gentoo auto-resync : 23:11:2022 - 07:07:57

4 files changed, 104 insertions, 4 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 1ddd1f0f4ace..35df2ce68b5e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,4 +1,5 @@
 AUX kodi-19.4-atomic.patch 3225 BLAKE2B 83559b2886625c3d8b3a4958733c62508e3ca2d538141f061c5d8f8bc681710540c1ce5cffe3184e293d9f8d5e99c1c83cf29d8d4cada9920f3b2f0f756b6c44 SHA512 8d011c9d0caa037f44557a7fd6f745735207fd510b76f53064ee2dbc03e660dfe475586fa4a08fb5308ed0d5133261aae6853c2c7b63d8da4600903f6b232f9a
+AUX kodi-19.4-dav1d-1.0.0.patch 4778 BLAKE2B 8c4909e4229e5676812f5c948a359940469d787613dc32ad2657aa1dc6098c8f0731d63ceb0bf729c7625b7d634141089d758981d540ea7ffd3a5db435c2e906 SHA512 b934b560fc6388eabceb38fd7175bc3f0be94ad607655b1d3b1f38573755adcb3e30b21bd66f3a3e6a8f24798f13eb77c56b26e4b9c357e925ebce02fc3f8e03
 AUX kodi-19.4-fmt-9.patch 2455 BLAKE2B 02ade8fe11dc19850814b01dd77db9f8f58aa2b9fac56d525c0fcd6e1235fdb3bee251835e6ddb78579e0fd1568f9c1284cbae356188d6998b6aed062f3089d1 SHA512 be32a2413b69b3c1bbc053a328c07bb8b42d84a58a22b0d84da6b0d50cf6d3cb29a509ebb808b4f9e1b3f1bc89ee6aa36dd5ee5685597102c3855aa27dfa724e
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
@@ -9,8 +10,8 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
-EBUILD kodi-19.4-r3.ebuild 10942 BLAKE2B 85dc752a08c5e097482960bb723f4f96dfc995a74024d80ef9c7ac8c12205f407807f38c43ed2e33e4334831067d1bb39f8959dd4ac8c5f156a18189315d57fe SHA512 4791df2eb0c39f75ff3f6798722a463ef8dc941b003665566c0bbb4c9948a399acc8ba6f647ff89332e6dcf1e9bbbf08c61d53d8e37b387255b4cd3db8e21cf5
-EBUILD kodi-19.4-r4.ebuild 10991 BLAKE2B ca068efdf5b381e950b429bbd33b36d45e6aa8f62f0af706a8b87a85fdb102dd9f879f8ce8eac229c1d93b4a4444f7a18fe6e203a18cefdf4ae02ad6cf6eb7eb SHA512 593ac6be1106800c542ded9ffe65f1f3d091aeba634e4c877b426269e25a64bb4bf41607d7ea811bd7c01e0740868b56cb621117f74b3d2f9875d8381fd86371
+EBUILD kodi-19.4-r3.ebuild 10995 BLAKE2B 873045aff53276245b54297404829242ed4cabcf85801d4c34d63c628598f1cee1508a3582e33a416e3ff342914ac95989af3ee940eae09e10f17d37103f86d4 SHA512 a9709e837528749eb47e0a841c3a27c7d7f421fe50efe936904a492dc603c92b3538a9076b643113cf3cb9114a23d3e808f114edb4eb5a94716d017ee2049b6a
+EBUILD kodi-19.4-r4.ebuild 11031 BLAKE2B 8029a161f714224d9d16ff56f8a344133c8cf73a3d2492ae396abd3ff1693632e41aa57e18d0f237e39995513c5be16667bcdb280feb739bf7e9df3ebbaa5b77 SHA512 bfe221b33b8d975d2fd2e0765ead769bd11989f7aa5ebf4ccc808b9880f5fcc249fdb754c29c6ac1124eb78da5412df987220b5273403e2e9f1556f3375b9fbe
 EBUILD kodi-19.9999.ebuild 10907 BLAKE2B ea5348a8a581c7ad94c9110843e98e18ae52320b7e7342920342fa0e70c4289fa5d26aba80573a8b17a2c3ec21f08ae0b322458b9abcc8c95e09a7559c05e12a SHA512 ec55a6010a8121f0efb672d595d7091373be2b493a83253b61d772a92b50387c24e823e39e4c435c1b1e4413c2dd3dcef34f4289dea77e6c91be0b7be75cad5f
 EBUILD kodi-9999.ebuild 10968 BLAKE2B 6f49e40d9545d853c815868637ff1c89a0cd219516e5697178363e0ab65ec16602af82427141c0812bd3e304339b93caba28a6c04a78b345f92951424fab976c SHA512 c4474c5ff1cf52e722eca24fe5f4608c646a0eb0dcf23a785ed8e053ef78284002da5e2b69427cd8a61c903abb856b6efdbe7df99f6d1219b13f8f1a8e671a1e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
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 000000000000..e1d69a983c35
--- /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/kodi-19.4-r3.ebuild b/media-tv/kodi/kodi-19.4-r3.ebuild
index e933af071cc2..caecc50cdfca 100644
--- a/media-tv/kodi/kodi-19.4-r3.ebuild
+++ b/media-tv/kodi/kodi-19.4-r3.ebuild
@@ -33,6 +33,10 @@ fi
 
 inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
 
+PATCHES=(
+	"${FILESDIR}/${P}-dav1d-1.0.0.patch"
+)
+
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
@@ -113,7 +117,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:= )
diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
index 237fc5a593d9..3fcd9b13f6b0 100644
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ b/media-tv/kodi/kodi-19.4-r4.ebuild
@@ -36,6 +36,7 @@ inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xd
 PATCHES=(
 	"${FILESDIR}/${P}-fmt-9.patch"
 	"${FILESDIR}/${P}-atomic.patch"
+	"${FILESDIR}/${P}-dav1d-1.0.0.patch"
 )
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
@@ -118,7 +119,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:= )