games/gcompris* update

Thu Mar 4 11:18:13 PST 2004

> >
> >I haven't seen this, but then I didn't try --without-python because there 
> >were already so many things that requires python. I'll have a look at it 
> >over the weekend though. Was there a reason that you wanted it without 
> >python? From what I understand there isn't anything in gcompris using it 
> >yet, they just added the framework for it, so that boards can be written 
> >in python.
> >
> Right. But afair my very first attempt to update gcompriss was 4.9 
> (gcompriss release) and that time gcompriss failed to build w/ python 
> support. Since I don't like snakes for some reason I switched  their 
> support off. But built w/o python support gcompriss complained at 
> run-time about missed pyton module plus I got few abort()s related to 
> python integration randomly walking through the game boards while 
> testing. All this give me impression that port is not safe for parents 
> yet ;-)
>    To be honest I did not try 5.0-2 versions with python support. May 
> be something changed since 4.9 time and you will be more lucky. Let me know.

Ok, I probably didn't look hard enough previously because this time I
did see the python complaints when it was compiled without python. I
started with your patch and made it use python and a few other small
tweaks and it seems to be working now. I have patch against your patch
at the end of the email. A patch agains cvs is available at:

http://people.freebsd.org/~jhay/gcompriss2.patch-jhay

Any comments? The sound also works and my kids love it, but using it
on a 300MHz Celeron is pushing it a bit.

John
-- 
John Hay -- John.Hay at icomtek.csir.co.za / jhay at FreeBSD.org



diff -Nru /export/jhay/gcompris2-bland/Makefile ./Makefile

--- /export/jhay/gcompris2-bland/Makefile	Mon Mar  1 09:08:27 2004
+++ ./Makefile	Tue Mar  2 20:59:30 2004
@@ -16,16 +16,17 @@
 COMMENT=	A simple Gnome2-based education game for children starting at 3
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		ao.3:${PORTSDIR}/audio/libao
+		ao.3:${PORTSDIR}/audio/libao \
+		assetml.0:${PORTSDIR}/devel/libassetml
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=      gnomehack lthack gnomeprefix libgnomeui
+USE_PYTHON=	yes
+USE_GNOME=      gnomehack lthack gnomeprefix pygnome2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS} -lm"
-CONFIGURE_ARGS=	--without-python
 
 INFO=		gcompris
 
diff -Nru /export/jhay/gcompris2-bland/files/patch-configure ./files/patch-configure
--- /export/jhay/gcompris2-bland/files/patch-configure	Mon Mar  1 09:08:27 2004
+++ ./files/patch-configure	Mon Mar  1 09:22:55 2004
@@ -1,6 +1,6 @@
---- configure.bak	Mon Feb  2 22:50:16 2004
-+++ configure	Mon Feb  2 23:04:24 2004
-@@ -12756,7 +12756,7 @@
+--- configure.orig	Sat Feb 28 08:33:22 2004
++++ configure	Sat Feb 28 11:14:06 2004
+@@ -12767,7 +12767,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -9,7 +9,7 @@
  _ACEOF
  
  
-@@ -12764,7 +12764,7 @@
+@@ -12775,7 +12775,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -18,7 +18,21 @@
  _ACEOF
  
  
-@@ -13365,7 +13365,7 @@
+@@ -12795,7 +12795,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOME_ICONDIR "${myprefix}/${DATADIRNAME}/pixmaps"
++#define GNOME_ICONDIR "${myprefix}/${DATADIRNAME}/gnome/pixmaps"
+ _ACEOF
+ 
+ 
+@@ -13372,11 +13372,11 @@
+ 
+ 
+ 
+-ASSETML_DIR=assetml
++ASSETML_DIR=gnome/assetml
  
  
  cat >>confdefs.h <<_ACEOF
diff -Nru /export/jhay/gcompris2-bland/pkg-plist ./pkg-plist
--- /export/jhay/gcompris2-bland/pkg-plist	Mon Mar  1 09:08:27 2004
+++ ./pkg-plist	Wed Mar  3 20:20:15 2004
@@ -25,6 +25,7 @@
 lib/gcompris/libmoney.so
 lib/gcompris/libparatrooper.so
 lib/gcompris/libplanegame.so
+lib/gcompris/libpython.so
 lib/gcompris/librailroad.so
 lib/gcompris/libread_colors.so
 lib/gcompris/libreading.so
@@ -36,6 +37,17 @@
 lib/gcompris/libtarget.so
 lib/gcompris/libtraffic.so
 lib/gcompris/libwordsgame.so
