Index: head/graphics/osg/Makefile =================================================================== --- head/graphics/osg/Makefile (revision 369855) +++ head/graphics/osg/Makefile (revision 369856) @@ -1,196 +1,195 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= osg -PORTVERSION= 3.2.0 -PORTREVISION= 4 +PORTVERSION= 3.2.1 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering LICENSE= OSGPL LICENSE_NAME= OpenSceneGraph Public License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff CONFLICTS= osg-devel-[0-9]* USES= cmake:outsource pkgconfig zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ OSG_SHLIBVER=100 \ OPENTHREADS_VERSION=${PORTVERSION} \ - OPENTHREADS_SHLIBVER=13 + OPENTHREADS_SHLIBVER=20 PORTSCOUT= limitw:1,even OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE GTA \ VNC OPENEXR FFMPEG SVG PDF SDL NVTT QT4 XRANDR OPTIONS_DEFAULT=FREETYPE GIF FFMPEG XRANDR GDAL_DESC= GDAL support INVENTOR_DESC= SGI OpenInventor support GTA_DESC= GTA file format support VNC_DESC= LibVNCServer support SDL_DESC= Use SDL (joystick support in present3d) NVTT_DESC= Use NVidia texture tools OPTIONS_SUB= yes CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib INVENTOR_LIB_DEPENDS= libInventor.so:${PORTSDIR}/graphics/inventor JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper XINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine GTA_LIB_DEPENDS= libgta.so:${PORTSDIR}/devel/libgta VNC_LIB_DEPENDS= libvncserver.so:${PORTSDIR}/net/libvncserver OPENEXR_LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg SVG_LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 PDF_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib SDL_USE= SDL=sdl NVTT_LIB_DEPENDS= libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build QT4_CMAKE_ON= -DOSG_USE_QT=ON QT4_CMAKE_OFF= -DOSG_USE_QT=OFF .include # GUI toolkits are only needed for building examples, which are not even installed FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt5Widgets wxWidgets OpenAL GtkGl # only for examples FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports FORCE_IGNORE+= OpenVRML # ports version too old FORCE_IGNORE+= ITK # ports version doesn't build on 10.x FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight # options that affect FIND_PACKAGE .if ${PORT_OPTIONS:MCURL} FORCE_REQUIRE+= CURL .else FORCE_IGNORE+= CURL .endif .if ${PORT_OPTIONS:MFREETYPE} FORCE_REQUIRE+= FreeType .else FORCE_IGNORE+= FreeType .endif .if ${PORT_OPTIONS:MGDAL} FORCE_REQUIRE+= GDAL .else FORCE_IGNORE+= GDAL .endif .if ${PORT_OPTIONS:MGIF} FORCE_REQUIRE+= GIFLIB .else FORCE_IGNORE+= GIFLIB .endif .if ${PORT_OPTIONS:MINVENTOR} FORCE_REQUIRE+= Inventor .else FORCE_IGNORE+= Inventor .endif .if ${PORT_OPTIONS:MJASPER} FORCE_REQUIRE+= Jasper .else FORCE_IGNORE+= Jasper .endif .if ${PORT_OPTIONS:MXINE} FORCE_REQUIRE+= Xine .else FORCE_IGNORE+= Xine .endif .if ${PORT_OPTIONS:MGTA} FORCE_REQUIRE+= GTA .else FORCE_IGNORE+= GTA .endif .if ${PORT_OPTIONS:MVNC} FORCE_REQUIRE+= LibVNCServer .else FORCE_IGNORE+= LibVNCServer .endif .if ${PORT_OPTIONS:MOPENEXR} FORCE_REQUIRE+= OpenEXR .else FORCE_IGNORE+= OpenEXR .endif .if ${PORT_OPTIONS:MFFMPEG} FORCE_REQUIRE+= FFmpeg .else FORCE_IGNORE+= FFmpeg .endif .if ${PORT_OPTIONS:MSDL} FORCE_REQUIRE+= SDL .else FORCE_IGNORE+= SDL .endif .if ${PORT_OPTIONS:MNVTT} FORCE_REQUIRE+= NVTT .else FORCE_IGNORE+= NVTT .endif # options that affect PKG_CHECK_MODULES .if ${PORT_OPTIONS:MSVG} FORCE_REQUIRE+= RSVG .else FORCE_IGNORE+= RSVG .endif .if ${PORT_OPTIONS:MPDF} FORCE_REQUIRE+= Poppler-glib .else FORCE_IGNORE+= Poppler-glib .endif .if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF} USE_GNOME= cairo .endif # other options .if ${PORT_OPTIONS:MXRANDR} USE_XORG+= xrandr .endif post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \ ${WRKSRC}/CMakeLists.txt .for p in ${FORCE_REQUIRE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ ${WRKSRC}/CMakeLists.txt .endfor .for p in ${FORCE_IGNORE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \ ${WRKSRC}/CMakeLists.txt .endfor .include Index: head/graphics/osg/distinfo =================================================================== --- head/graphics/osg/distinfo (revision 369855) +++ head/graphics/osg/distinfo (revision 369856) @@ -1,2 +1,2 @@ -SHA256 (OpenSceneGraph-3.2.0.zip) = ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e -SIZE (OpenSceneGraph-3.2.0.zip) = 7195748 +SHA256 (OpenSceneGraph-3.2.1.zip) = d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d +SIZE (OpenSceneGraph-3.2.1.zip) = 7219212 Index: head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake =================================================================== --- head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake (revision 369855) +++ head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake (nonexistent) @@ -1,44 +0,0 @@ ---- CMakeModules/FindFreeType.cmake.orig 2013-12-24 19:18:24.000000000 +0100 -+++ CMakeModules/FindFreeType.cmake 2013-12-24 19:19:27.000000000 +0100 -@@ -24,18 +24,18 @@ - # wants explicit full paths and this trickery doesn't work too well. - # I'm going to attempt to cut out the middleman and hope - # everything still works. --FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h - PATHS - $ENV{FREETYPE_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES include - ) --FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES include - ) --FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h - PATHS - /usr/local - /usr -@@ -51,16 +51,16 @@ - PATH_SUFFIXES include - ) - --FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - $ENV{FREETYPE_DIR}/include/freetype2 - NO_DEFAULT_PATH - ) --FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES include/freetype2 - ) --FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h -+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - /usr/local/include/freetype2 - /usr/include/freetype2 - /usr/local/X11R6/include/freetype2 Property changes on: head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp =================================================================== --- head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp (revision 369855) +++ head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- src/osgPlugins/freetype/FreeTypeFont.cpp.orig 2013-12-24 19:29:26.000000000 +0100 -+++ src/osgPlugins/freetype/FreeTypeFont.cpp 2013-12-24 19:30:24.000000000 +0100 -@@ -14,8 +14,9 @@ - #include "FreeTypeFont.h" - #include "FreeTypeLibrary.h" - --#include --#include -+#include -+#include FT_OUTLINE_H -+#include FT_BBOX_H - - #include - #include Property changes on: head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h =================================================================== --- head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h (revision 369855) +++ head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h (nonexistent) @@ -1,29 +0,0 @@ -Index: src/osgPlugins/osc/osc/OscHostEndianness.h -=================================================================== ---- src/osgPlugins/osc/osc/OscHostEndianness.h (revision 13802) -+++ src/osgPlugins/osc/osc/OscHostEndianness.h (working copy) -@@ -60,6 +60,15 @@ - #else - #error Unknown machine endianness detected. - #endif -+ #elif defined(__FreeBSD__) -+ #include -+ #if (_BYTE_ORDER == _LITTLE_ENDIAN) -+ #define __LITTLE_ENDIAN__ -+ #elif (_BYTE_ORDER == _BIG_ENDIAN) -+ #define __BIG_ENDIAN__ -+ #else -+ #error Unknown machine endianness detected. -+ #endif - #endif - - #if defined(__LITTLE_ENDIAN__) -@@ -74,7 +83,7 @@ - - #else - -- #error please edit OSCHostEndianness.h to configure endianness -+ #error please edit OscHostEndianness.h to configure endianness - - #endif - Property changes on: head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property