summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-08-14 12:07:29 +0000
committerDaniel Bermond2020-08-14 12:07:29 +0000
commitf06e41fe331dab95b4be5e361d629f059ee0d40e (patch)
tree177000afd8482b2016a4084e14b73af18442dbbf
parentb38e834c47562855016e855af82456e3f752eccd (diff)
downloadaur-f06e41fe331dab95b4be5e361d629f059ee0d40e.tar.gz
Bring back tensorflow support (fixed by upstream)
The tensorflow build issue was fixed[1] upstream by ffmpeg. References ---------- [1] http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3c05c8a15f2fa5543213f6c8cbe439ad4376137d [2] https://aur.archlinux.org/cgit/aur.git/commit/?h=ffmpeg-full-git&id=b38e834c47562855016e855af82456e3f752eccd
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 467b79d771e..a35e596b8b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
- pkgver = 4.4.r98723.gbb59bdbcd1
+ pkgver = 4.4.r98732.g9f702fc8f4
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -64,6 +64,7 @@ pkgbase = ffmpeg-full-git
depends = svt-hevc
depends = svt-av1
depends = svt-vp9
+ depends = tensorflow
depends = tesseract
depends = libtheora
depends = twolame
diff --git a/PKGBUILD b/PKGBUILD
index 5a8c6ffc54d..bfca54bfcad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _svt_hevc_ver='1.5.0'
_svt_vp9_ver='0.2.2'
pkgname=ffmpeg-full-git
-pkgver=4.4.r98723.gbb59bdbcd1
+pkgver=4.4.r98732.g9f702fc8f4
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -19,7 +19,7 @@ depends=(
'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
'openjpeg2' 'opus' 'pulseaudio' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband'
'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1'
- 'svt-vp9' 'tesseract' 'libtheora' 'twolame' 'v4l-utils'
+ 'svt-vp9' 'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils'
'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'x264' 'x265'
'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
@@ -80,7 +80,7 @@ build() {
./configure \
--prefix='/usr' \
- --extra-cflags='-I/opt/cuda/include' \
+ --extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \
--extra-ldflags='-L/opt/cuda/lib64' \
\
--disable-rpath \
@@ -154,7 +154,7 @@ build() {
--enable-libssh \
--enable-libsvthevc \
--enable-libsvtav1 \
- --disable-libtensorflow \
+ --enable-libtensorflow \
--enable-libtesseract \
--enable-libtheora \
--disable-libtls \