gcc-3.3 compile fix

4 files changed, 194 insertions, 9 deletions

diff --git a/media-plugins/xmms-goom/ChangeLog b/media-plugins/xmms-goom/ChangeLog
index 21d434b02149..31d94504c7c1 100644
--- a/media-plugins/xmms-goom/ChangeLog
+++ b/media-plugins/xmms-goom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/xmms-goom
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-goom/ChangeLog,v 1.3 2003/03/15 07:19:27 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-goom/ChangeLog,v 1.4 2003/09/15 00:57:35 seemant Exp $
+
+  14 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xmms-goom-1.99.4.ebuild,
+  files/xmms-goom-gcc-3.3.patch:
+  added patch to allow compilation with gcc-3.3. Thanks to: Niek van der Maas
+  <webmaster@refstart.nl> in bug #28276
 
 *xmms-goom-1.99.4 (15 Mar 2003)
 
diff --git a/media-plugins/xmms-goom/Manifest b/media-plugins/xmms-goom/Manifest
index b908a5d563cb..9681ceb3360c 100644
--- a/media-plugins/xmms-goom/Manifest
+++ b/media-plugins/xmms-goom/Manifest
@@ -1,6 +1,7 @@
-MD5 36c53d98729ef024ab480a625d4c3049 ChangeLog 671
 MD5 960b805106f04887d58b2878583eb8fd xmms-goom-1.10.0.ebuild 1044
-MD5 e483ba3fb4dd0cac8e2ab6e2f5284566 xmms-goom-1.99.4.ebuild 783
+MD5 a9da3c3470327381e4142131c9badb62 xmms-goom-1.99.4.ebuild 920
+MD5 6c1798424f0a0ae7d19275f4a7a9a921 ChangeLog 904
+MD5 b8e70969c0f221bf8371525e5f69ded0 files/xmms-goom-1.10.0-libtool.patch 551
+MD5 c799d0f5d602fcc614edff965046b897 files/xmms-goom-gcc-3.3.patch 5611
 MD5 93a5f4f68328435dec0ed981a2ef1bb7 files/digest-xmms-goom-1.10.0 60
 MD5 968662905603222290ae708c927ba2df files/digest-xmms-goom-1.99.4 64
