CVS commit: pkgsrc/multimedia/ffmpeg2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  5 22:47:41 UTC 2025

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile distinfo
Added Files:
        pkgsrc/multimedia/ffmpeg2/patches: patch-libavcodec_x86_mathops.h

Log Message:
ffmpeg2: use code from ffmpeg 3.4.13 to fix build on NetBSD 10.99.14/x86_64.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/ffmpeg2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_mathops.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.109 pkgsrc/multimedia/ffmpeg2/Makefile:1.110
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.109    Thu Apr 17 21:51:44 2025
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Mon May  5 22:47:41 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2025/04/17 21:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2025/05/05 22:47:41 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   7
+PKGREVISION=   8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/distinfo
diff -u pkgsrc/multimedia/ffmpeg2/distinfo:1.64 pkgsrc/multimedia/ffmpeg2/distinfo:1.65
--- pkgsrc/multimedia/ffmpeg2/distinfo:1.64     Tue Sep 17 08:31:29 2024
+++ pkgsrc/multimedia/ffmpeg2/distinfo  Mon May  5 22:47:41 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2024/09/17 08:31:29 adam Exp $
+$NetBSD: distinfo,v 1.65 2025/05/05 22:47:41 wiz Exp $
 
 BLAKE2s (ffmpeg-2.8.22.tar.xz) = 786bd29ff69cd7890762ff87e30f9f570f25d462cc5d33bb6bde5a824ec54cba
 SHA512 (ffmpeg-2.8.22.tar.xz) = bf67ccea938045de5ce5648e45b36fa718d8dec787e02c37ca9124f02d15f56ae0d00b903f9bbe4083aab3071110c4a083915edf79db04f32834c0a761276161
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = bdc91d620c077f8
 SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
 SHA1 (patch-libavcodec_libfdk-aacenc.c) = b7c3301ea0e5270a7b8fe2273f1391b79a4b972b
 SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = f8951b7a1b036addbc0e6a657418e08fcde9fb44
+SHA1 (patch-libavcodec_x86_mathops.h) = 6de29b45192f3932886bf53611ea320b4187a259
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
 SHA1 (patch-libavutil_ppc_cpu.c) = be6ece342b061c3ef9b1836bf55ec4f2e0cdc81b
 SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548

Added files:

Index: pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_mathops.h:1.1
--- /dev/null   Mon May  5 22:47:41 2025
+++ pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_mathops.h    Mon May  5 22:47:41 2025
@@ -0,0 +1,40 @@
+$NetBSD: patch-libavcodec_x86_mathops.h,v 1.1 2025/05/05 22:47:41 wiz Exp $
+
+Use code from ffmpeg 3.4.13 to fix build on NetBSD 10.99.14/x86_64.
+
+--- libavcodec/x86/mathops.h.orig      2025-05-05 22:42:27.968117892 +0000
++++ libavcodec/x86/mathops.h
+@@ -113,19 +113,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;
+ }
+