+lib/gcompris/python/gcompris/utils/__init__.py
+lib/gcompris/python/gcompris/score/__init__.py
+lib/gcompris/python/gcompris/bonus/__init__.py
+lib/gcompris/python/gcompris/timer/__init__.py
+lib/gcompris/python/gcompris/sound/__init__.py
+lib/gcompris/python/gcompris/skin/__init__.py
+lib/gcompris/python/gcompris/__init__.py
+lib/gcompris/python/melody.py
+lib/gcompris/python/pythontest.py
+lib/gcompris/python/redraw.py
+lib/gcompris/python/watercycle.py
 share/gnome/applications/gcompris-edit.desktop
 share/gnome/applications/gcompris.desktop
 share/gnome/assetml/gcompris_alphabet_de.assetml
@@ -1766,17 +1778,17 @@
 @dirrm share/gnome/help/gcompris/fr
 @dirrm share/gnome/help/gcompris/C
 @dirrm share/gnome/help/gcompris
- at dirrm share/gnome/gcompris/sounds
 @dirrm share/gnome/gcompris/boards/wordsgame
 @dirrm share/gnome/gcompris/boards/watercycle
 @dirrm share/gnome/gcompris/boards/traffic
 @dirrm share/gnome/gcompris/boards/target
 @dirrm share/gnome/gcompris/boards/submarine
- at dirrm share/gnome/gcompris/boards/sounds/pt/misic
+ at dirrm share/gnome/gcompris/boards/sounds/pt/misc
 @dirrm share/gnome/gcompris/boards/sounds/pt/geography
 @dirrm share/gnome/gcompris/boards/sounds/pt/colors
 @dirrm share/gnome/gcompris/boards/sounds/pt/alphabet
 @dirrm share/gnome/gcompris/boards/sounds/pt
+ at dirrm share/gnome/gcompris/boards/sounds/melody
 @dirrm share/gnome/gcompris/boards/sounds/fr/misc
 @dirrm share/gnome/gcompris/boards/sounds/fr/geography
 @dirrm share/gnome/gcompris/boards/sounds/fr/colors
@@ -1797,8 +1809,11 @@
 @dirrm share/gnome/gcompris/boards/sounds/de/colors
 @dirrm share/gnome/gcompris/boards/sounds/de/alphabet
 @dirrm share/gnome/gcompris/boards/sounds/de
+ at dirrm share/gnome/gcompris/boards/sounds/chronos/space
+ at dirrm share/gnome/gcompris/boards/sounds/chronos
 @dirrm share/gnome/gcompris/boards/sounds
 @dirrm share/gnome/gcompris/boards/skins/pink
+ at dirrm share/gnome/gcompris/boards/skins/linha verde
 @dirrm share/gnome/gcompris/boards/skins/default
 @dirrm share/gnome/gcompris/boards/skins
 @dirrm share/gnome/gcompris/boards/scales
@@ -1814,7 +1829,7 @@
 @dirrm share/gnome/gcompris/boards/paintings/level1
 @dirrm share/gnome/gcompris/boards/paintings/kandinky.comp8
 @dirrm share/gnome/gcompris/boards/paintings
- at dirrm share/gnome/gcompris/boards/music/backgroung
+ at dirrm share/gnome/gcompris/boards/music/background
 @dirrm share/gnome/gcompris/boards/music
 @dirrm share/gnome/gcompris/boards/mrpatate
 @dirrm share/gnome/gcompris/boards/money/euro
@@ -1831,7 +1846,6 @@
 @dirrm share/gnome/gcompris/boards/geography
 @dirrm share/gnome/gcompris/boards/gcompris/timers
 @dirrm share/gnome/gcompris/boards/gcompris/misc
- at dirrm share/gnome/gcompris/boards/gcompris/letters
 @dirrm share/gnome/gcompris/boards/gcompris/dice
 @dirrm share/gnome/gcompris/boards/gcompris/bonus
 @dirrm share/gnome/gcompris/boards/gcompris/animals
@@ -1843,6 +1857,7 @@
 @dirrm share/gnome/gcompris/boards/dataset
 @dirrm share/gnome/gcompris/boards/colors
 @dirrm share/gnome/gcompris/boards/clockgame
+ at dirrm share/gnome/gcompris/boards/chronos/space
 @dirrm share/gnome/gcompris/boards/chronos
 @dirrm share/gnome/gcompris/boards/chess
 @dirrm share/gnome/gcompris/boards/canal_lock
@@ -1856,4 +1871,12 @@
 @dirrm share/gnome/gcompris/boards/advanced_colors
 @dirrm share/gnome/gcompris/boards
 @dirrm share/gnome/gcompris
+ at dirrm lib/gcompris/python/gcompris/skin
+ at dirrm lib/gcompris/python/gcompris/sound
+ at dirrm lib/gcompris/python/gcompris/timer
+ at dirrm lib/gcompris/python/gcompris/bonus
+ at dirrm lib/gcompris/python/gcompris/score
+ at dirrm lib/gcompris/python/gcompris/utils
+ at dirrm lib/gcompris/python/gcompris
+ at dirrm lib/gcompris/python
 @dirrm lib/gcompris
