From 838da37aa8bf874de45943593a8eb547fdd0a779 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 05:51:21 +0100 Subject: [PATCH] - fix system libdvdnav support to also link libdvdread --- xine-lib-1.1.20-link-libdvdread.patch | 11 +++++++++++ xine-lib.spec | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 xine-lib-1.1.20-link-libdvdread.patch diff --git a/xine-lib-1.1.20-link-libdvdread.patch b/xine-lib-1.1.20-link-libdvdread.patch new file mode 100644 index 0000000..c714aad --- /dev/null +++ b/xine-lib-1.1.20-link-libdvdread.patch @@ -0,0 +1,11 @@ +diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-link-libdvdread/configure.ac +--- xine-lib-1.1.20/configure.ac 2011-11-13 02:36:20.000000000 +0100 ++++ xine-lib-1.1.20-link-libdvdread/configure.ac 2011-11-20 05:46:16.000000000 +0100 +@@ -1773,6 +1773,7 @@ + AM_PATH_DVDNAV(0.1.9, + AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), + [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) ++ AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) + else + AC_MSG_RESULT([Use included DVDNAV support]) + fi diff --git a/xine-lib.spec b/xine-lib.spec index 1eaa0ef..38b18a9 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -43,6 +43,9 @@ Patch1: xine-lib-1.1.4-optflags.patch Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch +# fix system libdvdnav support to also link libdvdread +# otherwise, we get unresolved symbols in the spudec plugin +Patch10: xine-lib-1.1.20-link-libdvdread.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -143,6 +146,7 @@ rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 %patch1 -p1 -b .optflags %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch10 -p1 -b .link-libdvdread ./autogen.sh noconfig @@ -382,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT - drop unused deepbind patch - drop xvmclib_header patch, fixed upstream - use the system libdvdnav (and libdvdread) instead of the bundled one +- fix system libdvdnav support to also link libdvdread - plugin ABI is now 1.30 * Fri Jul 15 2011 Kevin Kofler 1.1.19-7