From 4829a4708d621373939ff44f3b0aea907be7f905 Mon Sep 17 00:00:00 2001 From: David Black Date: Fri, 12 Apr 2013 20:49:38 +0100 Subject: [PATCH] new non-working com.nooskewl.bobby --- metadata/com.nooskewl.bobby.txt | 37 ++++++++++++++ metadata/com.nooskewl.bobby/bobby.patch | 68 +++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 metadata/com.nooskewl.bobby.txt create mode 100644 metadata/com.nooskewl.bobby/bobby.patch diff --git a/metadata/com.nooskewl.bobby.txt b/metadata/com.nooskewl.bobby.txt new file mode 100644 index 0000000000..2f27527e96 --- /dev/null +++ b/metadata/com.nooskewl.bobby.txt @@ -0,0 +1,37 @@ +Category:Games +# Allegro is zlib; Bobby is "choose your licence" +License:Zlib +Web Site:http://www.nooskewl.com/content/bobby +Source Code:http://www.nooskewl.com/content/more-open-source +Issue Tracker:http://www.nooskewl.com/forums/bobby + +Summary:2-D game +Description: +. + +Repo Type:git +Repo:git://nooskewl.com/bobby.git + +# missing liballegro_ttf-debug.so and allegro5/allegro_ttf.h +# allegro seems to be installed for armeabi-v7a not for armeabi +# need to run make install as root to get freetype headers +Build Version:1.4.1,2,c544e260f,subdir=android-proj,\ +patch=bobby.patch,scanignore=toolchain;jni,rm=\ +android-proj/bobby-signed-googleplay.apk;android-proj/bobby-signed-amazon.apk,\ +prebuild=sed -i 's/true/false/g' AndroidManifest.xml && \ +wget http://download.savannah.gnu.org/releases/freetype/freetype-2.4.10.tar.bz2 && \ +tar xvjf freetype-2.4.10.tar.bz2 && rm freetype-2.4.10.tar.bz2 && \ +git clone git://git.code.sf.net/p/alleg/allegro && \ +mkdir -p allegro/build jni/armeabi && mv libs/*.so jni/armeabi/,build=\ +$$NDK$$/build/tools/make-standalone-toolchain.sh \ +--platform=android-9 --install-dir=toolchain && cd freetype-2.4.10/ && \ +./configure --host=arm-linux-androideabi PLATFORM_PREFIX=../toolchain/ \ +NDK_PATH=$$NDK$$ NDK_PLATFORM=android-9 && make && sudo make install && \ +cd ../allegro/ && git checkout 5.1 && cd build/ && \ +cmake .. -DANDROID_NDK_TOOLCHAIN_ROOT=../../toolchain -DWANT_ANDROID=on \ +-DWANT_EXAMPLES=OFF -DWANT_DEMO=OFF -DCMAKE_BUILD_TYPE=Debug && \ +make && make install && cd ../../ && mv allegro/build/lib/*.so jni/armeabi/ && \ +ANDROID_NDK_TOOLCHAIN_ROOT=toolchain $$NDK$$/ndk-build,buildjni=no + +Update Check Mode:Static + diff --git a/metadata/com.nooskewl.bobby/bobby.patch b/metadata/com.nooskewl.bobby/bobby.patch new file mode 100644 index 0000000000..9f55a82f5f --- /dev/null +++ b/metadata/com.nooskewl.bobby/bobby.patch @@ -0,0 +1,68 @@ +diff --git a/android-proj/jni/Android.mk b/android-proj/jni/Android.mk +index 0f83e81..c540c07 100644 +--- a/android-proj/jni/Android.mk ++++ b/android-proj/jni/Android.mk +@@ -39,25 +39,32 @@ include $(PREBUILT_SHARED_LIBRARY) + + include $(CLEAR_VARS) + +-LOCAL_MODULE := liballegro_ttf-prebuilt +-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_ttf-debug.so ++LOCAL_MODULE := liballegro_acodec ++LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_acodec-debug.so + include $(PREBUILT_SHARED_LIBRARY) + + include $(CLEAR_VARS) + +-LOCAL_MODULE := libbass-prebuilt +-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libbass.so ++LOCAL_MODULE := liballegro_audio ++LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_audio-debug.so + include $(PREBUILT_SHARED_LIBRARY) + + include $(CLEAR_VARS) + ++LOCAL_MODULE := liballegro_ttf-prebuilt ++LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_ttf-debug.so ++include $(PREBUILT_SHARED_LIBRARY) ++ ++include $(CLEAR_VARS) ++ ++ + LOCAL_ALLOW_UNDEFINED_SYMBOLS := false + LOCAL_MODULE := Bobby + LOCAL_SRC_FILES := Bobby.c bassstuff.cpp + LOCAL_LDLIBS := +-LOCAL_CFLAGS := -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/include -DDEBUGMODE -DWITHOUT_GAMECENTER ++LOCAL_CFLAGS := -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi-v7a/include -DDEBUGMODE -DWITHOUT_GAMECENTER -DKCM_AUDIO -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/include -DDEBUGMODE -DWITHOUT_GAMECENTER -DKCM_AUDIO + +-LOCAL_LDLIBS := -L$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/lib -L$(LOCAL_PATH)/$(TARGET_ARCH_ABI) -llog libs/$(TARGET_ARCH_ABI)/liballegro-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_primitives-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_image-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_font-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_ttf-debug.so libs/$(TARGET_ARCH_ABI)/libbass.so -lGLESv1_CM ++LOCAL_LDLIBS := -L$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/lib -L$(LOCAL_PATH)/$(TARGET_ARCH_ABI) -llog libs/$(TARGET_ARCH_ABI)/liballegro-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_primitives-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_image-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_font-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_ttf-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_audio-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_acodec-debug.so -lGLESv1_CM + + include $(BUILD_SHARED_LIBRARY) + +diff --git a/android-proj/jni/Application.mk b/android-proj/jni/Application.mk +index 3a14cf5..4a51fd3 100644 +--- a/android-proj/jni/Application.mk ++++ b/android-proj/jni/Application.mk +@@ -1,4 +1,4 @@ + APP_PLATFORM := android-10 +-APP_ABI := armeabi +-APP_MODULES := liballegro-prebuilt liballegro_primitives-prebuilt liballegro_image-prebuilt liballegro_font-prebuilt liballegro_ttf-prebuilt libbass-prebuilt Bobby ++APP_ABI := armeabi armeabi-v7a ++APP_MODULES := liballegro-prebuilt liballegro_primitives-prebuilt liballegro_image-prebuilt liballegro_font-prebuilt liballegro_ttf-prebuilt liballegro_acodec liballegro_audio Bobby + APP_STL := stlport_static +diff --git a/android-proj/src/com/nooskewl/bobby/AllegroActivity.java b/android-proj/src/com/nooskewl/bobby/AllegroActivity.java +index 3e18663..063c0c1 100644 +--- a/android-proj/src/com/nooskewl/bobby/AllegroActivity.java ++++ b/android-proj/src/com/nooskewl/bobby/AllegroActivity.java +@@ -117,7 +117,8 @@ public class AllegroActivity extends Activity implements SensorEventListener + System.loadLibrary("allegro_image-debug"); + System.loadLibrary("allegro_font-debug"); + System.loadLibrary("allegro_ttf-debug"); +- System.loadLibrary("bass"); ++ System.loadLibrary("allegro_audio"); ++ System.loadLibrary("allegro_acodec"); + System.loadLibrary("Bobby"); + } +