From nobody@FreeBSD.org  Fri May 25 06:26:06 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0632916A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 May 2007 06:26:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id ED48513C45D
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 May 2007 06:26:05 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l4P6Q5T4086607
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 May 2007 06:26:05 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l4P6Q5gD086603;
	Fri, 25 May 2007 06:26:05 GMT
	(envelope-from nobody)
Message-Id: <200705250626.l4P6Q5gD086603@www.freebsd.org>
Date: Fri, 25 May 2007 06:26:05 GMT
From: Benjamin Close<benjsc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] libflash does not compile after gcc 4.2 import
X-Send-Pr-Version: www-3.0

>Number:         112977
>Category:       ports
>Synopsis:       [patch] graphics/libflash does not compile after gcc 4.2 import
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 25 06:30:06 GMT 2007
>Closed-Date:    Thu Jun 21 09:56:52 GMT 2007
>Last-Modified:  Thu Jun 21 10:00:10 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->benjsc 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri May 25 06:35:15 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112977 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri May 25 06:35:23 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112977 

From: "Li-Lun \"Leland\" Wang" <llwang@infor.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/112977: [patch] graphics/libflash does not compile after gcc 4.2 import
Date: Wed, 30 May 2007 00:09:31 -0500

 I'll need a couple more days to upgrade to the post-gcc-4.2 world to
 test the patch.  Sorry for the delay.
 
 -- llwang

From: "Li-Lun \"Leland\" Wang" <llwang@infor.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/112977: [patch] graphics/libflash does not compile after gcc 4.2 import
Date: Thu, 31 May 2007 16:57:10 -0500

 This patch seems to be working.  I agree on and approve this patch.
 
 -- llwang
Responsible-Changed-From-To: benjsc->freebsd-ports-bugs 
Responsible-Changed-By: benjsc 
Responsible-Changed-When: Tue Jun 5 00:26:50 UTC 2007 
Responsible-Changed-Why:  
no -ports bit to commit, back to the ports-bugs gurus 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112977 
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Thu Jun 21 09:56:51 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112977 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112977: commit references a PR
Date: Thu, 21 Jun 2007 09:56:47 +0000 (UTC)

 rafan       2007-06-21 09:56:41 UTC
 
   FreeBSD ports repository
 
   Added files:
     graphics/libflash/files patch-graphic16.h patch-graphic24.h 
                             patch-graphic32.h patch-matrix.h 
                             patch-sound.h patch-swf.h 
   Log:
   - Fix build with gcc4
   
   PR:              ports/112977
   Submitted by:    benjsc
   Approved by:     Li-Lun  Wang <llwang at infor.org> (maintainer)
   
   Revision  Changes    Path
   1.1       +11 -0     ports/graphics/libflash/files/patch-graphic16.h (new)
   1.1       +11 -0     ports/graphics/libflash/files/patch-graphic24.h (new)
   1.1       +11 -0     ports/graphics/libflash/files/patch-graphic32.h (new)
   1.1       +18 -0     ports/graphics/libflash/files/patch-matrix.h (new)
   1.1       +15 -0     ports/graphics/libflash/files/patch-sound.h (new)
   1.1       +12 -0     ports/graphics/libflash/files/patch-swf.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
