Split libraries from executables, rebuild against latest x265 and aom

Most peolple don't need the executables. Let's split libraries from the
executables in two different packages as done in other distro. If needed,
one can install lib32-ffmpeg to mimic exactly what is done by the ffmpeg
package.

Rebuild against latest x265 and aom.

We are not moving to 4.3 yet, since a major bug was reported with chromium
and others. Until it is fixed, we'll stay under the 4.2 branch.

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>

2 files changed, 198 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a237a9f623f2..1c69cf3651d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-ffmpeg
 	pkgdesc = Complete solution to record, convert and stream audio and video (32 bit)
 	pkgver = 4.2.3
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://ffmpeg.org/
 	arch = x86_64
@@ -10,6 +10,16 @@ pkgbase = lib32-ffmpeg
 	makedepends = git
 	makedepends = lib32-ladspa
 	makedepends = yasm
+	optdepends = lib32-ladspa: LADSPA filters
+	optdepends = lib32-nvidia-utils: Nvidia NVDEC/NVENC support
+	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2.3
+	source = vmaf-model-path.patch
+	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
+	sha256sums = SKIP
+	sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+
+pkgname = lib32-ffmpeg
+	pkgdesc = Complete solution to record, convert and stream audio and video (32 bit)
 	depends = ffmpeg
 	depends = lib32-alsa-lib
 	depends = lib32-aom
@@ -25,7 +35,58 @@ pkgbase = lib32-ffmpeg
 	depends = lib32-libass
 	depends = lib32-libavc1394
 	depends = lib32-libbluray
-	depends = lib32-dav1d
+	depends = lib32-libdav1d
+	depends = lib32-libdrm
+	depends = lib32-libffmpeg
+	depends = lib32-freetype2
+	depends = lib32-libiec61883
+	depends = lib32-libmodplug
+	depends = lib32-libomxil-bellagio
+	depends = lib32-libpulse
+	depends = lib32-libraw1394
+	depends = lib32-libtheora
+	depends = lib32-libva
+	depends = lib32-libvdpau
+	depends = lib32-libvorbis
+	depends = lib32-libvpx
+	depends = lib32-libwebp
+	depends = lib32-libx11
+	depends = lib32-x264>=0.159
+	depends = lib32-x265>=3.3
+	depends = lib32-libxcb
+	depends = lib32-libxext
+	depends = lib32-libxml2
+	depends = lib32-libxv
+	depends = lib32-xvidcore
+	depends = lib32-opencore-amr
+	depends = lib32-openjpeg2
+	depends = lib32-opus
+	depends = lib32-sdl2
+	depends = lib32-speex
+	depends = lib32-srt
+	depends = lib32-v4l-utils
+	depends = lib32-vmaf
+	depends = lib32-xz
+	depends = lib32-zlib
+
+pkgname = lib32-libffmpeg
+	pkgdesc = Complete solution to record, convert and stream audio and video - library (32 bit)
+	depends = ffmpeg
+	depends = lib32-alsa-lib
+	depends = lib32-aom
+	depends = lib32-bzip2
+	depends = lib32-fontconfig
+	depends = lib32-fribidi
+	depends = lib32-glibc
+	depends = lib32-gmp
+	depends = lib32-gnutls
+	depends = lib32-gsm
+	depends = lib32-jack
+	depends = lib32-lame
+	depends = lib32-libass
+	depends = lib32-libavc1394
+	depends = lib32-libbluray
+	depends = lib32-libdav1d
 	depends = lib32-libdrm
 	depends = lib32-freetype2
 	depends = lib32-libiec61883
@@ -57,8 +118,6 @@ pkgbase = lib32-ffmpeg
 	depends = lib32-vmaf
 	depends = lib32-xz
 	depends = lib32-zlib
-	optdepends = lib32-ladspa: LADSPA filters
-	optdepends = lib32-nvidia-utils: Nvidia NVDEC/NVENC support
 	provides = libavcodec.so
 	provides = libavdevice.so
 	provides = libavfilter.so
@@ -67,11 +126,5 @@ pkgbase = lib32-ffmpeg
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
-	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2.3
-	source = vmaf-model-path.patch
-	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = SKIP
-	sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
-
-pkgname = lib32-ffmpeg
+	provides = lib32-ffmpeg
 
diff --git a/PKGBUILD b/PKGBUILD
index 559d88932b11..f6464e04424a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,67 +5,14 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 _pkgbasename=ffmpeg
-pkgname=lib32-$_pkgbasename
+pkgname=("lib32-$_pkgbasename" "lib32-lib$_pkgbasename")
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
 arch=('x86_64')
 url="http://ffmpeg.org/"
 license=('GPL3')
