summaryrefslogtreecommitdiff
path: root/media-video/ffmpeg
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-11-26 02:00:48 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-11-26 02:00:48 +0000
commit403335d7014372971e9e9267493a808d08bab48e (patch)
treeffd28ddc69e6fe6543b018a00c9fad058bdda027 /media-video/ffmpeg
parent7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff)
gentoo auto-resync : 26:11:2024 - 02:00:48
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/Manifest11
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild1
-rw-r--r--media-video/ffmpeg/ffmpeg-6.1.2.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
-rw-r--r--media-video/ffmpeg/files/ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch69
7 files changed, 92 insertions, 5 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 988d5afdf07b..1c1218fa2e60 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,6 +9,7 @@ AUX ffmpeg-4.4.4-glslang.patch 1526 BLAKE2B d64d95f089c3d3aeafb7cc3fb08700641b62
AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 362 BLAKE2B 709a5a79aea781258998f295e539620651dce08820db345ab3d1d8996b076907db5157bfc7cd1fe15b8ce86bd1f6d073f79a2343f74a2548e9a699b92b4efe6f SHA512 0a5ecb29c19505564b4d3d6f362b8885d055c5a93688f3671509764194fb851aaf51483a956b8a150ec6ea17cc7ca2e5e0cca25d5f476f26c3bbdcb3ebd8ce05
AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e
AUX ffmpeg-4.4.5-incmptbl-pntr-types.patch 502 BLAKE2B 2c4d4416b112d1b4b0c985be7765e18e5d52586252834dd47052e13caa8554fd28dcbc88b37013f36134d5dba06b0c917f485f42a8e12d5cda37a6b13dd48827 SHA512 d3e9730467d52cb75999fa2494996e2b1515cdfb22d134be50240308f2c1167569033c7aaa821efe10dc0ee252863ff3c8826b58fbf2a727639c1bee652edc14
+AUX ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch 3472 BLAKE2B 7ba84ccd12c4c661a09ad0843ad53d863d3fe60cdba32c9ac2c05c4f2b5167a2315f24ac387d5ec612cf7d05fe6abd4cf00c7facc1c30bcf4f247ed316f716b7 SHA512 8951addd67a6720a45411f28fb3bccfd0707f35c1861969ea5e19c4e71c553116704f18c403c9032ae2443f065fae81c08d029d3a1d44de7c22a959b5e9835a1
AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0
AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899
@@ -40,10 +41,10 @@ DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf
DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530 SHA512 cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941
DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b
EBUILD ffmpeg-4.4.4-r11.ebuild 20088 BLAKE2B b94b463587e62913513bf46443aa26d45979ea13c960c008202c70ca7f5a5058799a5ed6b5dd0a38436a850a0403a5771258d80edab8719308ad28cf88c1a298 SHA512 a9e592bca2a1342d369b91c9c96fccecaf53d6ffbb7313bd4bc13b64c03b62488d89416b9ed77517cf2d8f9d4559ab9ed2a860bf1f7f5fd245f1ddbd46fc5a83
-EBUILD ffmpeg-4.4.5-r1.ebuild 19846 BLAKE2B fa792dff1e42d56ef923af54e5ad98832c500b8398604a67c962daf0a396c1205783602132f36e9e9711b228d2d8b3c375ccb9d5b6854e12dbca921fe2239f69 SHA512 d06a2c0d3c55fed10223f63bd1060da5c08c1d8e4b6867a851fd223fe7b9ad9a709052b22109ccc13a8c9db925e1a783b9ce69d64dd5a293080a5c3cee8ad68d
+EBUILD ffmpeg-4.4.5-r1.ebuild 19907 BLAKE2B d6685515941b937124d250328c165de66fb404a7bf321166d624e1c7f57807f51dea5cb39e230a12aa93a021393191de0df98f63a60d9b5fb2f7add72016e903 SHA512 ba3c06b8bc75c77ad2ad53337225c3b6381bed8676ba782ef531a401f749ff18d4833fa940410f429c86d466d08f8fa9e7b52c7c929eeea327b2444086941a64
EBUILD ffmpeg-6.1.1-r8.ebuild 20352 BLAKE2B 11ab7a671aab1ef238b69740cc1f0def0cbf414c66e496de9de57e25a9096f5c4e6a69187fc0159c1e4a31c9058380769e5dbd349a6c2ec70ea71d7107e18e07 SHA512 a74fc7f4dd6e87148c0c4eba1a11bde934b2b50d8a176e44851f528c5a66ce88608745a460b70650de71cb2da0f029051f8b362f64fe5d4925a8f1c13df0c234
-EBUILD ffmpeg-6.1.2.ebuild 20267 BLAKE2B 75dbaf8b802ad194d6fcccf12fe3c1eb19e756963de1aafa860ad2daaa949ef3fe8cf3882cdff609a30584e5b6df5dfcb97f010c86b247b70cfb35e13582ea6a SHA512 3ccfe3a169c93ce912aa38844f4105d5b9f7966ee32405571e12addd3cc77573fba989021789c5e0172d22b639b54c8ad88d2b307b5269227b457eb2a982627e
-EBUILD ffmpeg-7.0.1-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
-EBUILD ffmpeg-7.0.2-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
-EBUILD ffmpeg-9999.ebuild 20350 BLAKE2B 9159ff5687cd4a7ad20136cc748349e2fbfa0607b20e165ec7ca6b5155cb9e8cf110323fdccee5c7557f2f695e967187ebcb0f19888d89fccff416ca00167487 SHA512 f067c01e6602a57424b31f5f2462bb255194a323f15cf5c0139952a037cb49b078a32138595a78767371e7a92cb873eceeda019ee088ed6b2b2d7a549fc54bfa
+EBUILD ffmpeg-6.1.2.ebuild 20325 BLAKE2B 6f4f94f8e6ccd39dafa6b2df46459e26fe007022aa3400de01a401262158428aca64ca3f4c9b594a147d75e19bbfa76ba0169a5d7c0168a1452debe85e1af2d4 SHA512 b6ce8f1e006a2889aa7eb9814be5d4755bb3aa79c68fd4639c45b1d099bdeae70193a83b0bf21672427a86e5d5dd008118698b6341dddad2cc4cfecb65190329
+EBUILD ffmpeg-7.0.1-r1.ebuild 20346 BLAKE2B 5c7dbecddfdf50223acffecbba3d8a3a4e35bba435fee55249cbcc1340d075e15e47255d4b524ebd5499dc931eb36cf853846f53fffd9f57434ad3cd498c964f SHA512 b03a3933050b128cc43f2ef1c110a29e6b3d7c728e50a6878cae86751be879306f25f011e52cb5ef471eea666b2e7a7f8578c5a3d9b493b1d59c6b05e9486bfd
+EBUILD ffmpeg-7.0.2-r1.ebuild 20346 BLAKE2B 5c7dbecddfdf50223acffecbba3d8a3a4e35bba435fee55249cbcc1340d075e15e47255d4b524ebd5499dc931eb36cf853846f53fffd9f57434ad3cd498c964f SHA512 b03a3933050b128cc43f2ef1c110a29e6b3d7c728e50a6878cae86751be879306f25f011e52cb5ef471eea666b2e7a7f8578c5a3d9b493b1d59c6b05e9486bfd
+EBUILD ffmpeg-9999.ebuild 20416 BLAKE2B 8646b0ba938fd96657aa8582b8970a29b00da1f91e64f4e77847db9adfee81afd22f6de08f2b25954a19e126b87c8c505189e3e685d63e84f64241d59259baac SHA512 16d70a6080163d943af6f633211d086aa59e69a9da1498b9ffc86c1b4ac43f02ba105700ff447734089177adff0ef97e34b483bc688f7a5f0862d8c435269725
MISC metadata.xml 8343 BLAKE2B 4fa89eaccf10b2b691d66fc20df7cc09b31b848d0c054040664f6d9b132ba422c3a9cae2b239a95f307b4f15d1a5432e751a72fe1e4239376252bee9b814c59a SHA512 9b085513512c323c524d88837a517ebeb6a9db7212e4353ae1330c1db763761aa8114a47337a2f85a18ad2adae210cb56fb0472b09dfd78fdcac0fecf08ea7b3
diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
index ecf24fe33e56..6da94c8906df 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
@@ -348,6 +348,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.4.4-glslang.patch
"${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch
"${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.patch
+ "${FILESDIR}"/${PN}-4.4.5-wint-inconversion-libgcrypt.patch
)
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index 32eb9022ffd3..1baa7d788876 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -547,6 +547,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
index a4d91f76c9bf..36a0af85b719 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
@@ -548,6 +548,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
index a4d91f76c9bf..36a0af85b719 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
@@ -548,6 +548,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 357a04d67a61..ba89f852efa0 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -549,6 +549,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -DHAVE_POSIX_IOCTL
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch
new file mode 100644
index 000000000000..a9c4fb2ab437
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch
@@ -0,0 +1,69 @@
+https://bugs.gentoo.org/944785
+https://bugs.gentoo.org/935377
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/42982b5a5d461530a792e69b3e8abdd9d6d67052
+
+From 42982b5a5d461530a792e69b3e8abdd9d6d67052 Mon Sep 17 00:00:00 2001
+From: Frank Plowman <post@frankplowman.com>
+Date: Fri, 22 Dec 2023 12:00:01 +0000
+Subject: [PATCH 1/1] avformat/ffrtmpcrypt: Fix int-conversion warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The gcrypt definition of `bn_new` used to use the return statement
+on errors, with an AVERROR return value, regardless of the signature
+of the function where the macro is used - it is called in
+`dh_generate_key` and `ff_dh_init` which return pointers. As a result,
+compiling with gcrypt and the ffrtmpcrypt protocol resulted in an
+int-conversion warning. GCC 14 may upgrade these to errors [1].
+
+This patch fixes the problem by changing the macro to remove `AVERROR`
+and instead set `bn` to null if the allocation fails. This is the
+behaviour of all the other `bn_new` implementations and so the result is
+already checked at all the callsites. AFAICT, this should be the only
+change needed to get ffmpeg off Fedora's naughty list of projects with
+warnings which may be upgraded to errors in GCC 14 [2].
+
+[1]: https://gcc.gnu.org/pipermail/gcc/2023-May/241264.html
+[2]: https://www.mail-archive.com/devel@lists.fedoraproject.org/msg196024.html
+
+Signed-off-by: Frank Plowman <post@frankplowman.com>
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ libavformat/rtmpdh.c | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c
+index 5ddae537a1..6a6c2ccd87 100644
+--- a/libavformat/rtmpdh.c
++++ b/libavformat/rtmpdh.c
+@@ -113,15 +113,18 @@ static int bn_modexp(FFBigNum bn, FFBigNum y, FFBigNum q, FFBigNum p)
+ return 0;
+ }
+ #elif CONFIG_GCRYPT
+-#define bn_new(bn) \
+- do { \
+- if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) { \
+- if (!gcry_check_version("1.5.4")) \
+- return AVERROR(EINVAL); \
+- gcry_control(GCRYCTL_DISABLE_SECMEM, 0); \
+- gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); \
+- } \
+- bn = gcry_mpi_new(1); \
++#define bn_new(bn) \
++ do { \
++ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) { \
++ if (gcry_check_version("1.5.4")) { \
++ gcry_control(GCRYCTL_DISABLE_SECMEM, 0); \
++ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); \
++ } \
++ } \
++ if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) \
++ bn = gcry_mpi_new(1); \
++ else \
++ bn = NULL; \
+ } while (0)
+ #define bn_free(bn) gcry_mpi_release(bn)
+ #define bn_set_word(bn, w) gcry_mpi_set_ui(bn, w)
+--
+2.25.1
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 16:01:12 +0000