From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libopencv(4)-python: remove packages
Date: Fri, 12 Aug 2022 05:53:51 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38628@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages python/opencv
https://github.com/void-linux/void-packages/pull/38628
libopencv(4)-python: remove packages
- libopencv-python: remove package.
- libopencv4-python: remove package.
Neither package has any revdeps. Part of the ongoing python2 cleanup.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly** (builds)
A patch file from https://github.com/void-linux/void-packages/pull/38628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python/opencv-38628.patch --]
[-- Type: text/x-diff, Size: 6073 bytes --]
From 023f4db297e5b26bcd7dfdac936edf18ca44c77e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 11 Aug 2022 23:47:59 -0400
Subject: [PATCH 1/2] libopencv-python: remove package.
python 2, no revdeps.
---
srcpkgs/opencv/template | 23 ++++++-----------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2a7fdcec46aa 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,22 +1,21 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
- -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
-hostmakedepends="pkg-config eigen python-numpy python3-numpy"
+ -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}"
+hostmakedepends="pkg-config eigen python3-numpy"
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
- python-numpy python3-numpy python-devel python3-devel"
+ python3-numpy python3-devel"
short_desc="Computer vision and machine learning software library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://opencv.org"
-distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
+distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz"
checksum=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -31,9 +30,7 @@ fi
if [ "$CROSS_BUILD" ]; then
# Tell opencv where to find python and numpy
_npincdir="numpy/core/include"
- configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc}
- -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir}
- -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
+ configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
-DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}"
fi
@@ -64,14 +61,6 @@ libopencv-devel_package() {
}
}
-libopencv-python_package() {
- short_desc+=" - Python2 bindings"
- depends="python-numpy"
- pkg_install() {
- vmove usr/lib/python2.7
- }
-}
-
libopencv-python3_package() {
short_desc+=" - Python3 bindings"
depends="python3-numpy"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30cb55c291fb..79e46ebd0a9e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -230,6 +230,7 @@ replaces="
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
libmagick6<=6.9.12.12_2
+ libopencv-python<=3.4.15_1
libpyside-python3<=5.15.0_2
libqmatrixclient-devel<=0.5.3.2_1
libqmatrixclient<=0.5.3.2_1
From d2ae5175532811b07ecae677fb0ade1fa132dbf4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 11 Aug 2022 23:51:09 -0400
Subject: [PATCH 2/2] libopencv4-python: remove package.
python 2, no revdeps.
---
srcpkgs/opencv4/template | 22 +++++-----------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7021304915b8 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,21 +1,20 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
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_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
-hostmakedepends="pkg-config eigen python-numpy python3-numpy"
+hostmakedepends="pkg-config eigen python3-numpy"
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
- python-numpy python3-numpy python-devel python3-devel"
+ python3-numpy python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
maintainer="Hazel Levine <me@qtp2t.club>"
license="BSD-3-Clause"
@@ -36,11 +35,8 @@ fi
if [ "$CROSS_BUILD" ]; then
# Tell opencv where to find python and numpy
- _npincdir="numpy/core/include"
- configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc}
- -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir}
- -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
- -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}"
+ configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
+ -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -72,14 +68,6 @@ libopencv4-devel_package() {
}
}
-libopencv4-python_package() {
- short_desc+=" - Python2 bindings"
- depends="python-numpy"
- pkg_install() {
- vmove ${py2_sitelib}
- }
-}
-
libopencv4-python3_package() {
short_desc+=" - Python3 bindings"
depends="python3-numpy"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e46ebd0a9e..e3b0f1b54888 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -231,6 +231,7 @@ replaces="
libmagick6-perl<=6.9.12.12_2
libmagick6<=6.9.12.12_2
libopencv-python<=3.4.15_1
+ libopencv4-python<=4.5.3_2
libpyside-python3<=5.15.0_2
libqmatrixclient-devel<=0.5.3.2_1
libqmatrixclient<=0.5.3.2_1
next reply other threads:[~2022-08-12 3:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 3:53 classabbyamp [this message]
2022-08-12 5:15 ` [PR PATCH] [Updated] " classabbyamp
2022-08-12 19:19 ` [PR PATCH] [Updated] libopencv{,4}: update and remove python2 subpackage classabbyamp
2022-08-12 19:28 ` classabbyamp
2022-08-12 21:49 ` [PR PATCH] [Updated] opencv{,4}: " classabbyamp
2022-08-17 21:00 ` classabbyamp
2022-08-18 0:23 ` [PR PATCH] [Updated] opencv: update, merge with opencv4, " classabbyamp
2022-08-18 4:15 ` classabbyamp
2022-08-29 2:21 ` [PR PATCH] [Updated] " classabbyamp
2022-09-02 21:36 ` classabbyamp
2022-09-02 22:04 ` [PR PATCH] [Closed]: " classabbyamp
2022-09-02 22:04 ` [PR PATCH] [Updated] " classabbyamp
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38628@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--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).