Add comments patch, bug 190896

(Portage version: 2.1.3.18)

4 files changed, 70 insertions, 1 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/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
+}