From 2b9e7d8f8a8b83daa57594c59b9828c4623d065e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 14 Apr 2025 12:50:40 -0700 Subject: [PATCH] mplayer: fix distfile and fix for binutils 2.41 --- .../patches/ffmpeg-invalid-assembly.patch | 76 +++++++++++++++++++ srcpkgs/mplayer/template | 2 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mplayer/patches/ffmpeg-invalid-assembly.patch diff --git a/srcpkgs/mplayer/patches/ffmpeg-invalid-assembly.patch b/srcpkgs/mplayer/patches/ffmpeg-invalid-assembly.patch new file mode 100644 index 00000000000..5ebe9b9dcef --- /dev/null +++ b/srcpkgs/mplayer/patches/ffmpeg-invalid-assembly.patch @@ -0,0 +1,76 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb 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 +--- + libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +index 6298f5ed19..ca7e2dffc1 100644 +--- a/ffmpeg/libavcodec/x86/mathops.h ++++ b/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; + } + +-- +2.25.1 + diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 68865ad3ebc..c2af02e853e 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -19,7 +19,7 @@ short_desc="Multimedia player" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.mplayerhq.hu/" -distfiles="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz" +distfiles="http://mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz" checksum=650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85 nocross=yes