summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-04-24 16:26:40 +0000
committerDaniel Bermond2019-04-24 16:26:40 +0000
commitd5ef656164fbba475a5b07cd030acd3d8e3f5aaf (patch)
treece7c64c5fa2f29403e9906e049bd6b2ebe8da393
parent80216d8677754cededc7ab284b933db61b83bcb9 (diff)
downloadaur-d5ef656164fbba475a5b07cd030acd3d8e3f5aaf.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=3b11ffefc3397ed2186157664960f1074ebf6966;hb=HEAD#l6202 [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 dec3bceda44..455ef9be8cd 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 nvenc, qsv and libfdk-aac; git version)
- pkgver = 4.2.r93521.g0e1ea034d8
+ pkgver = 4.2.r93657.g7c2ee8d43d
pkgrel = 1
url = https://www.ffmpeg.org/
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 55f6b7b0382..5af69d1f4db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ffmpeg-full-git
_srcname=ffmpeg
-pkgver=4.2.r93521.g0e1ea034d8
+pkgver=4.2.r93657.g7c2ee8d43d
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')
@@ -85,10 +85,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 \