Merge commit 'refs/merge-requests/221' of gitorious.org:f-droid/fdroiddata
This commit is contained in:
commit
6a7a4b05aa
|
@ -27,14 +27,19 @@ Status: BETA
|
|||
.
|
||||
|
||||
Repo Type:git
|
||||
Repo:git://github.com/adventuregamestudio/ags.git
|
||||
#Repo:git://github.com/adventuregamestudio/ags.git
|
||||
Repo:file:///home/uniqa/ags
|
||||
|
||||
# ignored files
|
||||
Build:3.3.0-beta,1
|
||||
commit=v.3.3.0-beta
|
||||
disabled=Tons of prebuilts
|
||||
init=find ../.. -iregex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
|
||||
git submodule foreach git checkout d6f13daef9
|
||||
build=cd ../buildlibs && find -name "*.sh" -exec chmod +x {} + && ./buildall.sh
|
||||
patch=ndkr9.patch
|
||||
subdir=Android/launcher_list
|
||||
submodules=yes
|
||||
target=android-16
|
||||
target=android-17
|
||||
update=.;../library
|
||||
forceversion=yes
|
||||
buildjni=../library
|
||||
|
|
72
metadata/com.bigbluecup.android.launcher/ndkr9.patch
Normal file
72
metadata/com.bigbluecup.android.launcher/ndkr9.patch
Normal file
|
@ -0,0 +1,72 @@
|
|||
From fe3d87c86b830c5e6d7b7e990de5ec5ef68483e7 Mon Sep 17 00:00:00 2001
|
||||
From: jjsat <jjs@jjs.at>
|
||||
Date: Sun, 25 Aug 2013 11:39:02 +0200
|
||||
Subject: [PATCH] Android: Fix building with NDK r9.
|
||||
|
||||
---
|
||||
Android/library/jni/pe_jni.c | 2 +-
|
||||
Engine/platform/android/acpland.cpp | 6 +++---
|
||||
Engine/platform/util/libc.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Android/library/jni/pe_jni.c b/Android/library/jni/pe_jni.c
|
||||
index ac5b359..c24681b 100644
|
||||
--- a/Android/library/jni/pe_jni.c
|
||||
+++ b/Android/library/jni/pe_jni.c
|
||||
@@ -13,7 +13,7 @@ void android_debug_printf(char* format, ...)
|
||||
vsprintf(buffer, format, ap);
|
||||
va_end(ap);
|
||||
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "Allegro", buffer);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "Allegro", "%s", buffer);
|
||||
}
|
||||
|
||||
int IsDataFile(version_info_t* version_info)
|
||||
diff --git a/Engine/platform/android/acpland.cpp b/Engine/platform/android/acpland.cpp
|
||||
index 3aa1668..244d595 100644
|
||||
--- a/Engine/platform/android/acpland.cpp
|
||||
+++ b/Engine/platform/android/acpland.cpp
|
||||
@@ -675,7 +675,7 @@ void AGSAndroid::WriteDebugString(const char* texx, ...)
|
||||
va_start(ap,texx);
|
||||
vsprintf(&displbuf[5],texx,ap);
|
||||
va_end(ap);
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ void AGSAndroid::DisplayAlert(const char *text, ...) {
|
||||
JNIEnv* thread_env;
|
||||
android_jni_vm->AttachCurrentThread(&thread_env, NULL);
|
||||
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
|
||||
jstring java_string = thread_env->NewStringUTF(displbuf);
|
||||
thread_env->CallVoidMethod(java_object, java_messageCallback, java_string);
|
||||
@@ -765,7 +765,7 @@ void AGSAndroid::WriteConsole(const char *text, ...) {
|
||||
va_start(ap, text);
|
||||
vsprintf(displbuf, text, ap);
|
||||
va_end(ap);
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
}
|
||||
|
||||
void AGSAndroid::ShutdownCDPlayer() {
|
||||
diff --git a/Engine/platform/util/libc.c b/Engine/platform/util/libc.c
|
||||
index e201d2b..e3820af 100644
|
||||
--- a/Engine/platform/util/libc.c
|
||||
+++ b/Engine/platform/util/libc.c
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <string.h>
|
||||
|
||||
// Only a dummy. It is used in a function of alfont, but never called in AGS.
|
||||
-size_t malloc_usable_size(void* allocation)
|
||||
+size_t malloc_usable_size(const void* allocation)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ subdir=project,patch=tcl.patch,scanignore=project/jni/tcl8.5,\
|
|||
init=\
|
||||
ln -s ../../OpenMSX openmsx && \
|
||||
sed -ri 's/ant debug|ant release/exit/' ../build.sh && \
|
||||
find -L -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \
|
||||
find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \
|
||||
rm -rf ffmpeg/lib/* python/src/pythonp python/src/Parser/pgen ../themes/converter/converter && \
|
||||
prebuild=\
|
||||
export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh,\
|
||||
|
|
|
@ -10,7 +10,7 @@ Description:
|
|||
Yabause support booting games using Saturn cds or iso files. BIOS (optional) should be placed into
|
||||
/sdcard/yabause/bios and games go in /sdcard/yabause/games.
|
||||
|
||||
[Compatibility list http://yabause.org/compatibility-list/]
|
||||
[http://yabause.org/compatibility-list/ Compatibility list]
|
||||
|
||||
Status: ALPHA
|
||||
.
|
||||
|
@ -21,12 +21,12 @@ Repo:http://svn.code.sf.net/p/yabause/code/trunk/
|
|||
# r3136 is the last, known to work for sure
|
||||
Build Version:0.9.11,1,3136,buildjni=no,subdir=yabause/src/android,patch=toolchain.patch,\
|
||||
build=\
|
||||
cd ../.. && \
|
||||
echo "APP_CFLAGS+=-Wno-error=format-security" > jni/Application.mk && \
|
||||
export ANDROID_NDK="$$NDK$$" && cd ../.. && \
|
||||
export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \
|
||||
export ANDROID_NDK="$$NDK$$" && \
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake \
|
||||
-DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android \
|
||||
-DYAB_PORTS=android . && make
|
||||
-DYAB_PORTS=android . && make
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:None
|
||||
|
|
Loading…
Reference in a new issue