aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/android/packaging/xbmc/src/Main.java.in1
-rw-r--r--tools/depends/native/m4-native/01-fix-ftbfs-with-glibc-2.28.patch117
-rw-r--r--tools/depends/native/m4-native/Makefile3
-rw-r--r--tools/depends/target/Makefile1
-rw-r--r--tools/depends/target/libandroidjni/Makefile2
-rw-r--r--tools/depends/target/libcec/Makefile2
-rw-r--r--tools/depends/target/sqlite3/Makefile10
-rw-r--r--tools/depends/target/sqlite3/fix-32bits-on-64bits.patch11
-rw-r--r--tools/windows/packaging/uwp/kodi_temp_key.pfxbin2568 -> 1846 bytes
9 files changed, 126 insertions, 21 deletions
diff --git a/tools/android/packaging/xbmc/src/Main.java.in b/tools/android/packaging/xbmc/src/Main.java.in
index 214badd4d2..d5e6c88381 100644
--- a/tools/android/packaging/xbmc/src/Main.java.in
+++ b/tools/android/packaging/xbmc/src/Main.java.in
@@ -17,6 +17,7 @@ import android.view.View;
import android.graphics.Color;
import android.graphics.PixelFormat;
import android.os.Handler;
+import android.os.HandlerThread;
import android.widget.RelativeLayout;
import @APP_PACKAGE@.channels.util.TvUtil;
diff --git a/tools/depends/native/m4-native/01-fix-ftbfs-with-glibc-2.28.patch b/tools/depends/native/m4-native/01-fix-ftbfs-with-glibc-2.28.patch
new file mode 100644
index 0000000000..c10c1b2ba8
--- /dev/null
+++ b/tools/depends/native/m4-native/01-fix-ftbfs-with-glibc-2.28.patch
@@ -0,0 +1,117 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Fix FTBFS with glibc 2.28
+Bug-Debian: https://bugs.debian.org/915152
+X-Debian-version: 1.4.18-2
+
+Based on this gnulib commit by Paul Eggert:
+
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00002.html
+
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -25,7 +25,7 @@
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
diff --git a/tools/depends/native/m4-native/Makefile b/tools/depends/native/m4-native/Makefile
index 30bfea48d9..a4ffcc68d0 100644
--- a/tools/depends/native/m4-native/Makefile
+++ b/tools/depends/native/m4-native/Makefile
@@ -1,7 +1,7 @@
include ../../Makefile.include
PREFIX=$(NATIVEPREFIX)
PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile osx_snprintf.patch
+DEPS= ../../Makefile.include Makefile 01-fix-ftbfs-with-glibc-2.28.patch osx_snprintf.patch
# lib name, version
LIBNAME=m4
@@ -22,6 +22,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ cd $(PLATFORM); patch -p1 -i ../01-fix-ftbfs-with-glibc-2.28.patch
cd $(PLATFORM); patch -p1 -i ../osx_snprintf.patch
cd $(PLATFORM); $(CONFIGURE)
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
- };
-
diff --git a/tools/windows/packaging/uwp/kodi_temp_key.pfx b/tools/windows/packaging/uwp/kodi_temp_key.pfx
index 697763b40b..268a41a2e4 100644
--- a/tools/windows/packaging/uwp/kodi_temp_key.pfx
+++ b/tools/windows/packaging/uwp/kodi_temp_key.pfx
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-21 07:15:10 +0000