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

(-)b/graphics/opensubdiv/Makefile (-25 / +26 lines)
Lines 1-7 Link Here
1
PORTNAME=	opensubdiv
1
PORTNAME=	opensubdiv
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	3_6_0
3
DISTVERSION=	3_6_0
4
CATEGORIES?=	graphics
4
PORTREVISION=	1
5
CATEGORIES=	graphics
5
6
6
MAINTAINER=	FreeBSD@Shaneware.biz
7
MAINTAINER=	FreeBSD@Shaneware.biz
7
COMMENT=	High performance subdivision surface libraries
8
COMMENT=	High performance subdivision surface libraries
Lines 12-75 LICENSE_FILE= ${WRKSRC}/LICENSE.txt Link Here
12
13
13
BUILD_DEPENDS=	glfw>3.0.0:graphics/glfw
14
BUILD_DEPENDS=	glfw>3.0.0:graphics/glfw
14
15
15
USES=		cmake gl localbase
16
USES=		cmake gl localbase:ldflags
16
17
17
USE_GITHUB=	yes
18
USE_GITHUB=	yes
18
GH_ACCOUNT=	PixarAnimationStudios
19
GH_ACCOUNT=	PixarAnimationStudios
19
GH_PROJECT=	OpenSubdiv
20
GH_PROJECT=	OpenSubdiv
20
21
21
USE_GL=		egl gl glu glew
22
USE_GL=		opengl
22
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
23
CMAKE_ON=	NO_CLEW NO_CUDA NO_DX NO_METAL
24
CMAKE_ON=	NO_CLEW NO_CUDA NO_DX NO_METAL
24
25
26
PLIST_SUB+=	LIBVERS=${PORTVERSION}
27
25
OPTIONS_DEFINE=		DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS
28
OPTIONS_DEFINE=		DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS
26
OPTIONS_DEFAULT=	TBB
29
OPTIONS_DEFAULT=	PTEX TBB
30
OPTIONS_DEFAULT_armv6=
31
OPTIONS_DEFAULT_armv7=
32
OPTIONS_DEFAULT_OTHER_ARCHS=	OPENMP
27
OPTIONS_SUB=		yes
33
OPTIONS_SUB=		yes
28
34
29
DOCS_CMAKE_BOOL_OFF=	NO_DOC
35
PTEX_DESC=		ptex support
36
TBB_DESC=		Intel threading building blocks
37
TUTORIALS_DESC=		Install tutorial programs
38
30
DOCS_BUILD_DEPENDS=	rst2html.py:textproc/py-docutils \
39
DOCS_BUILD_DEPENDS=	rst2html.py:textproc/py-docutils \
31
			doxygen>=1.8.4:devel/doxygen
40
			doxygen>=1.8.4:devel/doxygen
32
DOCS_USES=		python:build
41
DOCS_USES=		python:build
42
DOCS_CMAKE_BOOL_OFF=	NO_DOC
33
DOCS_PORTDOCS=		*
43
DOCS_PORTDOCS=		*
34
44
35
EXAMPLES_CMAKE_BOOL_OFF=	NO_EXAMPLES
45
EXAMPLES_LIB_DEPENDS=	libglfw.so:graphics/glfw
36
EXAMPLES_USES=		xorg
46
EXAMPLES_USES=		xorg
37
EXAMPLES_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
47
EXAMPLES_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
38
EXAMPLES_LIB_DEPENDS=	libglfw.so:graphics/glfw
48
EXAMPLES_CMAKE_BOOL_OFF=	NO_EXAMPLES
39
49
40
OPENCL_CMAKE_BOOL_OFF=	NO_OPENCL
41
OPENCL_CFLAGS=		-pthread
42
OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl
50
OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl
43
OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
51
OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
44
OPENCL_PREVENTS=	EXAMPLES
52
OPENCL_USE=		gl=gl
53
OPENCL_CMAKE_BOOL_OFF=	NO_OPENCL
54
OPENCL_CFLAGS=		-pthread
55
OPENCL_LDFLAGS=		-lGLX
45
56
46
OPENMP_CMAKE_BOOL_OFF=	NO_OMP
57
OPENMP_CMAKE_BOOL_OFF=	NO_OMP
47
58
48
PTEX_DESC=		ptex support
49
PTEX_CMAKE_BOOL_OFF=	NO_PTEX
50
PTEX_CMAKE_ON=		-DPTEX_LOCATION:STRING=${LOCALBASE} \
51
			-DPTEX_INCLUDE_DIR:STRING=${LOCALBASE}/include/ptex
