diff options
Diffstat (limited to 'multimedia/kodi')
| -rw-r--r-- | multimedia/kodi/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/kodi/distinfo | 8 | ||||
| -rw-r--r-- | multimedia/kodi/files/patch-swig | 13 | ||||
| -rw-r--r-- | multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp | 47 | ||||
| -rw-r--r-- | multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h | 41 | ||||
| -rw-r--r-- | multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp | 10 | ||||
| -rw-r--r-- | multimedia/kodi/files/patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp | 10 | ||||
| -rw-r--r-- | multimedia/kodi/pkg-plist | 73 |
8 files changed, 89 insertions, 119 deletions
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index 4767f27f0b4d..bdf749c1bbe2 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,6 +1,5 @@ PORTNAME= kodi -DISTVERSION= 21.0 -PORTREVISION= 11 +DISTVERSION= 21.2 CATEGORIES= multimedia java MASTER_SITES= http://mirrors.kodi.tv/build-deps/sources/ DISTFILES= apache-groovy-binary-${GROOVY_VERSION}.zip \ @@ -9,6 +8,9 @@ DISTFILES= apache-groovy-binary-${GROOVY_VERSION}.zip \ DIST_SUBDIR= ${PORTNAME} # do not forget to fix devel/kodi-platform when updating kodi +PATCH_SITES= https://github.com/xbmc/xbmc/commit/ +PATCHFILES= 269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch:-p1 + MAINTAINER= yzrh@noema.org COMMENT= Award winning media center application WWW= https://kodi.tv/ diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo index da2b055758eb..059af28cd2b4 100644 --- a/multimedia/kodi/distinfo +++ b/multimedia/kodi/distinfo @@ -1,15 +1,17 @@ -TIMESTAMP = 1712510398 +TIMESTAMP = 1743432741 SHA256 (kodi/apache-groovy-binary-4.0.16.zip) = b8c3bec88a3f5a62235d9429a97e371032bf7216f3e28724823a9169dd10befc SIZE (kodi/apache-groovy-binary-4.0.16.zip) = 29793704 SHA256 (kodi/commons-lang3-3.14.0-bin.tar.gz) = 317c3e3fcd5fcca3781a7996ff1e0c50c13244ee961e94e5f6f6d84b84733b16 SIZE (kodi/commons-lang3-3.14.0-bin.tar.gz) = 9442785 SHA256 (kodi/commons-text-1.11.0-bin.tar.gz) = 4169cb90571fb28fad4c5eea7c1c994c18f1995452f73e8ea7a86087c0e3822e SIZE (kodi/commons-text-1.11.0-bin.tar.gz) = 3018564 -SHA256 (kodi/xbmc-xbmc-21.0-21.0-Omega_GH0.tar.gz) = 7f54c1fd8456ac46221fbc85e447362bdc209163c6cb19fca98d106560071b7c -SIZE (kodi/xbmc-xbmc-21.0-21.0-Omega_GH0.tar.gz) = 40987733 +SHA256 (kodi/xbmc-xbmc-21.2-21.2-Omega_GH0.tar.gz) = da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383 +SIZE (kodi/xbmc-xbmc-21.2-21.2-Omega_GH0.tar.gz) = 41306955 SHA256 (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e SIZE (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 102124 SHA256 (kodi/xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc SIZE (kodi/xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 128547 SHA256 (kodi/xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 SIZE (kodi/xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 110513 +SHA256 (kodi/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch) = 72282e0c3d407c3337861995f093fbd955a4cad668f432c665931a6f276772e3 +SIZE (kodi/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch) = 1257 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()) diff --git a/multimedia/kodi/pkg-plist b/multimedia/kodi/pkg-plist index 8e7c614a192f..173ecf9c4ed6 100644 --- a/multimedia/kodi/pkg-plist +++ b/multimedia/kodi/pkg-plist @@ -151,7 +151,7 @@ share/icons/hicolor/256x256/apps/kodi.png share/icons/hicolor/32x32/apps/kodi.png share/icons/hicolor/48x48/apps/kodi.png share/icons/hicolor/64x64/apps/kodi.png -share/icons/hicolor/scalable/apps/kodi.png +share/icons/hicolor/scalable/apps/kodi.svg %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/addon.xml %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/icon.png %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/resources/language/resource.language.af_za/strings.po @@ -1660,20 +1660,84 @@ share/icons/hicolor/scalable/apps/kodi.png %%DATADIR%%/addons/webinterface.default/images/thumbnail_default.png %%DATADIR%%/addons/webinterface.default/index.html %%DATADIR%%/addons/webinterface.default/js/kodi-webinterface.js +%%DATADIR%%/addons/webinterface.default/lang/_strings/af.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/am.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ar.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ast.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/az.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/be.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/bg.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/bs.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ca.json %%DATADIR%%/addons/webinterface.default/lang/_strings/cs.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/cy.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/da.json %%DATADIR%%/addons/webinterface.default/lang/_strings/de.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/el.json %%DATADIR%%/addons/webinterface.default/lang/_strings/en.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/en_au.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/en_nz.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/en_us.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/eo.json %%DATADIR%%/addons/webinterface.default/lang/_strings/es.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/es_ar.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/es_mx.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/et.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/eu.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/fa.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/fa_ir.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/fi.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/fo.json %%DATADIR%%/addons/webinterface.default/lang/_strings/fr.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/fr_ca.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/gl.json %%DATADIR%%/addons/webinterface.default/lang/_strings/gr.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/hi.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/hr.json %%DATADIR%%/addons/webinterface.default/lang/_strings/hu.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/hy.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/id.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/is.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/it.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/iw.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ja.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/kn.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ko.json %%DATADIR%%/addons/webinterface.default/lang/_strings/lt.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/lv.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/mi.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/mk.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ml.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/mn.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ms.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/mt.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/my.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/nb.json %%DATADIR%%/addons/webinterface.default/lang/_strings/nl.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/oc_fr.json %%DATADIR%%/addons/webinterface.default/lang/_strings/pl.json %%DATADIR%%/addons/webinterface.default/lang/_strings/pt.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/pt_br.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ro.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ru.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/si.json %%DATADIR%%/addons/webinterface.default/lang/_strings/sk.json -%%DATADIR%%/addons/webinterface.default/lang/_strings/zh_hans.json -%%DATADIR%%/addons/webinterface.default/lang/_strings/zh_hant.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/sl.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/sq.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/sr.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/sr_rs@latin.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/sv.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/szl.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/ta.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/te.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/tg.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/th.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/tr.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/uk.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/uz.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/vi.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/zh_cn.json +%%DATADIR%%/addons/webinterface.default/lang/_strings/zh_tw.json %%DATADIR%%/addons/webinterface.default/lang/de/app-readme.html %%DATADIR%%/addons/webinterface.default/lang/de/keybind-readme.html %%DATADIR%%/addons/webinterface.default/lang/de/lang-readme.html @@ -1822,6 +1886,8 @@ share/icons/hicolor/scalable/apps/kodi.png %%DATADIR%%/media/icon32x32.png %%DATADIR%%/media/icon48x48.png %%DATADIR%%/media/icon80x80.png +%%DATADIR%%/media/qr/kodilove/qr-logo.png +%%DATADIR%%/media/qr/kodilove/qr-popcorn.jpg %%DATADIR%%/media/splash.jpg %%DATADIR%%/media/vendor_icon.png %%DATADIR%%/media/vendor_logo.png @@ -1871,6 +1937,7 @@ share/icons/hicolor/scalable/apps/kodi.png %%DATADIR%%/system/keymaps/mouse.xml %%DATADIR%%/system/keymaps/nyxboard/keyboard.xml %%DATADIR%%/system/keymaps/osmc/osmc_remote.xml +%%DATADIR%%/system/keymaps/osmcv3/osmcv3_remote.xml %%DATADIR%%/system/keymaps/remote.xml %%DATADIR%%/system/keymaps/touchscreen.xml %%DATADIR%%/system/keymaps/wetek-play/keyboard.xml |