Don't bail out when there is title reading errors wrt #233113 by Martin Thierer.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 69 insertions, 30 deletions

diff --git a/media-video/lsdvd/ChangeLog b/media-video/lsdvd/ChangeLog
index 2eb35603eedd..3ec09f5051a6 100644
--- a/media-video/lsdvd/ChangeLog
+++ b/media-video/lsdvd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/lsdvd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.43 2008/12/22 15:50:04 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.44 2009/07/20 23:13:34 ssuominen Exp $
+
+*lsdvd-0.16-r2 (20 Jul 2009)
+
+  20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +lsdvd-0.16-r2.ebuild,
+  +files/lsdvd-0.16-title.patch:
+  Don't bail out when there is title reading errors wrt #233113 by Martin
+  Thierer.
 
   22 Dec 2008; Raúl Porcel <armin76@gentoo.org> lsdvd-0.16-r1.ebuild:
   ia64 stable wrt #251285
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index 0aab9e38866a..301d898e96e4 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,7 +1,8 @@
-AUX lsdvd-0.15-types.patch 962 RMD160 2b784f089d66769aa76275362346a9988ca30041 SHA1 b40c6e80741890182b99e99231c53e074c939926 SHA256 2226aa17b95852426c7bf03175d8608b1556064948a487fe3b82db7913e5bbd0
+AUX lsdvd-0.16-title.patch 944 RMD160 a7706a4231482c9f17dbeea2f002e3b61ea6832b SHA1 c007d79573964e3dbec8cde8a79fa2fee1258acd SHA256 422178a981c505bcf6d9a5f853aabac1be7022a38940b3ac5ed6bb1fda7ce106
 AUX lsdvd-0.16-types.patch 971 RMD160 02c31c4780a2b533d11e27add4bbc8de13582547 SHA1 ef34c72ae0e4f7b43ecb51d84a65a545aa0ed719 SHA256 2b187779b57aa5194963eff3e13da573f735cb70a0160bfe6cab9fff6bef9fa8
 AUX lsdvd-0.16-usec.patch 973 RMD160 b72c614147be704fde1c98dc3a70005c70a3a3a8 SHA1 fb1581b482eb87b69d48e92bd72b2fcb17299acf SHA256 f83938b1ebfdfcb1b2503352d24e1c04bfb2a4e603a418a94d2069a0da926759
 DIST lsdvd-0.16.tar.gz 100495 RMD160 fcd0993aea6ad2203c8be019ec31ba7c8660ca25 SHA1 d5c0d32bfb220807ebdc0bfbb17679e7294791f4 SHA256 04ae3e2d823ed427e31d57f3677d28ec36bdf3bf984d35f7bdfab030d89b20f1
 EBUILD lsdvd-0.16-r1.ebuild 725 RMD160 85c2ce76d47c88ce638e481f87e5fb364b9686af SHA1 6ab7639908c2afc7c030cbc3434c0da12e6fed15 SHA256 6df4228eb28cf3fe922640824dc6421c808ee6a02c9ba4bb3992fad4e44cac09
-MISC ChangeLog 5194 RMD160 5bc440f3d27acea4ff8747a025877e8291c8134e SHA1 cf5b173559f327f884f21e592c7b427096e62469 SHA256 78caf5f748228bac1a0d7bf98503c29f88daefdeae675141fe12965eae1ad680
+EBUILD lsdvd-0.16-r2.ebuild 772 RMD160 7b63842c137130f9703d717111fc2e767eedbe5e SHA1 2040cea0abd0816e55f3f5da485e139052ef2fa0 SHA256 009c0da05ebee54a58e2af8115df1ae16394b789f2da923c3ca30d0878262e5b
+MISC ChangeLog 5422 RMD160 10136de1e647aa807663c2305ecf5dd1ba7f8910 SHA1 d98330b24be0f7419e72654e9636d0997ed05b9b SHA256 a95b0a896a152fd3e677b665e243f9073f3c6dc1975100aa7a2837a7c8695d26
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/lsdvd/files/lsdvd-0.15-types.patch b/media-video/lsdvd/files/lsdvd-0.15-types.patch
deleted file mode 100644
index 9cb8e6422a0b..000000000000
--- a/media-video/lsdvd/files/lsdvd-0.15-types.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lsdvd-0.15/configure.in
-===================================================================
---- lsdvd-0.15.orig/configure.in
-+++ lsdvd-0.15/configure.in
-@@ -5,7 +5,8 @@ CFLAGS=-g
- AC_PROG_CC
- AC_CHECK_LIB(dvdread, DVDOpen, , AC_MSG_ERROR([libdvdread not found!]))
- AC_MSG_CHECKING([for dvdread/ifo_read.h])
--AC_TRY_COMPILE([#include <dvdread/ifo_read.h>], ,
-+AC_TRY_COMPILE([#include <stdint.h>
-+	#include <dvdread/ifo_read.h>], ,
- 	AC_MSG_RESULT([yes]), 
- 	AC_MSG_RESULT([no]) 
- 	AC_MSG_ERROR([Header files for dvdread not found]))
-Index: lsdvd-0.15/lsdvd.c
-===================================================================
---- lsdvd-0.15.orig/lsdvd.c
-+++ lsdvd-0.15/lsdvd.c
-@@ -13,6 +13,7 @@
-  *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
-  *			  output info structures in form of a Perl module, by Henk Vergonet.
-  */
-+#include <stdint.h>
- #include <dvdread/ifo_read.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/media-video/lsdvd/files/lsdvd-0.16-title.patch b/media-video/lsdvd/files/lsdvd-0.16-title.patch
new file mode 100644
index 000000000000..44511a126e64
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.16-title.patch
@@ -0,0 +1,27 @@
+See, http://bugs.gentoo.org/show_bug.cgi?id=233113
+
+lsdvd always reads the infos for all titles (even if only a single title was
+selected with "-t") and bails out if there is an error.
+
+Now, if for example title 5 is unreadable but you're interested in title 1, you
+should be able to get the info by using "-t 1", but that doesn't work, as lsdvd
+errors out before even starting the output because it can't read title 5.
+
+To solve this my patch makes lsdvd ignore read errors in titles it wouldn't
+display anyway.
+
+Patch by Martin Thierer
+
+diff -uw lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
+--- lsdvd-0.16.orig/lsdvd.c	2006-03-02 14:48:11.000000000 +0100
++++ lsdvd-0.16/lsdvd.c	2008-07-27 20:11:55.000000000 +0200
+@@ -292,7 +292,7 @@
+ 
+ 	for (i=1; i <= ifo_zero->vts_atrt->nr_of_vtss; i++) {
+ 		ifo[i] = ifoOpen(dvd, i);
+-		if ( !ifo[i] ) {
++		if ( !ifo[i] && opt_t == i ) {
+ 			fprintf( stderr, "Can't open ifo %d!\n", i);
+ 			return 4;
+ 		}
+
diff --git a/media-video/lsdvd/lsdvd-0.16-r2.ebuild b/media-video/lsdvd/lsdvd-0.16-r2.ebuild
new file mode 100644
index 000000000000..770ba852bf30
--- /dev/null
+++ b/media-video/lsdvd/lsdvd-0.16-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16-r2.ebuild,v 1.1 2009/07/20 23:13:34 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Utility for getting info out of DVDs"
+HOMEPAGE="http://untrepid.com/lsdvd/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libdvdread"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-types.patch \
+		"${FILESDIR}"/${P}-usec.patch \
+		"${FILESDIR}"/${P}-title.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README
+}