Add comments patch, bug 190896

Package-Manager: portage-2.1.3.18

5 files changed, 85 insertions, 5 deletions

diff --git a/media-sound/ogmtools/ChangeLog b/media-sound/ogmtools/ChangeLog
index 71015e2a6805..0b82a2bfd7f7 100644
--- a/media-sound/ogmtools/ChangeLog
+++ b/media-sound/ogmtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ogmtools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.28 2007/02/22 01:19:46 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.29 2007/11/09 15:10:59 beandog Exp $
+
+*ogmtools-1.5-r1 (09 Nov 2007)
+
+  09 Nov 2007; Steve Dibb <beandog@gentoo.org>
+  +files/ogmtools-1.5-comments.patch, +ogmtools-1.5-r1.ebuild:
+  Add comments patch, bug 190896
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index 546477fe8f1f..3837ada33b7b 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,16 +1,24 @@
+AUX ogmtools-1.5-comments.patch 1028 RMD160 03a141539ec280bb4322458b7bcad202775d1fc6 SHA1 1cd30c716c8c9b8b01ef2337e6dcf4d76db61565 SHA256 f6eb56592d5456dcfc60c01115f2fd59b54addfdf48348c1230f6c89ce9880b9
+MD5 e1ea3a11b072fe945ec2a1a91fac5757 files/ogmtools-1.5-comments.patch 1028
+RMD160 03a141539ec280bb4322458b7bcad202775d1fc6 files/ogmtools-1.5-comments.patch 1028
+SHA256 f6eb56592d5456dcfc60c01115f2fd59b54addfdf48348c1230f6c89ce9880b9 files/ogmtools-1.5-comments.patch 1028
 AUX ogmtools-1.5-endian-fix.patch 406 RMD160 f3731c5d77d02c084db23fe9b0415c88d7b1b9a5 SHA1 708e235ca129f33a96ccff9c74343fee4d242f96 SHA256 a2c7f6d5a8a532e55c8655f3f26dab3f4aab3310fb4a8ed4c6fc2eaa126b0052
 MD5 8926ba6de9fcdedf970cd572020fb4de files/ogmtools-1.5-endian-fix.patch 406
 RMD160 f3731c5d77d02c084db23fe9b0415c88d7b1b9a5 files/ogmtools-1.5-endian-fix.patch 406
 SHA256 a2c7f6d5a8a532e55c8655f3f26dab3f4aab3310fb4a8ed4c6fc2eaa126b0052 files/ogmtools-1.5-endian-fix.patch 406
 DIST ogmtools-1.5.tar.bz2 214934 RMD160 58b917795fcc08904d6dfdcfb6be82d1cd8cb4ca SHA1 a23ba7e6ac490ffb60e8fb739e790b7a020a444c SHA256 c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea
+EBUILD ogmtools-1.5-r1.ebuild 1091 RMD160 557e03baf3cf04cfbdb30e6d53483f3a726b4c71 SHA1 29c680a69930b73eb14b814a0bcdca702e9eaeed SHA256 78fa7432487dd6d3ecf7af4339e902f03bef5ac152d7efcd310d056485579975
+MD5 09d029b695eb610dfe315d3a170d2d97 ogmtools-1.5-r1.ebuild 1091
+RMD160 557e03baf3cf04cfbdb30e6d53483f3a726b4c71 ogmtools-1.5-r1.ebuild 1091
+SHA256 78fa7432487dd6d3ecf7af4339e902f03bef5ac152d7efcd310d056485579975 ogmtools-1.5-r1.ebuild 1091
 EBUILD ogmtools-1.5.ebuild 1039 RMD160 f6f59fdea76818a1a8007f2821115c79d34889f5 SHA1 47485de94024a4aec56de1ba1e5adf6fd4719443 SHA256 96cac208728c74ceeb341ab23e5fe437cef8d35a45f5d8dca698ff2e9cb49130
 MD5 46cf4406df9344e471cd4dfe6545365b ogmtools-1.5.ebuild 1039
 RMD160 f6f59fdea76818a1a8007f2821115c79d34889f5 ogmtools-1.5.ebuild 1039
 SHA256 96cac208728c74ceeb341ab23e5fe437cef8d35a45f5d8dca698ff2e9cb49130 ogmtools-1.5.ebuild 1039
