summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-03-13 01:46:51 +0000
committerDaniel Bermond2018-03-13 02:00:01 +0000
commitf9d589fa30dddc8318fff742a87b7927566b2a9e (patch)
tree63297033cdbf691dedcb47311629c9d3736d6731
parent1245edf694994bcb75db1e75f6299eb77fe61f00 (diff)
downloadaur-f9d589fa30dddc8318fff742a87b7927566b2a9e.tar.gz
Temporarily disable libopencv due to upstream compile error
There is a know upstream ffmpeg compile error when enabling libopencv. It should compile opencv code in C++ mode but it is compiling in C mode. Disabling libopencv support while a fix is not provided either by upstream ffmpeg or by opencv repository package. References: ----------- http://trac.ffmpeg.org/ticket/7059 https://github.com/opencv/opencv/issues/10963 https://bugs.archlinux.org/task/57811
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 184cef10d73d..b70fdb96962f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
- pkgver = 3.5.r90242.g5ab0ecf283
+ pkgver = 3.5.r90305.g040b28aecc
pkgrel = 1
url = http://www.ffmpeg.org/
arch = i686
@@ -39,7 +39,6 @@ pkgbase = ffmpeg-full-git
depends = libmodplug
depends = lame
depends = opencore-amr
- depends = opencv
depends = openjpeg2
depends = opus
depends = pulseaudio
diff --git a/PKGBUILD b/PKGBUILD
index 386e5f594d67..b651e9fa4b1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=ffmpeg-full-git
-pkgver=3.5.r90242.g5ab0ecf283
+pkgver=3.5.r90305.g040b28aecc
pkgrel=1
pkgdesc='Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=(
'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
'libbluray' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394' 'libavc1394'
'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883'
- 'libmodplug' 'lame' 'opencore-amr' 'opencv' 'openjpeg2' 'opus' 'pulseaudio'
+ 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio'
'librsvg' 'rubberband' 'rtmpdump' 'smbclient' 'snappy' 'libsoxr' 'speex'
'libssh' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'libvorbis'
'libvpx' 'wavpack' 'libwebp' 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'libxml2'
@@ -144,7 +144,7 @@ build() {
--enable-libmp3lame \
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
- --enable-libopencv \
+ --disable-libopencv \
--enable-libopenh264 \
--enable-libopenjpeg \
--enable-libopenmpt \