diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh index d356d2510..084d4234b 100755 --- a/project/jni/application/xserver/AndroidBuild.sh +++ b/project/jni/application/xserver/AndroidBuild.sh @@ -69,7 +69,7 @@ composite/.libs/libcomposite.a \ os/.libs/libos.a \ -L$CURDIR/../../../libs/'"$1"' \ -lpixman-1 -lXfont2 -lXau -lxshmfence -lXdmcp -lfontenc -lfreetype -lsdl_savepng -lpng \ --llog -lsdl-1.2 -lsdl_native_helpers -lGLESv1_CM -landroid-shmem -l:libcrypto.so.sdl.1.so -lz -lm -ldl' \ +-llog -lGLESv1_CM -landroid-shmem -lz -lm -ldl' \ || exit 1 rm -rf $CURDIR/tmp-$1 diff --git a/project/jni/application/xserver/readme.txt b/project/jni/application/xserver/readme.txt index 37aa591c0..a964cf35b 100644 --- a/project/jni/application/xserver/readme.txt +++ b/project/jni/application/xserver/readme.txt @@ -7,7 +7,7 @@ sudo apt-get update sudo apt-get install bison make zip git locales pkg-config \ xfonts-utils xutils-dev libfontenc-dev libxkbfile-dev libxmuu-dev \ curl autoconf automake autopoint libtool libtool-bin \ -libjpeg-dev libpng-dev \ +libjpeg-dev libpng-dev libpixman-1-dev libssl-dev \ help2man texinfo intltool Install Android NDK r21 and Android SDK with Android 10.0 framework, they must be in your $PATH. diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index a5f4638a9..a4e6f1199 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit a5f4638a93a6757c2e0e0cc64b0b70c010e70ef1 +Subproject commit a4e6f11993ef20201e8f58a94cc587ef4c09824e