* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2017-02-11 22:03 Andreas Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2017-02-11 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 24636b0d040ab64a4e7b1eefb761bc52d62c32b8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 22:02:43 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=24636b0d
media-libs/vigra: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/vigra/Manifest | 1 -
.../vigra/files/vigra-1.10.0-automagicness.patch | 64 ------
.../vigra/files/vigra-1.10.0-cmake-scripts.patch | 53 -----
.../vigra/files/vigra-1.10.0-mpi-fixes.patch | 230 ---------------------
media-libs/vigra/vigra-1.10.0.ebuild | 141 -------------
5 files changed, 489 deletions(-)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 76b42e3384..e4a5835ce7 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,3 +1,2 @@
-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/files/vigra-1.10.0-automagicness.patch b/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
deleted file mode 100644
index 182f40e2c8..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Optional jpeg/tiff/fftw/png dependencies
-Forwarded: not-needed
-Last-Update: 2013-12-11
-
-Index: vigra-1.10.0/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/CMakeLists.txt
-+++ vigra-1.10.0/CMakeLists.txt
-@@ -59,11 +59,24 @@ ENDIF ()
- ##################################################
-
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
-+IF(WITH_TIFF)
-+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+ VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
-
- IF(WITH_OPENEXR)
- VIGRA_FIND_PACKAGE(OpenEXR)
-@@ -85,9 +98,11 @@ IF(WITH_LEMON)
- VIGRA_FIND_PACKAGE(LEMON)
- ENDIF()
-
--SET(DOXYGEN_SKIP_DOT TRUE)
--FIND_PACKAGE(Doxygen)
--FIND_PACKAGE(PythonInterp)
-+IF(ENABLE_DOC)
-+ SET(DOXYGEN_SKIP_DOT TRUE)
-+ FIND_PACKAGE(Doxygen)
-+ FIND_PACKAGE(PythonInterp)
-+ENDIF()
-
- IF(WITH_VIGRANUMPY)
- FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-@@ -388,10 +403,4 @@ ELSE()
- MESSAGE( STATUS " vigranumpy will NOT be installed" )
- ENDIF()
-
--IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR
-- NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND)
-- MESSAGE( STATUS "" )
-- MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" )
--ENDIF()
--
- MESSAGE( STATUS "---------------------------------------------------------" )
diff --git a/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch b/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
deleted file mode 100644
index dc3a72e43e..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fix location of installed cmake scripts
-Author: Jens-Malte Gottfried <jmgottfried@web.de>
-Forwarded: not-needed
-Last-Update: 2013-12-11
-
-Index: vigra-1.10.0/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/CMakeLists.txt
-+++ vigra-1.10.0/CMakeLists.txt
-@@ -276,10 +276,10 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/con
-
- # export targets:
- INSTALL(EXPORT vigra-targets
-- DESTINATION lib${LIB_SUFFIX}/vigra)
-+ DESTINATION lib${LIB_SUFFIX}/cmake/Vigra)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
- ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
-- DESTINATION lib${LIB_SUFFIX}/vigra)
-+ DESTINATION lib${LIB_SUFFIX}/cmake/Vigra)
- EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
-
- ##################################################
-Index: vigra-1.10.0/config/VigraConfig.cmake.in
-===================================================================
---- vigra-1.10.0.orig/config/VigraConfig.cmake.in
-+++ vigra-1.10.0/config/VigraConfig.cmake.in
-@@ -1,5 +1,5 @@
- get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
--get_filename_component(Vigra_TOP_DIR "${SELF_DIR}/../../" ABSOLUTE)
-+get_filename_component(Vigra_TOP_DIR "${SELF_DIR}/../../../" ABSOLUTE)
-
- include(${SELF_DIR}/vigra-targets.cmake)
- get_target_property(VIGRA_TYPE vigraimpex TYPE)
-@@ -9,6 +9,6 @@
- endif(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY")
- get_filename_component(Vigra_INCLUDE_DIRS "${Vigra_TOP_DIR}/include/" ABSOLUTE)
-
--IF(EXISTS ${SELF_DIR}/../vigranumpy/VigranumpyConfig.cmake)
-- INCLUDE(${SELF_DIR}/../vigranumpy/VigranumpyConfig.cmake)
-+IF(EXISTS ${SELF_DIR}/VigranumpyConfig.cmake)
-+ INCLUDE(${SELF_DIR}/VigranumpyConfig.cmake)
- ENDIF()
---- vigra-1.10.0.orig/vigranumpy/CMakeLists.txt
-+++ vigra-1.10.0/vigranumpy/CMakeLists.txt
-@@ -53,7 +53,7 @@
- COMMENT "Creating vigranumpy setup in ${CMAKE_CURRENT_BINARY_DIR}/dist")
- ENDIF()
-
-- set(VIGRANUMPY_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/vigranumpy)
-+ set(VIGRANUMPY_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/Vigra)
-
- set(VIGRANUMPY_INCLUDE_RELATIVE "")
- foreach(PATH ${CMAKE_INSTALL_PREFIX}/include ${VIGRANUMPY_INCLUDE_DIRS})
diff --git a/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch b/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch
deleted file mode 100644
index 83bb86d111..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Description: Fix build with mpi enabled hdf5 libraries
-Author: Jens-Malte Gottfried <jmgottfried@web.de>
-Forwarded: not-needed
-Last-Update: 2013-12-11
-
-Index: vigra-1.10.0/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/CMakeLists.txt
-+++ vigra-1.10.0/CMakeLists.txt
-@@ -63,6 +63,7 @@ OPTION(WITH_TIFF "Enable tiff support" O
- OPTION(WITH_JPEG "Enable jpeg support" ON)
- OPTION(WITH_PNG "Enable png support" ON)
- OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(WITH_MPI "Link against mpi libraries" ON)
- OPTION(ENABLE_DOC "Build documentation" ON)
- IF(WITH_TIFF)
- VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-@@ -70,6 +71,9 @@ ENDIF()
- IF(WITH_JPEG)
- VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
- ENDIF()
-+IF(WITH_MPI)
-+ VIGRA_FIND_PACKAGE(MPI)
-+ENDIF()
- IF(WITH_PNG)
- VIGRA_FIND_PACKAGE(PNG)
- ENDIF()
-Index: vigra-1.10.0/src/impex/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/src/impex/CMakeLists.txt
-+++ vigra-1.10.0/src/impex/CMakeLists.txt
-@@ -79,7 +79,7 @@ IF(OPENEXR_FOUND)
- ENDIF(OPENEXR_FOUND)
-
- IF(HDF5_FOUND)
-- TARGET_LINK_LIBRARIES(vigraimpex ${HDF5_LIBRARIES})
-+ TARGET_LINK_LIBRARIES(vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
- ENDIF(HDF5_FOUND)
-
- INSTALL(TARGETS vigraimpex
-Index: vigra-1.10.0/test/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/CMakeLists.txt
-+++ vigra-1.10.0/test/CMakeLists.txt
-@@ -1,4 +1,7 @@
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-+IF(WITH_MPI)
-+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-+ENDIF()
-
- INCLUDE(VigraAddTest)
-
-Index: vigra-1.10.0/test/impex/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/impex/CMakeLists.txt
-+++ vigra-1.10.0/test/impex/CMakeLists.txt
-@@ -15,7 +15,7 @@ IF(OPENEXR_FOUND)
- ADD_DEFINITIONS(-DHasEXR)
- ENDIF(OPENEXR_FOUND)
-
--VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
- VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif lenna_masked_gray.tif)
-
-Index: vigra-1.10.0/test/classifier/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/classifier/CMakeLists.txt
-+++ vigra-1.10.0/test/classifier/CMakeLists.txt
-@@ -2,13 +2,15 @@ if(HDF5_FOUND)
- INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
-
- ADD_DEFINITIONS(${HDF5_CPPFLAGS} -DHasHDF5)
-- VIGRA_ADD_TEST(test_classifier test.cxx LIBRARIES vigraimpex ${HDF5_LIBRARIES})
-+ VIGRA_ADD_TEST(test_classifier test.cxx
-+ LIBRARIES vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
- else()
- MESSAGE(STATUS "** WARNING: test_classifier::RFHDF5Test() will not be executed")
- VIGRA_ADD_TEST(test_classifier test.cxx )
- endif()
-
--VIGRA_ADD_TEST(classifier_speed_comparison speed_comparison.cxx)
-+VIGRA_ADD_TEST(classifier_speed_comparison speed_comparison.cxx
-+ LIBRARIES ${MPI_LIBRARIES})
-
- add_subdirectory(data)
-
-Index: vigra-1.10.0/test/imgproc/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/imgproc/CMakeLists.txt
-+++ vigra-1.10.0/test/imgproc/CMakeLists.txt
-@@ -1,3 +1,9 @@
--VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
--VIGRA_COPY_TEST_DATA(lenna128.xv lenna128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv lennargb42IIR.xv lenna_rotate.xv)
-+VIGRA_COPY_TEST_DATA(
-+ lenna128.xv lenna128rgb.xv
-+ splineimageview2.xv splineimageview3.xv splineimageview5.xv
-+ lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv
-+ lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv
-+ lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv
-+ lennargb42IIR.xv lenna_rotate.xv)
-Index: vigra-1.10.0/test/convolution/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/convolution/CMakeLists.txt
-+++ vigra-1.10.0/test/convolution/CMakeLists.txt
-@@ -1,3 +1,11 @@
--VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
--VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
-+VIGRA_COPY_TEST_DATA(
-+ lenna128.xv lenna_simple_sharpening_orig.xv
-+ lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv
-+ lennahessxx.xv lennastxx.xv lenna128recgrad.xv
-+ lenna128nonlinear.xv resampling.xv lennahessyy.xv
-+ lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv
-+ lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv
-+ lenna_level1.xv lenna_level2.xv lenna_levellap0.xv
-+ lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
-Index: vigra-1.10.0/test/fourier/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/fourier/CMakeLists.txt
-+++ vigra-1.10.0/test/fourier/CMakeLists.txt
-@@ -1,7 +1,8 @@
- if(FFTW3_FOUND)
- INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
-
-- VIGRA_ADD_TEST(test_fourier test.cxx LIBRARIES vigraimpex ${FFTW3_LIBRARIES})
-+ VIGRA_ADD_TEST(test_fourier test.cxx
-+ LIBRARIES vigraimpex ${FFTW3_LIBRARIES} ${MPI_LIBRARIES})
-
- VIGRA_COPY_TEST_DATA(ghouse.gif filter.xv gaborresult.xv)
- else()
-Index: vigra-1.10.0/test/tensorimaging/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/tensorimaging/CMakeLists.txt
-+++ vigra-1.10.0/test/tensorimaging/CMakeLists.txt
-@@ -1,3 +1,7 @@
--VIGRA_ADD_TEST(test_tensorimaging test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_tensorimaging test.cxx
-+ LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
--VIGRA_COPY_TEST_DATA(l2.xv riesz00.xv riesz10.xv riesz01.xv riesz20.xv riesz11.xv riesz02.xv boundaryTensor.xv l2_boundary1.xv l2_boundary.xv l2_hourglass.xv l2_get.xv)
-+VIGRA_COPY_TEST_DATA(
-+ l2.xv riesz00.xv riesz10.xv riesz01.xv riesz20.xv
-+ riesz11.xv riesz02.xv boundaryTensor.xv
-+ l2_boundary1.xv l2_boundary.xv l2_hourglass.xv l2_get.xv)
-Index: vigra-1.10.0/test/simpleanalysis/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/simpleanalysis/CMakeLists.txt
-+++ vigra-1.10.0/test/simpleanalysis/CMakeLists.txt
-@@ -1,10 +1,12 @@
- if(FFTW3_FOUND)
- INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
- ADD_DEFINITIONS(-DHasFFTW3)
--
-- VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex ${FFTW3_LIBRARIES})
-+
-+ VIGRA_ADD_TEST(test_simpleanalysis test.cxx
-+ LIBRARIES vigraimpex ${FFTW3_LIBRARIES} ${MPI_LIBRARIES})
- else()
-- VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex)
-+ VIGRA_ADD_TEST(test_simpleanalysis test.cxx
-+ LIBRARIES vigraimpex ${MPI_LIBRARIES})
- endif()
-
- VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv lenna128.xv)
-Index: vigra-1.10.0/test/image/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/image/CMakeLists.txt
-+++ vigra-1.10.0/test/image/CMakeLists.txt
-@@ -1,3 +1,3 @@
--VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
- VIGRA_COPY_TEST_DATA(lenna.xv)
-Index: vigra-1.10.0/test/multiarray/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/multiarray/CMakeLists.txt
-+++ vigra-1.10.0/test/multiarray/CMakeLists.txt
-@@ -10,6 +10,6 @@ IF(TIFF_FOUND)
- ADD_DEFINITIONS(-DHasTIFF)
- ENDIF(TIFF_FOUND)
-
--VIGRA_ADD_TEST(test_multiarray test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_multiarray test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/impex)
-Index: vigra-1.10.0/test/multiconvolution/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/multiconvolution/CMakeLists.txt
-+++ vigra-1.10.0/test/multiconvolution/CMakeLists.txt
-@@ -1,4 +1,5 @@
--VIGRA_ADD_TEST(test_multiconvolution test.cxx LIBRARIES vigraimpex)
-+VIGRA_ADD_TEST(test_multiconvolution test.cxx
-+ LIBRARIES vigraimpex ${MPI_LIBRARIES})
-
- VIGRA_ADD_TEST(test_multiconvolution_speed speedtest.cxx)
-
-Index: vigra-1.10.0/test/hdf5impex/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/hdf5impex/CMakeLists.txt
-+++ vigra-1.10.0/test/hdf5impex/CMakeLists.txt
-@@ -3,7 +3,8 @@ if(HDF5_FOUND)
-
- ADD_DEFINITIONS(${HDF5_CPPFLAGS})
-
-- VIGRA_ADD_TEST(test_hdf5impex test.cxx LIBRARIES vigraimpex ${HDF5_LIBRARIES})
-+ VIGRA_ADD_TEST(test_hdf5impex test.cxx
-+ LIBRARIES vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
- else()
- MESSAGE(STATUS "** WARNING: test_hdf5impex will not be executed")
- endif()
-Index: vigra-1.10.0/test/sifImport/CMakeLists.txt
-===================================================================
---- vigra-1.10.0.orig/test/sifImport/CMakeLists.txt
-+++ vigra-1.10.0/test/sifImport/CMakeLists.txt
-@@ -4,5 +4,8 @@ if(HDF5_FOUND)
- ADD_DEFINITIONS(-DHasHDF5 ${HDF5_CPPFLAGS})
- endif()
-
--VIGRA_ADD_TEST(test_sifImport test.cxx LIBRARIES vigraimpex)
--VIGRA_COPY_TEST_DATA(testSif_4_16_30001.sif testSif_4_13_30000.sif testSif_4_6_30000.sif testSif_forBlocks_4_16_30001.sif)
-+VIGRA_ADD_TEST(test_sifImport test.cxx
-+ LIBRARIES vigraimpex ${MPI_LIBRARIES})
-+VIGRA_COPY_TEST_DATA(
-+ testSif_4_16_30001.sif testSif_4_13_30000.sif
-+ testSif_4_6_30000.sif testSif_forBlocks_4_16_30001.sif)
diff --git a/media-libs/vigra/vigra-1.10.0.ebuild b/media-libs/vigra/vigra-1.10.0.ebuild
deleted file mode 100644
index f36dc518bf..0000000000
--- a/media-libs/vigra/vigra-1.10.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_P=${P}-src-with-docu
-MY_V=${PV//\./-}
-PYTHON_COMPAT=( python2_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="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"
-
-# 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= )"
-
-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 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-automagicness.patch"
- "${FILESDIR}/${P}-cmake-scripts.patch"
- "${FILESDIR}/${P}-mpi-fixes.patch"
-)
-DOCS=( README.md )
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- einfo "Removing shipped doc, Win32 dependencies and VCS files"
- rm -rf doc
- rm vigra-dependencies-win32-vs8.zip
- rm .git* .hg* .travis.yml
-
- 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}"
- -DWITH_VALGRIND=OFF
- $(cmake-utils_use_enable doc DOC)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with hdf5 HDF5)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with mpi MPI)
- $(cmake-utils_use_with png PNG)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with python VIGRANUMPY)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use test CREATE_CTEST_TARGETS)
- $(cmake-utils_use test AUTOBUILD_TESTS)
- )
- 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2018-06-06 22:04 Andreas Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2018-06-06 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 6200a622d868d134deaa27d0de9a6e5b20e007c7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 22:04:25 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 22:04:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6200a622
media-libs/vigra: Remove old
Bug: https://bugs.gentoo.org/618172
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/vigra/Manifest | 1 -
.../vigra/files/vigra-1.9.0-automagicness.patch | 74 ----------------
media-libs/vigra/vigra-1.9.0.ebuild | 98 ----------------------
3 files changed, 173 deletions(-)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index b13f0e00d5b..6ba1371af9f 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,3 +1,2 @@
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/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
deleted file mode 100644
index e6deb761d1c..00000000000
--- a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
---- vigra-1.9.0.old/CMakeLists.txt 2013-06-04 13:38:43.158564579 +0200
-+++ vigra-1.9.0/CMakeLists.txt 2013-06-04 13:45:19.290550486 +0200
-@@ -57,13 +57,27 @@
- # search for dependencies
- #
- ##################################################
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_OPENEXR "Enable openexr support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
-
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+IF(WITH_TIFF)
-+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+ VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
- IF(WITH_OPENEXR)
- VIGRA_FIND_PACKAGE(OpenEXR)
- ENDIF()
-@@ -72,8 +86,10 @@
- ENDIF()
-
- SET(DOXYGEN_SKIP_DOT TRUE)
-+IF(ENABLE_DOC)
- FIND_PACKAGE(Doxygen)
- FIND_PACKAGE(PythonInterp)
-+ENDIF()
-
- IF(WITH_VIGRANUMPY)
- FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
---- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:38:43.207564577 +0200
-+++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:45:51.962549323 +0200
-@@ -1,4 +1,4 @@
--IF(PYTHON_SPHINX)
-+IF(PYTHON_SPHINX AND ENABLE_DOC)
- # vigranumpy documentation generation using sphinx
- IF(DEFINED VIGRANUMPY_DOCDIR)
- MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
-@@ -49,7 +49,7 @@
- ${VIGRANUMPY_DOCDIR}
- COMMENT "Generating vigranumpy documentation")
-
--ELSE(PYTHON_SPHINX)
-+ELSE(PYTHON_SPHINX AND ENABLE_DOC)
- # no vigranumpy documentation if sphinx not available
- ADD_CUSTOM_TARGET (doc_python
- ${CMAKE_COMMAND} -E echo
-@@ -57,7 +57,7 @@
- "(sphinx-build not found)"
- VERBATIM)
-
--ENDIF(PYTHON_SPHINX)
-+ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
-
- ADD_DEPENDENCIES(doc_python vigranumpy)
- ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
deleted file mode 100644
index 0252dcd97b6..00000000000
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-# This ebuild could use python-r1 in the future when upstream gets Python 3.x
-# support working
-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="https://ukoethe.github.io/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${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 openexr +png +python test +tiff"
-
-# Pull in dev-lang/python:2.7 for vigra-config which is always installed
-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:= )
- jpeg? ( virtual/jpeg )
- openexr? ( media-libs/openexr:= )
- png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
- )
- test? (
- python? ( >=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.txt )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-automagicness.patch
-
- # Don't build nor install API docs when not requested
- use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
-
- # 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() {
- local libdir=$(get_libdir)
-
- # required for ddocdir
- _cmake_check_build_dir init
- local mycmakeargs=(
- -DDOCDIR="${CMAKE_BUILD_DIR}"/doc
- -DLIBDIR_SUFFIX=${libdir/lib}
- -DDOCINSTALL=share/doc/${PF}
- -DWITH_VALGRIND=OFF
- $(cmake-utils_use_with python VIGRANUMPY)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with hdf5)
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use test CREATE_CTEST_TARGETS)
- $(cmake-utils_use test AUTOBUILD_TESTS)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doc
-}
-
-src_test() { :; } #390447
-
-src_install() {
- cmake-utils_src_install
-
- use python && python_optimize
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2018-11-19 20:13 Craig Andrews
0 siblings, 0 replies; 9+ messages in thread
From: Craig Andrews @ 2018-11-19 20:13 UTC (permalink / raw
To: gentoo-commits
commit: e2caaa6f7abb46ec70732b82a5bdd7bb00f058dd
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 21:27:39 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 20:13:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2caaa6f
media-libs/vigra: Fix compilation error and add -9999
Closes: https://bugs.gentoo.org/664720
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
...1.1-fix-incorrect-template-parameter-type.patch | 139 +++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r1.ebuild | 149 +++++++++++++++++++++
media-libs/vigra/vigra-9999.ebuild | 144 ++++++++++++++++++++
3 files changed, 432 insertions(+)
diff --git a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
new file mode 100644
index 00000000000..88ed61ee374
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
@@ -0,0 +1,139 @@
+From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
+From: JaimeIvanCervantes <jimmycc80@hotmail.com>
+Date: Fri, 16 Jun 2017 13:21:45 -0700
+Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
+ when using unsigned int N for TinyVector SIZE. (Fixes #414)
+
+---
+ include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
+index 1b5efa740..ec89bcf58 100644
+--- a/include/vigra/multi_convolution.hxx
++++ b/include/vigra/multi_convolution.hxx
+@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
+ class T2, class S2>
+ void
+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ double sigma,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
+
+@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
+ class T2, class S2>
+ void
+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ ConvolutionOptions<N> opt);
+
+ // likewise, but execute algorithm in parallel
+@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
+ class T2, class S2>
+ void
+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ BlockwiseConvolutionOptions<N> opt);
+ }
+ \endcode
+@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ inline void
+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ ConvolutionOptions<N> opt )
+ {
+ if(opt.to_point != typename MultiArrayShape<N>::type())
+@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ inline void
+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ double sigma,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
+ {
+@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
+ dest.init(0.0);
+
+ typedef typename NumericTraits<T1>::RealPromote TmpType;
+- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
++ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
+
+ using namespace multi_math;
+
+@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
+ class T2, class S2>
+ void
+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
+
+ // execute algorithm in parallel
+@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
+ class T2, class S2>
+ void
+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ BlockwiseConvolutionOptions<N> opt);
+ }
+ \endcode
+@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ inline void
+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
+ {
+ if(opt.to_point != typename MultiArrayShape<N>::type())
+@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
+ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ void
+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
+ MultiArrayView<N, T2, S2> divergence,
+ ConvolutionOptions<N> const & opt);
+
+ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ void
+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
+ MultiArrayView<N, T2, S2> divergence,
+ double sigma,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
+@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
+ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ void
+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
+ MultiArrayView<N, T2, S2> divergence,
+ BlockwiseConvolutionOptions<N> const & opt);
+ }
+@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
+ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ inline void
+-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
+ MultiArrayView<N, T2, S2> divergence,
+ ConvolutionOptions<N> const & opt)
+ {
+@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
+ template <unsigned int N, class T1, class S1,
+ class T2, class S2>
+ inline void
+-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
+ MultiArrayView<N, T2, S2> divergence,
+ double sigma,
+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/media-libs/vigra/vigra-1.11.1-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r1.ebuild
new file mode 100644
index 00000000000..c5e8c814dae
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r1.ebuild
@@ -0,0 +1,149 @@
+# 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
+}
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
new file mode 100644
index 00000000000..4073587b713
--- /dev/null
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -0,0 +1,144 @@
+# 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 )
+
+pkg_setup() {
+ use python && python_setup
+}
+
+src_prepare() {
+ einfo "Removing shipped docs and VCS files"
+ rm -rf doc || 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2019-04-08 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-04-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 2b10ea3bbf80c3d0b7951c2e63569047ec1e45ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:39:25 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=2b10ea3b
media-libs/vigra: Drop last use of LIBDIR_SUFFIX
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../vigra/files/vigra-1.11.1-lib_suffix.patch | 29 ++++++++++++++++++++++
media-libs/vigra/vigra-9999.ebuild | 5 ++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
new file mode 100644
index 00000000000..2b4b90df348
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
@@ -0,0 +1,29 @@
+LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already.
+
+--- a/config/vigra-config.in 2017-05-19 17:01:08.000000000 +0200
++++ b/config/vigra-config.in 2019-04-08 22:33:18.938060195 +0200
+@@ -68,7 +68,7 @@
+ if op.impex_lib: # was: --impex_lib|--impex-lib|--libs
+ ldflags = []
+
+- libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@'
++ libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@'
+ if libDir not in standardLibDirs:
+ ldflags.append('-L' + libDir)
+
+--- a/config/VigraSetDefaults.cmake 2017-05-19 17:01:08.000000000 +0200
++++ b/config/VigraSetDefaults.cmake 2019-04-08 22:33:09.361974643 +0200
+@@ -59,13 +59,6 @@
+ CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?"
+ FORCE)
+
+-IF(NOT DEFINED LIBDIR_SUFFIX)
+- SET(LIBDIR_SUFFIX "")
+-ENDIF()
+-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX}
+- CACHE STRING "Define suffix of lib directory name (empty string or 32 or 64)."
+- FORCE)
+-
+ IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX)
+ SET(DEPENDENCY_SEARCH_PREFIX "")
+ ENDIF()
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 6b2aabf8904..6d2b0b088cc 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}"
# Severely broken, also disabled in Fedora, bugs #390447, #653442
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
+
pkg_setup() {
use python && python_setup
}
@@ -92,13 +94,10 @@ src_prepare() {
src_configure() {
vigra_configure() {
- local libdir="$(get_libdir)"
-
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
-DDOCDIR="${BUILD_DIR}/doc"
-DDOCINSTALL="share/doc/${PF}"
- -DLIBDIR_SUFFIX="${libdir/lib}"
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
-DWITH_VALGRIND=$(usex valgrind ON OFF)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2019-11-27 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-11-27 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 87724dc6e1a9e45bd820535078a4d07c963257f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 23:50:50 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=87724dc6
media-libs/vigra: Fix cmake module install dir, backport python3_7
Use shipped documentation as building fails right now.
Closes: https://bugs.gentoo.org/701208
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/vigra-1.11.1-cmake-module-dir.patch | 17 ++++++++++
.../vigra/files/vigra-1.11.1-python3.7.patch | 30 +++++++++++++++++
.../{vigra-9999.ebuild => vigra-1.11.1-r3.ebuild} | 38 +++++++---------------
media-libs/vigra/vigra-9999.ebuild | 6 ++--
4 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch b/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch
new file mode 100644
index 00000000000..cfc56b34722
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch
@@ -0,0 +1,17 @@
+CMake modules must be in cmake subdir.
+
+--- a/CMakeLists.txt 2017-05-19 17:01:08.000000000 +0200
++++ b/CMakeLists.txt 2019-11-26 23:50:40.660462479 +0100
+@@ -368,10 +368,10 @@
+
+ # export targets:
+ INSTALL(EXPORT vigra-targets
+- DESTINATION lib${LIB_SUFFIX}/vigra)
++ DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
+ ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
+- DESTINATION lib${LIB_SUFFIX}/vigra)
++ DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
+
+ ##################################################
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
new file mode 100644
index 00000000000..2e6cd3469f8
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
@@ -0,0 +1,30 @@
+From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
+From: John Kirkham <kirkhamj@janelia.hhmi.org>
+Date: Fri, 19 Oct 2018 11:32:42 -0400
+Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
+
+In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
+instead of a `char *`. This broke VIGRA as we were accepting a `char *`
+in this case instead. Fortunately we do not need it to be mutable for
+our use case. So just type the variable storing the result from
+`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
+Python 3 versions that return `char *` as well.
+
+ref: https://bugs.python.org/issue28769
+---
+ vigranumpy/src/core/vigranumpycore.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
+index ec38d3636..c81c6ae52 100644
+--- a/vigranumpy/src/core/vigranumpycore.cxx
++++ b/vigranumpy/src/core/vigranumpycore.cxx
+@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
+ return checksum(data, size);
+ #else
+ Py_ssize_t size = 0;
+- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
++ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
+ return checksum(data, size);
+ #endif
+ }
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
similarity index 80%
copy from media-libs/vigra/vigra-9999.ebuild
copy to media-libs/vigra/vigra-1.11.1-r3.ebuild
index 6d9d2266b16..f2b096eaf51 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake-utils python-r1
@@ -16,7 +14,7 @@ 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"
+ 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
@@ -25,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 )
@@ -65,15 +58,18 @@ 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
# TODO: upstream
- "${FILESDIR}/${PN}-1.11.1-lib_suffix.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() {
@@ -86,10 +82,6 @@ src_prepare() {
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
@@ -100,6 +92,7 @@ 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
use test || cmake_comment_add_subdirectory test
}
@@ -107,8 +100,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)
@@ -120,8 +112,6 @@ src_configure() {
if use python; then
python_foreach_impl vigra_configure
else
- # required for docdir
- _cmake_check_build_dir init
vigra_configure
fi
}
@@ -137,12 +127,6 @@ src_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() {
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 6d9d2266b16..c1094b89265 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE="threads(+),xml"
inherit cmake-utils python-r1
@@ -16,7 +14,7 @@ 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"
+ 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
@@ -67,6 +65,7 @@ RESTRICT="test"
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
)
@@ -140,6 +139,7 @@ src_compile() {
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2020-07-10 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-07-10 21:24 UTC (permalink / raw
To: gentoo-commits
commit: a739a2ed97dfedfd922da007b645ad2851cbfa3c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 20:51: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=a739a2ed
media-libs/vigra: Fix build with GCC-10
Thanks-to: Victor Mataré <matare <AT> fh-aachen.de>
Closes: https://bugs.gentoo.org/723302
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/files/vigra-1.11.1-gcc-10.patch | 46 ++++++++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r3.ebuild | 1 +
2 files changed, 47 insertions(+)
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
new file mode 100644
index 00000000000..2433ba41712
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
@@ -0,0 +1,46 @@
+From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:26:17 +0200
+Subject: [PATCH] fixed noexcept declaration
+
+---
+ include/vigra/separableconvolution.hxx | 6 +++---
+ include/vigra/stdconvolution.hxx | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
+index 7ee33c09d..8fd120602 100644
+--- a/include/vigra/separableconvolution.hxx
++++ b/include/vigra/separableconvolution.hxx
+@@ -1409,10 +1409,10 @@ class Kernel1D
+ {}
+
+ ~InitProxy()
+-#ifndef _MSC_VER
+- throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+ noexcept(false)
++#else
++ throw(PreconditionViolation)
+ #endif
+ {
+ vigra_precondition(count_ == 1 || count_ == sum_,
+diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
+index 76d61a53f..657247259 100644
+--- a/include/vigra/stdconvolution.hxx
++++ b/include/vigra/stdconvolution.hxx
+@@ -792,10 +792,10 @@ public:
+ {}
+
+ ~InitProxy()
+-#ifndef _MSC_VER
+- throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+ noexcept(false)
++#else
++ throw(PreconditionViolation)
+ #endif
+ {
+ vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 93a26b7b05e..05721485aa8 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${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"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2024-05-30 17:14 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2024-05-30 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 63678ff9b6230c1de8b23260c41a0e3f1ced3234
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 16:18:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 17:14:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63678ff9
media-libs/vigra: Add python3.12
Bug: https://bugs.gentoo.org/929649
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/vigra-1.11.2-python3.12-remove-imp.patch | 30 ++++++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r9.ebuild | 3 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch b/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch
new file mode 100644
index 000000000000..a8094c6e7e7d
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch
@@ -0,0 +1,30 @@
+From 4f81ef7ed5128453c049958e496f9638d28bdf76 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Wed, 13 Mar 2024 16:24:02 +0100
+Subject: [PATCH] Use importlib.reload instead of imp.reload
+
+The imp module has been deprecated since Python 3.4 and is removed in
+Python 3.12.
+Replace its use with its replacement in the importlib module.
+
+Signed-off-by: David Runge <dave@sleepmap.de>
+---
+ vigranumpy/lib/axistags.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vigranumpy/lib/axistags.py b/vigranumpy/lib/axistags.py
+index 5c564ea9..cb5dd193 100644
+--- a/vigranumpy/lib/axistags.py
++++ b/vigranumpy/lib/axistags.py
+@@ -241,7 +241,7 @@ def benchmark(expression):
+ when getitem returns a value, the slowdown is about 3 (due to Python calls)
+ '''
+ import timeit, axistags
+- from imp import reload
++ from importlib import reload
+ reload(axistags)
+ repetitions = 100000
+ t1 = timeit.Timer(expression,
+--
+2.44.0
+
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 1be44dbdba2c..24693904f4da 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
inherit cmake flag-o-matic python-r1
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}/${P}-boost-python.patch"
"${FILESDIR}/${P}-python3.7.patch" # bug 701208
"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
+ "${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
# TODO: upstream
"${FILESDIR}/${P}-lib_suffix.patch"
"${FILESDIR}/${P}-cmake-module-dir.patch"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2024-06-14 7:15 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-06-14 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 4f366a4db94378e6baea9f0cbdcc8d40882feda9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 07:13:48 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 07:14:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f366a4d
media-libs/vigra: further py3.12 fixes
Unfortunately, the CMake still tries to use:
1) nose (???)
2) numpy.distutils
Bug: https://bugs.gentoo.org/929649
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/vigra-1.11.1-python3.12-distutils.patch | 70 ++++++++++++++++++++++
media-libs/vigra/vigra-1.11.1-r9.ebuild | 1 +
2 files changed, 71 insertions(+)
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
new file mode 100644
index 000000000000..7001a2a0217e
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
@@ -0,0 +1,70 @@
+https://github.com/ukoethe/vigra/commit/1203cccaed97c276d7c3cf6886730d03f6e8dfc6
+
+(But with some edits for more distutils removals & rebase.)
+
+From 1203cccaed97c276d7c3cf6886730d03f6e8dfc6 Mon Sep 17 00:00:00 2001
+From: Mark Harfouche <mark.harfouche@gmail.com>
+Date: Sat, 30 Sep 2023 16:25:08 -0400
+Subject: [PATCH] Do not use distutils since it is deprecated
+
+--- a/vigranumpy/setup.py.cmake2.in
++++ b/vigranumpy/setup.py.cmake2.in
+@@ -1,5 +1,8 @@
+-import distutils, ctypes.util, shutil, os, sys
+-from distutils.core import setup
++import ctypes.util
++import shutil
++import os
++import sys
++from setuptools import setup
+
+ # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
+ # if additional libraries are linked dynamically (e.g. tiff, png)
+--- a/vigranumpy/setup.py.in
++++ b/vigranumpy/setup.py.in
+@@ -1,5 +1,9 @@
+-import distutils, ctypes.util, shutil, os, sys
+-from distutils.core import setup
++import ctypes.util
++import shutil
++import os
++import sys
++from setuptools import setup
++
+
+ # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
+ # if additional libraries are linked dynamically (e.g. tiff, png)
+
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+@@ -40,7 +40,7 @@ IF(PYTHONINTERP_FOUND)
+ #
+ ######################################################################
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+- "from distutils.sysconfig import *; print(get_python_inc())"
++ "import sysconfig; print(sysconfig.get_paths()['include'])"
+ OUTPUT_VARIABLE PYTHON_INCLUDE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE}
+ CACHE PATH "Path to Python include files"
+@@ -66,10 +66,10 @@ IF(PYTHONINTERP_FOUND)
+ set(PYTHON_LIBRARY_NAME python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ ELSE()
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+- "from distutils.sysconfig import *; print(get_config_var('LDLIBRARY'))"
++ "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"
+ OUTPUT_VARIABLE PYTHON_LIBRARY_NAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+- "from distutils.sysconfig import *; print(get_config_var('LIBDIR'))"
++ "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"
+ OUTPUT_VARIABLE PYTHON_LIBRARY_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ENDIF()
+ FIND_LIBRARY(PYTHON_LIBRARIES ${PYTHON_LIBRARY_NAME} HINTS "${PYTHON_LIBRARY_PREFIX}" "${PYTHON_PREFIX}"
+@@ -139,7 +139,7 @@ IF(PYTHONINTERP_FOUND)
+ ######################################################################
+ IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+- "from distutils.sysconfig import *; print(get_python_lib(1))"
++ "import sysconfig; print(sysconfig.get_paths()['purelib'])"
+ OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
+ ENDIF()
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 24693904f4da..07f703b229be 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}/${P}-python3.7.patch" # bug 701208
"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
"${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
+ "${FILESDIR}/${PN}-1.11.1-python3.12-distutils.patch" # bug 929649
# TODO: upstream
"${FILESDIR}/${P}-lib_suffix.patch"
"${FILESDIR}/${P}-cmake-module-dir.patch"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/
@ 2024-08-30 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2024-08-30 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 4b22a61f118b7d82f50479d5fc67287d5fbab3f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 14:43:03 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 15:39:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b22a61f
media-libs/vigra: drop 1.11.1-r9
Bug: https://bugs.gentoo.org/938737
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/vigra/Manifest | 1 -
.../vigra/files/vigra-1.11.1-boost-python.patch | 22 ---
...1.1-fix-incorrect-template-parameter-type.patch | 139 ------------------
media-libs/vigra/files/vigra-1.11.1-gcc-10.patch | 46 ------
media-libs/vigra/files/vigra-1.11.1-openexr3.patch | 37 -----
.../vigra/files/vigra-1.11.1-python-syntax.patch | 64 ---------
.../files/vigra-1.11.1-python3.12-distutils.patch | 70 ---------
.../vigra/files/vigra-1.11.1-python3.7.patch | 30 ----
.../files/vigra-1.11.1-sphinx.ext.pngmath.patch | 27 ----
media-libs/vigra/vigra-1.11.1-r9.ebuild | 159 ---------------------
10 files changed, 595 deletions(-)
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6bacbbf4893a..02889381064a 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1 @@
-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/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
deleted file mode 100644
index ffa3334f873a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
deleted file mode 100644
index 88ed61ee374c..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
-From: JaimeIvanCervantes <jimmycc80@hotmail.com>
-Date: Fri, 16 Jun 2017 13:21:45 -0700
-Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
- when using unsigned int N for TinyVector SIZE. (Fixes #414)
-
----
- include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
-index 1b5efa740..ec89bcf58 100644
---- a/include/vigra/multi_convolution.hxx
-+++ b/include/vigra/multi_convolution.hxx
-@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
-@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt);
-
- // likewise, but execute algorithm in parallel
-@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt )
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
- dest.init(0.0);
-
- typedef typename NumericTraits<T1>::RealPromote TmpType;
-- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
-+ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
-
- using namespace multi_math;
-
-@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
- // execute algorithm in parallel
-@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt);
-
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- BlockwiseConvolutionOptions<N> const & opt);
- }
-@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt)
- {
-@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
deleted file mode 100644
index 2433ba41712a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:26:17 +0200
-Subject: [PATCH] fixed noexcept declaration
-
----
- include/vigra/separableconvolution.hxx | 6 +++---
- include/vigra/stdconvolution.hxx | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
-index 7ee33c09d..8fd120602 100644
---- a/include/vigra/separableconvolution.hxx
-+++ b/include/vigra/separableconvolution.hxx
-@@ -1409,10 +1409,10 @@ class Kernel1D
- {}
-
- ~InitProxy()
--#ifndef _MSC_VER
-- throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
- noexcept(false)
-+#else
-+ throw(PreconditionViolation)
- #endif
- {
- vigra_precondition(count_ == 1 || count_ == sum_,
-diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
-index 76d61a53f..657247259 100644
---- a/include/vigra/stdconvolution.hxx
-+++ b/include/vigra/stdconvolution.hxx
-@@ -792,10 +792,10 @@ public:
- {}
-
- ~InitProxy()
--#ifndef _MSC_VER
-- throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
- noexcept(false)
-+#else
-+ throw(PreconditionViolation)
- #endif
- {
- vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
deleted file mode 100644
index 703cd22b9321..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/files/vigra-1.11.1-python-syntax.patch b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
deleted file mode 100644
index 111bc06d5716..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
deleted file mode 100644
index 7001a2a0217e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/ukoethe/vigra/commit/1203cccaed97c276d7c3cf6886730d03f6e8dfc6
-
-(But with some edits for more distutils removals & rebase.)
-
-From 1203cccaed97c276d7c3cf6886730d03f6e8dfc6 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche@gmail.com>
-Date: Sat, 30 Sep 2023 16:25:08 -0400
-Subject: [PATCH] Do not use distutils since it is deprecated
-
---- a/vigranumpy/setup.py.cmake2.in
-+++ b/vigranumpy/setup.py.cmake2.in
-@@ -1,5 +1,8 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
-
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
---- a/vigranumpy/setup.py.in
-+++ b/vigranumpy/setup.py.in
-@@ -1,5 +1,9 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
-+
-
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
-
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -40,7 +40,7 @@ IF(PYTHONINTERP_FOUND)
- #
- ######################################################################
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_python_inc())"
-+ "import sysconfig; print(sysconfig.get_paths()['include'])"
- OUTPUT_VARIABLE PYTHON_INCLUDE OUTPUT_STRIP_TRAILING_WHITESPACE)
- SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE}
- CACHE PATH "Path to Python include files"
-@@ -66,10 +66,10 @@ IF(PYTHONINTERP_FOUND)
- set(PYTHON_LIBRARY_NAME python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
- ELSE()
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_config_var('LDLIBRARY'))"
-+ "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"
- OUTPUT_VARIABLE PYTHON_LIBRARY_NAME OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_config_var('LIBDIR'))"
-+ "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"
- OUTPUT_VARIABLE PYTHON_LIBRARY_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDIF()
- FIND_LIBRARY(PYTHON_LIBRARIES ${PYTHON_LIBRARY_NAME} HINTS "${PYTHON_LIBRARY_PREFIX}" "${PYTHON_PREFIX}"
-@@ -139,7 +139,7 @@ IF(PYTHONINTERP_FOUND)
- ######################################################################
- IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_python_lib(1))"
-+ "import sysconfig; print(sysconfig.get_paths()['purelib'])"
- OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
- FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
- ENDIF()
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
deleted file mode 100644
index 2e6cd3469f8e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
-From: John Kirkham <kirkhamj@janelia.hhmi.org>
-Date: Fri, 19 Oct 2018 11:32:42 -0400
-Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
-
-In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
-instead of a `char *`. This broke VIGRA as we were accepting a `char *`
-in this case instead. Fortunately we do not need it to be mutable for
-our use case. So just type the variable storing the result from
-`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
-Python 3 versions that return `char *` as well.
-
-ref: https://bugs.python.org/issue28769
----
- vigranumpy/src/core/vigranumpycore.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
-index ec38d3636..c81c6ae52 100644
---- a/vigranumpy/src/core/vigranumpycore.cxx
-+++ b/vigranumpy/src/core/vigranumpycore.cxx
-@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
- return checksum(data, size);
- #else
- Py_ssize_t size = 0;
-- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
-+ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
- return checksum(data, size);
- #endif
- }
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
deleted file mode 100644
index fc265763f6ad..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
deleted file mode 100644
index 07f703b229be..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 ~x64-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 )"
-
-# 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
- "${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
- "${FILESDIR}/${PN}-1.11.1-python3.12-distutils.patch" # bug 929649
- # 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"
- "${FILESDIR}/${P}-python-syntax.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] 9+ messages in thread
end of thread, other threads:[~2024-08-30 15:40 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-08 21:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-30 15:40 Andreas Sturmlechner
2024-06-14 7:15 Sam James
2024-05-30 17:14 Andreas Sturmlechner
2020-07-10 21:24 Andreas Sturmlechner
2019-11-27 0:13 Andreas Sturmlechner
2018-11-19 20:13 Craig Andrews
2018-06-06 22:04 Andreas Hüttel
2017-02-11 22:03 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox