From 6a2841ae73da88dbd8be8e8b3c50a1e2bfc88d73b4f50b2ad19ad760a6343a00 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Oct 2008 10:33:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=16 --- xine-lib-1.1.15-autoconf.diff | 29 +++++++++++++++++++++++++++++ xine-lib.changes | 5 +++++ xine-lib.spec | 6 +++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.15-autoconf.diff diff --git a/xine-lib-1.1.15-autoconf.diff b/xine-lib-1.1.15-autoconf.diff new file mode 100644 index 0000000..2b9d1b1 --- /dev/null +++ b/xine-lib-1.1.15-autoconf.diff @@ -0,0 +1,29 @@ +tree 27b16715df5c +parent f5ff69fc65d3 +author Matthias Hopf 1222961491 -7200 +committer Matthias Hopf 1222961491 -7200 +revision 9559 +branch default + +Fix compilation for new auto*. +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -728,7 +728,7 @@ + + AC_ARG_WITH(xxmc-path, AS_HELP_STRING([--with-xxmc-path=path], [where libXvMC libraries for the + xxmc plugin are installed. Defalts to the default X library path.]), +- xxmc_path="$withval", xxmc_path="$x_libraries") ++ xxmc_path="$withval", xxmc_path="${x_libraries:-/usr/lib}") + AC_ARG_WITH(xxmc-lib, AS_HELP_STRING([--with-xxmc-lib=XXXX], [The name of the XvMC library + libXXXX.so for the xxmc plugin.]),xxmc_stub="$withval", + xxmc_stub="XvMCW") +@@ -819,7 +819,7 @@ + + AC_ARG_WITH(xvmc-path, AS_HELP_STRING([--with-xvmc-path=path], [where libXvMC libraries for the + xvmc plugin are installed. Defalts to the default X library path.]), +- xvmc_path="$withval", xvmc_path="$x_libraries") ++ xvmc_path="$withval", xvmc_path="${x_libraries:-/usr/lib}") + AC_ARG_WITH(xvmc-lib, AS_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the XvMC library + libXXXX.so for the xvmc plugin.]),xvmc_stub="$withval", + xvmc_stub="XvMCW") diff --git a/xine-lib.changes b/xine-lib.changes index d0efc85..4f2a247 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 21 12:10:59 CEST 2008 - lnussel@suse.de + +- fix build with newer autoconf + ------------------------------------------------------------------- Wed Sep 17 09:47:23 CEST 2008 - lnussel@suse.de diff --git a/xine-lib.spec b/xine-lib.spec index 63fd64f..941ca04 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -89,7 +89,7 @@ BuildRequires: DirectFB BuildRequires: libmodplug %endif Version: 1.1.15 -Release: 17 +Release: 18 %define abiversion 1.24 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players @@ -108,6 +108,7 @@ Patch27: xine-lib-1.1.14-asprintf-typo.diff Patch28: xine-lib-1.1.14-ia64-is-not-alpha.diff Patch29: xine-lib-1.1.15-cpp-compilation.diff Patch30: xine-lib-1.1.15-demux_str.diff +Patch31: xine-lib-1.1.15-autoconf.diff # *** Addons Patch50: vdr-xine-0.8.2.diff.bz2 Patch51: vdr-xine-SUSE.diff @@ -449,6 +450,7 @@ cd xine-lib-%{version} %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 %patch50 -p1 %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am @@ -786,6 +788,8 @@ rm -rf %{buildroot} %endif %changelog +* Tue Oct 21 2008 lnussel@suse.de +- fix build with newer autoconf * Wed Sep 17 2008 lnussel@suse.de - add some more obsoletes/provides for legacy packman packages - fix build with newer ffmpeg releases