summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2023-11-25 23:26:43 -0300
committerDaniel Bermond2023-11-25 23:26:43 -0300
commit78a69d17d701b4449ff66ca3ade383a483af14b5 (patch)
tree10e70ba7a93fd257b680117d3448b8b199c0f2a9
parent009b13564e2d32e2bf987567ecfce0329838dc65 (diff)
downloadaur-78a69d17d701b4449ff66ca3ade383a483af14b5.tar.gz
Bring back support for opencv
opencv support was disabled[1] a long time ago because ffmpeg failed to build with it. opencv 3.x does not support C compilation mode[2] anymore, and ffmpeg uses only C. There is no ffmpeg interest[3] in compiling opencv in C++ mode, so opencv2 must be used here. References ---------- [1] https://aur.archlinux.org/cgit/aur.git/commit/?h=ffmpeg-full-git&id=f9d589fa30dddc8318fff742a87b7927566b2a9e [2] https://github.com/opencv/opencv/issues/10963 [3] https://trac.ffmpeg.org/ticket/7059
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1005c7cb8da..222c1f26e505 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.r112841.g2d9ed64859
+ pkgver = 6.2.r112846.ge7111ba44a
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -85,6 +85,7 @@ pkgbase = ffmpeg-full-git
depends = onevpl-intel-gpu
depends = openal
depends = opencore-amr
+ depends = opencv2
depends = openh264
depends = openjpeg2
depends = openvino
diff --git a/PKGBUILD b/PKGBUILD
index e51998cf593f..983140a54dc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=ffmpeg-full-git
-pkgver=6.2.r112841.g2d9ed64859
+pkgver=6.2.r112846.ge7111ba44a
pkgrel=1
_svt_hevc_ver='6cca5b932623d3a1953b165ae6b093ca1325ac44'
_svt_vp9_ver='43ef8e5e96932421858762392adbbab57c84aebf'
@@ -82,6 +82,7 @@ depends=(
'onevpl-intel-gpu'
'openal'
'opencore-amr'
+ 'opencv2'
'openh264'
'openjpeg2'
'openvino'
@@ -238,7 +239,7 @@ build() {
--enable-libmp3lame \
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
- --disable-libopencv \
+ --enable-libopencv \
--enable-libopenh264 \
--enable-libopenjpeg \
--enable-libopenmpt \