Added a patch to fix several issues with this plugin.

(Portage version: 2.0.53_rc7)

5 files changed, 274 insertions, 13 deletions

diff --git a/media-plugins/xmms-jess/ChangeLog b/media-plugins/xmms-jess/ChangeLog
index 88f50c4e08e5..967d9110cbeb 100644
--- a/media-plugins/xmms-jess/ChangeLog
+++ b/media-plugins/xmms-jess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xmms-jess
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-jess/ChangeLog,v 1.12 2005/09/04 10:29:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-jess/ChangeLog,v 1.13 2005/11/12 18:12:07 metalgod Exp $
+
+*xmms-jess-2.9.1-r1 (12 Nov 2005)
+
+  12 Nov 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-jess-2.9.1-fixissues.patch, +xmms-jess-2.9.1-r1.ebuild:
+  Added a patch to fix several issues with this plugin.
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmms-jess-2.9.1.ebuild:
   Don't install COPYING and INSTALL files.
diff --git a/media-plugins/xmms-jess/Manifest b/media-plugins/xmms-jess/Manifest
index 450cdce1361c..a23d638c6e4b 100644
--- a/media-plugins/xmms-jess/Manifest
+++ b/media-plugins/xmms-jess/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e64cbee02429b94e01a2114bd4302e7b ChangeLog 1276
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 cec94efdc27bc47ce7cefb94ca787a14 xmms-jess-2.9.1.ebuild 760
 MD5 f4856328ab7b220af943402e1dc92475 files/digest-xmms-jess-2.9.1 62
