Date: Fri, 25 May 2007 06:26:05 GMT From: Benjamin Close<benjsc@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/112977: [patch] libflash does not compile after gcc 4.2 import Message-ID: <200705250626.l4P6Q5gD086603@www.freebsd.org> Resent-Message-ID: <200705250630.l4P6U6ZL000604@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112977
>Category: ports
>Synopsis: [patch] libflash does not compile after gcc 4.2 import
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri May 25 06:30:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Benjamin Close
>Release: 7.0 - Current (After Gcc 4.2 import)
>Organization:
>Environment:
FreeBSD wolf.clearchain.com 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Mon May 21 11:32:59 CST 2007 root@wolf.clearchain.com:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
graphics/libflash does not compile after the gcc 4.2 import due to compiler changes.
===> Building for libflash-0.4.13_3
if /bin/sh /usr/local/bin/libtool --tag=CXX --mode=compile c++ -DHAVE_CONFIG_H -I. -I. -I.. -I../lib -I/usr/local/include -O3 -Wall -fno-rtti -fno-exceptions -g3 -O2 -fno-strict-aliasing -pipe -MT adpcm.lo -MD -MP -MF ".deps/adpcm.Tpo" -c -o adpcm.lo adpcm.cc; then mv -f ".deps/adpcm.Tpo" ".deps/adpcm.Plo"; else rm -f ".deps/adpcm.Tpo"; exit 1; fi
mkdir .libs
c++ -DHAVE_CONFIG_H -I. -I. -I.. -I../lib -I/usr/local/include -O3 -Wall -fno-rtti -fno-exceptions -g3 -O2 -fno-strict-aliasing -pipe -MT adpcm.lo -MD -MP -MF .deps/adpcm.Tpo -c adpcm.cc -fPIC -DPIC -o .libs/adpcm.o
In file included from swf.h:35,
from adpcm.cc:2:
matrix.h:36: error: extra qualification 'Matrix::' on member 'getX'
matrix.h:42: error: extra qualification 'Matrix::' on member 'getY'
In file included from swf.h:226,
from adpcm.cc:2:
sound.h:106: error: extra qualification 'SoundMixer::' on member 'Mp3Scale'
sound.h:107: error: extra qualification 'SoundMixer::' on member 'Mp3Decompress'
sound.h:108: error: extra qualification 'SoundMixer::' on member 'uninitMp3Sounds'
*** Error code 1
Stop in /usr/ports/graphics/libflash/work/gplflash-0.4.13/lib.
*** Error code 1
>How-To-Repeat:
Compile graphics/libflash on 7.0-current after the gcc 4.2 import
>Fix:
Apply attached patch.
(Please note I don't have -ports commit bit but would be happy to commit with approval)
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/libflash/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 19 May 2007 20:09:47 -0000 1.21
+++ Makefile 25 May 2007 05:45:29 -0000
@@ -7,7 +7,7 @@
PORTNAME= libflash
PORTVERSION= 0.4.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gplflash
Index: files/patch-graphic16.h
===================================================================
RCS file: files/patch-graphic16.h
diff -N files/patch-graphic16.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-graphic16.h 25 May 2007 05:41:26 -0000
@@ -0,0 +1,11 @@
+--- lib/graphic16.h Fri May 25 15:04:22 2007
++++ lib2/graphic16.h Fri May 25 15:05:53 2007
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice16: public GraphicDevice {
+ private:
+- long GraphicDevice16::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice16(FlashDisplay *fd);
Index: files/patch-graphic24.h
===================================================================
RCS file: files/patch-graphic24.h
diff -N files/patch-graphic24.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-graphic24.h 25 May 2007 05:41:49 -0000
@@ -0,0 +1,11 @@
+--- lib/graphic24.h Fri May 25 15:04:22 2007
++++ lib2/graphic24.h Fri May 25 15:06:00 2007
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice24: public GraphicDevice {
+ private:
+- long GraphicDevice24::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice24(FlashDisplay *fd);
Index: files/patch-graphic32.h
===================================================================
RCS file: files/patch-graphic32.h
diff -N files/patch-graphic32.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-graphic32.h 25 May 2007 05:42:03 -0000
@@ -0,0 +1,11 @@
+--- lib/graphic32.h Fri May 25 15:04:22 2007
++++ lib2/graphic32.h Fri May 25 15:06:05 2007
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice32: public GraphicDevice {
+ private:
+- long GraphicDevice32::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice32(FlashDisplay *fd);
Index: files/patch-matrix.h
===================================================================
RCS file: files/patch-matrix.h
diff -N files/patch-matrix.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-matrix.h 25 May 2007 05:42:20 -0000
@@ -0,0 +1,18 @@
+--- lib/matrix.h Fri May 25 15:04:22 2007
++++ lib2/matrix.h Fri May 25 15:05:10 2007
+@@ -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);
+ };
Index: files/patch-sound.h
===================================================================
RCS file: files/patch-sound.h
diff -N files/patch-sound.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sound.h 25 May 2007 05:42:36 -0000
@@ -0,0 +1,15 @@
+--- lib/sound.h Fri May 25 15:04:22 2007
++++ lib2/sound.h Fri May 25 15:05:20 2007
+@@ -103,9 +103,9 @@
+ long playSounds(); // Actually play sounds of all instances
+ long fillSoundBuffer(SoundList *, char *buffer, long bufferSize); // Fill sound buffer
+ private:
+- int SoundMixer::Mp3Scale(mad_fixed_t sample);
+- void SoundMixer::Mp3Decompress(SoundList *sl);
+- void SoundMixer::uninitMp3Sounds(SoundList *sl);
++ int Mp3Scale(mad_fixed_t sample);
++ void Mp3Decompress(SoundList *sl);
++ void uninitMp3Sounds(SoundList *sl);
+ };
+
+ #endif /* _SOUND_H_ */
Index: files/patch-swf.h
===================================================================
RCS file: files/patch-swf.h
diff -N files/patch-swf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-swf.h 25 May 2007 05:42:57 -0000
@@ -0,0 +1,12 @@
+--- lib/swf.h Fri May 25 15:04:22 2007
++++ lib2/swf.h Fri May 25 15:08:36 2007
+@@ -199,7 +199,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);
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705250626.l4P6Q5gD086603>