diff --git a/extra/gst-plugins-bad/0001-opencv-allow-compilation-against-4.5.x.patch b/extra/gst-plugins-bad/0001-opencv-allow-compilation-against-4.5.x.patch deleted file mode 100644 index 566521ec8..000000000 --- a/extra/gst-plugins-bad/0001-opencv-allow-compilation-against-4.5.x.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Mon, 26 Oct 2020 16:24:08 +0100 -Subject: [PATCH] opencv: allow compilation against 4.5.x - ---- - ext/opencv/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index 074272a9c..e3d1865da 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -66,7 +66,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.6.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers diff --git a/extra/gst-plugins-bad/PKGBUILD b/extra/gst-plugins-bad/PKGBUILD index ff4c61998..6ddd39a6d 100644 --- a/extra/gst-plugins-bad/PKGBUILD +++ b/extra/gst-plugins-bad/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=gst-plugins-bad pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv) -pkgver=1.18.0+54+gbd3532008 +pkgver=1.18.1 pkgrel=1 pkgdesc="Multimedia graph framework - bad plugins" url="https://gstreamer.freedesktop.org/" @@ -27,11 +27,9 @@ makedepends=(mjpegtools curl chromaprint libmms faad2 libdca libdvdnav zxing-cpp opencv libva) checkdepends=(xorg-server-xvfb) options=(!emptydirs) -_commit=bd3532008f2a12377c2d5b56e93cbfa53e1979cf # 1.18 -source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit" - 0001-opencv-allow-compilation-against-4.5.x.patch) -sha256sums=('SKIP' - 'b310123298a4de09033c84b6e2a1ec01c7122320cddc3bff655c42c56d21d064') +_commit=e5c3c106a2da607953fea36e3a253b382c939684 # tags/1.18.1^0 +source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $pkgbase @@ -41,7 +39,7 @@ pkgver() { prepare() { cd $pkgbase git cherry-pick -n 3ea6387f969c0b08027fc959b8b8cd102708bceb # Fix svthevcenc test - git apply -3 ../0001-opencv-allow-compilation-against-4.5.x.patch + git cherry-pick -n 77f28ee3e71d1c5bd8278967963b08b226515dd1 # opencv 4.5 } build() {