projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a41bc6)
External variables defined with both C and C++ linkage are regected in GCC
authorRyan Hill <rhill@gentoo.org>
Tue, 6 Mar 2007 00:04:35 +0000 (00:04 +0000)
committerRyan Hill <rhill@gentoo.org>
Tue, 6 Mar 2007 00:04:35 +0000 (00:04 +0000)
4.1.2. Update GCC patch to cover this. Walter Meinl, bug #169517.
Package-Manager: portage-2.1.2.1

media-libs/libflash/ChangeLog patch | blob | history
media-libs/libflash/Manifest patch | blob | history
media-libs/libflash/files/libflash-0.4.10-gcc41.patch patch | blob | history
media-libs/libflash/libflash-0.4.10-r1.ebuild patch | blob | history

diff --git a/media-libs/libflash/ChangeLog b/media-libs/libflash/ChangeLog
index 6bd38c2b42dc0f1ea87327f3e88a82fe4350caef..9afed40bf808251d4adb9a6ef71eac86a8564740 100644 (file)
--- 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/Manifest b/media-libs/libflash/Manifest
index 887ed6c7ad776081388f6eedc63bf47be32dccb0..73af70cd473edd3a034d019f36fb9bc0fe34ba4f 100644 (file)
--- a/media-libs/libflash/Manifest
+++ b/media-libs/libflash/Manifest
@@ -1,20 +1,20 @@
-AUX libflash-0.4.10-gcc41.patch 1462 RMD160 69b2506fcc4141cd94b6962cb2bb11ca0b303aa4 SHA1 643a3dab9f5d9aec58139a6bdc679f918e87a886 SHA256 7c8ca4ad8fdeab4d4f6b906edf2b35a8dba609389dd6af241db2a69d48c4a144
-MD5 efb833ab4eb40978248150f9c202068d files/libflash-0.4.10-gcc41.patch 1462
-RMD160 69b2506fcc4141cd94b6962cb2bb11ca0b303aa4 files/libflash-0.4.10-gcc41.patch 1462
-SHA256 7c8ca4ad8fdeab4d4f6b906edf2b35a8dba609389dd6af241db2a69d48c4a144 files/libflash-0.4.10-gcc41.patch 1462
+AUX libflash-0.4.10-gcc41.patch 2209 RMD160 ff699df0de1c40eeb3f3eda767a3d090396900d5 SHA1 93bf2e648dba65489d91cb9373398a73c70da5a6 SHA256 08fcfa1652aa957eefead5c20f3f934e8ebbff53ccd67d5de3eff3722a0c1d18
+MD5 11d78ad7042ab8080ae8d70469ddfe54 files/libflash-0.4.10-gcc41.patch 2209
+RMD160 ff699df0de1c40eeb3f3eda767a3d090396900d5 files/libflash-0.4.10-gcc41.patch 2209
+SHA256 08fcfa1652aa957eefead5c20f3f934e8ebbff53ccd67d5de3eff3722a0c1d18 files/libflash-0.4.10-gcc41.patch 2209
 AUX libflash-0.4.10-sqrt.patch 292 RMD160 f7cde190ccd553858f15fcf7521c0c04a16cb056 SHA1 0a026167f06c7ed782255ee5cd6382c363eba11c SHA256 1e31664af0f8deb107317bc497b356003690a54afd080e38fcafbe61ed93c14e
 MD5 093e0256b6d6954b15274cad821aa8d3 files/libflash-0.4.10-sqrt.patch 292
 RMD160 f7cde190ccd553858f15fcf7521c0c04a16cb056 files/libflash-0.4.10-sqrt.patch 292
 SHA256 1e31664af0f8deb107317bc497b356003690a54afd080e38fcafbe61ed93c14e files/libflash-0.4.10-sqrt.patch 292
 DIST libflash-0.4.10.tar.gz 176876 RMD160 26750b49d201f113911bf5b1d0eb02128ec952c0 SHA1 257ea421729794643c6ad65220a183393f94d9ff SHA256 8a8019807b556faf5c55528a474f25b70e303041df5abb60c6b592d890396ec8
-EBUILD libflash-0.4.10-r1.ebuild 871 RMD160 55f7b742d4663609f824bd97dad2235257e5d46b SHA1 79701d05abb07a72b3af0afcab69dd1e2d2f2964 SHA256 2da0d6e370ed6654fae3bc3b0f5e91cfb6ac52dd9cdda2645140c35fe3a5ae20
-MD5 9ba5dadcd6f3955a6a44746ac83cbf15 libflash-0.4.10-r1.ebuild 871
-RMD160 55f7b742d4663609f824bd97dad2235257e5d46b libflash-0.4.10-r1.ebuild 871
-SHA256 2da0d6e370ed6654fae3bc3b0f5e91cfb6ac52dd9cdda2645140c35fe3a5ae20 libflash-0.4.10-r1.ebuild 871
-MISC ChangeLog 2186 RMD160 b6472bbf7d1a63002f5aa8c4ed1a0dbca65204de SHA1 8537bbff7f6fcdd2cb8f88a8d48cdcdd39cab00c SHA256 def059de1656d616504ce2eb3eedc7575ce3c0cb08dd11f68ef6292851d6416a
-MD5 f55ceab915d315d710050890b3522ea0 ChangeLog 2186
-RMD160 b6472bbf7d1a63002f5aa8c4ed1a0dbca65204de ChangeLog 2186
-SHA256 def059de1656d616504ce2eb3eedc7575ce3c0cb08dd11f68ef6292851d6416a ChangeLog 2186
+EBUILD libflash-0.4.10-r1.ebuild 874 RMD160 e3e245b239991bc2ad829a5c6027797c8fa69477 SHA1 4c71063e10f5744fd55e12501c8530480b4d58c9 SHA256 0bfd3672eb9d43d2d13f58026dab01876b55a075492441021cb412327ea1a0fc
+MD5 ad10350640d84df1cfb5bbd2ed4d07f3 libflash-0.4.10-r1.ebuild 874
+RMD160 e3e245b239991bc2ad829a5c6027797c8fa69477 libflash-0.4.10-r1.ebuild 874
+SHA256 0bfd3672eb9d43d2d13f58026dab01876b55a075492441021cb412327ea1a0fc libflash-0.4.10-r1.ebuild 874
+MISC ChangeLog 2448 RMD160 ba31b5f1554a53e9969999339115686481db45d5 SHA1 e77e4e009c20f9a86e8e9ca8c1fca76aee619055 SHA256 354f88e888a699ae2bf799f359dd74fc6e09e7a33ab6dd25775e15a54ead60b3
+MD5 73f4c9053a53918ea5835fb50a6a1371 ChangeLog 2448
+RMD160 ba31b5f1554a53e9969999339115686481db45d5 ChangeLog 2448
+SHA256 354f88e888a699ae2bf799f359dd74fc6e09e7a33ab6dd25775e15a54ead60b3 ChangeLog 2448
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
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 c4b5df1725c9092427419ce10a9c7519bde3ad30..363846c43ab51dee8faee105d719499d218755b5 100644 (file)
--- 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 cbe7d9681d9dfcab85ab0064327c44f966605197..f587b419d12c3b72bd941d6593e9301aef0a9f7c 100644 (file)
--- 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
 }
Unnamed repository; edit this file 'description' to name the repository.