summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-20 23:13:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-20 23:13:34 +0000
commit5bd01251f8ae28b17078d2df2aa0d2a4d9e2c2e1 (patch)
tree2f10ed62f66b1b2680403667098c39eae660505e /media-video
parentFix libxklavier-4 support. (diff)
downloadgentoo-2-5bd01251f8ae28b17078d2df2aa0d2a4d9e2c2e1.tar.gz
gentoo-2-5bd01251f8ae28b17078d2df2aa0d2a4d9e2c2e1.tar.bz2
gentoo-2-5bd01251f8ae28b17078d2df2aa0d2a4d9e2c2e1.zip
Don't bail out when there is title reading errors wrt #233113 by Martin Thierer.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/lsdvd/ChangeLog11
-rw-r--r--media-video/lsdvd/files/lsdvd-0.15-types.patch26
-rw-r--r--media-video/lsdvd/files/lsdvd-0.16-title.patch27
-rw-r--r--media-video/lsdvd/lsdvd-0.16-r2.ebuild30
4 files changed, 66 insertions, 28 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/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
+}