diff options
| -rw-r--r-- | media-libs/libflash/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libflash/files/libflash-0.4.10-gcc41.patch | 65 | ||||
| -rw-r--r-- | media-libs/libflash/libflash-0.4.10-r1.ebuild | 11 |
3 files changed, 53 insertions, 30 deletions
diff --git a/media-libs/libflash/ChangeLog b/media-libs/libflash/ChangeLog index 6bd38c2b42dc..9afed40bf808 100644 --- a/media-libs/libflash/ChangeLog +++ b/media-libs/libflash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libflash # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libflash/ChangeLog,v 1.14 2007/02/22 01:54:04 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libflash/ChangeLog,v 1.15 2007/03/06 00:04:35 dirtyepic Exp $ + + 06 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> + files/libflash-0.4.10-gcc41.patch, libflash-0.4.10-r1.ebuild: + External variables defined with both C and C++ linkage are regected in GCC + 4.1.2. Update GCC patch to cover this. Walter Meinl, bug #169517. 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/media-libs/libflash/files/libflash-0.4.10-gcc41.patch b/media-libs/libflash/files/libflash-0.4.10-gcc41.patch index c4b5df1725c9..363846c43ab5 100644 --- a/media-libs/libflash/files/libflash-0.4.10-gcc41.patch +++ b/media-libs/libflash/files/libflash-0.4.10-gcc41.patch @@ -1,23 +1,6 @@ ---- libflash-0.4.10/lib/matrix.h.old 2006-01-11 21:23:55.000000000 +0100 -+++ libflash-0.4.10/lib/matrix.h 2006-01-11 21:24:19.000000000 +0100 -@@ -33,13 +33,13 @@ - #endif - - inline -- long Matrix::getX(long x, long y) -+ long getX(long x, long y) - { - return (long) (x*a+y*b+tx); - }; - - inline -- long Matrix::getY(long x, long y) -+ long getY(long x, long y) - { - return (long) (x*c+y*d+ty); - }; ---- libflash-0.4.10/lib/graphic16.h.old 2006-01-11 21:24:39.000000000 +0100 -+++ libflash-0.4.10/lib/graphic16.h 2006-01-11 21:24:52.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic16.h libflash-0.4.10/lib/graphic16.h +--- libflash-0.4.10-orig/lib/graphic16.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic16.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice16: public GraphicDevice { @@ -27,8 +10,9 @@ public: GraphicDevice16(FlashDisplay *fd); ---- libflash-0.4.10/lib/graphic24.h.old 2006-01-11 21:25:06.000000000 +0100 -+++ libflash-0.4.10/lib/graphic24.h 2006-01-11 21:25:39.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic24.h libflash-0.4.10/lib/graphic24.h +--- libflash-0.4.10-orig/lib/graphic24.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic24.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice24: public GraphicDevice { @@ -38,8 +22,9 @@ public: GraphicDevice24(FlashDisplay *fd); ---- libflash-0.4.10/lib/graphic32.h.old 2006-01-11 21:26:01.000000000 +0100 -+++ libflash-0.4.10/lib/graphic32.h 2006-01-11 21:26:40.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic32.h libflash-0.4.10/lib/graphic32.h +--- libflash-0.4.10-orig/lib/graphic32.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic32.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice32: public GraphicDevice { @@ -49,3 +34,35 @@ public: GraphicDevice32(FlashDisplay *fd); +diff -Naur libflash-0.4.10-orig/lib/matrix.h libflash-0.4.10/lib/matrix.h +--- libflash-0.4.10-orig/lib/matrix.h 2001-04-22 22:18:54.000000000 -0600 ++++ libflash-0.4.10/lib/matrix.h 2007-03-05 17:53:38.000000000 -0600 +@@ -33,13 +33,13 @@ + #endif + + inline +- long Matrix::getX(long x, long y) ++ long getX(long x, long y) + { + return (long) (x*a+y*b+tx); + }; + + inline +- long Matrix::getY(long x, long y) ++ long getY(long x, long y) + { + return (long) (x*c+y*d+ty); + }; +diff -Naur libflash-0.4.10-orig/lib/swf.h libflash-0.4.10/lib/swf.h +--- libflash-0.4.10-orig/lib/swf.h 2001-04-22 22:18:54.000000000 -0600 ++++ libflash-0.4.10/lib/swf.h 2007-03-05 17:54:57.000000000 -0600 +@@ -196,7 +196,9 @@ + #define true 1 + #endif + ++extern "C" { + extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb; ++}; + + typedef void (*ScanLineFunc)(void *id, long y, long start, long end); + diff --git a/media-libs/libflash/libflash-0.4.10-r1.ebuild b/media-libs/libflash/libflash-0.4.10-r1.ebuild index cbe7d9681d9d..f587b419d12c 100644 --- a/media-libs/libflash/libflash-0.4.10-r1.ebuild +++ b/media-libs/libflash/libflash-0.4.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libflash/libflash-0.4.10-r1.ebuild,v 1.17 2006/08/15 20:15:40 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libflash/libflash-0.4.10-r1.ebuild,v 1.18 2007/03/06 00:04:35 dirtyepic Exp $ inherit eutils @@ -17,16 +17,17 @@ DEPEND="media-libs/jpeg sys-libs/zlib" src_unpack() { - unpack ${A} ; cd "${S}" + unpack ${A} + cd "${S}" # patch to fix the sqrt not defined problem in gcc3.1 - # It should be ok with gcc2.95 thanks to Doug Goldstein + # It should be ok with gcc2.95 thanks to Doug Goldstein # <dougg@ufl.edu> (Cardoe) epatch "${FILESDIR}"/${P}-sqrt.patch epatch "${FILESDIR}"/${P}-gcc41.patch } src_install() { - make DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install || die "Install failed" dodoc AUTHORS COPYING README } |