[arch-commits] Commit in openvdb/trunk (PKGBUILD openvdb-openexr3.patch)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sat Jun 12 23:58:50 UTC 2021
Date: Saturday, June 12, 2021 @ 23:58:50
Author: svenstaro
Revision: 963221
upgpkg: openvdb 8.1.0-1
Modified:
openvdb/trunk/PKGBUILD
Deleted:
openvdb/trunk/openvdb-openexr3.patch
------------------------+
PKGBUILD | 14 +----
openvdb-openexr3.patch | 121 -----------------------------------------------
2 files changed, 4 insertions(+), 131 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-12 23:49:58 UTC (rev 963220)
+++ PKGBUILD 2021-06-12 23:58:50 UTC (rev 963221)
@@ -1,7 +1,7 @@
# Maintainer : Sven-Hendrik Haase <svenstaro at gmail.com>
pkgname=openvdb
-pkgver=8.0.1
-pkgrel=5
+pkgver=8.1.0
+pkgrel=1
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')
@@ -11,15 +11,9 @@
optdepends=('glfw: for tools'
'glu: for tools'
'python-numpy: python module')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/dreamworksanimation/openvdb/archive/v${pkgver}.tar.gz"
- openvdb-openexr3.patch)
-sha512sums=('6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2'
- 'bc7a0e4c7ef00b620e62097f56a741f4924d1465528d5fabd52fefe1c981d109389c7c75056508bc32353f0daa8305367c9a52e941b7ec1fbef865ee5719615a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/dreamworksanimation/openvdb/archive/v${pkgver}.tar.gz")
+sha512sums=('081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5')
-prepare() {
- patch -d $pkgname-$pkgver -p1 < openvdb-openexr3.patch
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
Deleted: openvdb-openexr3.patch
===================================================================
--- openvdb-openexr3.patch 2021-06-12 23:49:58 UTC (rev 963220)
+++ openvdb-openexr3.patch 2021-06-12 23:58:50 UTC (rev 963221)
@@ -1,121 +0,0 @@
-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
-+++ b/openvdb/openvdb/CMakeLists.txt
-@@ -46,8 +46,8 @@ message(STATUS "----------------------------------------------------")
- # Collect and configure lib dependencies
-
- if(USE_EXR)
-- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED)
-- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED)
-+ find_package(Imath CONFIG REQUIRED)
-+ find_package(OpenEXR CONFIG REQUIRED)
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_OPENEXR_VERSION)
- if(${OpenEXR_VERSION} VERSION_LESS FUTURE_MINIMUM_OPENEXR_VERSION)
- message(DEPRECATION "Support for OpenEXR versions < ${FUTURE_MINIMUM_OPENEXR_VERSION} "
-@@ -55,7 +55,7 @@ if(USE_EXR)
- endif()
- endif()
- else()
-- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
-+ find_package(Imath CONFIG REQUIRED)
- endif()
-
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
-@@ -129,7 +129,7 @@ endif()
- set(OPENVDB_CORE_DEPENDENT_LIBS
- Boost::iostreams
- Boost::system
-- IlmBase::Half
-+ Imath::Imath
- )
-
- if(WIN32)
-@@ -147,10 +147,8 @@ endif()
-
- if(USE_EXR)
- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
-- IlmBase::IlmThread
-- IlmBase::Iex
-- IlmBase::Imath
-- OpenEXR::IlmImf
-+ Imath::Imath
-+ OpenEXR::OpenEXR
- )
- endif()
-
-@@ -413,7 +411,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_CORE_PUBLIC_DEFINES -DOPENVDB_OPENEXR_STATICLIB)
- endif()
-diff --git a/openvdb/openvdb/Types.h b/openvdb/openvdb/Types.h
-index d176c874..4ba72e3e 100644
---- a/openvdb/openvdb/Types.h
-+++ b/openvdb/openvdb/Types.h
-@@ -7,7 +7,7 @@
- #include "version.h"
- #include "Platform.h"
- #include "TypeList.h" // backwards compat
--#include <OpenEXR/half.h>
-+#include <Imath/half.h>
- #include <openvdb/math/Math.h>
- #include <openvdb/math/BBox.h>
- #include <openvdb/math/Quat.h>
More information about the arch-commits
mailing list