From 248630f765f877835ae88ad8256f44a29b7daf79 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 24 Jan 2025 19:38:22 +0100 Subject: [PATCH] rebuilt with current python (3.11) [release 21.2-2mamba;Thu Jan 23 2025] --- kodi-21.1-swig-4.3.0.patch | 26 -------------------------- kodi.spec | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 kodi-21.1-swig-4.3.0.patch diff --git a/kodi-21.1-swig-4.3.0.patch b/kodi-21.1-swig-4.3.0.patch deleted file mode 100644 index e87ead7..0000000 --- a/kodi-21.1-swig-4.3.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ff0ba903bed472cddb0d6e5c53c8176cded6b09 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Mon, 21 Oct 2024 22:10:29 +1100 -Subject: [PATCH] [swig] Fix building with swig 4.3.0 - -swig 4.3.0 has dropped the -xmllang option used with -xml, which had no effect on the output. - -Ref: -- https://github.com/swig/swig/commit/86498e46c6a6218a3d091c12513c40076ac2ce63 ---- - xbmc/interfaces/swig/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt -index 1951b2a336789..46c84c7f7efc5 100644 ---- a/xbmc/interfaces/swig/CMakeLists.txt -+++ b/xbmc/interfaces/swig/CMakeLists.txt -@@ -22,7 +22,7 @@ function(generate_file file) - - add_custom_command(OUTPUT ${CPP_FILE} - COMMAND ${SWIG_EXECUTABLE} -- ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file} -+ ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file} - COMMAND ${Java_JAVA_EXECUTABLE} - ARGS ${JAVA_OPEN_OPTS} -cp "${classpath}" groovy.ui.GroovyMain ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull} - ${CLANG_FORMAT_COMMAND} diff --git a/kodi.spec b/kodi.spec index 57cfc6f..4a12fe2 100644 --- a/kodi.spec +++ b/kodi.spec @@ -24,8 +24,8 @@ Name: kodi -Version: 21.1 -Release: 3mamba +Version: 21.2 +Release: 2mamba Summary: A media player and entertainment hub for digital media Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -45,9 +45,9 @@ Patch1: xbmc-12.0-set_native_cxxflags.patch Patch2: xbmc-12.0-relax_badcolordepth_check.patch Patch3: kodi-21.1-ffmpeg-6-disable-nv-codec.patch Patch4: kodi-21.1-libnfs-6.0.2.patch -Patch5: kodi-21.1-swig-4.3.0.patch Patch6: kodi-21.1-libudev-256.patch License: GPL + ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libX11-devel @@ -122,8 +122,6 @@ BuildRequires: libz-devel BuildRequires: lirc-devel BuildRequires: trousers-devel ## AUTOBUILDREQ-END -BuildRequires: libspdlog-devel >= 0:1.15.0-1mamba -BuildRequires: libdisplay-info-devel >= 0:0.2.0-1mamba BuildRequires: doxygen BuildRequires: gperf BuildRequires: java-openjdk17 @@ -132,8 +130,6 @@ BuildRequires: swig BuildRequires: unzip BuildRequires: libdvdcss-devel BuildRequires: libflac-devel -BuildRequires: libfmt-devel >= 10.1.0 -BuildRequires: libGLESv2-devel BuildRequires: liblame-devel BuildRequires: libmad-devel BuildRequires: libmodplug-devel @@ -184,7 +180,6 @@ Obsoletes: xbmc-rpi < 18.9 XBMC is an award-winning free and open source (GPL) software media player and entertainment hub for digital media. %endif -%debug_package %global _lto_cflags %{nil} @@ -200,13 +195,13 @@ XBMC is an award-winning free and open source (GPL) software media player and en %patch 3 -p1 %patch 4 -p1 -b .libnfs-6.0.2 -%patch 5 -p1 -b .swig-4.3.0 %patch 6 -p1 -b .libudev-256 %build export JAVA_HOME=%{jvmdir}/java-17 #:<< ___EOF %cmake -d build \ + -DPython3_EXECUTABLE=%{__python3} \ -DENABLE_INTERNAL_RapidJSON=OFF \ -DENABLE_INTERNAL_FFMPEG=ON \ -DENABLE_INTERNAL_CROSSGUID=ON \ @@ -304,6 +299,12 @@ fi %doc README.md %changelog +* Thu Jan 23 2025 Silvan Calarco 21.2-2mamba +- rebuilt with current python (3.11) + +* Wed Jan 22 2025 Automatic Build System 21.2-1mamba +- automatic version update by autodist + * Wed Dec 25 2024 Silvan Calarco 21.1-3mamba - patch to fix assert in libudev >= 256 ( https://github.com/LibreELEC/LibreELEC.tv/pull/8982 )