media-video/freej-0.7: fix gcc41 compatibilty; add missing dep; bug #135497

svn path=/; revision=18

9 files changed, 261 insertions, 0 deletions

diff --git a/media-video/freej/ChangeLog b/media-video/freej/ChangeLog
new file mode 100644
index 000000000..6d9001775
--- /dev/null
+++ b/media-video/freej/ChangeLog
@@ -0,0 +1,35 @@
+# ChangeLog for media-video/freej
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/ChangeLog,v 1.6 2006/05/03 20:52:02 flameeyes Exp $
+
+  08 Jun 2006; Piotr Jaroszynski <peper@aster.pl> +files/freej-0.7-gcc41.patch, freej-0.7.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #135497
+  Add missing dep(sys-libs/slang)
+
+  03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Update metadata to list media-video@gentoo.org as maintainer.
+
+*freej-0.8.1 (13 Nov 2005)
+
+  13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> freej-0.7.ebuild,
+  +freej-0.8.1.ebuild:
+  New version -* pending major patching, avifile removal
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> freej-0.7.ebuild:
+  Added to ~ppc.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Fixed herd in metadata.xml.
+
+*freej-0.7 (20 Nov 2004)
+
+  20 Nov 2004; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  +files/freej-0.7-errno.patch, +files/freej-0.7-fastmemcpy.patch,
+  +files/freej-0.7-v4l.patch, +freej-0.7.ebuild:
+  Initial import into the tree.  Closes bug #29455.  Thanks to Kasper 
+  Souren and Kai Zimmermann for the ebuild submission.  Thanks to lu_zero 
+  and Tester for helping me unbreak a few things!
+
diff --git a/media-video/freej/Manifest b/media-video/freej/Manifest
new file mode 100644
index 000000000..e709dda7d
--- /dev/null
+++ b/media-video/freej/Manifest
@@ -0,0 +1,32 @@
+AUX freej-0.7-errno.patch 741 RMD160 ac40eb4ceccec3463cbb81ab824fdf30cfd226cc SHA1 3f9ae300ab07370f92b0d9a2fee84e5a7e05f8cd SHA256 f517641ba15387652c83cceff81366ef8237e00e4bbb19da9be785e9001bf614
+MD5 0060b7f722bb0974847d296ef8403ebd files/freej-0.7-errno.patch 741
+RMD160 ac40eb4ceccec3463cbb81ab824fdf30cfd226cc files/freej-0.7-errno.patch 741
+SHA256 f517641ba15387652c83cceff81366ef8237e00e4bbb19da9be785e9001bf614 files/freej-0.7-errno.patch 741
+AUX freej-0.7-fastmemcpy.patch 2554 RMD160 18d47559fafa07a9b6add094499af61dfbc2411c SHA1 9735177e9c10958612444a1c9f8449582db58c87 SHA256 0da38a99ff90ed6e51dea0e2b23b726a72b5fb6cb8b677d864f8d10f2b98e723
+MD5 e6a0544f5627d624dcc6d314be575360 files/freej-0.7-fastmemcpy.patch 2554
+RMD160 18d47559fafa07a9b6add094499af61dfbc2411c files/freej-0.7-fastmemcpy.patch 2554
+SHA256 0da38a99ff90ed6e51dea0e2b23b726a72b5fb6cb8b677d864f8d10f2b98e723 files/freej-0.7-fastmemcpy.patch 2554
+AUX freej-0.7-gcc41.patch 1060 RMD160 08c1b0f3d5bab88cc24d3512a1e93a96b6e03223 SHA1 5a7de067533f8d61487d90038ceaa442b47f73dd SHA256 61fd8ead6999b105b2e02b6c722f9ac7f7303d192843004fc04735e2a9b3e0af
+MD5 6533d6bf329038791169224fed4ca37c files/freej-0.7-gcc41.patch 1060
+RMD160 08c1b0f3d5bab88cc24d3512a1e93a96b6e03223 files/freej-0.7-gcc41.patch 1060
+SHA256 61fd8ead6999b105b2e02b6c722f9ac7f7303d192843004fc04735e2a9b3e0af files/freej-0.7-gcc41.patch 1060
+AUX freej-0.7-v4l.patch 256 RMD160 e2d8a578b71ad2d3b1f1e51d7b3e3ab341e17f29 SHA1 e19d6150185151be76517522682a8a99d9c382bb SHA256 78ff3cf053e07b1a5ed8b16adc333ea4201fbb69e824a1be5c5c0abfb6972452
+MD5 fbc899d7160ab39e47de15461a90b452 files/freej-0.7-v4l.patch 256
+RMD160 e2d8a578b71ad2d3b1f1e51d7b3e3ab341e17f29 files/freej-0.7-v4l.patch 256
+SHA256 78ff3cf053e07b1a5ed8b16adc333ea4201fbb69e824a1be5c5c0abfb6972452 files/freej-0.7-v4l.patch 256
+DIST freej-0.7.tar.gz 716439 RMD160 006eaf6873f04b3518144b04987f9f3744fb4200 SHA1 094bc69d22ecdd6032e5857a62822a312fe9b50a SHA256 66838815397030f5586fa579acfd0acbd6c8086686935ed82ac93d2b6801776d
+EBUILD freej-0.7.ebuild 1453 RMD160 a65c5a652dfd4c83f8c0500659882e55de1c5c9b SHA1 7cff9fde27dc1a45667201354c018f0f6de21ada SHA256 842dfff79d21c6719cdfe1639a74921026c1d7067e328c05d048cf559f7d9eb1
+MD5 cc467dc0638c34ca7eb3c1062d34d618 freej-0.7.ebuild 1453
+RMD160 a65c5a652dfd4c83f8c0500659882e55de1c5c9b freej-0.7.ebuild 1453
+SHA256 842dfff79d21c6719cdfe1639a74921026c1d7067e328c05d048cf559f7d9eb1 freej-0.7.ebuild 1453
+MISC ChangeLog 1404 RMD160 0244f8397aff0fcdec2507dbaf4ab760d038341d SHA1 b9e896d11f3998c34a80a8c1016bc55b2b570844 SHA256 82ba002da288ea3a8f6d5888eb9ec25b6d3b3532ebc9b2724ecd755e67e6f4d1
+MD5 874d5b276a9eadc8e6d19f39036ab065 ChangeLog 1404
+RMD160 0244f8397aff0fcdec2507dbaf4ab760d038341d ChangeLog 1404
+SHA256 82ba002da288ea3a8f6d5888eb9ec25b6d3b3532ebc9b2724ecd755e67e6f4d1 ChangeLog 1404
+MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
+RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
+SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
+MD5 4261eb09131d7c51cbab6f99ece9acda files/digest-freej-0.7 229
+RMD160 3b26a9b2fcdbf70051a8b3126c7387fa4ddc67ca files/digest-freej-0.7 229
+SHA256 c39649f2ddf9ef7762d8eaa04756e22775745b29b2e859373c0c7b4e6d41129a files/digest-freej-0.7 229
diff --git a/media-video/freej/files/digest-freej-0.7 b/media-video/freej/files/digest-freej-0.7
new file mode 100644
index 000000000..be1320da8
--- /dev/null
+++ b/media-video/freej/files/digest-freej-0.7
@@ -0,0 +1,3 @@
+MD5 193f3295f72cb8aff5d939e69b69acce freej-0.7.tar.gz 716439
+RMD160 006eaf6873f04b3518144b04987f9f3744fb4200 freej-0.7.tar.gz 716439
+SHA256 66838815397030f5586fa579acfd0acbd6c8086686935ed82ac93d2b6801776d freej-0.7.tar.gz 716439
diff --git a/media-video/freej/files/freej-0.7-errno.patch b/media-video/freej/files/freej-0.7-errno.patch
new file mode 100644
index 000000000..3db9a1371
--- /dev/null
+++ b/media-video/freej/files/freej-0.7-errno.patch
@@ -0,0 +1,30 @@
+--- src/freej.cpp.old	2004-11-20 00:27:32.301971896 +0900
++++ src/freej.cpp	2004-11-20 00:27:44.193164160 +0900
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <cerrno>
+ 
+ #include <context.h>
+ 
+--- src/console.cpp.old	2004-11-20 00:31:48.678996664 +0900
++++ src/console.cpp	2004-11-20 00:32:06.817239232 +0900
+@@ -23,6 +23,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#include <cerrno>
+ 
+ #include <signal.h>
+ #include <slang.h>
+--- src/scroll_layer.cpp.old	2004-11-20 00:40:18.799446568 +0900
++++ src/scroll_layer.cpp	2004-11-20 00:41:16.402689544 +0900
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <cerrno>
+ 
+ #include <scroll_layer.h>
+ #include <context.h>
diff --git a/media-video/freej/files/freej-0.7-fastmemcpy.patch b/media-video/freej/files/freej-0.7-fastmemcpy.patch
new file mode 100644
index 000000000..972e4910a
--- /dev/null
+++ b/media-video/freej/files/freej-0.7-fastmemcpy.patch
@@ -0,0 +1,57 @@
+--- src/fastmemcpy.cpp.old	2004-05-12 02:10:17.000000000 +0900
++++ src/fastmemcpy.cpp	2004-11-20 01:08:53.775730544 +0900
+@@ -229,8 +229,8 @@
+ 		MOVNTQ" %%mm6, 48(%1)\n"
+ 		MOVNTQ" %%mm7, 56(%1)\n"
+ 		:: "r" (from), "r" (to) : "memory");
+-		((const unsigned char *)from)+=64;
+-		((unsigned char *)to)+=64;
++		from = (unsigned char *)from + 64;
++		to = (unsigned char *)to + 64;
+ 	}
+ #ifdef HAVE_MMX2
+                 /* since movntq is weakly-ordered, a "sfence"
+@@ -316,8 +316,8 @@
+                                     "movq %%mm6, 48(%1)\n"
+                                     "movq %%mm7, 56(%1)\n"
+                                     :: "r" (from), "r" (to) : "memory");
+-               ((const unsigned char *)from)+=64;
+-               ((unsigned char *)to)+=64;
++               from = (unsigned char *)from + 64;
++               to = (unsigned char *)to + 64;
+           }
+           __asm__ __volatile__ ("emms":::"memory");
+      }
+@@ -403,8 +403,8 @@
+                                     "movntq %%mm6, 48(%1)\n"
+                                     "movntq %%mm7, 56(%1)\n"
+                                     :: "r" (from), "r" (to) : "memory");
+-               ((const unsigned char *)from)+=64;
+-               ((unsigned char *)to)+=64;
++               from = (unsigned char *)from + 64;
++               to = (unsigned char *) to + 64;
+           }
+           /* since movntq is weakly-ordered, a "sfence"
+           * is needed to become ordered again. */
+@@ -461,8 +461,8 @@
+                                          "movntps %%xmm2, 32(%1)\n"
+                                          "movntps %%xmm3, 48(%1)\n"
+                                          :: "r" (from), "r" (to) : "memory");
+-                    ((const unsigned char *)from)+=64;
+-                    ((unsigned char *)to)+=64;
++                    from = (unsigned char *)from + 64;
++                    to = (unsigned char *) to + 64;
+                }
+           else
+                /*
+@@ -483,8 +483,8 @@
+                                          "movntps %%xmm2, 32(%1)\n"
+                                          "movntps %%xmm3, 48(%1)\n"
+                                          :: "r" (from), "r" (to) : "memory");
+-                    ((const unsigned char *)from)+=64;
+-                    ((unsigned char *)to)+=64;
++                    from = (unsigned char *)from + 64;
++                    to = (unsigned char *)to + 64;
+                }
+           /* since movntq is weakly-ordered, a "sfence"
+            * is needed to become ordered again. */
diff --git a/media-video/freej/files/freej-0.7-gcc41.patch b/media-video/freej/files/freej-0.7-gcc41.patch
new file mode 100644
index 000000000..806d6911f
--- /dev/null
+++ b/media-video/freej/files/freej-0.7-gcc41.patch
@@ -0,0 +1,24 @@
+diff -urN freej-0.7-orig/src/include/blitter.h freej-0.7/src/include/blitter.h
+--- freej-0.7-orig/src/include/blitter.h	2004-08-29 23:48:18.000000000 +0200
++++ freej-0.7/src/include/blitter.h	2006-06-04 18:52:11.000000000 +0200
+@@ -114,7 +114,7 @@
+   bool fade_value(int step, int val); ///< fade to a new blit value
+   bool pulse_value(int step, int val); ///< pulse it to a value and come back
+   bool set_kernel(short *krn); /// set the convolution kernel
+-  bool Blitter::set_colorkey(int x,int y);
++  bool set_colorkey(int x,int y);
+   Linklist blitlist; ///< list of available blits
+ 
+   /* ==== geometrical transformations */
+diff -urN freej-0.7-orig/src/include/linklist.h freej-0.7/src/include/linklist.h
+--- freej-0.7-orig/src/include/linklist.h	2004-09-23 12:40:00.000000000 +0200
++++ freej-0.7/src/include/linklist.h	2006-06-04 18:52:20.000000000 +0200
+@@ -50,7 +50,7 @@
+   Entry *search(char *name);
+   int *completion(char *needle);
+ 
+-  Entry *Linklist::selected();
++  Entry *selected();
+ 
+   Entry *operator[](int pos) { return pick(pos); };
+ 
diff --git a/media-video/freej/files/freej-0.7-v4l.patch b/media-video/freej/files/freej-0.7-v4l.patch
new file mode 100644
index 000000000..a33fc97b1
--- /dev/null
+++ b/media-video/freej/files/freej-0.7-v4l.patch
@@ -0,0 +1,10 @@
+--- src/include/v4l_layer.h.old	2004-11-20 09:57:14.136543184 +0900
++++ src/include/v4l_layer.h	2004-11-20 09:57:27.002587248 +0900
+@@ -24,6 +24,7 @@
+ 
+ 
+ #include <linux/types.h>
++#include <sys/time.h>
+ #include <linux/videodev.h>
+ #include <context.h>
+ 
diff --git a/media-video/freej/freej-0.7.ebuild b/media-video/freej/freej-0.7.ebuild
new file mode 100644
index 000000000..1b0067189
--- /dev/null
+++ b/media-video/freej/freej-0.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/freej-0.7.ebuild,v 1.3 2005/11/13 18:08:38 lu_zero Exp $
+
+inherit eutils
+
+DESCRIPTION="A unified framework for realtime video processing"
+HOMEPAGE="http://freej.dyne.org/"
+SRC_URI="ftp://freej.dyne.org/freej/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="v4l debug"
+
+DEPEND=">=media-libs/libsdl-1.2.0
+	>=media-libs/libpng-1.2.0
+	>=media-libs/freetype-2
+	media-video/ffmpeg
+	sys-libs/slang"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fixes missing errno defines
+	epatch ${FILESDIR}/${P}-errno.patch
+
+	# fixes bad hacking with type casting
+	epatch ${FILESDIR}/${P}-fastmemcpy.patch
+
+	# fixes some v4l defines
+	epatch ${FILESDIR}/${P}-v4l.patch
+
+	# fixes gcc 4.1 compatibility
+	epatch ${FILESDIR}/${P}-gcc41.patch
+}
+
+src_compile() {
+
+	# patch the doc path
+	sed -i -e "s:doc/\${PACKAGE}-\${VERSION}:share/doc/${PF}:" Makefile.in || die "doc path patching failed!"
+
+	econf \
+	$(use_enable avi) \
+	$(use_enable v4l) \
+	$(use_enable debug) \
+	|| die "econf failed!"
+
+	# give us custom CFLAGS
+	sed -i \
+	-e "s:^CFLAGS = .*:CFLAGS = -D_REENTRANT ${CFLAGS}:" \
+	-e "s:^CXXFLAGS = .*:CXXFLAGS = -D_REENTRANT ${CXXFLAGS}:" ${S}/src/Makefile \
+	|| die "Could not patch custom CFLAGS!"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc FreeJ_Tutorial.pdf
+}
diff --git a/media-video/freej/metadata.xml b/media-video/freej/metadata.xml
new file mode 100644
index 000000000..edccfe575
--- /dev/null
+++ b/media-video/freej/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>video</herd>
+<maintainer>
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>