From 54889f6d382f8f714af8bb89b25efcb376c7da82 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 19 May 2016 21:46:24 +0300 Subject: [PATCH] XSDL: updated to compile on NDK r11c --- project/jni/application/hid-pc-keyboard/src | 2 +- project/jni/application/openttd/src | 2 +- project/jni/application/xserver/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/xserver/AndroidBuild.sh | 2 +- project/jni/application/xserver/pulseaudio | 2 +- project/jni/application/xserver/readme.txt | 4 ++-- project/jni/application/xserver/xserver | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index bf31c329b..8d2430db7 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit bf31c329b1275c11f1e5243b5dba48ebca72239e +Subproject commit 8d2430db72134e15f6039644baf01cf54791338a diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 2aee7d406..67a0d3878 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 2aee7d406cc36e4a7893b474330a359eb58c180e +Subproject commit 67a0d38786c29890a7e18dbd4fecc2ea743506be diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg index cb080f772..eb06b09a4 100644 --- a/project/jni/application/xserver/AndroidAppSettings.cfg +++ b/project/jni/application/xserver/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XServer XSDL" AppFullName=x.org.server # Application version code (integer) -AppVersionCode=11139 +AppVersionCode=11140 # Application user-visible version name (string) -AppVersionName="1.11.39" +AppVersionName="1.11.40" # 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 @@ -223,12 +223,12 @@ NDK_TOOLCHAIN_VERSION= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a x86 mips' +MultiABI='armeabi-v7a x86' # 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="jpeg png freetype sdl_ttf" +CompiledLibraries="jpeg png freetype sdl_ttf crypto" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh index 3bb34b4f3..7e4d2175c 100755 --- a/project/jni/application/xserver/AndroidBuild.sh +++ b/project/jni/application/xserver/AndroidBuild.sh @@ -72,7 +72,7 @@ xkb/.libs/libxkbstubs.a \ composite/.libs/libcomposite.a \ os/.libs/libos.a \ hw/kdrive/linux/.libs/liblinux.a \ --lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype -landroid-shmem' \ +-lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype -landroid-shmem -lcrypto' \ || exit 1 rm -rf $CURDIR/tmp-$1 diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio index f5bebe88c..eb3c60d97 160000 --- a/project/jni/application/xserver/pulseaudio +++ b/project/jni/application/xserver/pulseaudio @@ -1 +1 @@ -Subproject commit f5bebe88cb4101b842b44183c7eb46aa9405eb9f +Subproject commit eb3c60d9768e0d6cc9f968bf825cffa69c891e79 diff --git a/project/jni/application/xserver/readme.txt b/project/jni/application/xserver/readme.txt index e300660d5..e0ea34715 100644 --- a/project/jni/application/xserver/readme.txt +++ b/project/jni/application/xserver/readme.txt @@ -1,6 +1,6 @@ You will need to install some packages to your Debian/Ubuntu first. -You will need both xcb-proto and python-xcbgen packages to have version 1.10-1, +You will need both xcb-proto and python-xcbgen packages to have version 1.10-1 or newer, so you need to build on at least Debian Jessie or newer distribution. Install following packages, assuming fresh Debian Jessie installation for x86_64 architecture: @@ -18,7 +18,7 @@ libxmuu-dev libxt-dev libsm-dev libice-dev libxrender-dev libxrandr-dev xfonts-u curl autoconf automake libtool pkg-config libjpeg-dev libpng-dev git mc locales \ openjdk-7-jdk ant make zip libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 -Install Android NDK r10e and Android SDK with Android 5.1 framework, they must be in your $PATH. +Install Android NDK r11c and Android SDK with Android 6.0 framework, they must be in your $PATH. Download SDL repo, select xserver project, and build it: diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index a710794bc..ad7ad4873 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit a710794bcbef76293fa34f18f3cbed321788a12a +Subproject commit ad7ad4873dcf38f8581145e4578a011d0cda6483