diff --git a/.gitignore b/.gitignore index ab1f999..7cd31ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libdvdnav-svn1184.tar.bz2 /libdvdnav-4.2.0.tar.bz2 /libdvdnav-4.2.1.tar.xz /libdvdnav-5.0.1.tar.bz2 +/libdvdnav-5.0.3.tar.bz2 diff --git a/0001-Do-not-assert-on-NULL-pgcit.patch b/0001-Do-not-assert-on-NULL-pgcit.patch deleted file mode 100644 index c59d1fc..0000000 --- a/0001-Do-not-assert-on-NULL-pgcit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b026ed3da85b2085678a8d9e643e85e072ae6f83 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Sun, 31 Aug 2014 00:40:47 +0200 -Subject: [PATCH 1/5] Do not assert on NULL pgcit - ---- - src/vm/getset.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/vm/getset.c b/src/vm/getset.c -index 12b24ec..cd0c074 100644 ---- a/src/vm/getset.c -+++ b/src/vm/getset.c -@@ -242,7 +242,10 @@ int get_ID(vm_t *vm, int id) { - - /* Relies on state to get the correct pgcit. */ - pgcit = get_PGCIT(vm); -- assert(pgcit != NULL); -+ if(pgcit == NULL) { -+ fprintf(MSG_OUT, "libdvdnav: PGCIT null!\n"); -+ return 0; -+ } - #ifdef TRACE - fprintf(MSG_OUT, "libdvdnav: ** Searching for menu (0x%x) entry PGC\n", id); - #endif --- -1.9.3 - diff --git a/0002-Return-an-error-in-dvdnav_get_position-instead-of-as.patch b/0002-Return-an-error-in-dvdnav_get_position-instead-of-as.patch deleted file mode 100644 index 05caf64..0000000 --- a/0002-Return-an-error-in-dvdnav_get_position-instead-of-as.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d73a2b3c6ccd3d45be194d482cfb09f8e5055e2 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Sun, 31 Aug 2014 00:51:40 +0200 -Subject: [PATCH 2/5] Return an error in dvdnav_get_position instead of - asserting - -LP: #1236939 ---- - src/searching.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/searching.c b/src/searching.c -index f6e497e..74a16ee 100644 ---- a/src/searching.c -+++ b/src/searching.c -@@ -563,7 +563,8 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos, - *len += cell->last_sector - cell->first_sector + 1; - } - -- assert((signed)*pos != -1); -+ if((signed)*pos == -1) -+ return DVDNAV_STATUS_ERR; - - pthread_mutex_unlock(&this->vm_lock); - --- -1.9.3 - diff --git a/0003-dvdnav_get_position-Fix-mutex-unlocking-in-case-of-e.patch b/0003-dvdnav_get_position-Fix-mutex-unlocking-in-case-of-e.patch deleted file mode 100644 index 87f14d5..0000000 --- a/0003-dvdnav_get_position-Fix-mutex-unlocking-in-case-of-e.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e225924870be20b03aa5e05b8bd1f524499fe722 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Sun, 31 Aug 2014 19:51:04 +0200 -Subject: [PATCH 3/5] dvdnav_get_position: Fix mutex unlocking in case of error - ---- - src/searching.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/searching.c b/src/searching.c -index 74a16ee..93c7c2c 100644 ---- a/src/searching.c -+++ b/src/searching.c -@@ -563,11 +563,11 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos, - *len += cell->last_sector - cell->first_sector + 1; - } - -+ pthread_mutex_unlock(&this->vm_lock); -+ - if((signed)*pos == -1) - return DVDNAV_STATUS_ERR; - -- pthread_mutex_unlock(&this->vm_lock); -- - return DVDNAV_STATUS_OK; - } - --- -1.9.3 - diff --git a/libdvdnav.spec b/libdvdnav.spec index e6a64ba..43b0b04 100644 --- a/libdvdnav.spec +++ b/libdvdnav.spec @@ -1,15 +1,12 @@ Name: libdvdnav -Version: 5.0.1 -Release: 2.20140901gite225924%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: A library for reading DVD video discs based on Ogle code License: GPLv2+ URL: http://dvdnav.mplayerhq.hu/ -Source0: ftp://ftp.videolan.org/pub/videolan/libdvdnav/%{version}/libdvdnav-%{version}.tar.bz2 -Patch0: 0001-Do-not-assert-on-NULL-pgcit.patch -Patch1: 0002-Return-an-error-in-dvdnav_get_position-instead-of-as.patch -Patch2: 0003-dvdnav_get_position-Fix-mutex-unlocking-in-case-of-e.patch +Source0: https://download.videolan.org/pub/videolan/libdvdnav/%{version}/libdvdnav-%{version}.tar.bz2 BuildRequires: doxygen -BuildRequires: libdvdread-devel >= 4.1.3-0.3 +BuildRequires: libdvdread-devel >= 5.0.2 %description libdvdnav provides a simple library for reading DVD video discs. @@ -18,7 +15,7 @@ The code is based on Ogle and used in, among others, the Xine dvdnav plug-in. %package devel Summary: Development files for libdvdnav Requires: %{name} = %{version}-%{release} -Requires: libdvdread-devel >= 4.1.3-0.3 +Requires: libdvdread-devel >= 5.0.2 Requires: pkgconfig %description devel @@ -27,9 +24,6 @@ libdvdnav library. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --disable-static @@ -60,6 +54,11 @@ rm %{buildroot}%{_libdir}/libdvdnav.la %{_libdir}/pkgconfig/dvdnav.pc %changelog +* Sat Feb 07 2015 Dominik Mierzejewski 5.0.3-1 +- update to 5.0.3 +- drop obsolete patches +- BR libdvdread 5.0.2 + * Fri Oct 03 2014 Dominik Mierzejewski 5.0.1-2.20140901gite225924 - backport patches upstream git master to fix several known bugs (LP #1236939, #570790) diff --git a/sources b/sources index 54ca747..4ebc0c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81e30fb57eaf9f61aa6513a7bd85bd74 libdvdnav-5.0.1.tar.bz2 +e9ea4de3bd8f204e61301d407d09f033 libdvdnav-5.0.3.tar.bz2