+MD5 f4856328ab7b220af943402e1dc92475 files/digest-xmms-jess-2.9.1-r1 62
+MD5 6e770b3e58478540ee969f83929e15e4 files/xmms-jess-2.9.1-fixissues.patch 6026
 MD5 54c6a61d455728c63b489b057d9d4f3d files/xmms-jess-2.9.1-gcc34.patch 973
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGsy0j5H05b2HAEkRArLeAJ4n2rOb3DVt6r8VrhqO1hycMT+lgACcCMpu
-VhjdGDa6s2CJdDZro6InjGg=
-=bHlB
------END PGP SIGNATURE-----
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1e00652cd68b4a4574625242a69b630c xmms-jess-2.9.1-r1.ebuild 764
+MD5 cec94efdc27bc47ce7cefb94ca787a14 xmms-jess-2.9.1.ebuild 760
diff --git a/media-plugins/xmms-jess/files/digest-xmms-jess-2.9.1-r1 b/media-plugins/xmms-jess/files/digest-xmms-jess-2.9.1-r1
new file mode 100644
index 000000000000..d4b30afb0d39
--- /dev/null
+++ b/media-plugins/xmms-jess/files/digest-xmms-jess-2.9.1-r1
@@ -0,0 +1 @@
+MD5 e40db7d3f107c4d7324dbe66faf4fb6b JESS-2.9.1.tar.gz 182447
diff --git a/media-plugins/xmms-jess/files/xmms-jess-2.9.1-fixissues.patch b/media-plugins/xmms-jess/files/xmms-jess-2.9.1-fixissues.patch
new file mode 100644
index 000000000000..db9947c9c176
--- /dev/null
+++ b/media-plugins/xmms-jess/files/xmms-jess-2.9.1-fixissues.patch
@@ -0,0 +1,227 @@
+--- xmms-jess-2.9.1.orig/jess.c
++++ xmms-jess-2.9.1/jess.c
+@@ -209,6 +209,7 @@
+ 
+   printf("SDL Setvideo mode Ok\n");
+ 
++  SDL_WM_SetCaption("JESS", "JESS");
+   SDL_ShowCursor(0);
+   SDL_EventState (SDL_ACTIVEEVENT, SDL_IGNORE);
+   SDL_EventState (SDL_MOUSEMOTION, SDL_IGNORE);
+@@ -255,6 +256,7 @@
+ 
+   printf("SDL Setvideo mode Ok\n");
+ 
++  SDL_WM_SetCaption("JESS", "JESS");
+   SDL_ShowCursor(0);
+   SDL_EventState (SDL_ACTIVEEVENT, SDL_IGNORE);
+   SDL_EventState (SDL_MOUSEMOTION, SDL_IGNORE);
+--- xmms-jess-2.9.1.orig/draw.c
++++ xmms-jess-2.9.1/draw.c
+@@ -286,12 +286,13 @@
+ {
+ 
+   float x, y, z, xres4 = (float) (resx >> 2);
+-  float fyres2 = yres2;
++  float fyres2;
+   gint16 ax = 0, ay = 0, ix, iy, i, j, nb_x, nb_y;
+   int tx[16][16], ty[16][16];
+   unsigned char color[16][16];
+   nb_x = 16;
+   nb_y = 16;
++  fyres2 = yres2;
+ 
+   for (i = 0; i < nb_x; i++)
+     {
+@@ -510,7 +511,7 @@
+ 	  }
+       }
+     break;
+-  default:
++/*  default: */
+   }
+   /*  printf("  Appel rotation_3d\n");
+   printf("  Appel perspective\n");
+@@ -525,23 +526,23 @@
+ /*  	{ */
+ /*  	  switch(mode) */
+ /*  	    { */
+-  /*  	    case 0: /* galaxie z commande par alpha et spirale par alpha */ 
++  /*  	    case 0: / * galaxie z commande par alpha et spirale par alpha * / */
+ /*  	      x = RESFACTXF ((float) 25*(i+1)*cos(i*2*PI/nb_x*cos(alpha)*i+ j*2*PI/nb_y) ); */
+ /*  	      y = RESFACTYF ((float) 25*(i+1)*sin(i*2*PI/nb_x*cos(alpha)*i+ j*2*PI/nb_y) ); */
+ /*  	      z = RESFACTXF (40*cos(5*alpha)); */
+ /*  	      break; */
+-/*  	    case 1: /* ouverture */ 
++/*  	    case 1: / * ouverture * / */
+ /*  	      x = RESFACTXF ((float) 50*(i*i*i*PI/(nb_x*nb_x*nb_x)*fabs(lys.dEdt_moyen*5000) + sin((i+1)*PI/nb_x))*cos(5*alpha*i*2*PI/nb_x +  j*2*PI/nb_y)  ); */
+ /*  	      y = RESFACTYF ((float) 50*(i*i*i*PI/(nb_x*nb_x*nb_x)*fabs(lys.dEdt_moyen*5000) + sin((i+1)*PI/nb_x))*sin(5*alpha*i*2*PI/nb_x +  j*2*PI/nb_y) ); */
+ /*  	      z = RESFACTXF ((float) 100*cos((float)i/nb_x*PI)*(1 + lys.dEdt_moyen*1000) ); */
+ /*  	      break; */
+-/*  	    case 2: /* oeuf */ 
++/*  	    case 2: / * oeuf * / */
+ /*  	      x = RESFACTXF ((float) 130*sin((i+1)*PI/nb_x)*cos(-i*2*PI/(5*nb_x)+ j*2*PI/nb_y) ); */
+ /*  	      y = RESFACTYF ((float) 130*sin((i+1)*PI/nb_x)*sin(-i*2*PI/(5*nb_x)+ j*2*PI/nb_y) ); */
+ /*  	      z = -RESFACTXF (130*cos((float)i/nb_x*PI)*lys.dEdt_moyen*1000 ); */
+ 	  
+ /*  	      break; */
+-/*  	    case 3: /* forme bizzare se deforme*/ 
++/*  	    case 3: / * forme bizzare se deforme * / */
+ /*  	      x = RESFACTXF ((float) 25*(i+1)*cos(-i*2*PI/(10*nb_x)+ j*2*PI/nb_y) ); */
+ /*  	      y = RESFACTYF ((float) 25*(i+1)*sin(-i*2*PI/(10*nb_x)+ j*2*PI/nb_y) ); */
+ /*  	      z = RESFACTXF (60* (cos(j*2*PI/nb_y+10*alpha)+cos(i*2*PI/nb_y)) ); */
+@@ -623,7 +624,7 @@
+ 	}
+       break;
+ 
+-    default:
++/*    default: */
+     }
+ }
+ 
+@@ -643,7 +644,9 @@
+       select = 1;
+       stars_create_state(pos[0], 0);
+       stars_create_state(pos[1], 1);
+-   printf("NEW SESSION\n");
++   #ifdef DEBUG
++   	printf("NEW SESSION\n");
++   #endif
+     }
+   else if(new == NEW) /* on creer une nouvelle forme */
+     { 
+@@ -659,7 +662,9 @@
+ 	}
+       select = 1 - select;
+       stars_create_state(pos[select], rand()%2+1);
++#ifdef DEBUG
+       printf("NEW\n");
++#endif
+     }
+   else  /* on gere */
+     {
+--- xmms-jess-2.9.1.orig/misc.c
++++ xmms-jess-2.9.1/misc.c
+@@ -196,9 +196,11 @@
+ 	  break;
+ 
+ 	default:
++	  ;
+ 	}   
+       break;
+     default:
++      ;
+     }
+ 
+ }
+--- xmms-jess-2.9.1.orig/analyser.c
++++ xmms-jess-2.9.1/analyser.c
+@@ -130,8 +130,10 @@
+       conteur.dt = time_last(FOUR,NON);
+       conteur.fps = (gint) 1/time_last(FOUR,REINIT);
+ 
++#ifdef DEBUG
+        if (conteur.term_display == OUI) 
+-	printf("FPS :%i\r", conteur.fps);   
++       printf("FPS :%i\r", conteur.fps);   
++#endif
+ }
+ 
+ 
+@@ -154,8 +156,6 @@
+ 
+ 
+ 
+-
+-
+ /*
+ void C_E_moyen(void)
+ {
+--- xmms-jess-2.9.1.orig/renderer.c
++++ xmms-jess-2.9.1/renderer.c
+@@ -93,7 +93,7 @@
+ 		     conteur.angle2 / 60, 200, 130);
+       break;
+ 
+-    default:
++/*    default: */
+     }
+ 
+   conteur.k3 += 10;
+@@ -395,9 +395,11 @@
+  
+ void render_deformation(int defmode)
+ {
+-   unsigned int bmax, *tab1, *tab2, *tab3, *tab4, i;
++   unsigned long bmax, i;
++   unsigned int *tab1, *tab2, *tab3, *tab4;
+    unsigned char *pix = pixel , *buf = buffer, *aux;
+    
++   tab1 = NULL;
+ 
+    SDL_LockSurface(screen);
+ 
+@@ -412,7 +414,7 @@
+        tab2 = table2;
+        tab3 = table3;
+        tab4 = table4;
+-       bmax = resx * resy + (unsigned int) pixel;
++       bmax = resx * resy + (unsigned long) pixel;
+ 
+        switch(defmode)
+ 	 {
+@@ -468,7 +470,7 @@
+ 	 }
+        for (i = 0; i < resy*resx; i++)
+ 	 {
+-	   aux  =  (unsigned char *) ((*(tab1) << 2 ) + (unsigned int) buffer);
++	   aux  =  (unsigned char *) ((*(tab1) << 2 ) + (unsigned long) buffer);
+ 	   *pix = *(aux) ;
+ 	   pix++;
+ 	   *pix = *(aux + 1);  
+@@ -494,7 +496,7 @@
+   /* j'ai mis pixel par defaut... */
+ 
+   unsigned char *pix = pixel;
+-  unsigned int bmax,pitch_4;
++  unsigned long bmax,pitch_4;
+ 
+   pix = pixel;
+   if (pixel == NULL) return;
+@@ -508,7 +510,7 @@
+ 
+   if (video == 8)
+     {
+-      bmax = resx * (resy-1) + (unsigned int) pixel;
++      bmax = resx * (resy-1) + (unsigned long) pixel;
+       for (pix = pixel; pix < (unsigned char *) bmax-1; pix++)
+ 	{
+ 	  *pix += *(pix+1) + *(pix+resx) + *(pix+resx+1); 
+@@ -517,7 +519,7 @@
+   else
+     {
+       pitch_4 = pitch+4;
+-      bmax = pitch*(resy-1) + (unsigned int) pixel;
++      bmax = pitch*(resy-1) + (unsigned long) pixel;
+       for (pix = pixel; pix < (unsigned char *) bmax-4; )
+ 	{
+ 	  *pix += *(pix + 4) + *(pix + pitch) + *(pix + pitch_4); 
+@@ -529,5 +531,5 @@
+  	  pix++; 
+ 	}
+     }
+-  non:;
++/*  non:; */
+ }
+--- xmms-jess-2.9.1.orig/palette.c
++++ xmms-jess-2.9.1/palette.c
+@@ -102,7 +102,9 @@
+     colors_used[i].b = courbes_palette(i, l);
+   }
+ 
+-  printf("Switch to color mode %i\n",j+10*k+100*l);
++ #ifdef DEBUG
++   printf("Switch to color mode %i\n",j+10*k+100*l);
++ #endif
+   SDL_SetColors(screen, colors_used, 0, 256);
+ }
diff --git a/media-plugins/xmms-jess/xmms-jess-2.9.1-r1.ebuild b/media-plugins/xmms-jess/xmms-jess-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..e6278c462ecd
--- /dev/null
+++ b/media-plugins/xmms-jess/xmms-jess-2.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-jess/xmms-jess-2.9.1-r1.ebuild,v 1.1 2005/11/12 18:12:08 metalgod Exp $
+
+IUSE=""
+
+inherit eutils
+
+MY_P="JESS-${PV}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="JESS Visualization Plugin for XMMS"
+SRC_URI="http://arquier.free.fr/${MY_P}.tar.gz"
+HOMEPAGE="http://arquier.free.fr/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	>=media-libs/libsdl-1.1.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fixissues.patch
+}
+
+src_install () {
+	dodir `xmms-config --visualization-plugin-dir`
+
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README NEWS
+}