From b22f63da971bf9019759d1ed713f64c824f925a8 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:51:15 +0200 Subject: [PATCH 1/2] ffmpeg: update to 4.4. --- ...070d9b092d3a354a6963c65197054ddf7a75.patch | 41 --------- ...8cca6e51db0f19928c12d0348deaa17137b3.patch | 83 ------------------- srcpkgs/ffmpeg/template | 4 +- 3 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch delete mode 100644 srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch diff --git a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch deleted file mode 100644 index 621aba392fb6..000000000000 --- a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2687070d9b092d3a354a6963c65197054ddf7a75 Mon Sep 17 00:00:00 2001 -From: Carl Eugen Hoyos -Date: Sat, 23 Jan 2021 19:33:13 +0100 -Subject: [PATCH] lsws/ppc/yuv2rgb: Fix transparency converting from - yuv->rgb32. -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Based on 68363b69 by Reimar Döffinger. - -Fixes ticket #9077. ---- - libswscale/ppc/yuv2rgb_altivec.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c -index 58e480dd2c..4f5382e4c1 100644 ---- libswscale/ppc/yuv2rgb_altivec.c -+++ libswscale/ppc/yuv2rgb_altivec.c -@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ - } - - #define out_abgr(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr) -+ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), c, b, a, ptr) - #define out_bgra(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr) -+ vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr) - #define out_rgba(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr) -+ vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr) - #define out_argb(a, b, c, ptr) \ -- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr) -+ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), a, b, c, ptr) - #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr) - #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr) - --- -2.20.1 - diff --git a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch deleted file mode 100644 index b50385a0c8f4..000000000000 --- a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3 -From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001 -From: Lynne -Date: Tue, 7 Jul 2020 16:01:58 +0100 -Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value - -We return 0 for this particular architecture but should instead be -returning the number of lines. -Fixes users who check the return value matches what they expect. ---- - libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++--------------- - libswscale/aarch64/yuv2rgb_neon.S | 2 ++ - 2 files changed, 16 insertions(+), 17 deletions(-) - -diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c -index 551daad9e353..c7a2a1037df8 100644 ---- libswscale/aarch64/swscale_unscaled.c -+++ libswscale/aarch64/swscale_unscaled.c -@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], \ -- src[1], srcStride[1], \ -- src[2], srcStride[2], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], \ -+ src[1], srcStride[1], \ -+ src[2], srcStride[2], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \ -@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], src[1], srcStride[1], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], src[1], srcStride[1], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \ -diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S -index b7446aa10511..f4b220fb608e 100644 ---- libswscale/aarch64/yuv2rgb_neon.S -+++ libswscale/aarch64/yuv2rgb_neon.S -@@ -142,6 +142,7 @@ - .macro declare_func ifmt ofmt - function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - load_args_\ifmt -+ mov w9, w1 - 1: - mov w8, w0 // w8 = width - 2: -@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - increment_\ifmt - subs w1, w1, #1 // height -= 1 - b.gt 1b -+ mov w0, w9 - ret - endfunc - .endm diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 76c9423d02fe..3112157bdd3f 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg -version=4.3.2 +version=4.4 revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Johannes " @@ -9,7 +9,7 @@ license="GPL-3.0-or-later" homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb +checksum=06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel From 8d767687ecc78a3435d2c66d7a357cbc0eaeba4f Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Thu, 29 Apr 2021 12:49:19 +0200 Subject: [PATCH 2/2] ffmpeg: make jack support a conditional build option --- srcpkgs/ffmpeg/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 3112157bdd3f..30c3a6f695d3 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg version=4.4 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Johannes " license="GPL-3.0-or-later" @@ -14,7 +14,7 @@ checksum=06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel - gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel + gnutls-devel libvorbis-devel x264-devel xvidcore-devel SDL2-devel libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel) @@ -23,11 +23,12 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel) $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel) $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel) - $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)" + $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel) + $(vopt_if jack jack-devel)" build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio - dav1d zimg webp sofa" -build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp" + dav1d zimg webp sofa jack" +build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp jack" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";; @@ -85,7 +86,7 @@ do_configure() { --enable-shared --enable-static --enable-libxcb \ $(vopt_enable pulseaudio libpulse) --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ - --enable-libopus --enable-librtmp --enable-libjack $(vopt_enable nvenc) \ + --enable-libopus --enable-librtmp $(vopt_enable nvenc) \ $(vopt_if faac '--enable-nonfree --enable-libfaac') \ $(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \ --disable-libopencore_amrnb --disable-libopencore_amrwb \ @@ -98,7 +99,8 @@ do_configure() { $(vopt_if dav1d '--enable-libdav1d') \ $(vopt_if zimg '--enable-libzimg') \ $(vopt_if webp '--enable-libwebp') \ - $(vopt_if sofa '--enable-libmysofa') + $(vopt_if sofa '--enable-libmysofa') \ + $(vopt_if jack '--enable-jack') } do_build() { make ${makejobs}