summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2024-03-19 13:03:56 -0300
committerDaniel Bermond2024-03-19 13:03:56 -0300
commit1c089ce577fc06c7ab362ba804078eba45d40542 (patch)
tree7a9b4cf80adc7e30d26a1c74db58594a68af313b
parent549b23f5a3e56fdf781c95f370fd144ede2fe6cf (diff)
downloadaur-1c089ce577fc06c7ab362ba804078eba45d40542.tar.gz
Bring back libtensorflow. Add new option libtorch in disabled mode.
Tensorflow is now fixed[1] and can be added again[2]. The new upstream option --enable-libtorch[3] can be added only when the repository ffmpeg sonames (library versions) catch up with ffmpeg git master, as python-pytorch depends on ffmpeg and the current ffmpeg git master bumped[4] the soname of all libraries. Otherwise, the ffmpeg libraries will conflict. References ---------- [1] https://gitlab.archlinux.org/archlinux/packaging/packages/tensorflow/-/issues/2 [2] https://aur.archlinux.org/cgit/aur.git/commit/?h=ffmpeg-full-git&id=5b34804510e96f108909ef41963a34fdb25df903 [3] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f4e0664fd1bc94ee1a1afbd20c5a32ac33d93a2d [4] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/783d00b203b2a6c67ec289856ff080c7a36ddb6e
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 869d1c51029e..9b10c630065f 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 = 6.2.r114236.g95a6788314
+ pkgver = 6.2.r114270.g53dd31497b
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -104,6 +104,7 @@ pkgbase = ffmpeg-full-git
depends = svt-av1
depends = svt-hevc
depends = svt-vp9
+ depends = tensorflow
depends = tesseract
depends = twolame
depends = v4l-utils
diff --git a/PKGBUILD b/PKGBUILD
index 047dcb83a802..482f397f0fb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=ffmpeg-full-git
-pkgver=6.2.r114236.g95a6788314
+pkgver=6.2.r114270.g53dd31497b
pkgrel=1
_svt_hevc_ver='78bcaa7bdefa0dd593149517ce41842d528d596f'
_svt_vp9_ver='3ecdf8f88037367e175198adda6e43662129af0b'
@@ -101,6 +101,7 @@ depends=(
'svt-av1'
'svt-hevc'
'svt-vp9'
+ 'tensorflow'
'tesseract'
'twolame'
'v4l-utils'
@@ -181,7 +182,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' \
--enable-lto \
\
@@ -265,10 +266,11 @@ build() {
--enable-libsvtav1 \
--enable-libsvthevc \
--enable-libsvtvp9 \
- --disable-libtensorflow \
+ --enable-libtensorflow \
--enable-libtesseract \
--enable-libtheora \
--disable-libtls \
+ --disable-libtorch \
--enable-libtwolame \
--enable-libuavs3d \
--enable-libv4l2 \