vigra: Fix python modules extension, cmake files location, HDF5 1.12

BUILD
2020-06-10 12:03:50 +03:00
parent aa1bf70af5
commit 1d09c4b0ea
4 changed files with 90 additions and 7 deletions
--- a/mingw-w64-vigra/0013-fix-build-hdf5-1.12.patch
+++ b/mingw-w64-vigra/0013-fix-build-hdf5-1.12.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2020-06-10 09:44:11.475668700 +0300
+++ b/CMakeLists.txt	2020-06-10 09:44:21.451556000 +0300
+@@ -39,6 +39,7 @@
+ 
+ IF(WITH_HDF5)
+     VIGRA_FIND_PACKAGE(HDF5)
+    add_compile_options(-DH5_USE_110_API=1)
+ ENDIF()
+ 
+ IF(WITH_LEMON)
--- a/mingw-w64-vigra/0014-python-module.ext.patch
+++ b/mingw-w64-vigra/0014-python-module.ext.patch
@@ -0,0 +1,32 @@
+diff -Naur vigra-1.11.1-orig/config/VIGRA_ADD_NUMPY_MODULE.cmake vigra-1.11.1/config/VIGRA_ADD_NUMPY_MODULE.cmake
+--- vigra-1.11.1-orig/config/VIGRA_ADD_NUMPY_MODULE.cmake	2017-05-19 18:01:08.000000000 +0300
+++ vigra-1.11.1/config/VIGRA_ADD_NUMPY_MODULE.cmake	2020-06-10 11:07:31.988569500 +0300
+@@ -71,8 +71,10 @@
+     TARGET_LINK_LIBRARIES(${TARGET_NAME} ${VIGRANUMPY_LIBRARIES})
+ 
+     IF(PYTHON_PLATFORM MATCHES "^windows$")
+        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig, sys; get = distutils.sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.pyd');"
+                        OUTPUT_VARIABLE PYTHON_MOD_EXT)
+         SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}"
+-                                                           PREFIX "" SUFFIX  ".pyd")
+                                                           PREFIX "" SUFFIX  "${PYTHON_MOD_EXT}")
+     ELSEIF(MACOSX)
+         IF(${CMAKE_MAJOR_VERSION} LESS 3)
+             SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}" PREFIX ""
+diff -Naur vigra-1.11.1-orig/config/VigranumpyConfig.cmake.in vigra-1.11.1/config/VigranumpyConfig.cmake.in
+--- vigra-1.11.1-orig/config/VigranumpyConfig.cmake.in	2017-05-19 18:01:08.000000000 +0300
+++ vigra-1.11.1/config/VigranumpyConfig.cmake.in	2020-06-10 11:08:42.134660900 +0300
+@@ -52,9 +52,11 @@
+         ADD_DEFINITIONS(-DBOOST_AUTO_LINK_NOMANGLE)
+     endif()
+     
+-    IF(WIN32 AND NOT MINGW)
+    IF(WIN32)
+        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig, sys; get = distutils.sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.pyd');"
+                        OUTPUT_VARIABLE PYTHON_MOD_EXT)
+         SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}" 
+-                                                           PREFIX "" SUFFIX  ".pyd")
+                                                           PREFIX "" SUFFIX  "${PYTHON_MOD_EXT}")
+     ELSEIF(APPLE)
+         SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}" PREFIX "" SUFFIX ".so")
+     ELSE()
--- a/mingw-w64-vigra/0015-cmake-files-location.patch
+++ b/mingw-w64-vigra/0015-cmake-files-location.patch
@@ -0,0 +1,26 @@
+--- vigra-1.11.1/CMakeLists.txt.orig	2020-06-10 11:21:22.125614100 +0300
+++ vigra-1.11.1/CMakeLists.txt	2020-06-10 11:22:11.574132700 +0300
+@@ -369,10 +369,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)
+ 
+ ##################################################
+--- vigra-1.11.1/vigranumpy/CMakeLists.txt.orig	2020-06-10 11:22:37.014851900 +0300
+++ vigra-1.11.1/vigranumpy/CMakeLists.txt	2020-06-10 11:22:55.614969000 +0300
+@@ -59,7 +59,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/vigranumpy)
+ 
+     set(VIGRANUMPY_INCLUDE_RELATIVE "")
+     foreach(PATH ${CMAKE_INSTALL_PREFIX}/include ${VIGRANUMPY_INCLUDE_DIRS})
--- a/mingw-w64-vigra/PKGBUILD
+++ b/mingw-w64-vigra/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.11.1
 _pkgver=${pkgver//./-}
-pkgrel=3
+pkgrel=4
 pkgdesc="vigra - Generic Programming for Computer Vision (mingw-w64)"
 arch=('any')
 url='https://ukoethe.github.io/vigra/'
@@ -18,13 +18,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-libpng"
         "${MINGW_PACKAGE_PREFIX}-libtiff"
         "${MINGW_PACKAGE_PREFIX}-openexr"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-doxygen"
-             "${MINGW_PACKAGE_PREFIX}-python3-nose"
-             "${MINGW_PACKAGE_PREFIX}-python3-sphinx")
+             "${MINGW_PACKAGE_PREFIX}-python-nose"
+             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
 options=('staticlibs' 'strip')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/ukoethe/vigra/releases/download/Version-${_pkgver}/${_realname}-${pkgver}-src.tar.gz
        0001-vigra-numpy-detection.patch
