commit:     91967fc3aaa18c259052d1a7e3750d30b9ed617a
Author:     Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  1 20:14:31 2025 +0000
Commit:     Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Mon Dec  1 20:14:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91967fc3

media-tv/kodi: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>

 media-tv/kodi/files/kodi-21.1-fix-gcc15.patch      | 116 ---------------------
 .../kodi-21.1-fix-swig-4.3.0-build-pr25863.patch   |  27 -----
 2 files changed, 143 deletions(-)

diff --git a/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch 
b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
deleted file mode 100644
index 5ab776e70f50..000000000000
--- a/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-https://bugs.gentoo.org/938531
-https://github.com/xbmc/xbmc/pull/25735
-
-From 75e7b25883af5d2c8c89dbe6d830a5c17e9452f2 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <[email protected]>
-Date: Sat, 14 Sep 2024 13:46:25 +0300
-Subject: [PATCH] Include missing <cstdint> includes
-
-* GCC-15 stopped implicitly including it.
-
-Signed-off-by: Alfred Wingate <[email protected]>
---- a/xbmc/ContextMenuItem.h
-+++ b/xbmc/ContextMenuItem.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <memory>
- #include <string>
---- a/xbmc/addons/AddonManager.h
-+++ b/xbmc/addons/AddonManager.h
-@@ -11,6 +11,7 @@
- #include "threads/CriticalSection.h"
- #include "utils/EventStream.h"
- 
-+#include <cstdint>
- #include <map>
- #include <memory>
- #include <mutex>
---- a/xbmc/addons/IAddon.h
-+++ b/xbmc/addons/IAddon.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <memory>
- #include <string>
---- a/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
-+++ b/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
-@@ -11,6 +11,8 @@
- #include "IRetroPlayerStream.h"
- #include "cores/RetroPlayer/RetroPlayerTypes.h"
- 
-+#include <cstdint>
-+
- extern "C"
- {
- #include <libavutil/pixfmt.h>
---- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
-@@ -10,6 +10,7 @@
- 
- #include <array>
- #include <cmath>
-+#include <cstdint>
- #include <memory>
- 
- extern "C" {
---- a/xbmc/guilib/FFmpegImage.h
-+++ b/xbmc/guilib/FFmpegImage.h
-@@ -9,6 +9,8 @@
- #pragma once
- 
- #include "iimage.h"
-+
-+#include <cstdint>
- #include <memory>
- 
- extern "C"
---- a/xbmc/input/keymaps/remote/IRTranslator.h
-+++ b/xbmc/input/keymaps/remote/IRTranslator.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <memory>
- #include <string>
---- a/xbmc/messaging/ThreadMessage.h
-+++ b/xbmc/messaging/ThreadMessage.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <memory>
- #include <string>
- #include <utility>
---- a/xbmc/settings/AdvancedSettings.h
-+++ b/xbmc/settings/AdvancedSettings.h
-@@ -13,6 +13,7 @@
- #include "settings/lib/ISettingsHandler.h"
- #include "utils/SortUtils.h"
- 
-+#include <cstdint>
- #include <set>
- #include <string>
- #include <utility>
---- a/xbmc/utils/Archive.h
-+++ b/xbmc/utils/Archive.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <cstring>
- #include <memory>
- #include <string>
--- 
-2.46.0
-

diff --git a/media-tv/kodi/files/kodi-21.1-fix-swig-4.3.0-build-pr25863.patch 
b/media-tv/kodi/files/kodi-21.1-fix-swig-4.3.0-build-pr25863.patch
deleted file mode 100644
index aff5f9c135ca..000000000000
--- a/media-tv/kodi/files/kodi-21.1-fix-swig-4.3.0-build-pr25863.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: https://github.com/xbmc/xbmc/pull/25863
-From 4ff0ba903bed472cddb0d6e5c53c8176cded6b09 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <[email protected]>
-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}

Reply via email to