GCC 4.1 patch - bug #135497

Package-Manager: portage-2.1.2_rc3

5 files changed, 63 insertions, 35 deletions

diff --git a/media-video/freej/ChangeLog b/media-video/freej/ChangeLog
index 2dffbe77f58c..2d7e859aa114 100644
--- a/media-video/freej/ChangeLog
+++ b/media-video/freej/ChangeLog
@@ -1,6 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/ChangeLog,v 1.7 2006/12/09 23:09:08 dirtyepic Exp $
+
+  09 Dec 2006; Ryan Hill <dirtyepic@gentoo.org>
+  +files/freej-0.7-gcc41.patch, freej-0.7.ebuild:
+  GCC 4.1 patch - bug #135497
 
   03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata to list media-video@gentoo.org as maintainer.
diff --git a/media-video/freej/Manifest b/media-video/freej/Manifest
index 6dbfb1669b17..134eff58577d 100644
--- a/media-video/freej/Manifest
+++ b/media-video/freej/Manifest
@@ -1,46 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX freej-0.7-errno.patch 741 RMD160 ac40eb4ceccec3463cbb81ab824fdf30cfd226cc SHA1 3f9ae300ab07370f92b0d9a2fee84e5a7e05f8cd SHA256 f517641ba15387652c83cceff81366ef8237e00e4bbb19da9be785e9001bf614 size 741
+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 size 2554
+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-v4l.patch 256 RMD160 e2d8a578b71ad2d3b1f1e51d7b3e3ab341e17f29 SHA1 e19d6150185151be76517522682a8a99d9c382bb SHA256 78ff3cf053e07b1a5ed8b16adc333ea4201fbb69e824a1be5c5c0abfb6972452 size 256
+AUX freej-0.7-gcc41.patch 1062 RMD160 41df1c04530855cd95de7d6c4abb2384ffc47bc0 SHA1 345748669d8691f3bb648c071bbb7be91c73afc3 SHA256 5f99208f829f79b6b9891be5a1d80f3598d97030ca822c540c05fb3e4cf7719f
+MD5 c3ab28e85005f258e39b01b4d70ed4cd files/freej-0.7-gcc41.patch 1062
+RMD160 41df1c04530855cd95de7d6c4abb2384ffc47bc0 files/freej-0.7-gcc41.patch 1062
+SHA256 5f99208f829f79b6b9891be5a1d80f3598d97030ca822c540c05fb3e4cf7719f files/freej-0.7-gcc41.patch 1062
+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 size 716439
-DIST freej-0.8.1.tar.gz 3546869 size 3546869
-EBUILD freej-0.7.ebuild 1368 RMD160 95eed2ad52d46ac89516082d60e7c3c91848356b SHA1 5659e4855dbd0944472f88171d01d48815abd518 SHA256 a626f8ca62476dd9a2cc6c64b235912fb117b6944f6a3a00bbecf5d82aa48bb2 size 1368
-MD5 165089178a718ec628cfd61fdf09b8ea freej-0.7.ebuild 1368
-RMD160 95eed2ad52d46ac89516082d60e7c3c91848356b freej-0.7.ebuild 1368
-SHA256 a626f8ca62476dd9a2cc6c64b235912fb117b6944f6a3a00bbecf5d82aa48bb2 freej-0.7.ebuild 1368
-EBUILD freej-0.8.1.ebuild 1276 RMD160 e8a7d50be4154920d9484f5d8c69f79c3a3e92f2 SHA1 79d6418e5b21bc5ca34dd0a97ab4560f6839ccb1 SHA256 d819ed8012a98f7fce638874031eee72ca79559fc44dc4949f74c241a3a19fd7 size 1276
+DIST freej-0.7.tar.gz 716439 RMD160 006eaf6873f04b3518144b04987f9f3744fb4200 SHA1 094bc69d22ecdd6032e5857a62822a312fe9b50a SHA256 66838815397030f5586fa579acfd0acbd6c8086686935ed82ac93d2b6801776d
+DIST freej-0.8.1.tar.gz 3546869
+EBUILD freej-0.7.ebuild 1457 RMD160 a4c7b52309e2f5e4623ac320739af95905cf2353 SHA1 b63da93f2b889bf5f9ef3b554c199803bac4f35b SHA256 eac5f4504b1850d4b37370827247ee02e533a70044dea85b066060f37a249f4d
+MD5 1915b6f718b5042758f5861efebbe412 freej-0.7.ebuild 1457
+RMD160 a4c7b52309e2f5e4623ac320739af95905cf2353 freej-0.7.ebuild 1457
+SHA256 eac5f4504b1850d4b37370827247ee02e533a70044dea85b066060f37a249f4d freej-0.7.ebuild 1457
+EBUILD freej-0.8.1.ebuild 1276 RMD160 e8a7d50be4154920d9484f5d8c69f79c3a3e92f2 SHA1 79d6418e5b21bc5ca34dd0a97ab4560f6839ccb1 SHA256 d819ed8012a98f7fce638874031eee72ca79559fc44dc4949f74c241a3a19fd7
 MD5 91014b04b1375ca247c0c9027c5597c5 freej-0.8.1.ebuild 1276
 RMD160 e8a7d50be4154920d9484f5d8c69f79c3a3e92f2 freej-0.8.1.ebuild 1276
 SHA256 d819ed8012a98f7fce638874031eee72ca79559fc44dc4949f74c241a3a19fd7 freej-0.8.1.ebuild 1276