-MD5 b8e70969c0f221bf8371525e5f69ded0 files/xmms-goom-1.10.0-libtool.patch 551
diff --git a/media-plugins/xmms-goom/files/xmms-goom-gcc-3.3.patch b/media-plugins/xmms-goom/files/xmms-goom-gcc-3.3.patch
new file mode 100644
index 000000000000..5107ac7830a8
--- /dev/null
+++ b/media-plugins/xmms-goom/files/xmms-goom-gcc-3.3.patch
@@ -0,0 +1,172 @@
+--- zoom_filter_mmx.c.old	2003-09-10 12:12:52.000000000 +0200
++++ zoom_filter_mmx.c	2003-09-10 12:13:28.000000000 +0200
+@@ -20,103 +20,89 @@
+ 					  int precalCoef[16][16])
+ {
+   unsigned int ax = (prevX-1)<<PERTEDEC, ay = (prevY-1)<<PERTEDEC;
+-  
++
+   int bufsize = prevX * prevY;
+   int loop;
+ 
+-  __asm__ ("pxor %mm7,%mm7");
+-  
++  pxor_r2r(mm7,mm7);
++
+   for (loop=0; loop<bufsize; loop++)
+ 	{
+-	  int couleur;
+ 	  int px,py;
+ 	  int pos;
+ 	  int coeffs;
+ 
++          int posplusprevX;
++
+ 	  int myPos = loop << 1,
+-		myPos2 = myPos + 1;
++			myPos2 = myPos + 1;
+ 	  int brutSmypos = brutS[myPos];
+-	  
++
+ 	  px = brutSmypos + (((brutD[myPos] - brutSmypos)*buffratio) >> BUFFPOINTNB);
+ 	  brutSmypos = brutS[myPos2];
+ 	  py = brutSmypos + (((brutD[myPos2] - brutSmypos)*buffratio) >> BUFFPOINTNB);
+-	  
+-	  if ((py>=ay) || (px>=ax)) {
+-		pos=coeffs=0;
++
++	  if ((py>=(int)ay) || (px>=(int)ax)) {
++			pos=coeffs=0;
+ 	  }
+ 	  else {
+-		pos = ((px >> PERTEDEC) + prevX * (py >> PERTEDEC));
+-		// coef en modulo 15
+-		coeffs = precalCoef [px & PERTEMASK][py & PERTEMASK];
++			pos = ((px >> PERTEDEC) + prevX * (py >> PERTEDEC));
++			/* coef en modulo 15 */
++			coeffs = precalCoef [px & PERTEMASK][py & PERTEMASK];
+ 	  }
+ 
+-	  __asm__ __volatile__ ("
+-               movd %%eax,%%mm6
+-			   ;// recuperation des deux premiers pixels dans mm0 et mm1
+-	   	       movq (%%edx,%%ebx,4), %%mm0		/* b1-v1-r1-a1-b2-v2-r2-a2 */
+-			   movq %%mm0, %%mm1				/* b1-v1-r1-a1-b2-v2-r2-a2 */
+-			   
+-			   ;// depackage du premier pixel
+-			   punpcklbw %%mm7, %%mm0	/* 00-b2-00-v2-00-r2-00-a2 */
+-			   
+-			   movq %%mm6, %%mm5			/* ??-??-??-??-c4-c3-c2-c1 */
+-			   ;// depackage du 2ieme pixel
+-			   punpckhbw %%mm7, %%mm1	/* 00-b1-00-v1-00-r1-00-a1 */
+-							   
+-			   ;// extraction des coefficients...
+-			   punpcklbw %%mm5, %%mm6	/* c4-c4-c3-c3-c2-c2-c1-c1 */
+-			   movq %%mm6, %%mm4			/* c4-c4-c3-c3-c2-c2-c1-c1 */
+-			   movq %%mm6, %%mm5			/* c4-c4-c3-c3-c2-c2-c1-c1 */
+-											   
+-			   punpcklbw %%mm5, %%mm6	/* c2-c2-c2-c2-c1-c1-c1-c1 */
+-			   punpckhbw %%mm5, %%mm4	/* c4-c4-c4-c4-c3-c3-c3-c3 */
+-
+-			   movq %%mm6, %%mm3			/* c2-c2-c2-c2-c1-c1-c1-c1 */
+-			   punpcklbw %%mm7, %%mm6	/* 00-c1-00-c1-00-c1-00-c1 */
+-			   punpckhbw %%mm7, %%mm3	/* 00-c2-00-c2-00-c2-00-c2 */
+-	
+-			   ;// multiplication des pixels par les coefficients
+-			   pmullw %%mm6, %%mm0		/* c1*b2-c1*v2-c1*r2-c1*a2 */
+-			   pmullw %%mm3, %%mm1		/* c2*b1-c2*v1-c2*r1-c2*a1 */
+-			   paddw %%mm1, %%mm0
+-			   
+-			   ;// ...extraction des 2 derniers coefficients
+-			   movq %%mm4, %%mm5			/* c4-c4-c4-c4-c3-c3-c3-c3 */
+-			   punpcklbw %%mm7, %%mm4	/* 00-c3-00-c3-00-c3-00-c3 */
+-			   punpckhbw %%mm7, %%mm5	/* 00-c4-00-c4-00-c4-00-c4 */
+-
+-			   /* ajouter la longueur de ligne a esi */
+-			   addl 8(%%ebp),%%ebx
+-	   
+-			   ;// recuperation des 2 derniers pixels
+-			   movq (%%edx,%%ebx,4), %%mm1
+-			   movq %%mm1, %%mm2
+-			
+-			   ;// depackage des pixels
+-			   punpcklbw %%mm7, %%mm1
+-			   punpckhbw %%mm7, %%mm2
+-			
+-			   ;// multiplication pas les coeffs
+-			   pmullw %%mm4, %%mm1
+-			   pmullw %%mm5, %%mm2
+-			   
+-			   ;// ajout des valeurs obtenues à la valeur finale
+-			   paddw %%mm1, %%mm0
+-			   paddw %%mm2, %%mm0
+-			   
+-			   ;// division par 256 = 16+16+16+16, puis repackage du pixel final
+-			   psrlw $8, %%mm0
+-			   packuswb %%mm7, %%mm0
+-
+-               movd %%mm0,%%eax
+-			   "
+-							:"=eax"(expix2[loop])
+-							:"ebx"(pos),"eax"(coeffs),"edx"(expix1)
+-							
+-				);
+-	  
+-//	  expix2[loop] = couleur;
+-	  
+-	  __asm__ __volatile__ ("emms");
++	  posplusprevX = pos + prevX;
++
++		movd_m2r(coeffs, mm6);
++		;/* recuperation des deux premiers pixels dans mm0 et mm1 */
++		movq_m2r(expix1[pos], mm0);		/* b1-v1-r1-a1-b2-v2-r2-a2 */
++		movq_r2r(mm0, mm1);			/* b1-v1-r1-a1-b2-v2-r2-a2 */
++		;/* depackage du premier pixel */
++		punpcklbw_r2r(mm7, mm0);		/* 00-b2-00-v2-00-r2-00-a2 */
++		movq_r2r(mm6, mm5);			/* xx-xx-xx-xx-c4-c3-c2-c1 */
++		;/* depackage du 2ieme pixel */
++		punpckhbw_r2r(mm7, mm1);		/* 00-b1-00-v1-00-r1-00-a1 */
++		;/* extraction des coefficients... */
++		punpcklbw_r2r(mm5, mm6);		/* c4-c4-c3-c3-c2-c2-c1-c1 */
++		movq_r2r(mm6, mm4);			/* c4-c4-c3-c3-c2-c2-c1-c1 */
++		movq_r2r(mm6, mm5);			/* c4-c4-c3-c3-c2-c2-c1-c1 */
++		punpcklbw_r2r(mm5, mm6);	/* c2-c2-c2-c2-c1-c1-c1-c1 */
++		punpckhbw_r2r(mm5, mm4);	/* c4-c4-c4-c4-c3-c3-c3-c3 */
++
++		movq_r2r(mm6, mm3);			/* c2-c2-c2-c2-c1-c1-c1-c1 */
++		punpcklbw_r2r(mm7, mm6);	/* 00-c1-00-c1-00-c1-00-c1 */
++		punpckhbw_r2r(mm7, mm3);	/* 00-c2-00-c2-00-c2-00-c2 */
++		;/* multiplication des pixels par les coefficients */
++		pmullw_r2r(mm6, mm0);		/* c1*b2-c1*v2-c1*r2-c1*a2 */
++		pmullw_r2r(mm3, mm1);		/* c2*b1-c2*v1-c2*r1-c2*a1 */
++		paddw_r2r(mm1, mm0);
++
++		;/* ...extraction des 2 derniers coefficients */
++		movq_r2r(mm4, mm5);			/* c4-c4-c4-c4-c3-c3-c3-c3 */
++		punpcklbw_r2r(mm7, mm4);	/* 00-c3-00-c3-00-c3-00-c3 */
++		punpckhbw_r2r(mm7, mm5);	/* 00-c4-00-c4-00-c4-00-c4 */
++
++		/* ajouter la longueur de ligne a esi */
++		;/* recuperation des 2 derniers pixels */
++		movq_m2r(expix1[posplusprevX], mm1);
++		movq_r2r(mm1, mm2);
++
++		;/* depackage des pixels */
++		punpcklbw_r2r(mm7, mm1);
++		punpckhbw_r2r(mm7, mm2);
++
++		;/* multiplication pas les coeffs */
++		pmullw_r2r(mm4, mm1);
++		pmullw_r2r(mm5, mm2);
++
++		;/* ajout des valeurs obtenues %/1€Œiso8859-15à la valeur finale */
++		paddw_r2r(mm1, mm0);
++		paddw_r2r(mm2, mm0);
++
++		;/* division par 256 = 16+16+16+16, puis repackage du pixel final */
++		psrlw_i2r(8, mm0);
++		packuswb_r2r(mm7, mm0);
++		movd_r2m(mm0,expix2[loop]);
+ 	}
++	emms();
+ }
diff --git a/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild b/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild
index fb86758d1729..29c2ed334aa7 100644
--- a/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild
+++ b/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild
@@ -1,23 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild,v 1.3 2003/09/08 07:17:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-goom/xmms-goom-1.99.4.ebuild,v 1.4 2003/09/15 00:57:35 seemant Exp $
 
-DESCRIPTION="Trippy Vis for XMMS using SDL."
 MY_P=${P/xmms-/}
 S=${WORKDIR}/${MY_P}
-SRC_URI="http://ios.free.fr/goom/devel/${MY_P}-src.tgz"
+DESCRIPTION="Trippy Visualisation for XMMS using SDL."
 HOMEPAGE="http://ios.free.fr/?page=projet&quoi=1&lg=AN"
+SRC_URI="http://ios.free.fr/goom/devel/${MY_P}-src.tgz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
 
 DEPEND="media-sound/xmms
 	media-libs/libsdl
 	sys-apps/sh-utils"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+
+	epatch ${FILESDIR}/${PN}-gcc-3.3.patch
+}
+
 src_compile() {
-	econf
+	econf || die
 
 	emake OPT="$CFLAGS" || die
 }