From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C224B15800A for ; Thu, 10 Aug 2023 04:08:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCE702BC022; Thu, 10 Aug 2023 04:08:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFC562BC022 for ; Thu, 10 Aug 2023 04:08:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F26F33BE6C for ; Thu, 10 Aug 2023 04:08:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 079B2B5B for ; Thu, 10 Aug 2023 04:08:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691639826.a685f699e19daaa572044c82858580af15465189.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/files/, media-video/ffmpeg-chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch X-VCS-Directories: media-video/ffmpeg-chromium/ media-video/ffmpeg-chromium/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a685f699e19daaa572044c82858580af15465189 X-VCS-Branch: master Date: Thu, 10 Aug 2023 04:08:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d6e7df4-c94b-4359-894d-cc28101830b3 X-Archives-Hash: ec4ca1cebf28555cc72486db4a6a32f5 commit: a685f699e19daaa572044c82858580af15465189 Author: Sam James gentoo org> AuthorDate: Thu Aug 10 03:57:06 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 10 03:57:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a685f699 media-video/ffmpeg-chromium: fix build w/ binutils-2.41 Closes: https://bugs.gentoo.org/911839 Signed-off-by: Sam James gentoo.org> .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild | 1 + .../ffmpeg-chromium/ffmpeg-chromium-106.ebuild | 1 + .../ffmpeg-chromium/ffmpeg-chromium-114.ebuild | 1 + .../files/ffmpeg-chromium-binutils-2.41.patch | 77 ++++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild index 5c5350f293b1..6e4409a5274b 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild @@ -116,6 +116,7 @@ S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${PN}-100.patch "${FILESDIR}"/${PN}-vk-headers.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild index 39b454aa1a07..a25fa2fc9cdb 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild @@ -114,6 +114,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch "${FILESDIR}"/${PN}-vk-headers.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild index a550da7245bf..da89ecc4a215 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild @@ -113,6 +113,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) 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 new file mode 100644 index 000000000000..81d544625919 --- /dev/null +++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch @@ -0,0 +1,77 @@ +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