pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia
Module Name: pkgsrc
Committed By: jperkin
Date: Thu Aug 17 08:56:11 UTC 2023
Modified Files:
pkgsrc/multimedia/ffmpeg3: distinfo
pkgsrc/multimedia/ffmpeg4: distinfo
pkgsrc/multimedia/ffmpeg5: distinfo
pkgsrc/multimedia/ffmpeg6: distinfo
Added Files:
pkgsrc/multimedia/ffmpeg3/patches: patch-libavcodec_x86_mathops.h
pkgsrc/multimedia/ffmpeg4/patches: patch-libavcodec_x86_mathops.h
pkgsrc/multimedia/ffmpeg5/patches: patch-libavcodec_x86_mathops.h
pkgsrc/multimedia/ffmpeg6/patches: patch-libavcodec_x86_mathops.h
Log Message:
ffmpeg*: Apply upstream patch for binutils 2.41.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_x86_mathops.h
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg4/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_x86_mathops.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg5/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_x86_mathops.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg6/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/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.39 pkgsrc/multimedia/ffmpeg3/distinfo:1.40
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.39 Tue Aug 23 10:17:49 2022
+++ pkgsrc/multimedia/ffmpeg3/distinfo Thu Aug 17 08:56:10 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2022/08/23 10:17:49 wiz Exp $
+$NetBSD: distinfo,v 1.40 2023/08/17 08:56:10 jperkin Exp $
BLAKE2s (ffmpeg-3.4.11.tar.xz) = d23ee74f99cf5e2b8ee8358053b2978b967cf81f5d85b0c3d2a8de0a7ba128b1
SHA512 (ffmpeg-3.4.11.tar.xz) = 61d62d5ad7bbde78d957ca40b5cf9fae5fe0125292b99d0caff9441fad3ecea165a4546a44b9049849f588024c881bba2c6bbd0255133db49188d4bf4693ff4e
@@ -6,6 +6,7 @@ Size (ffmpeg-3.4.11.tar.xz) = 8517940 by
SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
SHA1 (patch-configure) = 1232f497896f36d23f72d43cdbf7d0de627bd85e
SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
+SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487
Index: pkgsrc/multimedia/ffmpeg4/distinfo
diff -u pkgsrc/multimedia/ffmpeg4/distinfo:1.30 pkgsrc/multimedia/ffmpeg4/distinfo:1.31
--- pkgsrc/multimedia/ffmpeg4/distinfo:1.30 Wed Apr 19 17:36:12 2023
+++ pkgsrc/multimedia/ffmpeg4/distinfo Thu Aug 17 08:56:10 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2023/04/19 17:36:12 adam Exp $
+$NetBSD: distinfo,v 1.31 2023/08/17 08:56:10 jperkin Exp $
BLAKE2s (ffmpeg-4.4.4.tar.xz) = b344e5e3ba0cb4c13bfd7a3989aa1f6b8f7443af9ce6c24993ca8627ac5b2a2d
SHA512 (ffmpeg-4.4.4.tar.xz) = 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf
@@ -10,6 +10,7 @@ SHA1 (patch-doc_general__contents.texi)
SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c
SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1
SHA1 (patch-ffbuild_libversion.sh) = 7671eced5a8135a900c2f1d30343fc072ebb84ec
+SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = 8f835f8ec7b057ddcd6303bc2178cdb6f4541e2a
SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a
Index: pkgsrc/multimedia/ffmpeg5/distinfo
diff -u pkgsrc/multimedia/ffmpeg5/distinfo:1.8 pkgsrc/multimedia/ffmpeg5/distinfo:1.9
--- pkgsrc/multimedia/ffmpeg5/distinfo:1.8 Wed Jun 7 11:42:21 2023
+++ pkgsrc/multimedia/ffmpeg5/distinfo Thu Aug 17 08:56:10 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2023/06/07 11:42:21 markd Exp $
+$NetBSD: distinfo,v 1.9 2023/08/17 08:56:10 jperkin Exp $
BLAKE2s (ffmpeg-5.1.3.tar.xz) = 68bec61d58ecbb84d9292add3bd8e608b9d416a4dd7f32203205aa5ee29508be
SHA512 (ffmpeg-5.1.3.tar.xz) = 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a
@@ -9,6 +9,7 @@ SHA1 (patch-doc_Makefile) = d45fc311f47e
SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2
+SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = 1d12f5b12d37a73512cd8e0f05272e9a64588e49
SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a
Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.2 pkgsrc/multimedia/ffmpeg6/distinfo:1.3
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.2 Wed Jun 7 11:42:47 2023
+++ pkgsrc/multimedia/ffmpeg6/distinfo Thu Aug 17 08:56:10 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2023/06/07 11:42:47 markd Exp $
+$NetBSD: distinfo,v 1.3 2023/08/17 08:56:10 jperkin Exp $
BLAKE2s (ffmpeg-6.0.tar.xz) = ce6f75464ac37374825b33d7b32b22f7e9dcea51026cc885cd6668fbada65c08
SHA512 (ffmpeg-6.0.tar.xz) = 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980
@@ -9,6 +9,7 @@ SHA1 (patch-doc_Makefile) = c513af183e37
SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2
+SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = a9e2a2027fb2c18d5509b68deb5fd8523305dfc7
SHA1 (patch-libavdevice_sunau.c) = 554a5fc77c0e94828e9eadc7f1f9d4067a76d4ae
Added files:
Index: pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_x86_mathops.h:1.1
--- /dev/null Thu Aug 17 08:56:11 2023
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_x86_mathops.h Thu Aug 17 08:56:10 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-libavcodec_x86_mathops.h,v 1.1 2023/08/17 08:56:10 jperkin Exp $
+
+Apply upstream patch for binutils 2.41.
+
+--- libavcodec/x86/mathops.h.orig 2020-04-27 21:48:15.000000000 +0000
++++ 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;
+ }
+
Index: pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_x86_mathops.h:1.1
--- /dev/null Thu Aug 17 08:56:11 2023
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_x86_mathops.h Thu Aug 17 08:56:10 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-libavcodec_x86_mathops.h,v 1.1 2023/08/17 08:56:10 jperkin Exp $
+
+Apply upstream patch for binutils 2.41.
+
+--- libavcodec/x86/mathops.h.orig 2020-04-27 21:48:15.000000000 +0000
++++ 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;
+ }
+
Index: pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_x86_mathops.h:1.1
--- /dev/null Thu Aug 17 08:56:11 2023
+++ pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_x86_mathops.h Thu Aug 17 08:56:10 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-libavcodec_x86_mathops.h,v 1.1 2023/08/17 08:56:10 jperkin Exp $
+
+Apply upstream patch for binutils 2.41.
+
+--- libavcodec/x86/mathops.h.orig 2020-04-27 21:48:15.000000000 +0000
++++ 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;
+ }
+
Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_x86_mathops.h:1.1
--- /dev/null Thu Aug 17 08:56:11 2023
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_x86_mathops.h Thu Aug 17 08:56:10 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-libavcodec_x86_mathops.h,v 1.1 2023/08/17 08:56:10 jperkin Exp $
+
+Apply upstream patch for binutils 2.41.
+
+--- libavcodec/x86/mathops.h.orig 2020-04-27 21:48:15.000000000 +0000
++++ 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;
+ }
+
Home |
Main Index |
Thread Index |
Old Index