Drop i686 support

2 files changed, 49 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9000d76dc901..cc62aa0690fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = ffmpeg-full
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
 	pkgver = 4.1.3
-	pkgrel = 7
+	pkgrel = 8
 	url = https://www.ffmpeg.org/
-	arch = i686
 	arch = x86_64
 	license = custom: nonfree and unredistributable
 	makedepends = nasm
 	makedepends = opencl-headers
 	makedepends = ffnvcodec-headers
+	makedepends = vmaf
 	makedepends = blackmagic-decklink-sdk
 	depends = glibc
 	depends = alsa-lib
@@ -82,6 +82,7 @@ pkgbase = ffmpeg-full
 	depends = libx11
 	depends = libxext
 	depends = zlib
+	depends = cuda
 	depends = libomxil-bellagio
 	depends = libva
 	depends = libdrm
@@ -101,7 +102,11 @@ pkgbase = ffmpeg-full
 	depends = xavs2
 	depends = ndi-sdk
 	depends = libmysofa
+	depends = intel-media-sdk
 	depends = rockchip-mpp
+	depends = intel-svt-hevc
+	depends = intel-svt-av1
+	depends = svt-vp9-git
 	provides = libavcodec.so
 	provides = libavdevice.so
 	provides = libavfilter.so
@@ -115,27 +120,21 @@ pkgbase = ffmpeg-full
 	conflicts = ffmpeg
 	source = https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.xz
 	source = https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.xz.asc
+	source = ffmpeg-full-add-intel-svt-hevc-1.3.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.3.0/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+	source = ffmpeg-full-add-intel-svt-hevc-docs-1.3.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.3.0/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+	source = ffmpeg-full-add-intel-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+	source = ffmpeg-full-add-intel-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
 	source = ffmpeg-full-decklink-sdk-11.patch
 	source = LICENSE
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
 	sha256sums = 0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d
 	sha256sums = SKIP
+	sha256sums = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d
+	sha256sums = 516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d
+	sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
+	sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 	sha256sums = 96500257c72c664a9e7417d9aee3d0b2a4436f836e9733dcf1c9c30926b642df
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
-	source_x86_64 = ffmpeg-full-add-intel-svt-hevc-1.3.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.3.0/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	source_x86_64 = ffmpeg-full-add-intel-svt-hevc-docs-1.3.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.3.0/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
-	source_x86_64 = ffmpeg-full-add-intel-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
-	source_x86_64 = ffmpeg-full-add-intel-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
-	depends_x86_64 = cuda
-	depends_x86_64 = intel-svt-hevc
-	depends_x86_64 = intel-svt-av1
-	depends_x86_64 = svt-vp9-git
-	depends_x86_64 = intel-media-sdk
-	makedepends_x86_64 = vmaf
-	sha256sums_x86_64 = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d
-	sha256sums_x86_64 = 516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d
-	sha256sums_x86_64 = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
-	sha256sums_x86_64 = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 
 pkgname = ffmpeg-full
 
diff --git a/PKGBUILD b/PKGBUILD
index 2179411f729f..16dd6466475f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,10 @@ _svt_av1_ver='0.6.0'
 _svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
 
 pkgname=ffmpeg-full
-_srcname=ffmpeg
 pkgver=4.1.3
-pkgrel=7
+pkgrel=8
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.ffmpeg.org/'
 license=('custom: nonfree and unredistributable')
 depends=(
@@ -25,99 +24,72 @@ depends=(
         'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so'
         'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
         'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11'
-        'libxext' 'zlib' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
+        'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
     # AUR:
         'chromaprint-fftw' 'codec2' 'davs2' 'flite1-patched' 'libilbc' 'libklvanc-git'
         'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2'
-        'ndi-sdk' 'libmysofa' 'rockchip-mpp'
-)
-depends_x86_64=(
-    # official repositories:
-        'cuda'
-    # AUR:
-        'intel-svt-hevc' 'intel-svt-av1' 'svt-vp9-git' 'intel-media-sdk'
+        'ndi-sdk' 'libmysofa' 'intel-media-sdk' 'rockchip-mpp' 'intel-svt-hevc'
+        'intel-svt-av1' 'svt-vp9-git'
 )
 makedepends=(
     # official repositories:
         'nasm' 'opencl-headers' 'ffnvcodec-headers'
     # AUR:
-        'blackmagic-decklink-sdk'
-)
-makedepends_x86_64=(
-    # AUR:
-        'vmaf'
+        'vmaf' 'blackmagic-decklink-sdk'
 )
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
           'libswresample.so' 'ffmpeg')
 conflicts=('ffmpeg')
 source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
