From c9e56b245349e503ab5d95f0d39c597c836617ef Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 11 Apr 2007 17:42:59 +0100 Subject: Split the DVD MRL brief description. Stops a "can't adjust line" warning. --- doc/man/en/xine.5 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 0c4cedc12..f705b1b23 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -31,7 +31,9 @@ to read from. Valid MRLs may be plain file names or one of the following: .TP \(bu CD and DVD: .br -.BI dvd:/[||][/.<part>] +.BI dvd:/[<device_name>][/<title>.<part>] +.br +.BI dvd:/<DVD_image_file_or_directory>[/<title>.<part>] .br .BI vcd://[<CD_image>|<device_name>][@[letter]<number>] .br -- cgit v1.2.3 From 275aeba0f94a30c19e4d5f8301cb7c19f7e78386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi> Date: Wed, 11 Apr 2007 18:46:22 +0200 Subject: Return NULL to avoid 'control reaches end of non-void function' warning from throwing off the test. --- m4/pthreads.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index 35193370d..363a8b4b2 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -41,7 +41,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[#include <pthread.h> - void *fakethread(void *arg) { } + void *fakethread(void *arg) { return NULL; } pthread_t fakevariable; ]], [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]] -- cgit v1.2.3 From 91fbaf503a19e6a3d838fac68885d023a9b7cf6a Mon Sep 17 00:00:00 2001 From: Darren Salt <linux@youmustbejoking.demon.co.uk> Date: Wed, 11 Apr 2007 18:10:53 +0100 Subject: Build-dep on libdirectfb-dev, libgtk2.0-dev (for gdkpixbuf) & libmpcdec-dev. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6a72f689d..1749dd041 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,10 @@ Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), pkg-config, libesd0-dev, libgnomevfs2-dev, zlib1g-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, + libdirectfb-dev, libgtk2.0-dev, libflac-dev (>>1.1.0), libpulse-dev, libsdl1.2-dev (>=1.2.11), libsmbclient-dev, libspeex-dev, libmng-dev, - libmad0-dev, libcdio-dev (>= 0.76-1), + libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), w3m, transfig, gs, sgmltools-lite Build-Conflicts: libdvdnav-dev, libvcdinfo-dev Standards-Version: 3.7.2 -- cgit v1.2.3 From c494a25b1a462744c7b78e0160d75aa1e6f97f06 Mon Sep 17 00:00:00 2001 From: Darren Salt <linux@youmustbejoking.demon.co.uk> Date: Wed, 11 Apr 2007 18:11:58 +0100 Subject: Re-enable the libcaca test for .deb building. --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8e4ca67fe..395b983e0 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,6 @@ CONFIGURE_FLAGS := --prefix=/usr \ --with-external-libmad \ --with-external-a52dec \ --with-external-libdts \ - --disable-cacatest \ $(DEB_BUILD_CONFIG_OPTIONS) \ CFLAGS="$(CFLAGS)" -- cgit v1.2.3 From 753fbd6127fd4457e777b61799003b9ebbc4b558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= <flameeyes@gmail.com> Date: Thu, 12 Apr 2007 18:02:38 +0200 Subject: Set xv_path before rewriting X_LIBS if we're not using pkg-config to discover X libraries. --- configure.ac | 6 ++++++ m4/xv.m4 | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4ecb5bce7..73bade8c9 100644 --- a/configure.ac +++ b/configure.ac @@ -499,6 +499,12 @@ if test "x$with_x" != "xno"; then PKG_CHECK_MODULES([X], [x11 xext], , [ AC_PATH_XTRA + dnl Set xv_path if its not done already + dnl we do it here before rewriting X_LIBS + if test x$xv_path = x; then + xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'` + fi + dnl ---------------------------------------------- dnl Check for XShm support (required with X) dnl ---------------------------------------------- diff --git a/m4/xv.m4 b/m4/xv.m4 index 6d58cd0e7..91380a1de 100644 --- a/m4/xv.m4 +++ b/m4/xv.m4 @@ -68,11 +68,6 @@ AC_DEFUN([AC_FIND_LIBXV], # Ensure that AC_PATH_XTRA is executed before this AC_REQUIRE([AC_PATH_XTRA]) - # Set xv_path if its not done already - if test x$xv_path = x; then - xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'` - fi - if test x$xv_path = x; then xv_path=/usr/X11R6/lib fi -- cgit v1.2.3