From 12c529383c85d4fbddc7126abd0cbcb103a8f67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Wed, 6 Mar 2024 19:04:24 +0000 Subject: [PATCH] imath: update to 3.1.11. --- .../patches/split-pyimath-cmake-target.patch | 39 ------------------- srcpkgs/imath/template | 12 +++--- 2 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/imath/patches/split-pyimath-cmake-target.patch diff --git a/srcpkgs/imath/patches/split-pyimath-cmake-target.patch b/srcpkgs/imath/patches/split-pyimath-cmake-target.patch deleted file mode 100644 index 94d8b9ca65ccfd..00000000000000 --- a/srcpkgs/imath/patches/split-pyimath-cmake-target.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/config/ImathConfig.cmake.in -+++ b/config/ImathConfig.cmake.in -@@ -4,4 +4,7 @@ - @PACKAGE_INIT@ - - include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/PyImathTargets.cmake") -+ include("${CMAKE_CURRENT_LIST_DIR}/PyImathTargets.cmake") -+endif() - check_required_components("@PROJECT_NAME@") ---- a/src/python/config/ModuleDefine.cmake -+++ b/src/python/config/ModuleDefine.cmake -@@ -52,7 +52,7 @@ function(PYIMATH_ADD_LIBRARY_PRIV libnam - add_library(${PROJECT_NAME}::${libname} ALIAS ${libname}) - - install(TARGETS ${libname} -- EXPORT ${PROJECT_NAME} -+ EXPORT PyImath - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ---- a/src/python/config/CMakeLists.txt -+++ b/src/python/config/CMakeLists.txt -@@ -7,8 +7,14 @@ - add_library(PyImathConfig INTERFACE) - target_include_directories(PyImathConfig INTERFACE - $) --install(TARGETS PyImathConfig EXPORT ${PROJECT_NAME}) -+install(TARGETS PyImathConfig EXPORT PyImath) - add_library(PyImath::Config ALIAS PyImathConfig) -+install(EXPORT PyImath -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PyImath -+ FILE PyImathTargets.cmake -+ NAMESPACE Imath:: -+ EXPORT_LINK_INTERFACE_LIBRARIES -+) - - if(IMATH_INSTALL_PKG_CONFIG) - # use a helper function to avoid variable pollution, but pretty simple diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template index b4a47b59073b8c..ff20a00935ce35 100644 --- a/srcpkgs/imath/template +++ b/srcpkgs/imath/template @@ -1,7 +1,7 @@ # Template file for 'imath' pkgname=imath -version=3.1.9 -revision=3 +version=3.1.11 +revision=1 build_style=cmake configure_args="-DPYTHON=ON" hostmakedepends="python3-numpy" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://imath.readthedocs.io/" changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md" distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/imath-${version}.tar.gz" -checksum=f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3 +checksum=9057849585e49b8b85abe7cc1e76e22963b01bfdc3b6d83eac90c499cd760063 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTING=ON" @@ -34,7 +34,8 @@ imath-python3_package() { short_desc+=" - Python module" pkg_install() { vmove "usr/lib/libPyImath*.so.*" - vmove "${py3_sitelib}" + vmove "${py3_sitelib}/imath.so" + vmove "${py3_sitelib}/imathnumpy.so" } } @@ -44,7 +45,6 @@ imath-python3-devel_package() { short_desc+=" - Python module - development files" pkg_install() { vmove "usr/include/Imath/Py*" - vmove "usr/lib/cmake/PyImath*" vmove usr/lib/pkgconfig/PyImath.pc vmove "usr/lib/libPyImath*.so" } @@ -56,7 +56,7 @@ imath-devel_package() { pkg_install() { vmove "usr/include/Imath/half*" vmove "usr/include/Imath/Imath*" - vmove "usr/lib/cmake/Imath*" + vmove "usr/lib/cmake" vmove usr/lib/pkgconfig/Imath.pc vmove "usr/lib/libImath*.so" }