[arch-commits] Commit in vigra/repos/community-x86_64 (4 files)
Bruno Pagani
archange at gemini.archlinux.org
Fri Mar 18 13:43:20 UTC 2022
Date: Friday, March 18, 2022 @ 13:43:19
Author: archange
Revision: 1158524
archrelease: copy trunk to community-x86_64
Added:
vigra/repos/community-x86_64/PKGBUILD
(from rev 1158523, vigra/trunk/PKGBUILD)
vigra/repos/community-x86_64/vigra-openexr3.patch
(from rev 1158523, vigra/trunk/vigra-openexr3.patch)
Deleted:
vigra/repos/community-x86_64/PKGBUILD
vigra/repos/community-x86_64/vigra-openexr3.patch
----------------------+
PKGBUILD | 116 +++++++++++++++++++++++++------------------------
vigra-openexr3.patch | 42 ++++++++---------
2 files changed, 82 insertions(+), 76 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-18 13:42:41 UTC (rev 1158523)
+++ PKGBUILD 2022-03-18 13:43:19 UTC (rev 1158524)
@@ -1,55 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-
-pkgname=vigra
-pkgver=1.11.1.r45+g8acd73a5
-pkgrel=6
-pkgdesc="Computer vision library"
-arch=(x86_64)
-url="https://ukoethe.github.io/vigra/"
-license=(custom:MIT)
-depends=(libpng libtiff openexr gcc-libs sh hdf5 fftw)
-makedepends=(git cmake boost python-numpy)
-checkdepends=(python-nose)
-optdepends=('python: for python bindings'
- 'boost-libs: for python bindings')
-source=(git+https://github.com/ukoethe/vigra#commit=8acd73a5e0408326e2a3c1ed1c2c70ffe2b954d0
- vigra-openexr3.patch)
-sha256sums=(SKIP
- 2572717e39f916c7c463b8f49306b683c5923906be2721f7da181c58b3a2b34b)
-
-pkgver() {
- cd ${pkgname}
- git describe --long --tags | sed 's/^Version-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/\.g/+g/'
-}
-
-prepare() {
- cd ${pkgbase}
- # Fix build with openexr 3
- patch -p1 < ../vigra-openexr3.patch
-}
-
-build() {
- cmake -B build -S ${pkgbase} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python \
- -DWITH_OPENEXR=true \
- -DWITH_VIGRANUMPY=1 \
- -DDOCINSTALL=share/doc \
- -DCMAKE_C_FLAGS="-DH5_USE_110_API" \
- -DCMAKE_CXX_FLAGS="-DH5_USE_110_API"
- make -C build
-}
-
-# Numerous failures, upstream almost dead
-# https://github.com/ukoethe/vigra/issues/409
-# https://github.com/ukoethe/vigra/issues/491
-#check() {
-# make -C build -j1 -k check
-#}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
- install -Dm644 ${pkgbase}/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
Copied: vigra/repos/community-x86_64/PKGBUILD (from rev 1158523, vigra/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-18 13:43:19 UTC (rev 1158524)
@@ -0,0 +1,61 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgname=vigra
+pkgver=1.11.1.r67+g093d57d1
+pkgrel=1
+pkgdesc="Computer vision library"
+arch=(x86_64)
+url="https://ukoethe.github.io/vigra/"
+license=(custom:MIT)
+depends=(libpng libtiff openexr gcc-libs sh hdf5 fftw)
+makedepends=(git cmake boost python-numpy)
+checkdepends=(python-nose)
+optdepends=('python: for python bindings'
+ 'boost-libs: for python bindings')
+source=(git+https://github.com/ukoethe/vigra#commit=093d57d15c8c237adf1704d96daa6393158ce299
+ vigra-python3.10.patch::https://github.com/ukoethe/vigra/commit/e7e656c29083729090dd3fb3ec214a888e0b3e8d.patch
+ vigra-numpy1.20.patch::https://github.com/ukoethe/vigra/commit/23ad778502c6436fb6e40ade5e9fd9ddbbad9f35.patch
+ vigra-bind-c17.patch::https://github.com/ukoethe/vigra/pull/500.patch
+ vigra-openexr3.patch)
+sha256sums=('SKIP'
+ '18ab55f011458963785442947ed07dd44cb93e8879a8bdda495fb330011621a4'
+ '014cff1a7e69415ec15cef6635a7279c429d5bf8df861a4d89193d2209de604d'
+ '9c2289f75e6444ad3316b0d46dd7276de10ae81d194cfa10ed84d1e5236aaea0'
+ '2572717e39f916c7c463b8f49306b683c5923906be2721f7da181c58b3a2b34b')
+
+pkgver() {
+ cd ${pkgname}
+ git describe --tags --match "Version-*" | sed 's/^Version-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/\.g/+g/'
+}
+
+prepare() {
+ cd ${pkgbase}
+ patch -p1 < ../vigra-openexr3.patch
+ patch -p1 < ../vigra-python3.10.patch
+ patch -p1 < ../vigra-numpy1.20.patch
+ # https://github.com/ukoethe/vigra/issues/504
+ patch -R -p1 < ../vigra-bind-c17.patch
+}
+
+build() {
+ cmake -B build -S ${pkgbase} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
+ -DDOCINSTALL=share/doc \
+ -DWITH_OPENEXR=true \
+ -DWITH_VIGRANUMPY=1
+ #-DBUILD_DOCS=OFF \
+ make -C build
+}
+
+check() {
+ # https://github.com/ukoethe/vigra/issues/491
+ make -C build -j1 -k check || echo "Tests failed"
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+ install -Dm644 ${pkgbase}/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
Deleted: vigra-openexr3.patch
===================================================================
--- vigra-openexr3.patch 2022-03-18 13:42:41 UTC (rev 1158523)
+++ vigra-openexr3.patch 2022-03-18 13:43:19 UTC (rev 1158524)
@@ -1,21 +0,0 @@
-diff --git a/config/FindOpenEXR.cmake b/config/FindOpenEXR.cmake
-index ef36cdbf..0423e247 100644
---- a/config/FindOpenEXR.cmake
-+++ b/config/FindOpenEXR.cmake
-@@ -23,6 +23,16 @@
- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-+find_package(OpenEXR 3.0 CONFIG QUIET)
-+if(TARGET OpenEXR::OpenEXR)
-+ find_package(Threads)
-+ SET(OPENEXR_FOUND TRUE)
-+ SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
-+ SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+ SET(OPENEXR_VERSION ${OpenEXR_VERSION})
-+ return()
-+endif()
-+
- FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
-
- FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
Copied: vigra/repos/community-x86_64/vigra-openexr3.patch (from rev 1158523, vigra/trunk/vigra-openexr3.patch)
===================================================================
--- vigra-openexr3.patch (rev 0)
+++ vigra-openexr3.patch 2022-03-18 13:43:19 UTC (rev 1158524)
@@ -0,0 +1,21 @@
+diff --git a/config/FindOpenEXR.cmake b/config/FindOpenEXR.cmake
+index ef36cdbf..0423e247 100644
+--- a/config/FindOpenEXR.cmake
++++ b/config/FindOpenEXR.cmake
+@@ -23,6 +23,16 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ find_package(Threads)
++ SET(OPENEXR_FOUND TRUE)
++ SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
++ SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++ SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++ return()
++endif()
++
+ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
+
+ FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
More information about the arch-commits
mailing list