+        "ffmpeg-full-add-intel-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
+        "ffmpeg-full-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
+        "ffmpeg-full-add-intel-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
+        "ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch"
         'ffmpeg-full-decklink-sdk-11.patch'
         'LICENSE')
-source_x86_64=("ffmpeg-full-add-intel-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
-               "ffmpeg-full-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
-               "ffmpeg-full-add-intel-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
-               "ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch")
 sha256sums=('0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d'
             'SKIP'
+            'cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d'
+            '516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d'
+            '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
+            '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
             '96500257c72c664a9e7417d9aee3d0b2a4436f836e9733dcf1c9c30926b642df'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
-sha256sums_x86_64=('cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d'
-                   '516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d'
-                   '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
-                   '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 
 prepare() {
-    cd "${_srcname}-${pkgver}"
+    cd "ffmpeg-${pkgver}"
     
     # add intel-svt support for hevc, av1 and vp9
-    if [ "$CARCH" = 'x86_64' ] 
-    then
-        patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-${_svt_hevc_ver}.patch"
-        patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
-        patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-av1-${_svt_av1_ver}.patch"
-        patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
-    fi
+    patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-${_svt_hevc_ver}.patch"
+    patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
+    patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-av1-${_svt_av1_ver}.patch"
+    patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
     
     # fix build with decklink sdk 11
     patch -Np1 -i "${srcdir}/ffmpeg-full-decklink-sdk-11.patch"
 }
 
 build() {
-    cd "${_srcname}-${pkgver}"
+    cd "ffmpeg-${pkgver}"
     
-    # set x86_64 specific options
-    if [ "$CARCH" = 'x86_64' ] 
-    then
-        local _libvmaf='--enable-libvmaf'
-        local _cudasdk='--enable-cuda-sdk'
-        local _libmfx='--enable-libmfx'
-        local _libnpp='--enable-libnpp'
-        
-        local _cflags='-I/opt/cuda/include'
-        local _ldflags='-L/opt/cuda/lib64'
-        
-        export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/mediasdk/lib64/pkgconfig"
+    local _ldflags='-L/opt/cuda/lib64'
+    
+    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/mediasdk/lib64/pkgconfig"
         
-        # set path of -lcuda (libcuda.so.x, required by cuda_sdk)
-        # on systems with legacy nvidia drivers
-        if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1
-        then
-            _ldflags+=' -L/usr/lib/nvidia'
-        fi
+    # set path of -lcuda on systems with legacy nvidia-340xx drivers
+    # (libcuda.so.x, required by --enable-cuda-sdk)
+    if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1
+    then
+        _ldflags+=' -L/usr/lib/nvidia'
     fi
     
-    # fix tensorflow include dir
-    ## upstream ffmpeg excects : /usr/include/tensorflow/
-    ## tensorflow package ships: /usr/include/tensorflow/tensorflow/
-    _cflags+=' -I/usr/include/tensorflow'
-    
     printf '%s\n' '  -> Running ffmpeg configure script...'
     
     ./configure \
         --prefix='/usr' \
-        --extra-cflags="$_cflags" \
+        --extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \
         --extra-ldflags="$_ldflags" \
         \
         --disable-rpath \
@@ -193,7 +165,7 @@ build() {
         --enable-libtwolame \
         --enable-libv4l2 \
         --enable-libvidstab \
-        $_libvmaf \
+        --enable-libvmaf \
         --enable-libvo-amrwbenc \
         --enable-libvorbis \
         --enable-libvpx \
@@ -227,12 +199,12 @@ build() {
         --enable-xlib \
         --enable-zlib \
         \
-        $_cudasdk \
+        --enable-cuda-sdk \
         --enable-cuvid \
         --enable-ffnvcodec \
         --enable-libdrm \
-        $_libmfx \
-        $_libnpp \
+        --enable-libmfx \
+        --enable-libnpp \
         --enable-nvdec \
         --enable-nvenc \
         --enable-omx \
@@ -247,7 +219,7 @@ build() {
 }
 
 package() {
-    cd "${_srcname}-${pkgver}"
+    cd "ffmpeg-${pkgver}"
     
     make DESTDIR="$pkgdir" install