* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2017-12-19 23:42 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2017-12-19 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 31be70b4de8dc1f3627765a4a35a4b5cf90a170f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 23:42:15 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 23:42:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31be70b4
media-video/ffmpeg: Fix chromium build in 9999
Some libraries were missing from the final link. This just involved
referencing FF_EXTRALIBS instead of FFEXTRALIBS. Also tested with
3.3.3.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/ffmpeg/files/chromium.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
index 60a3e5d6cb9..307f31f4a3a 100644
--- a/media-video/ffmpeg/files/chromium.patch
+++ b/media-video/ffmpeg/files/chromium.patch
@@ -14,7 +14,7 @@ index 0000000..992cf3c
+LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
+
+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS)
++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FF_EXTRALIBS)
+
+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
+ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2018-12-02 21:43 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2018-12-02 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 36e878ee7e983945a26092328ac0487e43abde6a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 23:18:32 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 21:41:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e878ee
media-video/ffmpeg: Fix chromium-r1.patch to not link every time
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/ffmpeg/files/chromium-r1.patch | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
index cfe06a7aec8..514780035bc 100644
--- a/media-video/ffmpeg/files/chromium-r1.patch
+++ b/media-video/ffmpeg/files/chromium-r1.patch
@@ -9,17 +9,23 @@ new file mode 100644
index 0000000..992cf3c
--- /dev/null
+++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,27 @@
+LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
+LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
+
-+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++ifeq ($(CONFIG_SHARED),yes)
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++else
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++endif
+
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
++ifeq ($(CONFIG_SHARED),yes)
+ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++else
++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++endif
+
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
+libffmpeg: $(LIBFFMPEG)
+
+install-libffmpeg: $(LIBFFMPEG)
@@ -30,7 +36,7 @@ index 0000000..992cf3c
+uninstall-libffmpeg:
+ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
+
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
--
2.13.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2022-10-15 19:34 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2022-10-15 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 1c244906669d840bb054f435ee1bbe6bac497090
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 15 07:58:17 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c244906
media-video/ffmpeg: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27791
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ffmpeg-5.0.1-libsdl2-new-version-scheme.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
deleted file mode 100644
index f95ff1cb7065..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/240d82f26eef10461c8b78b09a0db76c464deea8
-
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Wed, 11 May 2022 15:11:04 -0500
-Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
-
-sdl2 recently changed their versioning, moving the patch level to minor level
-https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
-and have said that they will instead ship sdl3.pc for 3.0.0
-
-Fixes ticket 9768
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
-Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
---- a/configure
-+++ b/configure
-@@ -6739,7 +6739,7 @@ fi
-
- if enabled sdl2; then
- SDL2_CONFIG="${cross_prefix}sdl2-config"
-- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
-+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
- if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
- sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
- sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2022-12-26 10:19 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-12-26 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 2138891c92cfc78d179c78ed13ba55c73503af98
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 26 08:34:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 10:18:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2138891c
media-video/ffmpeg: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28810
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ffmpeg-4.4.2-libsdl2-new-version-scheme.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
deleted file mode 100644
index b592c2f9b72d..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
-
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Wed, 11 May 2022 15:11:04 -0500
-Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
-
-sdl2 recently changed their versioning, moving the patch level to minor level
-https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
-and have said that they will instead ship sdl3.pc for 3.0.0
-
-Fixes ticket 9768
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
-Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
---- a/configure
-+++ b/configure
-@@ -6383,7 +6383,7 @@ fi
-
- if enabled sdl2; then
- SDL2_CONFIG="${cross_prefix}sdl2-config"
-- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
-+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
- if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
- sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
- sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2023-06-23 21:29 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2023-06-23 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 934dd4559fd942a55149a964ff3f0fffa018c848
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun 1 15:45:47 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934dd455
media-video/ffmpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31267
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ffmpeg-4.2.7-libsdl2-new-version-scheme.patch | 26 -----------------
media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch | 33 ----------------------
2 files changed, 59 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch
deleted file mode 100644
index ce552893d19b..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
-
-From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Wed, 11 May 2022 15:11:04 -0500
-Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
-
-sdl2 recently changed their versioning, moving the patch level to minor level
-https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
-and have said that they will instead ship sdl3.pc for 3.0.0
-
-Fixes ticket 9768
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
-Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
---- a/configure
-+++ b/configure
-@@ -6383,7 +6383,7 @@ fi
-
- if enabled sdl2; then
- SDL2_CONFIG="${cross_prefix}sdl2-config"
-- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
-+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
- if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
- sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
- sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch
deleted file mode 100644
index d7ce57350e4e..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001
-From: Lynne <dev@lynne.ee>
-Date: Sun, 25 Dec 2022 01:03:30 +0100
-Subject: [PATCH] hwcontext_vulkan: remove optional encode/decode extensions
- from the list
-
-They're not currently used, so they don't need to be there.
-Vulkan stabilized the decode extensions less than a week ago, and their
-name prefixes were changed from EXT to KHR. It's a bit too soon to be
-depending on it, so rather than bumping, just remove these for now.
----
- libavutil/hwcontext_vulkan.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
-index f1db1c7291f1..2a9b5f4aac62 100644
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
- { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
- { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },
- #endif
--
-- /* Video encoding/decoding */
-- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- };
-
- /* Converts return values to strings */
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2023-12-31 2:38 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2023-12-31 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 689718f584770fd735e2d4adde6cc5eac7f2497c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 29 14:07:22 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 02:37:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689718f5
media-video/ffmpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34534
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch | 81 ----------------------
.../ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch | 67 ------------------
2 files changed, 148 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch
deleted file mode 100644
index 51a8cb02d7b5..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/907478
-https://bugs.gentoo.org/907493
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=bea695d54372b66a6b9b136982fc92adb63e4745
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=3344d47a88506aba060b5fd2a214cf7785b11483
-
-From bea695d54372b66a6b9b136982fc92adb63e4745 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:28 -0500
-Subject: [PATCH] avcodec/libsvtav1: replace vbv_bufsize with
- maximum_buffer_size_ms
-
-svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using
-- maximum_buffer_size_ms (--buf-sz)
-- starting_buffer_level_ms (--buf-initial-sz)
-- optimal_buffer_level_ms (--buf-optimal-sz)
-
-and vbv_bufsize has not been in use since svt-av1 v0.8.6
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -183,7 +183,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- param->vbv_bufsize = avctx->rc_buffer_size;
-+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
-@@ -300,7 +300,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- avctx->bit_rate = param->rate_control_mode > 0 ?
- param->target_bit_rate : 0;
- avctx->rc_max_rate = param->max_bit_rate;
-- avctx->rc_buffer_size = param->vbv_bufsize;
-+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
-
- if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
- AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
---
-2.30.2
-
-From 3344d47a88506aba060b5fd2a214cf7785b11483 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:27 -0500
-Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and
- simplify alloc_buffer
-
-compressed_ten_bit_format has been deprecated upstream and has no effect
-and can be removed. Plus, technically it was never used in the first place
-since it would require the app (ffmpeg) to set it and do additional
-processing of the input frames.
-
-Also simplify alloc_buffer by removing calculations relating to the
-non-existant processing.
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-2.30.2
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch
deleted file mode 100644
index fb905f714fa3..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8fe2fec45321d1b82f98f9725ad9118cefcfa58d
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=e5b5dd66535f444451e0fee59247b224d866f334
-
-From 8fe2fec45321d1b82f98f9725ad9118cefcfa58d Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Sun, 20 Nov 2022 13:07:36 -0600
-Subject: [PATCH] avcodec/libsvtav1: only set max_buf_sz if both bitrate and
- rc_buf_sz is set
-
-maximum_buffer_size_ms should only be set if both are specified or if
-the user sets it through -svtav1-params buf-sz=val
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-+ if (avctx->bit_rate && avctx->rc_buffer_size)
-+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
---
-2.30.2
-
-From e5b5dd66535f444451e0fee59247b224d866f334 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jan=20Ekstr=C3=B6m?= <jeebjp@gmail.com>
-Date: Thu, 9 Mar 2023 20:27:06 +0200
-Subject: [PATCH] avcodec/libsvtav1: use larger of bit rate and max rate for
- buffer size
-
-Generally if maxrate is set, the calculation should be maxrate over
-bufsize. This additionally enables CRF + maxrate & bufsize usage.
-
-In order to keep negative values from enabling zero to be treated
-as larger and causing a division by zero, check that one of the
-variables is larger than zero.
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -179,8 +179,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- if (avctx->bit_rate && avctx->rc_buffer_size)
-- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-+ if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size)
-+ param->maximum_buffer_size_ms =
-+ avctx->rc_buffer_size * 1000LL /
-+ FFMAX(avctx->bit_rate, avctx->rc_max_rate);
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
-@@ -297,7 +299,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- avctx->bit_rate = param->rate_control_mode > 0 ?
- param->target_bit_rate : 0;
- avctx->rc_max_rate = param->max_bit_rate;
-- avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
-+ avctx->rc_buffer_size = param->maximum_buffer_size_ms *
-+ FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL;
-
- if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
- AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
---
-2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2024-03-26 20:25 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-26 20:25 UTC (permalink / raw
To: gentoo-commits
commit: ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 18:53:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:24:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba51a1ee
media-video/ffmpeg: fix parallel build with opencl
Closes: https://bugs.gentoo.org/782553
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35917
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch | 21 ++++++++++-----------
.../ffmpeg-6.1-opencl-parallel-gmake-fix.patch | 21 ++++++++++-----------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
index c0b1b1b1ce76..9ac8ec79cf2e 100644
--- a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
@@ -1,13 +1,12 @@
Bug: https://bugs.gentoo.org/782553
---- a/libavfilter/Makefile
-+++ b/libavfilter/Makefile
-@@ -562,7 +562,7 @@
- clean::
- $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%)
-
--OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))
-+OPENCL = $(wildcard libavfilter/opencl/*.cl)
- .SECONDARY: $(OPENCL:.cl=.c)
- libavfilter/opencl/%.c: TAG = OPENCL
- libavfilter/opencl/%.c: $(SRC_PATH)/libavfilter/opencl/%.cl
+--- ffmpeg-4.4.4/tools/cl2c.orig 2024-03-14 04:53:45.468507151 +0300
++++ ffmpeg-4.4.4/tools/cl2c 2024-03-14 04:54:53.503086088 +0300
+@@ -24,6 +24,7 @@
+
+ name=$(basename "$input" | sed 's/.cl$//')
+
++mkdir -p "$(dirname "$output")"
+ cat >$output <<EOF
+ // Generated from $input
+ const char *ff_opencl_source_$name =
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch b/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
index c7eef79f347a..271a18999fb3 100644
--- a/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
+++ b/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
@@ -1,13 +1,12 @@
Bug: https://bugs.gentoo.org/782553
---- a/libavfilter/Makefile
-+++ b/libavfilter/Makefile
-@@ -663,7 +663,7 @@ clean::
- $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \
- $(CLEANSUFFIXES:%=libavfilter/vulkan/%)
-
--OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))
-+OPENCL = $(wildcard libavfilter/opencl/*.cl)
- .SECONDARY: $(OPENCL:.cl=.c)
- libavfilter/opencl/%.c: TAG = OPENCL
- libavfilter/opencl/%.c: $(SRC_PATH)/libavfilter/opencl/%.cl
+--- ffmpeg-6.1.1/tools/source2c.orig 2024-03-14 04:53:45.468507151 +0300
++++ ffmpeg-6.1.1/tools/source2c 2024-03-14 04:54:53.503086088 +0300
+@@ -24,6 +24,7 @@
+
+ name=$(basename "$input" | sed 's/.cl$//')
+
++mkdir -p "$(dirname "$output")"
+ cat >$output <<EOF
+ // Generated from $input
+ const char *ff_opencl_source_$name =
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2024-07-20 4:09 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-20 4:09 UTC (permalink / raw
To: gentoo-commits
commit: bc073449c565b6c5afd9709b05af6a8527d583ed
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 03:45:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 03:56:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc073449
media-video/ffmpeg: drop old patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch
deleted file mode 100644
index 88af1e58458c..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Zhao Zhili <zhilizhao@tencent.com>
-Date: Tue, 28 Feb 2023 18:23:00 +0000 (+0800)
-Subject: avcodec/aacps_tablegen: fix build error after avutil bump
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46970dd1555b3e50eee48ec95c893ee9a52f7fab
-
-avcodec/aacps_tablegen: fix build error after avutil bump
-
-Fix tickets #10225
-
-DECLARE_ALIGNED has been moved to mem_internal.h.
-
-Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
-Reviewed-by: Anton Khirnov <anton@khirnov.net>
-(cherry picked from commit 814178f92647be2411516bbb82f48532373d2554)
----
-
-diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h
-index 0ac4f68d68..5fdd7f0a9d 100644
---- a/libavcodec/aacps_tablegen.h
-+++ b/libavcodec/aacps_tablegen.h
-@@ -34,7 +34,7 @@
- #include "libavutil/common.h"
- #include "libavutil/libm.h"
- #include "libavutil/mathematics.h"
--#include "libavutil/mem.h"
-+#include "libavutil/mem_internal.h"
- #define NR_ALLPASS_BANDS20 30
- #define NR_ALLPASS_BANDS34 50
- #define PS_AP_LINKS 3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2024-08-20 8:01 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2024-08-20 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 3ba107dcb61f7eb1a688248dd395d6f084cd426f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 22 16:46:25 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 08:01:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba107dc
media-video/ffmpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch | 76 ----------------------
.../files/ffmpeg-6.0-wint-conversion-vulkan.patch | 43 ------------
2 files changed, 119 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch
deleted file mode 100644
index a06b9119666f..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/911582
-https://trac.ffmpeg.org/ticket/10405
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=cc703cf60759d9798f440a9417e4efa2fcbe2747
-https://sourceware.org/PR30578
-https://gcc.gnu.org/PR108941
-
-From cc703cf60759d9798f440a9417e4efa2fcbe2747 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
-(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb)
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
---
-2.30.2
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch
deleted file mode 100644
index 2c71a189329a..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=58f18df430d48e47a82c5e740d6e63a50c97d75f
-
-From 58f18df430d48e47a82c5e740d6e63a50c97d75f Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
-Date: Thu, 2 Mar 2023 17:27:30 +0100
-Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes compilation with clang which errors out on Wint-conversion.
-
-Signed-off-by: Kacper MichajÅow <kasper93@gmail.com>
-Signed-off-by: Martin Storsjö <martin@martin.st>
-(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264)
-Signed-off-by: Martin Storsjö <martin@martin.st>
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
-
- av_freep(&cmd->queues);
- av_freep(&cmd->bufs);
-- cmd->pool = NULL;
-+ cmd->pool = VK_NULL_HANDLE;
- }
-
- static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
---- a/libavutil/vulkan.h
-+++ b/libavutil/vulkan.h
-@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline {
- VkDescriptorSetLayout *desc_layout;
- VkDescriptorPool desc_pool;
- VkDescriptorSet *desc_set;
-+#if VK_USE_64_BIT_PTR_DEFINES == 1
- void **desc_staging;
-+#else
-+ uint64_t *desc_staging;
-+#endif
- VkDescriptorSetLayoutBinding **desc_binding;
- VkDescriptorUpdateTemplate *desc_template;
- int *desc_set_initialized;
---
-2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2024-11-23 22:23 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2024-11-23 22:23 UTC (permalink / raw
To: gentoo-commits
commit: c9ed1d4bb3417c2351ab6bd8a81c74bc3dd9ec7e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Nov 23 16:32:15 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:23:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ed1d4b
media-video/ffmpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch | 25 -----
...eg-6.0-libplacebo-remove-deprecated-field.patch | 103 -------------------
.../ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch | 112 ---------------------
3 files changed, 240 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch
deleted file mode 100644
index 40db3304b564..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/901099 and partly https://bugs.gentoo.org/900937.
-
-Newer compilers may optimise such that < 7 registers are free on 32-bit x86
-and then we get an "invalid asm" error. This is https://bugs.gentoo.org/901099
-and https://trac.ffmpeg.org/ticket/8903.
-
-Making matters worse, GCC sometimes hangs on invalid asm, so this also
-mitigates a hang with e.g. -O3 -march=znver1. See https://bugs.gentoo.org/900937
-and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109137.
-
-In future, we may want to adjust the definition of HAVE_7REGS to just exclude
-32-bit x86, but that's a big sledgehammer, so let's avoid it for now until we have
-a reply on the upstream ffmpeg bug.
---- a/libavcodec/x86/cabac.h
-+++ b/libavcodec/x86/cabac.h
-@@ -175,7 +175,7 @@
-
- #endif /* BROKEN_RELOCATIONS */
-
--#if HAVE_7REGS && !BROKEN_COMPILER
-+#if HAVE_7REGS && !BROKEN_COMPILER && !ARCH_X86_32
- #define get_cabac_inline get_cabac_inline_x86
- static
- #if defined(_WIN32) && !defined(_WIN64) && defined(__clang__)
-
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch
deleted file mode 100644
index ca05c1c56ea4..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Bug: https://bugs.gentoo.org/910406
-
-Backports the following two commits:
- https://github.com/FFmpeg/FFmpeg/commit/11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc
- https://github.com/FFmpeg/FFmpeg/commit/1231003c3c6d4839a9e838d06f8e16ee7690958f
-
---- a/doc/filters.texi
-+++ b/doc/filters.texi
-@@ -16242,9 +16242,6 @@
- @item disable_builtin
- Disable built-in GPU sampling (forces LUT).
-
--@item force_icc_lut
--Force the use of a full ICC 3DLUT for gamut mapping.
--
- @item disable_fbos
- Forcibly disable FBOs, resulting in loss of almost all functionality, but
- offering the maximum possible speed.
---- a/libavfilter/version_major.h
-+++ b/libavfilter/version_major.h
-@@ -35,4 +35,6 @@
- * the public API and may change, break or disappear at any time.
- */
-
-+#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10)
-+
- #endif /* AVFILTER_VERSION_MAJOR_H */
---- a/libavfilter/vf_libplacebo.c
-+++ b/libavfilter/vf_libplacebo.c
-@@ -97,7 +97,6 @@
- float polar_cutoff;
- int disable_linear;
- int disable_builtin;
-- int force_icc_lut;
- int force_dither;
- int disable_fbos;
-
-@@ -132,11 +131,15 @@
- int inverse_tonemapping;
- float crosstalk;
- int tonemapping_lut_size;
-+
-+#if FF_API_LIBPLACEBO_OPTS
- /* for backwards compatibility */
- float desat_str;
- float desat_exp;
- int gamut_warning;
- int gamut_clipping;
-+ int force_icc_lut;
-+#endif
-
- /* pl_dither_params */
- int dithering;
-@@ -380,6 +383,7 @@
- pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio);
- }
-
-+#if FF_API_LIBPLACEBO_OPTS
- /* backwards compatibility with older API */
- if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) {
- float str = s->desat_str < 0.0f ? 0.9f : s->desat_str;
-@@ -397,6 +401,7 @@
- gamut_mode = PL_GAMUT_WARN;
- if (s->gamut_clipping)
- gamut_mode = PL_GAMUT_DESATURATE;
-+#endif
-
- /* Update render params */
- params = (struct pl_render_params) {
-@@ -458,7 +463,6 @@
- .polar_cutoff = s->polar_cutoff,
- .disable_linear_scaling = s->disable_linear,
- .disable_builtin_scalers = s->disable_builtin,
-- .force_icc_lut = s->force_icc_lut,
- .force_dither = s->force_dither,
- .disable_fbos = s->disable_fbos,
- };
-@@ -818,11 +822,14 @@
- { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
- { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC },
- { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC },
-+
-+#if FF_API_LIBPLACEBO_OPTS
- /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */
- { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
- { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
- { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
- { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-+#endif
-
- { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" },
- { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" },
-@@ -847,7 +854,9 @@
- { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
- { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
- { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-- { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-+#if FF_API_LIBPLACEBO_OPTS
-+ { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-+#endif
- { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
- { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
- { NULL },
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch b/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch
deleted file mode 100644
index 10c216ec4c88..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://bugs.gentoo.org/924431
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=75b1a555a70c178a9166629e43ec2f6250219eb2
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=ac06190a5a11f2b170e7719d769d7c0d65bff3e0
-
-From 75b1a555a70c178a9166629e43ec2f6250219eb2 Mon Sep 17 00:00:00 2001
-From: Leo Izen <leo.izen@gmail.com>
-Date: Sat, 8 Jul 2023 14:43:31 -0400
-Subject: [PATCH] avcodec/libjxldec: build against libjxl 0.9
-
-Git master libjxl changed several function signatures, so this commit
-adds some #ifdefs to handle the new signatures without breaking old
-releases. Do note that old git master development versions of libjxl
-will be broken, but no releases will be.
-
-Signed-off-by: Leo Izen <leo.izen@gmail.com>
---- a/libavcodec/libjxldec.c
-+++ b/libavcodec/libjxldec.c
-@@ -210,14 +210,22 @@ static int libjxl_get_icc(AVCodecContext *avctx)
- JxlDecoderStatus jret;
- /* an ICC profile is present, and we can meaningfully get it,
- * because the pixel data is not XYB-encoded */
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
- jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
-+#else
-+ jret = JxlDecoderGetICCProfileSize(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
-+#endif
- if (jret == JXL_DEC_SUCCESS && icc_len > 0) {
- av_buffer_unref(&ctx->iccp);
- ctx->iccp = av_buffer_alloc(icc_len);
- if (!ctx->iccp)
- return AVERROR(ENOMEM);
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
- jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA,
-- ctx->iccp->data, icc_len);
-+ ctx->iccp->data, icc_len);
-+#else
-+ jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, icc_len);
-+#endif
- if (jret != JXL_DEC_SUCCESS) {
- av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICC Profile\n");
- av_buffer_unref(&ctx->iccp);
-@@ -253,12 +261,21 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame)
- /* set this flag if we need to fall back on wide gamut */
- int fallback = 0;
-
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
- jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
-+#else
-+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
-+#endif
- if (jret == JXL_DEC_SUCCESS) {
- /* enum values describe the colors of this image */
- jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color);
- if (jret == JXL_DEC_SUCCESS)
-- jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt,
-+ JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#else
-+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#endif
- /* if we couldn't successfully request the pixel data space, we fall back on wide gamut */
- /* this code path is very unlikely to happen in practice */
- if (jret != JXL_DEC_SUCCESS)
---
-2.30.2
-
-From ac06190a5a11f2b170e7719d769d7c0d65bff3e0 Mon Sep 17 00:00:00 2001
-From: Leo Izen <leo.izen@gmail.com>
-Date: Tue, 23 Jan 2024 17:29:14 -0500
-Subject: [PATCH] avcodec/libjxl.h: include version.h
-
-This file has been exported since our minimum required version (0.7.0),
-but it wasn't documented. Instead it was transitively included by
-<jxl/decode.h> (but not jxl/encode.h), which ffmpeg relied on.
-
-libjxl broke its API in libjxl/libjxl@66b959239355aef5255 by removing
-the transitive include of version.h, and they do not plan on adding
-it back. Instead they are choosing to leave the API backwards-
-incompatible with downstream callers written for some fairly recent
-versions of their API.
-
-As a result, we include <jxl/version.h> to continue to build against
-more recent versions of libjxl. The version macros removed are also
-present in that file, so we no longer need to redefine them.
-
-Signed-off-by: Leo Izen <leo.izen@gmail.com>
---- a/libavcodec/libjxl.h
-+++ b/libavcodec/libjxl.h
-@@ -27,19 +27,8 @@
- #ifndef AVCODEC_LIBJXL_H
- #define AVCODEC_LIBJXL_H
-
--#include <jxl/decode.h>
- #include <jxl/memory_manager.h>
--
--/*
-- * libjxl version 0.7.0 and earlier doesn't contain these macros at all
-- * so to detect version 0.7.0 versus 0.8.0 we need to define them ourselves
-- */
--#ifndef JPEGXL_COMPUTE_NUMERIC_VERSION
-- #define JPEGXL_COMPUTE_NUMERIC_VERSION(major,minor,patch) ((major<<24) | (minor<<16) | (patch<<8) | 0)
--#endif
--#ifndef JPEGXL_NUMERIC_VERSION
-- #define JPEGXL_NUMERIC_VERSION JPEGXL_COMPUTE_NUMERIC_VERSION(0, 7, 0)
--#endif
-+#include <jxl/version.h>
-
- /**
- * Transform threadcount in ffmpeg to one used by libjxl.
---
-2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
@ 2025-01-09 15:13 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2025-01-09 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 7f3938d385bff9b497b5742dbbf53c969fa9a59c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan 7 19:17:10 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 15:12:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3938d3
media-video/ffmpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch | 44 -------------
.../ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch | 76 ----------------------
2 files changed, 120 deletions(-)
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch
deleted file mode 100644
index c9c180f06641..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/907478
-https://bugs.gentoo.org/907493
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=c3c8f97a9804b4234e97f13b0057ffc2c9af27c0
-
-From c3c8f97a9804b4234e97f13b0057ffc2c9af27c0 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:27 -0500
-Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and
- simplify alloc_buffer
-
-compressed_ten_bit_format has been deprecated upstream and has no effect
-and can be removed. Plus, technically it was never used in the first place
-since it would require the app (ffmpeg) to set it and do additional
-processing of the input frames.
-
-Also simplify alloc_buffer by removing calculations relating to the
-non-existant processing.
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-(cherry picked from commit 031f1561cd286596cdb374da32f8aa816ce3b135)
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -120,16 +120,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-2.30.2
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch
deleted file mode 100644
index 7031d1f02ccf..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/911582
-https://trac.ffmpeg.org/ticket/10405
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e
-https://sourceware.org/PR30578
-https://gcc.gnu.org/PR108941
-
-From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001
-From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
-(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb)
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
---
-2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-01-09 15:13 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-23 21:29 [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2025-01-09 15:13 Conrad Kostecki
2024-11-23 22:23 James Le Cuirot
2024-08-20 8:01 Joonas Niilola
2024-07-20 4:09 Sam James
2024-03-26 20:25 Sam James
2023-12-31 2:38 Conrad Kostecki
2022-12-26 10:19 Sam James
2022-10-15 19:34 Conrad Kostecki
2018-12-02 21:43 James Le Cuirot
2017-12-19 23:42 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox