diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-05-13 13:32:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 13:32:59 +0200 |
| commit | 0d4d35ab930ecb5b313f74ae430edddd0ee79d4d (patch) | |
| tree | eae78f0de27694706fd9cddc7e6aa04464855c26 /build/android | |
| parent | 6673aff685047d4a0e6254f3b62313425e8f5b3c (diff) | |
| download | minetest-0d4d35ab930ecb5b313f74ae430edddd0ee79d4d.tar.gz minetest-0d4d35ab930ecb5b313f74ae430edddd0ee79d4d.tar.bz2 minetest-0d4d35ab930ecb5b313f74ae430edddd0ee79d4d.zip | |
Android dependencies updates (#5755)
* irrlicht ogles 5122 -> 5145
* openssl 1.0.2j -> 1.0.2k
* curl 7.52 -> 7.54
* sqlite 3.15.2 -> 3.18.0
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/Makefile | 13 | ||||
| -rw-r--r-- | build/android/patches/sqlite3-readonly-fix.patch | 17 |
2 files changed, 6 insertions, 24 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 2ee3f7dcc..d9a82da4d 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -84,14 +84,14 @@ OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android -IRRLICHT_REVISION = 5122 +IRRLICHT_REVISION = 5145 IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.2j +OPENSSL_VERSION = 1.0.2k OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -99,7 +99,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.52.0 +CURL_VERSION = 7.54.0 CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp @@ -126,8 +126,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3150200 -SQLITE3_URL = https://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip +SQLITE3_FOLDER = sqlite-amalgamation-3180000 +SQLITE3_URL = https://www.sqlite.org/2017/$(SQLITE3_FOLDER).zip ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') @@ -680,8 +680,7 @@ deps/${SQLITE3_FOLDER}/sqlite3.c : wget ${SQLITE3_URL}; \ unzip ${SQLITE3_FOLDER}.zip; \ ln -s ${SQLITE3_FOLDER} sqlite; \ - cd ${SQLITE3_FOLDER}; \ - patch sqlite3.c < ${ANDR_ROOT}/patches/sqlite3-readonly-fix.patch + cd ${SQLITE3_FOLDER}; clean_sqlite3: cd deps && $(RM) -rf ${SQLITE3_FOLDER} && $(RM) -f ${SQLITE3_FOLDER}.zip && \ diff --git a/build/android/patches/sqlite3-readonly-fix.patch b/build/android/patches/sqlite3-readonly-fix.patch deleted file mode 100644 index be19055ee..000000000 --- a/build/android/patches/sqlite3-readonly-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- sqlite3.c 2016-11-29 02:29:24.000000000 +0000 -+++ sqlite3.c 2016-12-08 22:54:54.206465377 +0000 -@@ -30445,7 +30445,14 @@ - #if OS_VXWORKS - struct vxworksFileId *pId; /* Unique file ID for vxworks. */ - #else -- ino_t ino; /* Inode number */ -+ #ifdef ANDROID -+ // Bionic's struct stat has a 64 bit st_ino on both 32 and -+ // 64 bit architectures. ino_t remains 32 bits wide on 32 bit -+ // architectures and can lead to inode truncation. -+ unsigned long long ino; /* Inode number */ -+ #else -+ ino_t ino; /* Inode number */ -+ #endif - #endif - }; |