6.0.0-1: Upstream update

3 files changed, 19 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e82e2ac2ebee..7966172610fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 # Generated by mksrcinfo v8
-# Fri Jul 22 17:05:29 UTC 2016
+# Sat Feb 17 17:46:42 UTC 2018
 pkgbase = lib32-libdvdnav
 	pkgdesc = The library for xine-dvdnav plugin (32 bit)
-	pkgver = 5.0.3
-	pkgrel = 2
-	url = http://dvdnav.mplayerhq.hu/
+	pkgver = 6.0.0
+	pkgrel = 1
+	url = https://www.videolan.org/developers/libdvdnav.html
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	depends = lib32-libdvdread
 	depends = libdvdnav
-	source = libdvdnav-5.0.3.zip::https://code.videolan.org/videolan/libdvdnav/repository/archive.zip?ref=5.0.3
-	source = fix-crash-describe_title.patch
-	md5sums = 7d7713909dc8642550ef3f2e661e2e52
-	md5sums = a23f89f9175a36f04b5e202bd4e35baa
+	source = git+https://code.videolan.org/videolan/libdvdnav.git#commit=dcb9109e45ccd304ec82a7c7bf46cca63620adf9
+	md5sums = SKIP
 
 pkgname = lib32-libdvdnav
 
diff --git a/PKGBUILD b/PKGBUILD
index 330ede70d981..4cb42b1cb834 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,33 +3,24 @@
 
 _pkgname=libdvdnav
 pkgname=lib32-${_pkgname}
-pkgver=5.0.3
-pkgrel=2
+pkgver=6.0.0
+pkgrel=1
 pkgdesc="The library for xine-dvdnav plugin (32 bit)"
 arch=('x86_64')
 license=('GPL')
-url="http://dvdnav.mplayerhq.hu/"
+url="https://www.videolan.org/developers/libdvdnav.html"
 depends=('lib32-libdvdread' "${_pkgname}")
 makedepends=('git')
-#source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver
-#	fix-crash-describe_title.patch)
-source=("$_pkgname-$pkgver.zip::https://code.videolan.org/videolan/libdvdnav/repository/archive.zip?ref=$pkgver"
-	fix-crash-describe_title.patch)
-md5sums=('7d7713909dc8642550ef3f2e661e2e52'
-         'a23f89f9175a36f04b5e202bd4e35baa')
-
-
-
-#md5sums=('SKIP'
-#         'a23f89f9175a36f04b5e202bd4e35baa')
-#source=("http://mirror.us.leaseweb.net/archlinux/extra/os/i686/${_pkgname}-${pkgver}-1-x86_64.pkg.tar.xz")
-#md5sums=('8e673c2641a6d53ff3d5bde0b7a164eb')
+_commit=dcb9109e45ccd304ec82a7c7bf46cca63620adf9  # tags/6.0.0^0
+source=("git+https://code.videolan.org/videolan/libdvdnav.git#commit=$_commit")
+md5sums=('SKIP')
 
+pkgver() {
+cd ${_pkgname}
+git describe --tags | sed -e 's/-/+/g'
+}
 prepare() {
-#cd "${_pkgname}"
-
-cd $_pkgname-$pkgver-5fb919774444aa382f6e02cb63801c82f2c38325
-patch -Np1 -i ../fix-crash-describe_title.patch
+cd "${_pkgname}"
 autoreconf -fi
 }
 
@@ -38,15 +29,13 @@ export CC='gcc -m32'
 export CXX='g++ -m32'
 export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
   
-#cd "${_pkgname}"  
-cd $_pkgname-$pkgver-5fb919774444aa382f6e02cb63801c82f2c38325
+cd "${_pkgname}"
 ./configure --prefix=/usr --libdir=/usr/lib32
 make
 }
 
 package() {
-#cd "${_pkgname}"
-cd $_pkgname-$pkgver-5fb919774444aa382f6e02cb63801c82f2c38325
+cd "${_pkgname}"
 make DESTDIR="${pkgdir}" install
 rm -rf "${pkgdir}/usr"/{bin,include,share}
 }
diff --git a/fix-crash-describe_title.patch b/fix-crash-describe_title.patch
deleted file mode 100644
index 1c07336e7376..000000000000
--- a/fix-crash-describe_title.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-