aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-04-09 00:11:21 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-04-09 04:11:45 +0000
commit5c912cad250ad74e51a450ca5e07a7ad12cf5348 (patch)
treedfaa35df0d316f757f5173a99145647e1ccebfa4
parent8c878c223f274c5b8c4c673585e4ba3b1ff05c80 (diff)
downloadaports-5c912cad250ad74e51a450ca5e07a7ad12cf5348.tar.gz
aports-5c912cad250ad74e51a450ca5e07a7ad12cf5348.tar.bz2
aports-5c912cad250ad74e51a450ca5e07a7ad12cf5348.tar.xz
community/ffmpeg: upgrade to 4.4
-rw-r--r--community/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch83
-rw-r--r--community/ffmpeg/APKBUILD10
2 files changed, 4 insertions, 89 deletions
diff --git a/community/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/community/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch
deleted file mode 100644
index 86f55882f0..0000000000
--- a/community/ffmpeg/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 <dev@lynne.ee>
-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
---- a/libswscale/aarch64/swscale_unscaled.c
-+++ b/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
---- a/libswscale/aarch64/yuv2rgb_neon.S
-+++ b/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/community/ffmpeg/APKBUILD b/community/ffmpeg/APKBUILD
index 4ac7858261..a7a1d806e2 100644
--- a/community/ffmpeg/APKBUILD
+++ b/community/ffmpeg/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ffmpeg
-pkgver=4.3.2
-pkgrel=1
+pkgver=4.4
+pkgrel=0
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="https://ffmpeg.org/"
arch="all"
@@ -45,7 +45,6 @@ makedepends="
checkdepends="rsync"
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
- 3e098cca6e51db0f19928c12d0348deaa17137b3.patch
"
# secfixes:
@@ -192,6 +191,5 @@ libs() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
}
-sha512sums="c85e2ecdd397389da2d7ab9e0d1fa23994931d4ad171a551b0d4863154d7daf42e51de747ec5c6d939ebd668817099bbbd272fa709f20093000376e26597becf ffmpeg-4.3.2.tar.xz
-1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
-7151e98829c215619b82e27fdff98b9a0d6a778f499170f3688e111a8bf7b2cc8895f09aa49bcb812ba5b5f06dd0243ebc79c31af246420f7d0869859b4a0241 3e098cca6e51db0f19928c12d0348deaa17137b3.patch"
+sha512sums="4f9e99958904bf1b99b4b17e2104729dfe67e0080cac525137597974597ff265c9847eb1be0771aa443c85691025bc0747d213e6c1281f7b67d18d8b0e8c5080 ffmpeg-4.4.tar.xz
+1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"