View | Details | Raw Unified | Return to bug 277112
Collapse All | Expand All

(-)b/misc/openvdb/Makefile (-3 / +5 lines)
Lines 1-7 Link Here
1
PORTNAME=	openvdb
1
PORTNAME=	openvdb
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	10.0.1
3
DISTVERSION=	11.0.0
4
PORTREVISION=	12
5
CATEGORIES=	misc
4
CATEGORIES=	misc
6
5
7
MAINTAINER=	yuri@FreeBSD.org
6
MAINTAINER=	yuri@FreeBSD.org
Lines 27-33 GH_ACCOUNT= AcademySoftwareFoundation Link Here
27
26
28
CMAKE_ARGS=		-DCONCURRENT_MALLOC="Tbbmalloc" -DTbb_INCLUDE_DIR=${LOCALBASE}/include
27
CMAKE_ARGS=		-DCONCURRENT_MALLOC="Tbbmalloc" -DTbb_INCLUDE_DIR=${LOCALBASE}/include
29
CMAKE_OFF=		OPENVDB_CORE_STATIC
28
CMAKE_OFF=		OPENVDB_CORE_STATIC
30
CMAKE_TESTING_ON=	OPENVDB_BUILD_UNITTESTS # one test fails: https://github.com/AcademySoftwareFoundation/openvdb/issues/1103
29
CMAKE_TESTING_ON=	OPENVDB_BUILD_UNITTESTS
30
31
PLIST_SUB+=		PATCHVERSION="${DISTVERSION}"
32
PLIST_SUB+=		MINORVERSION="${DISTVERSION:R}"
31
33
32
OPTIONS_DEFINE=		TOOLS #DOCS # TOOLS should be made into a subpackage
34
OPTIONS_DEFINE=		TOOLS #DOCS # TOOLS should be made into a subpackage
33
OPTIONS_DEFAULT=	TOOLS
35
OPTIONS_DEFAULT=	TOOLS
(-)b/misc/openvdb/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1669923457
1
TIMESTAMP = 1708086141
2
SHA256 (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 887a3391fbd96b20c77914f4fb3ab4b33d26e5fc479aa036d395def5523c622f
2
SHA256 (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 6314ff1db057ea90050763e7b7d7ed86d8224fcd42a82cdbb9c515e001b96c74
3
SIZE (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 3461352
3
SIZE (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 4620858
(-)a/misc/openvdb/files/patch-cmake_FindIlmBase.cmake (-143 lines)
Removed Link Here
1
--- cmake/FindIlmBase.cmake.orig	2021-06-11 21:38:41 UTC
2
+++ cmake/FindIlmBase.cmake
3
@@ -10,7 +10,7 @@ Find IlmBase include dirs and libraries
4
 
5
 Use this module by invoking find_package with the form::
6
 
7
-  find_package(IlmBase
8
+  find_package(Imath
9
     [version] [EXACT]      # Minimum or EXACT version
10
     [REQUIRED]             # Fail with error if IlmBase is not found
11
     [COMPONENTS <libs>...] # IlmBase libraries by their canonical name
12
@@ -36,11 +36,11 @@ Result Variables
13
 
14
 This will define the following variables:
15
 
16
-``IlmBase_FOUND``
17
-  True if the system has the IlmBase library.
18
+``Imath_FOUND``
19
+  True if the system has the Imath library.
20
 ``IlmBase_VERSION``
21
   The version of the IlmBase library which was found.
22
-``IlmBase_INCLUDE_DIRS``
23
+``S``
24
   Include directories needed to use IlmBase.
25
 ``IlmBase_RELEASE_LIBRARIES``
26
   Libraries needed to link to the release version of IlmBase.
27
@@ -65,7 +65,7 @@ Cache Variables
28
 
29
 The following cache variables may also be set:
30
 
31
-``IlmBase_INCLUDE_DIR``
32
+````
33
   The directory containing ``IlmBase/config-auto.h``.
34
 ``IlmBase_{COMPONENT}_LIBRARY``
35
   Individual component libraries for IlmBase. may include target_link_libraries() debug/optimized keywords.
36
@@ -102,7 +102,7 @@ include(GNUInstallDirs)
37
 
38
 
39
 mark_as_advanced(
40
-  IlmBase_INCLUDE_DIR
41
+  
42
   IlmBase_LIBRARY
43
 )
44
 
45
@@ -112,10 +112,6 @@ if(DISABLE_CMAKE_SEARCH_PATHS)
46
 endif()
47
 
48
 set(_ILMBASE_COMPONENT_LIST
49
-  Half
50
-  Iex
51
-  IexMath
52
-  IlmThread
53
   Imath
54
 )
55
 
56
@@ -177,15 +173,15 @@ list(APPEND _ILMBASE_INCLUDE_SEARCH_DIRS
57
 )
58
 
59
 # Look for a standard IlmBase header file.
60
-find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h
61
+find_path( IlmBaseConfig.h
62
   ${_FIND_ILMBASE_ADDITIONAL_OPTIONS}
63
   PATHS ${_ILMBASE_INCLUDE_SEARCH_DIRS}
64
   PATH_SUFFIXES ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR include/OpenEXR OpenEXR
65
 )
66
 
67
-if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
68
+if(EXISTS "${}/IlmBaseConfig.h")
69
   # Get the ILMBASE version information from the config header
70
-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
71
+  file(STRINGS "${}/IlmBaseConfig.h"
72
     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
73
   )
74
   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
75
@@ -193,7 +189,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
76
   )
77
   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
78
 
79
-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
80
+  file(STRINGS "${}/IlmBaseConfig.h"
81
      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
82
   )
83
   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
84
@@ -324,16 +320,16 @@ endforeach()
85
 # ------------------------------------------------------------------------
86
 
87
 include(FindPackageHandleStandardArgs)
88
-find_package_handle_standard_args(IlmBase
89
-  FOUND_VAR IlmBase_FOUND
90
+find_package_handle_standard_args(Imath
91
+  FOUND_VAR Imath_FOUND
92
   REQUIRED_VARS
93
-    IlmBase_INCLUDE_DIR
94
-    IlmBase_LIB_COMPONENTS
95
-  VERSION_VAR IlmBase_VERSION
96
+#    IlmBase_INCLUDE_DIR
97
+    Imath_LIB_COMPONENTS
98
+  VERSION_VAR Imath_VERSION
99
   HANDLE_COMPONENTS
100
 )
101
 
102
-if(NOT IlmBase_FOUND)
103
+if(NOT Imath_FOUND)
104
   if(IlmBase_FIND_REQUIRED)
105
     message(FATAL_ERROR "Unable to find IlmBase")
106
   endif()
107
@@ -348,8 +344,8 @@ set(IlmBase_DEBUG_LIBRARIES "")
108
 set(IlmBase_DEBUG_LIBRARY_DIRS "")
109
 foreach(LIB ${IlmBase_LIB_COMPONENTS_RELEASE})
110
   get_filename_component(_ILM_LIBDIR ${LIB} DIRECTORY)
111
-  list(APPEND IlmBase_RELEASE_LIBRARIES ${LIB})
112
-  list(APPEND IlmBase_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR})
113
+  list(APPEND Imath_RELEASE_LIBRARIES ${LIB})
114
+  list(APPEND Imath_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR})
115
 endforeach()
116
 
117
 foreach(LIB ${IlmBase_LIB_COMPONENTS_DEBUG})
118
@@ -377,12 +373,12 @@ set(IlmBase_LIBRARY_DIRS ${IlmBase_RELEASE_LIBRARY_DIR
119
 
120
 set(_IlmBase_Parent_Dir "")
121
 get_filename_component(_IlmBase_Parent_Dir
122
-  ${IlmBase_INCLUDE_DIR}/../ ABSOLUTE)
123
+  ${}/../ ABSOLUTE)
124
 
125
-set(IlmBase_INCLUDE_DIRS)
126
-list(APPEND IlmBase_INCLUDE_DIRS
127
+set(S)
128
+list(APPEND S
129
   ${_IlmBase_Parent_Dir}
130
-  ${IlmBase_INCLUDE_DIR}
131
+  ${}
132
 )
133
 unset(_IlmBase_Parent_Dir)
134
 
135
@@ -419,7 +415,7 @@ foreach(COMPONENT ${IlmBase_FIND_COMPONENTS})
136
     set_target_properties(IlmBase::${COMPONENT} PROPERTIES
137
       INTERFACE_COMPILE_OPTIONS "${PC_IlmBase_CFLAGS_OTHER}"
138
       INTERFACE_COMPILE_DEFINITIONS "${IlmBase_${COMPONENT}_DEFINITIONS}"
139
-      INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
140
+      INTERFACE_INCLUDE_DIRECTORIES "${S}")
141
 
142
     # Standard location
143
     set_target_properties(IlmBase::${COMPONENT} PROPERTIES
(-)b/misc/openvdb/pkg-plist (-4 / +13 lines)
Lines 25-31 include/openvdb/math/Coord.h Link Here
25
include/openvdb/math/DDA.h
25
include/openvdb/math/DDA.h
26
include/openvdb/math/FiniteDifference.h
26
include/openvdb/math/FiniteDifference.h
27
include/openvdb/math/Half.h
27
include/openvdb/math/Half.h
28
include/openvdb/math/HalfLimits.h
29
include/openvdb/math/LegacyFrustum.h
28
include/openvdb/math/LegacyFrustum.h
30
include/openvdb/math/Maps.h
29
include/openvdb/math/Maps.h
31
include/openvdb/math/Mat.h
30
include/openvdb/math/Mat.h
Lines 68-76 include/openvdb/points/PointScatter.h Link Here
68
include/openvdb/points/PointStatistics.h
67
include/openvdb/points/PointStatistics.h
69
include/openvdb/points/PointTransfer.h
68
include/openvdb/points/PointTransfer.h
70
include/openvdb/points/StreamCompression.h
69
include/openvdb/points/StreamCompression.h
70
include/openvdb/points/impl/PointAttributeImpl.h
71
include/openvdb/points/impl/PointConversionImpl.h
72
include/openvdb/points/impl/PointCountImpl.h
73
include/openvdb/points/impl/PointDeleteImpl.h
74
include/openvdb/points/impl/PointGroupImpl.h
75
include/openvdb/points/impl/PointMaskImpl.h
76
include/openvdb/points/impl/PointMoveImpl.h
71
include/openvdb/points/impl/PointRasterizeFrustumImpl.h
77
include/openvdb/points/impl/PointRasterizeFrustumImpl.h
72
include/openvdb/points/impl/PointRasterizeSDFImpl.h
78
include/openvdb/points/impl/PointRasterizeSDFImpl.h
73
include/openvdb/points/impl/PointRasterizeTrilinearImpl.h
79
include/openvdb/points/impl/PointRasterizeTrilinearImpl.h
80
include/openvdb/points/impl/PointReplicateImpl.h
81
include/openvdb/points/impl/PointSampleImpl.h
82
include/openvdb/points/impl/PointScatterImpl.h
83
include/openvdb/points/impl/PointStatisticsImpl.h
74
include/openvdb/thread/Threading.h
84
include/openvdb/thread/Threading.h
75
include/openvdb/tools/Activate.h
85
include/openvdb/tools/Activate.h
76
include/openvdb/tools/ChangeBackground.h
86
include/openvdb/tools/ChangeBackground.h
Lines 148-154 include/openvdb/util/Util.h Link Here
148
include/openvdb/util/logging.h
158
include/openvdb/util/logging.h
149
include/openvdb/version.h
159
include/openvdb/version.h
150
lib/cmake/OpenVDB/FindBlosc.cmake
160
lib/cmake/OpenVDB/FindBlosc.cmake
151
lib/cmake/OpenVDB/FindIlmBase.cmake
152
lib/cmake/OpenVDB/FindJemalloc.cmake
161
lib/cmake/OpenVDB/FindJemalloc.cmake
153
lib/cmake/OpenVDB/FindLog4cplus.cmake
162
lib/cmake/OpenVDB/FindLog4cplus.cmake
154
lib/cmake/OpenVDB/FindOpenEXR.cmake
163
lib/cmake/OpenVDB/FindOpenEXR.cmake
Lines 159-163 lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake Link Here
159
lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake
168
lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake
160
lib/cmake/OpenVDB/OpenVDBUtils.cmake
169
lib/cmake/OpenVDB/OpenVDBUtils.cmake
161
lib/libopenvdb.so
170
lib/libopenvdb.so
162
lib/libopenvdb.so.10.0
171
lib/libopenvdb.so.%%MINORVERSION%%
163
lib/libopenvdb.so.10.0.1
172
lib/libopenvdb.so.%%PATCHVERSION%%

Return to bug 277112