[arch-commits] Commit in openvdb/trunk (PKGBUILD openvdb-openexr3.patch)

Antonio Rojas arojas at archlinux.org
Sat Apr 24 18:12:33 UTC 2021


    Date: Saturday, April 24, 2021 @ 18:12:32
  Author: arojas
Revision: 923703

Patch installed cmake module too

Modified:
  openvdb/trunk/PKGBUILD
  openvdb/trunk/openvdb-openexr3.patch

------------------------+
 PKGBUILD               |    4 +--
 openvdb-openexr3.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-24 18:10:27 UTC (rev 923702)
+++ PKGBUILD	2021-04-24 18:12:32 UTC (rev 923703)
@@ -1,7 +1,7 @@
 # Maintainer : Sven-Hendrik Haase <svenstaro at gmail.com>
 pkgname=openvdb
 pkgver=8.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A large suite of tools for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids'
 url='https://github.com/dreamworksanimation/openvdb'
 arch=('x86_64')
@@ -14,7 +14,7 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/dreamworksanimation/openvdb/archive/v${pkgver}.tar.gz"
          openvdb-openexr3.patch)
 sha512sums=('6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2'
-            '2d9e69a74f01d8c6ca66c18b31f4b504a89fe6a46c584874d2d41ba6cadcc06a995f823e0b42f9149ace16e02c449c95f268d28f1eab3c76f8c64cf7f158b84b')
+            'bc7a0e4c7ef00b620e62097f56a741f4924d1465528d5fabd52fefe1c981d109389c7c75056508bc32353f0daa8305367c9a52e941b7ec1fbef865ee5719615a')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < openvdb-openexr3.patch

Modified: openvdb-openexr3.patch
===================================================================
--- openvdb-openexr3.patch	2021-04-24 18:10:27 UTC (rev 923702)
+++ openvdb-openexr3.patch	2021-04-24 18:12:32 UTC (rev 923703)
@@ -1,3 +1,56 @@
+diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+index 3cb246d6..a9c8c8bb 100644
+--- a/cmake/FindOpenVDB.cmake
++++ b/cmake/FindOpenVDB.cmake
+@@ -444,7 +444,7 @@ endif()
+ 
+ # Add standard dependencies
+ 
+-find_package(IlmBase REQUIRED COMPONENTS Half)
++find_package(Imath CONFIG REQUIRED)
+ find_package(TBB REQUIRED COMPONENTS tbb)
+ find_package(ZLIB REQUIRED)
+ 
+@@ -596,8 +596,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+ endif()
+ 
+ if(OpenVDB_USES_EXR)
+-  find_package(IlmBase REQUIRED)
+-  find_package(OpenEXR REQUIRED)
++  find_package(OpenEXR CONFIG REQUIRED)
+ endif()
+ 
+ if(UNIX)
+@@ -608,7 +607,7 @@ if(WIN32)
+   # @note OPENVDB_OPENEXR_STATICLIB is old functionality from the makefiles
+   #       used in PlatformConfig.h to configure EXR exports. Once this file
+   #       is completely removed, this define can be too
+-  get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE)
++  get_target_property(ILMBASE_LIB_TYPE Imath::Imath TYPE)
+   if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY))
+     list(APPEND OpenVDB_DEFINITIONS OPENVDB_OPENEXR_STATICLIB)
+   endif()
+@@ -623,7 +622,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ if(OpenVDB_ABI)
+@@ -632,10 +631,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND OpenVDB_DEFINITIONS OPENVDB_TOOLS_RAYTRACER_USE_EXR)
+ endif()
 diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
 index 04bfee59..c853689a 100644
 --- a/openvdb/openvdb/CMakeLists.txt



More information about the arch-commits mailing list