@@ -32,14 +32,20 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/ukoethe/vigra/releases
        0003-vigra-cmath-std-namespace.patch
        0010-fix-incorrect-template-parameter.patch
        0011-fix-receive-from-PyUnicode_AsUTF8.patch
-        0012-hdf5-fixes.patch)
+        0012-hdf5-fixes.patch
+        0013-fix-build-hdf5-1.12.patch
+        0014-python-module.ext.patch
+        0015-cmake-files-location.patch)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf'
            '3395713d051f53b69979a4a610fd88a440b320ca5d0c0b6e944caf3fa3e2cbcd'
            'f214f448616aa9c4e05d5a83738bd14a48be40dfc4f6cfa233a9a81e76bfe23d'
            'b70f6f2d3873188febf406cb2bceeac45a5c5f47f14f2b481ff3a9cdb66f5d51'
            'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4'
            '754c0a67a2909512f696a56d4fb9c5253204f8db87389a9588de39a4fa03ffd2'
-            '8f09d4b8e4044f20db1095c7232080bb9dff9743c2e2437ca43e5e88dc24a3a4')
+            '8f09d4b8e4044f20db1095c7232080bb9dff9743c2e2437ca43e5e88dc24a3a4'
+            'bd3c224458a022c5255259e0a81bf26181de798b487fd257d1d21e05b5aa7d4c'
+            '6f2a91b882ca2cab044655c97252dbbf1d49dc798b739ad62b169c5ef35b8e6b'
+            '06e3f1ca5ad4dfa5a96194843445bbe6b6f9cf14865630ac0bae38f2beec9d41')

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"
@@ -51,6 +57,9 @@ prepare() {
  patch -p1 -i "${srcdir}/0010-fix-incorrect-template-parameter.patch"
  patch -p1 -i "${srcdir}/0011-fix-receive-from-PyUnicode_AsUTF8.patch"
  patch -p1 -i "${srcdir}/0012-hdf5-fixes.patch"
+  patch -p1 -i "${srcdir}/0013-fix-build-hdf5-1.12.patch"
+  patch -p1 -i "${srcdir}/0014-python-module.ext.patch"
+  patch -p1 -i "${srcdir}/0015-cmake-files-location.patch"
 }

 build() {
@@ -65,7 +74,7 @@ build() {
    -DWITH_BOOST_GRAPH=ON \
    -DWITH_VIGRANUMPY=ON \
    -DWITH_OPENEXR=ON \
-    -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python3 \
+    -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python \
    ../${_realname}-${pkgver}

  make
@@ -80,5 +89,11 @@ package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
  make DESTDIR="${pkgdir}" -j1 install

+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/{vigra,vigranumpy}/*.cmake; do
+    sed -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" -i ${_f}
+    sed -e "s|${MINGW_PREFIX}|\$\{_IMPORT_PREFIX\}|g" -i ${_f}
+  done
+
  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"
 }