commit: 6c45cb2f21571bc67827dce5be44eba75c18330d Author: V3n3RiX <venerix <AT> koprulu <DOT> sector> AuthorDate: Tue Nov 22 19:27:24 2022 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed Nov 23 06:01:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c45cb2f
media-tv/kodi : fix build with dav1d 1.0.0 Closes: https://github.com/gentoo/gentoo/pull/28389 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch | 94 +++++++++++++++++++++++++ media-tv/kodi/kodi-19.4-r3.ebuild | 6 +- media-tv/kodi/kodi-19.4-r4.ebuild | 3 +- 3 files changed, 101 insertions(+), 2 deletions(-) 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.devol...@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.devol...@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:= )
