diff options
Diffstat (limited to 'tools/depends/target')
-rw-r--r-- | tools/depends/target/Makefile | 1 | ||||
-rw-r--r-- | tools/depends/target/libandroidjni/Makefile | 2 | ||||
-rw-r--r-- | tools/depends/target/libcec/Makefile | 2 | ||||
-rw-r--r-- | tools/depends/target/sqlite3/Makefile | 10 | ||||
-rw-r--r-- | tools/depends/target/sqlite3/fix-32bits-on-64bits.patch | 11 |
5 files changed, 6 insertions, 20 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 0c525401e6..493213d27c 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -119,6 +119,7 @@ waylandpp: wayland $(WAYLANDPP_DEPS) dbus: expat libinput: mtdev libevdev libevdev: libudev +taglib: $(ZLIB) .installed-$(PLATFORM): $(DEPENDS) touch $@ diff --git a/tools/depends/target/libandroidjni/Makefile b/tools/depends/target/libandroidjni/Makefile index eb1654539d..49dddbb530 100644 --- a/tools/depends/target/libandroidjni/Makefile +++ b/tools/depends/target/libandroidjni/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libandroidjni -VERSION=482232cc05102021e955e9d907b0047801fa47b4 +VERSION=aa12538cc5090d061d34b5fd7385d939ea82ce8b SOURCE=archive ARCHIVE=$(VERSION).tar.gz GIT_BASE_URL=https://github.com/xbmc diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile index 71468e2a9a..89889ebb54 100644 --- a/tools/depends/target/libcec/Makefile +++ b/tools/depends/target/libcec/Makefile @@ -5,7 +5,7 @@ DEPS= ../../Makefile.include Makefile remove_git_info.patch LIBNAME=libcec VERSION_MAJOR=4 VERSION_MINOR=0 -VERSION_PATCH=1 +VERSION_PATCH=4 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) SOURCE=$(LIBNAME)-$(VERSION) diff --git a/tools/depends/target/sqlite3/Makefile b/tools/depends/target/sqlite3/Makefile index 2838a89f61..39e5334645 100644 --- a/tools/depends/target/sqlite3/Makefile +++ b/tools/depends/target/sqlite3/Makefile @@ -1,19 +1,18 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile fix-32bits-on-64bits.patch sqlite3.c.patch +DEPS= ../../Makefile.include Makefile sqlite3.c.patch # lib name, version LIBNAME=sqlite -VERSION=3140200 +VERSION=3260000 SOURCE=$(LIBNAME)-autoconf-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 export CFLAGS+=-DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=0x10000000 -export TCLLIBDIR=/dev/null CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ ./configure --prefix=$(PREFIX) --disable-shared \ - --enable-threadsafe --disable-tcl --disable-readline \ + --enable-threadsafe --disable-readline \ LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME)3.a @@ -25,9 +24,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) -ifeq ($(OS),android) - cd $(PLATFORM); patch -p0 < ../fix-32bits-on-64bits.patch -endif # seems MAP_POPULATE is broken on aarch64 ifneq ($(OS),android) cd $(PLATFORM); patch -p1 < ../sqlite3.c.patch diff --git a/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch b/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch deleted file mode 100644 index cf4d75be1b..0000000000 --- a/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sqlite3.c.orig 2014-11-19 13:14:16.633721369 +0100 -+++ sqlite3.c 2014-11-19 13:23:23.733711563 +0100 -@@ -25301,7 +25301,7 @@ - #if OS_VXWORKS - struct vxworksFileId *pId; /* Unique file ID for vxworks. */ - #else -- ino_t ino; /* Inode number */ -+ unsigned long long ino; /* Inode number */ - #endif - }; - |