added gcc3.4 patch for 0.6.4.2 and new ebuild for 0.6.5 see ChangeLog for details

Package-Manager: portage-2.1_pre3-r1

6 files changed, 67 insertions, 7 deletions

diff --git a/media-video/subtitler-yuv/ChangeLog b/media-video/subtitler-yuv/ChangeLog
index 9cb8e44055ea..db352965fcc5 100644
--- a/media-video/subtitler-yuv/ChangeLog
+++ b/media-video/subtitler-yuv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/subtitler-yuv
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.3 2004/06/25 00:50:31 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.4 2006/05/05 08:26:52 lordvan Exp $
+
+*subtitler-yuv-0.6.5 (05 May 2006)
+
+  05 May 2006; Thomas Raschbacher <lordvan@gentoo.org> +files/gcc-3.4.patch,
+  subtitler-yuv-0.6.4.2.ebuild, +subtitler-yuv-0.6.5.ebuild:
+  added gcc 3.4 patch for version 0.6.4.2 (fixes Bug #128831)
+  added 0.6.5 version (doesn't need any patches to compile)
 
   10 Jun 2004; David Holm <dholm@gentoo.org> subtitler-yuv-0.6.4.2.ebuild:
   Added to ~ppc.
diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
index 114035a46c86..e58f30958ee4 100644
--- a/media-video/subtitler-yuv/Manifest
+++ b/media-video/subtitler-yuv/Manifest
@@ -1,5 +1,8 @@
-MD5 05c61fbff9a101fbc4b5480c85531221 subtitler-yuv-0.6.4.2.ebuild 906
-MD5 a82d8cf3d9e19683044f6e3e235f321f ChangeLog 573
-MD5 3ba625acf04e8d0d32263c38d31a715f metadata.xml 221
+MD5 a23c0fca70ca7f1916fa44a3f2bcbbe0 ChangeLog 869
 MD5 d983c11affc106eda8b1fc4c427fa9a7 files/digest-subtitler-yuv-0.6.4.2 70
+MD5 2f2d6f7480e5b7d14014e10ad45770ce files/digest-subtitler-yuv-0.6.5 68
+MD5 9ea51ef86d16e0c4a2e3a4673c9f522e files/gcc-3.4.patch 343
 MD5 5611c5bf3200b1e8f89714c267a73005 files/subtitler-yuv-0.6.4.2.patch 780
+MD5 3ba625acf04e8d0d32263c38d31a715f metadata.xml 221
+MD5 0e0bb561defb091289bb731d07540a0f subtitler-yuv-0.6.4.2.ebuild 965
+MD5 17f53f9d8c4517bdadd858f0aeb46c54 subtitler-yuv-0.6.5.ebuild 1105
diff --git a/media-video/subtitler-yuv/files/digest-subtitler-yuv-0.6.5 b/media-video/subtitler-yuv/files/digest-subtitler-yuv-0.6.5
new file mode 100644
index 000000000000..c7ea482003af
--- /dev/null
+++ b/media-video/subtitler-yuv/files/digest-subtitler-yuv-0.6.5
@@ -0,0 +1 @@
+MD5 50193af78d6c87f9bd26473817eb9735 subtitler-yuv-0.6.5.tgz 568408
diff --git a/media-video/subtitler-yuv/files/gcc-3.4.patch b/media-video/subtitler-yuv/files/gcc-3.4.patch
new file mode 100644
index 000000000000..35b411f62ca4
--- /dev/null
+++ b/media-video/subtitler-yuv/files/gcc-3.4.patch
@@ -0,0 +1,13 @@
+--- frame_list.c.orig	2006-05-04 21:28:11.000000000 +0100
++++ frame_list.c	2006-05-04 21:28:48.000000000 +0100
+@@ -33,8 +33,8 @@
+ 
+ char *strsave(char *s) /*save char array s somewhere*/
+ {
+-char *p, *malloc();
+-if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
++char *p;
++if(p = (char *) malloc( strlen(s) +  1) ) strcpy(p, s);
+ return(p);
+ }
+ 
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
index 51456ece34aa..3444c91648c8 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild,v 1.4 2004/06/25 00:50:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild,v 1.5 2006/05/05 08:26:52 lordvan Exp $
 
 inherit eutils
 
@@ -17,6 +17,8 @@ src_unpack() {
 	unpack ${A}
 	# fix missing '\' 
 	cd ${S}; epatch ${FILESDIR}/${P}.patch
+	# gcc 3.4 patch
+	cd ${S}; epatch ${FILESDIR}/gcc-3.4.patch
 }
 
 src_compile() {
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
new file mode 100644
index 000000000000..693bc243fb9b
--- /dev/null
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild,v 1.1 2006/05/05 08:26:52 lordvan Exp $
+
+inherit eutils
+
+DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
+HOMEPAGE="http://home.zonnet.nl/panteltje/subtitles/"
+#SRC_URI="http://home.zonnet.nl/panteltje/subtitles/${P}.tgz"
+# using ibibio mirror as the webpage itself seems to be offline at the moment
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/video/subtitler-yuv-0.6.5.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	# fix missing '\' 
+	#cd ${S}; epatch ${FILESDIR}/${P}.patch
+	#cd ${S}; epatch ${FILESDIR}/gcc-3.4.patch
+}
+
+src_compile() {
+	emake CFLAGS="$CFLAGS" || die "emake failed"
+}
+
+src_install() {
+	dobin subtitler-yuv
+	dodoc CHANGES HOWTO_USE_THIS LICENSE README README.COLOR.PROCESSOR README.PPML
+	insinto /usr/share/${PN}
+	doins demo-yuv.ppml rose.ppm sun.ppm mp-arial-iso-8859-1.zip
+}