From 71a72389e3e889481e83893da3e33208f195bbc2 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 9 Nov 2018 20:27:49 +0200 Subject: [PATCH 01/16] SDL: updated submodules --- project/jni/boost/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/boost/src b/project/jni/boost/src index 1bd9aa134..e5dbf0d54 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 1bd9aa13463be4553b1146d6a5916566c2fba69c +Subproject commit e5dbf0d54477a3c0caa23e5c988c4fb256d820a5 From fd5babab779449d72e6fdbbbeced45fc0c88e398 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 19 Nov 2018 19:42:28 +0200 Subject: [PATCH 02/16] SDL: removed android-support symlink, it will generate a duplicate module name error --- changeAppSettings.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 3c5906aa9..c7d83faca 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -1102,8 +1102,6 @@ fi ./copyAssets.sh || exit 1 rm -rf project/jni/android-support -echo "$NDK_TOOLCHAIN_VERSION" | grep 'clang' > /dev/null || \ - ln -s "`which ndk-build | sed 's@/ndk-build@@'`/sources/android/support" project/jni/android-support rm -rf project/res/drawable/banner.png if [ -e project/jni/application/src/banner.png ]; then From 68d69233579dce9930a060fb4eb6a619bfb969eb Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 19 Nov 2018 19:55:32 +0200 Subject: [PATCH 03/16] SDL: converted Guichan to static library, because we are using static libc++ so all C++ code must be linked inside libapplication.so --- project/jni/SettingsTemplate.mk | 2 +- project/jni/guichan/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index 6976dcffb..5a9f2f167 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -6,7 +6,7 @@ APP_AVAILABLE_STATIC_LIBS := jpeg png freetype fontconfig xerces ogg vorbis flac boost_regex boost_serialization boost_signals boost_stacktrace_basic boost_stacktrace_noop \ boost_system boost_test_exec_monitor boost_thread boost_timer boost_type_erasure boost_unit_test_framework boost_wave boost_wserialization \ glu icudata icutest icui18n icuio icule iculx icutu icuuc icu-le-hb harfbuzz sdl_savepng android_support \ - gl4es nanogl gd + gl4es nanogl gd guichan # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 APP_MODULES := application sdl-1.2 sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype tremor ogg diff --git a/project/jni/guichan/Android.mk b/project/jni/guichan/Android.mk index 691c142b7..3bfd73dfd 100755 --- a/project/jni/guichan/Android.mk +++ b/project/jni/guichan/Android.mk @@ -22,4 +22,4 @@ LOCAL_STATIC_LIBRARIES := LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) From 61c5b7352b22be464487d559df5cb0d50bfbc605 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 19 Nov 2018 20:09:34 +0200 Subject: [PATCH 04/16] SDL: fixed build warning --- project/jni/guichan/Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/jni/guichan/Android.mk b/project/jni/guichan/Android.mk index 3bfd73dfd..dfaeaa1cb 100755 --- a/project/jni/guichan/Android.mk +++ b/project/jni/guichan/Android.mk @@ -20,6 +20,4 @@ LOCAL_SHARED_LIBRARIES += sdl_image sdl_ttf LOCAL_STATIC_LIBRARIES := -LOCAL_LDLIBS := -llog - include $(BUILD_STATIC_LIBRARY) From 969d785ec1741b0a348a032632b388d41d26c756 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 5 Dec 2018 19:25:37 +0200 Subject: [PATCH 05/16] SDL: notice that MP# is patent-free now --- changeAppSettings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index c7d83faca..38db3d6e9 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -405,7 +405,7 @@ echo "# Available architectures: armeabi-v7a arm64-v8a x86 x86_64" >> AndroidApp echo MultiABI=\'$MultiABI\' >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Optional shared libraries to compile - removing some of them will save space" >> AndroidAppSettings.cfg -echo "# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed" >> AndroidAppSettings.cfg +echo "# MP3 patents are expired, but libmad license is GPL, not LGPL" >> AndroidAppSettings.cfg grep 'Available' project/jni/SettingsTemplate.mk >> AndroidAppSettings.cfg echo CompiledLibraries=\"$CompiledLibraries\" >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg From bf0eb74ea82a530d4ba459f0e0b79670f5658094 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 5 Dec 2018 19:49:59 +0200 Subject: [PATCH 06/16] SDL: fix for loading libiconv --- project/java/MainActivity.java | 3 +++ project/jni/application/ballfield/AndroidAppSettings.cfg | 2 +- project/jni/iconv/src | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 084eb1f18..5279509e8 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -1195,6 +1195,7 @@ public class MainActivity extends Activity File libpath = new File(getFilesDir().getAbsolutePath() + "/../lib/" + libname); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); System.load(libpath.getPath()); + Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath()); } catch( UnsatisfiedLinkError e ) { @@ -1205,11 +1206,13 @@ public class MainActivity extends Activity File libpath = new File(getFilesDir().getAbsolutePath() + "/" + libname); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); System.load(libpath.getPath()); + Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath()); } catch( UnsatisfiedLinkError ee ) { Log.i("SDL", "libSDL: error loading lib " + l + ": " + ee.toString()); System.loadLibrary(l); + Log.i("SDL", "libSDL: loaded lib " + l + " from app lib path"); } } } diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index b57a87ed8..65b292ea7 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -269,7 +269,7 @@ APP_PLATFORM= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi-v7a x86 arm64-v8a x86_64 -MultiABI='armeabi-v7a arm64-v8a x86 x86_64' +MultiABI='arm64-v8a' # armeabi-v7a x86 x86_64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed diff --git a/project/jni/iconv/src b/project/jni/iconv/src index 77c9e6c31..3265ce98e 160000 --- a/project/jni/iconv/src +++ b/project/jni/iconv/src @@ -1 +1 @@ -Subproject commit 77c9e6c31e2dc1c5273dfc4b09903957caaf53ca +Subproject commit 3265ce98ed76be7e62fdc61f0a358fb42ccbd97e From eec2e53f0f3ff52f8d2dfa6ede3f6639191b4ef2 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 5 Dec 2018 20:15:36 +0200 Subject: [PATCH 07/16] SDL: fixed optimization flags for debug builds, I can finally run ndk-gdb because I've got a new phone yay --- project/jni/Application.mk | 5 ++++- project/jni/sdl-1.2/Android.mk | 6 +++++- project/jni/sdl-1.2/src/video/android/SDL_androidinput.c | 2 +- project/jni/sdl_image/Android.mk | 6 +++++- project/jni/sdl_mixer/Android.mk | 6 +++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/project/jni/Application.mk b/project/jni/Application.mk index 758fd1213..5d22f6f71 100644 --- a/project/jni/Application.mk +++ b/project/jni/Application.mk @@ -3,7 +3,10 @@ APP_PROJECT_PATH := $(call my-dir)/.. include jni/Settings.mk APP_STL := c++_static -APP_CFLAGS := -Oz -DNDEBUG -g # -Oz works best with clang +APP_CFLAGS := -g +ifneq ($(NDK_DEBUG),1) +APP_CFLAGS += -Oz -DNDEBUG # -Oz works best with clang +endif APP_PIE := true # This feature makes executables incompatible to Android API 15 or lower, but executables without PIE will not run on Android 5.0 and newer SDL_EXCLUDE_LIBGCC := -Wl,--exclude-libs,libgcc.a SDL_EXCLUDE_LIBUNWIND := -Wl,--exclude-libs,libunwind.a diff --git a/project/jni/sdl-1.2/Android.mk b/project/jni/sdl-1.2/Android.mk index 7fcf7cb05..71c846f54 100644 --- a/project/jni/sdl-1.2/Android.mk +++ b/project/jni/sdl-1.2/Android.mk @@ -9,7 +9,7 @@ $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package wit endif LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -O3 \ +LOCAL_CFLAGS := \ -DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \ -DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\" \ -DSDL_TRACKBALL_KEYUP_DELAY=$(SDL_TRACKBALL_KEYUP_DELAY) \ @@ -17,6 +17,10 @@ LOCAL_CFLAGS := -O3 \ -DSDL_VIDEO_RENDER_RESIZE=$(SDL_VIDEO_RENDER_RESIZE) \ $(SDL_ADDITIONAL_CFLAGS) +ifneq ($(NDK_DEBUG),1) +LOCAL_CFLAGS += -O3 -DNDEBUG +endif + SDL_SRCS := \ src/*.c \ src/audio/*.c \ diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index f7b0423bf..a718b474d 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -856,7 +856,7 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMotionEvent) ( JNIEnv* env, jobject t return; #endif - __android_log_print(ANDROID_LOG_INFO, "libSDL", "Motion event: %4d %4d action %d ptr %d, force %d radius %d", x, y, action, pointerId, force, radius); + //__android_log_print(ANDROID_LOG_INFO, "libSDL", "Motion event: %4d %4d action %d ptr %d, force %d radius %d", x, y, action, pointerId, force, radius); pointerId = BumpPointerId( pointerId ); diff --git a/project/jni/sdl_image/Android.mk b/project/jni/sdl_image/Android.mk index 8d0409501..42d94df19 100644 --- a/project/jni/sdl_image/Android.mk +++ b/project/jni/sdl_image/Android.mk @@ -5,11 +5,15 @@ include $(CLEAR_VARS) LOCAL_MODULE := sdl_image LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../jpeg/include $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include -LOCAL_CFLAGS := -O3 \ +LOCAL_CFLAGS := \ -DLOAD_JPG -DLOAD_PNG -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM \ -DLOAD_PCX -DLOAD_PNM -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM \ -DLOAD_XV +ifneq ($(NDK_DEBUG),1) +LOCAL_CFLAGS += -O3 -DNDEBUG +endif + LOCAL_CPP_EXTENSION := .cpp LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk index 5a749287f..f3bbbcddb 100644 --- a/project/jni/sdl_mixer/Android.mk +++ b/project/jni/sdl_mixer/Android.mk @@ -8,7 +8,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $( $(LOCAL_PATH)/../mad/include $(LOCAL_PATH)/../flac/include $(LOCAL_PATH)/../ogg/include \ $(LOCAL_PATH)/../vorbis/include $(LOCAL_PATH)/../tremor/include $(LOCAL_PATH)/../mikmod/include \ $(LOCAL_PATH)/timidity -LOCAL_CFLAGS := -O3 -DWAV_MUSIC -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC -DMID_MUSIC -DUSE_TIMIDITY_MIDI +LOCAL_CFLAGS := -DWAV_MUSIC -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC -DMID_MUSIC -DUSE_TIMIDITY_MIDI + +ifneq ($(NDK_DEBUG),1) +LOCAL_CFLAGS += -O3 -DNDEBUG +endif LOCAL_CPP_EXTENSION := .cpp From 264f7aa43f87ba2f5057d2ee2fb04f53e3331e51 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 5 Dec 2018 20:19:39 +0200 Subject: [PATCH 08/16] SDL: disabled spammy debug output --- .../jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c index cc022cae6..6b2563af0 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c @@ -78,7 +78,7 @@ extern void SDL_ANDROID_MainThreadPushMouseMotion(int x, int y) { SDL_ANDROID_currentMouseX = x; SDL_ANDROID_currentMouseY = y; - __android_log_print(ANDROID_LOG_INFO, "libSDL", "MainThreadPushMouseMotion: %4d %4d", x, y); + //__android_log_print(ANDROID_LOG_INFO, "libSDL", "MainThreadPushMouseMotion: %4d %4d", x, y); SDL_SendMouseMotion( ANDROID_CurrentWindow, 0, x, y ); } From 5b778604b518b48f630c1940316050b7ecf98f60 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 11 Dec 2018 19:14:08 +0200 Subject: [PATCH 09/16] Updated todo --- todo.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/todo.txt b/todo.txt index 2adb53f51..96989db31 100644 --- a/todo.txt +++ b/todo.txt @@ -25,6 +25,10 @@ TODO, which will get actually done - SDL: support for mounting OBB files as directories: https://developer.android.com/google/play/expansion-files.html +- SDL: SdlVideoResizeKeepAspect=y mouse location shifted near right border. + +- SDL: Text input window is slightly out of screen on phone with virtual navigation keys. + - Debian: proot crashes on Shield TV arm64 box. - Debian: add harldink simulation to proot, for Android 6. From f3ee09e0477e1c4b0d79fd9f340eacf0b8da6eca Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 13 Dec 2018 18:39:46 +0200 Subject: [PATCH 10/16] Updated todo --- todo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/todo.txt b/todo.txt index 96989db31..d5c07d8c6 100644 --- a/todo.txt +++ b/todo.txt @@ -29,6 +29,8 @@ TODO, which will get actually done - SDL: Text input window is slightly out of screen on phone with virtual navigation keys. +- SDL: Text input window still blocks touches sometimes after text input is finished. + - Debian: proot crashes on Shield TV arm64 box. - Debian: add harldink simulation to proot, for Android 6. From 63178dd22b3dd39ff0e24261a92d129225a108ae Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 13 Dec 2018 19:48:19 +0200 Subject: [PATCH 11/16] Updated boost --- project/jni/boost/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/boost/src b/project/jni/boost/src index e5dbf0d54..c73f21d76 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit e5dbf0d54477a3c0caa23e5c988c4fb256d820a5 +Subproject commit c73f21d7670c49f35d45dda3be8d30a0504fdb5f From da55d8672311bc09ccff35d4653c179f28fbc483 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 13 Dec 2018 20:49:08 +0200 Subject: [PATCH 12/16] SDL: account for rounded screen corners for text input --- project/java/MainActivity.java | 2 ++ project/jni/application/ballfield/ballfield.cpp | 4 ++-- todo.txt | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 5279509e8..8aab7b017 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -871,6 +871,8 @@ public class MainActivity extends Activity screenKeyboard.setTextColor(this.getResources().getColor(android.R.color.background_light)); if( isRunningOnOUYA() && Globals.TvBorders ) screenKeyboard.setPadding(100, 100, 100, 100); // Bad bad HDMI TVs all have cropped borders + else + screenKeyboard.setPadding(20, 20, 20, 20); // Account for rounded screen corners _screenKeyboard = screenKeyboard; _videoLayout.addView(_screenKeyboard); //_screenKeyboard.setKeyListener(new TextKeyListener(TextKeyListener.Capitalize.NONE, false)); diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp index 875fbc478..2a4c359c0 100644 --- a/project/jni/application/ballfield/ballfield.cpp +++ b/project/jni/application/ballfield/ballfield.cpp @@ -715,7 +715,7 @@ int main(int argc, char* argv[]) if(evt.key.keysym.sym == SDLK_2) { __android_log_print(ANDROID_LOG_INFO, "Ballfield", "Async text input started"); - asyncTextInputBuf[0] = 0; + strcpy(asyncTextInputBuf, "async"); SDL_ANDROID_GetScreenKeyboardTextInputAsync(asyncTextInputBuf, sizeof(asyncTextInputBuf)); } if(evt.key.keysym.sym == SDLK_3) @@ -768,7 +768,7 @@ int main(int argc, char* argv[]) } } } - if( screenKeyboardShown != SDL_IsScreenKeyboardShown(NULL)) + if( screenKeyboardShown != SDL_IsScreenKeyboardShown(NULL) ) { __android_log_print(ANDROID_LOG_INFO, "Ballfield", "Screen keyboard shown: %d -> %d", screenKeyboardShown, SDL_IsScreenKeyboardShown(NULL)); screenKeyboardShown = SDL_IsScreenKeyboardShown(NULL); diff --git a/todo.txt b/todo.txt index d5c07d8c6..d9b4196ae 100644 --- a/todo.txt +++ b/todo.txt @@ -27,8 +27,6 @@ TODO, which will get actually done - SDL: SdlVideoResizeKeepAspect=y mouse location shifted near right border. -- SDL: Text input window is slightly out of screen on phone with virtual navigation keys. - - SDL: Text input window still blocks touches sometimes after text input is finished. - Debian: proot crashes on Shield TV arm64 box. From 6b1bd79e2fc40087f35d31d50f8b2943e229d967 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 17 Dec 2018 23:41:24 +0200 Subject: [PATCH 13/16] OpenLieroX: fixed opening app from Chrome notification --- .../ballfield/AndroidAppSettings.cfg | 2 +- .../openlierox/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openlierox/java.patch | 19 +++++++++++++------ .../jni/application/openlierox/project.patch | 13 +++++++++---- project/jni/application/openlierox/src | 2 +- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 65b292ea7..56ad0e328 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -67,7 +67,7 @@ SwVideoMode=y SdlVideoResize=y # Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) -SdlVideoResizeKeepAspect=y +SdlVideoResizeKeepAspect=n # Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer InhibitSuspend=y diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index 2afd5597a..dff7bcbdd 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenLieroX" AppFullName=openlierox.net # Application version code (integer) -AppVersionCode=10580525 +AppVersionCode=10580526 # Application user-visible version name (string) -AppVersionName="0.58rc5a25" +AppVersionName="0.58rc5a26" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -269,7 +269,7 @@ MultiABI='armeabi-v7a arm64-v8a x86 x86_64' # arm64-v8a x86 x86_64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma mad" +CompiledLibraries="sdl_image sdl_mixer xml2 curl ssl crypto gd jpeg vorbis ogg lzma mad" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n diff --git a/project/jni/application/openlierox/java.patch b/project/jni/application/openlierox/java.patch index dbfef06b0..91c852a9e 100644 --- a/project/jni/application/openlierox/java.patch +++ b/project/jni/application/openlierox/java.patch @@ -11,9 +11,9 @@ index 9e6150a..09ade66 100644 if( Globals.TouchscreenKeyboardTheme == 4 ) nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.retro)); if( Globals.TouchscreenKeyboardTheme == 5 ) ---- /dev/null 2018-04-10 21:06:44.327303421 +0300 -+++ b/project/java/RunFromOtherApp.java 2018-05-17 22:21:46.816651827 +0300 -@@ -0,0 +1,108 @@ +--- /dev/null 2018-12-13 18:37:19.876000065 +0200 ++++ Connect.java 2018-12-17 21:16:01.027001714 +0200 +@@ -0,0 +1,115 @@ +/* +Simple DirectMedia Layer +Java source code (C) 2009-2014 Sergii Pylypenko @@ -105,7 +105,7 @@ index 9e6150a..09ade66 100644 +import android.content.ComponentName; + + -+public class RunFromOtherApp extends Activity ++public class Connect extends Activity +{ + @Override + protected void onCreate(Bundle savedInstanceState) @@ -114,9 +114,16 @@ index 9e6150a..09ade66 100644 + + Intent main = new Intent(this, MainActivity.class); + main.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); -+ if( getIntent().getScheme() != null && getIntent().getScheme().equals("openlierox") ) ++ if( getIntent().getScheme() != null && getIntent().getScheme().equals("openlierox") && getIntent().getData() != null && getIntent().getData().getHost().equals("connect") ) + { -+ main.putExtra(RestartMainActivity.SDL_RESTART_PARAMS, getIntent().getData().getHost() + ":" + getIntent().getData().getPort()); ++ main.putExtra(RestartMainActivity.SDL_RESTART_PARAMS, getIntent().getData().getPath().replace("/","").replace("!",":")); ++ } ++ if( getIntent().getScheme() != null && getIntent().getScheme().equals("https") && getIntent().getData() != null && getIntent().getData().getPath().contains("connect") ) ++ { ++ if( getIntent().getData().getQueryParameter("a") != null ) ++ main.putExtra(RestartMainActivity.SDL_RESTART_PARAMS, getIntent().getData().getQueryParameter("a").replace("!",":")); ++ else ++ main.putExtra(RestartMainActivity.SDL_RESTART_PARAMS, getIntent().getData().getPath().replace("/connect/","").replace("!",":")); + } + startActivity(main); + finish(); diff --git a/project/jni/application/openlierox/project.patch b/project/jni/application/openlierox/project.patch index 429ee0549..4405f07ba 100644 --- a/project/jni/application/openlierox/project.patch +++ b/project/jni/application/openlierox/project.patch @@ -1,21 +1,26 @@ --- a/project/AndroidManifest.xml 2018-05-17 22:12:08.421817275 +0300 +++ a/project/AndroidManifest.xml 2018-05-17 22:14:05.186301554 +0300 -@@ -27,6 +27,19 @@ +@@ -27,6 +27,24 @@ -+ + -+ -+ + + ++ + + ++ ++ ++ ++ ++ ++ + Date: Mon, 24 Dec 2018 23:15:06 +0200 Subject: [PATCH 14/16] Updated todo --- todo.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/todo.txt b/todo.txt index d9b4196ae..8157bc947 100644 --- a/todo.txt +++ b/todo.txt @@ -34,3 +34,15 @@ TODO, which will get actually done - Debian: add harldink simulation to proot, for Android 6. - Debian: add OpenSL ES output plugin to PulseAudio. + +- XServer: apostrophe and minus on hardware keyboard with Italian layout are swapped, and slash (key 7) dos not work, seems to be incorrect keycode processing in SDL. + +- XServer: do not use xsel to enter Unicode characters, modify clipboard directly. + +- XServer: remove checking network port and restarting, add SO_REUSEPORT flag. + +- XServer: fix xrandr screen resizing. + +- XServer: use pixel size instead of screen size. + +- XServer: native PulseAudio support using OpenSLES. From 8c632cd6e0dc3d709bd2f4afe32459ffa2aa27d5 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 3 Jan 2019 17:18:34 +0200 Subject: [PATCH 15/16] Updated todo --- todo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/todo.txt b/todo.txt index 8157bc947..b3134cb5f 100644 --- a/todo.txt +++ b/todo.txt @@ -46,3 +46,5 @@ TODO, which will get actually done - XServer: use pixel size instead of screen size. - XServer: native PulseAudio support using OpenSLES. + +- OpenLieroX: limited lives are shown incorrectly in score table when spectating. From 0186aa078666306c60e8ae3e7c96a8a9e8506f52 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 4 Jan 2019 18:43:06 +0200 Subject: [PATCH 16/16] Updated todo --- todo.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/todo.txt b/todo.txt index b3134cb5f..2d04b3eb0 100644 --- a/todo.txt +++ b/todo.txt @@ -48,3 +48,8 @@ TODO, which will get actually done - XServer: native PulseAudio support using OpenSLES. - OpenLieroX: limited lives are shown incorrectly in score table when spectating. + +- SuperTux: update to new upstream version. + +- SuperTux: right click does not work in editor. +