From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] opencv: update to 4.2.0.
Date: Sun, 19 Jan 2020 21:55:16 +0100 [thread overview]
Message-ID: <20200119205516.Qu1n9JmoIA7NWVcCpglN5T1DNesE2Cv9WxS0DVvGhIs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18386@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
There is an updated pull request by ralsei against master on the void-packages repository
https://github.com/ralsei/void-packages opencv
https://github.com/void-linux/void-packages/pull/18386
opencv: update to 4.2.0.
A patch file from https://github.com/void-linux/void-packages/pull/18386.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-opencv-18386.patch --]
[-- Type: text/x-diff, Size: 7256 bytes --]
From dc67ed946e2a71f1159036be2e7c802bd1db34e1 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sat, 18 Jan 2020 20:12:48 -0500
Subject: [PATCH 1/6] opencv: update to 4.2.0 and add opencv_contrib.
[ci skip]
---
common/shlibs | 35 ++++++++++++++++++-----------------
srcpkgs/opencv/template | 11 +++++------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 889115c8112..e17fdb24b11 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1975,23 +1975,24 @@ libcapstone.so.4 capstone-4.0_1
libhavege.so.1 libhaveged-1.9.1_1
libnih.so.1 libnih-1.0.3_1
libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_ml.so.3.4 libopencv-3.4.1_1
-libopencv_objdetect.so.3.4 libopencv-3.4.1_1
-libopencv_dnn.so.3.4 libopencv-3.4.1_1
-libopencv_shape.so.3.4 libopencv-3.4.1_1
-libopencv_stitching.so.3.4 libopencv-3.4.1_1
-libopencv_photo.so.3.4 libopencv-3.4.1_1
-libopencv_video.so.3.4 libopencv-3.4.1_1
-libopencv_calib3d.so.3.4 libopencv-3.4.1_1
-libopencv_features2d.so.3.4 libopencv-3.4.1_1
-libopencv_flann.so.3.4 libopencv-3.4.1_1
-libopencv_highgui.so.3.4 libopencv-3.4.1_1
-libopencv_videoio.so.3.4 libopencv-3.4.1_1
-libopencv_imgcodecs.so.3.4 libopencv-3.4.1_1
-libopencv_imgproc.so.3.4 libopencv-3.4.1_1
-libopencv_core.so.3.4 libopencv-3.4.1_1
-libopencv_superres.so.3.4 libopencv-3.4.1_1
-libopencv_videostab.so.3.4 libopencv-3.4.1_1
+libopencv_ml.so.4.2 libopencv-4.2.0_1
+libopencv_objdetect.so.4.2 libopencv-4.2.0_1
+libopencv_dnn.so.4.2 libopencv-4.2.0_1
+libopencv_shape.so.4.2 libopencv-4.2.0_1
+libopencv_stitching.so.4.2 libopencv-4.2.0_1
+libopencv_photo.so.4.2 libopencv-4.2.0_1
+libopencv_video.so.4.2 libopencv-4.2.0_1
+libopencv_calib3d.so.4.2 libopencv-4.2.0_1
+libopencv_features2d.so.4.2 libopencv-4.2.0_1
+libopencv_flann.so.4.2 libopencv-4.2.0_1
+libopencv_highgui.so.4.2 libopencv-4.2.0_1
+libopencv_videoio.so.4.2 libopencv-4.2.0_1
+libopencv_imgcodecs.so.4.2 libopencv-4.2.0_1
+libopencv_imgproc.so.4.2 libopencv-4.2.0_1
+libopencv_core.so.4.2 libopencv-4.2.0_1
+libopencv_superres.so.4.2 libopencv-4.2.0_1
+libopencv_videostab.so.4.2 libopencv-4.2.0_1
+libopencv_gapi.so.4.2 libopencv-4.2.0_1
libcgmanager.so.0 libcgmanager-0.33_1
libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index fc6e169b413..ac8daeb6bc7 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
-version=3.4.8
-revision=3
+version=4.2.0
+revision=1
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -12,11 +12,11 @@ makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel"
short_desc="Computer vision and machine learning software library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Hazel Levine <rose.hazel@protonmail.ch>"
license="BSD-3-Clause"
homepage="https://opencv.org"
distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
-checksum=f0901648a1db3dc3af30e65082665921dbe998673137380450bdd91e8251b567
+checksum=9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec
case "$XBPS_TARGET_MACHINE" in
armv[56]*|mips*) makedepends+=" libatomic-devel";;
@@ -38,9 +38,8 @@ libopencv-devel_package() {
depends="libopencv>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- vmove usr/share/OpenCV
+ vmove usr/share/opencv4
}
}
From e7d85e1b0a68742f1467dfe0ce7f92df10b59a1b Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sun, 19 Jan 2020 15:53:26 -0500
Subject: [PATCH 2/6] actiona: bump revision for opencv 4.2.0
---
srcpkgs/actiona/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index e90d9c6e013..035be1f3366 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -1,7 +1,7 @@
# Template file for 'actiona'
pkgname=actiona
version=3.10.0
-revision=1
+revision=2
build_style=qmake
hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake"
makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
From 4f168e77721a113fa942d7ec7eee987967f544c1 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sun, 19 Jan 2020 15:53:53 -0500
Subject: [PATCH 3/6] digikam: bump revision for opencv 4.2.0
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index fa581ed3b74..47da2c674da 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=6.4.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config bison flex"
makedepends="qt5-devel libjpeg-turbo-devel qt5-plugin-mysql qt5-plugin-odbc
From 8536e00de1e1f59752bfba4d181dab0473fb6e30 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sun, 19 Jan 2020 15:54:17 -0500
Subject: [PATCH 4/6] gmic: bump revision for opencv 4.2.0
---
srcpkgs/gmic/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 58498e25ea0..8170219885d 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
# Template file for 'gmic'
pkgname=gmic
version=2.8.0
-revision=1
+revision=2
build_wrksrc="src"
build_style=gnu-makefile
hostmakedepends="pkg-config gimp"
From 3da7a1d82b2fb2ea5c620f33d66db870bece2f72 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sun, 19 Jan 2020 15:54:36 -0500
Subject: [PATCH 5/6] nomacs: bump revision for opencv 4.2.0
---
srcpkgs/nomacs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 7f825a118c7..8af0362de89 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
# Template file for 'nomacs'
pkgname=nomacs
version=3.12
-revision=3
+revision=4
build_wrksrc=ImageLounge
build_style=cmake
configure_args="-DENABLE_TRANSLATIONS=1 -DUSE_SYSTEM_QUAZIP=1"
From f39bf4fb91d06f9448ee80a2b44a54ac5c55e679 Mon Sep 17 00:00:00 2001
From: Hazel Levine <rose.hazel@protonmail.ch>
Date: Sun, 19 Jan 2020 15:54:52 -0500
Subject: [PATCH 6/6] waifu2x-converter-cpp: bump revision for opencv 4.2.0
---
srcpkgs/waifu2x-converter-cpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 70d4a134836..20bb49fdf5f 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,7 +1,7 @@
# Template file for 'waifu2x-converter-cpp'
pkgname=waifu2x-converter-cpp
version=5.2.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DINSTALL_MODELS=ON"
hostmakedepends="pkg-config"
next prev parent reply other threads:[~2020-01-19 20:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 1:14 [PR PATCH] " voidlinux-github
2020-01-19 18:41 ` voidlinux-github
2020-01-19 20:17 ` voidlinux-github
2020-01-19 20:29 ` voidlinux-github
2020-01-19 20:31 ` voidlinux-github
2020-01-19 20:32 ` voidlinux-github
2020-01-19 20:38 ` voidlinux-github
2020-01-19 20:43 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-19 20:45 ` voidlinux-github
2020-01-19 20:46 ` voidlinux-github
2020-01-19 20:55 ` voidlinux-github [this message]
2020-01-19 21:02 ` [PR PATCH] [Updated] opencv: update to 4.2.0 and add opencv_contrib voidlinux-github
2020-01-19 21:03 ` voidlinux-github
2020-01-19 21:03 ` voidlinux-github
2020-01-20 1:24 ` voidlinux-github
2020-01-20 3:59 ` voidlinux-github
2020-01-21 16:12 ` voidlinux-github
2020-01-21 17:56 ` voidlinux-github
2020-01-21 17:59 ` voidlinux-github
2020-01-21 18:00 ` voidlinux-github
2020-01-21 18:00 ` voidlinux-github
2020-01-21 18:09 ` voidlinux-github
2020-01-21 18:11 ` voidlinux-github
2020-01-21 18:17 ` voidlinux-github
2020-01-21 18:18 ` voidlinux-github
2020-01-21 18:23 ` voidlinux-github
2020-01-21 19:39 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-21 19:40 ` voidlinux-github
2020-01-21 21:59 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-21 21:59 ` voidlinux-github
2020-01-27 14:52 ` voidlinux-github
2020-01-27 15:21 ` voidlinux-github
2020-01-27 15:52 ` voidlinux-github
2020-01-27 16:04 ` voidlinux-github
2020-01-27 16:19 ` voidlinux-github
2020-01-27 16:57 ` voidlinux-github
2020-01-27 16:59 ` voidlinux-github
2020-01-27 17:06 ` [WIP] " voidlinux-github
2020-01-27 19:50 ` [PR PATCH] [Updated] [WIP] New package: opencv4 4.2.0 voidlinux-github
2020-01-27 19:52 ` voidlinux-github
2020-01-30 11:27 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200119205516.Qu1n9JmoIA7NWVcCpglN5T1DNesE2Cv9WxS0DVvGhIs@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).