summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2023-03-15 10:54:44 +0100
committerØrjan Malde <red@foxi.me>2023-03-15 10:54:44 +0100
commitacfb242cff059141a6ead8fa025284cc22f1d578 (patch)
treea4e05a795a7d72a76422ba99d9c9ec7794525b4e /patches
parent70ad842b64d3e9192a253a9a852fa72457417f3d (diff)
downloadmidipix_build-acfb242cff059141a6ead8fa025284cc22f1d578.tar.bz2
midipix_build-acfb242cff059141a6ead8fa025284cc22f1d578.tar.xz
groups/231.native_packages_etc.group: ffmpeg: bump to v6.0
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
-rw-r--r--patches/ffmpeg-6.0.local.patch (renamed from patches/ffmpeg-5.1.2.local.patch)78
-rw-r--r--patches/ffmpeg-6.0_pre.local.patch (renamed from patches/ffmpeg-5.1.2_pre.local.patch)0
2 files changed, 27 insertions, 51 deletions
diff --git a/patches/ffmpeg-5.1.2.local.patch b/patches/ffmpeg-6.0.local.patch
index 1c385d2c..ee0c91f7 100644
--- a/patches/ffmpeg-5.1.2.local.patch
+++ b/patches/ffmpeg-6.0.local.patch
@@ -1,3 +1,30 @@
+diff -ru ffmpeg-6.0.orig/libavcodec/x86/lpc_init.c ffmpeg-6.0/libavcodec/x86/lpc_init.c
+--- ffmpeg-6.0.orig/libavcodec/x86/lpc_init.c 2023-02-27 21:43:45.000000000 +0100
++++ ffmpeg-6.0/libavcodec/x86/lpc_init.c 2023-03-15 10:24:51.602248563 +0100
+@@ -45,9 +45,9 @@
+ x86_reg i = -len*sizeof(double);
+ if(j == lag-2) {
+ __asm__ volatile(
+- "movsd "MANGLE(pd_1)", %%xmm0 \n\t"
+- "movsd "MANGLE(pd_1)", %%xmm1 \n\t"
+- "movsd "MANGLE(pd_1)", %%xmm2 \n\t"
++ "movsd "LOCAL_MANGLE(pd_1)", %%xmm0 \n\t"
++ "movsd "LOCAL_MANGLE(pd_1)", %%xmm1 \n\t"
++ "movsd "LOCAL_MANGLE(pd_1)", %%xmm2 \n\t"
+ "1: \n\t"
+ "movapd (%2,%0), %%xmm3 \n\t"
+ "movupd -8(%3,%0), %%xmm4 \n\t"
+@@ -76,8 +76,8 @@
+ );
+ } else {
+ __asm__ volatile(
+- "movsd "MANGLE(pd_1)", %%xmm0 \n\t"
+- "movsd "MANGLE(pd_1)", %%xmm1 \n\t"
++ "movsd "LOCAL_MANGLE(pd_1)", %%xmm0 \n\t"
++ "movsd "LOCAL_MANGLE(pd_1)", %%xmm1 \n\t"
+ "1: \n\t"
+ "movapd (%3,%0), %%xmm3 \n\t"
+ "movupd -8(%4,%0), %%xmm4 \n\t"
diff -ru ffmpeg-5.1.orig/libavcodec/x86/cabac.h ffmpeg-5.1/libavcodec/x86/cabac.h
--- ffmpeg-5.1.orig/libavcodec/x86/cabac.h 2022-07-22 19:58:39.000000000 +0200
+++ ffmpeg-5.1/libavcodec/x86/cabac.h 2022-08-21 12:11:42.010806805 +0200
@@ -143,44 +170,6 @@ diff -ru ffmpeg-5.1.orig/libavcodec/x86/h264_cabac.c ffmpeg-5.1/libavcodec/x86/h
#endif
"add %11, %6 \n\t"
-diff -ru ffmpeg-5.1.orig/libavcodec/x86/lpc.c ffmpeg-5.1/libavcodec/x86/lpc.c
---- ffmpeg-5.1.orig/libavcodec/x86/lpc.c 2022-07-22 19:58:39.000000000 +0200
-+++ ffmpeg-5.1/libavcodec/x86/lpc.c 2022-08-21 12:11:41.774806812 +0200
-@@ -40,8 +40,8 @@
- x86_reg j = n2*sizeof(int32_t);
- __asm__ volatile(
- "movsd %4, %%xmm7 \n\t"
-- "movapd "MANGLE(pd_1)", %%xmm6 \n\t"
-- "movapd "MANGLE(pd_2)", %%xmm5 \n\t"
-+ "movapd "LOCAL_MANGLE(pd_1)", %%xmm6 \n\t"
-+ "movapd "LOCAL_MANGLE(pd_2)", %%xmm5 \n\t"
- "movlhps %%xmm7, %%xmm7 \n\t"
- "subpd %%xmm5, %%xmm7 \n\t"
- "addsd %%xmm6, %%xmm7 \n\t"
-@@ -91,9 +91,9 @@
- x86_reg i = -len*sizeof(double);
- if(j == lag-2) {
- __asm__ volatile(
-- "movsd "MANGLE(pd_1)", %%xmm0 \n\t"
-- "movsd "MANGLE(pd_1)", %%xmm1 \n\t"
-- "movsd "MANGLE(pd_1)", %%xmm2 \n\t"
-+ "movsd "LOCAL_MANGLE(pd_1)", %%xmm0 \n\t"
-+ "movsd "LOCAL_MANGLE(pd_1)", %%xmm1 \n\t"
-+ "movsd "LOCAL_MANGLE(pd_1)", %%xmm2 \n\t"
- "1: \n\t"
- "movapd (%2,%0), %%xmm3 \n\t"
- "movupd -8(%3,%0), %%xmm4 \n\t"
-@@ -122,8 +122,8 @@
- );
- } else {
- __asm__ volatile(
-- "movsd "MANGLE(pd_1)", %%xmm0 \n\t"
-- "movsd "MANGLE(pd_1)", %%xmm1 \n\t"
-+ "movsd "LOCAL_MANGLE(pd_1)", %%xmm0 \n\t"
-+ "movsd "LOCAL_MANGLE(pd_1)", %%xmm1 \n\t"
- "1: \n\t"
- "movapd (%3,%0), %%xmm3 \n\t"
- "movupd -8(%4,%0), %%xmm4 \n\t"
diff -ru ffmpeg-5.1.orig/libavcodec/x86/mlpdsp_init.c ffmpeg-5.1/libavcodec/x86/mlpdsp_init.c
--- ffmpeg-5.1.orig/libavcodec/x86/mlpdsp_init.c 2022-07-22 19:58:39.000000000 +0200
+++ ffmpeg-5.1/libavcodec/x86/mlpdsp_init.c 2022-08-21 12:11:42.286806796 +0200
@@ -395,19 +384,6 @@ diff -ru ffmpeg-5.1.orig/libpostproc/postprocess_template.c ffmpeg-5.1/libpostpr
"psubb %%mm0, %%mm5 \n\t" // q
"paddsb %%mm6, %%mm5 \n\t" // fix bad rounding
"pcmpgtb %%mm5, %%mm7 \n\t" // SIGN(q)
-@@ -991,10 +991,10 @@
- "psubusw %%mm1, %%mm5 \n\t" // ld
-
-
-- "movq "MANGLE(w05)", %%mm2 \n\t" // 5
-+ "movq "LOCAL_MANGLE(w05)", %%mm2 \n\t" // 5
- "pmullw %%mm2, %%mm4 \n\t"
- "pmullw %%mm2, %%mm5 \n\t"
-- "movq "MANGLE(w20)", %%mm2 \n\t" // 32
-+ "movq "LOCAL_MANGLE(w20)", %%mm2 \n\t" // 32
- "paddw %%mm2, %%mm4 \n\t"
- "paddw %%mm2, %%mm5 \n\t"
- "psrlw $6, %%mm4 \n\t"
@@ -1187,7 +1187,7 @@
"psubb %%mm7, %%mm6 \n\t" // max - min
"push %%"FF_REG_a" \n\t"
diff --git a/patches/ffmpeg-5.1.2_pre.local.patch b/patches/ffmpeg-6.0_pre.local.patch
index d8e39cba..d8e39cba 100644
--- a/patches/ffmpeg-5.1.2_pre.local.patch
+++ b/patches/ffmpeg-6.0_pre.local.patch