- fix system libdvdnav support to also link libdvdread

This commit is contained in:
Kevin Kofler 2011-11-20 05:51:21 +01:00
parent ce16711891
commit 838da37aa8
2 changed files with 16 additions and 0 deletions

View File

@ -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

View File

@ -43,6 +43,9 @@ Patch1: xine-lib-1.1.4-optflags.patch
Patch8: xine-lib-1.1.17-avsync_hack.patch Patch8: xine-lib-1.1.17-avsync_hack.patch
# http://bugzilla.redhat.com/477226 # http://bugzilla.redhat.com/477226
Patch9: xine-lib-1.1.16.2-multilib.patch 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} Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{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 %patch1 -p1 -b .optflags
%patch8 -p1 -b .avsync_hack %patch8 -p1 -b .avsync_hack
%patch9 -p1 -b .multilib %patch9 -p1 -b .multilib
%patch10 -p1 -b .link-libdvdread
./autogen.sh noconfig ./autogen.sh noconfig
@ -382,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT
- drop unused deepbind patch - drop unused deepbind patch
- drop xvmclib_header patch, fixed upstream - drop xvmclib_header patch, fixed upstream
- use the system libdvdnav (and libdvdread) instead of the bundled one - 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 - plugin ABI is now 1.30
* Fri Jul 15 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.19-7 * Fri Jul 15 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.19-7