Date: Mon, 20 Jan 2014 14:35:09 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340402 - in head/graphics/osg: . files Message-ID: <201401201435.s0KEZ9Cf014047@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jan 20 14:35:09 2014 New Revision: 340402 URL: http://svnweb.freebsd.org/changeset/ports/340402 QAT: https://qat.redports.org/buildarchive/r340402/ Log: - Update to 3.2.0 - Update MASTER_SITES - Add license [1] - Switch to outsource cmake build - Add missing NVTT, GTA and QT4 options - Remove ITK option - Some pathes were integrated upstream PR: 185227 [1] Submitted by: Hardy Schumacher <hardy.schumacher@gmx.de> [1] Added: head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake (contents, props changed) head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h (contents, props changed) Deleted: head/graphics/osg/files/patch-include-OpenThreads-Atomic head/graphics/osg/files/patch-include-osg-Math head/graphics/osg/files/patch-libav07 head/graphics/osg/files/patch-libav9 head/graphics/osg/files/patch-src-OpenThreads-common-Atomic.cpp head/graphics/osg/files/patch-src-osgPlugins-ffmpeg-FFmpegDecoderAudio.cpp head/graphics/osg/files/patch-src-osgPlugins-xine-video__out__rgb.c Modified: head/graphics/osg/Makefile head/graphics/osg/distinfo head/graphics/osg/pkg-plist Modified: head/graphics/osg/Makefile ============================================================================== --- head/graphics/osg/Makefile Mon Jan 20 14:29:55 2014 (r340401) +++ head/graphics/osg/Makefile Mon Jan 20 14:35:09 2014 (r340402) @@ -2,16 +2,20 @@ # $FreeBSD$ PORTNAME= osg -PORTVERSION= 3.0.1 -PORTREVISION= 9 +PORTVERSION= 3.2.0 CATEGORIES= graphics -MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \ +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 @@ -19,27 +23,28 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap CONFLICTS= osg-devel-[0-9]* USE_ZIP= yes -USES= cmake pkgconfig +USES= cmake:outsource pkgconfig USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ - OSG_SHLIBVER=80 \ - OPENTHREADS_VERSION=2.6.0 \ - OPENTHREADS_SHLIBVER=12 + OSG_SHLIBVER=100 \ + OPENTHREADS_VERSION=${PORTVERSION} \ + OPENTHREADS_SHLIBVER=13 PORTSCOUT= limitw:1,even -OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \ - VNC OPENEXR FFMPEG SVG PDF XRANDR SDL +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 -ITK_DESC= InsightToolkit 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 @@ -50,21 +55,27 @@ GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/g INVENTOR_LIB_DEPENDS= libInventor.so:${PORTSDIR}/graphics/inventor JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper XINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine -ITK_BUILD_DEPENDS= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit -ITK_RUN_DEPENDS= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit +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 <bsd.port.options.mk> # GUI toolkits are only needed for building examples, which are not even installed -FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt4 wxWidgets OpenAL GtkGl # only for examples +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 @@ -104,20 +115,16 @@ FORCE_REQUIRE+= Jasper FORCE_IGNORE+= Jasper .endif -# broken (openvrml from ports is too old) -FORCE_IGNORE+= OpenVRML - .if ${PORT_OPTIONS:MXINE} FORCE_REQUIRE+= Xine .else FORCE_IGNORE+= Xine .endif -.if ${PORT_OPTIONS:MITK} -FORCE_REQUIRE+= ITK -CXXFLAGS+= -DVCL_CAN_STATIC_CONST_INIT_FLOAT=0 +.if ${PORT_OPTIONS:MGTA} +FORCE_REQUIRE+= GTA .else -FORCE_IGNORE+= ITK +FORCE_IGNORE+= GTA .endif .if ${PORT_OPTIONS:MVNC} @@ -140,11 +147,16 @@ FORCE_IGNORE+= FFmpeg .if ${PORT_OPTIONS:MSDL} FORCE_REQUIRE+= SDL -USE_SDL= 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 Modified: head/graphics/osg/distinfo ============================================================================== --- head/graphics/osg/distinfo Mon Jan 20 14:29:55 2014 (r340401) +++ head/graphics/osg/distinfo Mon Jan 20 14:35:09 2014 (r340402) @@ -1,2 +1,2 @@ -SHA256 (OpenSceneGraph-3.0.1.zip) = 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 -SIZE (OpenSceneGraph-3.0.1.zip) = 6780282 +SHA256 (OpenSceneGraph-3.2.0.zip) = ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e +SIZE (OpenSceneGraph-3.2.0.zip) = 7195748 Added: head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake Mon Jan 20 14:35:09 2014 (r340402) @@ -0,0 +1,25 @@ +--- CMakeModules/FindGTA.cmake.orig 2014-01-19 17:46:13.693927259 +0400 ++++ CMakeModules/FindGTA.cmake 2014-01-19 18:38:17.868997891 +0400 +@@ -8,16 +8,6 @@ + # correspond to the ./configure --prefix=$GTA_DIR + # used in building libgta. + +-INCLUDE(FindPkgConfig OPTIONAL) +- +-IF(PKG_CONFIG_FOUND) +- +- INCLUDE(FindPkgConfig) +- +- PKG_CHECK_MODULES(GTA gta) +- +-ELSE(PKG_CONFIG_FOUND) +- + FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp + $ENV{GTA_DIR}/include + $ENV{GTA_DIR} +@@ -52,5 +42,3 @@ + IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) + SET(GTA_FOUND "YES") + ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) +- +-ENDIF(PKG_CONFIG_FOUND) Added: head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h Mon Jan 20 14:35:09 2014 (r340402) @@ -0,0 +1,29 @@ +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 <sys/endian.h> ++ #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 + Modified: head/graphics/osg/pkg-plist ============================================================================== --- head/graphics/osg/pkg-plist Mon Jan 20 14:29:55 2014 (r340401) +++ head/graphics/osg/pkg-plist Mon Jan 20 14:35:09 2014 (r340402) @@ -112,6 +112,7 @@ include/osg/OccluderNode include/osg/OcclusionQueryNode include/osg/OperationThread include/osg/PagedLOD +include/osg/PatchParameter include/osg/Plane include/osg/Point include/osg/PointSprite @@ -120,6 +121,7 @@ include/osg/PolygonOffset include/osg/PolygonStipple include/osg/Polytope include/osg/PositionAttitudeTransform +include/osg/PrimitiveRestartIndex include/osg/PrimitiveSet include/osg/Program include/osg/Projection @@ -127,6 +129,7 @@ include/osg/ProxyNode include/osg/Quat include/osg/Referenced include/osg/RenderInfo +include/osg/SampleMaski include/osg/Scissor include/osg/Sequence include/osg/ShadeModel @@ -157,6 +160,7 @@ include/osg/Texture2D include/osg/Texture2DArray include/osg/Texture2DMultisample include/osg/Texture3D +include/osg/TextureBuffer include/osg/TextureCubeMap include/osg/TextureRectangle include/osg/Timer @@ -171,18 +175,29 @@ include/osg/Vec2 include/osg/Vec2b include/osg/Vec2d include/osg/Vec2f +include/osg/Vec2i include/osg/Vec2s +include/osg/Vec2ub +include/osg/Vec2ui +include/osg/Vec2us include/osg/Vec3 include/osg/Vec3b include/osg/Vec3d include/osg/Vec3f +include/osg/Vec3i include/osg/Vec3s +include/osg/Vec3ub +include/osg/Vec3ui +include/osg/Vec3us include/osg/Vec4 include/osg/Vec4b include/osg/Vec4d include/osg/Vec4f +include/osg/Vec4i include/osg/Vec4s include/osg/Vec4ub +include/osg/Vec4ui +include/osg/Vec4us include/osg/Version include/osg/VertexProgram include/osg/View @@ -288,6 +303,7 @@ include/osgFX/Version include/osgGA/AnimationPathManipulator include/osgGA/CameraManipulator include/osgGA/CameraViewSwitchManipulator +include/osgGA/Device include/osgGA/DriveManipulator include/osgGA/EventQueue include/osgGA/EventVisitor @@ -382,9 +398,18 @@ include/osgParticle/range include/osgPresentation/AnimationMaterial include/osgPresentation/CompileSlideCallback include/osgPresentation/Export +include/osgPresentation/KeyEventHandler include/osgPresentation/PickEventHandler +include/osgPresentation/PropertyManager include/osgPresentation/SlideEventHandler include/osgPresentation/SlideShowConstructor +include/osgPresentation/Timeout +%%QT4%%include/osgQt/Export +%%QT4%%include/osgQt/GraphicsWindowQt +%%QT4%%include/osgQt/QFontImplementation +%%QT4%%include/osgQt/QGraphicsViewAdapter +%%QT4%%include/osgQt/QWebViewImage +%%QT4%%include/osgQt/QWidgetImage include/osgShadow/ConvexPolyhedron include/osgShadow/DebugShadowMap include/osgShadow/Export @@ -396,6 +421,7 @@ include/osgShadow/OccluderGeometry include/osgShadow/ParallelSplitShadowMap include/osgShadow/ProjectionShadowMap include/osgShadow/ShadowMap +include/osgShadow/ShadowSettings include/osgShadow/ShadowTechnique include/osgShadow/ShadowTexture include/osgShadow/ShadowVolume @@ -403,6 +429,7 @@ include/osgShadow/ShadowedScene include/osgShadow/SoftShadowMap include/osgShadow/StandardShadowMap include/osgShadow/Version +include/osgShadow/ViewDependentShadowMap include/osgShadow/ViewDependentShadowTechnique include/osgSim/BlinkSequence include/osgSim/ColorRange @@ -467,6 +494,7 @@ include/osgUtil/LineSegmentIntersector include/osgUtil/MeshOptimizers include/osgUtil/OperationArrayFunctor include/osgUtil/Optimizer +include/osgUtil/PerlinNoise include/osgUtil/PlaneIntersector include/osgUtil/PolytopeIntersector include/osgUtil/PositionalStateContainer @@ -493,6 +521,7 @@ include/osgUtil/Version include/osgViewer/CompositeViewer include/osgViewer/Export include/osgViewer/GraphicsWindow +include/osgViewer/Keystone include/osgViewer/Renderer include/osgViewer/Scene include/osgViewer/Version @@ -564,6 +593,9 @@ lib/libosgParticle.so.%%OSG_SHLIBVER%% lib/libosgPresentation.so lib/libosgPresentation.so.%%OSG_VERSION%% lib/libosgPresentation.so.%%OSG_SHLIBVER%% +%%QT4%%lib/libosgQt.so +%%QT4%%lib/libosgQt.so.%%OSG_VERSION%% +%%QT4%%lib/libosgQt.so.%%OSG_SHLIBVER%% lib/libosgShadow.so lib/libosgShadow.so.%%OSG_VERSION%% lib/libosgShadow.so.%%OSG_SHLIBVER%% @@ -608,7 +640,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_dep lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so -%%ITK%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_dicom.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so @@ -616,24 +647,27 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf %%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so %%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so %%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so -lib/osgPlugins-%%OSG_VERSION%%/osgdb_geo.so %%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so +%%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so %%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so %%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_mdl.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_normals.so +%%NVTT%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_nvtt.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_obj.so %%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ogr.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_openflight.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so @@ -648,6 +682,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_png lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so +%%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so @@ -655,13 +690,16 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_sca lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgga.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgmanipulator.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgparticle.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgshadow.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so +%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so %%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so @@ -669,6 +707,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_trans.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_trk.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so %%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so @@ -683,6 +722,7 @@ libdata/pkgconfig/openscenegraph-osgFX.p libdata/pkgconfig/openscenegraph-osgGA.pc libdata/pkgconfig/openscenegraph-osgManipulator.pc libdata/pkgconfig/openscenegraph-osgParticle.pc +%%QT4%%libdata/pkgconfig/openscenegraph-osgQt.pc libdata/pkgconfig/openscenegraph-osgShadow.pc libdata/pkgconfig/openscenegraph-osgSim.pc libdata/pkgconfig/openscenegraph-osgTerrain.pc @@ -704,6 +744,7 @@ libdata/pkgconfig/openthreads.pc @dirrm include/osgTerrain @dirrm include/osgSim @dirrm include/osgShadow +%%QT4%%@dirrm include/osgQt @dirrm include/osgPresentation @dirrm include/osgParticle @dirrm include/osgManipulator
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401201435.s0KEZ9Cf014047>