start to add pygame, fix sdl compilation and copy all libs to build/libs

tito · tito · commit f2dd25ad3866 · 2012-01-06T02:41:43.000+01:00
diff --git a/configure.sh b/configure.sh
@@ -13,6 +13,7 @@ MODULES=$MODULES
 ROOT_PATH="$(dirname $(readlink -f $0))"
 RECIPES_PATH="$ROOT_PATH/recipes"
 BUILD_PATH="$ROOT_PATH/build"
+LIBS_PATH="$ROOT_PATH/build/libs"
 PACKAGES_PATH="$BUILD_PATH/packages"
 SRC_PATH="$ROOT_PATH/src"
 JNI_PATH="$SRC_PATH/jni"
@@ -173,6 +174,7 @@ function run_prepare() {
 	# create build directory if not found
 	if [ ! -d $BUILD_PATH ]; then
 		mkdir -p $BUILD_PATH
+		mkdir -p $LIBS_PATH
 		mkdir -p $PACKAGES_PATH
 	fi
 
diff --git a/recipes/pygame/recipe.sh b/recipes/pygame/recipe.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+PRIORITY_pygame=21
+VERSION_pygame=1.9.1
+URL_pygame=http://pygame.org/ftp/pygame-$(echo $VERSION_pygame)release.tar.gz
+DEPS_pygame=(sdl)
+MD5_pygame=1c4cdc708d17c8250a2d78ef997222fc
+BUILD_pygame=$BUILD_PATH/pygame/$(get_directory $URL_pygame)
+RECIPE_pygame=$RECIPES_PATH/pygame
+
+function prebuild_pygame() {
+true
+}
+
+function build_pygame() {
+	cd $BUILD_pygame
+
+	push_arm
+
+	CFLAGS="$CFLAGS -I$JNI_PATH/png -I$JNI_PATH/jpeg"
+	CFLAGS="$CFLAGS -I$JNI_PATH/sdl/include -I$JNI_PATH/sdl_mixer"
+	CFLAGS="$CFLAGS -I$JNI_PATH/sdl_ttf -I$JNI_PATH/sdl_image"
+	export CFLAGS="$CFLAGS"
+	export LDFLAGS="$LDFLAGS -L$LIBS_PATH -lm -lz"
+	try $BUILD_PATH/python-install/bin/python.host setup.py install
+	try find build/lib.* -name "*.o" -exec $STRIP {} \;
+
+	pop_arm
+}
+
+function postbuild_pygame() {
+	true
+}
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -47,6 +47,7 @@ function build_python() {
 	pop_arm
 
 	try cp $BUILD_hostpython/hostpython $BUILD_PATH/python-install/bin/python.host
+	try cp libpython2.7.so $LIBS_PATH/
 }
 
 
diff --git a/recipes/sdl/recipe.sh b/recipes/sdl/recipe.sh
@@ -2,24 +2,41 @@
 
 PRIORITY_sdl=15
 VERSION_sdl=1.3
-URL_sdl=http://www.libsdl.org/tmp/SDL-$VERSION_sdl.tar.gz
-MD5_sdl=7176d5f1a0f2683bf1394e0de18c74bb
-BUILD_sdl=$BUILD_PATH/sdl/$(get_directory $URL_sdl)
+URL_sdl=
+MD5_sdl=
+BUILD_sdl=$BUILD_PATH/sdl/SDL
 RECIPE_sdl=$RECIPES_PATH/sdl
 
 function prebuild_sdl() {
+	set -x
+	# clone sdl repo
+	if [ ! -f $BUILD_sdl ]; then
+		cd $BUILD_PATH/sdl
+		hg clone http://hg.libsdl.org/SDL
+	fi
+
 	# make the symlink to sdl in src directory
 	cd $SRC_PATH/jni
-	if [ ! -f sdl ]; then
-		ln -s $BUILD_sdl sdl
-	fi
+	rm sdl
+	ln -s $BUILD_sdl sdl
 }
 
 function build_sdl() {
 	cd $SRC_PATH/jni
 	push_arm
 	ndk-build V=1
 	pop_arm
+
+	# rename libs
+	cp -a $SRC_PATH/libs/$ARCH/*.so $LIBS_PATH
+
+	# FIXME: patch jni compilation to make it work.
+	cd $LIBS_PATH
+	mv libsdl_image.so libSDL_image.so
+	mv libsdl_image.so libSDL_image.so
+	mv libsdl_main.so libSDL_main.so
+	mv libsdl_mixer.so libSDL_mixer.so
+	mv libsdl_ttf.so libSDL_ttf.so
 }
 
 function postbuild_sdl() {

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ function build_python() {`
`47`	`47`	`pop_arm`
`48`	`48`
`49`	`49`	`try cp $BUILD_hostpython/hostpython $BUILD_PATH/python-install/bin/python.host`
	`50`	`+ try cp libpython2.7.so $LIBS_PATH/`
`50`	`51`	`}`
`51`	`52`
`52`	`53`