summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-04-24 16:31:03 +0000
committerDaniel Bermond2019-04-24 16:31:03 +0000
commit46028079090518a3518acf30a0aec01b6d3867d5 (patch)
tree525f979651ec8715f647e23d3932f9ad06d244ee
parent2eaa5ac3cf4acbc248315c550a0c9809e722752b (diff)
downloadaur-46028079090518a3518acf30a0aec01b6d3867d5.tar.gz
Fix tensorflow include dir
upstream ffmpeg excects[1] : /usr/include/tensorflow/ tensorflow package ships[2]: /usr/include/tensorflow/tensorflow/ References ---------- [1] https://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=a9644e211bebb342fb9066190f1be70e55f68ec0;hb=4154f8967820ca734a77ce91bb590cd77649dee8#l6138 [2] https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/tensorflow&id=d6b6fa4eb56d8e6055268504d6b0110c6fddde7e
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4bf1096f335..578a825e137 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
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 = 1
+ pkgrel = 2
url = https://www.ffmpeg.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 79cad9db6d1..6253f7a811c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full
_srcname=ffmpeg
pkgver=4.1.3
-pkgrel=1
+pkgrel=2
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64')
url='https://www.ffmpeg.org/'
@@ -74,10 +74,15 @@ build() {
# on systems with legacy nvidia drivers
if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1
then
- _ldflags="${_ldflags} -L/usr/lib/nvidia"
+ _ldflags+=' -L/usr/lib/nvidia'
fi
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 \