From c860cdd6d00aceba899768de2aacca211fcb3a718262fc53d6a7fbdb06441e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 4 Dec 2011 18:05:29 +0000 Subject: [PATCH] Accepting request 95296 from home:pbleser:branches:multimedia:libs - update to 4.2.0: * added dvdnav_get_serial_string() function * fixed ifo leak in dvdnav_describe_chapters() * added dvdnav_get_video_resolution() to retrieve video resolution * added dvdnav_program_play() & dvdnav_current_title_program() for more reliable playback * fixed deadlock between dvdnav_reset() and dvd_clear() * fixed pthread_mutex_destroy macro for Win32 * fixed numerous assertion failures occuring when playing DVDs with new "copy protection" schemes * fixed forward seeks to always move forward OBS-URL: https://build.opensuse.org/request/show/95296 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdvdnav?expand=0&rev=12 --- libdvdnav-4.1.3.tar.bz2 | 3 -- libdvdnav-4.2.0.tar.bz2 | 3 ++ libdvdnav-strict-aliasing.patch | 29 ++++---------- libdvdnav.changes | 15 ++++++++ libdvdnav.diff | 25 ------------ libdvdnav.spec | 68 +++++++++++---------------------- 6 files changed, 47 insertions(+), 96 deletions(-) delete mode 100644 libdvdnav-4.1.3.tar.bz2 create mode 100644 libdvdnav-4.2.0.tar.bz2 delete mode 100644 libdvdnav.diff diff --git a/libdvdnav-4.1.3.tar.bz2 b/libdvdnav-4.1.3.tar.bz2 deleted file mode 100644 index c72b28d..0000000 --- a/libdvdnav-4.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d -size 110843 diff --git a/libdvdnav-4.2.0.tar.bz2 b/libdvdnav-4.2.0.tar.bz2 new file mode 100644 index 0000000..708cc5b --- /dev/null +++ b/libdvdnav-4.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550 +size 111575 diff --git a/libdvdnav-strict-aliasing.patch b/libdvdnav-strict-aliasing.patch index 639e9b5..96652dd 100644 --- a/libdvdnav-strict-aliasing.patch +++ b/libdvdnav-strict-aliasing.patch @@ -1,26 +1,11 @@ -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig 2008-06-14 14:33:21.000000000 +0200 -+++ src/Makefile.am 2009-11-20 13:44:17.000000000 +0100 -@@ -5,7 +5,7 @@ SUBDIRS = vm +--- src/Makefile.am.orig 2011-12-04 00:09:32.836001024 +0100 ++++ src/Makefile.am 2011-12-04 00:09:49.615001024 +0100 +@@ -4,7 +4,7 @@ + includedir = ${prefix}/include/dvdnav - AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ -- -I$(top_srcdir)/src/vm -+ -fno-strict-aliasing -I$(top_srcdir)/src/vm +-AM_CPPFLAGS = $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ ++AM_CPPFLAGS = $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) -fno-strict-aliasing \ + -I$(top_srcdir)/src/vm EXTRA_DIST = README.MAP FELLOWSHIP.map - -Index: configure.ac -=================================================================== ---- configure.ac.orig 2009-11-20 13:44:17.000000000 +0100 -+++ configure.ac 2009-11-20 14:28:01.000000000 +0100 -@@ -61,7 +61,7 @@ dnl libname.so.(DVDNAV_LT_CURRENT - D - - DVDNAV_LT_CURRENT=5 - DVDNAV_LT_AGE=1 --DVDNAV_LT_REVISION=2 -+DVDNAV_LT_REVISION=3 - - AC_SUBST(DVDNAV_LT_CURRENT) - AC_SUBST(DVDNAV_LT_AGE) diff --git a/libdvdnav.changes b/libdvdnav.changes index efbc770..6883a94 100644 --- a/libdvdnav.changes +++ b/libdvdnav.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Dec 3 23:14:39 UTC 2011 - pascal.bleser@opensuse.org + +- update to 4.2.0: + * added dvdnav_get_serial_string() function + * fixed ifo leak in dvdnav_describe_chapters() + * added dvdnav_get_video_resolution() to retrieve video resolution + * added dvdnav_program_play() & dvdnav_current_title_program() for + more reliable playback + * fixed deadlock between dvdnav_reset() and dvd_clear() + * fixed pthread_mutex_destroy macro for Win32 + * fixed numerous assertion failures occuring when playing DVDs with + new "copy protection" schemes + * fixed forward seeks to always move forward + ------------------------------------------------------------------- Sun Nov 13 09:15:40 UTC 2011 - coolo@suse.com diff --git a/libdvdnav.diff b/libdvdnav.diff deleted file mode 100644 index dba6365..0000000 --- a/libdvdnav.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- configure.ac -+++ configure.ac 2004/01/12 11:14:06 -@@ -158,21 +158,17 @@ - dnl --------------------------------------------- - dnl Get where .m4 should be installed. - dnl --------------------------------------------- --case "`id`" in -- uid=0\(* ) - AC_MSG_CHECKING(for aclocal directory) - if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" - AC_MSG_RESULT($ACLOCAL_DIR) - else -- ACLOCAL_DIR="/usr/local/share/aclocal" -+ ACLOCAL_DIR="/usr/share/aclocal" - AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) - fi - escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" - ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" - AC_SUBST(ACLOCAL_DIR) -- ;; --esac - AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") - - dnl --------------------------------------------- diff --git a/libdvdnav.spec b/libdvdnav.spec index 05de87b..cfdab74 100644 --- a/libdvdnav.spec +++ b/libdvdnav.spec @@ -19,31 +19,22 @@ Name: libdvdnav -Summary: A DVD Navigation Library +Summary: DVD Navigation Library Url: http://www.mplayerhq.hu/ License: GPLv2+ Group: Productivity/Multimedia/Other -Version: 4.1.3 -Release: 14 -Source0: http://www1.mplayerhq.hu/MPlayer/releases/dvdnav-old/%name-%version.tar.bz2 -Patch: libdvdnav.diff +Version: 4.2.0 +Release: 0 +Source0: http://dvdnav.mplayerhq.hu/releases/libdvdnav-%{version}.tar.bz2 Patch1: libdvdnav-strict-aliasing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libdvdread-devel pkg-config +BuildRequires: libdvdread-devel >= 4.2.0 +BuildRequires: pkg-config BuildRequires: libtool %description This library contains functions to display DVD video menus. - - -Authors: --------- - Daniel Caujolle-Bert - Thomas Vander Stichele - Rich Wareham - Kees Cook - %package -n libdvdnav4 License: GPLv2+ Summary: A DVD Navigation Library @@ -54,15 +45,6 @@ Obsoletes: %{name} <= 0.1.10 %description -n libdvdnav4 This library contains functions to display DVD video menus. - - -Authors: --------- - Daniel Caujolle-Bert - Thomas Vander Stichele - Rich Wareham - Kees Cook - %package devel License: GPLv2+ Summary: Development Environment for libdvdnav @@ -72,48 +54,42 @@ Requires: libdvdnav4 = %{version} libdvdread-devel %description devel This library contains functions to display DVD video menus. - - -Authors: --------- - Daniel Caujolle-Bert - Thomas Vander Stichele - Rich Wareham - Kees Cook - %prep %setup -q -%patch %patch1 %build -autoreconf -f -i +autoreconf -f -i -v %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +%__make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install -%{__rm} -f %{buildroot}%{_libdir}/*.la +%__rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} -%post -n libdvdnav4 -p /sbin/ldconfig +%post -n libdvdnav4 -p /sbin/ldconfig %postun -n libdvdnav4 -p /sbin/ldconfig %files -n libdvdnav4 %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/libdvdnav.so.4 +%{_libdir}/libdvdnav.so.4.* +%{_libdir}/libdvdnavmini.so.4 +%{_libdir}/libdvdnavmini.so.4.* %files devel %defattr(-,root,root) %doc AUTHORS COPYING NEWS README -/usr/bin/* -/usr/include/* -/usr/share/aclocal/*.m4 -%{_libdir}/*.so -%_libdir/pkgconfig/dvdnav.pc -%_libdir/pkgconfig/dvdnavmini.pc +%{_bindir}/dvdnav-config +%{_includedir}/dvdnav +%{_datadir}/aclocal/dvdnav.m4 +%{_libdir}/libdvdnav.so +%{_libdir}/libdvdnavmini.so +%{_libdir}/pkgconfig/dvdnav.pc +%{_libdir}/pkgconfig/dvdnavmini.pc %changelog