52
PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
59
PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
60
PTEX_CMAKE_BOOL_OFF=	NO_PTEX
61
PTEX_CMAKE_ON=		-DPTEX_INCLUDE_DIR:STRING=${LOCALBASE}/include/ptex \
62
			-DPTEX_LOCATION:STRING=${LOCALBASE}
53
63
54
TBB_DESC=		Intel threading building blocks
55
TBB_CMAKE_BOOL_OFF=	NO_TBB
56
TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
64
TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
65
TBB_CMAKE_BOOL_OFF=	NO_TBB
57
66
58
TEST_CMAKE_BOOL_OFF=	NO_REGRESSION NO_TESTS NO_GL_TESTS
59
TEST_LIB_DEPENDS=	libglfw.so:graphics/glfw
67
TEST_LIB_DEPENDS=	libglfw.so:graphics/glfw
60
TEST_USES=		xorg
68
TEST_USES=		xorg
61
TEST_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
69
TEST_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
70
TEST_CMAKE_BOOL_OFF=	NO_REGRESSION NO_TESTS
62
71
63
# the tutorials and tests include use of deprecated parts of the library
64
# using clang 10 on 32 bit fails to build all tutorials and tests
65
# currently 12.1 still works - 11.4 and current fail
66
# CMake files and pkg-plist are patched to prevent failing builds
67
68
TUTORIALS_DESC=		Install tutorial programs
69
TUTORIALS_CMAKE_BOOL_OFF=	NO_TUTORIALS
72
TUTORIALS_CMAKE_BOOL_OFF=	NO_TUTORIALS
70
73
71
PLIST_SUB+=		LIBVERS=${PORTVERSION}
72
73
post-patch:
74
post-patch:
74
	${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt -exec \
75
	${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt -exec \
75
		${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/${DATADIR_REL}/tutorials|g' {} +
76
		${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/${DATADIR_REL}/tutorials|g' {} +
(-)a/graphics/opensubdiv/files/patch-examples_CMakeLists.txt (-12 lines)
Removed Link Here
1
--- examples/CMakeLists.txt.orig	2020-06-30 16:05:15 UTC
2
+++ examples/CMakeLists.txt
3
@@ -32,7 +32,8 @@ if (OPENGL_FOUND AND GLFW_FOUND)
4
     add_subdirectory(glFVarViewer)
5
     add_subdirectory(glStencilViewer)
6
     add_subdirectory(glImaging)
7
-    add_subdirectory(farViewer)
8
+# uses deprecated api
9
+#    add_subdirectory(farViewer)
10
 
11
     if (OPENGL_4_2_FOUND)
12
         add_subdirectory(glPaintTest)
(-)b/graphics/opensubdiv/files/patch-opensubdiv_hbr_mesh.h (+11 lines)
Added Link Here
1
--- opensubdiv/hbr/mesh.h.orig	2023-09-14 19:19:06 UTC
2
+++ opensubdiv/hbr/mesh.h
3
@@ -215,7 +215,7 @@ template <class T> class HbrMesh { (public)
4
     void SetFVarPropagateCorners(bool p) { fvarpropagatecorners = p; }
5
 
6
     // Register routines for keeping track of memory usage
7
-    void RegisterMemoryRoutines(void (*increment)(unsigned long bytes), void (*decrement)(unsigned long bytes)) {
8
+    void RegisterMemoryRoutines(void (*increment)(size_t bytes), void (*decrement)(size_t bytes)) {
9
         m_faceAllocator.SetMemStatsIncrement(increment);
10
         m_faceAllocator.SetMemStatsDecrement(decrement);
11
         m_vertexAllocator.SetMemStatsIncrement(increment);
(-)b/graphics/opensubdiv/files/patch-opensubdiv_osd_CMakeLists.txt (-4 / +4 lines)
Lines 1-6 Link Here
1
--- opensubdiv/osd/CMakeLists.txt.orig	2022-09-26 18:17:44 UTC
1
--- opensubdiv/osd/CMakeLists.txt.orig	2023-09-14 19:19:06 UTC
2
+++ opensubdiv/osd/CMakeLists.txt
2
+++ opensubdiv/osd/CMakeLists.txt
3
@@ -76,6 +76,8 @@ if(OPENMP_FOUND )
3
@@ -81,6 +81,8 @@ if(OPENMP_FOUND )
4
 
4
 
5
     if (CMAKE_COMPILER_IS_GNUCXX)
5
     if (CMAKE_COMPILER_IS_GNUCXX)
6
         list(APPEND PLATFORM_CPU_LIBRARIES gomp)
6
         list(APPEND PLATFORM_CPU_LIBRARIES gomp)
Lines 9-15 Link Here
9
     endif()
9
     endif()
10
 endif()
10
 endif()
11
 
11
 
12
@@ -96,10 +98,6 @@ if( TBB_FOUND )
12
@@ -99,10 +101,6 @@ if( TBB_FOUND )
13
     )
13
     )
14
 
14
 
15
     list(APPEND PUBLIC_HEADER_FILES ${TBB_PUBLIC_HEADERS})
15
     list(APPEND PUBLIC_HEADER_FILES ${TBB_PUBLIC_HEADERS})
Lines 19-22 Link Here
19
-    endif()
19
-    endif()
20
 
20
 
21
     list(APPEND PLATFORM_CPU_LIBRARIES
21
     list(APPEND PLATFORM_CPU_LIBRARIES
22
         ${TBB_LIBRARIES}
22
         TBB::tbb
(-)a/graphics/opensubdiv/files/patch-regression_CMakeLists.txt (-22 lines)
Removed Link Here
1
--- regression/CMakeLists.txt.orig	2022-09-26 18:17:44 UTC
2
+++ regression/CMakeLists.txt
3
@@ -28,14 +28,16 @@ if (NOT NO_REGRESSION)
4
 
5
     add_subdirectory(bfr_evaluate)
6
 
7
-    add_subdirectory(hbr_regression)
8
+# uses deprecated api
9
+#    add_subdirectory(hbr_regression)
10
 
11
-    add_subdirectory(far_regression)
12
+#    add_subdirectory(far_regression)
13
 
14
     add_subdirectory(far_perf)
15
 
16
     if(OPENGL_FOUND AND GLFW_FOUND)
17
-        add_subdirectory(osd_regression)
18
+# uses deprecated api
19
+#        add_subdirectory(osd_regression)
20
     endif()
21
 
22
 endif()
(-)a/graphics/opensubdiv/files/patch-tutorials_CMakeLists.txt (-12 lines)
Removed Link Here
1
--- tutorials/CMakeLists.txt.orig	2020-06-30 16:03:59 UTC
2
+++ tutorials/CMakeLists.txt
3
@@ -27,7 +27,8 @@ include_directories(
4
     "${OPENSUBDIV_INCLUDE_DIR}/"
5
 )
6
 
7
-add_subdirectory(hbr)
8
+# uses deprecated api
9
+#add_subdirectory(hbr)
10
 
11
 add_subdirectory(far)
12
 
(-)b/graphics/opensubdiv/pkg-plist (-10 / +10 lines)
Lines 59-66 include/opensubdiv/osd/glXFBEvaluator.h Link Here
59
include/opensubdiv/osd/glslPatchShaderSource.h
59
include/opensubdiv/osd/glslPatchShaderSource.h
60
include/opensubdiv/osd/mesh.h
60
include/opensubdiv/osd/mesh.h
61
include/opensubdiv/osd/nonCopyable.h
61
include/opensubdiv/osd/nonCopyable.h
62
@comment include/opensubdiv/osd/ompEvaluator.h
62
%%OPENMP%%include/opensubdiv/osd/ompEvaluator.h
63
@comment include/opensubdiv/osd/ompKernel.h
63
%%OPENMP%%include/opensubdiv/osd/ompKernel.h
64
%%OPENCL%%include/opensubdiv/osd/opencl.h
64
%%OPENCL%%include/opensubdiv/osd/opencl.h
65
include/opensubdiv/osd/opengl.h
65
include/opensubdiv/osd/opengl.h
66
include/opensubdiv/osd/patchBasis.h
66
include/opensubdiv/osd/patchBasis.h
Lines 95-101 lib/libosdCPU.so.%%LIBVERS%% Link Here
95
lib/libosdGPU.a
95
lib/libosdGPU.a
96
lib/libosdGPU.so
96
lib/libosdGPU.so
97
lib/libosdGPU.so.%%LIBVERS%%
97
lib/libosdGPU.so.%%LIBVERS%%
98
@comment %%EXAMPLES%%%%EXAMPLESDIR%%/farViewer
98
%%EXAMPLES%%%%EXAMPLESDIR%%/farViewer
99
%%EXAMPLES%%%%EXAMPLESDIR%%/glEvalLimit
99
%%EXAMPLES%%%%EXAMPLESDIR%%/glEvalLimit
100
%%EXAMPLES%%%%EXAMPLESDIR%%/glFVarViewer
100
%%EXAMPLES%%%%EXAMPLESDIR%%/glFVarViewer
101
%%EXAMPLES%%%%EXAMPLESDIR%%/glImaging
101
%%EXAMPLES%%%%EXAMPLESDIR%%/glImaging
Lines 106-115 lib/libosdGPU.so.%%LIBVERS%% Link Here
106
%%EXAMPLES%%%%EXAMPLESDIR%%/glViewer
106
%%EXAMPLES%%%%EXAMPLESDIR%%/glViewer
107
%%TEST%%tests/opensubdiv/bfr_evaluate
107
%%TEST%%tests/opensubdiv/bfr_evaluate
108
%%TEST%%tests/opensubdiv/far_perf
108
%%TEST%%tests/opensubdiv/far_perf
109
@comment %%TEST%%tests/opensubdiv/far_regression
109
%%TEST%%tests/opensubdiv/far_regression
110
@comment %%TEST%%tests/opensubdiv/hbr_baseline
110
%%TEST%%tests/opensubdiv/hbr_baseline
111
@comment %%TEST%%tests/opensubdiv/hbr_regression
111
%%TEST%%tests/opensubdiv/hbr_regression
112
@comment %%TEST%%tests/opensubdiv/osd_regression
112
%%TEST%%tests/opensubdiv/osd_regression
113
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_1
113
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_1
114
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_2
114
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_2
115
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_3
115
%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_3
Lines 131-137 lib/libosdGPU.so.%%LIBVERS%% Link Here
131
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_1
131
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_1
132
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_2
132
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_2
133
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_3
133
%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_3
134
@comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_0
134
%%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_0
135
@comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_1
135
%%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_1
136
@comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_2
136
%%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_2
137
%%TUTORIALS%%%%DATADIR%%/tutorials/osd_tutorial_0
137
%%TUTORIALS%%%%DATADIR%%/tutorials/osd_tutorial_0

Return to bug 279472