* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2016-01-30 8:10 Michael Palimaka
0 siblings, 0 replies; 64+ messages in thread
From: Michael Palimaka @ 2016-01-30 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 2c8c406e43ced399e8bdea50766d7722e6216ee8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 08:08:29 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 08:10:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8c406e
media-libs/vigra: fix function call
The function was renamed in e4b034ec87ff80561b18d52ee07df66b04a50cab but usage
was never checked for because it is supposed to be a private function.
Gentoo-bug: 573296
Package-Manager: portage-2.2.27
media-libs/vigra/vigra-1.10.0.ebuild | 2 +-
media-libs/vigra/vigra-1.9.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.10.0.ebuild b/media-libs/vigra/vigra-1.10.0.ebuild
index 1f84ed4..1710741 100644
--- a/media-libs/vigra/vigra-1.10.0.ebuild
+++ b/media-libs/vigra/vigra-1.10.0.ebuild
@@ -95,7 +95,7 @@ src_configure() {
python_foreach_impl vigra_configure
else
# required for docdir
- _check_build_dir init
+ _cmake_check_build_dir init
vigra_configure
fi
}
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
index dda3d6a..1ff5bca 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -64,7 +64,7 @@ src_configure() {
local libdir=$(get_libdir)
# required for ddocdir
- _check_build_dir init
+ _cmake_check_build_dir init
local mycmakeargs=(
-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-DLIBDIR_SUFFIX=${libdir/lib}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2016-08-19 5:33 Tim Harder
0 siblings, 0 replies; 64+ messages in thread
From: Tim Harder @ 2016-08-19 5:33 UTC (permalink / raw
To: gentoo-commits
commit: 528787f76aa6effa5f757394462f3cc152cbe31a
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 05:32:22 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 05:32:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528787f7
media-libs/vigra: update HOMEPAGE
media-libs/vigra/vigra-1.10.0.ebuild | 2 +-
media-libs/vigra/vigra-1.9.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.10.0.ebuild b/media-libs/vigra/vigra-1.10.0.ebuild
index 1710741..f36dc51 100644
--- a/media-libs/vigra/vigra-1.10.0.ebuild
+++ b/media-libs/vigra/vigra-1.10.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="threads,xml"
inherit cmake-utils python-r1
DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
index 1ff5bca..0bc41dc 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -14,7 +14,7 @@ inherit cmake-utils eutils multilib python-single-r1
MY_P=${P}-src
DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2016-09-07 18:22 Austin English
0 siblings, 0 replies; 64+ messages in thread
From: Austin English @ 2016-09-07 18:22 UTC (permalink / raw
To: gentoo-commits
commit: f10498150b680bafef1fb6887957f1bc0e9c2720
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 00:02:11 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 18:22:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1049815
media-libs/vigra: version bump to 1.11.0
Also:
* update to EAPI 6
* respect USE=valgrind instead of always disabling
* minor naming fixes
Gentoo-Bug: https://bugs.gentoo.org/506902
Package-Manager: portage-2.2.28
media-libs/vigra/Manifest | 1 +
media-libs/vigra/metadata.xml | 3 +
media-libs/vigra/vigra-1.11.0.ebuild | 138 +++++++++++++++++++++++++++++++++++
3 files changed, 142 insertions(+)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index d26e531..76b42e3 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1,3 @@
DIST vigra-1.10.0-src-with-docu.tar.gz 36122311 SHA256 42d4a361b0bb52fbfdae7e76000698be04dabba77be3f4248d369139fe96a099 SHA512 4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d WHIRLPOOL 92cf1517acc6ff11eb255cb6bee523ebcaab118b9f73602baf07be8070c537c5bb7e94a9ccbd97bd7e20e20efeb8ac485a184f1c3609fe7747051ed6ec4ca65f
+DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 68617de347eae7d4700a8f66cd59ce31d6cd92ffb4a235b4df34c688673af5cb SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a WHIRLPOOL 1dc73a42b5033c88427850d72078475211a206d9af69209a5d3d05d1b117baef651ccb8232b0c0428b775160feda28b08aae3f14ab07c353de1b076664a0e105
DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 618f709..aad87b8 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">ukoethe/vigra</remote-id>
</upstream>
+ <use>
+ <flag name="valgrind">Enable valgrind in make check</flag>
+ </use>
</pkgmetadata>
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
new file mode 100644
index 00000000..b456607
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+MY_P=${P}-src
+MY_V=${PV//\./-}
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+inherit cmake-utils python-r1
+
+DESCRIPTION="C++ computer vision library with emphasis on customizable algorithms and data structures"
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+
+# runtime dependency on python:2.7 is required by the vigra-config script
+RDEPEND="
+ dev-lang/python:2.7
+ >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
+ fftw? ( sci-libs/fftw:3.0 )
+ hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
+ jpeg? ( virtual/jpeg )
+ openexr? ( media-libs/openexr:= )
+ png? ( media-libs/libpng:0= )
+ python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ tiff? ( media-libs/tiff:0= )
+ valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+ )
+ test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+ doc? ( hdf5 fftw )
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+ test? ( hdf5 python fftw )"
+
+DOCS=( README.md )
+
+pkg_setup() {
+ use python && python_setup
+}
+
+src_prepare() {
+ default
+
+ einfo "Removing shipped docs and VCS files"
+ rm -rf doc || die
+ rm .git* .travis.yml || die
+
+ cmake-utils_src_prepare
+
+ # Don't use python_fix_shebang because we can't put this behind USE="python"
+ sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+ vigra_configure() {
+ local libdir="$(get_libdir)"
+
+ local mycmakeargs=(
+ -DAUTOEXEC_TESTS=OFF
+ -DDOCDIR="${BUILD_DIR}/doc"
+ -DDOCINSTALL="share/doc/${P}"
+ -DLIBDIR_SUFFIX="${libdir/lib}"
+ -DUSE_DOC=$(usex doc ON OFF) # unused
+ -DUSE_FFTW3=$(usex fftw ON OFF) # unused
+ -DUSE_JPEG=$(usex jpeg ON OFF) # unused
+ -DUSE_MPI=$(usex mpi ON OFF) # unused
+ -DUSE_PNG=$(usex png ON OFF) # unused
+ -DUSE_TIFF=$(usex tiff ON OFF) # unused
+ -DWITH_HDF5=$(usex hdf5 ON OFF)
+ -DWITH_OPENEXR=$(usex openexr ON OFF)
+ -DWITH_VALGRIND=$(usex valgrind ON OFF)
+ -DWITH_VIGRANUMPY=$(usex python ON OFF)
+ -DBUILD_TESTING=$(usex test ON OFF) # unused
+ -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
+ -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
+ )
+ cmake-utils_src_configure
+ }
+
+ if use python; then
+ python_foreach_impl vigra_configure
+ else
+ # required for docdir
+ _cmake_check_build_dir init
+ vigra_configure
+ fi
+}
+
+src_compile() {
+ local VIGRA_BUILD_DIR
+ vigra_compile() {
+ cmake-utils_src_compile
+ VIGRA_BUILD_DIR="${BUILD_DIR}"
+ }
+ if use python; then
+ python_foreach_impl vigra_compile
+ else
+ vigra_compile
+ fi
+
+ if use doc; then
+ einfo "Generating Documentation"
+ # use build dir from last compile command
+ BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_foreach_impl cmake-utils_src_install
+ python_optimize
+ else
+ cmake-utils_src_install
+ fi
+}
+
+src_test() {
+ # perhaps disable tests (see #390447)
+ vigra_test() {
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+ }
+ if use python; then
+ python_foreach_impl vigra_test
+ else
+ vigra_test
+ fi
+}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2017-02-11 22:03 Andreas Hüttel
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Hüttel @ 2017-02-11 22:03 UTC (permalink / raw
To: gentoo-commits
commit: c4b2dd5f9ffdbdcd53aaf0ace19dd809e23b55af
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:58:50 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 22:03:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b2dd5f
media-libs/vigra: Update HOMEPAGE
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/vigra/vigra-1.11.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index b456607684..897275f7ff 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="threads,xml"
inherit cmake-utils python-r1
DESCRIPTION="C++ computer vision library with emphasis on customizable algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2017-02-11 22:03 Andreas Hüttel
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Hüttel @ 2017-02-11 22:03 UTC (permalink / raw
To: gentoo-commits
commit: c8c031633ee92bbdfe5df150a7b2122ae73736ef
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 22:00:37 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 22:03:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c03163
media-libs/vigra: Silence repoman
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/vigra/vigra-1.11.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 897275f7ff..2f2c42e3e8 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,xml"
inherit cmake-utils python-r1
-DESCRIPTION="C++ computer vision library with emphasis on customizable algorithms and data structures"
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
@@ -24,7 +24,7 @@ RDEPEND="
>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0 )
openexr? ( media-libs/openexr:= )
png? ( media-libs/libpng:0= )
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2017-02-16 0:13 Andreas Hüttel
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Hüttel @ 2017-02-16 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 98f8581814c50bec7a8787c0469b60e18a17a242
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 23:55:04 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 00:13:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f85818
media-libs/vigra: Make sure TeX font generation stays in the sandbox, bug 555078
Thanks to Andrey Golovizin
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/vigra/vigra-1.11.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 2f2c42e3e8..dc29a60f77 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -112,7 +112,7 @@ src_compile() {
if use doc; then
einfo "Generating Documentation"
# use build dir from last compile command
- BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+ VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
fi
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2017-11-26 23:06 David Seifert
0 siblings, 0 replies; 64+ messages in thread
From: David Seifert @ 2017-11-26 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 79cce3c566c692c5860031a8c68823ec85226e39
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 12:05:03 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:04:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79cce3c5
media-libs/vigra: [QA] Consistent whitespace in metadata.xml
media-libs/vigra/metadata.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index aad87b83017..ab7510955b8 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,10 +5,10 @@
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
+ <use>
+ <flag name="valgrind">Enable valgrind in make check</flag>
+ </use>
<upstream>
<remote-id type="github">ukoethe/vigra</remote-id>
</upstream>
- <use>
- <flag name="valgrind">Enable valgrind in make check</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2018-04-16 16:25 Aaron Bauman
0 siblings, 0 replies; 64+ messages in thread
From: Aaron Bauman @ 2018-04-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 0e309445daecbc640190cc79b4e76602c55de7ea
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 16:23:28 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 16:23:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e309445
media-libs/vigra: amd64 stable
Bug: https://bugs.gentoo.org/652316
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-libs/vigra/vigra-1.11.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 2a8cb711812..7c3e44a5e1b 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2018-04-18 18:37 Pacho Ramos
0 siblings, 0 replies; 64+ messages in thread
From: Pacho Ramos @ 2018-04-18 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 6f03bb5a88c6724d59db7a122c6708321cfc472c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 18:30:11 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 18:37:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f03bb5a
media-libs/vigra: Bump, disable broken tests (#653442)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-libs/vigra/Manifest | 1 +
media-libs/vigra/vigra-1.11.1.ebuild | 139 +++++++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index bc108028855..b13f0e00d5b 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1,3 @@
DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
+DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
new file mode 100644
index 00000000000..6fa95e1699a
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_P="${P}-src"
+MY_V="${PV//\./-}"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+
+# runtime dependency on python:2.7 is required by the vigra-config script
+RDEPEND="
+ dev-lang/python:2.7
+ >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
+ fftw? ( sci-libs/fftw:3.0 )
+ hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
+ jpeg? ( virtual/jpeg:0 )
+ openexr? ( media-libs/openexr:= )
+ png? ( media-libs/libpng:0= )
+ python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ tiff? ( media-libs/tiff:0= )
+ valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+ )
+ test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+ doc? ( hdf5 fftw )
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+ test? ( hdf5 python fftw )"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+DOCS=( README.md )
+
+pkg_setup() {
+ use python && python_setup
+}
+
+src_prepare() {
+ einfo "Removing shipped docs and VCS files"
+ rm -rf doc || die
+ rm .git* .travis.yml || die
+
+ cmake-utils_src_prepare
+
+ # Don't use python_fix_shebang because we can't put this behind USE="python"
+ sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+ vigra_configure() {
+ local libdir="$(get_libdir)"
+
+ local mycmakeargs=(
+ -DAUTOEXEC_TESTS=OFF
+ -DDOCDIR="${BUILD_DIR}/doc"
+ -DDOCINSTALL="share/doc/${P}"
+ -DLIBDIR_SUFFIX="${libdir/lib}"
+ -DUSE_DOC=$(usex doc ON OFF) # unused
+ -DUSE_FFTW3=$(usex fftw ON OFF) # unused
+ -DUSE_JPEG=$(usex jpeg ON OFF) # unused
+ -DUSE_MPI=$(usex mpi ON OFF) # unused
+ -DUSE_PNG=$(usex png ON OFF) # unused
+ -DUSE_TIFF=$(usex tiff ON OFF) # unused
+ -DWITH_HDF5=$(usex hdf5 ON OFF)
+ -DWITH_OPENEXR=$(usex openexr ON OFF)
+ -DWITH_VALGRIND=$(usex valgrind ON OFF)
+ -DWITH_VIGRANUMPY=$(usex python ON OFF)
+ -DBUILD_TESTING=$(usex test ON OFF) # unused
+ -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
+ -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
+ )
+ cmake-utils_src_configure
+ }
+
+ if use python; then
+ python_foreach_impl vigra_configure
+ else
+ # required for docdir
+ _cmake_check_build_dir init
+ vigra_configure
+ fi
+}
+
+src_compile() {
+ local VIGRA_BUILD_DIR
+ vigra_compile() {
+ cmake-utils_src_compile
+ VIGRA_BUILD_DIR="${BUILD_DIR}"
+ }
+ if use python; then
+ python_foreach_impl vigra_compile
+ else
+ vigra_compile
+ fi
+
+ if use doc; then
+ einfo "Generating Documentation"
+ # use build dir from last compile command
+ VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_foreach_impl cmake-utils_src_install
+ python_optimize
+ else
+ cmake-utils_src_install
+ fi
+}
+
+src_test() {
+ # perhaps disable tests (see #390447)
+ vigra_test() {
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+ }
+ if use python; then
+ python_foreach_impl vigra_test
+ else
+ vigra_test
+ fi
+}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2018-04-25 19:27 Thomas Deutschmann
0 siblings, 0 replies; 64+ messages in thread
From: Thomas Deutschmann @ 2018-04-25 19:27 UTC (permalink / raw
To: gentoo-commits
commit: e6085bd51402b9d71f2eda3b6eb4e4ee040d0946
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 18:57:13 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 19:23:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6085bd5
media-libs/vigra: x86 stable (bug #652316)
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-libs/vigra/vigra-1.11.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 6fa95e1699a..8f29f07fd69 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2018-04-26 5:02 Matt Turner
0 siblings, 0 replies; 64+ messages in thread
From: Matt Turner @ 2018-04-26 5:02 UTC (permalink / raw
To: gentoo-commits
commit: a8cc601674a6c0f5e9d074003025bfb25d6a4d54
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 04:59:53 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 05:02:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cc6016
media-libs/vigra: Dropped ppc/ppc64 keywords, bug 652316
Neither version 1.9.0 nor 1.11.0 build on ppc or ppc64; No reverse
dependencies.
media-libs/vigra/vigra-1.11.0.ebuild | 2 +-
media-libs/vigra/vigra-1.11.1.ebuild | 2 +-
media-libs/vigra/vigra-1.9.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 7c3e44a5e1b..566354ca414 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 8f29f07fd69..c7db801f5f0 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
index fe2fa6ed8e7..0252dcd97b6 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
# Pull in dev-lang/python:2.7 for vigra-config which is always installed
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: fbec2d140834b04eee6c2a306993d1ec65f820da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 18:39:00 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec2d14
media-libs/vigra: EAPI-7 bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 45 +++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 4073587b713..120f0cc2429 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
MY_P="${P}-src"
MY_V="${PV//\./-}"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,xml"
-
inherit cmake-utils python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -24,8 +24,20 @@ LICENSE="MIT"
SLOT="0"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+REQUIRED_USE="
+ doc? ( hdf5 fftw )
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+ test? ( hdf5 python fftw )"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+ )
+ test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
+"
# runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
+DEPEND="
dev-lang/python:2.7
>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
@@ -35,35 +47,24 @@ RDEPEND="
png? ( media-libs/libpng:0= )
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
tiff? ( media-libs/tiff:0= )
- valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
- )
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
- doc? ( hdf5 fftw )
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${DEPEND}"
# Severely broken, also disabled in Fedora, bugs #390447, #653442
RESTRICT="test"
-DOCS=( README.md )
-
pkg_setup() {
use python && python_setup
}
src_prepare() {
- einfo "Removing shipped docs and VCS files"
- rm -rf doc || die
-
cmake-utils_src_prepare
+ if [[ ${PV} != *9999 ]]; then
+ rm -r doc || die "failed to remove shipped docs"
+ fi
+
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: e89f49d6009209166451557d8f7666ff6c3ee00e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 21:04:41 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:13:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89f49d6
media-libs/vigra: USE doc needs python_setup
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 46984673565..6f78ecb7151 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
BDEPEND="
doc? (
app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+ >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
)
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
@@ -66,7 +66,9 @@ RESTRICT="test"
PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
pkg_setup() {
- use python && python_setup
+ if use python || use doc; then
+ python_setup
+ fi
}
src_prepare() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: bf5b286286b23a33a24f718e8bd765b9617f73e3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 21:08:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:13:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b2862
media-libs/vigra: Revbump with lots of fixes from 9999
Bug: https://bugs.gentoo.org/682860
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r2.ebuild | 163 ++++++++++++++++++++++++++++++++
1 file changed, 163 insertions(+)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
new file mode 100644
index 00000000000..97c69bf3221
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P}-src"
+MY_V="${PV//\./-}"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+inherit cmake-utils python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+ doc? ( hdf5 fftw )
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+ test? ( hdf5 python fftw )"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
+ )
+ test? (
+ >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+ valgrind? ( dev-util/valgrind )
+ )
+"
+# runtime dependency on python:2.7 is required by the vigra-config script
+DEPEND="
+ dev-lang/python:2.7
+ fftw? ( sci-libs/fftw:3.0 )
+ hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
+ jpeg? ( virtual/jpeg:0 )
+ openexr? (
+ media-libs/openexr:=
+ media-libs/ilmbase:=
+ )
+ png? ( media-libs/libpng:0= )
+ python? (
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ tiff? ( media-libs/tiff:0= )
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+ "${FILESDIR}/${P}-lib_suffix.patch"
+)
+
+pkg_setup() {
+ if use python || use doc; then
+ python_setup
+ fi
+}
+
+src_prepare() {
+ vigra_disable() {
+ if ! use ${1}; then
+ sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+ -i CMakeLists.txt || die "failed to disable ${1}"
+ fi
+ }
+
+ cmake-utils_src_prepare
+
+ if [[ ${PV} != *9999 ]]; then
+ rm -r doc || die "failed to remove shipped docs"
+ fi
+
+ vigra_disable fftw fftw3
+ vigra_disable fftw fftw3f
+ vigra_disable jpeg
+ vigra_disable png
+ vigra_disable tiff
+ vigra_disable zlib
+
+ # Don't use python_fix_shebang because we can't put this behind USE="python"
+ sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+ vigra_configure() {
+ local mycmakeargs=(
+ -DAUTOEXEC_TESTS=OFF
+ -DDOCDIR="${BUILD_DIR}/doc"
+ -DDOCINSTALL="share/doc/${PF}"
+ -DWITH_HDF5=$(usex hdf5)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_VALGRIND=$(usex valgrind)
+ -DWITH_VIGRANUMPY=$(usex python)
+ )
+ cmake-utils_src_configure
+ }
+
+ if use python; then
+ python_foreach_impl vigra_configure
+ else
+ # required for docdir
+ _cmake_check_build_dir init
+ vigra_configure
+ fi
+}
+
+src_compile() {
+ local VIGRA_BUILD_DIR
+ vigra_compile() {
+ cmake-utils_src_compile
+ VIGRA_BUILD_DIR="${BUILD_DIR}"
+ }
+ if use python; then
+ python_foreach_impl vigra_compile
+ else
+ vigra_compile
+ fi
+
+ if use doc; then
+ einfo "Generating Documentation"
+ # use build dir from last compile command
+ VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_foreach_impl cmake-utils_src_install
+ python_optimize
+ else
+ cmake-utils_src_install
+ fi
+}
+
+src_test() {
+ # perhaps disable tests (see #390447)
+ vigra_test() {
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+ }
+ if use python; then
+ python_foreach_impl vigra_test
+ else
+ vigra_test
+ fi
+}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 6aff7700dd3e81eb33a02ba30d1bcf1fb1895de8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:47:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aff7700
media-libs/vigra: valgrind binary is only used during testing
But tests are restricted, so it does actually nothing for us.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 6d2b0b088cc..18768a9bc62 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -34,7 +34,10 @@ BDEPEND="
app-doc/doxygen
python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
)
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
+ test? (
+ >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+ valgrind? ( dev-util/valgrind )
+ )
"
# runtime dependency on python:2.7 is required by the vigra-config script
DEPEND="
@@ -53,7 +56,6 @@ DEPEND="
${PYTHON_DEPS}
)
tiff? ( media-libs/tiff:0= )
- valgrind? ( dev-util/valgrind )
zlib? ( sys-libs/zlib )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: dde2022379a7c53d8c9c2ca324adccf7e5aec743
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:48:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde20223
media-libs/vigra: Cleanup superfluous usex params
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 18768a9bc62..46984673565 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -100,10 +100,10 @@ src_configure() {
-DAUTOEXEC_TESTS=OFF
-DDOCDIR="${BUILD_DIR}/doc"
-DDOCINSTALL="share/doc/${PF}"
- -DWITH_HDF5=$(usex hdf5 ON OFF)
- -DWITH_OPENEXR=$(usex openexr ON OFF)
- -DWITH_VALGRIND=$(usex valgrind ON OFF)
- -DWITH_VIGRANUMPY=$(usex python ON OFF)
+ -DWITH_HDF5=$(usex hdf5)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_VALGRIND=$(usex valgrind)
+ -DWITH_VIGRANUMPY=$(usex python)
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 7457903f720e05ad51e62a50ccd35cbdadbf63b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 19:16:41 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7457903f
media-libs/vigra: Fix doc dir location
Bug: https://bugs.gentoo.org/671636
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 5a274845013..809f900d2d1 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -91,7 +91,7 @@ src_configure() {
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
-DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${P}"
+ -DDOCINSTALL="share/doc/${PF}"
-DLIBDIR_SUFFIX="${libdir/lib}"
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: b80d201921346e5902463b7db13772525ca0bb59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 19:15:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80d2019
media-libs/vigra: Cleanup remaining unused cmake vars
Marked as 'known' already, but why not fixed?
Bug: https://bugs.gentoo.org/665380
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 93002332593..5a274845013 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -93,14 +93,10 @@ src_configure() {
-DDOCDIR="${BUILD_DIR}/doc"
-DDOCINSTALL="share/doc/${P}"
-DLIBDIR_SUFFIX="${libdir/lib}"
- -DUSE_DOC=$(usex doc ON OFF) # unused
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
-DWITH_VALGRIND=$(usex valgrind ON OFF)
-DWITH_VIGRANUMPY=$(usex python ON OFF)
- -DBUILD_TESTING=$(usex test ON OFF) # unused
- -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
- -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: f1677714164a7061d7413acbac69381703971412
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 18:59:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1677714
media-libs/vigra: Fix USE fftw, jpeg, png, tiff (automagic, unused)
Bug: https://bugs.gentoo.org/665380
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 120f0cc2429..13ec1ef25a5 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -59,12 +59,25 @@ pkg_setup() {
}
src_prepare() {
+ vigra_disable() {
+ if ! use ${1}; then
+ sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+ -i CMakeLists.txt || die "failed to disable ${1}"
+ fi
+ }
+
cmake-utils_src_prepare
if [[ ${PV} != *9999 ]]; then
rm -r doc || die "failed to remove shipped docs"
fi
+ vigra_disable fftw fftw3
+ vigra_disable fftw fftw3f
+ vigra_disable jpeg
+ vigra_disable png
+ vigra_disable tiff
+
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
}
@@ -79,11 +92,7 @@ src_configure() {
-DDOCINSTALL="share/doc/${P}"
-DLIBDIR_SUFFIX="${libdir/lib}"
-DUSE_DOC=$(usex doc ON OFF) # unused
- -DUSE_FFTW3=$(usex fftw ON OFF) # unused
- -DUSE_JPEG=$(usex jpeg ON OFF) # unused
-DUSE_MPI=$(usex mpi ON OFF) # unused
- -DUSE_PNG=$(usex png ON OFF) # unused
- -DUSE_TIFF=$(usex tiff ON OFF) # unused
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
-DWITH_VALGRIND=$(usex valgrind ON OFF)
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 38eab4cda00adc166e4beb7449227afee172aff0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 19:13:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38eab4cd
media-libs/vigra: Fix USE mpi unused cmake variable
Bug: https://bugs.gentoo.org/665380
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index b2cbd9927e0..93002332593 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="
dev-lang/python:2.7
>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
+ hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? ( media-libs/openexr:= )
png? ( media-libs/libpng:0= )
@@ -94,7 +94,6 @@ src_configure() {
-DDOCINSTALL="share/doc/${P}"
-DLIBDIR_SUFFIX="${libdir/lib}"
-DUSE_DOC=$(usex doc ON OFF) # unused
- -DUSE_MPI=$(usex mpi ON OFF) # unused
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
-DWITH_VALGRIND=$(usex valgrind ON OFF)
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: e2a02ea40a631d05ea511a971124c669efe75f22
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 21:09:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:13:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a02ea4
media-libs/vigra: Drop 1.11.1-r1, 1.11.0 (r0)
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/Manifest | 1 -
media-libs/vigra/vigra-1.11.0.ebuild | 139 -----------------------------
media-libs/vigra/vigra-1.11.1-r1.ebuild | 149 --------------------------------
3 files changed, 289 deletions(-)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6ba1371af9f..cc03ca4ec08 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1 @@
-DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
deleted file mode 100644
index 566354ca414..00000000000
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P=${P}-src
-MY_V=${PV//\./-}
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
-
-# runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
- dev-lang/python:2.7
- >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
- fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
- jpeg? ( virtual/jpeg:0 )
- openexr? ( media-libs/openexr:= )
- png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- tiff? ( media-libs/tiff:0= )
- valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
- )
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
- doc? ( hdf5 fftw )
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-7.patch
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- einfo "Removing shipped docs and VCS files"
- rm -rf doc || die
- rm .git* .travis.yml || die
-
- cmake-utils_src_prepare
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
- vigra_configure() {
- local libdir="$(get_libdir)"
-
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${P}"
- -DLIBDIR_SUFFIX="${libdir/lib}"
- -DUSE_DOC=$(usex doc ON OFF) # unused
- -DUSE_FFTW3=$(usex fftw ON OFF) # unused
- -DUSE_JPEG=$(usex jpeg ON OFF) # unused
- -DUSE_MPI=$(usex mpi ON OFF) # unused
- -DUSE_PNG=$(usex png ON OFF) # unused
- -DUSE_TIFF=$(usex tiff ON OFF) # unused
- -DWITH_HDF5=$(usex hdf5 ON OFF)
- -DWITH_OPENEXR=$(usex openexr ON OFF)
- -DWITH_VALGRIND=$(usex valgrind ON OFF)
- -DWITH_VIGRANUMPY=$(usex python ON OFF)
- -DBUILD_TESTING=$(usex test ON OFF) # unused
- -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
- -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
- )
- cmake-utils_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- # required for docdir
- _cmake_check_build_dir init
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake-utils_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-
- if use doc; then
- einfo "Generating Documentation"
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake-utils_src_install
- python_optimize
- else
- cmake-utils_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
diff --git a/media-libs/vigra/vigra-1.11.1-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r1.ebuild
deleted file mode 100644
index c5e8c814dae..00000000000
--- a/media-libs/vigra/vigra-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
-
-# runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
- dev-lang/python:2.7
- >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
- fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
- jpeg? ( virtual/jpeg:0 )
- openexr? ( media-libs/openexr:= )
- png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- tiff? ( media-libs/tiff:0= )
- valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
- )
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
- doc? ( hdf5 fftw )
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- einfo "Removing shipped docs and VCS files"
- rm -rf doc || die
- rm .git* .travis.yml || die
-
- cmake-utils_src_prepare
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
- vigra_configure() {
- local libdir="$(get_libdir)"
-
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${P}"
- -DLIBDIR_SUFFIX="${libdir/lib}"
- -DUSE_DOC=$(usex doc ON OFF) # unused
- -DUSE_FFTW3=$(usex fftw ON OFF) # unused
- -DUSE_JPEG=$(usex jpeg ON OFF) # unused
- -DUSE_MPI=$(usex mpi ON OFF) # unused
- -DUSE_PNG=$(usex png ON OFF) # unused
- -DUSE_TIFF=$(usex tiff ON OFF) # unused
- -DWITH_HDF5=$(usex hdf5 ON OFF)
- -DWITH_OPENEXR=$(usex openexr ON OFF)
- -DWITH_VALGRIND=$(usex valgrind ON OFF)
- -DWITH_VIGRANUMPY=$(usex python ON OFF)
- -DBUILD_TESTING=$(usex test ON OFF) # unused
- -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
- -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
- )
- cmake-utils_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- # required for docdir
- _cmake_check_build_dir init
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake-utils_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-
- if use doc; then
- einfo "Generating Documentation"
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake-utils_src_install
- python_optimize
- else
- cmake-utils_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 768bcc0561ec00f5ae1384eee37aa6b9d5a216f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:19:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768bcc05
media-libs/vigra: Add missing USE openexr dependency
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 02d2ecb935e..6b2aabf8904 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -42,7 +42,10 @@ DEPEND="
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
- openexr? ( media-libs/openexr:= )
+ openexr? (
+ media-libs/openexr:=
+ media-libs/ilmbase:=
+ )
png? ( media-libs/libpng:0= )
python? (
dev-libs/boost:=[python?,${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 1dac07463140170af306046fb849acc1bea9efde
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 19:05:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dac0746
media-libs/vigra: Add USE zlib, fixing automagic dep
Bug: https://bugs.gentoo.org/665380
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 13ec1ef25a5..b2cbd9927e0 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
REQUIRED_USE="
doc? ( hdf5 fftw )
@@ -48,6 +48,7 @@ DEPEND="
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
tiff? ( media-libs/tiff:0= )
valgrind? ( dev-util/valgrind )
+ zlib? ( sys-libs/zlib )
"
RDEPEND="${DEPEND}"
@@ -77,6 +78,7 @@ src_prepare() {
vigra_disable jpeg
vigra_disable png
vigra_disable tiff
+ vigra_disable zlib
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 2ec9f3c6621aae9d8021545ffa3f66183d71e8ec
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:07:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec9f3c6
media-libs/vigra: dev-libs/boost is default off, only for USE python
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 809f900d2d1..02d2ecb935e 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -39,13 +39,16 @@ BDEPEND="
# runtime dependency on python:2.7 is required by the vigra-config script
DEPEND="
dev-lang/python:2.7
- >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? ( media-libs/openexr:= )
png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ python? (
+ dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
tiff? ( media-libs/tiff:0= )
valgrind? ( dev-util/valgrind )
zlib? ( sys-libs/zlib )
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-08 21:47 Andreas K. Hüttel
0 siblings, 0 replies; 64+ messages in thread
From: Andreas K. Hüttel @ 2019-04-08 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 587259e86b651310073ce82055be24ac327abdc8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 21:47:08 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:47:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587259e8
media-libs/vigra: No revbump for build fixes needed
Backporting to stable to avoid rebuilds
Bug: https://bugs.gentoo.org/664720
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1.ebuild | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 44a25f14450..b2db9b985bc 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,11 +11,17 @@ inherit cmake-utils python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+ KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
@@ -48,6 +54,10 @@ RESTRICT="test"
DOCS=( README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+)
+
pkg_setup() {
use python && python_setup
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-09 14:31 Mikle Kolyada
0 siblings, 0 replies; 64+ messages in thread
From: Mikle Kolyada @ 2019-04-09 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 65df7e555e4a76e1d580446db8cc9948171e209d
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 14:31:12 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 14:31:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65df7e55
media-libs/vigra: amd64 stable wrt bug #682860
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-libs/vigra/vigra-1.11.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 97c69bf3221..1b9cdea69e5 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-04-24 21:33 Thomas Deutschmann
0 siblings, 0 replies; 64+ messages in thread
From: Thomas Deutschmann @ 2019-04-24 21:33 UTC (permalink / raw
To: gentoo-commits
commit: b51a1546cd020eaa31ede671a4c2251fcb2b3258
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 21:29:45 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 21:33:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51a1546
media-libs/vigra: x86 stable (bug #682860)
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 1b9cdea69e5..d24961a71f1 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-05-20 17:22 Aaron Bauman
0 siblings, 0 replies; 64+ messages in thread
From: Aaron Bauman @ 2019-05-20 17:22 UTC (permalink / raw
To: gentoo-commits
commit: 7a5ad4390122dafcd0c859ab9bb11f10db70c9d0
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 17:09:19 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon May 20 17:22:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5ad439
media-libs/vigra: arm64 stable
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
media-libs/vigra/vigra-1.11.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index d24961a71f1..d959cda3ae2 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-06-05 19:20 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-06-05 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 19b328d5a86e55060e6d9198569c6b77f9c22262
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 19:18:19 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 19:19:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b328d5
media-libs/vigra: Drop 1.11.1-r1
Closes: https://bugs.gentoo.org/665380
Closes: https://bugs.gentoo.org/671636
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1.ebuild | 149 -----------------------------------
1 file changed, 149 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
deleted file mode 100644
index b2db9b985bc..00000000000
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
-
-# runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
- dev-lang/python:2.7
- >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
- fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
- jpeg? ( virtual/jpeg:0 )
- openexr? ( media-libs/openexr:= )
- png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- tiff? ( media-libs/tiff:0= )
- valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
- )
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
- doc? ( hdf5 fftw )
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- einfo "Removing shipped docs and VCS files"
- rm -rf doc || die
- rm .git* .travis.yml || die
-
- cmake-utils_src_prepare
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
- vigra_configure() {
- local libdir="$(get_libdir)"
-
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${P}"
- -DLIBDIR_SUFFIX="${libdir/lib}"
- -DUSE_DOC=$(usex doc ON OFF) # unused
- -DUSE_FFTW3=$(usex fftw ON OFF) # unused
- -DUSE_JPEG=$(usex jpeg ON OFF) # unused
- -DUSE_MPI=$(usex mpi ON OFF) # unused
- -DUSE_PNG=$(usex png ON OFF) # unused
- -DUSE_TIFF=$(usex tiff ON OFF) # unused
- -DWITH_HDF5=$(usex hdf5 ON OFF)
- -DWITH_OPENEXR=$(usex openexr ON OFF)
- -DWITH_VALGRIND=$(usex valgrind ON OFF)
- -DWITH_VIGRANUMPY=$(usex python ON OFF)
- -DBUILD_TESTING=$(usex test ON OFF) # unused
- -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
- -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
- )
- cmake-utils_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- # required for docdir
- _cmake_check_build_dir init
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake-utils_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-
- if use doc; then
- einfo "Generating Documentation"
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake-utils_src_install
- python_optimize
- else
- cmake-utils_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-10-06 14:46 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-10-06 14:46 UTC (permalink / raw
To: gentoo-commits
commit: bc1d3667f460c5f7188638986504ad2de0f36e72
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 12:30:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 6 14:46:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1d3667
media-libs/vigra: python3 support
Sync KEYWORDS from current ~arch ebuild.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 6f78ecb7151..fb010ab449c 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
MY_P="${P}-src"
MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
PYTHON_REQ_USE="threads,xml"
inherit cmake-utils python-r1
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
@@ -91,9 +91,6 @@ src_prepare() {
vigra_disable png
vigra_disable tiff
vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 811866d89e048e67d33e31d9be877af0fef351b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 22:12:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 00:12:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811866d8
media-libs/vigra: Disable test dir to avoid useless warnings
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r2.ebuild | 2 ++
media-libs/vigra/vigra-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 387419da085..8f4b2b23a1c 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -100,6 +100,8 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+
+ use test || cmake_comment_add_subdirectory test
}
src_configure() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 363de89451a..cad2a8191a7 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -95,6 +95,8 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+
+ use test || cmake_comment_add_subdirectory test
}
src_configure() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 6bf94b61ed79c56b38ce68f579ac93d75421bd65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 22:02:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 00:12:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf94b61
media-libs/vigra: Add python3_7, drop python2_7
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index e384297bbb8..363de89451a 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -5,8 +5,8 @@ EAPI=7
MY_P="${P}-src"
MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),xml"
inherit cmake-utils python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -39,26 +39,27 @@ BDEPEND="
valgrind? ( dev-util/valgrind )
)
"
-# runtime dependency on python:2.7 is required by the vigra-config script
+# runtime dependency on python is required by the vigra-config script
DEPEND="
- dev-lang/python:2.7
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? (
- media-libs/openexr:=
media-libs/ilmbase:=
+ media-libs/openexr:=
)
png? ( media-libs/libpng:0= )
python? (
+ ${PYTHON_DEPS}
dev-libs/boost:=[python?,${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
)
tiff? ( media-libs/tiff:0= )
zlib? ( sys-libs/zlib )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${PYTHON_DEPS}
+ ${DEPEND}
+"
# Severely broken, also disabled in Fedora, bugs #390447, #653442
RESTRICT="test"
@@ -91,6 +92,9 @@ src_prepare() {
vigra_disable png
vigra_disable tiff
vigra_disable zlib
+
+ # Don't use python_fix_shebang because we can't put this behind USE="python"
+ sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 44c2311179d177a205fd072c70991255b96b2680
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 21:34:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 00:12:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c23111
media-libs/vigra: Add PYTHON_REQUIRED_USE for USE doc
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r2.ebuild | 4 ++--
media-libs/vigra/vigra-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index d959cda3ae2..9306ea02732 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -25,14 +25,14 @@ SLOT="0"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
REQUIRED_USE="
- doc? ( hdf5 fftw )
+ doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
test? ( hdf5 python fftw )"
BDEPEND="
doc? (
app-doc/doxygen
- >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.3-r5
)
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index fb010ab449c..e384297bbb8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -25,14 +25,14 @@ SLOT="0"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
REQUIRED_USE="
- doc? ( hdf5 fftw )
+ doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
test? ( hdf5 python fftw )"
BDEPEND="
doc? (
app-doc/doxygen
- >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.3-r5
)
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-11-27 14:43 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 14:43 UTC (permalink / raw
To: gentoo-commits
commit: d14bfc5f1c36538feb11f73962b55771fe7a7e82
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 14:41:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 14:42:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14bfc5f
media-libs/vigra: Disable more tests
Bug: https://bugs.gentoo.org/701328
Package-Manager: Portage-2.3.80, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 6 +++++-
media-libs/vigra/vigra-9999.ebuild | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index f2b096eaf51..d38b643763a 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -93,7 +93,11 @@ src_prepare() {
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
use doc || cmake_comment_add_subdirectory docsrc
- use test || cmake_comment_add_subdirectory test
+
+ if ! use test; then
+ cmake_comment_add_subdirectory test
+ sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+ fi
}
src_configure() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index c1094b89265..289fe049252 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -99,7 +99,10 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
- use test || cmake_comment_add_subdirectory test
+ if ! use test; then
+ cmake_comment_add_subdirectory test
+ sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-12-30 16:14 Agostino Sarubbo
0 siblings, 0 replies; 64+ messages in thread
From: Agostino Sarubbo @ 2019-12-30 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 278e3fc93809e41a4e5bcc7c24f3223a50e932d7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 16:14:35 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 16:14:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278e3fc9
media-libs/vigra: amd64 stable wrt bug #704168
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index d38b643763a..57a8d42e892 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2019-12-31 1:06 Aaron Bauman
0 siblings, 0 replies; 64+ messages in thread
From: Aaron Bauman @ 2019-12-31 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 7581b2def2a447b5d9de7ed7f1b1f5ed119e0727
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 01:05:03 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 01:05:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7581b2de
media-libs/vigra: arm64 stable (bug #704168)
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
media-libs/vigra/vigra-1.11.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 57a8d42e892..2b23820f069 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2020-01-10 1:26 Thomas Deutschmann
0 siblings, 0 replies; 64+ messages in thread
From: Thomas Deutschmann @ 2020-01-10 1:26 UTC (permalink / raw
To: gentoo-commits
commit: 464601eda92bc9c3c75909f26e599d78a8b0c1df
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 01:18:52 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 01:25:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464601ed
media-libs/vigra: x86 stable (bug #704168)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 2b23820f069..bfb94af9b87 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2020-01-12 15:29 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2020-01-12 15:29 UTC (permalink / raw
To: gentoo-commits
commit: d3d25c632f1f3b5e7ab3c26e8e476de352c52738
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 15:24:34 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 15:28:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d25c63
media-libs/vigra: Drop 1.11.1-r2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r2.ebuild | 169 --------------------------------
1 file changed, 169 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
deleted file mode 100644
index 757fe839d19..00000000000
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
-
-REQUIRED_USE="
- doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- >=dev-python/sphinx-1.1.3-r5
- )
- test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
- )
-"
-# runtime dependency on python:2.7 is required by the vigra-config script
-DEPEND="
- dev-lang/python:2.7
- fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- png? ( media-libs/libpng:0= )
- python? (
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- tiff? ( media-libs/tiff:0= )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
- "${FILESDIR}/${P}-boost-python.patch"
- # TODO: upstream
- "${FILESDIR}/${P}-lib_suffix.patch"
- "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-)
-
-pkg_setup() {
- if use python || use doc; then
- python_setup
- fi
-}
-
-src_prepare() {
- vigra_disable() {
- if ! use ${1}; then
- sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
- -i CMakeLists.txt || die "failed to disable ${1}"
- fi
- }
-
- cmake-utils_src_prepare
-
- if [[ ${PV} != *9999 ]]; then
- rm -r doc || die "failed to remove shipped docs"
- fi
-
- vigra_disable fftw fftw3
- vigra_disable fftw fftw3f
- vigra_disable jpeg
- vigra_disable png
- vigra_disable tiff
- vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-
- use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${PF}"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake-utils_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- # required for docdir
- _cmake_check_build_dir init
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake-utils_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-
- if use doc; then
- einfo "Generating Documentation"
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake-utils_src_install
- python_optimize
- else
- cmake-utils_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2020-04-17 0:04 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2020-04-17 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 10c1df032fc9fd9ab816018ddfb8041ddcec6529
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 00:03:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 00:04:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c1df03
media-libs/vigra: python3_8 support
dev-libs/boost now has py38, and if Fedora does, so can we.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 2 +-
media-libs/vigra/vigra-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index bfb94af9b87..93a26b7b05e 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake-utils python-r1
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 289fe049252..9bb9d1c453b 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake-utils python-r1
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2020-07-10 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2020-07-10 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 0e85e56bbbf6cb26305aa96a8df7650dc85530f9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 20:58:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 21:23:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e85e56b
media-libs/vigra: Switch to cmake.eclass
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 05721485aa8..c9dfc49eed8 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="threads(+),xml"
-inherit cmake-utils python-r1
+inherit cmake python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -81,7 +81,7 @@ src_prepare() {
fi
}
- cmake-utils_src_prepare
+ cmake_src_prepare
vigra_disable fftw fftw3
vigra_disable fftw fftw3f
@@ -111,7 +111,7 @@ src_configure() {
-DWITH_VALGRIND=$(usex valgrind)
-DWITH_VIGRANUMPY=$(usex python)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
if use python; then
@@ -124,7 +124,7 @@ src_configure() {
src_compile() {
local VIGRA_BUILD_DIR
vigra_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
VIGRA_BUILD_DIR="${BUILD_DIR}"
}
if use python; then
@@ -136,17 +136,17 @@ src_compile() {
src_install() {
if use python; then
- python_foreach_impl cmake-utils_src_install
+ python_foreach_impl cmake_src_install
python_optimize
else
- cmake-utils_src_install
+ cmake_src_install
fi
}
src_test() {
# perhaps disable tests (see #390447)
vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
}
if use python; then
python_foreach_impl vigra_test
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2021-01-09 19:06 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2021-01-09 19:06 UTC (permalink / raw
To: gentoo-commits
commit: d9b70bc0c70893b8c9f17437bafcd83c05df5dd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 17:53:14 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 19:05:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b70bc0
media-libs/vigra: python3_9
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index c9dfc49eed8..f3b56a52e27 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake python-r1
@@ -97,7 +97,7 @@ src_prepare() {
if ! use test; then
cmake_comment_add_subdirectory test
- sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+ cmake_run_in vigranumpy cmake_comment_add_subdirectory test
fi
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2021-02-28 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2021-02-28 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 389efddf0c61a8f935afd48cc84f27801789605f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 16:47:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 16:48:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389efddf
media-libs/vigra: Sync cmake.eclass and python3_9 to live ebuild
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index c445f2e401c..9ffac6b73b0 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
-inherit cmake-utils python-r1
+inherit cmake python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -83,7 +83,7 @@ src_prepare() {
fi
}
- cmake-utils_src_prepare
+ cmake_src_prepare
if [[ ${PV} != *9999 ]]; then
rm -r doc || die "failed to remove shipped docs"
@@ -101,7 +101,7 @@ src_prepare() {
if ! use test; then
cmake_comment_add_subdirectory test
- sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+ cmake_run_in vigranumpy cmake_comment_add_subdirectory test
fi
}
@@ -116,7 +116,7 @@ src_configure() {
-DWITH_VALGRIND=$(usex valgrind)
-DWITH_VIGRANUMPY=$(usex python)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
if use python; then
@@ -131,7 +131,7 @@ src_configure() {
src_compile() {
local VIGRA_BUILD_DIR
vigra_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
VIGRA_BUILD_DIR="${BUILD_DIR}"
}
if use python; then
@@ -150,17 +150,17 @@ src_compile() {
src_install() {
if use python; then
- python_foreach_impl cmake-utils_src_install
+ python_foreach_impl cmake_src_install
python_optimize
else
- cmake-utils_src_install
+ cmake_src_install
fi
}
src_test() {
# perhaps disable tests (see #390447)
vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
}
if use python; then
python_foreach_impl vigra_test
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2021-09-10 5:23 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2021-09-10 5:23 UTC (permalink / raw
To: gentoo-commits
commit: b0ca3df14e110dba28d75a7023b423c79346b58b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 05:22:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 05:23:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ca3df1
media-libs/vigra: add -DH5_USE_110_API workaround
Bug: https://bugs.gentoo.org/808731
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 6 +++++-
media-libs/vigra/vigra-9999.ebuild | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 714a95b192e..65fd07b618a 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -102,6 +102,10 @@ src_prepare() {
}
src_configure() {
+ # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+ # bug #808731
+ use hdf5 && append-cppflags -DH5_USE_110_API
+
vigra_configure() {
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 9ffac6b73b0..171eedd560f 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -106,6 +106,10 @@ src_prepare() {
}
src_configure() {
+ # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+ # bug #808731
+ use hdf5 && append-cppflags -DH5_USE_110_API
+
vigra_configure() {
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-15 19:51 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 663937bb03ecb813f5e77c26318b875fad24ea4b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 20:42:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:50:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663937bb
media-libs/vigra: support OpenEXR 3 / imath
Bug: https://bugs.gentoo.org/833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{vigra-9999.ebuild => vigra-1.11.1-r4.ebuild} | 46 ++++++++--------------
media-libs/vigra/vigra-9999.ebuild | 35 ++++------------
2 files changed, 24 insertions(+), 57 deletions(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild
similarity index 77%
copy from media-libs/vigra/vigra-9999.ebuild
copy to media-libs/vigra/vigra-1.11.1-r4.ebuild
index 171eedd560f8..be3e2f9fe820 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake flag-o-matic python-r1
@@ -23,15 +23,10 @@ SLOT="0"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
REQUIRED_USE="
- doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
test? ( hdf5 python fftw )"
BDEPEND="
- doc? (
- app-doc/doxygen
- >=dev-python/sphinx-1.1.3-r5
- )
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
valgrind? ( dev-util/valgrind )
@@ -39,11 +34,11 @@ BDEPEND="
"
# runtime dependency on python is required by the vigra-config script
DEPEND="
- fftw? ( sci-libs/fftw:3.0 )
+ fftw? ( sci-libs/fftw:3.0= )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? (
- media-libs/ilmbase:=
+ dev-libs/imath:=
media-libs/openexr:=
)
png? ( media-libs/libpng:0= )
@@ -63,16 +58,19 @@ RDEPEND="${PYTHON_DEPS}
RESTRICT="test"
PATCHES=(
+ # git master
+ "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+ "${FILESDIR}/${P}-boost-python.patch"
+ "${FILESDIR}/${P}-python3.7.patch" # bug 701208
+ "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
# TODO: upstream
- "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
- "${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
- "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+ "${FILESDIR}/${P}-lib_suffix.patch"
+ "${FILESDIR}/${P}-cmake-module-dir.patch"
+ "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
)
pkg_setup() {
- if use python || use doc; then
- python_setup
- fi
+ use python && python_setup
}
src_prepare() {
@@ -85,10 +83,6 @@ src_prepare() {
cmake_src_prepare
- if [[ ${PV} != *9999 ]]; then
- rm -r doc || die "failed to remove shipped docs"
- fi
-
vigra_disable fftw fftw3
vigra_disable fftw fftw3f
vigra_disable jpeg
@@ -99,6 +93,8 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+ use doc || cmake_comment_add_subdirectory docsrc
+
if ! use test; then
cmake_comment_add_subdirectory test
cmake_run_in vigranumpy cmake_comment_add_subdirectory test
@@ -113,8 +109,7 @@ src_configure() {
vigra_configure() {
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${PF}"
+ -DDOCINSTALL="share/doc/${PF}/html"
-DWITH_HDF5=$(usex hdf5)
-DWITH_OPENEXR=$(usex openexr)
-DWITH_VALGRIND=$(usex valgrind)
@@ -126,8 +121,6 @@ src_configure() {
if use python; then
python_foreach_impl vigra_configure
else
- # required for docdir
- _cmake_check_build_dir init
vigra_configure
fi
}
@@ -143,13 +136,6 @@ src_compile() {
else
vigra_compile
fi
-
- if use doc; then
- einfo "Generating Documentation"
- doxygen -u ${VIGRA_BUILD_DIR}/docsrc/Doxyfile 2>/dev/null || die
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
}
src_install() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 171eedd560f8..bcefe3e30c33 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake flag-o-matic python-r1
@@ -23,15 +23,10 @@ SLOT="0"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
REQUIRED_USE="
- doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
test? ( hdf5 python fftw )"
BDEPEND="
- doc? (
- app-doc/doxygen
- >=dev-python/sphinx-1.1.3-r5
- )
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
valgrind? ( dev-util/valgrind )
@@ -39,11 +34,11 @@ BDEPEND="
"
# runtime dependency on python is required by the vigra-config script
DEPEND="
- fftw? ( sci-libs/fftw:3.0 )
+ fftw? ( sci-libs/fftw:3.0= )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? (
- media-libs/ilmbase:=
+ dev-libs/imath:=
media-libs/openexr:=
)
png? ( media-libs/libpng:0= )
@@ -70,9 +65,7 @@ PATCHES=(
)
pkg_setup() {
- if use python || use doc; then
- python_setup
- fi
+ use python && python_setup
}
src_prepare() {
@@ -85,10 +78,6 @@ src_prepare() {
cmake_src_prepare
- if [[ ${PV} != *9999 ]]; then
- rm -r doc || die "failed to remove shipped docs"
- fi
-
vigra_disable fftw fftw3
vigra_disable fftw fftw3f
vigra_disable jpeg
@@ -99,6 +88,8 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+ use doc || cmake_comment_add_subdirectory docsrc
+
if ! use test; then
cmake_comment_add_subdirectory test
cmake_run_in vigranumpy cmake_comment_add_subdirectory test
@@ -113,8 +104,7 @@ src_configure() {
vigra_configure() {
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
- -DDOCDIR="${BUILD_DIR}/doc"
- -DDOCINSTALL="share/doc/${PF}"
+ -DDOCINSTALL="share/doc/${PF}/html"
-DWITH_HDF5=$(usex hdf5)
-DWITH_OPENEXR=$(usex openexr)
-DWITH_VALGRIND=$(usex valgrind)
@@ -126,8 +116,6 @@ src_configure() {
if use python; then
python_foreach_impl vigra_configure
else
- # required for docdir
- _cmake_check_build_dir init
vigra_configure
fi
}
@@ -143,13 +131,6 @@ src_compile() {
else
vigra_compile
fi
-
- if use doc; then
- einfo "Generating Documentation"
- doxygen -u ${VIGRA_BUILD_DIR}/docsrc/Doxyfile 2>/dev/null || die
- # use build dir from last compile command
- VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
- fi
}
src_install() {
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-18 18:14 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-18 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 79037644ec0c0a336a242871ca4b2bd7bd95672f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 18:10:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 18:14:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79037644
media-libs/vigra: crank up imath/openexr dependency
To avoid the 'slotted mode' Imath which installed to a
non-standard location.
See: https://forums.gentoo.org/viewtopic-t-1147367.html
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r5.ebuild | 4 ++--
media-libs/vigra/vigra-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r5.ebuild b/media-libs/vigra/vigra-1.11.1-r5.ebuild
index f11ce7a0baef..94b15381c44b 100644
--- a/media-libs/vigra/vigra-1.11.1-r5.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r5.ebuild
@@ -38,8 +38,8 @@ DEPEND="
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
+ >=dev-libs/imath-3.1.4-r2:=
+ >=media-libs/openexr-3:=
)
png? ( media-libs/libpng:0= )
python? (
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index bcefe3e30c33..b3c0a5b7ab12 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -38,8 +38,8 @@ DEPEND="
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
+ >=dev-libs/imath-3.1.4-r2:=
+ >=media-libs/openexr-3:=
)
png? ( media-libs/libpng:0= )
python? (
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-19 19:47 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-19 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 84f8fc7d114a39528b0a59bc64a24d76c86ba353
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 19:46:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 19:46:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f8fc7d
media-libs/vigra: simplify OpenEXR 3 dependency
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/{vigra-1.11.1-r5.ebuild => vigra-1.11.1-r6.ebuild} | 2 +-
media-libs/vigra/vigra-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r5.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
similarity index 99%
rename from media-libs/vigra/vigra-1.11.1-r5.ebuild
rename to media-libs/vigra/vigra-1.11.1-r6.ebuild
index 94b15381c44b..0f691407b511 100644
--- a/media-libs/vigra/vigra-1.11.1-r5.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( virtual/jpeg:0 )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openexr-3:=
+ >=media-libs/openexr-3:0=
)
png? ( media-libs/libpng:0= )
python? (
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index b3c0a5b7ab12..f842c53d7500 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( virtual/jpeg:0 )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openexr-3:=
+ >=media-libs/openexr-3:0=
)
png? ( media-libs/libpng:0= )
python? (
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-26 2:30 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-26 2:30 UTC (permalink / raw
To: gentoo-commits
commit: f097bd51e09f919803554613186f06d193042537
Author: Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Sun Feb 20 13:20:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 02:29:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f097bd51
media-libs/vigra: add python 3.10
Closes: https://bugs.gentoo.org/829444
Closes: https://github.com/gentoo/gentoo/pull/23381
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 0f691407b511..5712b97f47a9 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake flag-o-matic python-r1
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-28 5:21 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-28 5:21 UTC (permalink / raw
To: gentoo-commits
commit: c598addcdd2f0d724484debcd85aeab764fd18fc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 05:20:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 05:20:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c598addc
media-libs/vigra: Stabilize 1.11.1-r6 amd64, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 5712b97f47a9..09602d3d0d7e 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-02-28 23:58 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-02-28 23:58 UTC (permalink / raw
To: gentoo-commits
commit: d1d094b9f95aad33adfcdf975372ed29ec5f16e2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:57:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:57:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d094b9
media-libs/vigra: Stabilize 1.11.1-r6 x86, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 09602d3d0d7e..4f85686bed28 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-03-01 0:02 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-03-01 0:02 UTC (permalink / raw
To: gentoo-commits
commit: d9d8f9ef191bb21b4cd01f19cc5747bf012a670a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 00:01:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 00:01:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d8f9ef
media-libs/vigra: Stabilize 1.11.1-r6 arm64, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 4f85686bed28..6724c62fa033 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-07-11 2:50 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-07-11 2:50 UTC (permalink / raw
To: gentoo-commits
commit: b1d60fdb2d1ce212ed3ee0a07663d87df77344b9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 02:48:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 02:48:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d60fdb
media-libs/vigra: sync live (PYTHON_COMPAT)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index f842c53d7500..f10aa9a71fbf 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake flag-o-matic python-r1
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-08-17 16:21 Matt Turner
0 siblings, 0 replies; 64+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 3f7cebf28a502d5407acc6dd4aaf8d130f74c255
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:44:51 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7cebf2
media-libs/vigra: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r3.ebuild | 160 --------------------------------
media-libs/vigra/vigra-1.11.1-r4.ebuild | 160 --------------------------------
2 files changed, 320 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
deleted file mode 100644
index 65fd07b618ac..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
-
-REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-BDEPEND="
- test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
- )
-"
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
- fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr:=
- )
- png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tiff? ( media-libs/tiff:0= )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
- ${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
- "${FILESDIR}/${P}-boost-python.patch"
- "${FILESDIR}/${P}-python3.7.patch" # bug 701208
- "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
- # TODO: upstream
- "${FILESDIR}/${P}-lib_suffix.patch"
- "${FILESDIR}/${P}-cmake-module-dir.patch"
- "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- vigra_disable() {
- if ! use ${1}; then
- sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
- -i CMakeLists.txt || die "failed to disable ${1}"
- fi
- }
-
- cmake_src_prepare
-
- vigra_disable fftw fftw3
- vigra_disable fftw fftw3f
- vigra_disable jpeg
- vigra_disable png
- vigra_disable tiff
- vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
- use doc || cmake_comment_add_subdirectory docsrc
-
- if ! use test; then
- cmake_comment_add_subdirectory test
- cmake_run_in vigranumpy cmake_comment_add_subdirectory test
- fi
-}
-
-src_configure() {
- # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
- # bug #808731
- use hdf5 && append-cppflags -DH5_USE_110_API
-
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
diff --git a/media-libs/vigra/vigra-1.11.1-r4.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild
deleted file mode 100644
index be3e2f9fe820..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
-
-REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-BDEPEND="
- test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
- )
-"
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tiff? ( media-libs/tiff:0= )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
- ${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
- "${FILESDIR}/${P}-boost-python.patch"
- "${FILESDIR}/${P}-python3.7.patch" # bug 701208
- "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
- # TODO: upstream
- "${FILESDIR}/${P}-lib_suffix.patch"
- "${FILESDIR}/${P}-cmake-module-dir.patch"
- "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- vigra_disable() {
- if ! use ${1}; then
- sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
- -i CMakeLists.txt || die "failed to disable ${1}"
- fi
- }
-
- cmake_src_prepare
-
- vigra_disable fftw fftw3
- vigra_disable fftw fftw3f
- vigra_disable jpeg
- vigra_disable png
- vigra_disable tiff
- vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
- use doc || cmake_comment_add_subdirectory docsrc
-
- if ! use test; then
- cmake_comment_add_subdirectory test
- cmake_run_in vigranumpy cmake_comment_add_subdirectory test
- fi
-}
-
-src_configure() {
- # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
- # bug #808731
- use hdf5 && append-cppflags -DH5_USE_110_API
-
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-09-07 7:52 Michał Górny
0 siblings, 0 replies; 64+ messages in thread
From: Michał Górny @ 2022-09-07 7:52 UTC (permalink / raw
To: gentoo-commits
commit: bff2781e844970cc703ee95fcb54811280188d6f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 19:43:13 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 07:51:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff2781e
media-libs/vigra: Update PYTHON_REQ_USE to xml(+)
Update PYTHON_REQ_USE to specify "xml(+)", as Python 3.11 no longer
features the "xml" flag.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r6.ebuild | 2 +-
media-libs/vigra/vigra-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 6724c62fa033..d8a4ffb3a5e0 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index f10aa9a71fbf..a7f34a358cb8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2022-12-16 4:30 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2022-12-16 4:30 UTC (permalink / raw
To: gentoo-commits
commit: f309ed20d6d17fcbb062f48b6367d066582438ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 04:24:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 04:29:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f309ed20
media-libs/vigra: unrevbump 9999
Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/{vigra-9999-r1.ebuild => vigra-9999.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/vigra/vigra-9999-r1.ebuild b/media-libs/vigra/vigra-9999.ebuild
similarity index 100%
rename from media-libs/vigra/vigra-9999-r1.ebuild
rename to media-libs/vigra/vigra-9999.ebuild
^ permalink raw reply [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2023-05-02 20:50 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2023-05-02 20:50 UTC (permalink / raw
To: gentoo-commits
commit: e2f55c0a841be18be4f97577e7cb0923c3bdbea6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 20:31:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 2 20:47:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f55c0a
media-libs/vigra: Stabilize 1.11.1-r9 x86, #905611
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 691ce34a6ce1..ba5775049fe2 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2023-05-03 18:58 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2023-05-03 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 35411da4221572f4ff61fd4f884cf1c2a78ff30b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 18:58:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 3 18:58:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35411da4
media-libs/vigra: Stabilize 1.11.1-r9 amd64, #905611
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index ba5775049fe2..578a8cdef20f 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2023-05-05 9:03 Arthur Zamarin
0 siblings, 0 replies; 64+ messages in thread
From: Arthur Zamarin @ 2023-05-05 9:03 UTC (permalink / raw
To: gentoo-commits
commit: bfdb074dd92a33ac664d5f31885bc4c5a83c7ca2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 09:03:27 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 5 09:03:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdb074d
media-libs/vigra: Stabilize 1.11.1-r9 arm64, #905611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 578a8cdef20f..beb3622e9ca0 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2023-05-14 0:31 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2023-05-14 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 031e152dafaa74c07068f677c853b71b5f350ec1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 00:19:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 14 00:31:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031e152d
media-libs/vigra: drop invalid USE=valgrind flag (for test suite)
We don't, in general, run Valgrind for test suites in Gentoo because it's
not portable enough and gives inconsistent results, especially under sandbox.
Plus it's confusing given USE=valgrind is effectively a global USE flag (even
if it isn't in use.desc yet) for meaning "enable annotations to enable better
debugging under Valgrind", rather than "run tests under it".
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/metadata.xml | 3 ---
media-libs/vigra/vigra-1.11.1-r8.ebuild | 5 ++---
media-libs/vigra/vigra-1.11.1-r9.ebuild | 5 ++---
media-libs/vigra/vigra-9999.ebuild | 5 ++---
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 14449893ddbe..42f024b353cf 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,9 +5,6 @@
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
- <use>
- <flag name="valgrind">Enable valgrind in make check</flag>
- </use>
<upstream>
<remote-id type="github">ukoethe/vigra</remote-id>
</upstream>
diff --git a/media-libs/vigra/vigra-1.11.1-r8.ebuild b/media-libs/vigra/vigra-1.11.1-r8.ebuild
index 2c819e907573..8e05bebbabd4 100644
--- a/media-libs/vigra/vigra-1.11.1-r8.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r8.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
REQUIRED_USE="
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
BDEPEND="
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
)
"
# runtime dependency on python is required by the vigra-config script
@@ -113,7 +112,7 @@ src_configure() {
-DDOCINSTALL="share/doc/${PF}/html"
-DWITH_HDF5=$(usex hdf5)
-DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
+ -DWITH_VALGRIND=OFF # only used for tests
-DWITH_VIGRANUMPY=$(usex python)
)
cmake_src_configure
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index beb3622e9ca0..ef5236cfe1b7 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
REQUIRED_USE="
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
BDEPEND="
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
)
"
# runtime dependency on python is required by the vigra-config script
@@ -114,7 +113,7 @@ src_configure() {
-DDOCINSTALL="share/doc/${PF}/html"
-DWITH_HDF5=$(usex hdf5)
-DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
+ -DWITH_VALGRIND=OFF # only used for tests
-DWITH_VIGRANUMPY=$(usex python)
)
cmake_src_configure
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 9d414e9529c7..5a2feab44ca9 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
REQUIRED_USE="
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
BDEPEND="
test? (
>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- valgrind? ( dev-util/valgrind )
)
"
# runtime dependency on python is required by the vigra-config script
@@ -107,7 +106,7 @@ src_configure() {
-DDOCINSTALL="share/doc/${PF}/html"
-DWITH_HDF5=$(usex hdf5)
-DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=$(usex valgrind)
+ -DWITH_VALGRIND=OFF # only used for tests
-DWITH_VIGRANUMPY=$(usex python)
)
cmake_src_configure
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2023-05-14 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 64+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 10:29 UTC (permalink / raw
To: gentoo-commits
commit: fba95363465d0d5f261a109a0f0bddc70caac40e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 08:14:47 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba95363
media-libs/vigra: drop 1.11.1-r8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r8.ebuild | 160 --------------------------------
1 file changed, 160 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r8.ebuild b/media-libs/vigra/vigra-1.11.1-r8.ebuild
deleted file mode 100644
index 8e05bebbabd4..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r8.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
-
-REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-BDEPEND="
- test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- )
-"
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
- jpeg? ( media-libs/libjpeg-turbo:= )
- openexr? (
- >=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openexr-3:0=
- )
- png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tiff? ( media-libs/tiff:= )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
- ${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
- "${FILESDIR}/${P}-boost-python.patch"
- "${FILESDIR}/${P}-python3.7.patch" # bug 701208
- "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
- # TODO: upstream
- "${FILESDIR}/${P}-lib_suffix.patch"
- "${FILESDIR}/${P}-cmake-module-dir.patch"
- "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
- "${FILESDIR}/${P}-openexr3.patch"
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- vigra_disable() {
- if ! use ${1}; then
- sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
- -i CMakeLists.txt || die "failed to disable ${1}"
- fi
- }
-
- cmake_src_prepare
-
- vigra_disable fftw fftw3
- vigra_disable fftw fftw3f
- vigra_disable jpeg
- vigra_disable png
- vigra_disable tiff
- vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
- use doc || cmake_comment_add_subdirectory docsrc
-
- if ! use test; then
- cmake_comment_add_subdirectory test
- cmake_run_in vigranumpy cmake_comment_add_subdirectory test
- fi
-}
-
-src_configure() {
- # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
- # bug #808731
- use hdf5 && append-cppflags -DH5_USE_110_API
-
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=OFF # only used for tests
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2024-02-27 15:21 Michał Górny
0 siblings, 0 replies; 64+ messages in thread
From: Michał Górny @ 2024-02-27 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 234ccb2c4534655d08499bb66a2dedaf725cc2ac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 15:12:40 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 15:21:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234ccb2c
media-libs/vigra: Remove dev-python/nose dep
Upstream has switched over to dev-python/pytest in -9999. The old
version is still using dev-python/nose but the ebuild is test-restricted
anyway, so no point in blocking nose removal here.
Closes: https://bugs.gentoo.org/878713
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/vigra/vigra-1.11.1-r9.ebuild | 10 +++-------
media-libs/vigra/vigra-9999.ebuild | 7 ++++---
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 6e3de6f74804..1be44dbdba2c 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
+
inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -26,11 +27,6 @@ REQUIRED_USE="
python? ( hdf5 ${PYTHON_REQUIRED_USE} )
test? ( hdf5 python fftw )"
-BDEPEND="
- test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
- )
-"
# runtime dependency on python is required by the vigra-config script
DEPEND="
fftw? ( sci-libs/fftw:3.0= )
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 8e668e863ad0..4fee34b87e24 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
+
inherit cmake flag-o-matic python-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -28,7 +29,7 @@ REQUIRED_USE="
BDEPEND="
test? (
- >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
)
"
# runtime dependency on python is required by the vigra-config script
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2024-06-14 7:28 Sam James
0 siblings, 0 replies; 64+ messages in thread
From: Sam James @ 2024-06-14 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 593c2ab8a6b518c9a160459d10f77e9acc2a488a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 07:27:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 07:28:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593c2ab8
media-libs/vigra: add 1.11.2_p20240505
* Drop broken Python bindings as they use distutils quite a bit. There aren't
any reverse dependencies.
* Drop broken docs (needs various patching and still don't work in snapshot).
Closes: https://bugs.gentoo.org/743160
Closes: https://bugs.gentoo.org/806470
Closes: https://bugs.gentoo.org/929649
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/Manifest | 1 +
...a-9999.ebuild => vigra-1.11.2_p20240505.ebuild} | 103 +++++++--------------
media-libs/vigra/vigra-9999.ebuild | 103 +++++++--------------
3 files changed, 69 insertions(+), 138 deletions(-)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index cc03ca4ec086..6bacbbf4893a 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1 +1,2 @@
DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
+DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
similarity index 53%
copy from media-libs/vigra/vigra-9999.ebuild
copy to media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 4fee34b87e24..09cc7b4ffdc8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
-inherit cmake flag-o-matic python-r1
+inherit cmake flag-o-matic python-single-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -15,24 +15,32 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+ if [[ ${PV} == *_p* ]] ; then
+ VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1"
+ SRC_URI="https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${VIGRA_COMMIT}
+ else
+ SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+ fi
+
KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
+IUSE="+fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib"
REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
+ ${PYTHON_REQUIRED_USE}
+ test? ( hdf5 fftw )
+"
BDEPEND="
test? (
- dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ')
)
"
-# runtime dependency on python is required by the vigra-config script
DEPEND="
fftw? ( sci-libs/fftw:3.0= )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
@@ -42,15 +50,12 @@ DEPEND="
>=media-libs/openexr-3:0=
)
png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
tiff? ( media-libs/tiff:= )
zlib? ( sys-libs/zlib )
"
-RDEPEND="${PYTHON_DEPS}
+# Python is needed as a runtime dep of installed vigra-config
+RDEPEND="
+ ${PYTHON_DEPS}
${DEPEND}
"
@@ -61,13 +66,8 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
"${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
- "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
)
-pkg_setup() {
- use python && python_setup
-}
-
src_prepare() {
vigra_disable() {
if ! use ${1}; then
@@ -88,7 +88,9 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
- use doc || cmake_comment_add_subdirectory docsrc
+ sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR doc_cpp)/d' CMakeLists.txt || die
+
+ cmake_comment_add_subdirectory docsrc
if ! use test; then
cmake_comment_add_subdirectory test
@@ -101,55 +103,18 @@ src_configure() {
# bug #808731
use hdf5 && append-cppflags -DH5_USE_110_API
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=OFF # only used for tests
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
+ local mycmakeargs=(
+ -DAUTOEXEC_TESTS=OFF
+ -DDOCINSTALL="share/doc/${PF}/html"
+ -DWITH_HDF5=$(usex hdf5)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_VALGRIND=OFF # only used for tests
+ -DWITH_VIGRANUMPY=OFF
+ )
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
+ cmake_src_configure
}
src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
}
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 4fee34b87e24..09cc7b4ffdc8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
-inherit cmake flag-o-matic python-r1
+inherit cmake flag-o-matic python-single-r1
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -15,24 +15,32 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+ if [[ ${PV} == *_p* ]] ; then
+ VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1"
+ SRC_URI="https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${VIGRA_COMMIT}
+ else
+ SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+ fi
+
KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
fi
LICENSE="MIT"
SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
+IUSE="+fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib"
REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
+ ${PYTHON_REQUIRED_USE}
+ test? ( hdf5 fftw )
+"
BDEPEND="
test? (
- dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ')
)
"
-# runtime dependency on python is required by the vigra-config script
DEPEND="
fftw? ( sci-libs/fftw:3.0= )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
@@ -42,15 +50,12 @@ DEPEND="
>=media-libs/openexr-3:0=
)
png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
tiff? ( media-libs/tiff:= )
zlib? ( sys-libs/zlib )
"
-RDEPEND="${PYTHON_DEPS}
+# Python is needed as a runtime dep of installed vigra-config
+RDEPEND="
+ ${PYTHON_DEPS}
${DEPEND}
"
@@ -61,13 +66,8 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
"${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
- "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
)
-pkg_setup() {
- use python && python_setup
-}
-
src_prepare() {
vigra_disable() {
if ! use ${1}; then
@@ -88,7 +88,9 @@ src_prepare() {
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
- use doc || cmake_comment_add_subdirectory docsrc
+ sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR doc_cpp)/d' CMakeLists.txt || die
+
+ cmake_comment_add_subdirectory docsrc
if ! use test; then
cmake_comment_add_subdirectory test
@@ -101,55 +103,18 @@ src_configure() {
# bug #808731
use hdf5 && append-cppflags -DH5_USE_110_API
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=OFF # only used for tests
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
+ local mycmakeargs=(
+ -DAUTOEXEC_TESTS=OFF
+ -DDOCINSTALL="share/doc/${PF}/html"
+ -DWITH_HDF5=$(usex hdf5)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_VALGRIND=OFF # only used for tests
+ -DWITH_VIGRANUMPY=OFF
+ )
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
+ cmake_src_configure
}
src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
}
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2024-08-30 14:23 Arthur Zamarin
0 siblings, 0 replies; 64+ messages in thread
From: Arthur Zamarin @ 2024-08-30 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 1a8c5ce6536f57341b07304f333de437c5cfdca6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 14:23:33 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 14:23:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8c5ce6
media-libs/vigra: Stabilize 1.11.2_p20240505 arm64, #938737
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.2_p20240505.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 09cc7b4ffdc8..ce1ebe1ad538 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
fi
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+ KEYWORDS="~amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2024-08-30 14:29 Arthur Zamarin
0 siblings, 0 replies; 64+ messages in thread
From: Arthur Zamarin @ 2024-08-30 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 29abc87f010fa79784ebe6cf4a3e0792c83f519c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 14:28:59 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 14:28:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29abc87f
media-libs/vigra: Stabilize 1.11.2_p20240505 amd64, #938737
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.2_p20240505.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index ce1ebe1ad538..2bb45ea5ab6f 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
fi
- KEYWORDS="~amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+ KEYWORDS="amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
@ 2024-08-30 14:31 Arthur Zamarin
0 siblings, 0 replies; 64+ messages in thread
From: Arthur Zamarin @ 2024-08-30 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 5998c95ee437bac9ae60d6f5aba06157bfe0acbe
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 14:31:49 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 14:31:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5998c95e
media-libs/vigra: Stabilize 1.11.2_p20240505 x86, #938737
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/vigra/vigra-1.11.2_p20240505.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 2bb45ea5ab6f..6637427cd835 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
fi
- KEYWORDS="amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+ KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 64+ messages in thread
end of thread, other threads:[~2024-08-30 14:31 UTC | newest]
Thread overview: 64+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-20 17:22 [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-08-30 14:31 Arthur Zamarin
2024-08-30 14:29 Arthur Zamarin
2024-08-30 14:23 Arthur Zamarin
2024-06-14 7:28 Sam James
2024-02-27 15:21 Michał Górny
2023-05-14 10:29 Andreas Sturmlechner
2023-05-14 0:31 Sam James
2023-05-05 9:03 Arthur Zamarin
2023-05-03 18:58 Sam James
2023-05-02 20:50 Sam James
2022-12-16 4:30 Sam James
2022-09-07 7:52 Michał Górny
2022-08-17 16:21 Matt Turner
2022-07-11 2:50 Sam James
2022-03-01 0:02 Sam James
2022-02-28 23:58 Sam James
2022-02-28 5:21 Sam James
2022-02-26 2:30 Sam James
2022-02-19 19:47 Sam James
2022-02-18 18:14 Sam James
2022-02-15 19:51 Sam James
2021-09-10 5:23 Sam James
2021-02-28 16:52 Andreas Sturmlechner
2021-01-09 19:06 Andreas Sturmlechner
2020-07-10 21:24 Andreas Sturmlechner
2020-04-17 0:04 Andreas Sturmlechner
2020-01-12 15:29 Andreas Sturmlechner
2020-01-10 1:26 Thomas Deutschmann
2019-12-31 1:06 Aaron Bauman
2019-12-30 16:14 Agostino Sarubbo
2019-11-27 14:43 Andreas Sturmlechner
2019-11-27 0:13 Andreas Sturmlechner
2019-11-27 0:13 Andreas Sturmlechner
2019-11-27 0:13 Andreas Sturmlechner
2019-10-06 14:46 Andreas Sturmlechner
2019-06-05 19:20 Andreas Sturmlechner
2019-04-24 21:33 Thomas Deutschmann
2019-04-09 14:31 Mikle Kolyada
2019-04-08 21:47 Andreas K. Hüttel
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2018-04-26 5:02 Matt Turner
2018-04-25 19:27 Thomas Deutschmann
2018-04-18 18:37 Pacho Ramos
2018-04-16 16:25 Aaron Bauman
2017-11-26 23:06 David Seifert
2017-02-16 0:13 Andreas Hüttel
2017-02-11 22:03 Andreas Hüttel
2017-02-11 22:03 Andreas Hüttel
2016-09-07 18:22 Austin English
2016-08-19 5:33 Tim Harder
2016-01-30 8:10 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox