Date: Thursday, September 10, 2015 @ 09:43:26 Author: jgc Revision: 245704
archrelease: copy trunk to extra-i686, extra-x86_64 Added: libdvdnav/repos/extra-i686/PKGBUILD (from rev 245703, libdvdnav/trunk/PKGBUILD) libdvdnav/repos/extra-i686/fix-crash-describe_title.patch (from rev 245703, libdvdnav/trunk/fix-crash-describe_title.patch) libdvdnav/repos/extra-x86_64/PKGBUILD (from rev 245703, libdvdnav/trunk/PKGBUILD) libdvdnav/repos/extra-x86_64/fix-crash-describe_title.patch (from rev 245703, libdvdnav/trunk/fix-crash-describe_title.patch) Deleted: libdvdnav/repos/extra-i686/Fix-reading-DVD-label.patch libdvdnav/repos/extra-i686/PKGBUILD libdvdnav/repos/extra-x86_64/Fix-reading-DVD-label.patch libdvdnav/repos/extra-x86_64/PKGBUILD ---------------------------------------------+ /PKGBUILD | 70 ++++++++++++++++++++++++++ extra-i686/Fix-reading-DVD-label.patch | 27 ---------- extra-i686/PKGBUILD | 35 ------------- extra-i686/fix-crash-describe_title.patch | 29 ++++++++++ extra-x86_64/Fix-reading-DVD-label.patch | 27 ---------- extra-x86_64/PKGBUILD | 35 ------------- extra-x86_64/fix-crash-describe_title.patch | 29 ++++++++++ 7 files changed, 128 insertions(+), 124 deletions(-) Deleted: extra-i686/Fix-reading-DVD-label.patch =================================================================== --- extra-i686/Fix-reading-DVD-label.patch 2015-09-10 07:43:19 UTC (rev 245703) +++ extra-i686/Fix-reading-DVD-label.patch 2015-09-10 07:43:26 UTC (rev 245704) @@ -1,27 +0,0 @@ -From 1cdbd6909097cf36f3357a92de482ec9980ae7ed Mon Sep 17 00:00:00 2001 -From: John Stebbins <stebb...@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 - Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-09-10 07:43:19 UTC (rev 245703) +++ extra-i686/PKGBUILD 2015-09-10 07:43:26 UTC (rev 245704) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Arjan <ar...@archlinux.org> -# contributor Sarah Hay <sarah...@mb.sympatico.ca> - -pkgname=libdvdnav -pkgver=5.0.2 -pkgrel=1 -pkgdesc="The library for xine-dvdnav plugin." -arch=('i686' 'x86_64') -license=('GPL') -url="http://dvdnav.mplayerhq.hu/" -depends=('libdvdread') -makedepends=('git') -source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver - Fix-reading-DVD-label.patch) -sha256sums=('SKIP' - 'f4300e3f38cdcb985c8f3c765ad0503350a96b91496c3cd63c7de5a5cb937119') - -prepare() { - cd $pkgname - patch -Np1 -i ../Fix-reading-DVD-label.patch - autoreconf -fi -} - -build() { - cd $pkgname - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname - make DESTDIR="${pkgdir}" install -} Copied: libdvdnav/repos/extra-i686/PKGBUILD (from rev 245703, libdvdnav/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-09-10 07:43:26 UTC (rev 245704) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Arjan <ar...@archlinux.org> +# contributor Sarah Hay <sarah...@mb.sympatico.ca> + +pkgname=libdvdnav +pkgver=5.0.3 +pkgrel=1 +pkgdesc="The library for xine-dvdnav plugin." +arch=('i686' 'x86_64') +license=('GPL') +url="http://dvdnav.mplayerhq.hu/" +depends=('libdvdread') +makedepends=('git') +source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver + fix-crash-describe_title.patch) +sha256sums=('SKIP' + '6a8e9c777dd9dbfa8a7f981796bd7a60412e3a5c7a8400253c567d956412c64b') + +prepare() { + cd $pkgname + patch -Np1 -i ../fix-crash-describe_title.patch + autoreconf -fi +} + +build() { + cd $pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname + make DESTDIR="${pkgdir}" install +} Copied: libdvdnav/repos/extra-i686/fix-crash-describe_title.patch (from rev 245703, libdvdnav/trunk/fix-crash-describe_title.patch) =================================================================== --- extra-i686/fix-crash-describe_title.patch (rev 0) +++ extra-i686/fix-crash-describe_title.patch 2015-09-10 07:43:26 UTC (rev 245704) @@ -0,0 +1,29 @@ +From 8a270d6dd40ac43c98c948fe9d10e5bcb4aa3d41 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <j...@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 + Deleted: extra-x86_64/Fix-reading-DVD-label.patch =================================================================== --- extra-x86_64/Fix-reading-DVD-label.patch 2015-09-10 07:43:19 UTC (rev 245703) +++ extra-x86_64/Fix-reading-DVD-label.patch 2015-09-10 07:43:26 UTC (rev 245704) @@ -1,27 +0,0 @@ -From 1cdbd6909097cf36f3357a92de482ec9980ae7ed Mon Sep 17 00:00:00 2001 -From: John Stebbins <stebb...@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 - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-09-10 07:43:19 UTC (rev 245703) +++ extra-x86_64/PKGBUILD 2015-09-10 07:43:26 UTC (rev 245704) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Arjan <ar...@archlinux.org> -# contributor Sarah Hay <sarah...@mb.sympatico.ca> - -pkgname=libdvdnav -pkgver=5.0.2 -pkgrel=1 -pkgdesc="The library for xine-dvdnav plugin." -arch=('i686' 'x86_64') -license=('GPL') -url="http://dvdnav.mplayerhq.hu/" -depends=('libdvdread') -makedepends=('git') -source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver - Fix-reading-DVD-label.patch) -sha256sums=('SKIP' - 'f4300e3f38cdcb985c8f3c765ad0503350a96b91496c3cd63c7de5a5cb937119') - -prepare() { - cd $pkgname - patch -Np1 -i ../Fix-reading-DVD-label.patch - autoreconf -fi -} - -build() { - cd $pkgname - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname - make DESTDIR="${pkgdir}" install -} Copied: libdvdnav/repos/extra-x86_64/PKGBUILD (from rev 245703, libdvdnav/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-09-10 07:43:26 UTC (rev 245704) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Arjan <ar...@archlinux.org> +# contributor Sarah Hay <sarah...@mb.sympatico.ca> + +pkgname=libdvdnav +pkgver=5.0.3 +pkgrel=1 +pkgdesc="The library for xine-dvdnav plugin." +arch=('i686' 'x86_64') +license=('GPL') +url="http://dvdnav.mplayerhq.hu/" +depends=('libdvdread') +makedepends=('git') +source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver + fix-crash-describe_title.patch) +sha256sums=('SKIP' + '6a8e9c777dd9dbfa8a7f981796bd7a60412e3a5c7a8400253c567d956412c64b') + +prepare() { + cd $pkgname + patch -Np1 -i ../fix-crash-describe_title.patch + autoreconf -fi +} + +build() { + cd $pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname + make DESTDIR="${pkgdir}" install +} Copied: libdvdnav/repos/extra-x86_64/fix-crash-describe_title.patch (from rev 245703, libdvdnav/trunk/fix-crash-describe_title.patch) =================================================================== --- extra-x86_64/fix-crash-describe_title.patch (rev 0) +++ extra-x86_64/fix-crash-describe_title.patch 2015-09-10 07:43:26 UTC (rev 245704) @@ -0,0 +1,29 @@ +From 8a270d6dd40ac43c98c948fe9d10e5bcb4aa3d41 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <j...@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 +