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

(-)./Makefile (-68 / +27 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	osg
4
PORTNAME=	osg
5
PORTVERSION=	3.0.1
5
PORTVERSION=	3.0.1
6
PORTREVISION=	5
6
PORTREVISION=	6
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \
8
MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \
9
		http://mirror.amdmi3.ru/distfiles/
9
		http://mirror.amdmi3.ru/distfiles/
Lines 12-30 Link Here
12
MAINTAINER=	amdmi3@FreeBSD.org
12
MAINTAINER=	amdmi3@FreeBSD.org
13
COMMENT=	C++ OpenGL scene graph library for real-time rendering
13
COMMENT=	C++ OpenGL scene graph library for real-time rendering
14
14
15
LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
15
LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
16
		png15:${PORTSDIR}/graphics/png \
16
		libpng.so:${PORTSDIR}/graphics/png \
17
		tiff:${PORTSDIR}/graphics/tiff
17
		libtiff.so:${PORTSDIR}/graphics/tiff
18
18
19
CONFLICTS=	osg-devel-[0-9]*
19
CONFLICTS=	osg-devel-[0-9]*
20
20
21
USE_GCC=	any
22
USE_ZIP=	yes
21
USE_ZIP=	yes
23
USES=		cmake pkgconfig
22
USES=		cmake pkgconfig
24
USE_GL=		gl glu
23
USE_GL=		gl glu
25
USE_XORG=	x11
24
USE_XORG=	x11
26
USE_LDCONFIG=	yes
27
USE_GCC=	4.2+
25
USE_GCC=	4.2+
26
USE_LDCONFIG=	yes
28
27
29
PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
28
PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
30
		OSG_SHLIBVER=80 \
29
		OSG_SHLIBVER=80 \
Lines 35-50 Link Here
35
34
36
OPTIONS_DEFINE=	CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \
35
OPTIONS_DEFINE=	CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \
37
		VNC OPENEXR FFMPEG SVG PDF XRANDR SDL
36
		VNC OPENEXR FFMPEG SVG PDF XRANDR SDL
37
38
GDAL_DESC=	GDAL support
38
GDAL_DESC=	GDAL support
39
INVENTOR_DESC=	SGI OpenInventor support
39
INVENTOR_DESC=	SGI OpenInventor support
40
ITK_DESC=	InsightToolkit support
40
ITK_DESC=	InsightToolkit support
41
VNC_DESC=	LibVNCServer support
41
VNC_DESC=	LibVNCServer support
42
SDL_DESC=	Use SDL (joystick support in present3d)
42
SDL_DESC=	Use SDL (joystick support in present3d)
43
43
44
OPTIONS_DEFAULT=	FREETYPE GIF XRANDR
44
OPTIONS_SUB=	yes
45
45
46
# broken (openvrml from ports is too old)
46
OPTIONS_DEFAULT=	FREETYPE GIF FFMPEG XRANDR
47
#		OPENVRML "Support for OpenVRML"             off
47
48
CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
49
FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
50
GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
51
GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
52
INVENTOR_BUILD_DEPENDS=	${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
53
INVENTOR_RUN_DEPENDS=	${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
54
JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
55
XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
56
ITK_BUILD_DEPENDS=	${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
57
ITK_RUN_DEPENDS=	${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
58
VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
59
OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
60
FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
61
SVG_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
62
PDF_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
63
XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
64
XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
48
65
49
.include <bsd.port.options.mk>
66
.include <bsd.port.options.mk>
50
67
Lines 56-168 Link Here
56
# options that affect FIND_PACKAGE
73
# options that affect FIND_PACKAGE
57
.if ${PORT_OPTIONS:MCURL}
74
.if ${PORT_OPTIONS:MCURL}
58
FORCE_REQUIRE+=	CURL
75
FORCE_REQUIRE+=	CURL
59
LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
60
PLIST_SUB+=	CURL=""
61
.else
76
.else
62
FORCE_IGNORE+=	CURL
77
FORCE_IGNORE+=	CURL
63
PLIST_SUB+=	CURL="@comment "
64
.endif
78
.endif
65
79
66
.if ${PORT_OPTIONS:MFREETYPE}
80
.if ${PORT_OPTIONS:MFREETYPE}
67
FORCE_REQUIRE+=	FreeType
81
FORCE_REQUIRE+=	FreeType
68
LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
69
PLIST_SUB+=	FREETYPE=""
70
.else
82
.else
71
FORCE_IGNORE+=	FreeType
83
FORCE_IGNORE+=	FreeType
72
PLIST_SUB+=	FREETYPE="@comment "
73
.endif
84
.endif
74
85
75
.if ${PORT_OPTIONS:MGDAL}
86
.if ${PORT_OPTIONS:MGDAL}
76
FORCE_REQUIRE+=	GDAL
87
FORCE_REQUIRE+=	GDAL
77
LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
78
PLIST_SUB+=	GDAL=""
79
.else
88
.else
80
FORCE_IGNORE+=	GDAL
89
FORCE_IGNORE+=	GDAL
81
PLIST_SUB+=	GDAL="@comment "
82
.endif
90
.endif
83
91
84
.if ${PORT_OPTIONS:MGIF}
92
.if ${PORT_OPTIONS:MGIF}
85
FORCE_REQUIRE+=	GIFLIB
93
FORCE_REQUIRE+=	GIFLIB
86
LIB_DEPENDS+=	gif:${PORTSDIR}/graphics/giflib
87
PLIST_SUB+=	GIF=""
88
.else
94
.else
89
FORCE_IGNORE+=	GIFLIB
95
FORCE_IGNORE+=	GIFLIB
90
PLIST_SUB+=	GIF="@comment "
91
.endif
96
.endif
92
97
93
.if ${PORT_OPTIONS:MINVENTOR}
98
.if ${PORT_OPTIONS:MINVENTOR}
94
FORCE_REQUIRE+=	Inventor
99
FORCE_REQUIRE+=	Inventor
95
BUILD_DEPENDS+=	${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
96
RUN_DEPENDS+=	${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
97
PLIST_SUB+=	INVENTOR=""
98
.else
100
.else
99
FORCE_IGNORE+=	Inventor
101
FORCE_IGNORE+=	Inventor
100
PLIST_SUB+=	INVENTOR="@comment "
101
.endif
102
.endif
102
103
103
.if ${PORT_OPTIONS:MJASPER}
104
.if ${PORT_OPTIONS:MJASPER}
104
FORCE_REQUIRE+=	Jasper
105
FORCE_REQUIRE+=	Jasper
105
LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
106
PLIST_SUB+=	JASPER=""
107
.else
106
.else
108
FORCE_IGNORE+=	Jasper
107
FORCE_IGNORE+=	Jasper
109
PLIST_SUB+=	JASPER="@comment "
110
.endif
108
.endif
111
109
112
#.if ${PORT_OPTIONS:MOPENVRML}
113
#FORCE_REQUIRE+=	OpenVRML
114
#LIB_DEPENDS+=	openvrml:${PORTSDIR}/www/openvrml
115
#PLIST_SUB+=	OPENVRML=""
116
#.else
117
FORCE_IGNORE+=	OpenVRML
110
FORCE_IGNORE+=	OpenVRML
118
PLIST_SUB+=	OPENVRML="@comment "
119
#.endif
120
111
121
.if ${PORT_OPTIONS:MXINE}
112
.if ${PORT_OPTIONS:MXINE}
122
FORCE_REQUIRE+=	Xine
113
FORCE_REQUIRE+=	Xine
123
LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
124
PLIST_SUB+=	XINE=""
125
.else
114
.else
126
FORCE_IGNORE+=	Xine
115
FORCE_IGNORE+=	Xine
127
PLIST_SUB+=	XINE="@comment "
128
.endif
116
.endif
129
117
130
.if ${PORT_OPTIONS:MITK}
118
.if ${PORT_OPTIONS:MITK}
131
FORCE_REQUIRE+=	ITK
119
FORCE_REQUIRE+=	ITK
132
BUILD_DEPENDS+=	${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
133
RUN_DEPENDS+=	${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
134
PLIST_SUB+=	ITK=""
135
CXXFLAGS+=	-DVCL_CAN_STATIC_CONST_INIT_FLOAT=0
120
CXXFLAGS+=	-DVCL_CAN_STATIC_CONST_INIT_FLOAT=0
136
.else
121
.else
137
FORCE_IGNORE+=	ITK
122
FORCE_IGNORE+=	ITK
138
PLIST_SUB+=	ITK="@comment "
139
.endif
123
.endif
140
124
141
.if ${PORT_OPTIONS:MVNC}
125
.if ${PORT_OPTIONS:MVNC}
142
FORCE_REQUIRE+=	LibVNCServer
126
FORCE_REQUIRE+=	LibVNCServer
143
LIB_DEPENDS+=	vncserver:${PORTSDIR}/net/libvncserver
144
PLIST_SUB+=	VNC=""
145
.else
127
.else
146
FORCE_IGNORE+=	LibVNCServer
128
FORCE_IGNORE+=	LibVNCServer
147
PLIST_SUB+=	VNC="@comment "
148
.endif
129
.endif
149
130
150
.if ${PORT_OPTIONS:MOPENEXR}
131
.if ${PORT_OPTIONS:MOPENEXR}
151
FORCE_REQUIRE+=	OpenEXR
132
FORCE_REQUIRE+=	OpenEXR
152
LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
153
PLIST_SUB+=	OPENEXR=""
154
.else
133
.else
155
FORCE_IGNORE+=	OpenEXR
134
FORCE_IGNORE+=	OpenEXR
156
PLIST_SUB+=	OPENEXR="@comment "
157
.endif
135
.endif
158
136
159
.if ${PORT_OPTIONS:MFFMPEG}
137
.if ${PORT_OPTIONS:MFFMPEG}
160
FORCE_REQUIRE+=	FFmpeg
138
FORCE_REQUIRE+=	FFmpeg
161
LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
162
PLIST_SUB+=	FFMPEG=""
163
.else
139
.else
164
FORCE_IGNORE+=	FFmpeg
140
FORCE_IGNORE+=	FFmpeg
165
PLIST_SUB+=	FFMPEG="@comment "
166
.endif
141
.endif
167
142
168
.if ${PORT_OPTIONS:MSDL}
143
.if ${PORT_OPTIONS:MSDL}
Lines 175-213 Link Here
175
# options that affect PKG_CHECK_MODULES
150
# options that affect PKG_CHECK_MODULES
176
.if ${PORT_OPTIONS:MSVG}
151
.if ${PORT_OPTIONS:MSVG}
177
FORCE_REQUIRE+=	RSVG
152
FORCE_REQUIRE+=	RSVG
178
LIB_DEPENDS+=	rsvg-2:${PORTSDIR}/graphics/librsvg2
179
PLIST_SUB+=	SVG=""
180
.else
153
.else
181
FORCE_IGNORE+=	RSVG
154
FORCE_IGNORE+=	RSVG
182
PLIST_SUB+=	SVG="@comment "
183
.endif
155
.endif
184
156
185
.if ${PORT_OPTIONS:MPDF}
157
.if ${PORT_OPTIONS:MPDF}
186
FORCE_REQUIRE+=	Poppler-glib
158
FORCE_REQUIRE+=	Poppler-glib
187
LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
188
PLIST_SUB+=	PDF=""
189
.else
159
.else
190
FORCE_IGNORE+=	Poppler-glib
160
FORCE_IGNORE+=	Poppler-glib
191
PLIST_SUB+=	PDF="@comment "
192
.endif
161
.endif
193
162
194
.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
163
.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
195
LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
164
USE_GNOME=	cairo
196
.endif
165
.endif
197
166
198
# other options
167
# other options
199
.if ${PORT_OPTIONS:MXRANDR}
168
.if ${PORT_OPTIONS:MXRANDR}
200
CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
201
USE_XORG+=	xrandr
202
.else
203
CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
204
.endif
205
206
.if ${PORT_OPTIONS:MXRANDR}
207
CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
208
USE_XORG+=	xrandr
169
USE_XORG+=	xrandr
209
.else
210
CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
211
.endif
170
.endif
212
171
213
post-patch:
172
post-patch:
(-)./files/patch-include-OpenThreads-Atomic (+11 lines)
Line 0 Link Here
1
--- include/OpenThreads/Atomic.orig	2011-01-31 12:35:50.000000000 +0100
2
+++ include/OpenThreads/Atomic	2013-09-18 12:41:22.000000000 +0200
3
@@ -241,7 +241,7 @@
4
 AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
5
 {
6
 #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
7
-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
8
+    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
9
 #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
10
     return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
11
 #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
(-)./files/patch-src-OpenThreads-common-Atomic.cpp (+11 lines)
Line 0 Link Here
1
--- src/OpenThreads/common/Atomic.cpp.orig	2011-04-19 13:40:22.000000000 +0200
2
+++ src/OpenThreads/common/Atomic.cpp	2013-09-18 11:26:03.000000000 +0200
3
@@ -143,7 +143,7 @@
4
 AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
5
 {
6
 #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
7
-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
8
+    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
9
 #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
10
     return ptrOld == InterlockedCompareExchangePointer((PVOID volatile*)&_ptr, (PVOID)ptrNew, (PVOID)ptrOld);
11
 #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
(-)./pkg-plist (-1 lines)
Lines 672-678 Link Here
672
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so
672
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so
673
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so
673
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so
674
%%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so
674
%%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so
675
%%OPENVRML%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vrml.so
676
lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so
675
lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so
677
lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so
676
lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so
678
%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so
677
%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so

Return to bug 182205