aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target
diff options
context:
space:
mode:
Diffstat (limited to 'tools/depends/target')
-rw-r--r--tools/depends/target/Makefile3
-rw-r--r--tools/depends/target/brotli/01-all-disable-exe.patch28
-rw-r--r--tools/depends/target/brotli/BROTLI-VERSION5
-rw-r--r--tools/depends/target/brotli/Makefile33
-rw-r--r--tools/depends/target/cec/Makefile2
-rw-r--r--tools/depends/target/curl/CURL-VERSION4
-rw-r--r--tools/depends/target/curl/Makefile3
-rw-r--r--tools/depends/target/effects11/01-win-debugpostfix.patch11
-rw-r--r--tools/depends/target/effects11/EFFECTS11-VERSION5
-rw-r--r--tools/depends/target/gmp/Makefile2
-rw-r--r--tools/depends/target/gnutls/Makefile1
-rw-r--r--tools/depends/target/libgcrypt/Makefile7
-rw-r--r--tools/depends/target/openssl/001-android-getauxvalrevert.patch6
-rw-r--r--tools/depends/target/openssl/16-kodi.conf16
-rw-r--r--tools/depends/target/openssl/Makefile35
-rw-r--r--tools/depends/target/openssl/OPENSSL-VERSION4
-rw-r--r--tools/depends/target/pythonmodule-pil/PYTHONMODULE-PIL-VERSION4
-rw-r--r--tools/depends/target/tinyxml2/Makefile2
18 files changed, 132 insertions, 39 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index a498d373e4..11cdbb533b 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -6,6 +6,7 @@ endif
# Keep in alphabetical order
DEPENDS = \
+ brotli \
bzip2 \
curl \
dav1d \
@@ -150,7 +151,7 @@ $(DOWNLOAD_TARGETS):
download: $(DOWNLOAD_TARGETS)
crossguid: $(LIBUUID)
-curl: openssl nghttp2 $(ZLIB)
+curl: brotli openssl nghttp2 $(ZLIB)
dbus: expat
ffmpeg: $(ICONV) $(ZLIB) bzip2 gnutls dav1d $(LIBVA)
fontconfig: freetype2 expat $(ICONV) $(LIBUUID)
diff --git a/tools/depends/target/brotli/01-all-disable-exe.patch b/tools/depends/target/brotli/01-all-disable-exe.patch
new file mode 100644
index 0000000000..8b02506443
--- /dev/null
+++ b/tools/depends/target/brotli/01-all-disable-exe.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -169,15 +169,19 @@
+ endif()
+
+ # Build the brotli executable
+-add_executable(brotli c/tools/brotli.c)
+-target_link_libraries(brotli ${BROTLI_LIBRARIES})
++if(NOT BROTLI_DISABLE_EXE)
++ add_executable(brotli c/tools/brotli.c)
++ target_link_libraries(brotli ${BROTLI_LIBRARIES})
++endif()
+
+ # Installation
+ if(NOT BROTLI_BUNDLED_MODE)
+- install(
+- TARGETS brotli
+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+- )
++ if(NOT BROTLI_DISABLE_EXE)
++ install(
++ TARGETS brotli
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ )
++ endif()
+
+ install(
+ TARGETS ${BROTLI_LIBRARIES_CORE}
diff --git a/tools/depends/target/brotli/BROTLI-VERSION b/tools/depends/target/brotli/BROTLI-VERSION
new file mode 100644
index 0000000000..7747ea6a22
--- /dev/null
+++ b/tools/depends/target/brotli/BROTLI-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=brotli
+VERSION=1.1.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9
+BYPRODUCT=libbrotlidec.a
diff --git a/tools/depends/target/brotli/Makefile b/tools/depends/target/brotli/Makefile
new file mode 100644
index 0000000000..e3154fb8ce
--- /dev/null
+++ b/tools/depends/target/brotli/Makefile
@@ -0,0 +1,33 @@
+include ../../Makefile.include BROTLI-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile BROTLI-VERSION ../../download-files.include \
+ 01-all-disable-exe.patch
+
+LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT)
+
+CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_INSTALL_PREFIX=$(PREFIX) \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBROTLI_DISABLE_TESTS=ON \
+ -DBROTLI_DISABLE_EXE=ON
+
+all: .installed-$(PLATFORM)
+
+$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
+ rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
+ cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ cd $(PLATFORM); patch -p1 -i ../01-all-disable-exe.patch
+ cd $(PLATFORM)/build; $(CMAKE) ${CMAKE_OPTIONS} ..
+
+$(LIBDYLIB): $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+ $(MAKE) -C $(PLATFORM)/build install
+ touch $@
+
+clean:
+ rm -rf $(PLATFORM) .installed-$(PLATFORM)
+
+distclean::
+ rm -rf $(PLATFORM) .installed-$(PLATFORM)
+
diff --git a/tools/depends/target/cec/Makefile b/tools/depends/target/cec/Makefile
index 403f4f03f1..6b9fd9835d 100644
--- a/tools/depends/target/cec/Makefile
+++ b/tools/depends/target/cec/Makefile
@@ -19,7 +19,7 @@ CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=1 \
all: .installed-$(PLATFORM)
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
+$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p1 -i ../001-all-cmakelists.patch
diff --git a/tools/depends/target/curl/CURL-VERSION b/tools/depends/target/curl/CURL-VERSION
index 42bdd1d64f..017b222e75 100644
--- a/tools/depends/target/curl/CURL-VERSION
+++ b/tools/depends/target/curl/CURL-VERSION
@@ -1,5 +1,5 @@
LIBNAME=curl
-VERSION=8.4.0
+VERSION=8.7.1
ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
-SHA512=7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b
+SHA512=5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
BYPRODUCT=libcurl.a
diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile
index 896a67ddf4..d4f002df3d 100644
--- a/tools/depends/target/curl/Makefile
+++ b/tools/depends/target/curl/Makefile
@@ -5,6 +5,7 @@ DEPS = ../../Makefile.include Makefile CURL-VERSION ../../download-files.include
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
./configure --prefix=$(PREFIX) \
--disable-shared \
+ --disable-docs \
--disable-ldap \
--without-libssh2 \
--disable-ntlm-wb \
@@ -13,11 +14,11 @@ CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
--without-libidn2 \
--with-ca-fallback \
--with-ssl=$(PREFIX) \
+ --with-brotli=$(PREFIX) \
--with-nghttp2=$(PREFIX) \
--with-zlib \
--without-libpsl \
--without-zstd \
- --without-brotli \
--without-gssapi \
--without-gsasl \
--without-hyper \
diff --git a/tools/depends/target/effects11/01-win-debugpostfix.patch b/tools/depends/target/effects11/01-win-debugpostfix.patch
new file mode 100644
index 0000000000..b10d6e96fe
--- /dev/null
+++ b/tools/depends/target/effects11/01-win-debugpostfix.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,6 +22,8 @@
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+
++set(CMAKE_DEBUG_POSTFIX d)
++
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
diff --git a/tools/depends/target/effects11/EFFECTS11-VERSION b/tools/depends/target/effects11/EFFECTS11-VERSION
new file mode 100644
index 0000000000..a20e4907a3
--- /dev/null
+++ b/tools/depends/target/effects11/EFFECTS11-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=FX11
+VERSION=11.29
+ARCHIVE=$(LIBNAME)-jun2023.tar.gz
+SHA512=93a90b42efbc8e1e9cb76de80c959bc24406536af9d943d21e324a82be677d695c201deb995490e331ecfcda301d8b42285b90577fbed9acd5bb61c753efd66c
+BYPRODUCT_WIN=effects11.lib
diff --git a/tools/depends/target/gmp/Makefile b/tools/depends/target/gmp/Makefile
index 9c3e85752b..ffdcbfd97e 100644
--- a/tools/depends/target/gmp/Makefile
+++ b/tools/depends/target/gmp/Makefile
@@ -46,7 +46,7 @@ LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME).a
all: .installed-$(PLATFORM)
-$(PLATFORM)/config.status: $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
+$(PLATFORM)/config.status: $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); $(CONFIGURE)
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
index 052373292b..1b1e5e3287 100644
--- a/tools/depends/target/gnutls/Makefile
+++ b/tools/depends/target/gnutls/Makefile
@@ -31,6 +31,7 @@ CONFIGURE=./configure --prefix=$(PREFIX) \
--disable-guile \
--disable-tools \
--without-idn \
+ --without-brotli \
$(CONFIGURE_OPTIONS)
# LLVM 15 has raised this to error by default. drop back to warning
diff --git a/tools/depends/target/libgcrypt/Makefile b/tools/depends/target/libgcrypt/Makefile
index bb5a0053c5..2fefa9b66f 100644
--- a/tools/depends/target/libgcrypt/Makefile
+++ b/tools/depends/target/libgcrypt/Makefile
@@ -1,13 +1,6 @@
include ../../Makefile.include LIBGCRYPT-VERSION ../../download-files.include
DEPS = ../../Makefile.include Makefile LIBGCRYPT-VERSION ../../download-files.include
-ifeq ($(OS),android)
- # Just blanket disable neon support for non arm64 arch
- ifneq ($(findstring arm64, $(CPU)), arm64)
- CONFIGURE_FLAGS+= --disable-neon-support
- endif
-endif
-
ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin)
# required to fix asm link failure due C_SYMBOL_NAME macro not prepending _ to exported symbol
# exported symbols only have s single _ instead of double __
diff --git a/tools/depends/target/openssl/001-android-getauxvalrevert.patch b/tools/depends/target/openssl/001-android-getauxvalrevert.patch
index 810a8e80bb..1e75c57374 100644
--- a/tools/depends/target/openssl/001-android-getauxvalrevert.patch
+++ b/tools/depends/target/openssl/001-android-getauxvalrevert.patch
@@ -1,6 +1,6 @@
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
-@@ -68,12 +68,6 @@
+@@ -74,12 +74,6 @@
# include <sys/auxv.h>
# define OSSL_IMPLEMENT_GETAUXVAL
# endif
@@ -13,7 +13,7 @@
# endif
# if defined(__FreeBSD__)
# include <sys/param.h>
-@@ -94,15 +88,6 @@
+@@ -100,15 +94,6 @@
# endif
/*
@@ -31,7 +31,7 @@
*/
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
-@@ -211,12 +211,6 @@
+@@ -89,12 +89,6 @@
# if __GLIBC_PREREQ(2, 16)
# include <sys/auxv.h>
# define OSSL_IMPLEMENT_GETAUXVAL
diff --git a/tools/depends/target/openssl/16-kodi.conf b/tools/depends/target/openssl/16-kodi.conf
index eccb609a27..1855ed462c 100644
--- a/tools/depends/target/openssl/16-kodi.conf
+++ b/tools/depends/target/openssl/16-kodi.conf
@@ -5,28 +5,28 @@
#
my %targets = (
"kodi-darwin64-x86_64" => {
- inherit_from => [ "darwin-common", asm("x86_64_asm") ],
- cflags => add("\$(CFLAGS)"),
+ inherit_from => [ "darwin-common" ],
+ asm_arch => 'x86_64',
lib_cppflags => add("-DL_ENDIAN"),
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "macosx",
},
"kodi-darwin64-arm64" => {
- inherit_from => [ "darwin-common", asm("aarch64_asm") ],
- cflags => add("\$(CFLAGS)"),
+ inherit_from => [ "darwin-common" ],
+ asm_arch => 'aarch64',
lib_cppflags => add("-DL_ENDIAN"),
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "ios64",
},
"kodi-iphoneos-arm64" => {
- inherit_from => [ "ios-common", asm("aarch64_asm") ],
- cflags => add("\$(CFLAGS)"),
+ inherit_from => [ "ios-common" ],
+ asm_arch => 'aarch64',
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "ios64",
},
"kodi-appletvos-arm64" => {
- inherit_from => [ "ios-common", asm("aarch64_asm") ],
- cflags => add("\$(CFLAGS)"),
+ inherit_from => [ "ios-common"],
+ asm_arch => 'aarch64',
defines => [ "HAVE_FORK=0" ],
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "ios64",
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
index c03177e484..6a7f614153 100644
--- a/tools/depends/target/openssl/Makefile
+++ b/tools/depends/target/openssl/Makefile
@@ -4,15 +4,27 @@ DEPS = ../../Makefile.include Makefile OPENSSL-VERSION ../../download-files.incl
# configuration settings
ifeq ($(OS), linux)
- # Need to export our vars to override "default" conf data of openssl
TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib
- CONFIGURE=MACHINE=$(PLATFORM) ./config no-shared zlib no-tests no-asm $(TARGETOPT) --prefix=$(PREFIX) --libdir=lib
+ CONFIGURE=./Configure no-shared zlib no-tests no-asm no-module $(TARGETOPT) --prefix=$(PREFIX) --libdir=lib
+ ifeq ($(TARGET_PLATFORM),webos)
+ CONFIGURE+= linux-armv4
+ else
+ ifeq ($(CPU),aarch64)
+ CONFIGURE+= linux-aarch64
+ else ifeq ($(CPU),arm)
+ CONFIGURE+= linux-armv4
+ else ifeq ($(CPU),x86_64)
+ CONFIGURE+= linux-x86_64
+ else
+ # Fallback to base generic linux target
+ CONFIGURE+= linux-generic32
+ endif
+ endif
else
ifeq ($(OS), android)
- TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib -D__ANDROID_API__=$(NDK_LEVEL)
- # openssl 1.x incorrectly uses ANDROID_NDK_HOME, when openssl 3.x.x comes in use ANDROID_NDK_ROOT
- # see https://github.com/openssl/openssl/pull/11206
- export ANDROID_NDK_HOME=$(NDKROOT)
+ TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib -U__ANDROID_API__ -D__ANDROID_API__=$(NDK_LEVEL)
+
+ export ANDROID_NDK_ROOT=$(NDKROOT)
export PATH:=$(TOOLCHAIN)/bin:$(PATH)
ifeq ($(MESON_CPU), aarch64)
OPENSSLPLATFORM=android-arm64
@@ -24,18 +36,21 @@ else
# LLVM 15 has raised this to error by default. drop back to warning
CFLAGS+= -Wno-error=implicit-int
export SDKROOT CFLAGS
- OPENSSLPLATFORM=kodi-$(TARGET_PLATFORM)-$(CPU)
+ OPENSSLPLATFORM=kodi-iphoneos-arm64
+
ifeq ($(TARGET_PLATFORM),appletvos)
+ OPENSSLPLATFORM=kodi-appletvos-arm64
# Need to add "no-async" to avoid "'setcontext' is unavailable: not available on tvOS" error
- TARGETOPT=no-async
+ TARGETOPT+= no-async
endif
endif
ifeq ($(OS), osx)
OPENSSLPLATFORM=kodi-darwin64-$(CPU)
- ASMFLAG=no-asm
endif
- CONFIGURE=./Configure $(OPENSSLPLATFORM) no-shared $(ASMFLAG) zlib no-tests $(TARGETOPT) --prefix=$(PREFIX)
+ # Openssl 3.2.0 allows no-apps no-docs as options. Use when we update further
+ # We explicitly use no-asm as there is a symbol clash with gnutls
+ CONFIGURE=./Configure no-shared zlib no-tests no-asm no-module $(TARGETOPT) --prefix=$(PREFIX) $(OPENSSLPLATFORM)
endif
export CC CXX AR RANLIB
diff --git a/tools/depends/target/openssl/OPENSSL-VERSION b/tools/depends/target/openssl/OPENSSL-VERSION
index 1712a0c3da..424c6d4036 100644
--- a/tools/depends/target/openssl/OPENSSL-VERSION
+++ b/tools/depends/target/openssl/OPENSSL-VERSION
@@ -1,4 +1,4 @@
LIBNAME=openssl
-VERSION=1.1.1w
+VERSION=3.0.13
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d
+SHA512=22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9
diff --git a/tools/depends/target/pythonmodule-pil/PYTHONMODULE-PIL-VERSION b/tools/depends/target/pythonmodule-pil/PYTHONMODULE-PIL-VERSION
index 9940c862f7..8f7afcc92b 100644
--- a/tools/depends/target/pythonmodule-pil/PYTHONMODULE-PIL-VERSION
+++ b/tools/depends/target/pythonmodule-pil/PYTHONMODULE-PIL-VERSION
@@ -1,4 +1,4 @@
LIBNAME=Pillow
-VERSION=8.4.0
+VERSION=10.1.0
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
+SHA512=01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a
diff --git a/tools/depends/target/tinyxml2/Makefile b/tools/depends/target/tinyxml2/Makefile
index 23b86ed643..a7a5222969 100644
--- a/tools/depends/target/tinyxml2/Makefile
+++ b/tools/depends/target/tinyxml2/Makefile
@@ -7,7 +7,7 @@ LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT)
all: .installed-$(PLATFORM)
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
+$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); sed -ie 's|\r$$||' CMakeLists.txt
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-16 09:49:42 +0000