* Add builds for android-arm64 and android-x86_64 platforms (issue

#52) * Fix x265 encoding with FFmpeg on Android (issue bytedeco/javacv#866)
bytedeco · Feb 25, 2018 · 7073c01 · 7073c01
1 parent a43948a
commit 7073c01
Show file tree

Hide file tree

Showing 41 changed files with 1,161 additions and 253 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,6 +52,43 @@ matrix:
         install: true
         script: ./ci/install-travis.sh
 
+      - os: linux
+        env: PROJ=opencv,flandmark OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=ffmpeg OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=artoolkitplus OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=chilitags OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=openblas OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=fftw OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=gsl OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=leptonica,tesseract OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=tensorflow OS=android-arm64
+        install: true
+        script: ./ci/install-travis.sh
+
       - os: linux
         env: PROJ=opencv,flandmark OS=android-x86
         install: true
@@ -89,6 +126,43 @@ matrix:
         install: true
         script: ./ci/install-travis.sh
 
+      - os: linux
+        env: PROJ=opencv,flandmark OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=ffmpeg OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=artoolkitplus OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=chilitags OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=openblas OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=fftw OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=gsl OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=leptonica,tesseract OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=tensorflow OS=android-x86_64
+        install: true
+        script: ./ci/install-travis.sh
+
       - os: osx
         osx_image: xcode7.3
         env: PROJ=opencv OS=ios-arm64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Add builds for `android-arm64` and `android-x86_64` platforms ([issue #52](https://github.com/bytedeco/javacpp-presets/issues/52))
+ * Fix x265 encoding with FFmpeg on Android ([issue bytedeco/javacv#866](https://github.com/bytedeco/javacv/issues/866))
  * Add presets for ARPACK-NG
  * Add iOS builds for OpenCV, OpenBLAS, and Skia ([pull #525](https://github.com/bytedeco/javacpp-presets/pull/525))
  * Let GSL link with OpenBLAS, MKL, Accelerate, etc automatically instead of GSL CBLAS ([issue #18](https://github.com/bytedeco/javacpp-presets/issues/18))

diff --git a/artoolkitplus/ARToolKitPlus-2.3.1.patch → artoolkitplus/ARToolKitPlus.patch b/artoolkitplus/ARToolKitPlus-2.3.1.patch → artoolkitplus/ARToolKitPlus.patch
@@ -1,16 +1,40 @@
+diff -ruN ARToolKitPlus-2.3.1/android-arm64.cmake ARToolKitPlus-2.3.1-patch/android-arm64.cmake
+--- ARToolKitPlus-2.3.1/android-arm64.cmake	1970-01-01 09:00:00.000000000 +0900
++++ ARToolKitPlus-2.3.1-patch/android-arm64.cmake	2018-02-25 02:35:47.303741542 +0900
+@@ -0,0 +1,23 @@
++# CMake toolchain to build for Android 5.0. Sample usage:
++#
++# ANDROID_BIN=$HOME/android-ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android \
++# ANDROID_CPP=$HOME/android-ndk/sources/cxx-stl/gnu-libstdc++/4.9/ \
++# ANDROID_ROOT=$HOME/android-ndk/platforms/android-21/arch-arm64/ \
++# cmake -DCMAKE_TOOLCHAIN_FILE=android-arm64.cmake -DCMAKE_INSTALL_PREFIX=..
++
++set(CMAKE_SYSTEM_NAME UnixPaths)
++set(CMAKE_SYSTEM_PROCESSOR arm64)
++set(ANDROID TRUE)
++
++set(CMAKE_C_COMPILER   "$ENV{ANDROID_BIN}-gcc")
++set(CMAKE_CXX_COMPILER "$ENV{ANDROID_BIN}-g++")
++
++set(CMAKE_C_LINK_EXECUTABLE    "<CMAKE_C_COMPILER>   <FLAGS> <CMAKE_C_LINK_FLAGS>   <LINK_FLAGS> <OBJECTS> -o <TARGET> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib/ -lgcc -ldl -lz -lm -lc")
++set(CMAKE_CXX_LINK_EXECUTABLE  "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/arm64-v8a/ -L$ENV{ANDROID_ROOT}/usr/lib/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
++
++set(CMAKE_C_CREATE_SHARED_LIBRARY    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib/ -lgcc -ldl -lz -lm -lc")
++set(CMAKE_CXX_CREATE_SHARED_LIBRARY  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/arm64-v8a/ -L$ENV{ANDROID_ROOT}/usr/lib/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
++
++add_definitions(--sysroot=$ENV{ANDROID_ROOT} -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv8-a -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -z text -Wno-attributes -Wl,--no-undefined)
++
++include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/arm64-v8a/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/aarch64-linux-android/")
 diff -ruN ARToolKitPlus-2.3.1/android-arm.cmake ARToolKitPlus-2.3.1-patch/android-arm.cmake
 --- ARToolKitPlus-2.3.1/android-arm.cmake	1970-01-01 09:00:00.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/android-arm.cmake	2015-06-28 14:36:05.670742300 +0900
-@@ -0,0 +1,26 @@
-+# CMake toolchain to build ARToolKitPlus 2.3.1 for Android 2.2. Sample usage:
++++ ARToolKitPlus-2.3.1-patch/android-arm.cmake	2018-02-25 02:35:47.303741542 +0900
+@@ -0,0 +1,23 @@
++# CMake toolchain to build for Android 4.0. Sample usage:
 +#
-+# ANDROID_BIN=`pwd`/../android-ndk-r9d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi \
-+# ANDROID_CPP=`pwd`/../android-ndk-r9d/sources/cxx-stl/gnu-libstdc++/4.6/ \
-+# ANDROID_ROOT=`pwd`/../android-ndk-r9d/platforms/android-9/arch-arm/ \
++# ANDROID_BIN=$HOME/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi \
++# ANDROID_CPP=$HOME/android-ndk/sources/cxx-stl/gnu-libstdc++/4.9/ \
++# ANDROID_ROOT=$HOME/android-ndk/platforms/android-14/arch-arm/ \
 +# cmake -DCMAKE_TOOLCHAIN_FILE=android-arm.cmake -DCMAKE_INSTALL_PREFIX=..
-+#
-+# If you really need to use ARToolKitPlus on a CPU with no FPU, replace "libs/armeabi-v7a" by "libs/armeabi" and
-+# "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16" with "-march=armv5te -mtune=xscale -msoft-float"
 +
 +set(CMAKE_SYSTEM_NAME UnixPaths)
 +set(CMAKE_SYSTEM_PROCESSOR arm)
@@ -25,18 +49,45 @@ diff -ruN ARToolKitPlus-2.3.1/android-arm.cmake ARToolKitPlus-2.3.1-patch/androi
 +set(CMAKE_C_CREATE_SHARED_LIBRARY    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib/ -lgcc -ldl -lz -lm -lc")
 +set(CMAKE_CXX_CREATE_SHARED_LIBRARY  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/armeabi-v7a/ -L$ENV{ANDROID_ROOT}/usr/lib/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
 +
-+add_definitions("-DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300")
++add_definitions(--sysroot=$ENV{ANDROID_ROOT} -D__ANDROID_API__=14 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -z text -Wno-attributes -Wl,--no-undefined)
++
++include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/armeabi-v7a/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/arm-linux-androideabi/")
+diff -ruN ARToolKitPlus-2.3.1/android-x86_64.cmake ARToolKitPlus-2.3.1-patch/android-x86_64.cmake
+--- ARToolKitPlus-2.3.1/android-x86_64.cmake	1970-01-01 09:00:00.000000000 +0900
++++ ARToolKitPlus-2.3.1-patch/android-x86_64.cmake	2018-02-25 02:35:47.303741542 +0900
+@@ -0,0 +1,23 @@
++# CMake toolchain to build for Android 5.0. Sample usage:
++#
++# ANDROID_BIN=$HOME/android-ndk/toolchains/x86_64-4.9/prebuilt/linux-x86_64/bin/x86_64-linux-android \
++# ANDROID_CPP=$HOME/android-ndk/sources/cxx-stl/gnu-libstdc++/4.9/ \
++# ANDROID_ROOT=$HOME/android-ndk/platforms/android-21/arch-x86_64/ \
++# cmake -DCMAKE_TOOLCHAIN_FILE=android-x86_64.cmake -DCMAKE_INSTALL_PREFIX=..
++
++set(CMAKE_SYSTEM_NAME UnixPaths)
++set(CMAKE_SYSTEM_PROCESSOR atom64)
++set(ANDROID TRUE)
++
++set(CMAKE_C_COMPILER   "$ENV{ANDROID_BIN}-gcc")
++set(CMAKE_CXX_COMPILER "$ENV{ANDROID_BIN}-g++")
 +
-+include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/armeabi-v7a/include/" "$ENV{ANDROID_ROOT}/usr/include/")
++set(CMAKE_C_LINK_EXECUTABLE    "<CMAKE_C_COMPILER>   <FLAGS> <CMAKE_C_LINK_FLAGS>   <LINK_FLAGS> <OBJECTS> -o <TARGET> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib64/ -lgcc -ldl -lz -lm -lc")
++set(CMAKE_CXX_LINK_EXECUTABLE  "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/x86_64/ -L$ENV{ANDROID_ROOT}/usr/lib64/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
++
++set(CMAKE_C_CREATE_SHARED_LIBRARY    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib64/ -lgcc -ldl -lz -lm -lc")
++set(CMAKE_CXX_CREATE_SHARED_LIBRARY  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/x86_64/ -L$ENV{ANDROID_ROOT}/usr/lib64/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
++
++add_definitions(--sysroot=$ENV{ANDROID_ROOT} -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=x86-64 -mtune=atom -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -z text -Wno-attributes -Wl,--no-undefined)
++
++include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/x86_64/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/x86_64-linux-android/")
 diff -ruN ARToolKitPlus-2.3.1/android-x86.cmake ARToolKitPlus-2.3.1-patch/android-x86.cmake
 --- ARToolKitPlus-2.3.1/android-x86.cmake	1970-01-01 09:00:00.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/android-x86.cmake	2015-06-28 14:36:05.670742300 +0900
++++ ARToolKitPlus-2.3.1-patch/android-x86.cmake	2018-02-25 02:35:47.303741542 +0900
 @@ -0,0 +1,23 @@
-+# CMake toolchain to build ARToolKitPlus 2.3.1 for Android 2.2. Sample usage:
++# CMake toolchain to build for Android 4.0. Sample usage:
 +#
-+# ANDROID_BIN=`pwd`/../android-ndk/toolchains/x86-4.6/prebuilt/linux-x86_64/bin/i686-linux-android \
-+# ANDROID_CPP=`pwd`/../android-ndk/sources/cxx-stl/gnu-libstdc++/4.6/ \
-+# ANDROID_ROOT=`pwd`/../android-ndk/platforms/android-9/arch-x86/ \
++# ANDROID_BIN=$HOME/android-ndk/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android \
++# ANDROID_CPP=$HOME/android-ndk/sources/cxx-stl/gnu-libstdc++/4.9/ \
++# ANDROID_ROOT=$HOME/android-ndk/platforms/android-14/arch-x86/ \
 +# cmake -DCMAKE_TOOLCHAIN_FILE=android-x86.cmake -DCMAKE_INSTALL_PREFIX=..
 +
 +set(CMAKE_SYSTEM_NAME UnixPaths)
@@ -52,12 +103,12 @@ diff -ruN ARToolKitPlus-2.3.1/android-x86.cmake ARToolKitPlus-2.3.1-patch/androi
 +set(CMAKE_C_CREATE_SHARED_LIBRARY    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_ROOT}/usr/lib/ -lgcc -ldl -lz -lm -lc")
 +set(CMAKE_CXX_CREATE_SHARED_LIBRARY  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> -nostdlib <LINK_LIBRARIES> -L$ENV{ANDROID_CPP}/libs/x86/ -L$ENV{ANDROID_ROOT}/usr/lib/ -lgnustl_static -lgcc -ldl -lz -lm -lc")
 +
-+add_definitions("-DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -mtune=atom -mssse3 -mfpmath=sse -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300")
++add_definitions(--sysroot=$ENV{ANDROID_ROOT} -D__ANDROID_API__=14 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=i686 -mtune=atom -mssse3 -mfpmath=sse -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -z text -Wno-attributes -Wl,--no-undefined)
 +
-+include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/x86/include/" "$ENV{ANDROID_ROOT}/usr/include/")
++include_directories("$ENV{ANDROID_CPP}/include/" "$ENV{ANDROID_CPP}/libs/x86/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/" "$ENV{ANDROID_NDK}/sysroot/usr/include/i686-linux-android/")
 diff -ruN ARToolKitPlus-2.3.1/CMakeLists.txt ARToolKitPlus-2.3.1-patch/CMakeLists.txt
 --- ARToolKitPlus-2.3.1/CMakeLists.txt	2014-10-06 04:46:01.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/CMakeLists.txt	2015-06-28 14:36:05.686366700 +0900
++++ ARToolKitPlus-2.3.1-patch/CMakeLists.txt	2018-02-24 21:19:53.864216943 +0900
 @@ -8,8 +8,10 @@
  option(ARTK_USE_BOOST "Compile with boost (OpenCV calibration file support)" FALSE)
 
@@ -93,7 +144,7 @@ diff -ruN ARToolKitPlus-2.3.1/CMakeLists.txt ARToolKitPlus-2.3.1-patch/CMakeList
  install(DIRECTORY include/ DESTINATION include)
 diff -ruN ARToolKitPlus-2.3.1/include/ARToolKitPlus/Tracker.h ARToolKitPlus-2.3.1-patch/include/ARToolKitPlus/Tracker.h
 --- ARToolKitPlus-2.3.1/include/ARToolKitPlus/Tracker.h	2014-10-06 04:46:01.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/include/ARToolKitPlus/Tracker.h	2015-06-28 14:37:00.189513600 +0900
++++ ARToolKitPlus-2.3.1-patch/include/ARToolKitPlus/Tracker.h	2018-02-24 21:19:53.865216940 +0900
 @@ -30,6 +30,7 @@
  #include <ARToolKitPlus/extra/BCH.h>
  #include <ARToolKitPlus/extra/Hull.h>
@@ -102,9 +153,20 @@ diff -ruN ARToolKitPlus-2.3.1/include/ARToolKitPlus/Tracker.h ARToolKitPlus-2.3.
  #include <vector>
 
 
+@@ -585,8 +586,8 @@
+
+     HULL_TRACKING_MODE hullTrackingMode;
+
+-    static int screenWidth;
+-	static int screenHeight;
++    int screenWidth;
++    int screenHeight;
+     int thresh;
+
+     ARFloat gl_para[16];
 diff -ruN ARToolKitPlus-2.3.1/src/Camera.cpp ARToolKitPlus-2.3.1-patch/src/Camera.cpp
 --- ARToolKitPlus-2.3.1/src/Camera.cpp	2014-10-06 04:46:01.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/src/Camera.cpp	2015-06-28 14:36:38.000803100 +0900
++++ ARToolKitPlus-2.3.1-patch/src/Camera.cpp	2018-02-24 21:19:53.865216940 +0900
 @@ -19,6 +19,7 @@
   *  Pavel Rojtberg
   */
@@ -115,7 +177,7 @@ diff -ruN ARToolKitPlus-2.3.1/src/Camera.cpp ARToolKitPlus-2.3.1-patch/src/Camer
  #include <fstream>
 diff -ruN ARToolKitPlus-2.3.1/src/core/rppMultiGetTransMat.cpp ARToolKitPlus-2.3.1-patch/src/core/rppMultiGetTransMat.cpp
 --- ARToolKitPlus-2.3.1/src/core/rppMultiGetTransMat.cpp	2014-10-06 04:46:01.000000000 +0900
-+++ ARToolKitPlus-2.3.1-patch/src/core/rppMultiGetTransMat.cpp	2015-06-28 14:37:57.833858200 +0900
++++ ARToolKitPlus-2.3.1-patch/src/core/rppMultiGetTransMat.cpp	2018-02-24 21:19:53.866216938 +0900
 @@ -43,7 +43,7 @@
              std::map<int, int>::iterator iter = marker_id_freq.find(m_patt_id);
 
@@ -143,24 +205,9 @@ diff -ruN ARToolKitPlus-2.3.1/src/core/rppMultiGetTransMat.cpp ARToolKitPlus-2.3
                          config_patt_id.erase(c_iter);
                          c_iter = config_patt_id.end();
                          continue;
-
-diff -Naur ARToolKitPlus-2.3.1/include/ARToolKitPlus/Tracker.h ARToolKitPlus-2.3.1-patched/include/ARToolKitPlus/Tracker.h
---- ARToolKitPlus-2.3.1/include/ARToolKitPlus/Tracker.h	2015-09-22 18:55:29.714656500 +0200
-+++ ARToolKitPlus-2.3.1-patched/include/ARToolKitPlus/Tracker.h	2015-09-22 18:16:50.542938000 +0200
-@@ -586,8 +587,8 @@
-
-     HULL_TRACKING_MODE hullTrackingMode;
-
--    static int screenWidth;
--	static int screenHeight;
-+    int screenWidth;
-+    int screenHeight;
-     int thresh;
-
-     ARFloat gl_para[16];
-diff -Naur ARToolKitPlus-2.3.1/src/Tracker.cpp ARToolKitPlus-2.3.1-patched/src/Tracker.cpp
---- ARToolKitPlus-2.3.1/src/Tracker.cpp	2014-10-05 21:46:01.000000000 +0200
-+++ ARToolKitPlus-2.3.1-patched/src/Tracker.cpp	2015-09-22 18:27:47.665119000 +0200
+diff -ruN ARToolKitPlus-2.3.1/src/Tracker.cpp ARToolKitPlus-2.3.1-patch/src/Tracker.cpp
+--- ARToolKitPlus-2.3.1/src/Tracker.cpp	2014-10-06 04:46:01.000000000 +0900
++++ ARToolKitPlus-2.3.1-patch/src/Tracker.cpp	2018-02-24 21:19:53.867216935 +0900
 @@ -29,8 +29,8 @@
 
  namespace ARToolKitPlus {
@@ -172,17 +219,15 @@ diff -Naur ARToolKitPlus-2.3.1/src/Tracker.cpp ARToolKitPlus-2.3.1-patched/src/T
 
  Tracker::Tracker(int imWidth, int imHeight, int maxImagePatterns, int pattWidth, int pattHeight, int pattSamples,
          int maxLoadPatterns) :
-@@ -186,8 +186,9 @@
+@@ -186,6 +186,7 @@
      // (usually this image buffer should only be built once - unless we change camera resolution)
      //
 
 +
      int newSize = screenWidth * screenHeight;
 
      if (newSize == l_imageL_size)
-         return;
-
-@@ -345,7 +348,8 @@
+@@ -345,7 +346,8 @@
          return false;
      }
 

diff --git a/artoolkitplus/cppbuild.sh b/artoolkitplus/cppbuild.sh
@@ -15,19 +15,29 @@ cd $PLATFORM
 echo "Decompressing archives..."
 tar --totals -xjf ../ARToolKitPlus-$ARTOOLKITPLUS_VERSION.tar.bz2 --exclude="*/id-markers/*"
 cd ARToolKitPlus-$ARTOOLKITPLUS_VERSION
-patch --binary -Np1 < ../../../ARToolKitPlus-$ARTOOLKITPLUS_VERSION.patch || true
+patch --binary -Np1 < ../../../ARToolKitPlus.patch || true
 
 case $PLATFORM in
     android-arm)
         $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-arm.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..
         make -j4
         make install
         ;;
-     android-x86)
+    android-arm64)
+        $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-arm64.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..
+        make -j4
+        make install
+        ;;
+    android-x86)
         $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-x86.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..
         make -j4
         make install
         ;;
+    android-x86_64)
+        $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-x86_64.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..
+        make -j4
+        make install
+        ;;
     linux-x86)
         CC="$OLDCC -m32" CXX="$OLDCXX -m32" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..
         make -j4