diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-12 18:03:33 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-12 18:03:33 +0200 |
| commit | ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772 (patch) | |
| tree | 0e3b88d3e635a57dc16ff89401ace61ffffb33df | |
| parent | 789f34cd49bf40c2c14fbcbaa9ac09b72994006b (diff) | |
| parent | 753fbd6127fd4457e777b61799003b9ebbc4b558 (diff) | |
| download | xine-lib-ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772.tar.gz xine-lib-ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772.tar.bz2 | |
Update from 1.1 branch.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | doc/man/en/xine.5 | 4 | ||||
| -rw-r--r-- | m4/pthreads.m4 | 2 | ||||
| -rw-r--r-- | m4/xv.m4 | 5 |
6 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 202e2f0ea..03d3437e0 100644 --- a/configure.ac +++ b/configure.ac @@ -441,6 +441,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/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 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)" 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:/[<DVD_image>|<DVD_directory>|<device_name>][/<title>.<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 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);]] @@ -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 |