Drop i686 support

2 files changed, 52 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45029d7226a7..5693d0112c48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = ffmpeg-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
-	pkgver = 4.2.r94176.geb33be188d
+	pkgver = 4.2.r94300.gaf5f770113
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
-	arch = i686
 	arch = x86_64
 	license = custom: nonfree and unredistributable
 	makedepends = git
 	makedepends = nasm
 	makedepends = opencl-headers
 	makedepends = ffnvcodec-headers
+	makedepends = vmaf
 	makedepends = blackmagic-decklink-sdk
 	depends = glibc
 	depends = alsa-lib
@@ -84,6 +84,7 @@ pkgbase = ffmpeg-full-git
 	depends = libx11
 	depends = libxext
 	depends = zlib
+	depends = cuda
 	depends = libomxil-bellagio
 	depends = libva
 	depends = libdrm
@@ -104,7 +105,11 @@ pkgbase = ffmpeg-full-git
 	depends = xavs2
 	depends = libmysofa
 	depends = pocketsphinx
+	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
@@ -119,23 +124,17 @@ pkgbase = ffmpeg-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
+	source = ffmpeg-full-git-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-git-add-intel-svt-hevc-docs-1.3.0.patch
+	source = ffmpeg-full-git-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-git-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 = LICENSE
 	sha256sums = SKIP
+	sha256sums = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d
+	sha256sums = d6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5
+	sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
+	sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
-	source_x86_64 = ffmpeg-full-git-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-git-add-intel-svt-hevc-docs-1.3.0.patch
-	source_x86_64 = ffmpeg-full-git-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-git-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 = d6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5
-	sha256sums_x86_64 = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
-	sha256sums_x86_64 = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 
 pkgname = ffmpeg-full-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c24c8a542f57..2a35ecd4cdda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,10 @@ _svt_av1_ver='0.6.0'
 _svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
 
 pkgname=ffmpeg-full-git
-_srcname=ffmpeg
-pkgver=4.2.r94176.geb33be188d
+pkgver=4.2.r94300.gaf5f770113
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.ffmpeg.org/'
 license=('custom: nonfree and unredistributable')
 depends=(
@@ -24,106 +23,79 @@ depends=(
         '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'
+        'zlib' 'cuda' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
     # AUR:
         'chromaprint-fftw' 'dav1d-git' 'codec2' 'davs2' 'flite1-patched' 'libilbc'
         'libklvanc-git' 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc'
-        'xavs' 'xavs2' 'libmysofa' 'pocketsphinx' 'rockchip-mpp'
-)
-depends_x86_64=(
-    # official repositories:
-        'cuda'
-    # AUR:
-        'intel-svt-hevc' 'intel-svt-av1' 'svt-vp9-git' 'intel-media-sdk'
+        'xavs' 'xavs2' 'libmysofa' 'pocketsphinx' 'intel-media-sdk' 'rockchip-mpp'
+        'intel-svt-hevc' 'intel-svt-av1' 'svt-vp9-git'
 )
 makedepends=(
     # official repositories:
         'git' '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' 'ffmpeg-full' 'ffmpeg-git')
 conflicts=('ffmpeg')
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
+        "ffmpeg-full-git-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-git-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
+        "ffmpeg-full-git-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-git-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"
         'LICENSE')
-source_x86_64=("ffmpeg-full-git-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-git-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
-               "ffmpeg-full-git-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-git-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=('SKIP'
+            'cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d'
+            'd6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5'
+            '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
+            '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
-sha256sums_x86_64=('cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d'
-                   'd6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5'
-                   '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
-                   '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7')
 
 prepare() {
-    cd "$_srcname"
+    cd ffmpeg
     
     # add intel-svt support for hevc, av1 and vp9
-    if [ "$CARCH" = 'x86_64' ] 
-    then
-        git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-${_svt_hevc_ver}.patch"
-        git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
-        git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-av1-${_svt_av1_ver}.patch"
-        git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
-    fi
+    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-${_svt_hevc_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-av1-${_svt_av1_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
 }
 
 pkgver() {
-    cd "$_srcname"
+    cd ffmpeg
     
     local _version
     local _revision
     local _shorthash
     
-    _version="$(  git describe  --tags --long      | awk -F'-' '{ printf $1 }' | sed 's/^n//')"
-    _revision="$( git describe  --tags --match 'N' | awk -F'-' '{ printf $2 }')"
+    _version="$(  git describe  --tags --long      | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')"
+    _revision="$( git describe  --tags --match 'N' | awk -F'-' '{ print $2 }')"
     _shorthash="$(git rev-parse --short HEAD)"
     
     printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
 }
 
 build() {
-    cd "$_srcname"
+    cd ffmpeg
     
-    # set x86_64 specific options
-    if [ "$CARCH" = 'x86_64' ] 
+    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 on systems with legacy nvidia-340xx drivers
+    # (libcuda.so.x, required by --enable-cuda-nvcc)
+    if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1
     then
-        local _libvmaf='--enable-libvmaf'
-        local _cudanvcc='--enable-cuda-nvcc'
-        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"
-        
-        # 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
+        _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 \
@@ -201,7 +173,7 @@ build() {
         --enable-libtwolame \
         --enable-libv4l2 \
         --enable-libvidstab \
-        $_libvmaf \
+        --enable-libvmaf \
         --enable-libvo-amrwbenc \
         --enable-libvorbis \
         --enable-libvpx \
@@ -236,12 +208,12 @@ build() {
         --enable-xlib \
         --enable-zlib \
         \
-        $_cudanvcc \
+        --enable-cuda-nvcc \
         --enable-cuvid \
         --enable-ffnvcodec \
         --enable-libdrm \
-        $_libmfx \
-        $_libnpp \
+        --enable-libmfx \
+        --enable-libnpp \
         --enable-nvdec \
         --enable-nvenc \
         --enable-omx \
@@ -256,7 +228,7 @@ build() {
 }
 
 package() {
-    cd "$_srcname"
+    cd ffmpeg
     
     make DESTDIR="$pkgdir" install