From 4560e1a95e1072b051371c59aec78b15e4787ded Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Dec 2023 01:44:21 +0000 Subject: gentoo auto-resync : 24:12:2023 - 01:44:20 --- .../files/ffmpeg-chromium-100.patch | 27 -------- .../files/ffmpeg-chromium-binutils-2.41.patch | 77 ---------------------- 2 files changed, 104 deletions(-) delete mode 100644 media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch delete mode 100644 media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch (limited to 'media-video/ffmpeg-chromium/files') diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch deleted file mode 100644 index e0aa000faaa3..000000000000 --- a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2022-03-22 10:20:35.000000000 +0000 -+++ b/configure 2022-03-23 09:17:18.914615584 +0000 -@@ -6600,15 +6600,14 @@ - { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } - enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++" - enabled libopenvino && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api --# Chromium uses a built in copy of libopus that is not visible to pkg-config. --# enabled libopus && { --# enabled libopus_decoder && { --# require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create --# } --# enabled libopus_encoder && { --# require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create --# } --# } -+enabled libopus && { -+ enabled libopus_decoder && { -+ require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create -+ } -+ enabled libopus_encoder && { -+ require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create -+ } -+} - enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create - enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new - enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch deleted file mode 100644 index 81d544625919..000000000000 --- a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://bugs.gentoo.org/911582 -https://bugs.gentoo.org/911839 -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?= -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 -(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 -- cgit v1.2.3