* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
@ 2020-01-19 18:41 ` voidlinux-github
2020-01-19 20:17 ` voidlinux-github
` (38 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576033581
Comment:
To do that, would these packages just be bumped a revision? Not entirely sure what you mean.
In addition, I'm going to be adding `opencv-contrib` to this package, so hold tight.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
2020-01-19 18:41 ` voidlinux-github
@ 2020-01-19 20:17 ` voidlinux-github
2020-01-19 20:29 ` voidlinux-github
` (37 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576042418
Comment:
Exactly. Please also add [ci skip] to the git comment of the last commit since even opencv itself is to massive to be built within the travis timeout. This PR needs to be tested manually before merge.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 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
` (36 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576043599
Comment:
Should I make a separate commit for including `opencv_contrib` and bumping these package revisions, or should I split them up?
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (2 preceding siblings ...)
2020-01-19 20:29 ` voidlinux-github
@ 2020-01-19 20:31 ` voidlinux-github
2020-01-19 20:32 ` voidlinux-github
` (35 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576043703
Comment:
One commit for each revision bump please. Adding a new package usually also is a separate commit.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (3 preceding siblings ...)
2020-01-19 20:31 ` voidlinux-github
@ 2020-01-19 20:32 ` voidlinux-github
2020-01-19 20:38 ` voidlinux-github
` (34 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576043794
Comment:
`opencv_contrib` isn't a separate package, though -- it's built and included at compile-time with `opencv`, and I don't believe it's possible to split them.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (4 preceding siblings ...)
2020-01-19 20:32 ` voidlinux-github
@ 2020-01-19 20:38 ` voidlinux-github
2020-01-19 20:43 ` [PR PATCH] [Updated] " voidlinux-github
` (33 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576044365
Comment:
Then it is OK to include it with the update commit. Just add the information that the package is added to the commit title or comment.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (5 preceding siblings ...)
2020-01-19 20:38 ` voidlinux-github
@ 2020-01-19 20:43 ` voidlinux-github
2020-01-19 20:45 ` voidlinux-github
` (32 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:43 UTC (permalink / raw)
To: ml
[-- 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: 3732 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] 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
}
}
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (6 preceding siblings ...)
2020-01-19 20:43 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-19 20:45 ` voidlinux-github
2020-01-19 20:46 ` voidlinux-github
` (31 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576044993
Comment:
Commit dc67ed9 has the configure argument `-DBUILD_opencv_rgbd=OFF`, as it appeared top be missing a library. A similar issue was found here:
https://github.com/opencv/opencv_contrib/issues/2144
albeit no symlink of this nature was found on my system.
The rest of the project compiles without the `rgbd` module.
Not sure what to do about that.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (7 preceding siblings ...)
2020-01-19 20:45 ` voidlinux-github
@ 2020-01-19 20:46 ` voidlinux-github
2020-01-19 20:55 ` [PR PATCH] [Updated] " voidlinux-github
` (30 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576044993
Comment:
Commit dc67ed9 has the configure argument `-DBUILD_opencv_rgbd=OFF`, as it appeared to be missing part of `eigen`. A similar issue was found here:
https://github.com/opencv/opencv_contrib/issues/2144
albeit no symlink of this nature was found on my system.
The rest of the project compiles without the `rgbd` module.
Not sure what to do about that.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] opencv: update to 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (8 preceding siblings ...)
2020-01-19 20:46 ` voidlinux-github
@ 2020-01-19 20:55 ` voidlinux-github
2020-01-19 21:02 ` [PR PATCH] [Updated] opencv: update to 4.2.0 and add opencv_contrib voidlinux-github
` (29 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 20:55 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (9 preceding siblings ...)
2020-01-19 20:55 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-19 21:02 ` voidlinux-github
2020-01-19 21:03 ` voidlinux-github
` (28 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 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 and add opencv_contrib.
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: 9223 bytes --]
From 32af6b1388f78b6582ee5b6c87076a0167c34d7f 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 | 64 ++++++++++++++++++++++++++++++-----------
srcpkgs/opencv/template | 23 ++++++++-------
2 files changed, 60 insertions(+), 27 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 889115c8112..31986baac36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1975,23 +1975,53 @@ 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_quality.so.4.2 libopencv-4.2.0_1
+libopencv_reg.so.4.2 libopencv-4.2.0_1
+libopencv_surface_matching.so.4.2 libopencv-4.2.0_1
+libopencv_xphoto.so.4.2 libopencv-4.2.0_1
+libopencv_freetype.so.4.2 libopencv-4.2.0_1
+libopencv_fuzzy.so.4.2 libopencv-4.2.0_1
+libopencv_hfs.so.4.2 libopencv-4.2.0_1
+libopencv_img_hash.so.4.2 libopencv-4.2.0_1
+libopencv_line_descriptor.so.4.2 libopencv-4.2.0_1
+libopencv_saliency.so.4.2 libopencv-4.2.0_1
+libopencv_structured_light.so.4.2 libopencv-4.2.0_1
+libopencv_aruco.so.4.2 libopencv-4.2.0_1
+libopencv_bgsegm.so.4.2 libopencv-4.2.0_1
+libopencv_bioinspired.so.4.2 libopencv-4.2.0_1
+libopencv_ccalib.so.4.2 libopencv-4.2.0_1
+libopencv_face.so.4.2 libopencv-4.2.0_1
+libopencv_tracking.so.4.2 libopencv-4.2.0_1
+libopencv_xfeatures2d.so.4.2 libopencv-4.2.0_1
+libopencv_optflow.so.4.2 libopencv-4.2.0_1
+libopencv_ximgproc.so.4.2 libopencv-4.2.0_1
+libopencv_plot.so.4.2 libopencv-4.2.0_1
+libopencv_text.so.4.2 libopencv-4.2.0_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
+libopencv_xobjdetect.so.4.2 libopencv-4.2.0_1
+libopencv_datasets.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_objdetect.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_superres.so.4.2 libopencv-4.2.0_1
+libopencv_dpm.so.4.2 libopencv-4.2.0_1
+libopencv_phase_unwrapping.so.4.2 libopencv-4.2.0_1
+libopencv_stereo.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..048daba612f 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,22 +1,26 @@
# 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
+configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
+ -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
-DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}"
+ -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}
+ -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
+ -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen"
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
+distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
+checksum="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec
+ 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020"
case "$XBPS_TARGET_MACHINE" in
armv[56]*|mips*) makedepends+=" libatomic-devel";;
@@ -38,9 +42,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 a4ba235346ebb5183c0f4940a6eeb805e1a19022 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 697439196a01cd81a291156f056805f7261bd3da 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 ad0d5583304b04951e11b8a096e2cc6853ed6496 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 3c9f5f9b29718eb3f78b9c26e99941c44cffec17 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 5c7ce9dc482eeb55e5847d66414f6f755be05968 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"
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (10 preceding siblings ...)
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
` (27 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576046957
Comment:
Aaaand when I force-pushed that without changing anything it removed the `[ci skip]` comment. Great. My apologies.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (11 preceding siblings ...)
2020-01-19 21:03 ` voidlinux-github
@ 2020-01-19 21:03 ` voidlinux-github
2020-01-20 1:24 ` voidlinux-github
` (26 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-19 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576046957
Comment:
Aaaand when I force-pushed that without changing anything it removed the `[ci skip]` comment. Great. My apologies.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (12 preceding siblings ...)
2020-01-19 21:03 ` voidlinux-github
@ 2020-01-20 1:24 ` voidlinux-github
2020-01-20 3:59 ` voidlinux-github
` (25 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-20 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576044993
Comment:
Commit 32af6b1 has the configure argument `-DBUILD_opencv_rgbd=OFF`, as it appeared to be missing part of `eigen`. A similar issue was found here:
https://github.com/opencv/opencv_contrib/issues/2144
albeit no symlink of this nature was found on my system.
The rest of the project compiles without the `rgbd` module.
Not sure what to do about that.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (13 preceding siblings ...)
2020-01-20 1:24 ` voidlinux-github
@ 2020-01-20 3:59 ` voidlinux-github
2020-01-21 16:12 ` voidlinux-github
` (24 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-20 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576096865
Comment:
My apologies for the CI running anyway.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (14 preceding siblings ...)
2020-01-20 3:59 ` voidlinux-github
@ 2020-01-21 16:12 ` voidlinux-github
2020-01-21 17:56 ` voidlinux-github
` (23 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 16:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576755497
Comment:
FWIW `actiona` fails to build with:
```
cd actiontools/ && ( test -e Makefile || /usr/lib/qt5/bin/qmake -o Makefile /builddir/actiona-3.10.0/actiontools/actiontools.pro PREFIX=/usr LIB=/usr/lib QMAKE_CC=cc QMAKE_CXX=g++ QMAKE_LINK=g++ QMAKE_LINK_C=cc 'QMAKE_CFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -g' 'QMAKE_CXXFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -g' 'QMAKE_LFLAGS=-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ' ) && make -f Makefile
Project ERROR: opencv development package not found
make: *** [Makefile:99: sub-actiontools-make_first-ordered] Error 3
=> ERROR: actiona-3.10.0_2: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX"' exited with 2
=> ERROR: in do_build() at common/build-style/qmake.sh:58
```
It seems that there is no `/usr/lib/pkgconfig/opencv.pc` or similar and `actiona` does not look for newer `libopencv`.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (15 preceding siblings ...)
2020-01-21 16:12 ` voidlinux-github
@ 2020-01-21 17:56 ` voidlinux-github
2020-01-21 17:59 ` voidlinux-github
` (22 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576802321
Comment:
One thing I noticed when packaging 4.x OpenCV was that /usr/lib/pkgconfig was no longer present.
According to this: https://github.com/opencv/opencv/issues/13154, removal of pkg-config functionality was an intentional change of OpenCV 4.x.
According to this issue on `actiona`'s repo: https://github.com/Jmgr/actiona/issues/90, this issue has been fixed; but only in git, not a "stable" version of the software...
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (16 preceding siblings ...)
2020-01-21 17:56 ` voidlinux-github
@ 2020-01-21 17:59 ` voidlinux-github
2020-01-21 18:00 ` voidlinux-github
` (21 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576802321
Comment:
One thing I noticed when packaging 4.x OpenCV was that /usr/lib/pkgconfig was no longer present.
According to this: https://github.com/opencv/opencv/issues/13154, removal of `pkg-config` functionality was an intentional change of OpenCV 4.x.
This can be added with a compile-time flag, but the name has been changed to `opencv4` rather than `opencv` (the latter being in `actiona`'s build scripts), so the point is moot.
According to this issue on `actiona`'s repo: https://github.com/Jmgr/actiona/issues/90, this issue has been fixed; but only in git, not a "stable" version of the software...
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (17 preceding siblings ...)
2020-01-21 17:59 ` voidlinux-github
@ 2020-01-21 18:00 ` voidlinux-github
2020-01-21 18:00 ` voidlinux-github
` (20 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576804273
Comment:
Next time we need to me careful by checking revdeps
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (18 preceding siblings ...)
2020-01-21 18:00 ` voidlinux-github
@ 2020-01-21 18:00 ` voidlinux-github
2020-01-21 18:09 ` voidlinux-github
` (19 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576804273
Comment:
Next time we need to be careful by checking revdeps
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (19 preceding siblings ...)
2020-01-21 18:00 ` voidlinux-github
@ 2020-01-21 18:09 ` voidlinux-github
2020-01-21 18:11 ` voidlinux-github
` (18 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 784 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576802321
Comment:
One thing I noticed when packaging 4.x OpenCV was that /usr/lib/pkgconfig was no longer present.
According to this: https://github.com/opencv/opencv/issues/13154, removal of `pkg-config` functionality was an intentional change of OpenCV 4.x.
This can be added with a compile-time flag, but the name has been changed to `opencv4` rather than `opencv` (the latter being in `actiona`'s build scripts), so the point is moot.
According to this issue on `actiona`'s repo: https://github.com/Jmgr/actiona/issues/90, this issue has been fixed; but only in git, not a "stable" version of the software...
[this could probably be fixed with a patch]
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (20 preceding siblings ...)
2020-01-21 18:09 ` voidlinux-github
@ 2020-01-21 18:11 ` voidlinux-github
2020-01-21 18:17 ` voidlinux-github
` (17 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576808765
Comment:
@xtraeme this PR is not yet merged so I guess we'd better wait for the next actiona release, unless someone wants to backport the change.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (21 preceding siblings ...)
2020-01-21 18:11 ` voidlinux-github
@ 2020-01-21 18:17 ` voidlinux-github
2020-01-21 18:18 ` voidlinux-github
` (16 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576811357
Comment:
it's as simple as changing a build flag for OpenCV itself and changing one name in the `.pro` so I'll give it a go
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (22 preceding siblings ...)
2020-01-21 18:17 ` voidlinux-github
@ 2020-01-21 18:18 ` voidlinux-github
2020-01-21 18:23 ` voidlinux-github
` (15 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576811545
Comment:
@pullmoll OK. Much better. Yes, wait or merge relevant changes.
Thanks pullmoll
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (23 preceding siblings ...)
2020-01-21 18:18 ` voidlinux-github
@ 2020-01-21 18:23 ` voidlinux-github
2020-01-21 19:39 ` [PR PATCH] [Updated] " voidlinux-github
` (14 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576811357
Comment:
it's as simple as changing a build flag for OpenCV itself and patching some commits in, so I'll give it a go
`actiona` hasn't been updated since mid 2018, so it's unlikely upstream will address this
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (24 preceding siblings ...)
2020-01-21 18:23 ` voidlinux-github
@ 2020-01-21 19:39 ` voidlinux-github
2020-01-21 19:40 ` voidlinux-github
` (13 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 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 and add opencv_contrib.
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: 9203 bytes --]
From ddeba1b93c8210d3bf9b28e5da9490ed163e94a0 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 | 64 ++++++++++++++++++++++++++++++-----------
srcpkgs/opencv/template | 23 +++++++++------
2 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 889115c8112..31986baac36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1975,23 +1975,53 @@ 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_quality.so.4.2 libopencv-4.2.0_1
+libopencv_reg.so.4.2 libopencv-4.2.0_1
+libopencv_surface_matching.so.4.2 libopencv-4.2.0_1
+libopencv_xphoto.so.4.2 libopencv-4.2.0_1
+libopencv_freetype.so.4.2 libopencv-4.2.0_1
+libopencv_fuzzy.so.4.2 libopencv-4.2.0_1
+libopencv_hfs.so.4.2 libopencv-4.2.0_1
+libopencv_img_hash.so.4.2 libopencv-4.2.0_1
+libopencv_line_descriptor.so.4.2 libopencv-4.2.0_1
+libopencv_saliency.so.4.2 libopencv-4.2.0_1
+libopencv_structured_light.so.4.2 libopencv-4.2.0_1
+libopencv_aruco.so.4.2 libopencv-4.2.0_1
+libopencv_bgsegm.so.4.2 libopencv-4.2.0_1
+libopencv_bioinspired.so.4.2 libopencv-4.2.0_1
+libopencv_ccalib.so.4.2 libopencv-4.2.0_1
+libopencv_face.so.4.2 libopencv-4.2.0_1
+libopencv_tracking.so.4.2 libopencv-4.2.0_1
+libopencv_xfeatures2d.so.4.2 libopencv-4.2.0_1
+libopencv_optflow.so.4.2 libopencv-4.2.0_1
+libopencv_ximgproc.so.4.2 libopencv-4.2.0_1
+libopencv_plot.so.4.2 libopencv-4.2.0_1
+libopencv_text.so.4.2 libopencv-4.2.0_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
+libopencv_xobjdetect.so.4.2 libopencv-4.2.0_1
+libopencv_datasets.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_objdetect.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_superres.so.4.2 libopencv-4.2.0_1
+libopencv_dpm.so.4.2 libopencv-4.2.0_1
+libopencv_phase_unwrapping.so.4.2 libopencv-4.2.0_1
+libopencv_stereo.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..0d8a0d5fcf7 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,22 +1,27 @@
# 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
+configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
+ -DOPENCV_GENERATE_PKGCONFIG=YES
+ -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
-DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}"
+ -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}
+ -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
+ -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen"
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
+distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
+checksum="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec
+ 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020"
case "$XBPS_TARGET_MACHINE" in
armv[56]*|mips*) makedepends+=" libatomic-devel";;
@@ -40,7 +45,7 @@ libopencv-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- vmove usr/share/OpenCV
+ vmove usr/share/opencv4
}
}
From 62c42b5ef02daddf29c36ba1f7ebfd734ba679ae 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 fb6c6635af5057ed452c2f30928cb9102bd4ebfe 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 d0f2369be9f5e009550db26a7957a81acb3dfe2c 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 2629e6d232ed5ed34da905b99a0070f176455587 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 abba2aa82e235a2233edaa550cba3e0edcb0f2da 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
[ci skip]
---
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"
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (25 preceding siblings ...)
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
` (12 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576845836
Comment:
`pkg-config` support has been enabled, will work on back-porting changes for `actiona` later.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (26 preceding siblings ...)
2020-01-21 19:40 ` voidlinux-github
@ 2020-01-21 21:59 ` voidlinux-github
2020-01-21 21:59 ` voidlinux-github
` (11 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 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 and add opencv_contrib.
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: 12257 bytes --]
From ddeba1b93c8210d3bf9b28e5da9490ed163e94a0 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 | 64 ++++++++++++++++++++++++++++++-----------
srcpkgs/opencv/template | 23 +++++++++------
2 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 889115c8112..31986baac36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1975,23 +1975,53 @@ 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_quality.so.4.2 libopencv-4.2.0_1
+libopencv_reg.so.4.2 libopencv-4.2.0_1
+libopencv_surface_matching.so.4.2 libopencv-4.2.0_1
+libopencv_xphoto.so.4.2 libopencv-4.2.0_1
+libopencv_freetype.so.4.2 libopencv-4.2.0_1
+libopencv_fuzzy.so.4.2 libopencv-4.2.0_1
+libopencv_hfs.so.4.2 libopencv-4.2.0_1
+libopencv_img_hash.so.4.2 libopencv-4.2.0_1
+libopencv_line_descriptor.so.4.2 libopencv-4.2.0_1
+libopencv_saliency.so.4.2 libopencv-4.2.0_1
+libopencv_structured_light.so.4.2 libopencv-4.2.0_1
+libopencv_aruco.so.4.2 libopencv-4.2.0_1
+libopencv_bgsegm.so.4.2 libopencv-4.2.0_1
+libopencv_bioinspired.so.4.2 libopencv-4.2.0_1
+libopencv_ccalib.so.4.2 libopencv-4.2.0_1
+libopencv_face.so.4.2 libopencv-4.2.0_1
+libopencv_tracking.so.4.2 libopencv-4.2.0_1
+libopencv_xfeatures2d.so.4.2 libopencv-4.2.0_1
+libopencv_optflow.so.4.2 libopencv-4.2.0_1
+libopencv_ximgproc.so.4.2 libopencv-4.2.0_1
+libopencv_plot.so.4.2 libopencv-4.2.0_1
+libopencv_text.so.4.2 libopencv-4.2.0_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
+libopencv_xobjdetect.so.4.2 libopencv-4.2.0_1
+libopencv_datasets.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_objdetect.so.4.2 libopencv-4.2.0_1
+libopencv_dnn_superres.so.4.2 libopencv-4.2.0_1
+libopencv_dpm.so.4.2 libopencv-4.2.0_1
+libopencv_phase_unwrapping.so.4.2 libopencv-4.2.0_1
+libopencv_stereo.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..0d8a0d5fcf7 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,22 +1,27 @@
# 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
+configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
+ -DOPENCV_GENERATE_PKGCONFIG=YES
+ -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
-DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}"
+ -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}
+ -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
+ -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen"
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
+distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
+checksum="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec
+ 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020"
case "$XBPS_TARGET_MACHINE" in
armv[56]*|mips*) makedepends+=" libatomic-devel";;
@@ -40,7 +45,7 @@ libopencv-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- vmove usr/share/OpenCV
+ vmove usr/share/opencv4
}
}
From 13be0816db242078100ef2abe7c54a429843194a 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: patch for opencv 4.x
---
srcpkgs/actiona/patches/opencv4-compat.patch | 86 ++++++++++++++++++++
srcpkgs/actiona/template | 2 +-
2 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/actiona/patches/opencv4-compat.patch
diff --git a/srcpkgs/actiona/patches/opencv4-compat.patch b/srcpkgs/actiona/patches/opencv4-compat.patch
new file mode 100644
index 00000000000..35166f88859
--- /dev/null
+++ b/srcpkgs/actiona/patches/opencv4-compat.patch
@@ -0,0 +1,86 @@
+--- actiona.pro 2018-07-17 14:29:12.000000000 -0400
++++ actiona.pro 2020-01-21 16:25:05.202902174 -0500
+@@ -11,7 +11,7 @@
+ !system(pkg-config --exists 'xtst') {
+ error(Please install libxtst-dev)
+ }
+- !system(pkg-config --exists 'opencv') {
++ !system(pkg-config --exists 'opencv4') {
+ error(Please install libopencv-dev)
+ }
+ }
+--- actiontools/actiontools.pro 2018-07-17 14:29:12.000000000 -0400
++++ actiontools/actiontools.pro 2020-01-21 16:25:34.842901171 -0500
+@@ -6,7 +6,7 @@
+ TEMPLATE = lib
+ CONFIG += dll
+ unix:CONFIG += link_pkgconfig
+-unix:PKGCONFIG += opencv
++unix:PKGCONFIG += opencv4
+ DEFINES += ACTIONTOOLS_LIBRARY
+ TARGET = actiontools
+ DESTDIR = ..
+--- actiontools/opencvalgorithms.cpp 2018-07-17 14:29:12.000000000 -0400
++++ actiontools/opencvalgorithms.cpp 2020-01-21 16:27:45.586896745 -0500
+@@ -350,7 +350,7 @@
+
+ #if CV_MAJOR_VERSION == 2
+ const Mat &matImage = image;
+-#elif CV_MAJOR_VERSION == 3
++#elif CV_MAJOR_VERSION >= 3
+ cv::Mat matImage = image.getMat(cv::ACCESS_READ);
+ #endif
+
+@@ -394,7 +394,7 @@
+ {
+ #if CV_MAJOR_VERSION == 2
+ const cv::Mat &matImage = image;
+-#elif CV_MAJOR_VERSION == 3
++#elif CV_MAJOR_VERSION >= 3
+ cv::Mat matImage = image.getMat(cv::ACCESS_READ);
+ #endif
+
+@@ -411,7 +411,7 @@
+
+ #if CV_MAJOR_VERSION == 2
+ return back;
+-#elif CV_MAJOR_VERSION == 3
++#elif CV_MAJOR_VERSION >= 3
+ return back.getUMat(cv::ACCESS_RW);
+ #endif
+ }
+@@ -420,6 +420,7 @@
+ {
+ switch(method)
+ {
++#if CV_MAJOR_VERSION < 4
+ default:
+ case ActionTools::OpenCVAlgorithms::CorrelationCoefficientMethod:
+ return CV_TM_CCOEFF_NORMED;
+@@ -427,6 +428,15 @@
+ return CV_TM_CCORR_NORMED;
+ case ActionTools::OpenCVAlgorithms::SquaredDifferenceMethod:
+ return CV_TM_SQDIFF_NORMED;
++#else
++ default:
++ case ActionTools::OpenCVAlgorithms::CorrelationCoefficientMethod:
++ return cv::TM_CCOEFF_NORMED;
++ case ActionTools::OpenCVAlgorithms::CrossCorrelationMethod:
++ return cv::TM_CCORR_NORMED;
++ case ActionTools::OpenCVAlgorithms::SquaredDifferenceMethod:
++ return cv::TM_SQDIFF_NORMED;
++#endif
+ }
+ }
+ }
+--- actiontools/opencvalgorithms_private.h 2018-07-17 14:29:12.000000000 -0400
++++ actiontools/opencvalgorithms_private.h 2020-01-21 16:28:03.656896134 -0500
+@@ -33,7 +33,7 @@
+ }
+
+ using Mat = cv::Mat;
+-#elif CV_MAJOR_VERSION == 3
++#elif CV_MAJOR_VERSION >= 3
+ namespace cv
+ {
+ class UMat;
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 9ba351124a822c41205e2f90b10c0226322758e9 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 1bd457a74f4e9eae396fb5f7490216d2592b81c7 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 d8aa8ea9004162764ad0b2c5a8549eb928a3c115 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 973f9bda2bc8f9885746d00013db1316b2369a69 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
[ci skip]
---
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"
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (27 preceding siblings ...)
2020-01-21 21:59 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-21 21:59 ` voidlinux-github
2020-01-27 14:52 ` voidlinux-github
` (10 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-21 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-576902982
Comment:
Patched, and builds on my machine (x86_64 glibc).
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (28 preceding siblings ...)
2020-01-21 21:59 ` voidlinux-github
@ 2020-01-27 14:52 ` voidlinux-github
2020-01-27 15:21 ` voidlinux-github
` (9 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 14:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578785649
Comment:
Any update on the status of this PR? I'm sorry to bump, and I'm willing to leave this package to myself, if need be.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (29 preceding siblings ...)
2020-01-27 14:52 ` voidlinux-github
@ 2020-01-27 15:21 ` voidlinux-github
2020-01-27 15:52 ` voidlinux-github
` (8 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578799114
Comment:
I'll retry to build the PR here.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (30 preceding siblings ...)
2020-01-27 15:21 ` voidlinux-github
@ 2020-01-27 15:52 ` voidlinux-github
2020-01-27 16:04 ` voidlinux-github
` (7 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578813163
Comment:
Humm.. the `opencv4-compat.patch` for `actiona` fails to apply here.
It seems this has to do with MSDOS line endings in `actiona.pro`. I'll try to fix that patch here.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (31 preceding siblings ...)
2020-01-27 15:52 ` voidlinux-github
@ 2020-01-27 16:04 ` voidlinux-github
2020-01-27 16:19 ` voidlinux-github
` (6 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 16:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578819174
Comment:
`digikam` does not detect `opencv4` and also needs a patch.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (32 preceding siblings ...)
2020-01-27 16:04 ` voidlinux-github
@ 2020-01-27 16:19 ` voidlinux-github
2020-01-27 16:57 ` voidlinux-github
` (5 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578826497
Comment:
Sorry but trying to fix this is taking too much of my time. @ralsei you need to make sure the revbumps actually work before setting this PR to active. As it is this PR cannot be merged.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (33 preceding siblings ...)
2020-01-27 16:19 ` voidlinux-github
@ 2020-01-27 16:57 ` voidlinux-github
2020-01-27 16:59 ` voidlinux-github
` (4 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578845188
Comment:
Is it possible to package this as `opencv4`, `libopencv4`, etc? There's nothing that's explicitly stopping OpenCV 3.x and 4.x from coexisting on the same system, given the separate install directory.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (34 preceding siblings ...)
2020-01-27 16:57 ` voidlinux-github
@ 2020-01-27 16:59 ` voidlinux-github
2020-01-27 17:06 ` [WIP] " voidlinux-github
` (3 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578845188
Comment:
Is it possible to package this as `opencv4`, `libopencv4`, etc? There's nothing that's explicitly stopping OpenCV 3.x and 4.x from coexisting on the same system, given the separate install directory.
If I do this, should I set up a separate PR?
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [WIP] opencv: update to 4.2.0 and add opencv_contrib.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (35 preceding siblings ...)
2020-01-27 16:59 ` voidlinux-github
@ 2020-01-27 17:06 ` voidlinux-github
2020-01-27 19:50 ` [PR PATCH] [Updated] [WIP] New package: opencv4 4.2.0 voidlinux-github
` (2 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578849558
Comment:
@ralsei This would make sense. We can then switch packages from `opencv` to `opencv4` whenever they support it. You can modify this PR to create a new package `opencv4` and drop any revbumps.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: opencv4 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (36 preceding siblings ...)
2020-01-27 17:06 ` [WIP] " voidlinux-github
@ 2020-01-27 19:50 ` voidlinux-github
2020-01-27 19:52 ` voidlinux-github
2020-01-30 11:27 ` [PR PATCH] [Merged]: " voidlinux-github
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 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
[WIP] New package: opencv4 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: 7830 bytes --]
From 494ab5cfca43b2199d6e222af2803544127e2b39 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] New package: opencv4 4.2.0.
[ci skip]
---
common/shlibs | 47 ++++++++++++
srcpkgs/libopencv4 | 1 +
srcpkgs/libopencv4-devel | 1 +
srcpkgs/libopencv4-python | 1 +
srcpkgs/libopencv4-python3 | 1 +
.../patches/undef-altivec-macros-cpp.patch | 16 ++++
srcpkgs/opencv4/template | 73 +++++++++++++++++++
7 files changed, 140 insertions(+)
create mode 120000 srcpkgs/libopencv4
create mode 120000 srcpkgs/libopencv4-devel
create mode 120000 srcpkgs/libopencv4-python
create mode 120000 srcpkgs/libopencv4-python3
create mode 100644 srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch
create mode 100644 srcpkgs/opencv4/template
diff --git a/common/shlibs b/common/shlibs
index 889115c8112..18e0dd2b175 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1992,6 +1992,53 @@ 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_quality.so.4.2 libopencv4-4.2.0_1
+libopencv_reg.so.4.2 libopencv4-4.2.0_1
+libopencv_surface_matching.so.4.2 libopencv4-4.2.0_1
+libopencv_xphoto.so.4.2 libopencv4-4.2.0_1
+libopencv_freetype.so.4.2 libopencv4-4.2.0_1
+libopencv_fuzzy.so.4.2 libopencv4-4.2.0_1
+libopencv_hfs.so.4.2 libopencv4-4.2.0_1
+libopencv_img_hash.so.4.2 libopencv4-4.2.0_1
+libopencv_line_descriptor.so.4.2 libopencv4-4.2.0_1
+libopencv_saliency.so.4.2 libopencv4-4.2.0_1
+libopencv_structured_light.so.4.2 libopencv4-4.2.0_1
+libopencv_aruco.so.4.2 libopencv4-4.2.0_1
+libopencv_bgsegm.so.4.2 libopencv4-4.2.0_1
+libopencv_bioinspired.so.4.2 libopencv4-4.2.0_1
+libopencv_ccalib.so.4.2 libopencv4-4.2.0_1
+libopencv_face.so.4.2 libopencv4-4.2.0_1
+libopencv_tracking.so.4.2 libopencv4-4.2.0_1
+libopencv_xfeatures2d.so.4.2 libopencv4-4.2.0_1
+libopencv_optflow.so.4.2 libopencv4-4.2.0_1
+libopencv_ximgproc.so.4.2 libopencv4-4.2.0_1
+libopencv_plot.so.4.2 libopencv4-4.2.0_1
+libopencv_text.so.4.2 libopencv4-4.2.0_1
+libopencv_ml.so.4.2 libopencv4-4.2.0_1
+libopencv_objdetect.so.4.2 libopencv4-4.2.0_1
+libopencv_dnn.so.4.2 libopencv4-4.2.0_1
+libopencv_shape.so.4.2 libopencv4-4.2.0_1
+libopencv_stitching.so.4.2 libopencv4-4.2.0_1
+libopencv_photo.so.4.2 libopencv4-4.2.0_1
+libopencv_video.so.4.2 libopencv4-4.2.0_1
+libopencv_calib3d.so.4.2 libopencv4-4.2.0_1
+libopencv_features2d.so.4.2 libopencv4-4.2.0_1
+libopencv_flann.so.4.2 libopencv4-4.2.0_1
+libopencv_highgui.so.4.2 libopencv4-4.2.0_1
+libopencv_videoio.so.4.2 libopencv4-4.2.0_1
+libopencv_imgcodecs.so.4.2 libopencv4-4.2.0_1
+libopencv_imgproc.so.4.2 libopencv4-4.2.0_1
+libopencv_core.so.4.2 libopencv4-4.2.0_1
+libopencv_superres.so.4.2 libopencv4-4.2.0_1
+libopencv_videostab.so.4.2 libopencv4-4.2.0_1
+libopencv_gapi.so.4.2 libopencv4-4.2.0_1
+libopencv_xobjdetect.so.4.2 libopencv4-4.2.0_1
+libopencv_datasets.so.4.2 libopencv4-4.2.0_1
+libopencv_dnn_objdetect.so.4.2 libopencv4-4.2.0_1
+libopencv_dnn_superres.so.4.2 libopencv4-4.2.0_1
+libopencv_dpm.so.4.2 libopencv4-4.2.0_1
+libopencv_phase_unwrapping.so.4.2 libopencv4-4.2.0_1
+libopencv_stereo.so.4.2 libopencv4-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/libopencv4 b/srcpkgs/libopencv4
new file mode 120000
index 00000000000..84ec4806fc8
--- /dev/null
+++ b/srcpkgs/libopencv4
@@ -0,0 +1 @@
+opencv4
\ No newline at end of file
diff --git a/srcpkgs/libopencv4-devel b/srcpkgs/libopencv4-devel
new file mode 120000
index 00000000000..84ec4806fc8
--- /dev/null
+++ b/srcpkgs/libopencv4-devel
@@ -0,0 +1 @@
+opencv4
\ No newline at end of file
diff --git a/srcpkgs/libopencv4-python b/srcpkgs/libopencv4-python
new file mode 120000
index 00000000000..84ec4806fc8
--- /dev/null
+++ b/srcpkgs/libopencv4-python
@@ -0,0 +1 @@
+opencv4
\ No newline at end of file
diff --git a/srcpkgs/libopencv4-python3 b/srcpkgs/libopencv4-python3
new file mode 120000
index 00000000000..84ec4806fc8
--- /dev/null
+++ b/srcpkgs/libopencv4-python3
@@ -0,0 +1 @@
+opencv4
\ No newline at end of file
diff --git a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch
new file mode 100644
index 00000000000..67dd2a7a6da
--- /dev/null
+++ b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch
@@ -0,0 +1,16 @@
+This is necessary because otherwise conflicts are introduced in C++ code that
+includes this. The header itself does not rely on the macros. The issue is not
+visible on little endian because they undef the macros somewhere else.
+
+--- 3rdparty/include/opencl/1.2/CL/cl_platform.h
++++ 3rdparty/include/opencl/1.2/CL/cl_platform.h
+@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum;
+ /* Define basic vector types */
+ #if defined( __VEC__ )
+ #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
++ #undef vector
++ #undef pixel
++ #undef bool
+ typedef __vector unsigned char __cl_uchar16;
+ typedef __vector signed char __cl_char16;
+ typedef __vector unsigned short __cl_ushort8;
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
new file mode 100644
index 00000000000..27532a4af38
--- /dev/null
+++ b/srcpkgs/opencv4/template
@@ -0,0 +1,73 @@
+# Template file for 'opencv4'
+pkgname=opencv4
+version=4.2.0
+revision=1
+wrksrc=opencv-${version}
+build_style=cmake
+configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
+ -DOPENCV_GENERATE_PKGCONFIG=YES
+ -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
+ -DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib}
+ -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}
+ -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
+ -DBUILD_opencv_rgbd=OFF"
+hostmakedepends="pkg-config eigen"
+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, version 4.x"
+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
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
+checksum="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec
+ 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020"
+
+case "$XBPS_TARGET_MACHINE" in
+ armv[56]*|mips*) makedepends+=" libatomic-devel";;
+esac
+
+post_install() {
+ vlicense LICENSE
+}
+
+libopencv4_package() {
+ short_desc+=" - library files"
+ pkg_install() {
+ vmove usr/lib/*.so.*
+ }
+}
+
+libopencv4-devel_package() {
+ short_desc+=" - development files"
+ depends="libopencv4>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/*.so
+ vmove usr/share/opencv4
+ }
+}
+
+if [ -z "$CROSS_BUILD" ]; then
+ # because python-numpy cannot be cross compiled
+ hostmakedepends+=" python-devel python3-devel"
+ makedepends+=" python-numpy python3-numpy"
+
+ libopencv4-python_package() {
+ short_desc+=" - Python2 bindings"
+ depends="python-numpy"
+ pkg_install() {
+ vmove usr/lib/python2.7
+ }
+ }
+
+ libopencv4-python3_package() {
+ short_desc+=" - Python3 bindings"
+ depends="python3-numpy"
+ pkg_install() {
+ vmove usr/lib/python3*
+ }
+ }
+fi
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: New package: opencv4 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (37 preceding siblings ...)
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
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-27 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by ralsei on void-packages repository
https://github.com/void-linux/void-packages/pull/18386#issuecomment-578921966
Comment:
OpenCV 3.x and 4.x now coexist on my system.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PR PATCH] [Merged]: New package: opencv4 4.2.0.
2020-01-19 1:14 [PR PATCH] opencv: update to 4.2.0 voidlinux-github
` (38 preceding siblings ...)
2020-01-27 19:52 ` voidlinux-github
@ 2020-01-30 11:27 ` voidlinux-github
39 siblings, 0 replies; 41+ messages in thread
From: voidlinux-github @ 2020-01-30 11:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
There's a merged pull request on the void-packages repository
New package: opencv4 4.2.0.
https://github.com/void-linux/void-packages/pull/18386
Description:
^ permalink raw reply [flat|nested] 41+ messages in thread