From 3d2dec8e6d6fc2b134dc92bfab69afe2adbf1336 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Mon, 14 Sep 2020 03:58:30 +0200 Subject: [PATCH] Build non-free binary with fdk-aac support. --- ...util-clean-up-unused-FF_SYMVER-macro.patch | 0 .../{ffmpeg => ffmpeg-serverkomplex}/APKBUILD | 20 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) rename community/{ffmpeg => ffmpeg-serverkomplex}/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch (100%) rename community/{ffmpeg => ffmpeg-serverkomplex}/APKBUILD (93%) diff --git a/community/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/community/ffmpeg-serverkomplex/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch similarity index 100% rename from community/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch rename to community/ffmpeg-serverkomplex/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch diff --git a/community/ffmpeg/APKBUILD b/community/ffmpeg-serverkomplex/APKBUILD similarity index 93% rename from community/ffmpeg/APKBUILD rename to community/ffmpeg-serverkomplex/APKBUILD index 601dd210..32cb9372 100644 --- a/community/ffmpeg/APKBUILD +++ b/community/ffmpeg-serverkomplex/APKBUILD @@ -4,3 +4,3 @@ # Maintainer: Natanael Copa -pkgname=ffmpeg +pkgname=ffmpeg-serverkomplex pkgver=4.3.1 @@ -10,3 +10,3 @@ url="https://ffmpeg.org/" arch="all" -license="GPL-2.0-or-later AND LGPL-2.1-or-later" +license="GPL-2.0-or-later AND LGPL-2.1-or-later AND non-free" options="!check" # tests/data/hls-lists.append.m3u8 fails @@ -38,2 +38,3 @@ makedepends=" dav1d-dev + fdk-aac-dev " @@ -143,2 +144,4 @@ build() { --enable-libdav1d \ + --enable-nonfree \ + --enable-libfdk-aac \ --enable-postproc \ @@ -171,2 +174,3 @@ check() { package() { + provides="ffmpeg" make DESTDIR="$pkgdir" install install-man @@ -176,5 +180,10 @@ package() { +prepare() { + mv ffmpeg-*/ "${builddir}" +} + libs() { pkgdesc="Libraries for ffmpeg" - replaces="ffmpeg" + replaces="ffmpeg-serverkomplex" + provides="ffmpeg-libs" mkdir -p "$subpkgdir"/usr @@ -183,2 +192,7 @@ libs() { +dev() { + provides="ffmpeg-dev" + default_dev +} + sha512sums="64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f ffmpeg-4.3.1.tar.xz -- 2.28.0