* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/
@ 2022-02-15 23:41 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-02-15 23:41 UTC (permalink / raw
To: gentoo-commits
commit: ecadc9d1ebd6bff62bc1df3d617e7e6e8ab90ae5
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Tue Feb 15 23:14:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 23:41:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadc9d1
media-libs/vigra: fix OpenEXR-3 dependency
Without the patch, OpenEXR-3 support is not included, regardless of USE=openexr
(...)
-- Searching for OpenEXR
-- in default locations
-- Could NOT find OpenEXR (missing: OPENEXR_HALF_LIBRARY OPENEXR_ILMIMF_LIBRARY)
(...)
With it, hugin-2021.0.0 (correctly) detects OpenEXR-3 support in vigra,
and compiles just fine, closing below bug.
(Upstream patch was modified scrubbed)
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://bugs.gentoo.org/823632
Closes: https://github.com/gentoo/gentoo/pull/24205
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/vigra/files/vigra-1.11.1-openexr3.patch | 37 +++++
media-libs/vigra/vigra-1.11.1-r5.ebuild | 161 +++++++++++++++++++++
2 files changed, 198 insertions(+)
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
new file mode 100644
index 000000000000..703cd22b9321
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
@@ -0,0 +1,37 @@
+https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
+https://bugs.gentoo.org/823632
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+
+
+ IF(WITH_OPENEXR)
++ FIND_PACKAGE(Imath CONFIG)
++ IF(TARGET Imath::Imath)
++ FIND_PACKAGE(OpenEXR CONFIG)
++ SET(OPENEXR_LIBRARIES
++ OpenEXR::OpenEXR
++ OpenEXR::Iex
++ OpenEXR::IlmThread
++ Imath::Imath
++ )
++ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++ set(OPENEXR_FOUND TRUE)
++ ELSE()
+ VIGRA_FIND_PACKAGE(OpenEXR)
++ ENDIF()
+ ENDIF()
+
+ IF(WITH_HDF5)
+--- a/src/impex/CMakeLists.txt
++++ b/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+
+ IF(OPENEXR_FOUND)
++ cmake_policy(SET CMP0028 NEW)
+ TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+
diff --git a/media-libs/vigra/vigra-1.11.1-r5.ebuild b/media-libs/vigra/vigra-1.11.1-r5.ebuild
new file mode 100644
index 000000000000..f11ce7a0baef
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r5.ebuild
@@ -0,0 +1,161 @@
+# 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
+ "${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=$(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] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/
@ 2023-05-01 17:50 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-05-01 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 7de87c817a7c9b669a7849dbeec776ff423cb3f1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 17:48:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 17:50:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de87c81
media-libs/vigra: enable py3.11
Closes: https://bugs.gentoo.org/897016
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../vigra/files/vigra-1.11.1-python-syntax.patch | 64 ++++++++++++++++++++++
.../{vigra-9999.ebuild => vigra-1.11.1-r9.ebuild} | 15 +++--
media-libs/vigra/vigra-9999.ebuild | 2 +-
3 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
new file mode 100644
index 000000000000..111bc06d5716
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
@@ -0,0 +1,64 @@
+https://github.com/ukoethe/vigra/commit/aba7e731bdde39516b5470673ce40a0036665201
+https://github.com/ukoethe/vigra/commit/c949d3640266f515eb1e3ecca2b752e13e0c3804
+
+From aba7e731bdde39516b5470673ce40a0036665201 Mon Sep 17 00:00:00 2001
+From: Mark Harfouche <mark.harfouche@gmail.com>
+Date: Mon, 5 Sep 2022 15:10:08 -0400
+Subject: [PATCH] Avoid using `is not` when comparing to an integer
+
+---
+ vigranumpy/lib/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vigranumpy/lib/__init__.py b/vigranumpy/lib/__init__.py
+index 072a797c6..f598e0a8d 100644
+--- a/vigranumpy/lib/__init__.py
++++ b/vigranumpy/lib/__init__.py
+@@ -1780,7 +1780,7 @@ def handle_click(self, event):
+ for yo in range(-1*bs, bs+1):
+ xx = x+xo
+ yy = y+yo
+- if xo is not 0 or yo is not 0:
++ if (xo != 0) or (yo != 0):
+ if xx >=0 and xx<shape[0] and \
+ yy >=0 and yy<shape[0]:
+ otherLabel = labels[xx, yy]
+
+From c949d3640266f515eb1e3ecca2b752e13e0c3804 Mon Sep 17 00:00:00 2001
+From: Omari Stephens <xsdg@xsdg.org>
+Date: Tue, 28 Dec 2021 21:54:51 +0000
+Subject: [PATCH] Updates doc generation config for Python 3 compatibility
+
+---
+ vigranumpy/docsrc/conf.py.cmake2.in | 2 +-
+ vigranumpy/docsrc/conf.py.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vigranumpy/docsrc/conf.py.cmake2.in b/vigranumpy/docsrc/conf.py.cmake2.in
+index e4266a636..175dfb39f 100644
+--- a/vigranumpy/docsrc/conf.py.cmake2.in
++++ b/vigranumpy/docsrc/conf.py.cmake2.in
+@@ -23,7 +23,7 @@ _original_getargspec = inspect.getargspec
+ def _getargspec_workaround(*args, **kw):
+ try:
+ return _original_getargspec(*args, **kw)
+- except TypeError, e:
++ except TypeError as e:
+ if str(e).startswith('arg is not a Python function'):
+ return inspect.ArgSpec([], None, None, None)
+ else:
+diff --git a/vigranumpy/docsrc/conf.py.in b/vigranumpy/docsrc/conf.py.in
+index 607559352..ac2261d20 100644
+--- a/vigranumpy/docsrc/conf.py.in
++++ b/vigranumpy/docsrc/conf.py.in
+@@ -22,7 +22,7 @@ _original_getargspec = inspect.getargspec
+ def _getargspec_workaround(*args, **kw):
+ try:
+ return _original_getargspec(*args, **kw)
+- except TypeError, e:
++ except TypeError as e:
+ if str(e).startswith('arg is not a Python function'):
+ return inspect.ArgSpec([], None, None, None)
+ else:
+
+
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
similarity index 87%
copy from media-libs/vigra/vigra-9999.ebuild
copy to media-libs/vigra/vigra-1.11.1-r9.ebuild
index ccc20c7bd4e7..691ce34a6ce1 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
inherit cmake flag-o-matic python-r1
@@ -58,10 +58,17 @@ 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
+ "${FILESDIR}/${P}-openexr3.patch"
+ "${FILESDIR}/${P}-python-syntax.patch"
)
pkg_setup() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index ccc20c7bd4e7..9d414e9529c7 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
inherit cmake flag-o-matic python-r1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: b4dbda1d072c07a6578e297ae3feb442ccbd3ba9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 22:07:41 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=b4dbda1d
media-libs/vigra: Fix finding boost-python
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../vigra/files/vigra-1.11.1-boost-python.patch | 22 ++++++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r2.ebuild | 3 +++
2 files changed, 25 insertions(+)
diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
new file mode 100644
index 00000000000..ffa3334f873
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
@@ -0,0 +1,22 @@
+From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:10:56 +0200
+Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
+
+---
+ config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+index f6f9d563b..47cf4237c 100644
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
+ boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+ # Mac with Python 3
+ boost_python${PYTHON_VERSION_MAJOR}
++ # conda-forge
++ boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
+ # default
+ boost_python)
+
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 9306ea02732..387419da085 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -64,7 +64,10 @@ RDEPEND="${DEPEND}"
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"
)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 7de4915e9c99fba07343fc33c4bf50c85b2b7c76
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 22:23:53 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=7de4915e
media-libs/vigra: Fix build with sphinx-2
See also: https://github.com/ukoethe/vigra/issues/462
Closes: https://bugs.gentoo.org/678308
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/vigra-1.11.1-sphinx.ext.pngmath.patch | 27 ++++++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r2.ebuild | 1 +
media-libs/vigra/vigra-9999.ebuild | 6 ++++-
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
new file mode 100644
index 00000000000..fc265763f6a
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
@@ -0,0 +1,27 @@
+Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8
+Bug-Debian: https://bugs.debian.org/923467
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Fri, 08 Mar 2019 18:38:02 +0100
+
+--- a/vigranumpy/docsrc/conf.py.cmake2.in
++++ b/vigranumpy/docsrc/conf.py.cmake2.in
+@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi
+
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+--- a/vigranumpy/docsrc/conf.py.in
++++ b/vigranumpy/docsrc/conf.py.in
+@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi
+
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 8f4b2b23a1c..757fe839d19 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
"${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() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index cad2a8191a7..6d9d2266b16 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -64,7 +64,11 @@ RDEPEND="${PYTHON_DEPS}
# Severely broken, also disabled in Fedora, bugs #390447, #653442
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
+PATCHES=(
+ # TODO: upstream
+ "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
+ "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+)
pkg_setup() {
if use python || use doc; then
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/
@ 2017-09-14 19:24 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2017-09-14 19:24 UTC (permalink / raw
To: gentoo-commits
commit: c8d9adf62818774ab04531fb4f411c353891a54e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 19:23:53 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 19:24:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d9adf6
media-libs/vigra: gcc-7 patch, bug #618172
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-libs/vigra/files/vigra-1.11.0-gcc-7.patch | 13 +++++++++++++
media-libs/vigra/vigra-1.11.0.ebuild | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
new file mode 100644
index 00000000000..4aaba64ed5e
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
@@ -0,0 +1,13 @@
+diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx
+index a6f0f80..636cc64 100644
+--- a/include/vigra/imagecontainer.hxx
++++ b/include/vigra/imagecontainer.hxx
+@@ -763,7 +763,7 @@ public:
+ /** swap contents of this array with the contents of other
+ (STL-Container interface)
+ */
+- void swap(const ImagePyramid<ImageType, Alloc> &other)
++ void swap(ImagePyramid<ImageType, Alloc> &other)
+ {
+ images_.swap(other.images_);
+ std::swap(lowestLevel_, other.lowestLevel_);
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 7727e5e430c..2a8cb711812 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -44,13 +44,15 @@ REQUIRED_USE="
DOCS=( README.md )
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-7.patch
+)
+
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-01 17:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-15 23:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-01 17:50 Sam James
2019-11-27 0:13 Andreas Sturmlechner
2019-11-27 0:13 Andreas Sturmlechner
2017-09-14 19:24 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox