gentoo auto-resync : 28:08:2023 - 22:03:35

3 files changed, 78 insertions, 1 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index fa403c9e40db..c52b0587ae55 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -7,11 +7,12 @@ AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e741
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
 AUX mythtv-32.0-gcc13.patch 1123 BLAKE2B ab0ce43fa19ea67baa8816deb02e4ba1060661034074d76c63aee2e79e30da4450d1312dec5db2f84bf47426fded93771acc7be35622495afb2fe7860658868f SHA512 70d97bbd55017d6fc46804158f65ddf21a2e0843dfc28b7fffddf60600c7b39b6b9ffe4845af83ffc1c1c508db5e1ae45af288197c03bdd32af54b1a980d390a
 AUX mythtv-32.0-python-version.patch 834 BLAKE2B f590311e20434e02b7606112dd21ddd46bffd179e36a182e5b0dc84cb3fc46daccce47f1acaa0e191f4768c364d684e9b891ad79fcfadc64c383f8bd7d0c50e3 SHA512 d9c54af8a9af0eab3924cba91c8b6234eecac6fd6d4057e24750d68b8b9c9ff6f474f5e1990ed958fce1e7799a6da35a3c4942da7a9ee8d01cca7e574bb7a230
+AUX mythtv-33.1-ffmpeg-binutils-2.41.patch 2269 BLAKE2B 54f44ccc8c3901b89c271f634b09d42d0d63c43289e1b4a5a3492cce0f480eb485e345fce0a74a5980c9fa84adb58cd588abb761df1755fa87b4be47fa4642b6 SHA512 6fcf2c2dd38763c0099d62d357c78c4c1c2a5c510a9128e3b5129e27403e47425932dd09f4188485dea86073c770b77ed2fc980fcc37d55176bfb355faf3be65
 AUX mythtv-33.1-libva.patch 3296 BLAKE2B 31e7621b2b373120be1da0ee570a449d4bbfc0ee5d5fbb7c0c13da0afa963800fbe802e9413fd267ea4fb21a5163be1e2d67465078f0267bddc0a9b73e33937b SHA512 122d4f324cdd6be5f611b68f94423c57e5f36ae90141d475e30020bbee2d91f41ebd6cbd8be56ba6d95719d3631d6fd9b3b91a0a7e67401fd2bb66a54a12f97f
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c
 DIST mythtv-33.1.tar.gz 116920982 BLAKE2B bc784a12ee0acf3066d46896343ed15a2f7097364595d20e832da3197eb37c8d05342f82171b66ec842ec48b5829b7ace8c6043835b8de4a04afd8a4df72df1d SHA512 4dc2943915e5e3ca047edc0a005a9e0b58edf7bc51c7fb097a6715bbbb52028260065a7f52f35e4ed98559cc4f4ccca76f1cf6ae68e76b1f2d06a1befd4776e9
 EBUILD mythtv-32.0-r4.ebuild 12333 BLAKE2B 364e4c0767fb5c4a1a2c91debb1a488d6cb4d7363e6be5e13c02c68b22216e52e1c063dba76413352d49a7af42a32e517f85d27950e7593cbb89debd249f5399 SHA512 8d46dd81cafe584a8086e74b1b24284cdcf85473b0ac86c27c3ed8319590511a4710968a5ff5bd8ba6b7220b0e3d51c417009916311e89bd6f0728ac7438fe1a
-EBUILD mythtv-33.1.ebuild 10336 BLAKE2B 14438b3a1973814c2298c2eba13e9a4e30f3a56658d4f98c73286deb69514c302e2322feec2ac84df981169303b13ecc01a071dcfc93e9f9c7d37a759ff3b4d4 SHA512 3a0914e21f03f704ffbb7a803db6bd561a62d67e250b3ea56534db19f9829e44a80a805b6ef68563a4c24428d43bbf626fd3bdfdad8dbd1743a1d60b38275319
+EBUILD mythtv-33.1.ebuild 10389 BLAKE2B 6b02a6cbd7dfb86ba27f6bd85ceda666537964b791f29944bf67700be3f8dc9af8737d395477668abc1f5198ab15620df9e8a6d23471e343399ac0f21e683373 SHA512 c9b3440e54504ba0ae0504621a5ab6f37dce62295d60c2761239aacbe113267fa978201c8f933a4eaa8d0d7f05b0b6f77bfd2acfd7e88cffbda56880e2ec4250
 MISC metadata.xml 1983 BLAKE2B 3aad016c2964bbb51e234c8c4c91fa1945837adb30db1445a593f227eb8d1068c78e218bbdfb26591ce34bf61bcb2967653a009f9306602bcb15faeb9152635e SHA512 f369462e9e7b79c22325b3c95560cab83919c598526cd955963c97d5d3fc7764260d98a4565a9a64251119a8cc656f485a96f326881884132a0c29975319f4d7
diff --git a/media-tv/mythtv/files/mythtv-33.1-ffmpeg-binutils-2.41.patch b/media-tv/mythtv/files/mythtv-33.1-ffmpeg-binutils-2.41.patch
new file mode 100644
index 000000000000..e976d8344a2d
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-33.1-ffmpeg-binutils-2.41.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/912708
+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/external/FFmpeg/libavcodec/x86/mathops.h
++++ b/external/FFmpeg/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;
+ }
+ 
diff --git a/media-tv/mythtv/mythtv-33.1.ebuild b/media-tv/mythtv/mythtv-33.1.ebuild
index 1f945c653588..9275d56d64ed 100644
--- a/media-tv/mythtv/mythtv-33.1.ebuild
+++ b/media-tv/mythtv/mythtv-33.1.ebuild
@@ -146,6 +146,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-33.1-libva.patch
+	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
 )
 
 python_check_deps() {