aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Linux/kodi.desktop.in1
-rw-r--r--tools/Linux/kodi.metainfo.xml.in14
-rw-r--r--tools/depends/native/python3/01-distutil-flags.patch2
-rw-r--r--tools/depends/native/python3/PYTHON3-VERSION5
-rw-r--r--tools/depends/native/python3/distutil.patch12
-rw-r--r--tools/depends/target/Makefile2
-rw-r--r--tools/depends/target/freetype2-noharfbuzz/01-darwinembedded-incorrecttoolchain.patch12
-rw-r--r--tools/depends/target/freetype2-noharfbuzz/FREETYPE2-NOHARFBUZZ-VERSION5
-rw-r--r--tools/depends/target/freetype2-noharfbuzz/Makefile53
-rw-r--r--tools/depends/target/freetype2/01-darwinembedded-incorrecttoolchain.patch12
-rw-r--r--tools/depends/target/freetype2/FREETYPE2-VERSION5
-rw-r--r--tools/depends/target/freetype2/Makefile60
-rw-r--r--tools/depends/target/libandroidjni/LIBANDROIDJNI-VERSION4
-rw-r--r--tools/depends/target/python3/Makefile1
-rw-r--r--tools/depends/target/python3/PYTHON3-VERSION5
-rw-r--r--tools/depends/target/python3/crosscompile.patch26
16 files changed, 123 insertions, 96 deletions
diff --git a/tools/Linux/kodi.desktop.in b/tools/Linux/kodi.desktop.in
index 80e5a493be..71d3f7d7f2 100644
--- a/tools/Linux/kodi.desktop.in
+++ b/tools/Linux/kodi.desktop.in
@@ -11,7 +11,6 @@ Icon=@APP_NAME_LC@
Terminal=false
Type=Application
Categories=AudioVideo;Video;Player;TV;
-Keywords=audio;video;media;center;tv;movies;series;songs;remote;
Actions=Fullscreen;Standalone;
diff --git a/tools/Linux/kodi.metainfo.xml.in b/tools/Linux/kodi.metainfo.xml.in
index 99db9d7eba..26328a2427 100644
--- a/tools/Linux/kodi.metainfo.xml.in
+++ b/tools/Linux/kodi.metainfo.xml.in
@@ -12,6 +12,8 @@
<url type="faq">https://kodi.wiki/view/FAQs</url>
<url type="help">https://forum.kodi.tv/</url>
<url type="translate">https://kodi.weblate.cloud/</url>
+ <url type="contribute">https://github.com/xbmc/xbmc/blob/master/docs/CONTRIBUTING.md</url>
+ <url type="vcs-browser">https://github.com/xbmc/xbmc/</url>
<description>
<p>Kodi allows users to play and view videos, music, podcasts,
and other digital media files from local storage, network storage
@@ -24,6 +26,18 @@
very customisable and runs on a wide variety of devices. It is
supported by a dedicated team of volunteers and a huge community.</p>
</description>
+ <keywords>
+ <keyword>Kodi</keyword>
+ <keyword>xbmc</keyword>
+ <keyword>audio</keyword>
+ <keyword>video</keyword>
+ <keyword>media</keyword>
+ <keyword>media center</keyword>
+ <keyword>music</keyword>
+ <keyword>tv</keyword>
+ <keyword>television</keyword>
+ <keyword>remote control</keyword>
+ </keyboards>
<launchable type="desktop-id">@APP_NAME_LC@.desktop</launchable>
<screenshots>
<screenshot type="default">
diff --git a/tools/depends/native/python3/01-distutil-flags.patch b/tools/depends/native/python3/01-distutil-flags.patch
index fe83ebe333..8ab20bf6db 100644
--- a/tools/depends/native/python3/01-distutil-flags.patch
+++ b/tools/depends/native/python3/01-distutil-flags.patch
@@ -1,6 +1,6 @@
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -190,6 +190,9 @@
+@@ -196,6 +196,9 @@
(cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
get_config_vars('CC', 'CXX', 'CFLAGS',
'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
diff --git a/tools/depends/native/python3/PYTHON3-VERSION b/tools/depends/native/python3/PYTHON3-VERSION
index c68c3d6c9b..904a958141 100644
--- a/tools/depends/native/python3/PYTHON3-VERSION
+++ b/tools/depends/native/python3/PYTHON3-VERSION
@@ -1,5 +1,6 @@
LIBNAME=Python
-VERSION=3.9.10
+VERSION=3.9.13
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.xz
-SHA512=09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
+SHA512=e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
+
diff --git a/tools/depends/native/python3/distutil.patch b/tools/depends/native/python3/distutil.patch
deleted file mode 100644
index fe83ebe333..0000000000
--- a/tools/depends/native/python3/distutil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -190,6 +190,9 @@
- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+ # get_config_vars returns host vars. clear cflags, ldshared for crosscompile use
-+ cflags = ""
-+ ldshared = cc + " -shared"
-
- if 'CC' in os.environ:
- newcc = os.environ['CC']
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index a7b29eeaa4..38ffb6fc47 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -138,7 +138,7 @@ dav1d: meson-cross-file
dbus: expat
ffmpeg: $(ICONV) $(ZLIB) bzip2 gnutls dav1d $(LIBVA)
fontconfig: freetype2 expat $(ICONV) $(LIBUUID) meson-cross-file
-freetype2: harfbuzz $(ZLIB)
+freetype2: bzip2 harfbuzz $(ZLIB)
fribidi: meson-cross-file
gettext: $(ICONV)
gnutls: nettle $(ZLIB)
diff --git a/tools/depends/target/freetype2-noharfbuzz/01-darwinembedded-incorrecttoolchain.patch b/tools/depends/target/freetype2-noharfbuzz/01-darwinembedded-incorrecttoolchain.patch
new file mode 100644
index 0000000000..256718e6cb
--- /dev/null
+++ b/tools/depends/target/freetype2-noharfbuzz/01-darwinembedded-incorrecttoolchain.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,8 +149,7 @@
+ # iOS only uses static libraries
+ set(BUILD_SHARED_LIBS OFF)
+
+- set(CMAKE_TOOLCHAIN_FILE
+- ${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
++ include(${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
+ endif ()
+ else ()
+ if (DEFINED IOS_PLATFORM)
diff --git a/tools/depends/target/freetype2-noharfbuzz/FREETYPE2-NOHARFBUZZ-VERSION b/tools/depends/target/freetype2-noharfbuzz/FREETYPE2-NOHARFBUZZ-VERSION
new file mode 100644
index 0000000000..eba6f0e091
--- /dev/null
+++ b/tools/depends/target/freetype2-noharfbuzz/FREETYPE2-NOHARFBUZZ-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=freetype
+VERSION=2.11.1
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
+BYPRODUCT=libfreetype.a
diff --git a/tools/depends/target/freetype2-noharfbuzz/Makefile b/tools/depends/target/freetype2-noharfbuzz/Makefile
index 809e8cc875..e4a9fec384 100644
--- a/tools/depends/target/freetype2-noharfbuzz/Makefile
+++ b/tools/depends/target/freetype2-noharfbuzz/Makefile
@@ -1,43 +1,50 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile ../../download-files.include
-
-# lib name, version
-LIBNAME=freetype
-VERSION=2.11.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
-include ../../download-files.include
+include ../../Makefile.include FREETYPE2-NOHARFBUZZ-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile FREETYPE2-NOHARFBUZZ-VERSION ../../download-files.include \
+ 01-darwinembedded-incorrecttoolchain.patch
# Freetype has a circular dependency with harfbuzz.
# To enable harfbuzz support in freetype, we build this first to bootstrap harfbuzz
# and then build freetype2 again with harfbuzz support
-# configuration settings
-# force using internal libtool
-export LIBTOOL=builds/unix/libtool
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) builds/unix; \
- ./configure --prefix=$(PREFIX) --disable-shared --with-png=no --with-harfbuzz=no
+CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=OFF \
+ -DFT_DISABLE_ZLIB=ON \
+ -DFT_DISABLE_BZIP2=ON \
+ -DFT_DISABLE_PNG=ON \
+ -DFT_DISABLE_HARFBUZZ=ON \
+ -DFT_DISABLE_BROTLI=ON
-LIBDYLIB=$(PLATFORM)/objs/.libs/lib$(LIBNAME).a
+ifeq ($(OS), darwin_embedded)
+ # We need SDKROOT without the /SDKs/*.sdk for IOS_DEVELOPER_ROOT
+ DEV_ROOT=$(shell awk -v sdk=$(SDKROOT) 'BEGIN{ split(sdk, a, /\/SDKs/); print a[1]}')
-all: .installed-$(PLATFORM)
+ CMAKE_OPTIONS+= -DIOS_PLATFORM=OS \
+ -DCMAKE_AR=$(AR) \
+ -DCMAKE_OSX_ARCHITECTURES=$(CPU) \
+ -DCMAKE_IOS_DEVELOPER_ROOT=$(DEV_ROOT) \
+ -DCMAKE_IOS_SDK_ROOT=$(SDKROOT)
+endif
+LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT)
+
+all: .installed-$(PLATFORM)
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); $(CONFIGURE)
+ifeq ($(OS),darwin_embedded)
+ cd $(PLATFORM); patch -p1 -i ../01-darwinembedded-incorrecttoolchain.patch
+endif
+ cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) ..
$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
+.installed-$(PLATFORM): $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build install
touch $@
clean:
- $(MAKE) -C $(PLATFORM) clean
+ $(MAKE) -C $(PLATFORM)/build clean
rm -f .installed-$(PLATFORM)
distclean::
diff --git a/tools/depends/target/freetype2/01-darwinembedded-incorrecttoolchain.patch b/tools/depends/target/freetype2/01-darwinembedded-incorrecttoolchain.patch
new file mode 100644
index 0000000000..256718e6cb
--- /dev/null
+++ b/tools/depends/target/freetype2/01-darwinembedded-incorrecttoolchain.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,8 +149,7 @@
+ # iOS only uses static libraries
+ set(BUILD_SHARED_LIBS OFF)
+
+- set(CMAKE_TOOLCHAIN_FILE
+- ${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
++ include(${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
+ endif ()
+ else ()
+ if (DEFINED IOS_PLATFORM)
diff --git a/tools/depends/target/freetype2/FREETYPE2-VERSION b/tools/depends/target/freetype2/FREETYPE2-VERSION
new file mode 100644
index 0000000000..eba6f0e091
--- /dev/null
+++ b/tools/depends/target/freetype2/FREETYPE2-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=freetype
+VERSION=2.11.1
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
+BYPRODUCT=libfreetype.a
diff --git a/tools/depends/target/freetype2/Makefile b/tools/depends/target/freetype2/Makefile
index e0848c2a50..886959982d 100644
--- a/tools/depends/target/freetype2/Makefile
+++ b/tools/depends/target/freetype2/Makefile
@@ -1,39 +1,49 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile ../../download-files.include
-
-# lib name, version
-LIBNAME=freetype
-VERSION=2.11.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
-include ../../download-files.include
-
-# configuration settings
-# force using internal libtool
-export LIBTOOL=builds/unix/libtool
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) builds/unix; \
- ./configure --prefix=$(PREFIX) --disable-shared --with-png=no --with-harfbuzz=yes
-
-LIBDYLIB=$(PLATFORM)/objs/.libs/lib$(LIBNAME).a
+include ../../Makefile.include FREETYPE2-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile FREETYPE2-VERSION ../../download-files.include \
+ 01-darwinembedded-incorrecttoolchain.patch
+
+# explicitly disable PNG and ZLIB due to Apple platforms causing failures
+# with pkg-config not finding zlib due to no .pc when using system zlib
+# this effects fontconfig, libbluray
+CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=OFF \
+ -DFT_REQUIRE_BZIP2=ON \
+ -DFT_REQUIRE_HARFBUZZ=ON \
+ -DFT_DISABLE_BROTLI=ON \
+ -DFT_DISABLE_PNG=ON \
+ -DFT_DISABLE_ZLIB=ON
+
+ifeq ($(OS), darwin_embedded)
+ # We need SDKROOT without the /SDKs/*.sdk for IOS_DEVELOPER_ROOT
+ DEV_ROOT=$(shell awk -v sdk=$(SDKROOT) 'BEGIN{ split(sdk, a, /\/SDKs/); print a[1]}')
+
+ CMAKE_OPTIONS+= -DIOS_PLATFORM=OS \
+ -DCMAKE_AR=$(AR) \
+ -DCMAKE_OSX_ARCHITECTURES=$(CPU) \
+ -DCMAKE_IOS_DEVELOPER_ROOT=$(DEV_ROOT) \
+ -DCMAKE_IOS_SDK_ROOT=$(SDKROOT)
+endif
+
+LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT)
all: .installed-$(PLATFORM)
-
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); $(CONFIGURE)
+ifeq ($(OS),darwin_embedded)
+ cd $(PLATFORM); patch -p1 -i ../01-darwinembedded-incorrecttoolchain.patch
+endif
+ cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) ..
$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
+.installed-$(PLATFORM): $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build install
touch $@
clean:
- $(MAKE) -C $(PLATFORM) clean
+ $(MAKE) -C $(PLATFORM)/build clean
rm -f .installed-$(PLATFORM)
distclean::
diff --git a/tools/depends/target/libandroidjni/LIBANDROIDJNI-VERSION b/tools/depends/target/libandroidjni/LIBANDROIDJNI-VERSION
index 138ebe84a4..9478585f5d 100644
--- a/tools/depends/target/libandroidjni/LIBANDROIDJNI-VERSION
+++ b/tools/depends/target/libandroidjni/LIBANDROIDJNI-VERSION
@@ -1,6 +1,6 @@
LIBNAME=libandroidjni
-VERSION=084f39b4f689a1dd63eee9fdddb2c5f58f85e33e
+VERSION=e0b02a846ba68d856d47812bf606022207def9cb
BASE_URL=https://github.com/xbmc/libandroidjni/archive
ARCHIVE=$(VERSION).tar.gz
-SHA512=1f43992a2107fae0fca52ca4a4ccc5b05e38acd857930597099bd4cc3738a6d4a89dc4c123ee3440c2211563dd2b09473f87ccd1c5d156f13f37add523262c3d
+SHA512=851efa5fadd70c5d6388b593836f7312394b9aac3c929dafaff894938b7eb8a26d7b04887ef63c148ed03d1cb65751696e417b242dddd24e25cbdfde5de76b49
BYPRODUCT=libandroidjni.a
diff --git a/tools/depends/target/python3/Makefile b/tools/depends/target/python3/Makefile
index f68a56d08c..089dffbddf 100644
--- a/tools/depends/target/python3/Makefile
+++ b/tools/depends/target/python3/Makefile
@@ -29,7 +29,6 @@ CONFIGURE=./configure --prefix=$(PREFIX) \
--enable-ipv6 \
$(EXTRA_CONFIGURE)
-
LIBDYLIB=$(PLATFORM)/libpython$(PYTHON_VERSION).a
all: .installed-$(PLATFORM)
diff --git a/tools/depends/target/python3/PYTHON3-VERSION b/tools/depends/target/python3/PYTHON3-VERSION
index c68c3d6c9b..904a958141 100644
--- a/tools/depends/target/python3/PYTHON3-VERSION
+++ b/tools/depends/target/python3/PYTHON3-VERSION
@@ -1,5 +1,6 @@
LIBNAME=Python
-VERSION=3.9.10
+VERSION=3.9.13
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.xz
-SHA512=09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
+SHA512=e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
+
diff --git a/tools/depends/target/python3/crosscompile.patch b/tools/depends/target/python3/crosscompile.patch
index 93c86b8047..1b7b47725a 100644
--- a/tools/depends/target/python3/crosscompile.patch
+++ b/tools/depends/target/python3/crosscompile.patch
@@ -18,23 +18,6 @@
case $MACHDEP in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -38,7 +38,6 @@
- MAINCC= @MAINCC@
- LINKCC= @LINKCC@
- AR= @AR@
--READELF= @READELF@
- SOABI= @SOABI@
- LDVERSION= @LDVERSION@
- LIBPYTHON= @LIBPYTHON@
-@@ -634,7 +634,7 @@
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-+ PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-
-
- # Build static library
@@ -1694,10 +1694,11 @@
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -61,15 +44,6 @@
# This global variable is used to hold the list of modules to be disabled.
DISABLED_MODULE_LIST = []
-@@ -58,7 +58,7 @@
- return sys.platform
-
-
--CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ)
-+CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('CROSS_COMPILE_TARGET' in os.environ)
- HOST_PLATFORM = get_platform()
- MS_WINDOWS = (HOST_PLATFORM == 'win32')
- CYGWIN = (HOST_PLATFORM == 'cygwin')
@@ -445,6 +445,7 @@
self.compiler.set_executables(**args)
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-14 10:15:54 +0000