Repo ipdate to 5.0.3-1

4 files changed, 40 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ace5dd9f553..f166da763bb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = lib32-libdvdnav
 	pkgdesc = The library for xine-dvdnav plugin (32 bit)
-	pkgver = 5.0.2
+	pkgver = 5.0.3
 	pkgrel = 1
 	url = http://dvdnav.mplayerhq.hu/
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	depends = lib32-libdvdread
+	depends = lib32-libdvdread>=5.0.2
 	depends = libdvdnav
-	source = git://git.videolan.org/libdvdnav.git#tag=5.0.2
-	source = Fix-reading-DVD-label.patch
+	source = git://git.videolan.org/libdvdnav.git#tag=5.0.3
+	source = fix-crash-describe_title.patch
 	md5sums = SKIP
-	md5sums = a92e0638a7cbe5f0e11458a05cf5fb8a
+	md5sums = a23f89f9175a36f04b5e202bd4e35baa
 
 pkgname = lib32-libdvdnav
 
diff --git a/Fix-reading-DVD-label.patch b/Fix-reading-DVD-label.patch
deleted file mode 100644
index a91eaac93dcd..000000000000
--- a/Fix-reading-DVD-label.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1cdbd6909097cf36f3357a92de482ec9980ae7ed Mon Sep 17 00:00:00 2001
-From: John Stebbins <stebbins@jetheaddev.com>
-Date: Tue, 13 Jan 2015 11:07:03 -0700
-Subject: [PATCH] Fix reading DVD label
-
-This was inadvertently removed with REMAP
----
- src/vm/vm.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/vm/vm.c b/src/vm/vm.c
-index 7e4d594..1e87376 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
-@@ -402,6 +402,9 @@ int vm_reset(vm_t *vm, const char *dvdroot) {
-       /* return 0; Not really used for now.. */
-     }
-     /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */
-+    if(dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot) != 1) {
-+      fprintf(MSG_OUT, "libdvdnav: vm: dvd_read_name failed\n");
-+    }
-   }
-   if (vm->vmgi) {
-     int i, mask;
--- 
-1.7.10.4
-
diff --git a/PKGBUILD b/PKGBUILD
index 8043df6bc857..30e2c84e3b87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,23 @@
 
 _pkgname=libdvdnav
 pkgname=lib32-${_pkgname}
-pkgver=5.0.2
+pkgver=5.0.3
 pkgrel=1
 pkgdesc="The library for xine-dvdnav plugin (32 bit)"
 arch=('x86_64')
 license=('GPL')
 url="http://dvdnav.mplayerhq.hu/"
-depends=('lib32-libdvdread' "${_pkgname}")
+depends=('lib32-libdvdread>=5.0.2' "${_pkgname}")
 makedepends=('git')
 source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver
-		Fix-reading-DVD-label.patch)
+	fix-crash-describe_title.patch)
+		
 md5sums=('SKIP'
-         'a92e0638a7cbe5f0e11458a05cf5fb8a')
+         'a23f89f9175a36f04b5e202bd4e35baa')
 
 prepare() {
 cd "${_pkgname}"
-patch -Np1 -i ../Fix-reading-DVD-label.patch
+patch -Np1 -i ../fix-crash-describe_title.patch
 autoreconf -fi
 }
 
diff --git a/fix-crash-describe_title.patch b/fix-crash-describe_title.patch
new file mode 100644
index 000000000000..1c07336e7376
--- /dev/null
+++ b/fix-crash-describe_title.patch
@@ -0,0 +1,29 @@
+From 8a270d6dd40ac43c98c948fe9d10e5bcb4aa3d41 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Tue, 1 Sep 2015 16:00:59 +0200
+Subject: [PATCH] Fix crashes with some DVDs on describe_title
+
+This is a stop-over, but the actual issue is not fixed
+---
+ src/searching.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/searching.c b/src/searching.c
+index 70c0f85..f638b61 100644
+--- a/src/searching.c
++++ b/src/searching.c
+@@ -644,6 +644,11 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
+   if(!tmp)
+     goto fail;
+ 
++  if(!ptt) {
++      printerr("ptt NULL");
++      goto fail;
++  }
++
+   length = 0;
+   for(i=0; i<parts; i++) {
+     uint32_t cellnr, endcellnr;
+-- 
+1.7.10.4
+