-depends=(
-      "$_pkgbasename"
-      'lib32-alsa-lib'
-      'lib32-aom'
-      'lib32-bzip2'
-      'lib32-fontconfig'
-      'lib32-fribidi'
-      'lib32-glibc'
-      'lib32-gmp'
-      'lib32-gnutls'
-      'lib32-gsm'
-      'lib32-jack'
-      'lib32-lame'
-      'lib32-libass'
-      'lib32-libavc1394'
-      'lib32-libbluray'
-      'lib32-dav1d'
-      'lib32-libdrm'
-      'lib32-freetype2'
-      'lib32-libiec61883'
-#      'lib32-libmfx'
-      'lib32-libmodplug'
-      'lib32-libomxil-bellagio'
-      'lib32-libpulse'
-      'lib32-libraw1394'
-#      'lib32-libsoxr'
-#      'lib32-libssh'
-      'lib32-libtheora'
-      'lib32-libva'
-      'lib32-libvdpau'
-#      'lib32-vid.stab'
-      'lib32-libvorbis'
-      'lib32-libvpx'
-      'lib32-libwebp'
-      'lib32-libx11'
-      'lib32-x264>=0.159'
-      'lib32-x265>=3.3'
-      'lib32-libxcb'
-      'lib32-libxext'
-      'lib32-libxml2'
-      'lib32-libxv'
-      'lib32-xvidcore'
-      'lib32-opencore-amr'
-      'lib32-openjpeg2'
-      'lib32-opus'
-      'lib32-sdl2'
-      'lib32-speex'
-      'lib32-srt'
-      'lib32-v4l-utils'
-      'lib32-vmaf'
-      'lib32-xz'
-      'lib32-zlib'
-)
 makedepends=(
       'ffnvcodec-headers'
       'git'
@@ -77,16 +24,6 @@ optdepends=(
       'lib32-ladspa: LADSPA filters'
       'lib32-nvidia-utils: Nvidia NVDEC/NVENC support'
 )
-provides=(
-      'libavcodec.so'
-      'libavdevice.so'
-      'libavfilter.so'
-      'libavformat.so'
-      'libavutil.so'
-      'libpostproc.so'
-      'libswresample.so'
-      'libswscale.so'
-)
 source=(
       "git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}"
       "vmaf-model-path.patch"
@@ -172,7 +109,137 @@ build() {
   make
 }
 
-package() {
+package_lib32-libffmpeg() {
+  pkgdesc="Complete solution to record, convert and stream audio and video - library (32 bit)"
+  provides=(
+    'libavcodec.so'
+    'libavdevice.so'
+    'libavfilter.so'
+    'libavformat.so'
+    'libavutil.so'
+    'libpostproc.so'
+    'libswresample.so'
+    'libswscale.so'
+    'lib32-ffmpeg'
+  )
+  depends=(
+      "$_pkgbasename"
+      'lib32-alsa-lib'
+      'lib32-aom'
+      'lib32-bzip2'
+      'lib32-fontconfig'
+      'lib32-fribidi'
+      'lib32-glibc'
+      'lib32-gmp'
+      'lib32-gnutls'
+      'lib32-gsm'
+      'lib32-jack'
+      'lib32-lame'
+      'lib32-libass'
+      'lib32-libavc1394'
+      'lib32-libbluray'
+      'lib32-libdav1d'
+      'lib32-libdrm'
+      'lib32-freetype2'
+      'lib32-libiec61883'
+#      'lib32-libmfx'
+      'lib32-libmodplug'
+      'lib32-libomxil-bellagio'
+      'lib32-libpulse'
+      'lib32-libraw1394'
+#      'lib32-libsoxr'
+#      'lib32-libssh'
+      'lib32-libtheora'
+      'lib32-libva'
+      'lib32-libvdpau'
+#      'lib32-vid.stab'
+      'lib32-libvorbis'
+      'lib32-libvpx'
+      'lib32-libwebp'
+      'lib32-libx11'
+      'lib32-x264>=0.159'
+      'lib32-x265>=3.3'
+      'lib32-libxcb'
+      'lib32-libxext'
+      'lib32-libxml2'
+      'lib32-libxv'
+      'lib32-xvidcore'
+      'lib32-opencore-amr'
+      'lib32-openjpeg2'
+      'lib32-opus'
+      'lib32-sdl2'
+      'lib32-speex'
+      'lib32-srt'
+      'lib32-v4l-utils'
+      'lib32-vmaf'
+      'lib32-xz'
+      'lib32-zlib'
+  )
+
+  cd ${_pkgbasename}
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/{include,bin,share}
+}
+
+package_lib32-ffmpeg() {
+  pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
+  depends=(
+      "$_pkgbasename"
+      'lib32-alsa-lib'
+      'lib32-aom'
+      'lib32-bzip2'
+      'lib32-fontconfig'
+      'lib32-fribidi'
+      'lib32-glibc'
+      'lib32-gmp'
+      'lib32-gnutls'
+      'lib32-gsm'
+      'lib32-jack'
+      'lib32-lame'
+      'lib32-libass'
+      'lib32-libavc1394'
+      'lib32-libbluray'
+      'lib32-libdav1d'
+      'lib32-libdrm' 
+      'lib32-libffmpeg' 
+      'lib32-freetype2'
+      'lib32-libiec61883'
+#      'lib32-libmfx'
+      'lib32-libmodplug'
+      'lib32-libomxil-bellagio'
+      'lib32-libpulse'
+      'lib32-libraw1394'
+#      'lib32-libsoxr'
+#      'lib32-libssh'
+      'lib32-libtheora'
+      'lib32-libva'
+      'lib32-libvdpau'
+#      'lib32-vid.stab'
+      'lib32-libvorbis'
+      'lib32-libvpx'
+      'lib32-libwebp'
+      'lib32-libx11'
+      'lib32-x264>=0.159'
+      'lib32-x265>=3.3'
+      'lib32-libxcb'
+      'lib32-libxext'
+      'lib32-libxml2'
+      'lib32-libxv'
+      'lib32-xvidcore'
+      'lib32-opencore-amr'
+      'lib32-openjpeg2'
+      'lib32-opus'
+      'lib32-sdl2'
+      'lib32-speex'
+      'lib32-srt'
+      'lib32-v4l-utils'
+      'lib32-vmaf'
+      'lib32-xz'
+      'lib32-zlib'
+  )
+
   cd ${_pkgbasename}
 
   make DESTDIR="${pkgdir}" install
@@ -184,5 +251,5 @@ package() {
     mv "$i" "$i"-32
   done
 
-  rm -r "${pkgdir}"/usr/{include,share}
+  rm -r "${pkgdir}"/usr/{include,lib32,share}
 }