Add patches for removing extra newlines, and fixing chapter count display

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 86 insertions, 1 deletions

diff --git a/media-video/lsdvd/ChangeLog b/media-video/lsdvd/ChangeLog
index 2722cbd9f020..cb4be3102886 100644
--- a/media-video/lsdvd/ChangeLog
+++ b/media-video/lsdvd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/lsdvd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.46 2014/03/18 15:43:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.47 2014/08/26 16:14:53 beandog Exp $
+
+*lsdvd-0.16-r3 (26 Aug 2014)
+
+  26 Aug 2014; Steve Dibb <beandog@gentoo.org> +lsdvd-0.16-r3.ebuild,
+  +files/lsdvd-0.16-chapter-count.patch, +files/lsdvd-0.16-newline.patch:
+  Add patches for removing extra newlines, and fixing chapter count display
 
   18 Mar 2014; Steve Dibb <beandog@gentoo.org> lsdvd-0.16-r1.ebuild,
   lsdvd-0.16-r2.ebuild:
diff --git a/media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch b/media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch
new file mode 100644
index 000000000000..f51bd03762fc
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch
@@ -0,0 +1,25 @@
+Using tt_srpt->title[].nr_of_ptts from the VMG IFO as a reference to the
+chapter count is often wrong, and noted as such in the source code.  Use
+the program chain instead.
+
+--- lsdvd-0.16/lsdvd.c.orig	2014-08-22 21:47:06.009490680 -0600
++++ lsdvd-0.16/lsdvd.c	2014-08-22 21:47:30.947257942 -0600
+@@ -347,6 +347,7 @@
+ 		}
+ 
+ 		dvd_info.titles[j].chapter_count_reported = ifo_zero->tt_srpt->title[j].nr_of_ptts;
++		dvd_info.titles[j].chapter_count = pgc->nr_of_programs;
+ 		dvd_info.titles[j].cell_count = pgc->nr_of_cells;
+ 		dvd_info.titles[j].audiostream_count = vtsi_mat->nr_of_vts_audio_streams;
+ 		dvd_info.titles[j].subtitle_count = vtsi_mat->nr_of_vts_subp_streams;  
+--- lsdvd-0.16/ohuman.c.orig	2014-08-22 21:47:00.993538145 -0600
++++ lsdvd-0.16/ohuman.c	2014-08-22 21:47:45.533121749 -0600
+@@ -20,7 +20,7 @@
+ //				(int)(dvd_info->titles[j].general.length / 60) % 60,
+ //				(float)((int)(dvd_info->titles[j].general.length * 1000) % 6000) / 1000); //,
+ //				dvd_info->titles[j].general.length);
+-		printf("Chapters: %02d, Cells: %02d, ", dvd_info->titles[j].chapter_count_reported, dvd_info->titles[j].cell_count);
++		printf("Chapters: %02d, Cells: %02d, ", dvd_info->titles[j].chapter_count, dvd_info->titles[j].cell_count);
+ 		printf("Audio streams: %02d, Subpictures: %02d", dvd_info->titles[j].audiostream_count, dvd_info->titles[j].subtitle_count);
+ 		printf("\n"); 
+ 		
diff --git a/media-video/lsdvd/files/lsdvd-0.16-newline.patch b/media-video/lsdvd/files/lsdvd-0.16-newline.patch
new file mode 100644
index 000000000000..4f0ec1a74cd4
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.16-newline.patch
@@ -0,0 +1,22 @@
+Removes extra newline from output like this:
+
+Title: 01, Length: 02:18:41.834 Chapters: 06, Cells: 06, Audio streams: 01, Subpictures: 03
+
+Title: 02, Length: 00:46:16.000 Chapters: 03, Cells: 03, Audio streams: 01, Subpictures: 03
+
+Title: 03, Length: 00:46:11.834 Chapters: 03, Cells: 03, Audio streams: 01, Subpictures: 03
+--- lsdvd-0.16/ohuman.c.orig	2014-08-22 21:47:00.993538145 -0600
++++ lsdvd-0.16/ohuman.c	2014-08-22 21:52:11.964633226 -0600
+@@ -111,11 +111,10 @@
+ 				printf("\n");
+ 			}
+ 		}
+-		printf("\n");
+ 	}
+ 	}
+ 
+ 	if (! opt_t) {
+-		printf("Longest track: %02d\n\n", dvd_info->longest_track);
++		printf("Longest track: %02d\n", dvd_info->longest_track);
+ 	}
+ }
diff --git a/media-video/lsdvd/lsdvd-0.16-r3.ebuild b/media-video/lsdvd/lsdvd-0.16-r3.ebuild
new file mode 100644
index 000000000000..660ecbd4265c
--- /dev/null
+++ b/media-video/lsdvd/lsdvd-0.16-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16-r3.ebuild,v 1.1 2014/08/26 16:14:53 beandog Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Utility for getting info out of DVDs"
+HOMEPAGE="http://sourceforge.net/projects/lsdvd/"
+SRC_URI="mirror://sourceforge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="media-libs/libdvdread"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-types.patch \
+		"${FILESDIR}"/${P}-usec.patch \
+		"${FILESDIR}"/${P}-title.patch \
+		"${FILESDIR}"/${P}-chapter-count.patch \
+		"${FILESDIR}"/${P}-newline.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README
+}