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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

5 files changed, 91 insertions, 3 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/Manifest b/media-video/lsdvd/Manifest
index cabf85ab8172..0391cdd3ce16 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,8 +1,11 @@
+AUX lsdvd-0.16-chapter-count.patch 1388 SHA256 a50e8f45743cebcbb63f98977a7e15ee544211ac76011ad0e535340a2606fe62 SHA512 f20a3b42701d277107680d279b743c068de4b68c89d76d9dc6d3f18f63656fbdbf71f3ab58cc6d6b36d3a41b3b77dfd007ef29c1df98770697ad87970fa70223 WHIRLPOOL 548c4bc897aedfd819593edfd99f27a977d4396245d3eae59ee9b86c5825a77f50a4823a3f3fa69f2c4e4a02fe92c46ec853fc9079a156030ce24ab7a446ae2a
+AUX lsdvd-0.16-newline.patch 676 SHA256 3082ec6e7a90b9293e6de6cf1129c527740e1539d99e8a16ed2109e301551373 SHA512 a1344d95855577853013a9b22e53bdf4654c4bfae2c162857cfba3051d9bdd37ce80ec0c19aec1bda8a6cc219aafdc405f85c7e197b0f81ea36f2449836d184d WHIRLPOOL 4390026acb1b4bd63795cb0901140605e3d7005d91e7ff8d39cf8bc239a4411a3ac840aeaaff63ee378e997f1b3231217b35ca75c11bb40c9464b96b572b4e2b
 AUX lsdvd-0.16-title.patch 944 SHA256 422178a981c505bcf6d9a5f853aabac1be7022a38940b3ac5ed6bb1fda7ce106 SHA512 a14526f8dc6708070fc6d529bd4cf8d4ed1913d33d96a2490cb432820ae35564cd10ec11581b681e43a3d9639cf639aca8d046f0750fafe93b9c08a7aa94edee WHIRLPOOL 33567dfcede91289469c5e719e0b424cbc80ce30a01f63e45f10968b9d54f4430a614c84b2dc2cb6bdbb30b4cb923d1372c9841e879246ccebb27aeb0167022f
 AUX lsdvd-0.16-types.patch 971 SHA256 2b187779b57aa5194963eff3e13da573f735cb70a0160bfe6cab9fff6bef9fa8 SHA512 6582e49a603168faf5b92ed7d2889cc052e51a0adb5921c61cf5a8f4470786caefc4ab95e6baf80eb98af0e2b5fc4b5f12c6200c23775889216ed2434349d673 WHIRLPOOL 44244873d2b73fed3476bfa3d2f2aa0ab752d28d569fe2cb25a414c691aa4bb38a99efc55fc972b3b53b06dd188570ad8f7399b3e6a7ab0308ac43716d0aeed4
 AUX lsdvd-0.16-usec.patch 973 SHA256 f83938b1ebfdfcb1b2503352d24e1c04bfb2a4e603a418a94d2069a0da926759 SHA512 fc9fb6f30b995f417075ad137bf0766c3e7ab25caaf2e9098491416fb49a79423afa04d5e34023d6083745f562cc25e9cb0269689edf7a0e8b8f41cf6b05418c WHIRLPOOL 9797100acf5d79bb498efde6f915f6802387bacd539b76faad16ed581f18b85c965f0a4e86b0a623de443a47d572458101eda66a754c9f44942b910de2225206
-DIST lsdvd-0.16.tar.gz 100495 SHA256 04ae3e2d823ed427e31d57f3677d28ec36bdf3bf984d35f7bdfab030d89b20f1
+DIST lsdvd-0.16.tar.gz 100495 SHA256 04ae3e2d823ed427e31d57f3677d28ec36bdf3bf984d35f7bdfab030d89b20f1 SHA512 4690395811ff0fad2a97aaa25e0f7a9e13dd6124b7273d9e7ae2eaef8bb6c7488391afe654a17ed00ec16ab08346f6076b5c73e49373a2859fdce8baa0c75f6b WHIRLPOOL 633d25cd78193ae8f4002d0db770d33a2a31fd3f0559ce55704156c3aced528022fe5892184e51f632b809c20281119ffbb671bb7c16da629dcddb070e565916
 EBUILD lsdvd-0.16-r1.ebuild 764 SHA256 04d1e231ba810f5a0d3d6f24c96c932b42be3553ca725b0c34cb170637820362 SHA512 0bfb1852403257acfd8f8b7197677b9c97621a64b4b363772d867fc02f684721adf2741267f5d83c519ddd8dc692fcdab039a0ab7bc95f5ab3a4c22c881dc95d WHIRLPOOL aaef718c40006f99f7280212df6451cb972fc797f28df95f8b7907fadd56b975ad80408c71b3b88d5b8be266a5f5774f3a3fe0b8360ace8391c55fffdfc2fb26
 EBUILD lsdvd-0.16-r2.ebuild 834 SHA256 3bb858ef107a532d6d96e863b9fcc6e325dff02f01f925d4df88914eb25a828d SHA512 8a0c8efa3074ba56e769ec6acd6ee4d45108357f1d8d8a281127c31a9eb05c270803d7af845b19a72b3241deb40c7e5168da3672dd792e86138f7e8f6df11500 WHIRLPOOL 18ea6dd022000848e344df717ee7ecc888531805579ff3602b1a0cb926b869bf7ff79debe867b1e61ea5db24b52eb5e7e4b90066f1603a63ec2321ee3fb0e8de
-MISC ChangeLog 5645 SHA256 3fabbea737cf3856591056ed2ac2c40877e10702ba1ef10ed7d252adba75144c SHA512 9471c6591bb481d751e1ab9822d9e5b3cd679cb284a98c2d3c1a8502ef5e629d2fa71a6d25f4321d95a0b6342d270c67be276f4c3e3383180576e1f1d4a022c7 WHIRLPOOL 43de630cb2036084eaa8d2bbff1257c25d0d6bd2cb9d4416e109d4bfc13a4bca8026fc3582a7e87e4427af71ad3c2378e63ce84cb49ccb380a55d4de62805290
+EBUILD lsdvd-0.16-r3.ebuild 914 SHA256 a8536c071e4cec174b5a8071dfa745c88ecd183d4b89eba3b50427883ec20b51 SHA512 fe414324ddd2bc833645b8eb87c56d0f38c3de76bf7a4e67baecb17fc77173a7e4f1d0f45b65304bd5d0f2f8aeb363a1841e02b237bb441b095ac32fd66d7268 WHIRLPOOL af5fec104a9685e21a7142c0693d828df84559bf621cdd9cf5634e564e77229adbd9f8da28147d4f6fd97edb0f1a84949e24e1a31aa1f44af4ee51fc491844cc
+MISC ChangeLog 5896 SHA256 78fee3a3ce6b69c4d77bc7a9249b40b2d87393c23249db47a305390a56b66a92 SHA512 5a23f37117b1a53505c86e4730ffcf335249a21f1ca04718cecac9aa90c76eefe1d58fc2eb22bdd7ef4936adee93b1573516345c74ad2d8240774f3d9cb4b269 WHIRLPOOL d7163eef0b0b073546ea9f9adca5fd57002f1b97463fe9430a9b91419c61ffbee92f001b25d4dd9bb5041a2d842d362fbfa94d9dd9c0f5b8dc0494aad86948e0
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
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
+}