From 831d52d6c33a1ef158930bb59d19d81be78a4096 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:12:20 +0100 Subject: [PATCH 1/3] * Tue Jan 03 2011 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch --- .gitignore | 1 + sources | 2 +- xine-lib.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4d5df15..cd0f87f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xine-lib-1.1.19-autotools.patch.bz2 xine-lib-1.1.19-pruned.tar.bz2 /xine-lib-1.1.20-pruned.tar.xz +/xine-lib-1.1.20.1-pruned.tar.xz diff --git a/sources b/sources index cf0f1a3..d1fab77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a916dc5456276402ab2002dd68ded50 xine-lib-1.1.20-pruned.tar.xz +46d9f91395feb50237ac385aa6654b26 xine-lib-1.1.20.1-pruned.tar.xz diff --git a/xine-lib.spec b/xine-lib.spec index 38b18a9..2921665 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -25,7 +25,7 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.20 +Version: 1.1.20.1 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -43,9 +43,6 @@ 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}} @@ -146,7 +143,6 @@ 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 @@ -377,6 +373,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 03 2011 Kevin Kofler 1.1.20.1-1 +- update to 1.1.20.1 (bugfix release) +- drop upstreamed link-libdvdread patch + * Sun Nov 20 2011 Kevin Kofler 1.1.20-1 - update to 1.1.20 (#753758) - use .xz tarball From 666fd2482ee8915d8828834d5951a8d86f7dc68b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:15:22 +0100 Subject: [PATCH 2/3] =?UTF-8?q?s/2011/2012/,=20duh=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2921665..7bd8afb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -373,7 +373,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jan 03 2011 Kevin Kofler 1.1.20.1-1 +* Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch From 4a6eed5ac591c6332b2677ed902c8d9634be313a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:33:48 +0100 Subject: [PATCH 3/3] Delete obsolete patch. --- xine-lib-1.1.20-link-libdvdread.patch | 11 ----------- 1 file changed, 11 deletions(-) delete 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 deleted file mode 100644 index c714aad..0000000 --- a/xine-lib-1.1.20-link-libdvdread.patch +++ /dev/null @@ -1,11 +0,0 @@ -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