summaryrefslogtreecommitdiff
path: root/multimedia/kodi/files
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/kodi/files')
-rw-r--r--multimedia/kodi/files/patch-swig13
-rw-r--r--multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp47
-rw-r--r--multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h41
-rw-r--r--multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp10
-rw-r--r--multimedia/kodi/files/patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp10
5 files changed, 10 insertions, 111 deletions
diff --git a/multimedia/kodi/files/patch-swig b/multimedia/kodi/files/patch-swig
deleted file mode 100644
index 702f0db601f6..000000000000
--- a/multimedia/kodi/files/patch-swig
+++ /dev/null
@@ -1,13 +0,0 @@
-Obtained from: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi/-/commit/19ae08599ea754261c8bd3ff1dbc75893d69e6cd
-
---- xbmc/interfaces/swig/CMakeLists.txt.orig 2024-04-06 02:29:22 UTC
-+++ 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/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp
deleted file mode 100644
index 1e36573c825d..000000000000
--- a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- xbmc/music/tags/TagLibVFSStream.cpp.orig 2024-07-20 12:15:29 UTC
-+++ xbmc/music/tags/TagLibVFSStream.cpp
-@@ -59,7 +59,7 @@ FileName TagLibVFSStream::name() const
- * Reads a block of size \a length at the current get pointer.
- */
- #if (TAGLIB_MAJOR_VERSION >= 2)
--ByteVector TagLibVFSStream::readBlock(unsigned long length)
-+ByteVector TagLibVFSStream::readBlock(size_t length)
- #else
- ByteVector TagLibVFSStream::readBlock(TagLib::ulong length)
- #endif
-@@ -282,7 +282,7 @@ bool TagLibVFSStream::isOpen() const
- *
- * \see Position
- */
--void TagLibVFSStream::seek(long offset, Position p)
-+void TagLibVFSStream::seek(TagLib::offset_t offset, Position p)
- {
- const long fileLen = length();
- if (m_bIsReadOnly && fileLen > 0)
-@@ -340,7 +340,7 @@ void TagLibVFSStream::clear()
- /*!
- * Returns the current offset within the file.
- */
--long TagLibVFSStream::tell() const
-+TagLib::offset_t TagLibVFSStream::tell() const
- {
- int64_t pos = m_file.GetPosition();
- if(pos > LONG_MAX)
-@@ -352,7 +352,7 @@ long TagLibVFSStream::tell() const
- /*!
- * Returns the length of the file.
- */
--long TagLibVFSStream::length()
-+TagLib::offset_t TagLibVFSStream::length()
- {
- return (long)m_file.GetLength();
- }
-@@ -360,7 +360,7 @@ long TagLibVFSStream::length()
- /*!
- * Truncates the file to a \a length.
- */
--void TagLibVFSStream::truncate(long length)
-+void TagLibVFSStream::truncate(TagLib::offset_t length)
- {
- m_file.Truncate(length);
- }
diff --git a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h
deleted file mode 100644
index 2a762c2a791b..000000000000
--- a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- xbmc/music/tags/TagLibVFSStream.h.orig 2024-06-28 10:37:37 UTC
-+++ xbmc/music/tags/TagLibVFSStream.h
-@@ -38,7 +38,7 @@ namespace MUSIC_INFO
- * Reads a block of size \a length at the current get pointer.
- */
- #if (TAGLIB_MAJOR_VERSION >= 2)
-- TagLib::ByteVector readBlock(unsigned long length) override;
-+ TagLib::ByteVector readBlock(size_t length) override;
- #else
- TagLib::ByteVector readBlock(TagLib::ulong length) override;
- #endif
-@@ -99,7 +99,7 @@ namespace MUSIC_INFO
- *
- * \see Position
- */
-- void seek(long offset, TagLib::IOStream::Position p = Beginning) override;
-+ void seek(TagLib::offset_t offset, TagLib::IOStream::Position p = Beginning) override;
-
- /*!
- * Reset the end-of-file and error flags on the file.
-@@ -109,17 +109,17 @@ namespace MUSIC_INFO
- /*!
- * Returns the current offset within the file.
- */
-- long tell() const override;
-+ TagLib::offset_t tell() const override;
-
- /*!
- * Returns the length of the file.
- */
-- long length() override;
-+ TagLib::offset_t length() override;
-
- /*!
- * Truncates the file to a \a length.
- */
-- void truncate(long length) override;
-+ void truncate(TagLib::offset_t length) override;
-
- protected:
- /*!
diff --git a/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp b/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp
deleted file mode 100644
index 81127dba644b..000000000000
--- a/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp.orig 2022-05-22 10:20:23 UTC
-+++ xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
-@@ -27,6 +27,7 @@
- #include <arpa/inet.h>
- #include <fmt/format.h>
- #include <sys/select.h>
-+#include <sys/socket.h>
- #include <unistd.h>
-
- using namespace WSDiscovery;
diff --git a/multimedia/kodi/files/patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp b/multimedia/kodi/files/patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp
new file mode 100644
index 000000000000..ea5d19bc2103
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp
@@ -0,0 +1,10 @@
+--- xbmc/windowing/gbm/drm/DRMAtomic.cpp.orig 2024-11-21 22:28:38 UTC
++++ xbmc/windowing/gbm/drm/DRMAtomic.cpp
+@@ -114,7 +114,6 @@ void CDRMAtomic::DrmAtomicCommit(int fb_id, int flags,
+ if (m_inFenceFd != -1)
+ {
+ AddProperty(m_crtc, "OUT_FENCE_PTR", reinterpret_cast<uint64_t>(&m_outFenceFd));
+- AddProperty(m_gui_plane, "IN_FENCE_FD", m_inFenceFd);
+ }
+ }
+ else if (videoLayer && !CServiceBroker::GetGUI()->GetWindowManager().HasVisibleControls())