From e53771be5016073794f32a10cf7a27198cd0ee49 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 26 Feb 2020 01:56:49 +0000
Subject: user/ffmpeg: Bump to 4.2.2

---
 user/ffmpeg/APKBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'user/ffmpeg')

diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index c3537f5fe..b6de0597c 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -3,21 +3,22 @@
 # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ffmpeg
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=0
 pkgdesc="Record, convert, and stream audio and video"
 url="https://ffmpeg.org/"
 arch="all"
-license="GPL-2.0-only"
 options="!check textrels"  # Test suite requires proper licensing headers on all files,
 			   # which upstream does not provide.
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+license="GPL-2.0-only"
+depends=""
 makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev
 	ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev
 	libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev
 	libxfixes-dev opus-dev perl-dev pulseaudio-dev sdl2-dev
 	speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev
 	xz-dev yasm zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
 	0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
 	"
@@ -38,7 +39,7 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
 #     - CVE-2017-14225
 
 build() {
-	local _asm=""
+	_asm=""
 
 	case "$CARCH" in
 	ppc64) _asm="--cpu=G5" ;;
@@ -96,5 +97,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b  ffmpeg-4.2.1.tar.xz
+sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3  ffmpeg-4.2.2.tar.xz
 1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
-- 
cgit v1.2.3-70-g09d2