summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--groups/231.native_packages_etc.group4
-rw-r--r--patches/ffmpeg-4.3.local.patch (renamed from patches/ffmpeg-4.1.local.patch)78
-rw-r--r--patches/ffmpeg-4.3_pre.local.patch (renamed from patches/ffmpeg-4.1_pre.local.patch)0
3 files changed, 12 insertions, 70 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index b446ef60..37be5d73 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -88,8 +88,8 @@ zstd")";
: ${PKG_EXPAT_VERSION:=2.2.6};
: ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2};
: ${PKG_FFMPEG_DEPENDS:="lame libressl libshine libssh libtheora libxml2"};
-: ${PKG_FFMPEG_SHA256SUM:=b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5};
-: ${PKG_FFMPEG_VERSION:=4.1};
+: ${PKG_FFMPEG_SHA256SUM:=a7e87112fc49ad5b59e26726e3a7cae0ffae511cba5376c579ba3cb04483d6e2};
+: ${PKG_FFMPEG_VERSION:=4.3};
: ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2};
: ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libshine --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-gpl --enable-version3 --enable-gnutls --enable-libmp3lame --enable-libssh --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"};
: ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"};
diff --git a/patches/ffmpeg-4.1.local.patch b/patches/ffmpeg-4.3.local.patch
index 14aee73f..67b0b541 100644
--- a/patches/ffmpeg-4.1.local.patch
+++ b/patches/ffmpeg-4.3.local.patch
@@ -1,15 +1,16 @@
---- ffmpeg-4.1/libpostproc/postprocess_template.c.orig 2020-06-01 00:08:00.042230818 +0200
-+++ ffmpeg-4.1/libpostproc/postprocess_template.c 2020-06-01 00:12:40.651393371 +0200
+diff -ru ffmpeg-4.3.orig/libpostproc/postprocess_template.c ffmpeg-4.3/libpostproc/postprocess_template.c
+--- ffmpeg-4.3.orig/libpostproc/postprocess_template.c 2020-06-15 20:54:24.000000000 +0200
++++ ffmpeg-4.3/libpostproc/postprocess_template.c 2020-07-02 16:12:40.191351530 +0200
@@ -440,7 +440,7 @@
"paddusb %%mm0, %%mm0 \n\t"
"psubusb %%mm0, %%mm4 \n\t"
"pcmpeqb %%mm7, %%mm4 \n\t" // d <= QP ? -1 : 0
- "psubusb "MANGLE(b01)", %%mm3 \n\t"
-+ "psubusb "LOCAL_MANGLE(b01)", %%mm3 \n\t"
++ "psubusb "LOCAL_MANGLE(b01)", %%mm3 \n\t"
"pand %%mm4, %%mm3 \n\t" // d <= QP ? d : 0
PAVGB(%%mm7, %%mm3) // d/2
-@@ -620,13 +620,13 @@
+@@ -620,7 +620,7 @@
PMINUB(%%mm2, %%mm1, %%mm4) // MIN(|lenergy|,|renergy|)/8
"movq %2, %%mm4 \n\t" // QP //FIXME QP+1 ?
@@ -18,13 +19,6 @@
"pcmpgtb %%mm3, %%mm4 \n\t" // |menergy|/8 < QP
"psubusb %%mm1, %%mm3 \n\t" // d=|menergy|/8-MIN(|lenergy|,|renergy|)/8
"pand %%mm4, %%mm3 \n\t"
-
- "movq %%mm3, %%mm1 \n\t"
--// "psubusb "MANGLE(b01)", %%mm3 \n\t"
-+// "psubusb "MANGLE(b01)", %%mm3 \n\t"
- PAVGB(%%mm7, %%mm3)
- PAVGB(%%mm7, %%mm3)
- "paddusb %%mm1, %%mm3 \n\t"
@@ -643,7 +643,7 @@
"pand %%mm0, %%mm3 \n\t"
PMINUB(%%mm5, %%mm3, %%mm0)
@@ -110,11 +104,11 @@
"psrlw $6, %%mm4 \n\t"
@@ -1186,7 +1186,7 @@
"psubb %%mm7, %%mm6 \n\t" // max - min
- "push %4 \n\t"
- "movd %%mm6, %k4 \n\t"
-- "cmpb "MANGLE(deringThreshold)", %b4 \n\t"
-+ "cmpb "LOCAL_MANGLE(deringThreshold)", %b4 \n\t"
- "pop %4 \n\t"
+ "push %%"FF_REG_a" \n\t"
+ "movd %%mm6, %%eax \n\t"
+- "cmpb "MANGLE(deringThreshold)", %%al \n\t"
++ "cmpb "LOCAL_MANGLE(deringThreshold)", %%al \n\t"
+ "pop %%"FF_REG_a" \n\t"
" jb 1f \n\t"
PAVGB(%%mm0, %%mm7) // a=(max + min)/2
@@ -1212,9 +1212,9 @@
@@ -417,58 +411,6 @@
\
"por %%mm1, %%mm3 \n\t"\
"por %%mm3, %%mm6 \n\t"\
---- ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c.orig 2016-03-29 02:25:33.000000000 +0000
-+++ ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c 2019-01-16 00:24:06.884000000 +0000
-@@ -86,7 +86,7 @@
- "movq %%mm6, %%mm7\n\t" \
- "punpcklbw %%mm4, %%mm0\n\t" \
- "punpcklbw %%mm4, %%mm1\n\t" \
-- "pand "MANGLE(mmx_00ffw)", %%mm6\n\t" \
-+ "pand "LOCAL_MANGLE(mmx_00ffw)", %%mm6\n\t" \
- "psrlw $8, %%mm7\n\t" \
- "psllw $3, %%mm0\n\t" \
- "psllw $3, %%mm1\n\t" \
-@@ -175,15 +175,15 @@
- #define IF1(x) x
-
- #define RGB_PACK16(gmask, is15) \
-- "pand "MANGLE(mmx_redmask)", %%mm0\n\t" \
-- "pand "MANGLE(mmx_redmask)", %%mm1\n\t" \
-+ "pand "LOCAL_MANGLE(mmx_redmask)", %%mm0\n\t" \
-+ "pand "LOCAL_MANGLE(mmx_redmask)", %%mm1\n\t" \
- "movq %%mm2, %%mm3\n\t" \
- "psllw $"AV_STRINGIFY(3-is15)", %%mm2\n\t" \
- "psrlw $"AV_STRINGIFY(5+is15)", %%mm3\n\t" \
- "psrlw $3, %%mm0\n\t" \
- IF##is15("psrlw $1, %%mm1\n\t") \
-- "pand "MANGLE(pb_e0)", %%mm2\n\t" \
-- "pand "MANGLE(gmask)", %%mm3\n\t" \
-+ "pand "LOCAL_MANGLE(pb_e0)", %%mm2\n\t" \
-+ "pand "LOCAL_MANGLE(gmask)", %%mm3\n\t" \
- "por %%mm2, %%mm0\n\t" \
- "por %%mm3, %%mm1\n\t" \
- "movq %%mm0, %%mm2\n\t" \
-@@ -281,15 +281,15 @@
- "pshufw $0xc6, %%mm2, %%mm1 \n"\
- "pshufw $0x84, %%mm3, %%mm6 \n"\
- "pshufw $0x38, %%mm5, %%mm7 \n"\
-- "pand "MANGLE(mask1101)", %%mm6 \n" /* R0 G0 B0 R1 -- -- R2 G2 */\
-+ "pand "LOCAL_MANGLE(mask1101)", %%mm6 \n" /* R0 G0 B0 R1 -- -- R2 G2 */\
- "movq %%mm1, %%mm0 \n"\
-- "pand "MANGLE(mask0110)", %%mm7 \n" /* -- -- R6 G6 B6 R7 -- -- */\
-+ "pand "LOCAL_MANGLE(mask0110)", %%mm7 \n" /* -- -- R6 G6 B6 R7 -- -- */\
- "movq %%mm1, %%mm2 \n"\
-- "pand "MANGLE(mask0100)", %%mm1 \n" /* -- -- G3 B3 -- -- -- -- */\
-+ "pand "LOCAL_MANGLE(mask0100)", %%mm1 \n" /* -- -- G3 B3 -- -- -- -- */\
- "psrlq $48, %%mm3 \n" /* B2 R3 -- -- -- -- -- -- */\
-- "pand "MANGLE(mask0010)", %%mm0 \n" /* -- -- -- -- G1 B1 -- -- */\
-+ "pand "LOCAL_MANGLE(mask0010)", %%mm0 \n" /* -- -- -- -- G1 B1 -- -- */\
- "psllq $32, %%mm5 \n" /* -- -- -- -- R4 G4 B4 R5 */\
-- "pand "MANGLE(mask1001)", %%mm2 \n" /* G5 B5 -- -- -- -- G7 B7 */\
-+ "pand "LOCAL_MANGLE(mask1001)", %%mm2 \n" /* G5 B5 -- -- -- -- G7 B7 */\
- "por %%mm3, %%mm1 \n"\
- "por %%mm6, %%mm0 \n"\
- "por %%mm5, %%mm1 \n"\
--- ffmpeg-4.1/libavcodec/x86/lpc.c.orig 2018-11-01 18:34:25.000000000 +0000
+++ ffmpeg-4.1/libavcodec/x86/lpc.c 2019-01-16 00:26:53.376000000 +0000
@@ -40,8 +40,8 @@
diff --git a/patches/ffmpeg-4.1_pre.local.patch b/patches/ffmpeg-4.3_pre.local.patch
index d8e39cba..d8e39cba 100644
--- a/patches/ffmpeg-4.1_pre.local.patch
+++ b/patches/ffmpeg-4.3_pre.local.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 12:05:41 +0000