shinobi-ffmpeg to 4.3.2-2: Arch/Arch ARM support

2 files changed, 79 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3dc4a94905a..63a008f52a52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,12 @@
 pkgbase = ffmpeg-shinobi
 	pkgdesc = FFmpeg from the 4.3 release branch for use with Shinobi
 	pkgver = 4.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ffmpeg.org/
 	arch = x86_64
+	arch = aarch64
+	arch = armv6h
+	arch = armv7h
 	license = GPL3
 	makedepends = amf-headers
 	makedepends = avisynthplus
@@ -13,7 +16,6 @@ pkgbase = ffmpeg-shinobi
 	makedepends = ladspa
 	makedepends = nasm
 	depends = alsa-lib
-	depends = aom
 	depends = bzip2
 	depends = fontconfig
 	depends = fribidi
@@ -29,10 +31,8 @@ pkgbase = ffmpeg-shinobi
 	depends = libdrm
 	depends = libfreetype.so
 	depends = libiec61883
-	depends = libmfx
 	depends = libmodplug
 	depends = libpulse
-	depends = librav1e.so
 	depends = libraw1394
 	depends = libsoxr
 	depends = libssh
@@ -62,12 +62,15 @@ pkgbase = ffmpeg-shinobi
 	depends = speex
 	depends = srt
 	depends = v4l-utils
-	depends = vmaf
 	depends = xz
 	depends = zlib
+	depends = aom
+	depends = libmfx
+	depends = librav1e.so
+	depends = vmaf
 	optdepends = avisynthplus: AviSynthPlus support
-	optdepends = intel-media-sdk: Intel QuickSync support
 	optdepends = ladspa: LADSPA filters
+	optdepends = intel-media-sdk: Intel QuickSync support
 	optdepends = nvidia-utils: Nvidia NVDEC/NVENC support
 	provides = ffmpeg
 	provides = libavcodec.so
diff --git a/PKGBUILD b/PKGBUILD
index 12dc13f4e8a1..78630a9978ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: graysky <graysky AT archlinux DOT us>
+# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -8,14 +9,13 @@
 pkgname=ffmpeg-shinobi
 _pkgname=ffmpeg
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='FFmpeg from the 4.3 release branch for use with Shinobi'
-arch=(x86_64)
+arch=(x86_64 aarch64 armv6h armv7h)
 url=https://ffmpeg.org/
 license=(GPL3)
 depends=(
   alsa-lib
-  aom
   bzip2
   fontconfig
   fribidi
@@ -31,10 +31,8 @@ depends=(
   libdrm
   libfreetype.so
   libiec61883
-  libmfx
   libmodplug
   libpulse
-  librav1e.so
   libraw1394
   libsoxr
   libssh
@@ -64,10 +62,10 @@ depends=(
   speex
   srt
   v4l-utils
-  vmaf
   xz
   zlib
 )
+
 makedepends=(
   amf-headers
   avisynthplus
@@ -77,12 +75,22 @@ makedepends=(
   ladspa
   nasm
 )
+
 optdepends=(
   'avisynthplus: AviSynthPlus support'
-  'intel-media-sdk: Intel QuickSync support'
   'ladspa: LADSPA filters'
-  'nvidia-utils: Nvidia NVDEC/NVENC support'
 )
+
+if [[ $CARCH = "x86_64" ]]; then
+  # building for Arch x86_64
+  depends+=(aom libmfx librav1e.so vmaf)
+  optdepends+=('intel-media-sdk: Intel QuickSync support'
+  'nvidia-utils: Nvidia NVDEC/NVENC support')
+else
+  # building for Arch ARM
+  depends+=(librsvg-2.so)
+  makedepends+=(ffnvcodec-headers)
+fi
 provides=(
   ffmpeg
   libavcodec.so
@@ -122,61 +130,62 @@ prepare() {
 build() {
   cd ffmpeg
 
-  ./configure \
-    --prefix=/usr \
-    --disable-debug \
-    --disable-static \
-    --disable-stripping \
-    --enable-amf \
-    --enable-avisynth \
-    --enable-cuda-llvm \
-    --enable-lto \
-    --enable-fontconfig \
-    --enable-gmp \
-    --enable-gnutls \
-    --enable-gpl \
-    --enable-ladspa \
-    --enable-libaom \
-    --enable-libass \
-    --enable-libbluray \
-    --enable-libdav1d \
-    --enable-libdrm \
-    --enable-libfreetype \
-    --enable-libfribidi \
-    --enable-libgsm \
-    --enable-libiec61883 \
-    --enable-libjack \
-    --enable-libmfx \
-    --enable-libmodplug \
-    --enable-libmp3lame \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libopenjpeg \
-    --enable-libopus \
-    --enable-libpulse \
-    --enable-librav1e \
-    --enable-libsoxr \
-    --enable-libspeex \
-    --enable-libsrt \
-    --enable-libssh \
-    --enable-libtheora \
-    --enable-libv4l2 \
-    --enable-libvidstab \
-    --enable-libvmaf \
-    --enable-libvorbis \
-    --enable-libvpx \
-    --enable-libwebp \
-    --enable-libx264 \
-    --enable-libx265 \
-    --enable-libxcb \
-    --enable-libxml2 \
-    --enable-libxvid \
-    --enable-libzimg \
-    --enable-nvdec \
-    --enable-nvenc \
-    --enable-shared \
+  _args=(
+    --prefix=/usr
+    --disable-debug
+    --disable-static
+    --disable-stripping
+    --enable-amf
+    --enable-avisynth
+    --enable-cuda-llvm
+    --enable-lto
+    --enable-fontconfig
+    --enable-gmp
+    --enable-gnutls
+    --enable-gpl
+    --enable-ladspa
+    --enable-libass
+    --enable-libbluray
+    --enable-libdav1d
+    --enable-libdrm
+    --enable-libfreetype
+    --enable-libfribidi
+    --enable-libgsm
+    --enable-libiec61883
+    --enable-libjack
+    --enable-libmodplug
+    --enable-libmp3lame
+    --enable-libopencore_amrnb
+    --enable-libopencore_amrwb
+    --enable-libopenjpeg
+    --enable-libopus
+    --enable-libpulse
+    --enable-libsoxr
+    --enable-libspeex
+    --enable-libsrt
+    --enable-libssh
+    --enable-libtheora
+    --enable-libv4l2
+    --enable-libvidstab
+    --enable-libvorbis
+    --enable-libvpx
+    --enable-libwebp
+    --enable-libx264
+    --enable-libx265
+    --enable-libxcb
+    --enable-libxml2
+    --enable-libxvid
+    --enable-libzimg
+    --enable-shared
     --enable-version3
+  )
+
+  [[ $CARCH == "x86_64" ]] && _args+=(--enable-libaom --enable-libmfx --enable-librav1e --enable-libvmaf --enable-nvdec --enable-nvenc)
+
+  [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && _args+=('--host-cflags="-fPIC"' --enable-librsvg)
+  [[ $CARCH == "armv6h" || $CARCH == 'arm' ]] && _args+=('--extra-libs="-latomic"' --enable-librsvg)
 
+  ./configure "${_args[@]}"
   make
   make tools/qt-faststart
   make doc/ff{mpeg,play}.1