commit 7423fc97eda097561e175d244e11ca29d811e0c3 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Jan 16 16:13:46 2025 +0000 Update to 21.2 fix_py313.patch | 13 ------------- fix_python_install_directory.patch | 11 +++++++++++ kodi-20-versioning.patch | 2 +- kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 15 ++++++++++----- sources | 2 +- 6 files changed, 24 insertions(+), 21 deletions(-) --- diff --git a/fix_python_install_directory.patch b/fix_python_install_directory.patch new file mode 100644 index 0000000..0ba4724 --- /dev/null +++ b/fix_python_install_directory.patch @@ -0,0 +1,11 @@ +--- a/cmake/scripts/linux/Install.cmake 2025-01-15 22:14:15.000000000 +0000 ++++ b/cmake/scripts/linux/Install.cmake 2025-01-16 15:19:02.000000000 +0000 +@@ -199,7 +199,7 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE + + if(ENABLE_EVENTCLIENTS) + find_package(PythonInterpreter REQUIRED) +- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', scheme='posix_prefix', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}))" ++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))" + OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + # Install kodi-eventclients-common BT python files + install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py diff --git a/kodi-20-versioning.patch b/kodi-20-versioning.patch index e98741f..e9fd526 100644 --- a/kodi-20-versioning.patch +++ b/kodi-20-versioning.patch @@ -1,6 +1,6 @@ --- kodi-20.0rc2/xbmc/application/Application.cpp.orig 2022-12-19 00:41:40.000000000 -0600 +++ kodi-20.0rc2/xbmc/application/Application.cpp 2023-01-13 22:13:48.253716890 -0600 -@@ -3580,7 +3580,7 @@ +@@ -3688,7 +3688,7 @@ void CApplication::PrintStartupLog() { CLog::Log(LOGINFO, "-----------------------------------------------------------------------"); diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index ded006e..11c1e72 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=21 -MINORVERSION=1 +MINORVERSION=2 #GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583 #GITSHORT=b6daed5 CODENAME=Omega diff --git a/kodi.spec b/kodi.spec index 85d205c..0f29484 100644 --- a/kodi.spec +++ b/kodi.spec @@ -38,8 +38,8 @@ %endif Name: kodi -Version: 21.1 -Release: 2%{?dist} +Version: 21.2 +Release: 1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -77,8 +77,10 @@ Source6: apache-groovy-binary-4.0.16.zip # Set program version parameters Patch0: kodi-20-versioning.patch -# Python-3.13 fix -Patch1: fix_py313.patch +# Revert bad upstream commit to fix sitelib directory +# https://github.com/xbmc/xbmc/commit/2208a3bc7d40c75f73fef8b94823b150ccff38dd +# https://github.com/xbmc/xbmc/commit/2b55d858fa39b144ecbaff6bfc7c2ccbb534e03d +Patch1: fix_python_install_directory.patch # ffmpeg-7 fix # https://github.com/xbmc/xbmc/pull/24972 @@ -319,7 +321,7 @@ pushd .. unzip %{SOURCE6} popd %patch -P 0 -p1 -b.versioning -%patch -P 1 -p1 -b.py313 +%patch -P 1 -p1 -b.sitelib %patch -P 2 -p1 -b.ffmpeg7 # Fix up Python shebangs @@ -455,6 +457,9 @@ rm -f %{buildroot}%{_bindir}/TexturePacker %changelog +* Thu Jan 16 2025 Leigh Scott <leigh123linux(a)gmail.com&gt; - 21.2-1 +- Update to 21.2 + * Tue Oct 08 2024 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 21.1-2 - Rebuilt diff --git a/sources b/sources index 6addf32..b403b81 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (kodi-21.1-patched.tar.xz) = 9d1cb59a2d32a5716a3669675c1a01f825848801125c59d65b37cff61770db9ccc13b753aa109f4b9e36bbe5c240c9c771333ac558b7d6f199e1407e08d4ef1e +SHA512 (kodi-21.2-patched.tar.xz) = 20d6c0e305b0b1d59592904f221315a5f3a784c0cbc55df95e53d6cd768d85feb980ac4ba2c7bd44a576137f622e3e0b7791c0405cb1254cc99ecabe776a0545 SHA512 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d SHA512 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e SHA512 (apache-groovy-binary-4.0.16.zip) = 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0