-MISC ChangeLog 1213 RMD160 06e8a5368e7943fd8598e23ab921dcb6f337572c SHA1 70ac00ce241ab654f84fbf4f8636aefd6daad869 SHA256 7e91b121046eb4492d17be7404a64c5503399ac602475e6bc5aa10f76d0342fa size 1213
-MD5 5043a6b380db6ae8f665ab169c97dd98 ChangeLog 1213
-RMD160 06e8a5368e7943fd8598e23ab921dcb6f337572c ChangeLog 1213
-SHA256 7e91b121046eb4492d17be7404a64c5503399ac602475e6bc5aa10f76d0342fa ChangeLog 1213
-MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 size 223
+MISC ChangeLog 1342 RMD160 49c14a71d06a2571a8759757db3c555ece3e22da SHA1 07512aa4ea0c2810f060d701de62025b7de4dfa0 SHA256 10371f64f8ef5cadcb50c3843a76b72d8cf72311cf0d503f1dad6666b4b9acca
+MD5 ea91e1a419b655a66de3ba59856d9820 ChangeLog 1342
+RMD160 49c14a71d06a2571a8759757db3c555ece3e22da ChangeLog 1342
+SHA256 10371f64f8ef5cadcb50c3843a76b72d8cf72311cf0d503f1dad6666b4b9acca ChangeLog 1342
+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 e5641ba29fa7159b9329480d820c1a9a files/digest-freej-0.7 61
-RMD160 f0517edf1060ee84b53ea42fec7bf41b82c30061 files/digest-freej-0.7 61
-SHA256 e72a65353739816e6a4a97e4f5222ae3cd9457d7cb7fbdc521e8af7ad4fccc5f files/digest-freej-0.7 61
+MD5 4261eb09131d7c51cbab6f99ece9acda files/digest-freej-0.7 229
+RMD160 3b26a9b2fcdbf70051a8b3126c7387fa4ddc67ca files/digest-freej-0.7 229
+SHA256 c39649f2ddf9ef7762d8eaa04756e22775745b29b2e859373c0c7b4e6d41129a files/digest-freej-0.7 229
 MD5 1964ff7c2ef5f5e26820c67fe0ba0356 files/digest-freej-0.8.1 64
 RMD160 b9871fccbc4f13130f4df9d699714b81ab77568a files/digest-freej-0.8.1 64
 SHA256 17b85b87941928ac52938aebcd27ad46408508bf676cf3497d94b1b2cff358d3 files/digest-freej-0.8.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEWRf5AiZjviIA2XgRAt/DAJwJu/mdcxeaHJKNjLNeMbzH5o5wdACgzw3P
-4Yiok32zKHx2vP28uWisK3g=
-=pkaK
------END PGP SIGNATURE-----
diff --git a/media-video/freej/files/digest-freej-0.7 b/media-video/freej/files/digest-freej-0.7
index 095ec0bc0a52..be1320da8445 100644
--- a/media-video/freej/files/digest-freej-0.7
+++ b/media-video/freej/files/digest-freej-0.7
@@ -1 +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-gcc41.patch b/media-video/freej/files/freej-0.7-gcc41.patch
new file mode 100644
index 000000000000..65716dff1fe1
--- /dev/null
+++ b/media-video/freej/files/freej-0.7-gcc41.patch
@@ -0,0 +1,24 @@
+diff -Naur freej-0.7-orig/src/include/blitter.h freej-0.7/src/include/blitter.h
+--- freej-0.7-orig/src/include/blitter.h	2006-06-04 11:08:54.000000000 -0600
++++ freej-0.7/src/include/blitter.h	2006-06-04 11:11:42.000000000 -0600
+@@ -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 -Naur freej-0.7-orig/src/include/linklist.h freej-0.7/src/include/linklist.h
+--- freej-0.7-orig/src/include/linklist.h	2006-06-04 11:08:54.000000000 -0600
++++ freej-0.7/src/include/linklist.h	2006-06-04 11:11:18.000000000 -0600
+@@ -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/freej-0.7.ebuild b/media-video/freej/freej-0.7.ebuild
index 817c96f41d41..ef62a19e7ed4 100644
--- a/media-video/freej/freej-0.7.ebuild
+++ b/media-video/freej/freej-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/freej/freej-0.7.ebuild,v 1.3 2005/11/13 18:08:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/freej-0.7.ebuild,v 1.4 2006/12/09 23:09:08 dirtyepic Exp $
 
 inherit eutils
 
@@ -16,20 +16,24 @@ IUSE="v4l debug"
 DEPEND=">=media-libs/libsdl-1.2.0
 	>=media-libs/libpng-1.2.0
 	>=media-libs/freetype-2
-	media-video/ffmpeg"
+	media-video/ffmpeg
+	sys-libs/slang"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	# fixes missing errno defines
-	epatch ${FILESDIR}/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch
 
 	# fixes bad hacking with type casting
-	epatch ${FILESDIR}/${P}-fastmemcpy.patch
+	epatch "${FILESDIR}"/${P}-fastmemcpy.patch
 
 	# fixes some v4l defines
-	epatch ${FILESDIR}/${P}-v4l.patch
+	epatch "${FILESDIR}"/${P}-v4l.patch
+
+	# GCC 4.1 - bug #135497
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {