diff options
| author | Nicola Murino | 2020-10-18 18:03:41 +0200 |
|---|---|---|
| committer | Nicola Murino | 2020-10-18 18:03:41 +0200 |
| commit | 6f61f3cd5653cb27e3deae453dec8db0b84244ff (patch) | |
| tree | 050429c694be18c21c56f4bde24cabbbf62330f6 | |
| parent | 0962e2c7537b3ec5fa54ed95af4134084b952578 (diff) | |
| download | aur-6f61f3cd5653cb27e3deae453dec8db0b84244ff.tar.gz | |
add support for opencv 4.5.0
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 4.4.0.patch | 13 | ||||
| -rw-r--r-- | 4.5.0.patch | 25 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
4 files changed, 38 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = gst-plugins-opencv pkgdesc = GStreamer open-source multimedia framework OpenCV plugins pkgver = 1.18.0 - pkgrel = 1 + pkgrel = 2 url = https://gstreamer.freedesktop.org/ arch = x86_64 license = LGPL @@ -10,7 +10,9 @@ pkgbase = gst-plugins-opencv depends = gst-plugins-base-libs depends = opencv source = git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=7cb583bb0427819a6b59b783e7df67961df2155f + source = 4.5.0.patch sha256sums = SKIP + sha256sums = 59c4401641d619f6ca0fffd853dad0a2e027d3aba1698c81d5017a23e6ac6ff4 pkgname = gst-plugins-opencv diff --git a/4.4.0.patch b/4.4.0.patch deleted file mode 100644 index 46ab9aca3798..000000000000 --- a/4.4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index d9bc871126a304d5ddb8fb3695b7258d0e25decb..8434628e5f6b26bcaaa5f53e8cde55a5c48c0f4c 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -65,7 +65,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers diff --git a/4.5.0.patch b/4.5.0.patch new file mode 100644 index 000000000000..af21cce4a123 --- /dev/null +++ b/4.5.0.patch @@ -0,0 +1,25 @@ +From ae821f523e34b77135f865011266ed7d6540ba1c Mon Sep 17 00:00:00 2001 +From: Nicola Murino <nicola.murino@gmail.com> +Date: Sun, 18 Oct 2020 17:59:44 +0200 +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 +-- +2.28.0 + @@ -2,7 +2,7 @@ pkgname=gst-plugins-opencv _pkgname=gst-plugins-bad pkgver=1.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer open-source multimedia framework OpenCV plugins" url="https://gstreamer.freedesktop.org/" arch=(x86_64) @@ -10,14 +10,21 @@ license=(LGPL) depends=(gst-plugins-base-libs opencv) makedepends=(meson git) _commit=7cb583bb0427819a6b59b783e7df67961df2155f # tags/1.18.0^0 -source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit") -sha256sums=('SKIP') +source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit" + "4.5.0.patch") +sha256sums=('SKIP' + '59c4401641d619f6ca0fffd853dad0a2e027d3aba1698c81d5017a23e6ac6ff4') pkgver() { cd $_pkgname git describe --tags | sed 's/-/+/g' } +prepare() { + cd $_pkgname + patch -Np1 -i ../4.5.0.patch +} + build() { arch-meson $_pkgname build \ --auto-features=disabled \ |