113 lines
4.2 KiB
Diff
113 lines
4.2 KiB
Diff
|
From 3f7a41c28220ae6aa0ade50873399c94dd1a97c0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Carl Kittelberger <icedream@icedream.pw>
|
||
|
|
Date: Tue, 10 Jan 2023 09:27:50 +0100
|
||
|
|
Subject: [PATCH] Build non-free binary with fdk-aac support.
|
||
|
|
|
||
|
|
---
|
||
|
|
...01-ffbuild-libversion.sh-add-shebang.patch | 0
|
||
|
|
...util-clean-up-unused-FF_SYMVER-macro.patch | 0
|
||
|
|
.../{ffmpeg => ffmpeg-serverkomplex}/APKBUILD | 20 ++++++++++++++++---
|
||
|
|
...av_stream_get_first_dts-for-chromium.patch | 0
|
||
|
|
.../flto-auto.patch | 0
|
||
|
|
5 files changed, 17 insertions(+), 3 deletions(-)
|
||
|
|
rename community/{ffmpeg => ffmpeg-serverkomplex}/0001-ffbuild-libversion.sh-add-shebang.patch (100%)
|
||
|
|
rename community/{ffmpeg => ffmpeg-serverkomplex}/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch (100%)
|
||
|
|
rename community/{ffmpeg => ffmpeg-serverkomplex}/APKBUILD (94%)
|
||
|
|
rename community/{ffmpeg => ffmpeg-serverkomplex}/add-av_stream_get_first_dts-for-chromium.patch (100%)
|
||
|
|
rename community/{ffmpeg => ffmpeg-serverkomplex}/flto-auto.patch (100%)
|
||
|
|
|
||
|
|
diff --git a/community/ffmpeg/0001-ffbuild-libversion.sh-add-shebang.patch b/community/ffmpeg-serverkomplex/0001-ffbuild-libversion.sh-add-shebang.patch
|
||
|
|
similarity index 100%
|
||
|
|
rename from community/ffmpeg/0001-ffbuild-libversion.sh-add-shebang.patch
|
||
|
|
rename to community/ffmpeg-serverkomplex/0001-ffbuild-libversion.sh-add-shebang.patch
|
||
|
|
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 94%
|
||
|
|
rename from community/ffmpeg/APKBUILD
|
||
|
|
rename to community/ffmpeg-serverkomplex/APKBUILD
|
||
|
|
index d45301c1ef..068ed06ad9 100644
|
||
|
|
--- a/community/ffmpeg/APKBUILD
|
||
|
|
+++ b/community/ffmpeg-serverkomplex/APKBUILD
|
||
|
|
@@ -2,13 +2,13 @@
|
||
|
|
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
|
||
|
|
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
|
||
|
|
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||
|
|
-pkgname=ffmpeg
|
||
|
|
+pkgname=ffmpeg-serverkomplex
|
||
|
|
pkgver=5.1.2
|
||
|
|
pkgrel=1
|
||
|
|
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
|
||
|
|
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
|
||
|
|
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
|
||
|
|
makedepends="
|
||
|
|
@@ -17,6 +17,7 @@ makedepends="
|
||
|
|
bzip2-dev
|
||
|
|
coreutils
|
||
|
|
dav1d-dev
|
||
|
|
+ fdk-aac-dev
|
||
|
|
fontconfig-dev
|
||
|
|
freetype-dev
|
||
|
|
fribidi-dev
|
||
|
|
@@ -179,7 +180,9 @@ build() {
|
||
|
|
--enable-libfribidi \
|
||
|
|
--enable-gnutls \
|
||
|
|
--enable-gpl \
|
||
|
|
+ --enable-nonfree \
|
||
|
|
--enable-libass \
|
||
|
|
+ --enable-libfdk-aac\
|
||
|
|
--enable-libmp3lame \
|
||
|
|
--enable-libpulse \
|
||
|
|
--enable-libvorbis \
|
||
|
|
@@ -219,6 +222,15 @@ build() {
|
||
|
|
${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c
|
||
|
|
}
|
||
|
|
|
||
|
|
+prepare() {
|
||
|
|
+ mv ffmpeg-*/ "${builddir}"
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+dev() {
|
||
|
|
+ provides="ffmpeg-dev"
|
||
|
|
+ default_dev
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
# https://ffmpeg.org/fate.html
|
||
|
|
check() {
|
||
|
|
./configure \
|
||
|
|
@@ -229,6 +241,7 @@ check() {
|
||
|
|
}
|
||
|
|
|
||
|
|
package() {
|
||
|
|
+ provides="ffmpeg"
|
||
|
|
make DESTDIR="$pkgdir" install install-man
|
||
|
|
install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
|
||
|
|
# strip --strip-debug "$pkgdir"/usr/lib/*.a
|
||
|
|
@@ -236,7 +249,8 @@ package() {
|
||
|
|
|
||
|
|
libs() {
|
||
|
|
pkgdesc="Libraries for ffmpeg"
|
||
|
|
- replaces="ffmpeg"
|
||
|
|
+ replaces="ffmpeg-serverkomplex"
|
||
|
|
+ provides="ffmpeg-libs"
|
||
|
|
mkdir -p "$subpkgdir"/usr
|
||
|
|
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
|
||
|
|
}
|
||
|
|
diff --git a/community/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/community/ffmpeg-serverkomplex/add-av_stream_get_first_dts-for-chromium.patch
|
||
|
|
similarity index 100%
|
||
|
|
rename from community/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch
|
||
|
|
rename to community/ffmpeg-serverkomplex/add-av_stream_get_first_dts-for-chromium.patch
|
||
|
|
diff --git a/community/ffmpeg/flto-auto.patch b/community/ffmpeg-serverkomplex/flto-auto.patch
|
||
|
|
similarity index 100%
|
||
|
|
rename from community/ffmpeg/flto-auto.patch
|
||
|
|
rename to community/ffmpeg-serverkomplex/flto-auto.patch
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|