changes

olymk2 · olymk2 · commit c06b57f86e0b · 2015-03-28T21:46:04.000Z
diff --git a/recipes/freetype/recipe.sh b/recipes/freetype/recipe.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 VERSION_freetype=${VERSION_freetype:-2.5.5}
-#DEPS_freetype=(python)
+DEPS_freetype=(harfbuzz)
 URL_freetype=http://download.savannah.gnu.org/releases/freetype/freetype-2.5.5.tar.gz
-#MD5_freetype=4ba105e2d8535496fd633889396b20b7
+MD5_freetype=7448edfbd40c7aa5088684b0a3edb2b8
 BUILD_freetype=$BUILD_PATH/freetype/$(get_directory $URL_freetype)
 RECIPE_freetype=$RECIPES_PATH/freetype
 
@@ -23,7 +23,10 @@ function build_freetype() {
 	cd $BUILD_freetype
 
 	push_arm
-
+    export LDFLAGS="$LDFLAGS -L$BUILD_harfbuzz/src/.libs/"
+    echo $SRC_PATH
+    echo $BUILD_harfbuzz
+    #return
 	#~ export CC="$CC -I$BUILD_libfreetype/include"
 	#~ export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	#~ export LDSHARED="$LIBLINK"
@@ -33,13 +36,10 @@ function build_freetype() {
 
 
     #try sh autogen.sh
-	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-zlib --with-png=no --without-harfbuzz --enable-shared
-	#try ./configure --build=i686-pc-linux-gnu --host=arm-eabi OPT=$OFLAG --enable-shared --disable-toolbox-glue --disable-framework --without-zlib --with-png=no
+	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-zlib --with-png=no --enable-shared
 	try make -j5
-	#try make -k CROSS_COMPILE_TARGET=yes INSTSONAME=libfreetype.so#-j4
 	pop_arm
     echo 'finished'
-    #try cp -L $BUILD_freetype/objs/.libs/libfreetype.so $LIBS_PATH/libfreetype.so.6
     try cp -L $BUILD_freetype/objs/.libs/libfreetype.so $LIBS_PATH
 
 }
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+VERSION_harfbuzz=${VERSION_harfbuzz:-2.5.5}
+URL_harfbuzz=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.40.tar.bz2
+MD5_harfbuzz=0e27e531f4c4acff601ebff0957755c2
+BUILD_harfbuzz=$BUILD_PATH/harfbuzz/$(get_directory $URL_harfbuzz)
+RECIPE_harfbuzz=$RECIPES_PATH/harfbuzz
+
+# function called for preparing source code if needed
+# (you can apply patch etc here.)
+function prebuild_harfbuzz() {
+    true
+}
+
+function shouldbuild_harfbuzz() {
+    if [ -f "$BUILD_harfbuzz/src/.libs/libharfbuzz.so" ]; then
+        DO_BUILD=0
+    fi
+}
+
+function build_harfbuzz() {
+    cd $BUILD_harfbuzz
+
+    push_arm
+    try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --enable-shared --without-freetype --without-glib
+    try make -j5
+    pop_arm
+    try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
+}
+
+# function called after all the compile have been done
+function postbuild_harfbuzz() {
+    true
+}
+
diff --git a/recipes/python/patches/ctypes-find-library.diff b/recipes/python/patches/ctypes-find-library.diff
@@ -1,23 +1,21 @@
 --- Python-2.7.2.orig/Lib/ctypes/util.py	2011-06-11 16:46:24.000000000 +0100
-+++ Python-2.7.2/Lib/ctypes/util.py	2015-03-25 19:39:15.617933144 +0000
-@@ -84,6 +84,20 @@
++++ Python-2.7.2/Lib/ctypes/util.py	2015-03-26 13:45:33.322172603 +0000
+@@ -83,7 +83,17 @@
+             except ValueError:
                  continue
          return None
- 
+-
 +elif os.name == "posix" and sys.platform == "linux3":
-+    print sys.path
 +    def find_library(name):
 +        """ hack to find librarys for kivy and android 
 +        split the path and get the first parts which will give us 
 +        the app path something like /data/data/org.app.foo/"""
 +        app_root = os.path.abspath('./').split(os.path.sep)[0:4]
-+        lib_search = os.path.sep.join(app_root) + os.path.sep + 'files'
++        lib_search = os.path.sep.join(app_root) + os.path.sep + 'lib'
 +        for filename in os.listdir(lib_search):
-+            print filename
 +            if filename.endswith('.so') and name in filename:
 +                return lib_search + os.path.sep + filename
 +        return None
-+
  elif os.name == "posix":
      # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
      import re, tempfile, errno