-MISC ChangeLog 3654 RMD160 9fb58434ef9c8473ae53b5a8a43fc024d9b47466 SHA1 9e7ab5d49cf9bebbdc99d2f38e82f5aa15d9a2f4 SHA256 9af41b1eb2556a368be998b0aed63eaa225daa2ef39c122e2b44b7e50acda1f2
-MD5 66acd827b1f319cee30af90e983fe6d6 ChangeLog 3654
-RMD160 9fb58434ef9c8473ae53b5a8a43fc024d9b47466 ChangeLog 3654
-SHA256 9af41b1eb2556a368be998b0aed63eaa225daa2ef39c122e2b44b7e50acda1f2 ChangeLog 3654
+MISC ChangeLog 3832 RMD160 42ab3e3c3bfdbbb512d4f8e2d63d83e7c927912f SHA1 8b5ed08a313799efb0c388892fffb644534f270e SHA256 20e17b931af64fe94386f5c6fe3fd8cb0d3c27b38a5ca4cfe1fd2fbaf5ddd40d
+MD5 1aad75b474e58306c26be201d11ff78c ChangeLog 3832
+RMD160 42ab3e3c3bfdbbb512d4f8e2d63d83e7c927912f ChangeLog 3832
+SHA256 20e17b931af64fe94386f5c6fe3fd8cb0d3c27b38a5ca4cfe1fd2fbaf5ddd40d ChangeLog 3832
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221
@@ -18,3 +26,6 @@ SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e metadata
 MD5 a41b888a55a5dfd7398d2d4b8f013dc8 files/digest-ogmtools-1.5 241
 RMD160 c38cf38d6670efadccd1ca30bd16047bc3b8d1af files/digest-ogmtools-1.5 241
 SHA256 6b556b9334cb5129341e83656ad500a48ae2316d5f74589228f047d074265244 files/digest-ogmtools-1.5 241
+MD5 a41b888a55a5dfd7398d2d4b8f013dc8 files/digest-ogmtools-1.5-r1 241
+RMD160 c38cf38d6670efadccd1ca30bd16047bc3b8d1af files/digest-ogmtools-1.5-r1 241
+SHA256 6b556b9334cb5129341e83656ad500a48ae2316d5f74589228f047d074265244 files/digest-ogmtools-1.5-r1 241
diff --git a/media-sound/ogmtools/files/digest-ogmtools-1.5-r1 b/media-sound/ogmtools/files/digest-ogmtools-1.5-r1
new file mode 100644
index 000000000000..3ea94f8841f4
--- /dev/null
+++ b/media-sound/ogmtools/files/digest-ogmtools-1.5-r1
@@ -0,0 +1,3 @@
+MD5 02d356e3d21d53b1d9715bab223d8996 ogmtools-1.5.tar.bz2 214934
+RMD160 58b917795fcc08904d6dfdcfb6be82d1cd8cb4ca ogmtools-1.5.tar.bz2 214934
+SHA256 c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea ogmtools-1.5.tar.bz2 214934
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
new file mode 100644
index 000000000000..0440a8040b8c
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -0,0 +1,21 @@
+--- vorbis_header_utils.c.orig	Fri Aug 31 14:47:55 2007
++++ vorbis_header_utils.c	Fri Aug 31 14:51:23 2007
+@@ -153,15 +153,15 @@
+     die("malloc");
+   
+   memcpy(new_vc, vc, sizeof(vorbis_comment));
+-  new_vc->user_comments = (char **)malloc((vc->comments + 1) * sizeof(char *));
+-  new_vc->comment_lengths = (int *)malloc((vc->comments + 1) * sizeof(int));
++  new_vc->user_comments = (char **)malloc((vc->comments + 1) * sizeof(*new_vc->user_comments));
++  new_vc->comment_lengths = (int *)malloc((vc->comments + 1) * sizeof(*new_vc->comment_lengths));
+   if ((new_vc->user_comments == NULL) || (new_vc->comment_lengths == NULL))
+     die("malloc");
+   for (i = 0; i < vc->comments; i++)
+     new_vc->user_comments[i] = strdup(vc->user_comments[i]);
+   new_vc->user_comments[vc->comments] = 0;
+   memcpy(new_vc->comment_lengths, vc->comment_lengths,
+-         (vc->comments + 1) * sizeof(char *));
++         (vc->comments + 1) * sizeof(*new_vc->comment_lengths));
+   new_vc->vendor = strdup(vc->vendor);
+   
+   return new_vc;
diff --git a/media-sound/ogmtools/ogmtools-1.5-r1.ebuild b/media-sound/ogmtools/ogmtools-1.5-r1.ebuild
new file mode 100644
index 000000000000..5de7d4c46883
--- /dev/null
+++ b/media-sound/ogmtools/ogmtools-1.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.5-r1.ebuild,v 1.1 2007/11/09 15:10:59 beandog Exp $
+
+IUSE="dvd"
+
+inherit eutils
+
+DESCRIPTION="These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams"
+HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
+SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dvd? ( media-libs/libdvdread )
+	media-sound/vorbis-tools"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-comments.patch
+	epatch "${FILESDIR}"/${P}-endian-fix.patch
+}
+
+src_compile() {
+	econf `use_with dvd dvdread` || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die
+	use dvd && dobin dvdxchap
+	dodoc TODO README ChangeLog
+	doman dvdxchap.1 ogmcat.1 ogmdemux.1 ogminfo.1 ogmmerge.1 ogmsplit.1
+}