diff options
author | 2022-12-25 17:49:56 -0600 | |
---|---|---|
committer | 2022-12-25 17:49:56 -0600 | |
commit | eb1c458af496217de30009cf3ead8b9a16b99339 (patch) | |
tree | 56aabab8ff0eef1dc2d7fc93b081eaecf1470312 | |
parent | dev-python/pypy3-exe: treeclean (diff) | |
download | musl-eb1c458af496217de30009cf3ead8b9a16b99339.tar.gz musl-eb1c458af496217de30009cf3ead8b9a16b99339.tar.bz2 musl-eb1c458af496217de30009cf3ead8b9a16b99339.zip |
media-tv/kodi: add 19.5, drop 19.4-r4
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r-- | media-tv/kodi/Manifest | 2 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch | 94 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch | 12 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-19.4-fmt-9.patch | 74 | ||||
-rw-r--r-- | media-tv/kodi/kodi-19.5.ebuild (renamed from media-tv/kodi/kodi-19.4-r4.ebuild) | 17 |
5 files changed, 118 insertions, 81 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 0bad21b1..5607f1d7 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,5 +1,5 @@ DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a -DIST kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9 +DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 diff --git a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch new file mode 100644 index 00000000..b37ace0f --- /dev/null +++ b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch @@ -0,0 +1,94 @@ +diff -Nur a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake +--- a/cmake/modules/FindFFMPEG.cmake 2022-03-02 18:38:51.000000000 +0000 ++++ b/cmake/modules/FindFFMPEG.cmake 2022-11-22 19:15:38.690434650 +0000 +@@ -275,6 +275,8 @@ + PATCH_COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt + <SOURCE_DIR> && ++ # patch internal ffmpeg, fix build against dav1d 1.0.0 ++ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch && + ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake + <SOURCE_DIR>) +diff -Nur a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch +--- a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 1970-01-01 01:00:00.000000000 +0100 ++++ b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 2022-11-22 19:12:09.566420470 +0000 +@@ -0,0 +1,78 @@ ++From 2546e1ed27f92a840a2cf319e3c1833799974cf1 Mon Sep 17 00:00:00 2001 ++From: BlackEagle <ike.devolder@gmail.com> ++Date: Fri, 29 Apr 2022 14:33:12 +0200 ++Subject: [PATCH] add build fix for dav1d 1.0.0 ++ ++Taken from https://github.com/FFmpeg/FFmpeg/commit/e204846ec16c1ab34c7f3a681734cf5190433018 ++ ++add FF_DAV1D_VERSION_AT_LEAST ++ ++Extracted from https://github.com/FFmpeg/FFmpeg/commit/7ee17ec7e46afef0e0af20af196292ec75f50b62 ++ ++Signed-off-by: BlackEagle <ike.devolder@gmail.com> ++--- ++ libavcodec/libdav1d.c | 24 ++++++++++++++++++++++-- ++ 1 file changed, 22 insertions(+), 2 deletions(-) ++ ++diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c ++index bbb3ec1e6c..08b4af8ac8 100644 ++--- a/libavcodec/libdav1d.c +++++ b/libavcodec/libdav1d.c ++@@ -30,6 +30,9 @@ ++ #include "decode.h" ++ #include "internal.h" ++ +++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ +++ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) +++ ++ typedef struct Libdav1dContext { ++ AVClass *class; ++ Dav1dContext *c; ++@@ -140,6 +143,15 @@ static av_cold int libdav1d_init(AVCodecContext *c) ++ if (dav1d->operating_point >= 0) ++ s.operating_point = dav1d->operating_point; ++ +++#if FF_DAV1D_VERSION_AT_LEAST(6,0) +++ if (dav1d->frame_threads || dav1d->tile_threads) +++ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); +++ else +++ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); +++ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; +++ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", +++ s.n_threads, s.max_frame_delay); +++#else ++ s.n_tile_threads = dav1d->tile_threads ++ ? dav1d->tile_threads ++ : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); ++@@ -148,6 +160,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) ++ : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); ++ av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", ++ s.n_frame_threads, s.n_tile_threads); +++#endif ++ ++ res = dav1d_open(&dav1d->c, &s); ++ if (res < 0) ++@@ -384,11 +397,18 @@ static av_cold int libdav1d_close(AVCodecContext *c) ++ return 0; ++ } ++ +++#ifndef DAV1D_MAX_FRAME_THREADS +++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS +++#endif +++#ifndef DAV1D_MAX_TILE_THREADS +++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS +++#endif +++ ++ #define OFFSET(x) offsetof(Libdav1dContext, x) ++ #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM ++ static const AVOption libdav1d_options[] = { ++- { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, ++- { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, +++ { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, +++ { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, ++ { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD }, ++ { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, ++ { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, ++-- ++2.36.0 ++ diff --git a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch new file mode 100644 index 00000000..e9ff90df --- /dev/null +++ b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch @@ -0,0 +1,12 @@ +--- xbmc/xbmc/windowing/X11/GLContextEGL.h ++++ xbmc/xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,7 @@ + #include "threads/CriticalSection.h" + + #include <EGL/eglext.h> +-#include <EGL/eglextchromium.h> ++#include <EGL/eglext_angle.h> + #include <X11/Xutil.h> + + class CGLContextEGL : public CGLContext + diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch deleted file mode 100644 index b60d9ccc..00000000 --- a/media-tv/kodi/files/kodi-19.4-fmt-9.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Wed, 6 Jul 2022 22:48:35 +1000 -Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers - is disallowed - ---- - xbmc/utils/GLUtils.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp -index 1ef804709ff56..c36dcf6a20fec 100644 ---- a/xbmc/utils/GLUtils.cpp -+++ b/xbmc/utils/GLUtils.cpp -@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) - void LogGraphicsInfo() - { - #if defined(HAS_GL) || defined(HAS_GLES) -- const GLubyte *s; -+ const char* s; - -- s = glGetString(GL_VENDOR); -+ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); - if (s) - CLog::Log(LOGINFO, "GL_VENDOR = %s", s); - else - CLog::Log(LOGINFO, "GL_VENDOR = NULL"); - -- s = glGetString(GL_RENDERER); -+ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); - if (s) - CLog::Log(LOGINFO, "GL_RENDERER = %s", s); - else - CLog::Log(LOGINFO, "GL_RENDERER = NULL"); - -- s = glGetString(GL_VERSION); -+ s = reinterpret_cast<const char*>(glGetString(GL_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_VERSION = %s", s); - else - CLog::Log(LOGINFO, "GL_VERSION = NULL"); - -- s = glGetString(GL_SHADING_LANGUAGE_VERSION); -+ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); - else - -From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Mon, 11 Jul 2022 09:39:02 +0000 -Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void - pointers is disallowed - ---- - xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 8a18288fd8af0..033c0f77bf454 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() - - if(status == Success && items_read) - { -- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); -+ const char* s; -+ -+ s = reinterpret_cast<const char*>(data); -+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); - } - else - CLog::Log(LOGDEBUG,"Window Manager Name: "); diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.5.ebuild index db6aee12..a824206a 100644 --- a/media-tv/kodi/kodi-19.4-r4.ebuild +++ b/media-tv/kodi/kodi-19.5.ebuild @@ -34,8 +34,8 @@ fi inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg PATCHES=( - "${FILESDIR}/${P}-fmt-9.patch" - "${FILESDIR}/${P}-atomic.patch" + "${FILESDIR}/${PN}-19.4-atomic.patch" + "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch" # Musl Patches "${FILESDIR}/musl/19.0/0001-add-missing-stdint.h.patch" @@ -125,7 +125,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} ) !system-ffmpeg? ( app-arch/bzip2 - dav1d? ( media-libs/dav1d ) + dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) @@ -142,10 +142,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( - x11-libs/libva:= + media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) - wayland? ( x11-libs/libva[wayland] ) - X? ( x11-libs/libva[X] ) + wayland? ( media-libs/libva[wayland] ) + X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( @@ -215,6 +215,11 @@ src_unpack() { } src_prepare() { + # https://bugs.gentoo.org/885419 + if has_version ">=media-libs/mesa-22.3.0"; then + PATCHES+=( "${FILESDIR}/${PN}-19.4-fix-mesa-22.3.0-build.patch" ) + fi + cmake_src_prepare # avoid long delays when powerkit isn't running #348580 |