aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2021-07-21 20:10:14 +0000
committerPiotr Kubaj <pkubaj@FreeBSD.org>2021-07-21 20:10:14 +0000
commit2b3e3f331065f84a1af8cf8363f2a30b28955f54 (patch)
tree2d93d390b20e056c031d94a0458c7b7748e92809
parent632a8e82054ac07d4c25dc5aa66890c77756dbf3 (diff)
downloadports-2b3e3f331065f84a1af8cf8363f2a30b28955f54.tar.gz
ports-2b3e3f331065f84a1af8cf8363f2a30b28955f54.zip
multimedia/handbrake: update to 1.4.0
Differential revision: https://reviews.freebsd.org/D31252 Submitted by: naito.yuichiro@gmail.com (maintainer)
Diffstat
-rw-r--r--multimedia/handbrake/Makefile21
-rw-r--r--multimedia/handbrake/distinfo32
-rw-r--r--multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch1323
-rw-r--r--multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs15
-rw-r--r--multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs10
-rw-r--r--multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs10
-rw-r--r--multimedia/handbrake/files/patch-gtk_configure.ac12
-rw-r--r--multimedia/handbrake/files/patch-libhb_handbrake_ports.h36
-rw-r--r--multimedia/handbrake/files/patch-libhb_ports.c41
-rw-r--r--multimedia/handbrake/files/patch-libhb_qsv__common.c20
-rw-r--r--multimedia/handbrake/files/patch-make_configure.py29
-rw-r--r--multimedia/handbrake/files/patch-make_include_main.defs12
-rw-r--r--multimedia/handbrake/files/patch-test_module.defs11
-rw-r--r--multimedia/handbrake/files/version.txt10
-rw-r--r--multimedia/handbrake/pkg-plist4
15 files changed, 46 insertions, 1540 deletions
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index e24f3f6e24bb..12fae398fed2 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,8 +1,7 @@
# Created by: Andrew Thompson <andy@fud.org.nz>
PORTNAME= handbrake
-DISTVERSION= 1.3.3
-PORTREVISION= 4
+DISTVERSION= 1.4.0
CATEGORIES= multimedia
DIST_SUBDIR= ${PORTNAME}
@@ -19,10 +18,12 @@ BUILD_DEPENDS= bash:shells/bash \
cmake:devel/cmake \
meson:devel/meson
LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libgudev-1.0.so:devel/libgudev \
libharfbuzz.so:print/harfbuzz \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libfribidi.so:converters/fribidi \
+ libturbojpeg.so:graphics/libjpeg-turbo \
libxml2.so:textproc/libxml2 \
libass.so:multimedia/libass \
libspeex.so:audio/speex \
@@ -41,12 +42,13 @@ USES= autoreconf:build compiler:c11 gmake iconv libtool:build \
localbase:ldflags ninja:build pkgconfig python:3.6+,build
CONTRIB_FILES= fdk-aac-2.0.1.tar.gz \
- ffmpeg-4.2.3.tar.bz2 \
- libbluray-1.1.2.tar.bz2 \
- libdvdnav-6.0.1.tar.bz2 \
- libdvdread-6.0.2.tar.bz2 \
- dav1d-0.5.1.tar.bz2 \
- x265_3.2.1.tar.gz
+ ffmpeg-4.4.tar.bz2 \
+ libbluray-1.3.0.tar.bz2 \
+ libdvdnav-6.1.1.tar.bz2 \
+ libdvdread-6.1.1.tar.bz2 \
+ dav1d-0.9.0.tar.bz2 \
+ x265_3.5.tar.gz \
+ zimg-3.0.1.tar.gz
MASTER_SITES+= https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib
@@ -126,9 +128,6 @@ pre-configure:
# Following patches reduces warnings with clang.
${CP} ${FILESDIR}/P00-freebsd-libavutil-x86-asm-h.patch ${WRKSRC}/contrib/ffmpeg
${CP} ${FILESDIR}/P01-freebsd-ifo_types.h.patch ${WRKSRC}/contrib/libdvdread
-# for powerpc64.
-# picked from multimedia/ffmpeg/files/patch-libswscale_ppc_swscale__altivec.c
- ${CP} ${FILESDIR}/P02-freebsd-ppc-libswscale.patch ${WRKSRC}/contrib/ffmpeg
post-install-X11-on:
${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index d908b7e9f86e..e47319e4e17a 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,17 +1,19 @@
-TIMESTAMP = 1592180378
+TIMESTAMP = 1626703173
SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
-SHA256 (handbrake/ffmpeg-4.2.3.tar.bz2) = 217eb211c33303b37c5521a5abe1f0140854d6810c6a6ee399456cc96356795e
-SIZE (handbrake/ffmpeg-4.2.3.tar.bz2) = 10957405
-SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
-SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779
-SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
-SIZE (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491
-SHA256 (handbrake/libdvdread-6.0.2.tar.bz2) = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
-SIZE (handbrake/libdvdread-6.0.2.tar.bz2) = 405298
-SHA256 (handbrake/dav1d-0.5.1.tar.bz2) = 0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9
-SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584
-SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
-SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255
-SHA256 (handbrake/HandBrake-HandBrake-1.3.3_GH0.tar.gz) = 4a004666cdf4570385c7e4d8da093f36b4baa86e32bb0814b4d14e267905e3b3
-SIZE (handbrake/HandBrake-HandBrake-1.3.3_GH0.tar.gz) = 17925272
+SHA256 (handbrake/ffmpeg-4.4.tar.bz2) = 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e
+SIZE (handbrake/ffmpeg-4.4.tar.bz2) = 11489948
+SHA256 (handbrake/libbluray-1.3.0.tar.bz2) = e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
+SIZE (handbrake/libbluray-1.3.0.tar.bz2) = 754069
+SHA256 (handbrake/libdvdnav-6.1.1.tar.bz2) = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
+SIZE (handbrake/libdvdnav-6.1.1.tar.bz2) = 367606
+SHA256 (handbrake/libdvdread-6.1.1.tar.bz2) = 3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796
+SIZE (handbrake/libdvdread-6.1.1.tar.bz2) = 392134
+SHA256 (handbrake/dav1d-0.9.0.tar.bz2) = e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5
+SIZE (handbrake/dav1d-0.9.0.tar.bz2) = 771739
+SHA256 (handbrake/x265_3.5.tar.gz) = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
+SIZE (handbrake/x265_3.5.tar.gz) = 1537044
+SHA256 (handbrake/zimg-3.0.1.tar.gz) = c50a0922f4adac4efad77427d13520ed89b8366eef0ef2fa379572951afcc73f
+SIZE (handbrake/zimg-3.0.1.tar.gz) = 326304
+SHA256 (handbrake/HandBrake-HandBrake-1.4.0_GH0.tar.gz) = 32e9bb9d30d17c5d503ad29049d8e2b04a1ed900cf7877650139b7d504b0a2b3
+SIZE (handbrake/HandBrake-HandBrake-1.4.0_GH0.tar.gz) = 16787997
diff --git a/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch b/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch
deleted file mode 100644
index 1c0eb8192f74..000000000000
--- a/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
---- a/libswscale/ppc/swscale_altivec.c.orig 2019-08-11 20:06:32 UTC
-+++ b/libswscale/ppc/swscale_altivec.c
-@@ -153,13 +153,13 @@ static void yuv2plane1_float_altivec(const int32_t *sr
- const int add = (1 << (shift - 1));
- const int clip = (1 << 16) - 1;
- const float fmult = 1.0f / 65535.0f;
-- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
-- const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
-- const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip};
-- const vector float vmul = (vector float) {fmult, fmult, fmult, fmult};
-- const vector float vzero = (vector float) {0, 0, 0, 0};
-- vector uint32_t v;
-- vector float vd;
-+ const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+ const vec_u32 vshift = (vec_u32) vec_splat_u32(shift);
-+ const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip};
-+ const vec_f vmul = (vec_f) {fmult, fmult, fmult, fmult};
-+ const vec_f vzero = (vec_f) {0, 0, 0, 0};
-+ vec_u32 v;
-+ vec_f vd;
- int i;
-
- yuv2plane1_float_u(src, dest, dst_u, 0);
-@@ -186,14 +186,14 @@ static void yuv2plane1_float_bswap_altivec(const int32
- const int add = (1 << (shift - 1));
- const int clip = (1 << 16) - 1;
- const float fmult = 1.0f / 65535.0f;
-- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
-- const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
-- const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip};
-+ const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+ const vec_u32 vshift = (vec_u32) vec_splat_u32(shift);
-+ const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip};
- const vector float vmul = (vector float) {fmult, fmult, fmult, fmult};
- const vector float vzero = (vector float) {0, 0, 0, 0};
-- const vector uint32_t vswapbig = (vector uint32_t) {16, 16, 16, 16};
-- const vector uint16_t vswapsmall = vec_splat_u16(8);
-- vector uint32_t v;
-+ const vec_u32 vswapbig = (vec_u32) {16, 16, 16, 16};
-+ const vec_u16 vswapsmall = vec_splat_u16(8);
-+ vec_u32 v;
- vector float vd;
- int i;
-
-@@ -208,8 +208,8 @@ static void yuv2plane1_float_bswap_altivec(const int32
- vd = vec_ctf(v, 0);
- vd = vec_madd(vd, vmul, vzero);
-
-- vd = (vector float) vec_rl((vector uint32_t) vd, vswapbig);
-- vd = (vector float) vec_rl((vector uint16_t) vd, vswapsmall);
-+ vd = (vector float) vec_rl((vec_u32) vd, vswapbig);
-+ vd = (vector float) vec_rl((vec_u16) vd, vswapsmall);
-
- vec_st(vd, 0, (float *) &dest[i]);
- }
---- a/libswscale/ppc/swscale_vsx.c.orig 2019-08-11 20:06:32 UTC
-+++ a/libswscale/ppc/swscale_vsx.c
-@@ -103,9 +103,9 @@ static void yuv2plane1_8_vsx(const int16_t *src, uint8_t *dest, int dstW,
- const int dst_u = -(uintptr_t)dest & 15;
- int i, j;
- LOCAL_ALIGNED(16, int16_t, val, [16]);
-- const vector uint16_t shifts = (vector uint16_t) {7, 7, 7, 7, 7, 7, 7, 7};
-- vector int16_t vi, vileft, ditherleft, ditherright;
-- vector uint8_t vd;
-+ const vec_u16 shifts = (vec_u16) {7, 7, 7, 7, 7, 7, 7, 7};
-+ vec_s16 vi, vileft, ditherleft, ditherright;
-+ vec_u8 vd;
-
- for (j = 0; j < 16; j++) {
- val[j] = dither[(dst_u + offset + j) & 7];
-@@ -161,11 +161,11 @@ static void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW,
- const int shift = 15 - output_bits;
- const int add = (1 << (shift - 1));
- const int clip = (1 << output_bits) - 1;
-- const vector uint16_t vadd = (vector uint16_t) {add, add, add, add, add, add, add, add};
-- const vector uint16_t vswap = (vector uint16_t) vec_splat_u16(big_endian ? 8 : 0);
-- const vector uint16_t vshift = (vector uint16_t) vec_splat_u16(shift);
-- const vector uint16_t vlargest = (vector uint16_t) {clip, clip, clip, clip, clip, clip, clip, clip};
-- vector uint16_t v;
-+ const vec_u16 vadd = (vec_u16) {add, add, add, add, add, add, add, add};
-+ const vec_u16 vswap = (vec_u16) vec_splat_u16(big_endian ? 8 : 0);
-+ const vec_u16 vshift = (vec_u16) vec_splat_u16(shift);
-+ const vec_u16 vlargest = (vec_u16) {clip, clip, clip, clip, clip, clip, clip, clip};
-+ vec_u16 v;
- int i;
-
- yuv2plane1_nbps_u(src, dest, dst_u, big_endian, output_bits, 0);
-@@ -209,20 +209,20 @@ static void yuv2planeX_nbps_vsx(const int16_t *filter, int filterSize,
- const int add = (1 << (shift - 1));
- const int clip = (1 << output_bits) - 1;
- const uint16_t swap = big_endian ? 8 : 0;
-- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
-- const vector uint32_t vshift = (vector uint32_t) {shift, shift, shift, shift};
-- const vector uint16_t vswap = (vector uint16_t) {swap, swap, swap, swap, swap, swap, swap, swap};
-- const vector uint16_t vlargest = (vector uint16_t) {clip, clip, clip, clip, clip, clip, clip, clip};
-- const vector int16_t vzero = vec_splat_s16(0);
-- const vector uint8_t vperm = (vector uint8_t) {0, 1, 8, 9, 2, 3, 10, 11, 4, 5, 12, 13, 6, 7, 14, 15};
-- vector int16_t vfilter[MAX_FILTER_SIZE], vin;
-- vector uint16_t v;
-- vector uint32_t vleft, vright, vtmp;
-+ const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+ const vec_u32 vshift = (vec_u32) {shift, shift, shift, shift};
-+ const vec_u16 vswap = (vec_u16) {swap, swap, swap, swap, swap, swap, swap, swap};
-+ const vec_u16 vlargest = (vec_u16) {clip, clip, clip, clip, clip, clip, clip, clip};
-+ const vec_s16 vzero = vec_splat_s16(0);
-+ const vec_u8 vperm = (vec_u8) {0, 1, 8, 9, 2, 3, 10, 11, 4, 5, 12, 13, 6, 7, 14, 15};
-+ vec_s16 vfilter[MAX_FILTER_SIZE], vin;
-+ vec_u16 v;
-+ vec_u32 vleft, vright, vtmp;
- int i, j;
-
- for (i = 0; i < filterSize; i++) {
-- vfilter[i] = (vector int16_t) {filter[i], filter[i], filter[i], filter[i],
-- filter[i], filter[i], filter[i], filter[i]};
-+ vfilter[i] = (vec_s16) {filter[i], filter[i], filter[i], filter[i],
-+ filter[i], filter[i], filter[i], filter[i]};
- }
-
- yuv2planeX_nbps_u(filter, filterSize, src, dest, dst_u, big_endian, output_bits, 0);
-@@ -232,16 +232,16 @@ static void yuv2planeX_nbps_vsx(const int16_t *filter, int filterSize,
-
- for (j = 0; j < filterSize; j++) {
- vin = vec_vsx_ld(0, &src[j][i]);
-- vtmp = (vector uint32_t) vec_mule(vin, vfilter[j]);
-+ vtmp = (vec_u32) vec_mule(vin, vfilter[j]);
- vleft = vec_add(vleft, vtmp);
-- vtmp = (vector uint32_t) vec_mulo(vin, vfilter[j]);
-+ vtmp = (vec_u32) vec_mulo(vin, vfilter[j]);
- vright = vec_add(vright, vtmp);
- }
-
- vleft = vec_sra(vleft, vshift);
- vright = vec_sra(vright, vshift);
- v = vec_packsu(vleft, vright);
-- v = (vector uint16_t) vec_max((vector int16_t) v, vzero);
-+ v = (vec_u16) vec_max((vec_s16) v, vzero);
- v = vec_min(v, vlargest);
- v = vec_rl(v, vswap);
- v = vec_perm(v, v, vperm);
-@@ -279,11 +279,11 @@ static void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW,
- const int dst_u = -(uintptr_t)dest & 7;
- const int shift = 3;
- const int add = (1 << (shift - 1));
-- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
-- const vector uint16_t vswap = (vector uint16_t) vec_splat_u16(big_endian ? 8 : 0);
-- const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
-- vector uint32_t v, v2;
-- vector uint16_t vd;
-+ const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+ const vec_u16 vswap = (vec_u16) vec_splat_u16(big_endian ? 8 : 0);
-+ const vec_u32 vshift = (vec_u32) vec_splat_u32(shift);
-+ vec_u32 v, v2;
-+ vec_u16 vd;
- int i;
-
- yuv2plane1_16_u(src, dest, dst_u, big_endian, output_bits, 0);
-@@ -341,18 +341,18 @@ static void yuv2planeX_16_vsx(const int16_t *filter, int filterSize,
- const int bias = 0x8000;
- const int add = (1 << (shift - 1)) - 0x40000000;
- const uint16_t swap = big_endian ? 8 : 0;
-- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
-- const vector uint32_t vshift = (vector uint32_t) {shift, shift, shift, shift};
-- const vector uint16_t vswap = (vector uint16_t) {swap, swap, swap, swap, swap, swap, swap, swap};
-- const vector uint16_t vbias = (vector uint16_t) {bias, bias, bias, bias, bias, bias, bias, bias};
-- vector int32_t vfilter[MAX_FILTER_SIZE];
-- vector uint16_t v;
-- vector uint32_t vleft, vright, vtmp;
-- vector int32_t vin32l, vin32r;
-+ const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+ const vec_u32 vshift = (vec_u32) {shift, shift, shift, shift};
-+ const vec_u16 vswap = (vec_u16) {swap, swap, swap, swap, swap, swap, swap, swap};
-+ const vec_u16 vbias = (vec_u16) {bias, bias, bias, bias, bias, bias, bias, bias};
-+ vec_s32 vfilter[MAX_FILTER_SIZE];
-+ vec_u16 v;
-+ vec_u32 vleft, vright, vtmp;
-+ vec_s32 vin32l, vin32r;
- int i, j;
-
- for (i = 0; i < filterSize; i++) {
-- vfilter[i] = (vector int32_t) {filter[i], filter[i], filter[i], filter[i]};
-+ vfilter[i] = (vec_s32) {filter[i], filter[i], filter[i], filter[i]};
- }
-
- yuv2planeX_16_u(filter, filterSize, src, dest, dst_u, big_endian, output_bits, 0);
-@@ -364,15 +364,15 @@ static void yuv2planeX_16_vsx(const int16_t *filter, int filterSize,
- vin32l = vec_vsx_ld(0, &src[j][i]);
- vin32r = vec_vsx_ld(0, &src[j][i + 4]);
-
-- vtmp = (vector uint32_t) vec_mul(vin32l, vfilter[j]);
-+ vtmp = (vec_u32) vec_mul(vin32l, vfilter[j]);
- vleft = vec_add(vleft, vtmp);
-- vtmp = (vector uint32_t) vec_mul(vin32r, vfilter[j]);
-+ vtmp = (vec_u32) vec_mul(vin32r, vfilter[j]);
- vright = vec_add(vright, vtmp);
- }
-
- vleft = vec_sra(vleft, vshift);
- vright = vec_sra(vright, vshift);
-- v = (vector uint16_t) vec_packs((vector int32_t) vleft, (vector int32_t) vright);
-+ v = (vec_u16) vec_packs((vec_s32) vleft, (vec_s32) vright);
- v = vec_add(v, vbias);
- v = vec_rl(v, vswap);
- vec_st(v, 0, &dest[i]);
-@@ -478,9 +478,9 @@ yuv2NBPSX(16, LE, 0, 16, int32_t)
- out0 = vec_mergeh(bd, gd); \
- out1 = vec_mergeh(rd, ad); \
- \
-- tmp8 = (vector uint8_t) vec_mergeh((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergeh((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 0, dest); \
-- tmp8 = (vector uint8_t) vec_mergel((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergel((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 16, dest); \
- \
- dest += 32; \
-@@ -489,9 +489,9 @@ yuv2NBPSX(16, LE, 0, 16, int32_t)
- out0 = vec_mergeh(rd, gd); \
- out1 = vec_mergeh(bd, ad); \
- \
-- tmp8 = (vector uint8_t) vec_mergeh((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergeh((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 0, dest); \
-- tmp8 = (vector uint8_t) vec_mergel((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergel((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 16, dest); \
- \
- dest += 32; \
-@@ -500,9 +500,9 @@ yuv2NBPSX(16, LE, 0, 16, int32_t)
- out0 = vec_mergeh(ad, rd); \
- out1 = vec_mergeh(gd, bd); \
- \
-- tmp8 = (vector uint8_t) vec_mergeh((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergeh((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 0, dest); \
-- tmp8 = (vector uint8_t) vec_mergel((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergel((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 16, dest); \
- \
- dest += 32; \
-@@ -511,9 +511,9 @@ yuv2NBPSX(16, LE, 0, 16, int32_t)
- out0 = vec_mergeh(ad, bd); \
- out1 = vec_mergeh(gd, rd); \
- \
-- tmp8 = (vector uint8_t) vec_mergeh((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergeh((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 0, dest); \
-- tmp8 = (vector uint8_t) vec_mergel((vector uint16_t) out0, (vector uint16_t) out1); \
-+ tmp8 = (vec_u8) vec_mergel((vec_u16) out0, (vec_u16) out1); \
- vec_vsx_st(tmp8, 16, dest); \
- \
- dest += 32; \
-@@ -528,48 +528,48 @@ yuv2rgb_full_X_vsx_template(SwsContext *c, const int16_t *lumFilter,
- const int16_t **alpSrc, uint8_t *dest,
- int dstW, int y, enum AVPixelFormat target, int hasAlpha)
- {
-- vector int16_t vv;
-- vector int32_t vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-- vector int32_t R_l, R_r, G_l, G_r, B_l, B_r;
-- vector int32_t tmp, tmp2, tmp3, tmp4;
-- vector uint16_t rd16, gd16, bd16;
-- vector uint8_t rd, bd, gd, ad, out0, out1, tmp8;
-- vector int16_t vlumFilter[MAX_FILTER_SIZE], vchrFilter[MAX_FILTER_SIZE];
-- const vector int32_t ystart = vec_splats(1 << 9);
-- const vector int32_t uvstart = vec_splats((1 << 9) - (128 << 19));
-- const vector uint16_t zero16 = vec_splat_u16(0);
-- const vector int32_t y_offset = vec_splats(c->yuv2rgb_y_offset);
-- const vector int32_t y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-- const vector int32_t y_add = vec_splats(1 << 21);
-- const vector int32_t v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-- const vector int32_t v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-- const vector int32_t u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-- const vector int32_t u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-- const vector int32_t rgbclip = vec_splats(1 << 30);
-- const vector int32_t zero32 = vec_splat_s32(0);
-- const vector uint32_t shift22 = vec_splats(22U);
-- const vector uint32_t shift10 = vec_splat_u32(10);
-+ vec_s16 vv;
-+ vec_s32 vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-+ vec_s32 R_l, R_r, G_l, G_r, B_l, B_r;
-+ vec_s32 tmp, tmp2, tmp3, tmp4;
-+ vec_u16 rd16, gd16, bd16;
-+ vec_u8 rd, bd, gd, ad, out0, out1, tmp8;
-+ vec_s16 vlumFilter[MAX_FILTER_SIZE], vchrFilter[MAX_FILTER_SIZE];
-+ const vec_s32 ystart = vec_splats(1 << 9);
-+ const vec_s32 uvstart = vec_splats((1 << 9) - (128 << 19));
-+ const vec_u16 zero16 = vec_splat_u16(0);
-+ const vec_s32 y_offset = vec_splats(c->yuv2rgb_y_offset);
-+ const vec_s32 y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-+ const vec_s32 y_add = vec_splats(1 << 21);
-+ const vec_s32 v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-+ const vec_s32 v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-+ const vec_s32 u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-+ const vec_s32 u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-+ const vec_s32 rgbclip = vec_splats(1 << 30);
-+ const vec_s32 zero32 = vec_splat_s32(0);
-+ const vec_u32 shift22 = vec_splats(22U);
-+ const vec_u32 shift10 = vec_splat_u32(10);
- int i, j;
-
- // Various permutations
-- const vector uint8_t perm3rg0 = (vector uint8_t) {0x0, 0x10, 0,
-- 0x1, 0x11, 0,
-- 0x2, 0x12, 0,
-- 0x3, 0x13, 0,
-- 0x4, 0x14, 0,
-- 0x5 };
-- const vector uint8_t perm3rg1 = (vector uint8_t) { 0x15, 0,
-- 0x6, 0x16, 0,
-- 0x7, 0x17, 0 };
-- const vector uint8_t perm3tb0 = (vector uint8_t) {0x0, 0x1, 0x10,
-- 0x3, 0x4, 0x11,
-- 0x6, 0x7, 0x12,
-- 0x9, 0xa, 0x13,
-- 0xc, 0xd, 0x14,
-- 0xf };
-- const vector uint8_t perm3tb1 = (vector uint8_t) { 0x0, 0x15,
-- 0x2, 0x3, 0x16,
-- 0x5, 0x6, 0x17 };
-+ const vec_u8 perm3rg0 = (vec_u8) {0x0, 0x10, 0,
-+ 0x1, 0x11, 0,
-+ 0x2, 0x12, 0,
-+ 0x3, 0x13, 0,
-+ 0x4, 0x14, 0,
-+ 0x5 };
-+ const vec_u8 perm3rg1 = (vec_u8) { 0x15, 0,
-+ 0x6, 0x16, 0,
-+ 0x7, 0x17, 0 };
-+ const vec_u8 perm3tb0 = (vec_u8) {0x0, 0x1, 0x10,
-+ 0x3, 0x4, 0x11,
-+ 0x6, 0x7, 0x12,
-+ 0x9, 0xa, 0x13,
-+ 0xc, 0xd, 0x14,
-+ 0xf };
-+ const vec_u8 perm3tb1 = (vec_u8) { 0x0, 0x15,
-+ 0x2, 0x3, 0x16,
-+ 0x5, 0x6, 0x17 };
-
- ad = vec_splats((uint8_t) 255);
-
-@@ -685,52 +685,52 @@ yuv2rgb_full_2_vsx_template(SwsContext *c, const int16_t *buf[2],
- *abuf1 = hasAlpha ? abuf[1] : NULL;
- const int16_t yalpha1 = 4096 - yalpha;
- const int16_t uvalpha1 = 4096 - uvalpha;
-- vector int16_t vy, vu, vv, A = vec_splat_s16(0);
-- vector int32_t vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-- vector int32_t R_l, R_r, G_l, G_r, B_l, B_r;
-- vector int32_t tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-- vector uint16_t rd16, gd16, bd16;
-- vector uint8_t rd, bd, gd, ad, out0, out1, tmp8;
-- const vector int16_t vyalpha1 = vec_splats(yalpha1);
-- const vector int16_t vuvalpha1 = vec_splats(uvalpha1);
-- const vector int16_t vyalpha = vec_splats((int16_t) yalpha);
-- const vector int16_t vuvalpha = vec_splats((int16_t) uvalpha);
-- const vector uint16_t zero16 = vec_splat_u16(0);
-- const vector int32_t y_offset = vec_splats(c->yuv2rgb_y_offset);
-- const vector int32_t y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-- const vector int32_t y_add = vec_splats(1 << 21);
-- const vector int32_t v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-- const vector int32_t v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-- const vector int32_t u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-- const vector int32_t u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-- const vector int32_t rgbclip = vec_splats(1 << 30);
-- const vector int32_t zero32 = vec_splat_s32(0);
-- const vector uint32_t shift19 = vec_splats(19U);
-- const vector uint32_t shift22 = vec_splats(22U);
-- const vector uint32_t shift10 = vec_splat_u32(10);
-- const vector int32_t dec128 = vec_splats(128 << 19);
-- const vector int32_t add18 = vec_splats(1 << 18);
-+ vec_s16 vy, vu, vv, A = vec_splat_s16(0);
-+ vec_s32 vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-+ vec_s32 R_l, R_r, G_l, G_r, B_l, B_r;
-+ vec_s32 tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-+ vec_u16 rd16, gd16, bd16;
-+ vec_u8 rd, bd, gd, ad, out0, out1, tmp8;
-+ const vec_s16 vyalpha1 = vec_splats(yalpha1);
-+ const vec_s16 vuvalpha1 = vec_splats(uvalpha1);
-+ const vec_s16 vyalpha = vec_splats((int16_t) yalpha);
-+ const vec_s16 vuvalpha = vec_splats((int16_t) uvalpha);
-+ const vec_u16 zero16 = vec_splat_u16(0);
-+ const vec_s32 y_offset = vec_splats(c->yuv2rgb_y_offset);
-+ const vec_s32 y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-+ const vec_s32 y_add = vec_splats(1 << 21);
-+ const vec_s32 v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-+ const vec_s32 v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-+ const vec_s32 u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-+ const vec_s32 u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-+ const vec_s32 rgbclip = vec_splats(1 << 30);
-+ const vec_s32 zero32 = vec_splat_s32(0);
-+ const vec_u32 shift19 = vec_splats(19U);
-+ const vec_u32 shift22 = vec_splats(22U);
-+ const vec_u32 shift10 = vec_splat_u32(10);
-+ const vec_s32 dec128 = vec_splats(128 << 19);
-+ const vec_s32 add18 = vec_splats(1 << 18);
- int i;
-
- // Various permutations
-- const vector uint8_t perm3rg0 = (vector uint8_t) {0x0, 0x10, 0,
-- 0x1, 0x11, 0,
-- 0x2, 0x12, 0,
-- 0x3, 0x13, 0,
-- 0x4, 0x14, 0,
-- 0x5 };
-- const vector uint8_t perm3rg1 = (vector uint8_t) { 0x15, 0,
-- 0x6, 0x16, 0,
-- 0x7, 0x17, 0 };
-- const vector uint8_t perm3tb0 = (vector uint8_t) {0x0, 0x1, 0x10,
-- 0x3, 0x4, 0x11,
-- 0x6, 0x7, 0x12,
-- 0x9, 0xa, 0x13,
-- 0xc, 0xd, 0x14,
-- 0xf };
-- const vector uint8_t perm3tb1 = (vector uint8_t) { 0x0, 0x15,
-- 0x2, 0x3, 0x16,
-- 0x5, 0x6, 0x17 };
-+ const vec_u8 perm3rg0 = (vec_u8) {0x0, 0x10, 0,
-+ 0x1, 0x11, 0,
-+ 0x2, 0x12, 0,
-+ 0x3, 0x13, 0,
-+ 0x4, 0x14, 0,
-+ 0x5 };
-+ const vec_u8 perm3rg1 = (vec_u8) { 0x15, 0,
-+ 0x6, 0x16, 0,
-+ 0x7, 0x17, 0 };
-+ const vec_u8 perm3tb0 = (vec_u8) {0x0, 0x1, 0x10,
-+ 0x3, 0x4, 0x11,
-+ 0x6, 0x7, 0x12,
-+ 0x9, 0xa, 0x13,
-+ 0xc, 0xd, 0x14,
-+ 0xf };
-+ const vec_u8 perm3tb1 = (vec_u8) { 0x0, 0x15,
-+ 0x2, 0x3, 0x16,
-+ 0x5, 0x6, 0x17 };
-
- av_assert2(yalpha <= 4096U);
- av_assert2(uvalpha <= 4096U);
-@@ -759,7 +759,7 @@ yuv2rgb_full_2_vsx_template(SwsContext *c, const int16_t *buf[2],
- tmp3 = vec_sra(tmp3, shift19);
- tmp4 = vec_sra(tmp4, shift19);
- A = vec_packs(tmp3, tmp4);
-- ad = vec_packsu(A, (vector int16_t) zero16);
-+ ad = vec_packsu(A, (vec_s16) zero16);
- } else {
- ad = vec_splats((uint8_t) 255);
- }
-@@ -807,60 +807,60 @@ yuv2rgb_2_vsx_template(SwsContext *c, const int16_t *buf[2],
- *abuf1 = hasAlpha ? abuf[1] : NULL;
- const int16_t yalpha1 = 4096 - yalpha;
- const int16_t uvalpha1 = 4096 - uvalpha;
-- vector int16_t vy, vu, vv, A = vec_splat_s16(0);
-- vector int32_t vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-- vector int32_t R_l, R_r, G_l, G_r, B_l, B_r, vud32_l, vud32_r, vvd32_l, vvd32_r;
-- vector int32_t tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-- vector uint16_t rd16, gd16, bd16;
-- vector uint8_t rd, bd, gd, ad, out0, out1, tmp8;
-- const vector int16_t vyalpha1 = vec_splats(yalpha1);
-- const vector int16_t vuvalpha1 = vec_splats(uvalpha1);
-- const vector int16_t vyalpha = vec_splats((int16_t) yalpha);
-- const vector int16_t vuvalpha = vec_splats((int16_t) uvalpha);
-- const vector uint16_t zero16 = vec_splat_u16(0);
-- const vector int32_t y_offset = vec_splats(c->yuv2rgb_y_offset);
-- const vector int32_t y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-- const vector int32_t y_add = vec_splats(1 << 21);
-- const vector int32_t v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-- const vector int32_t v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-- const vector int32_t u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-- const vector int32_t u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-- const vector int32_t rgbclip = vec_splats(1 << 30);
-- const vector int32_t zero32 = vec_splat_s32(0);
-- const vector uint32_t shift19 = vec_splats(19U);
-- const vector uint32_t shift22 = vec_splats(22U);
-- const vector uint32_t shift10 = vec_splat_u32(10);
-- const vector int32_t dec128 = vec_splats(128 << 19);
-- const vector int32_t add18 = vec_splats(1 << 18);
-+ vec_s16 vy, vu, vv, A = vec_splat_s16(0);
-+ vec_s32 vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32;
-+ vec_s32 R_l, R_r, G_l, G_r, B_l, B_r, vud32_l, vud32_r, vvd32_l, vvd32_r;
-+ vec_s32 tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-+ vec_u16 rd16, gd16, bd16;
-+ vec_u8 rd, bd, gd, ad, out0, out1, tmp8;
-+ const vec_s16 vyalpha1 = vec_splats(yalpha1);
-+ const vec_s16 vuvalpha1 = vec_splats(uvalpha1);
-+ const vec_s16 vyalpha = vec_splats((int16_t) yalpha);
-+ const vec_s16 vuvalpha = vec_splats((int16_t) uvalpha);
-+ const vec_u16 zero16 = vec_splat_u16(0);
-+ const vec_s32 y_offset = vec_splats(c->yuv2rgb_y_offset);
-+ const vec_s32 y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-+ const vec_s32 y_add = vec_splats(1 << 21);
-+ const vec_s32 v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-+ const vec_s32 v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-+ const vec_s32 u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-+ const vec_s32 u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-+ const vec_s32 rgbclip = vec_splats(1 << 30);
-+ const vec_s32 zero32 = vec_splat_s32(0);
-+ const vec_u32 shift19 = vec_splats(19U);
-+ const vec_u32 shift22 = vec_splats(22U);
-+ const vec_u32 shift10 = vec_splat_u32(10);
-+ const vec_s32 dec128 = vec_splats(128 << 19);
-+ const vec_s32 add18 = vec_splats(1 << 18);
- int i;
-
- // Various permutations
-- const vector uint8_t doubleleft = (vector uint8_t) {0, 1, 2, 3,
-- 0, 1, 2, 3,
-- 4, 5, 6, 7,
-- 4, 5, 6, 7 };
-- const vector uint8_t doubleright = (vector uint8_t) {8, 9, 10, 11,
-- 8, 9, 10, 11,
-- 12, 13, 14, 15,
-- 12, 13, 14, 15 };
-- const vector uint8_t perm3rg0 = (vector uint8_t) {0x0, 0x10, 0,
-- 0x1, 0x11, 0,
-- 0x2, 0x12, 0,
-- 0x3, 0x13, 0,
-- 0x4, 0x14, 0,
-- 0x5 };
-- const vector uint8_t perm3rg1 = (vector uint8_t) { 0x15, 0,
-- 0x6, 0x16, 0,
-- 0x7, 0x17, 0 };
-- const vector uint8_t perm3tb0 = (vector uint8_t) {0x0, 0x1, 0x10,
-- 0x3, 0x4, 0x11,
-- 0x6, 0x7, 0x12,
-- 0x9, 0xa, 0x13,
-- 0xc, 0xd, 0x14,
-- 0xf };
-- const vector uint8_t perm3tb1 = (vector uint8_t) { 0x0, 0x15,
-- 0x2, 0x3, 0x16,
-- 0x5, 0x6, 0x17 };
-+ const vec_u8 doubleleft = (vec_u8) {0, 1, 2, 3,
-+ 0, 1, 2, 3,
-+ 4, 5, 6, 7,
-+ 4, 5, 6, 7 };
-+ const vec_u8 doubleright = (vec_u8) {8, 9, 10, 11,
-+ 8, 9, 10, 11,
-+ 12, 13, 14, 15,
-+ 12, 13, 14, 15 };
-+ const vec_u8 perm3rg0 = (vec_u8) {0x0, 0x10, 0,
-+ 0x1, 0x11, 0,
-+ 0x2, 0x12, 0,
-+ 0x3, 0x13, 0,
-+ 0x4, 0x14, 0,
-+ 0x5 };
-+ const vec_u8 perm3rg1 = (vec_u8) { 0x15, 0,
-+ 0x6, 0x16, 0,
-+ 0x7, 0x17, 0 };
-+ const vec_u8 perm3tb0 = (vec_u8) {0x0, 0x1, 0x10,
-+ 0x3, 0x4, 0x11,
-+ 0x6, 0x7, 0x12,
-+ 0x9, 0xa, 0x13,
-+ 0xc, 0xd, 0x14,
-+ 0xf };
-+ const vec_u8 perm3tb1 = (vec_u8) { 0x0, 0x15,
-+ 0x2, 0x3, 0x16,
-+ 0x5, 0x6, 0x17 };
-
- av_assert2(yalpha <= 4096U);
- av_assert2(uvalpha <= 4096U);
-@@ -889,7 +889,7 @@ yuv2rgb_2_vsx_template(SwsContext *c, const int16_t *buf[2],
- tmp3 = vec_sra(tmp3, shift19);
- tmp4 = vec_sra(tmp4, shift19);
- A = vec_packs(tmp3, tmp4);
-- ad = vec_packsu(A, (vector int16_t) zero16);
-+ ad = vec_packsu(A, (vec_s16) zero16);
- } else {
- ad = vec_splats((uint8_t) 255);
- }
-@@ -978,51 +978,51 @@ yuv2rgb_full_1_vsx_template(SwsContext *c, const int16_t *buf0,
- {
- const int16_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
- const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
-- vector int16_t vy, vu, vv, A = vec_splat_s16(0), tmp16;
-- vector int32_t vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32, tmp32_2;
-- vector int32_t R_l, R_r, G_l, G_r, B_l, B_r;
-- vector uint16_t rd16, gd16, bd16;
-- vector uint8_t rd, bd, gd, ad, out0, out1, tmp8;
-- const vector uint16_t zero16 = vec_splat_u16(0);
-- const vector int32_t y_offset = vec_splats(c->yuv2rgb_y_offset);
-- const vector int32_t y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-- const vector int32_t y_add = vec_splats(1 << 21);
-- const vector int32_t v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-- const vector int32_t v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-- const vector int32_t u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-- const vector int32_t u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-- const vector int32_t rgbclip = vec_splats(1 << 30);
-- const vector int32_t zero32 = vec_splat_s32(0);
-- const vector uint32_t shift2 = vec_splat_u32(2);
-- const vector uint32_t shift22 = vec_splats(22U);
-- const vector uint16_t sub7 = vec_splats((uint16_t) (128 << 7));
-- const vector uint16_t sub8 = vec_splats((uint16_t) (128 << 8));
-- const vector int16_t mul4 = vec_splat_s16(4);
-- const vector int16_t mul8 = vec_splat_s16(8);
-- const vector int16_t add64 = vec_splat_s16(64);
-- const vector uint16_t shift7 = vec_splat_u16(7);
-- const vector int16_t max255 = vec_splat_s16(255);
-+ vec_s16 vy, vu, vv, A = vec_splat_s16(0), tmp16;
-+ vec_s32 vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32, tmp32_2;
-+ vec_s32 R_l, R_r, G_l, G_r, B_l, B_r;
-+ vec_u16 rd16, gd16, bd16;
-+ vec_u8 rd, bd, gd, ad, out0, out1, tmp8;
-+ const vec_u16 zero16 = vec_splat_u16(0);
-+ const vec_s32 y_offset = vec_splats(c->yuv2rgb_y_offset);
-+ const vec_s32 y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-+ const vec_s32 y_add = vec_splats(1 << 21);
-+ const vec_s32 v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-+ const vec_s32 v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-+ const vec_s32 u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-+ const vec_s32 u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-+ const vec_s32 rgbclip = vec_splats(1 << 30);
-+ const vec_s32 zero32 = vec_splat_s32(0);
-+ const vec_u32 shift2 = vec_splat_u32(2);
-+ const vec_u32 shift22 = vec_splats(22U);
-+ const vec_u16 sub7 = vec_splats((uint16_t) (128 << 7));
-+ const vec_u16 sub8 = vec_splats((uint16_t) (128 << 8));
-+ const vec_s16 mul4 = vec_splat_s16(4);
-+ const vec_s16 mul8 = vec_splat_s16(8);
-+ const vec_s16 add64 = vec_splat_s16(64);
-+ const vec_u16 shift7 = vec_splat_u16(7);
-+ const vec_s16 max255 = vec_splat_s16(255);
- int i;
-
- // Various permutations
-- const vector uint8_t perm3rg0 = (vector uint8_t) {0x0, 0x10, 0,
-- 0x1, 0x11, 0,
-- 0x2, 0x12, 0,
-- 0x3, 0x13, 0,
-- 0x4, 0x14, 0,
-- 0x5 };
-- const vector uint8_t perm3rg1 = (vector uint8_t) { 0x15, 0,
-- 0x6, 0x16, 0,
-- 0x7, 0x17, 0 };
-- const vector uint8_t perm3tb0 = (vector uint8_t) {0x0, 0x1, 0x10,
-- 0x3, 0x4, 0x11,
-- 0x6, 0x7, 0x12,
-- 0x9, 0xa, 0x13,
-- 0xc, 0xd, 0x14,
-- 0xf };
-- const vector uint8_t perm3tb1 = (vector uint8_t) { 0x0, 0x15,
-- 0x2, 0x3, 0x16,
-- 0x5, 0x6, 0x17 };
-+ const vec_u8 perm3rg0 = (vec_u8) {0x0, 0x10, 0,
-+ 0x1, 0x11, 0,
-+ 0x2, 0x12, 0,
-+ 0x3, 0x13, 0,
-+ 0x4, 0x14, 0,
-+ 0x5 };
-+ const vec_u8 perm3rg1 = (vec_u8) { 0x15, 0,
-+ 0x6, 0x16, 0,
-+ 0x7, 0x17, 0 };
-+ const vec_u8 perm3tb0 = (vec_u8) {0x0, 0x1, 0x10,
-+ 0x3, 0x4, 0x11,
-+ 0x6, 0x7, 0x12,
-+ 0x9, 0xa, 0x13,
-+ 0xc, 0xd, 0x14,
-+ 0xf };
-+ const vec_u8 perm3tb1 = (vec_u8) { 0x0, 0x15,
-+ 0x2, 0x3, 0x16,
-+ 0x5, 0x6, 0x17 };
-
- for (i = 0; i < dstW; i += 8) { // The x86 asm also overwrites padding bytes.
- vy = vec_ld(0, &buf0[i]);
-@@ -1034,8 +1034,8 @@ yuv2rgb_full_1_vsx_template(SwsContext *c, const int16_t *buf0,
- vu = vec_ld(0, &ubuf0[i]);
- vv = vec_ld(0, &vbuf0[i]);
- if (uvalpha < 2048) {
-- vu = (vector int16_t) vec_sub((vector uint16_t) vu, sub7);
-- vv = (vector int16_t) vec_sub((vector uint16_t) vv, sub7);
-+ vu = (vec_s16) vec_sub((vec_u16) vu, sub7);
-+ vv = (vec_s16) vec_sub((vec_u16) vv, sub7);
-
- tmp32 = vec_mule(vu, mul4);
- tmp32_2 = vec_mulo(vu, mul4);
-@@ -1048,10 +1048,10 @@ yuv2rgb_full_1_vsx_template(SwsContext *c, const int16_t *buf0,
- } else {
- tmp16 = vec_ld(0, &ubuf1[i]);
- vu = vec_add(vu, tmp16);
-- vu = (vector int16_t) vec_sub((vector uint16_t) vu, sub8);
-+ vu = (vec_s16) vec_sub((vec_u16) vu, sub8);
- tmp16 = vec_ld(0, &vbuf1[i]);
- vv = vec_add(vv, tmp16);
-- vv = (vector int16_t) vec_sub((vector uint16_t) vv, sub8);
-+ vv = (vec_s16) vec_sub((vec_u16) vv, sub8);
-
- vu32_l = vec_mule(vu, mul8);
- vu32_r = vec_mulo(vu, mul8);
-@@ -1064,7 +1064,7 @@ yuv2rgb_full_1_vsx_template(SwsContext *c, const int16_t *buf0,
- A = vec_add(A, add64);
- A = vec_sr(A, shift7);
- A = vec_max(A, max255);
-- ad = vec_packsu(A, (vector int16_t) zero16);
-+ ad = vec_packsu(A, (vec_s16) zero16);
- } else {
- ad = vec_splats((uint8_t) 255);
- }
-@@ -1107,60 +1107,60 @@ yuv2rgb_1_vsx_template(SwsContext *c, const int16_t *buf0,
- {
- const int16_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
- const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
-- vector int16_t vy, vu, vv, A = vec_splat_s16(0), tmp16;
-- vector int32_t vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32, tmp32_2;
-- vector int32_t vud32_l, vud32_r, vvd32_l, vvd32_r;
-- vector int32_t R_l, R_r, G_l, G_r, B_l, B_r;
-- vector uint16_t rd16, gd16, bd16;
-- vector uint8_t rd, bd, gd, ad, out0, out1, tmp8;
-- const vector uint16_t zero16 = vec_splat_u16(0);
-- const vector int32_t y_offset = vec_splats(c->yuv2rgb_y_offset);
-- const vector int32_t y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-- const vector int32_t y_add = vec_splats(1 << 21);
-- const vector int32_t v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-- const vector int32_t v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-- const vector int32_t u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-- const vector int32_t u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-- const vector int32_t rgbclip = vec_splats(1 << 30);
-- const vector int32_t zero32 = vec_splat_s32(0);
-- const vector uint32_t shift2 = vec_splat_u32(2);
-- const vector uint32_t shift22 = vec_splats(22U);
-- const vector uint16_t sub7 = vec_splats((uint16_t) (128 << 7));
-- const vector uint16_t sub8 = vec_splats((uint16_t) (128 << 8));
-- const vector int16_t mul4 = vec_splat_s16(4);
-- const vector int16_t mul8 = vec_splat_s16(8);
-- const vector int16_t add64 = vec_splat_s16(64);
-- const vector uint16_t shift7 = vec_splat_u16(7);
-- const vector int16_t max255 = vec_splat_s16(255);
-+ vec_s16 vy, vu, vv, A = vec_splat_s16(0), tmp16;
-+ vec_s32 vy32_l, vy32_r, vu32_l, vu32_r, vv32_l, vv32_r, tmp32, tmp32_2;
-+ vec_s32 vud32_l, vud32_r, vvd32_l, vvd32_r;
-+ vec_s32 R_l, R_r, G_l, G_r, B_l, B_r;
-+ vec_u16 rd16, gd16, bd16;
-+ vec_u8 rd, bd, gd, ad, out0, out1, tmp8;
-+ const vec_u16 zero16 = vec_splat_u16(0);
-+ const vec_s32 y_offset = vec_splats(c->yuv2rgb_y_offset);
-+ const vec_s32 y_coeff = vec_splats(c->yuv2rgb_y_coeff);
-+ const vec_s32 y_add = vec_splats(1 << 21);
-+ const vec_s32 v2r_coeff = vec_splats(c->yuv2rgb_v2r_coeff);
-+ const vec_s32 v2g_coeff = vec_splats(c->yuv2rgb_v2g_coeff);
-+ const vec_s32 u2g_coeff = vec_splats(c->yuv2rgb_u2g_coeff);
-+ const vec_s32 u2b_coeff = vec_splats(c->yuv2rgb_u2b_coeff);
-+ const vec_s32 rgbclip = vec_splats(1 << 30);
-+ const vec_s32 zero32 = vec_splat_s32(0);
-+ const vec_u32 shift2 = vec_splat_u32(2);
-+ const vec_u32 shift22 = vec_splats(22U);
-+ const vec_u16 sub7 = vec_splats((uint16_t) (128 << 7));
-+ const vec_u16 sub8 = vec_splats((uint16_t) (128 << 8));
-+ const vec_s16 mul4 = vec_splat_s16(4);
-+ const vec_s16 mul8 = vec_splat_s16(8);
-+ const vec_s16 add64 = vec_splat_s16(64);
-+ const vec_u16 shift7 = vec_splat_u16(7);
-+ const vec_s16 max255 = vec_splat_s16(255);
- int i;
-
- // Various permutations
-- const vector uint8_t doubleleft = (vector uint8_t) {0, 1, 2, 3,
-- 0, 1, 2, 3,
-- 4, 5, 6, 7,
-- 4, 5, 6, 7 };
-- const vector uint8_t doubleright = (vector uint8_t) {8, 9, 10, 11,
-- 8, 9, 10, 11,
-- 12, 13, 14, 15,
-- 12, 13, 14, 15 };
-- const vector uint8_t perm3rg0 = (vector uint8_t) {0x0, 0x10, 0,
-- 0x1, 0x11, 0,
-- 0x2, 0x12, 0,
-- 0x3, 0x13, 0,
-- 0x4, 0x14, 0,
-- 0x5 };
-- const vector uint8_t perm3rg1 = (vector uint8_t) { 0x15, 0,
-- 0x6, 0x16, 0,
-- 0x7, 0x17, 0 };
-- const vector uint8_t perm3tb0 = (vector uint8_t) {0x0, 0x1, 0x10,
-- 0x3, 0x4, 0x11,
-- 0x6, 0x7, 0x12,
-- 0x9, 0xa, 0x13,
-- 0xc, 0xd, 0x14,
-- 0xf };
-- const vector uint8_t perm3tb1 = (vector uint8_t) { 0x0, 0x15,
-- 0x2, 0x3, 0x16,
-- 0x5, 0x6, 0x17 };
-+ const vec_u8 doubleleft = (vec_u8) {0, 1, 2, 3,
-+ 0, 1, 2, 3,
-+ 4, 5, 6, 7,
-+ 4, 5, 6, 7 };
-+ const vec_u8 doubleright = (vec_u8) {8, 9, 10, 11,
-+ 8, 9, 10, 11,
-+ 12, 13, 14, 15,
-+ 12, 13, 14, 15 };
-+ const vec_u8 perm3rg0 = (vec_u8) {0x0, 0x10, 0,
-+ 0x1, 0x11, 0,
-+ 0x2, 0x12, 0,
-+ 0x3, 0x13, 0,
-+ 0x4, 0x14, 0,
-+ 0x5 };
-+ const vec_u8 perm3rg1 = (vec_u8) { 0x15, 0,
-+ 0x6, 0x16, 0,
-+ 0x7, 0x17, 0 };
-+ const vec_u8 perm3tb0 = (vec_u8) {0x0, 0x1, 0x10,
-+ 0x3, 0x4, 0x11,
-+ 0x6, 0x7, 0x12,
-+ 0x9, 0xa, 0x13,
-+ 0xc, 0xd, 0x14,
-+ 0xf };
-+ const vec_u8 perm3tb1 = (vec_u8) { 0x0, 0x15,
-+ 0x2, 0x3, 0x16,
-+ 0x5, 0x6, 0x17 };
-
- for (i = 0; i < (dstW + 1) >> 1; i += 8) { // The x86 asm also overwrites padding bytes.
- vy = vec_ld(0, &buf0[i * 2]);
-@@ -1172,8 +1172,8 @@ yuv2rgb_1_vsx_template(SwsContext *c, const int16_t *buf0,
- vu = vec_ld(0, &ubuf0[i]);
- vv = vec_ld(0, &vbuf0[i]);
- if (uvalpha < 2048) {
-- vu = (vector int16_t) vec_sub((vector uint16_t) vu, sub7);
-- vv = (vector int16_t) vec_sub((vector uint16_t) vv, sub7);
-+ vu = (vec_s16) vec_sub((vec_u16) vu, sub7);
-+ vv = (vec_s16) vec_sub((vec_u16) vv, sub7);
-
- tmp32 = vec_mule(vu, mul4);
- tmp32_2 = vec_mulo(vu, mul4);
-@@ -1186,10 +1186,10 @@ yuv2rgb_1_vsx_template(SwsContext *c, const int16_t *buf0,
- } else {
- tmp16 = vec_ld(0, &ubuf1[i]);
- vu = vec_add(vu, tmp16);
-- vu = (vector int16_t) vec_sub((vector uint16_t) vu, sub8);
-+ vu = (vec_s16) vec_sub((vec_u16) vu, sub8);
- tmp16 = vec_ld(0, &vbuf1[i]);
- vv = vec_add(vv, tmp16);
-- vv = (vector int16_t) vec_sub((vector uint16_t) vv, sub8);
-+ vv = (vec_s16) vec_sub((vec_u16) vv, sub8);
-
- vu32_l = vec_mule(vu, mul8);
- vu32_r = vec_mulo(vu, mul8);
-@@ -1202,7 +1202,7 @@ yuv2rgb_1_vsx_template(SwsContext *c, const int16_t *buf0,
- A = vec_add(A, add64);
- A = vec_sr(A, shift7);
- A = vec_max(A, max255);
-- ad = vec_packsu(A, (vector int16_t) zero16);
-+ ad = vec_packsu(A, (vec_s16) zero16);
- } else {
- ad = vec_splats((uint8_t) 255);
- }
-@@ -1358,41 +1358,41 @@ YUV2RGBWRAPPERX(yuv2, rgb_full, rgb24_full, AV_PIX_FMT_RGB24, 0)
- YUV2RGBWRAPPERX(yuv2, rgb_full, bgr24_full, AV_PIX_FMT_BGR24, 0)
-
- static av_always_inline void
--write422(const vector int16_t vy1, const vector int16_t vy2,
-- const vector int16_t vu, const vector int16_t vv,
-+write422(const vec_s16 vy1, const vec_s16 vy2,
-+ const vec_s16 vu, const vec_s16 vv,
- uint8_t *dest, const enum AVPixelFormat target)
- {
-- vector uint8_t vd1, vd2, tmp;
-- const vector uint8_t yuyv1 = (vector uint8_t) {
-- 0x0, 0x10, 0x1, 0x18,
-- 0x2, 0x11, 0x3, 0x19,
-- 0x4, 0x12, 0x5, 0x1a,
-- 0x6, 0x13, 0x7, 0x1b };
-- const vector uint8_t yuyv2 = (vector uint8_t) {
-- 0x8, 0x14, 0x9, 0x1c,
-- 0xa, 0x15, 0xb, 0x1d,
-- 0xc, 0x16, 0xd, 0x1e,
-- 0xe, 0x17, 0xf, 0x1f };
-- const vector uint8_t yvyu1 = (vector uint8_t) {
-- 0x0, 0x18, 0x1, 0x10,
-- 0x2, 0x19, 0x3, 0x11,
-- 0x4, 0x1a, 0x5, 0x12,
-- 0x6, 0x1b, 0x7, 0x13 };
-- const vector uint8_t yvyu2 = (vector uint8_t) {
-- 0x8, 0x1c, 0x9, 0x14,
-- 0xa, 0x1d, 0xb, 0x15,
-- 0xc, 0x1e, 0xd, 0x16,
-- 0xe, 0x1f, 0xf, 0x17 };
-- const vector uint8_t uyvy1 = (vector uint8_t) {
-- 0x10, 0x0, 0x18, 0x1,
-- 0x11, 0x2, 0x19, 0x3,
-- 0x12, 0x4, 0x1a, 0x5,
-- 0x13, 0x6, 0x1b, 0x7 };
-- const vector uint8_t uyvy2 = (vector uint8_t) {
-- 0x14, 0x8, 0x1c, 0x9,
-- 0x15, 0xa, 0x1d, 0xb,
-- 0x16, 0xc, 0x1e, 0xd,
-- 0x17, 0xe, 0x1f, 0xf };
-+ vec_u8 vd1, vd2, tmp;
-+ const vec_u8 yuyv1 = (vec_u8) {
-+ 0x0, 0x10, 0x1, 0x18,
-+ 0x2, 0x11, 0x3, 0x19,
-+ 0x4, 0x12, 0x5, 0x1a,
-+ 0x6, 0x13, 0x7, 0x1b };
-+ const vec_u8 yuyv2 = (vec_u8) {
-+ 0x8, 0x14, 0x9, 0x1c,
-+ 0xa, 0x15, 0xb, 0x1d,
-+ 0xc, 0x16, 0xd, 0x1e,
-+ 0xe, 0x17, 0xf, 0x1f };
-+ const vec_u8 yvyu1 = (vec_u8) {
-+ 0x0, 0x18, 0x1, 0x10,
-+ 0x2, 0x19, 0x3, 0x11,
-+ 0x4, 0x1a, 0x5, 0x12,
-+ 0x6, 0x1b, 0x7, 0x13 };
-+ const vec_u8 yvyu2 = (vec_u8) {
-+ 0x8, 0x1c, 0x9, 0x14,
-+ 0xa, 0x1d, 0xb, 0x15,
-+ 0xc, 0x1e, 0xd, 0x16,
-+ 0xe, 0x1f, 0xf, 0x17 };
-+ const vec_u8 uyvy1 = (vec_u8) {
-+ 0x10, 0x0, 0x18, 0x1,
-+ 0x11, 0x2, 0x19, 0x3,
-+ 0x12, 0x4, 0x1a, 0x5,
-+ 0x13, 0x6, 0x1b, 0x7 };
-+ const vec_u8 uyvy2 = (vec_u8) {
-+ 0x14, 0x8, 0x1c, 0x9,
-+ 0x15, 0xa, 0x1d, 0xb,
-+ 0x16, 0xc, 0x1e, 0xd,
-+ 0x17, 0xe, 0x1f, 0xf };
-
- vd1 = vec_packsu(vy1, vy2);
- vd2 = vec_packsu(vu, vv);
-@@ -1428,11 +1428,11 @@ yuv2422_X_vsx_template(SwsContext *c, const int16_t *lumFilter,
- int y, enum AVPixelFormat target)
- {
- int i, j;
-- vector int16_t vy1, vy2, vu, vv;
-- vector int32_t vy32[4], vu32[2], vv32[2], tmp, tmp2, tmp3, tmp4;
-- vector int16_t vlumFilter[MAX_FILTER_SIZE], vchrFilter[MAX_FILTER_SIZE];
-- const vector int32_t start = vec_splats(1 << 18);
-- const vector uint32_t shift19 = vec_splats(19U);
-+ vec_s16 vy1, vy2, vu, vv;
-+ vec_s32 vy32[4], vu32[2], vv32[2], tmp, tmp2, tmp3, tmp4;
-+ vec_s16 vlumFilter[MAX_FILTER_SIZE], vchrFilter[MAX_FILTER_SIZE];
-+ const vec_s32 start = vec_splats(1 << 18);
-+ const vec_u32 shift19 = vec_splats(19U);
-
- for (i = 0; i < lumFilterSize; i++)
- vlumFilter[i] = vec_splats(lumFilter[i]);
-@@ -1539,11 +1539,11 @@ yuv2422_2_vsx_template(SwsContext *c, const int16_t *buf[2],
- *vbuf0 = vbuf[0], *vbuf1 = vbuf[1];
- const int16_t yalpha1 = 4096 - yalpha;
- const int16_t uvalpha1 = 4096 - uvalpha;
-- vector int16_t vy1, vy2, vu, vv;
-- vector int32_t tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-- const vector int16_t vyalpha1 = vec_splats(yalpha1);
-- const vector int16_t vuvalpha1 = vec_splats(uvalpha1);
-- const vector uint32_t shift19 = vec_splats(19U);
-+ vec_s16 vy1, vy2, vu, vv;
-+ vec_s32 tmp, tmp2, tmp3, tmp4, tmp5, tmp6;
-+ const vec_s16 vyalpha1 = vec_splats(yalpha1);
-+ const vec_s16 vuvalpha1 = vec_splats(uvalpha1);
-+ const vec_u32 shift19 = vec_splats(19U);
- int i;
- av_assert2(yalpha <= 4096U);
- av_assert2(uvalpha <= 4096U);
-@@ -1568,11 +1568,11 @@ yuv2422_1_vsx_template(SwsContext *c, const int16_t *buf0,
- int uvalpha, int y, enum AVPixelFormat target)
- {
- const int16_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
-- vector int16_t vy1, vy2, vu, vv, tmp;
-- const vector int16_t add64 = vec_splats((int16_t) 64);
-- const vector int16_t add128 = vec_splats((int16_t) 128);
-- const vector uint16_t shift7 = vec_splat_u16(7);
-- const vector uint16_t shift8 = vec_splat_u16(8);
-+ vec_s16 vy1, vy2, vu, vv, tmp;
-+ const vec_s16 add64 = vec_splats((int16_t) 64);
-+ const vec_s16 add128 = vec_splats((int16_t) 128);
-+ const vec_u16 shift7 = vec_splat_u16(7);
-+ const vec_u16 shift8 = vec_splat_u16(8);
- int i;
-
- if (uvalpha < 2048) {
-@@ -1666,18 +1666,18 @@ static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth,
- {
- int i;
- unsigned int xpos = 0, xx;
-- vector uint8_t vin, vin2, vperm;
-- vector int8_t vmul, valpha;
-- vector int16_t vtmp, vtmp2, vtmp3, vtmp4;
-- vector uint16_t vd_l, vd_r, vcoord16[2];
-- vector uint32_t vcoord[4];
-- const vector uint32_t vadd = (vector uint32_t) {
-+ vec_u8 vin, vin2, vperm;
-+ vec_s8 vmul, valpha;
-+ vec_s16 vtmp, vtmp2, vtmp3, vtmp4;
-+ vec_u16 vd_l, vd_r, vcoord16[2];
-+ vec_u32 vcoord[4];
-+ const vec_u32 vadd = (vec_u32) {
- 0,
- xInc * 1,
- xInc * 2,
- xInc * 3,
- };
-- const vector uint16_t vadd16 = (vector uint16_t) { // Modulo math
-+ const vec_u16 vadd16 = (vec_u16) { // Modulo math
- 0,
- xInc * 1,
- xInc * 2,
-@@ -1687,10 +1687,10 @@ static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth,
- xInc * 6,
- xInc * 7,
- };
-- const vector uint32_t vshift16 = vec_splats((uint32_t) 16);
-- const vector uint16_t vshift9 = vec_splat_u16(9);
-- const vector uint8_t vzero = vec_splat_u8(0);
-- const vector uint16_t vshift = vec_splat_u16(7);
-+ const vec_u32 vshift16 = vec_splats((uint32_t) 16);
-+ const vec_u16 vshift9 = vec_splat_u16(9);
-+ const vec_u8 vzero = vec_splat_u8(0);
-+ const vec_u16 vshift = vec_splat_u16(7);
-
- for (i = 0; i < dstWidth; i += 16) {
- vcoord16[0] = vec_splats((uint16_t) xpos);
-@@ -1701,7 +1701,7 @@ static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth,
-
- vcoord16[0] = vec_sr(vcoord16[0], vshift9);
- vcoord16[1] = vec_sr(vcoord16[1], vshift9);
-- valpha = (vector int8_t) vec_pack(vcoord16[0], vcoord16[1]);
-+ valpha = (vec_s8) vec_pack(vcoord16[0], vcoord16[1]);
-
- xx = xpos >> 16;
- vin = vec_vsx_ld(0, &src[xx]);
-@@ -1730,22 +1730,22 @@ static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth,
- vin2 = vec_vsx_ld(1, &src[xx]);
- vin2 = vec_perm(vin2, vin2, vperm);
-
-- vmul = (vector int8_t) vec_sub(vin2, vin);
-+ vmul = (vec_s8) vec_sub(vin2, vin);
- vtmp = vec_mule(vmul, valpha);
- vtmp2 = vec_mulo(vmul, valpha);
- vtmp3 = vec_mergeh(vtmp, vtmp2);
- vtmp4 = vec_mergel(vtmp, vtmp2);
-
-- vd_l = (vector uint16_t) vec_mergeh(vin, vzero);
-- vd_r = (vector uint16_t) vec_mergel(vin, vzero);
-+ vd_l = (vec_u16) vec_mergeh(vin, vzero);
-+ vd_r = (vec_u16) vec_mergel(vin, vzero);
- vd_l = vec_sl(vd_l, vshift);
- vd_r = vec_sl(vd_r, vshift);
-
-- vd_l = vec_add(vd_l, (vector uint16_t) vtmp3);
-- vd_r = vec_add(vd_r, (vector uint16_t) vtmp4);
-+ vd_l = vec_add(vd_l, (vec_u16) vtmp3);
-+ vd_r = vec_add(vd_r, (vec_u16) vtmp4);
-
-- vec_st((vector int16_t) vd_l, 0, &dst[i]);
-- vec_st((vector int16_t) vd_r, 0, &dst[i + 8]);
-+ vec_st((vec_s16) vd_l, 0, &dst[i]);
-+ vec_st((vec_s16) vd_r, 0, &dst[i + 8]);
-
- xpos += xInc * 16;
- }
-@@ -1773,8 +1773,8 @@ static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth,
- vd_l = vec_add(vd_l, vtmp3); \
- vd_r = vec_add(vd_r, vtmp4); \
- \
-- vec_st((vector int16_t) vd_l, 0, &out[i]); \
-- vec_st((vector int16_t) vd_r, 0, &out[i + 8])
-+ vec_st((vec_s16) vd_l, 0, &out[i]); \
-+ vec_st((vec_s16) vd_r, 0, &out[i + 8])
-
- static void hcscale_fast_vsx(SwsContext *c, int16_t *dst1, int16_t *dst2,
- int dstWidth, const uint8_t *src1,
-@@ -1782,19 +1782,19 @@ static void hcscale_fast_vsx(SwsContext *c, int16_t *dst1, int16_t *dst2,
- {
- int i;
- unsigned int xpos = 0, xx;
-- vector uint8_t vin, vin2, vperm;
-- vector uint8_t valpha, valphaxor;
-- vector uint16_t vtmp, vtmp2, vtmp3, vtmp4;
-- vector uint16_t vd_l, vd_r, vcoord16[2];
-- vector uint32_t vcoord[4];
-- const vector uint8_t vxor = vec_splats((uint8_t) 127);
-- const vector uint32_t vadd = (vector uint32_t) {
-+ vec_u8 vin, vin2, vperm;
-+ vec_u8 valpha, valphaxor;
-+ vec_u16 vtmp, vtmp2, vtmp3, vtmp4;
-+ vec_u16 vd_l, vd_r, vcoord16[2];
-+ vec_u32 vcoord[4];
-+ const vec_u8 vxor = vec_splats((uint8_t) 127);
-+ const vec_u32 vadd = (vec_u32) {
- 0,
- xInc * 1,
- xInc * 2,
- xInc * 3,
- };
-- const vector uint16_t vadd16 = (vector uint16_t) { // Modulo math
-+ const vec_u16 vadd16 = (vec_u16) { // Modulo math
- 0,
- xInc * 1,
- xInc * 2,
-@@ -1804,8 +1804,8 @@ static void hcscale_fast_vsx(SwsContext *c, int16_t *dst1, int16_t *dst2,
- xInc * 6,
- xInc * 7,
- };
-- const vector uint32_t vshift16 = vec_splats((uint32_t) 16);
-- const vector uint16_t vshift9 = vec_splat_u16(9);
-+ const vec_u32 vshift16 = vec_splats((uint32_t) 16);
-+ const vec_u16 vshift9 = vec_splat_u16(9);
-
- for (i = 0; i < dstWidth; i += 16) {
- vcoord16[0] = vec_splats((uint16_t) xpos);
-@@ -1859,29 +1859,29 @@ static void hScale8To19_vsx(SwsContext *c, int16_t *_dst, int dstW,
- {
- int i, j;
- int32_t *dst = (int32_t *) _dst;
-- vector int16_t vfilter, vin;
-- vector uint8_t vin8;
-- vector int32_t vout;
-- const vector uint8_t vzero = vec_splat_u8(0);
-- const vector uint8_t vunusedtab[8] = {
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-- (vector uint8_t) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
-+ vec_s16 vfilter, vin;
-+ vec_u8 vin8;
-+ vec_s32 vout;
-+ const vec_u8 vzero = vec_splat_u8(0);
-+ const vec_u8 vunusedtab[8] = {
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-+ (vec_u8) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
- };
-- const vector uint8_t vunused = vunusedtab[filterSize % 8];
-+ const vec_u8 vunused = vunusedtab[filterSize % 8];
-
- if (filterSize == 1) {
- for (i = 0; i < dstW; i++) {
-@@ -1898,14 +1898,14 @@ static void hScale8To19_vsx(SwsContext *c, int16_t *_dst, int dstW,
- vout = vec_splat_s32(0);
- for (j = 0; j < filterSize; j += 8) {
- vin8 = vec_vsx_ld(0, &src[srcPos + j]);
-- vin = (vector int16_t) vec_mergeh(vin8, vzero);
-+ vin = (vec_s16) vec_mergeh(vin8, vzero);
- if (j + 8 > filterSize) // Remove the unused elements on the last round
-- vin = vec_perm(vin, (vector int16_t) vzero, vunused);
-+ vin = vec_perm(vin, (vec_s16) vzero, vunused);
-
- vfilter = vec_vsx_ld(0, &filter[filterSize * i + j]);
- vout = vec_msums(vin, vfilter, vout);
- }
-- vout = vec_sums(vout, (vector int32_t) vzero);
-+ vout = vec_sums(vout, (vec_s32) vzero);
- dst[i] = FFMIN(vout[3] >> 3, (1 << 19) - 1);
- }
- }
-@@ -1921,28 +1921,28 @@ static void hScale16To19_vsx(SwsContext *c, int16_t *_dst, int dstW,
- const uint16_t *src = (const uint16_t *) _src;
- int bits = desc->comp[0].depth - 1;
- int sh = bits - 4;
-- vector int16_t vfilter, vin;
-- vector int32_t vout, vtmp, vtmp2, vfilter32_l, vfilter32_r;
-- const vector uint8_t vzero = vec_splat_u8(0);
-- const vector uint8_t vunusedtab[8] = {
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-- (vector uint8_t) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
-+ vec_s16 vfilter, vin;
-+ vec_s32 vout, vtmp, vtmp2, vfilter32_l, vfilter32_r;
-+ const vec_u8 vzero = vec_splat_u8(0);
-+ const vec_u8 vunusedtab[8] = {
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-+ (vec_u8) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
- };
-- const vector uint8_t vunused = vunusedtab[filterSize % 8];
-+ const vec_u8 vunused = vunusedtab[filterSize % 8];
-
- if ((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth<16) {
- sh = 9;
-@@ -1966,16 +1966,16 @@ static void hScale16To19_vsx(SwsContext *c, int16_t *_dst, int dstW,
- const int srcPos = filterPos[i];
- vout = vec_splat_s32(0);
- for (j = 0; j < filterSize; j += 8) {
-- vin = (vector int16_t) vec_vsx_ld(0, &src[srcPos + j]);
-+ vin = (vec_s16) vec_vsx_ld(0, &src[srcPos + j]);
- if (j + 8 > filterSize) // Remove the unused elements on the last round
-- vin = vec_perm(vin, (vector int16_t) vzero, vunused);
-+ vin = vec_perm(vin, (vec_s16) vzero, vunused);
-
- vfilter = vec_vsx_ld(0, &filter[filterSize * i + j]);
- vfilter32_l = vec_unpackh(vfilter);
- vfilter32_r = vec_unpackl(vfilter);
-
-- vtmp = (vector int32_t) vec_mergeh(vin, (vector int16_t) vzero);
-- vtmp2 = (vector int32_t) vec_mergel(vin, (vector int16_t) vzero);
-+ vtmp = (vec_s32) vec_mergeh(vin, (vec_s16) vzero);
-+ vtmp2 = (vec_s32) vec_mergel(vin, (vec_s16) vzero);
-
- vtmp = vec_mul(vtmp, vfilter32_l);
- vtmp2 = vec_mul(vtmp2, vfilter32_r);
-@@ -1983,7 +1983,7 @@ static void hScale16To19_vsx(SwsContext *c, int16_t *_dst, int dstW,
- vout = vec_adds(vout, vtmp);
- vout = vec_adds(vout, vtmp2);
- }
-- vout = vec_sums(vout, (vector int32_t) vzero);
-+ vout = vec_sums(vout, (vec_s32) vzero);
- dst[i] = FFMIN(vout[3] >> sh, (1 << 19) - 1);
- }
- }
-@@ -1997,28 +1997,28 @@ static void hScale16To15_vsx(SwsContext *c, int16_t *dst, int dstW,
- int i, j;
- const uint16_t *src = (const uint16_t *) _src;
- int sh = desc->comp[0].depth - 1;
-- vector int16_t vfilter, vin;
-- vector int32_t vout, vtmp, vtmp2, vfilter32_l, vfilter32_r;
-- const vector uint8_t vzero = vec_splat_u8(0);
-- const vector uint8_t vunusedtab[8] = {
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-- (vector uint8_t) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-- (vector uint8_t) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-- 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
-+ vec_s16 vfilter, vin;
-+ vec_s32 vout, vtmp, vtmp2, vfilter32_l, vfilter32_r;
-+ const vec_u8 vzero = vec_splat_u8(0);
-+ const vec_u8 vunusedtab[8] = {
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf},
-+ (vec_u8) {0x0, 0x1, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0x10, 0x10, 0x10, 0x10},
-+ (vec_u8) {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
-+ 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0x10, 0x10},
- };
-- const vector uint8_t vunused = vunusedtab[filterSize % 8];
-+ const vec_u8 vunused = vunusedtab[filterSize % 8];
-
- if (sh<15) {
- sh = isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : (desc->comp[0].depth - 1);
-@@ -2042,16 +2042,16 @@ static void hScale16To15_vsx(SwsContext *c, int16_t *dst, int dstW,
- const int srcPos = filterPos[i];
- vout = vec_splat_s32(0);
- for (j = 0; j < filterSize; j += 8) {
-- vin = (vector int16_t) vec_vsx_ld(0, &src[srcPos + j]);
-+ vin = (vec_s16) vec_vsx_ld(0, &src[srcPos + j]);
- if (j + 8 > filterSize) // Remove the unused elements on the last round
-- vin = vec_perm(vin, (vector int16_t) vzero, vunused);
-+ vin = vec_perm(vin, (vec_s16) vzero, vunused);
-
- vfilter = vec_vsx_ld(0, &filter[filterSize * i + j]);
- vfilter32_l = vec_unpackh(vfilter);
- vfilter32_r = vec_unpackl(vfilter);
-
-- vtmp = (vector int32_t) vec_mergeh(vin, (vector int16_t) vzero);
-- vtmp2 = (vector int32_t) vec_mergel(vin, (vector int16_t) vzero);
-+ vtmp = (vec_s32) vec_mergeh(vin, (vec_s16) vzero);
-+ vtmp2 = (vec_s32) vec_mergel(vin, (vec_s16) vzero);
-
- vtmp = vec_mul(vtmp, vfilter32_l);
- vtmp2 = vec_mul(vtmp2, vfilter32_r);
-@@ -2059,7 +2059,7 @@ static void hScale16To15_vsx(SwsContext *c, int16_t *dst, int dstW,
- vout = vec_adds(vout, vtmp);
- vout = vec_adds(vout, vtmp2);
- }
-- vout = vec_sums(vout, (vector int32_t) vzero);
-+ vout = vec_sums(vout, (vec_s32) vzero);
- dst[i] = FFMIN(vout[3] >> sh, (1 << 15) - 1);
- }
- }
diff --git a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
deleted file mode 100644
index 4fb336e67c57..000000000000
--- a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
+++ /dev/null
@@ -1,15 +0,0 @@
---- contrib/ffmpeg/module.defs.orig 2020-06-13 14:05:35 UTC
-+++ contrib/ffmpeg/module.defs
-@@ -57,10 +57,11 @@ FFMPEG.CONFIGURE.extra = \
- --disable-decoder=*_crystalhd \
- --enable-libdav1d \
- --enable-decoder=libdav1d \
-+ --pkg-config-flags=--static \
- --cc="$(FFMPEG.GCC.gcc)" \
- --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
-
--ifeq (1-linux,$(FEATURE.qsv)-$(HOST.system))
-+ifneq (,$(filter $(FEATURE.qsv)-$(HOST.system),1-linux 1-freebsd))
- FFMPEG.CONFIGURE.extra += --enable-vaapi
- FFMPEG.CONFIGURE.extra += --disable-xlib
- else
diff --git a/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs b/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs
index 099916f2e28d..a73eb577e907 100644
--- a/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs
+++ b/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs
@@ -1,13 +1,13 @@
---- contrib/x265_10bit/module.defs.orig 2018-06-17 04:23:34 UTC
+--- contrib/x265_10bit/module.defs.orig 2020-01-25 15:34:39 UTC
+++ contrib/x265_10bit/module.defs
@@ -19,6 +19,10 @@ X265_10.CONFIGURE.static =
X265_10.CONFIGURE.shared = -DENABLE_SHARED=OFF
- X265_10.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF
+ X265_10.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF
+ifneq (x86_64,$(BUILD.machine))
+ X265_10.CONFIGURE.extra += -DENABLE_ASSEMBLY=0
+endif
+
- ifneq (none,$(X265_10.GCC.g))
- X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
- else
+ ifneq (1,$(FEATURE.numa))
+ X265_10.CONFIGURE.extra += -DENABLE_LIBNUMA=OFF
+ endif
diff --git a/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs b/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs
index 5508be6e8442..2ba4e68fd2a1 100644
--- a/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs
+++ b/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs
@@ -1,13 +1,13 @@
---- contrib/x265_12bit/module.defs.orig 2018-06-17 04:23:34 UTC
+--- contrib/x265_12bit/module.defs.orig 2020-01-25 15:34:39 UTC
+++ contrib/x265_12bit/module.defs
@@ -19,6 +19,10 @@ X265_12.CONFIGURE.static =
X265_12.CONFIGURE.shared = -DENABLE_SHARED=OFF
- X265_12.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF -DMAIN12=ON
+ X265_12.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DMAIN12=ON
+ifneq (x86_64,$(BUILD.machine))
+ X265_12.CONFIGURE.extra += -DENABLE_ASSEMBLY=0
+endif
+
- ifneq (none,$(X265_12.GCC.g))
- X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
- else
+ ifneq (1,$(FEATURE.numa))
+ X265_12.CONFIGURE.extra += -DENABLE_LIBNUMA=OFF
+ endif
diff --git a/multimedia/handbrake/files/patch-gtk_configure.ac b/multimedia/handbrake/files/patch-gtk_configure.ac
deleted file mode 100644
index 82ad9f6dc410..000000000000
--- a/multimedia/handbrake/files/patch-gtk_configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/configure.ac.orig 2019-11-09 20:44:32 UTC
-+++ gtk/configure.ac
-@@ -227,6 +227,9 @@ case $host in
- ;;
- *-*-freebsd*)
- HB_LIBS="$HB_LIBS -lpthread"
-+ if test "x$use_qsv" = "xyes" ; then
-+ HB_LIBS="$HB_LIBS -lva -lva-drm"
-+ fi
- ;;
- *-*-netbsd*)
- HB_LIBS="$HB_LIBS -pthread"
diff --git a/multimedia/handbrake/files/patch-libhb_handbrake_ports.h b/multimedia/handbrake/files/patch-libhb_handbrake_ports.h
deleted file mode 100644
index d80ad280daaf..000000000000
--- a/multimedia/handbrake/files/patch-libhb_handbrake_ports.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- libhb/handbrake/ports.h.orig 2019-11-09 20:44:32 UTC
-+++ libhb/handbrake/ports.h
-@@ -28,7 +28,7 @@
-
- #if HB_PROJECT_FEATURE_QSV
- #include "mfx/mfxstructures.h"
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
- #include <va/va_drm.h>
- #endif
- #endif
-@@ -36,9 +36,9 @@
- /************************************************************************
- * HW accel display
- ***********************************************************************/
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
- extern const char* DRM_INTEL_DRIVER_NAME;
--#endif // SYS_LINUX
-+#endif // SYS_LINUX || SYS_FREEBSD
-
- typedef struct
- {
-@@ -46,10 +46,10 @@ typedef struct
- #if HB_PROJECT_FEATURE_QSV
- mfxHandleType mfxType;
-
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
- int vaFd;
- VADisplay vaDisplay;
--#endif // SYS_LINUX
-+#endif // SYS_LINUX || SYS_FREEBSD
- #endif
- } hb_display_t;
-
diff --git a/multimedia/handbrake/files/patch-libhb_ports.c b/multimedia/handbrake/files/patch-libhb_ports.c
deleted file mode 100644
index 43b7a9e77fdf..000000000000
--- a/multimedia/handbrake/files/patch-libhb_ports.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- libhb/ports.c.orig 2019-11-09 20:44:32 UTC
-+++ libhb/ports.c
-@@ -28,7 +28,11 @@
- #if defined(SYS_DARWIN) || defined(SYS_FREEBSD)
- #include <sys/types.h>
- #include <sys/sysctl.h>
-+#if HB_PROJECT_FEATURE_QSV && defined(SYS_FREEBSD)
-+#include <libdrm/drm.h>
-+#include <fcntl.h>
- #endif
-+#endif
-
- #ifdef SYS_OPENBSD
- #include <sys/param.h>
-@@ -1518,7 +1522,7 @@ char * hb_strndup(const char * src, size_t len)
- }
-
- #if HB_PROJECT_FEATURE_QSV
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
-
- #define MAX_NODES 16
- #define DRI_RENDER_NODE_START 128
-@@ -1676,7 +1680,7 @@ void hb_display_close(hb_display_t ** _d)
- *_d = NULL;
- }
-
--#else // !SYS_LINUX
-+#else // !SYS_LINUX && !SYS_FREEBSD
-
- hb_display_t * hb_display_init(const char * driver_name,
- const char * const * interface_names)
-@@ -1689,7 +1693,7 @@ void hb_display_close(hb_display_t ** _d)
- (void)_d;
- }
-
--#endif // SYS_LINUX
-+#endif // SYS_LINUX || SYS_FREEBSD
- #else // !HB_PROJECT_FEATURE_QSV
-
- hb_display_t * hb_display_init(const char * driver_name,
diff --git a/multimedia/handbrake/files/patch-libhb_qsv__common.c b/multimedia/handbrake/files/patch-libhb_qsv__common.c
deleted file mode 100644
index 23e44bf827f3..000000000000
--- a/multimedia/handbrake/files/patch-libhb_qsv__common.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libhb/qsv_common.c.orig 2019-11-09 20:44:32 UTC
-+++ libhb/qsv_common.c
-@@ -678,7 +678,7 @@ int hb_qsv_info_init()
- */
- mfxSession session;
- mfxVersion version = { .Major = 1, .Minor = 0, };
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
- mfxIMPL hw_preference = MFX_IMPL_VIA_ANY;
- #else
- mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11;
-@@ -738,7 +738,7 @@ int hb_qsv_info_init()
- }
- else
- {
--#ifndef SYS_LINUX
-+#if !defined(SYS_LINUX) && !defined(SYS_FREEBSD)
- // Windows only: After D3D11 we will try D3D9
- if (hw_preference == MFX_IMPL_VIA_D3D11)
- hw_preference = MFX_IMPL_VIA_D3D9;
diff --git a/multimedia/handbrake/files/patch-make_configure.py b/multimedia/handbrake/files/patch-make_configure.py
deleted file mode 100644
index dfc888a7f0b8..000000000000
--- a/multimedia/handbrake/files/patch-make_configure.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- make/configure.py.orig 2019-11-09 20:44:32 UTC
-+++ make/configure.py
-@@ -1413,7 +1413,7 @@ def createCLI( cross = None ):
- grp.add_argument( '--enable-nvenc', dest="enable_nvenc", default=IfHost( True, '*-*-linux*', '*-*-mingw*', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
- grp.add_argument( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
-
-- h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-mingw*', none=argparse.SUPPRESS).value
-+ h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-freebsd*', '*-*-mingw*', none=argparse.SUPPRESS).value
- grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "*-*-mingw*", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
- grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
-
-@@ -1684,7 +1684,7 @@ try:
- none=False).value
- and options.enable_x265)
- # Disable QSV on unsupported platforms
-- options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*',
-+ options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*', '*-*-freebsd*',
- '*-*-mingw*', none=False).value
- # Disable VCE on unsupported platforms
- options.enable_vce = IfHost(options.enable_vce, '*-*-linux*', '*-*-mingw*',
-@@ -2124,7 +2124,7 @@ int main()
- stdout.write( 'Enable NVENC: %s' % options.enable_nvenc )
- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
- stdout.write( 'Enable QSV: %s' % options.enable_qsv )
-- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
-+ stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'freebsd' or host_tuple.system == 'mingw') else stdout.write( '\n' )
- stdout.write( 'Enable VCE: %s' % options.enable_vce )
- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
-
diff --git a/multimedia/handbrake/files/patch-make_include_main.defs b/multimedia/handbrake/files/patch-make_include_main.defs
deleted file mode 100644
index 76608653f9a3..000000000000
--- a/multimedia/handbrake/files/patch-make_include_main.defs
+++ /dev/null
@@ -1,12 +0,0 @@
---- make/include/main.defs.orig 2019-11-09 20:44:32 UTC
-+++ make/include/main.defs
-@@ -53,7 +53,9 @@ MODULES += contrib/libdvdnav
- MODULES += contrib/libbluray
-
- ifeq (1,$(FEATURE.qsv))
-+ifeq (,$(filter $(HOST.system),freebsd))
- MODULES += contrib/libmfx
-+endif
- endif
-
- ifeq (1,$(FEATURE.vce))
diff --git a/multimedia/handbrake/files/patch-test_module.defs b/multimedia/handbrake/files/patch-test_module.defs
deleted file mode 100644
index 165c0a34b957..000000000000
--- a/multimedia/handbrake/files/patch-test_module.defs
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/module.defs.orig 2019-11-09 20:44:32 UTC
-+++ test/module.defs
-@@ -25,7 +25,7 @@ endif
-
- ifeq (1,$(FEATURE.qsv))
- TEST.GCC.l += mfx
--ifeq ($(HOST.system),linux)
-+ifneq (,$(filter $(HOST.system),linux freebsd))
- TEST.GCC.l += va va-drm
- endif
- endif
diff --git a/multimedia/handbrake/files/version.txt b/multimedia/handbrake/files/version.txt
index 802e70a974c3..ed8b7e1fe742 100644
--- a/multimedia/handbrake/files/version.txt
+++ b/multimedia/handbrake/files/version.txt
@@ -1,9 +1,9 @@
URL=https://github.com/HandBrake/HandBrake.git
-HASH=012a0f15dfab1383899a6a04f7c84a336b578d70
-SHORTHASH=012a0f15d
-TAG=1.3.3
-TAG_HASH=012a0f15dfab1383899a6a04f7c84a336b578d70
+HASH=a91adfa02ce544c84aa34e758b85f0967d005aa7
+SHORTHASH=a91adfa02
+TAG=1.3.2
+TAG_HASH=a91adfa02ce544c84aa34e758b85f0967d005aa7
REV=0
BRANCH=
REMOTE=https://github.com/HandBrake/HandBrake.git
-DATE=2020-06-13 15:05:35 +0100
+DATE=2020-05-03 12:12:08 -0400
diff --git a/multimedia/handbrake/pkg-plist b/multimedia/handbrake/pkg-plist
index a971448fc567..38d53da426cb 100644
--- a/multimedia/handbrake/pkg-plist
+++ b/multimedia/handbrake/pkg-plist
@@ -11,6 +11,7 @@ bin/HandBrakeCLI
%%X11%%share/locale/es/LC_MESSAGES/ghb.mo
%%X11%%share/locale/eu/LC_MESSAGES/ghb.mo
%%X11%%share/locale/fr/LC_MESSAGES/ghb.mo
+%%X11%%share/locale/he/LC_MESSAGES/ghb.mo
%%X11%%share/locale/hr/LC_MESSAGES/ghb.mo
%%X11%%share/locale/it/LC_MESSAGES/ghb.mo
%%X11%%share/locale/ja/LC_MESSAGES/ghb.mo
@@ -22,10 +23,13 @@ bin/HandBrakeCLI
%%X11%%share/locale/pt_BR/LC_MESSAGES/ghb.mo
%%X11%%share/locale/ro/LC_MESSAGES/ghb.mo
%%X11%%share/locale/ru/LC_MESSAGES/ghb.mo
+%%X11%%share/locale/si/LC_MESSAGES/ghb.mo
%%X11%%share/locale/sk/LC_MESSAGES/ghb.mo
+%%X11%%share/locale/sl_SI/LC_MESSAGES/ghb.mo
%%X11%%share/locale/sv/LC_MESSAGES/ghb.mo
%%X11%%share/locale/th/LC_MESSAGES/ghb.mo
%%X11%%share/locale/tr/LC_MESSAGES/ghb.mo
%%X11%%share/locale/uk_UA/LC_MESSAGES/ghb.mo
%%X11%%share/locale/zh_CN/LC_MESSAGES/ghb.mo
+%%X11%%share/locale/zh_TW/LC_MESSAGES/ghb.mo
%%X11%%share/metainfo/fr.handbrake.ghb.metainfo.xml
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 10:33:45 +0000