Update opencv dependency
ffmpeg have just added support for opencv4[1] in the git master branch. Added the patch here, so now opencv2 dependency from the AUR can be dropped, and we can use the opencv package from the official repositories while opencv5 is not yet released. [1] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c4ce51ee62205c74604767f1b7dab6a036edac7f
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
pkgbase = ffmpeg-full
|
||||
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
|
||||
pkgver = 8.0
|
||||
pkgrel = 3
|
||||
pkgrel = 4
|
||||
url = https://ffmpeg.org/
|
||||
arch = x86_64
|
||||
license = LicenseRef-nonfree-and-unredistributable
|
||||
@@ -94,7 +94,7 @@ pkgbase = ffmpeg-full
|
||||
depends = openal
|
||||
depends = openapv
|
||||
depends = opencore-amr
|
||||
depends = opencv2
|
||||
depends = opencv
|
||||
depends = openh264
|
||||
depends = openjpeg2
|
||||
depends = openvino
|
||||
@@ -162,6 +162,7 @@ pkgbase = ffmpeg-full
|
||||
source = 070-ffmpeg-lcevcdec4.0.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/fa23202cc7baab899894e8d22d82851a84967848
|
||||
source = 080-ffmpeg-cuda13-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f8a300c6739ea2ca648579d7faf3ae9811b9f19a
|
||||
source = 090-ffmpeg-glslang16-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f1e9032a2000b8b885cffd6fed8eacd47b37673f
|
||||
source = 100-ffmpeg-add-opencv4-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/c4ce51ee62205c74604767f1b7dab6a036edac7f
|
||||
source = LICENSE
|
||||
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
|
||||
sha256sums = b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e
|
||||
@@ -178,6 +179,7 @@ pkgbase = ffmpeg-full
|
||||
sha256sums = d2bacb3a5b0201503554c3394ea1f3fbc8ad79d5c2721e0c226134d40812ad08
|
||||
sha256sums = 79e3fbc30c86e0db789af78e79dc23227e5f6887531bcd52b2defa8526d1455b
|
||||
sha256sums = 0010bf826a7008452ccc8a072b0186688e8687be0dbe2be2ca7540e26ca076f1
|
||||
sha256sums = f5b448f7e6e567273f74ed6e62ed25d8470f6bc9183c247993f1c03e78b57587
|
||||
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
|
||||
|
||||
pkgname = ffmpeg-full
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=ffmpeg-full
|
||||
pkgver=8.0
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
_svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c'
|
||||
_obs_studio_ver='32.0.2'
|
||||
_whispercpp_ver='1.8.2'
|
||||
@@ -88,7 +88,7 @@ depends=(
|
||||
'openal'
|
||||
'openapv'
|
||||
'opencore-amr'
|
||||
'opencv2'
|
||||
'opencv'
|
||||
'openh264'
|
||||
'openjpeg2'
|
||||
'openvino'
|
||||
@@ -171,6 +171,7 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
|
||||
'070-ffmpeg-lcevcdec4.0.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/fa23202cc7baab899894e8d22d82851a84967848'
|
||||
'080-ffmpeg-cuda13-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f8a300c6739ea2ca648579d7faf3ae9811b9f19a'
|
||||
'090-ffmpeg-glslang16-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f1e9032a2000b8b885cffd6fed8eacd47b37673f'
|
||||
'100-ffmpeg-add-opencv4-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/c4ce51ee62205c74604767f1b7dab6a036edac7f'
|
||||
'LICENSE')
|
||||
sha256sums=('b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e'
|
||||
'SKIP'
|
||||
@@ -186,6 +187,7 @@ sha256sums=('b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e'
|
||||
'd2bacb3a5b0201503554c3394ea1f3fbc8ad79d5c2721e0c226134d40812ad08'
|
||||
'79e3fbc30c86e0db789af78e79dc23227e5f6887531bcd52b2defa8526d1455b'
|
||||
'0010bf826a7008452ccc8a072b0186688e8687be0dbe2be2ca7540e26ca076f1'
|
||||
'f5b448f7e6e567273f74ed6e62ed25d8470f6bc9183c247993f1c03e78b57587'
|
||||
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
|
||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
||||
|
||||
@@ -200,6 +202,7 @@ prepare() {
|
||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-lcevcdec4.0.0-fix.patch"
|
||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-cuda13-fix.patch"
|
||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/090-ffmpeg-glslang16-fix.patch"
|
||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/100-ffmpeg-add-opencv4-support.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Reference in New Issue
Block a user