Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Dec 2019 01:07:53 +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: r519640 - in head: . graphics graphics/osg graphics/osg-devel graphics/osg/files
Message-ID:  <201912100107.xBA17rMK026967@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Dec 10 01:07:52 2019
New Revision: 519640
URL: https://svnweb.freebsd.org/changeset/ports/519640

Log:
  - Move graphics/osg-devel to graphics/osg and update to latest stable 3.6.4
  
  PR:		230442

Added:
  head/graphics/osg/
     - copied from r519639, head/graphics/osg-devel/
  head/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt   (contents, props changed)
  head/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp   (contents, props changed)
  head/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt   (contents, props changed)
Deleted:
  head/graphics/osg-devel/
  head/graphics/osg/files/patch-CMakeLists.txt
  head/graphics/osg/files/patch-ffmpeg3
  head/graphics/osg/files/patch-include_osgViewer_View
  head/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt
  head/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp
  head/graphics/osg/files/patch-src_osgDB_ConvertBase64.cpp
  head/graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt
  head/graphics/osg/files/patch-src_osgPlugins_osgjs_Base64
  head/graphics/osg/files/patch-src_osgPlugins_osgjs_Base64.cpp
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/osg/Makefile
  head/graphics/osg/distinfo
  head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake
  head/graphics/osg/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/MOVED	Tue Dec 10 01:07:52 2019	(r519640)
@@ -13516,3 +13516,4 @@ www/grafana3|www/grafana4|2019-12-01|Has expired: Depe
 www/miniminiweb||2019-12-01|Has expired: Upstream no longer available
 www/py-dj21-django-extensions|www/py-dj22-django-extensions|2019-12-06|Renamed to py-dj22-django-extensions because Django 2.1 has reached its End-of-Life
 www/py-dj21-djangoql|www/py-dj22-djangoql|2019-12-06|Renamed to py-dj22-djangoql because Django 2.1 has reached its End-of-Life
+graphics/osg-devel|graphics/osg|2019-12-10|Updated to latest stable version

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/graphics/Makefile	Tue Dec 10 01:07:52 2019	(r519640)
@@ -600,8 +600,8 @@
     SUBDIR += opensubdiv
     SUBDIR += optar
     SUBDIR += optipng
+    SUBDIR += osg
     SUBDIR += osg34
-    SUBDIR += osg-devel
     SUBDIR += osgearth
     SUBDIR += ossim
     SUBDIR += oyranos

Modified: head/graphics/osg/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/graphics/osg/Makefile	Tue Dec 10 01:07:52 2019	(r519640)
@@ -2,13 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	osg
-PORTVERSION=	3.5.1
-PORTREVISION=	13
+PORTVERSION=	3.6.4
+DISTVERSIONPREFIX=	OpenSceneGraph-
 CATEGORIES=	graphics
-MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
-		http://mirror.amdmi3.ru/distfiles/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	OpenSceneGraph-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
@@ -21,34 +17,39 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-CONFLICTS=	osg
+USE_GITHUB=	yes
+GH_ACCOUNT=	openscenegraph
+GH_PROJECT=	OpenSceneGraph
 
-USES=		alias cmake jpeg gl pkgconfig xorg zip
-USE_GL=		gl glu
+CONFLICTS=	osg34-[0-9]*
+
+USES=		alias cmake jpeg gl localbase pkgconfig xorg
+USE_GL=		gl
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
-		OSG_SHLIBVER=141 \
-		OPENTHREADS_VERSION=3.3.0 \
-		OPENTHREADS_SHLIBVER=20
+		OSG_SHLIBVER=160 \
+		OPENTHREADS_VERSION=3.3.1 \
+		OPENTHREADS_SHLIBVER=21
 
-PORTSCOUT=	limitw:1,odd
-
 OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \
-		JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \
-		SVG VNC XINE XRANDR
-OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
+		JASPER LIBLAS LUA NVTT OPENEXR PDF SDL ASIO \
+		SVG VNC XRANDR XINERAMA FONTCONFIG DCMTK COLLADA
+OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR XINERAMA FONTCONFIG
+OPTIONS_SUB=		yes
 
-GDAL_DESC=	GDAL support
-GTA_DESC=	GTA file format support
-LIBLAS_DESC=	liblas support
-NVTT_DESC=	Use NVidia texture tools
-SDL_DESC=	Use SDL (joystick support in present3d)
-VNC_DESC=	LibVNCServer support
+ASIO_DESC=		ASIO support (resthttp plugin)
+GDAL_DESC=		GDAL support
+GTA_DESC=		GTA file format support
+LIBLAS_DESC=		liblas support
+NVTT_DESC=		Use NVidia texture tools
+SDL_DESC=		Use SDL (joystick support in present3d)
+VNC_DESC=		LibVNCServer support
+OPENCASCADE_DESC=	OpenCASCADE format support
+DCMTK_DESC=		DICOM format support
+COLLADA_DESC=		COLLADA (dae) format support
 
-OPTIONS_SUB=	yes
-
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_VARS=		FORCE_REQUIRE+=CURL
 CURL_VARS_OFF=		FORCE_IGNORE+=CURL
@@ -58,6 +59,8 @@ FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_VARS=		FORCE_REQUIRE+=Freetype
 FREETYPE_VARS_OFF=	FORCE_IGNORE+=Freetype
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+FONTCONFIG_CMAKE_BOOL=	OSG_TEXT_USE_FONTCONFIG
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_VARS=		FORCE_REQUIRE+=GDAL
 GDAL_VARS_OFF=		FORCE_IGNORE+=GDAL
@@ -65,8 +68,8 @@ GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_VARS=		FORCE_REQUIRE+=GIFLIB
 GIF_VARS_OFF=		FORCE_IGNORE+=GIFLIB
 GSTREAMER_USE=		GNOME=glib20 GSTREAMER1=yes
-GSTREAMER_VARS=		FORCE_REQUIRE+=GStreamer
-GSTREAMER_VARS_OFF=	FORCE_IGNORE+=GStreamer
+GSTREAMER_VARS=		FORCE_REQUIRE+="GStreamer GLIB"
+GSTREAMER_VARS_OFF=	FORCE_IGNORE+="GStreamer GLIB"
 GSTREAMER_BROKEN=	fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 GTA_VARS=		FORCE_REQUIRE+=GTA
@@ -88,48 +91,53 @@ OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr
 OPENEXR_VARS=		FORCE_REQUIRE+=OpenEXR
 OPENEXR_VARS_OFF=	FORCE_IGNORE+=OpenEXR
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
-PDF_USE=		gnome=cairo
+PDF_USE=		GNOME=cairo
 PDF_VARS=		FORCE_REQUIRE+=Poppler-glib
 PDF_VARS_OFF=		FORCE_IGNORE+=Poppler-glib
-QT5_USES=		qt:5
-QT5_USE=		qt=buildtools_build,core,gui,opengl,qmake_build,webkit
-QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
-QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
-QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
-SDL_USES=		sdl
-SDL_USE=		sdl=sdl
+SDL_USE=		SDL=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
-SVG_USES=		gnome
-SVG_USE=		gnome=cairo,librsvg2
+SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+SVG_USE=		GNOME=cairo
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_VARS=		FORCE_REQUIRE+=LibVNCServer
 VNC_VARS_OFF=		FORCE_IGNORE+=LibVNCServer
-XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
-XINE_VARS=		FORCE_REQUIRE+=Xine
-XINE_VARS_OFF=		FORCE_IGNORE+=Xine
-XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
-XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
-XRANDR_USE=		xorg=xrandr
+XRANDR_CMAKE_BOOL=	OSGVIEWER_USE_XRANDR
+XRANDR_USE=		XORG=xrandr
+XINERAMA_CMAKE_BOOL=	OSGVIEWER_USE_XINERAMA
+XINERAMA_USE=		XORG=xinerama
+#OPENCASCADE_LIB_DEPENDS=libTKBRep.so:cad/opencascade
+#OPENCASCADE_VARS=	FORCE_REQUIRE+=OpenCascade
+#OPENCASCADE_VARS_OFF=	FORCE_IGNORE+=OpenCascade
+#OPENCASCADE_CMAKE_ARGS=	-DOPENCASCADE_LIBRARY_TYPE="Shared"
+DCMTK_LIB_DEPENDS=	libdcmrt.so:graphics/dcmtk \
+			libxml2.so:textproc/libxml2 \
+			libicuuc.so:devel/icu
+DCMTK_USES=		ssl
+DCMTK_VARS=		FORCE_REQUIRE+=DCMTK
+DCMTK_VARS_OFF=		FORCE_IGNORE+=DCMTK
+#ILMBASE_LIB_DEPENDS=	${LOCALBASE}/lib/libImath.so:graphics/ilmbase
+#ILMBASE_VARS=		FORCE_REQUIRE+=ilmbase
+#ILMBASE_VARS_OFF=	FORCE_IGNORE+=ilmbase
+COLLADA_LIB_DEPENDS=	libcollada-dom2.5-dp.so:devel/collada-dom \
+			libboost_filesystem.so:devel/boost-libs
+COLLADA_VARS=		FORCE_REQUIRE+=COLLADA
+COLLADA_VARS_OFF=	FORCE_IGNORE+=COLLADA
+ASIO_BUILD_DEPENDS=	${LOCALBASE}/include/asio.hpp:net/asio
+ASIO_VARS=		FORCE_REQUIRE+=Asio
+ASIO_VARS_OFF=		FORCE_IGNORE+=Asio
 
 # GUI toolkits are only needed for building examples, which are not even installed
-FORCE_IGNORE=	FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2	# 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
+FORCE_IGNORE=	FLTK FOX wxWidgets GtkGl SDL2		# only for examples
+FORCE_IGNORE+=	FBX Inventor				# not in ports
+FORCE_IGNORE+=	ilmbase					# not used
+FORCE_IGNORE+=	OpenCascade				# detection broken
+FORCE_IGNORE+=	ZeroConf				# no avahi support yet
+FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB	# common & lightweight
 
 .include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT5}
-CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
-PLIST_SUB+=		QT=""
-.else
-CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=OFF
-PLIST_SUB+=		QT="@comment "
-.endif
 
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \

Modified: head/graphics/osg/distinfo
==============================================================================
--- head/graphics/osg-devel/distinfo	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/graphics/osg/distinfo	Tue Dec 10 01:07:52 2019	(r519640)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482850076
-SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0
-SIZE (OpenSceneGraph-3.5.1.zip) = 8353019
+TIMESTAMP = 1575910338
+SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33
+SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 5771539

Modified: head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake
==============================================================================
--- head/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/graphics/osg/files/patch-CMakeModules-FindGTA.cmake	Tue Dec 10 01:07:52 2019	(r519640)
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeModules/FindGTA.cmake.orig	2017-05-19 16:06:36 UTC
++++ CMakeModules/FindGTA.cmake
+@@ -8,17 +8,6 @@
  # correspond to the ./configure --prefix=$GTA_DIR
  # used in building libgta.
  
@@ -12,14 +12,16 @@
 -
 -    PKG_CHECK_MODULES(GTA gta)
 -
--ELSE(PKG_CONFIG_FOUND)
+-ENDIF(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)
+-IF(NOT GTA_FOUND)
+     FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
+         $ENV{GTA_DIR}/include
+         $ENV{GTA_DIR}
+@@ -53,5 +42,3 @@ IF(NOT GTA_FOUND)
+     IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
+         SET(GTA_FOUND "YES")
+     ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
 -
--ENDIF(PKG_CONFIG_FOUND)
+-ENDIF(NOT GTA_FOUND)
+\ No newline at end of file

Added: head/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt	Tue Dec 10 01:07:52 2019	(r519640)
@@ -0,0 +1,18 @@
+--- src/OpenThreads/pthreads/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
++++ src/OpenThreads/pthreads/CMakeLists.txt
+@@ -80,8 +80,15 @@ ELSE()
+           # double check that pthread_setaffinity_np is available as FreeBSD header doesn't contain required function
+           CHECK_CXX_SOURCE_COMPILES("
+             #include <pthread.h>
++            #ifdef __FreeBSD__
++            #include <pthread_np.h>
++            #endif
+             int main() {
++            #ifdef __FreeBSD__
++            cpuset_t cpumask;
++            #else
+             cpu_set_t cpumask;
++            #endif
+             CPU_ZERO( &cpumask );
+             CPU_SET( 0, &cpumask );
+             pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask);

Added: head/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp	Tue Dec 10 01:07:52 2019	(r519640)
@@ -0,0 +1,24 @@
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2019-07-26 11:54:16 UTC
++++ src/OpenThreads/pthreads/PThread.cpp
+@@ -21,6 +21,9 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <pthread.h>
++#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(__FreeBSD__)
++    #include <pthread_np.h>
++#endif
+ #include <limits.h>
+ 
+ #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
+@@ -113,7 +116,11 @@ namespace OpenThreads
+ static void setAffinity(const Affinity& affinity)
+ {
+     //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl;
++#if defined(__FreeBSD__)
++    cpuset_t cpumask;
++#else
+     cpu_set_t cpumask;
++#endif
+     CPU_ZERO( &cpumask );
+     unsigned int numprocessors = OpenThreads::GetNumberOfProcessors();
+     if (affinity)

Added: head/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt	Tue Dec 10 01:07:52 2019	(r519640)
@@ -0,0 +1,11 @@
+--- src/osgViewer/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
++++ src/osgViewer/CMakeLists.txt
+@@ -210,7 +210,7 @@ ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "X11")
+     IF(OSGVIEWER_USE_XINERAMA)
+         ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
+         SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
+-        SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS})
++        SET(LIB_EXTRA_LIBS ${X11_Xinerama_LIB} ${LIB_EXTRA_LIBS})
+     ENDIF()
+ 
+     # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard

Modified: head/graphics/osg/pkg-plist
==============================================================================
--- head/graphics/osg-devel/pkg-plist	Tue Dec 10 00:31:36 2019	(r519639)
+++ head/graphics/osg/pkg-plist	Tue Dec 10 01:07:52 2019	(r519640)
@@ -4,6 +4,7 @@ bin/osgfilecache
 bin/osgversion
 bin/osgviewer
 bin/present3D
+include/OpenThreads/Affinity
 include/OpenThreads/Atomic
 include/OpenThreads/Barrier
 include/OpenThreads/Block
@@ -21,10 +22,11 @@ include/osg/AnimationPath
 include/osg/ApplicationUsage
 include/osg/ArgumentParser
 include/osg/Array
-include/osg/ArrayDispatchers
+include/osg/AttributeDispatchers
 include/osg/AudioStream
 include/osg/AutoTransform
 include/osg/Billboard
+include/osg/BindImageTexture
 include/osg/BlendColor
 include/osg/BlendEquation
 include/osg/BlendEquationi
@@ -63,6 +65,8 @@ include/osg/CullStack
 include/osg/CullingSet
 include/osg/DeleteHandler
 include/osg/Depth
+include/osg/DepthRangeIndexed
+include/osg/DispatchCompute
 include/osg/DisplaySettings
 include/osg/DrawPixels
 include/osg/Drawable
@@ -75,7 +79,6 @@ include/osg/FrameStamp
 include/osg/FrontFace
 include/osg/GL
 include/osg/GL2Extensions
-include/osg/GLBeginEndAdapter
 include/osg/GLDefines
 include/osg/GLExtensions
 include/osg/GLObjects
@@ -87,6 +90,7 @@ include/osg/GraphicsCostEstimator
 include/osg/GraphicsThread
 include/osg/Group
 include/osg/Hint
+include/osg/Identifier
 include/osg/Image
 include/osg/ImageSequence
 include/osg/ImageStream
@@ -131,6 +135,7 @@ include/osg/Polytope
 include/osg/PositionAttitudeTransform
 include/osg/PrimitiveRestartIndex
 include/osg/PrimitiveSet
+include/osg/PrimitiveSetIndirect
 include/osg/Program
 include/osg/Projection
 include/osg/ProxyNode
@@ -138,7 +143,9 @@ include/osg/Quat
 include/osg/Referenced
 include/osg/RenderInfo
 include/osg/SampleMaski
+include/osg/Sampler
 include/osg/Scissor
+include/osg/ScissorIndexed
 include/osg/ScriptEngine
 include/osg/Sequence
 include/osg/ShadeModel
@@ -157,6 +164,7 @@ include/osg/Stencil
 include/osg/StencilTwoSided
 include/osg/Switch
 include/osg/TemplatePrimitiveFunctor
+include/osg/TemplatePrimitiveIndexFunctor
 include/osg/TexEnv
 include/osg/TexEnvCombine
 include/osg/TexEnvFilter
@@ -177,10 +185,13 @@ include/osg/TransferFunction
 include/osg/Transform
 include/osg/TriangleFunctor
 include/osg/TriangleIndexFunctor
+include/osg/TriangleLinePointIndexFunctor
 include/osg/Types
 include/osg/Uniform
 include/osg/UserDataContainer
+include/osg/ValueMap
 include/osg/ValueObject
+include/osg/ValueStack
 include/osg/Vec2
 include/osg/Vec2b
 include/osg/Vec2d
@@ -209,14 +220,17 @@ include/osg/Vec4ub
 include/osg/Vec4ui
 include/osg/Vec4us
 include/osg/Version
+include/osg/VertexArrayState
 include/osg/VertexAttribDivisor
 include/osg/VertexProgram
 include/osg/View
 include/osg/Viewport
+include/osg/ViewportIndexed
 include/osg/buffered_value
 include/osg/fast_back_stack
 include/osg/io_utils
 include/osg/observer_ptr
+include/osg/os_utils
 include/osg/ref_ptr
 include/osgAnimation/Action
 include/osgAnimation/ActionAnimation
@@ -240,6 +254,8 @@ include/osgAnimation/Interpolator
 include/osgAnimation/Keyframe
 include/osgAnimation/LinkVisitor
 include/osgAnimation/MorphGeometry
+include/osgAnimation/MorphTransformHardware
+include/osgAnimation/MorphTransformSoftware
 include/osgAnimation/RigGeometry
 include/osgAnimation/RigTransform
 include/osgAnimation/RigTransformHardware
@@ -423,13 +439,6 @@ include/osgPresentation/PropertyManager
 include/osgPresentation/SlideEventHandler
 include/osgPresentation/SlideShowConstructor
 include/osgPresentation/Timeout
-%%QT%%include/osgQt/Export
-%%QT%%include/osgQt/GraphicsWindowQt
-%%QT%%include/osgQt/QFontImplementation
-%%QT%%include/osgQt/QGraphicsViewAdapter
-%%QT%%include/osgQt/QWebViewImage
-%%QT%%include/osgQt/QWidgetImage
-%%QT%%include/osgQt/Version
 include/osgShadow/ConvexPolyhedron
 include/osgShadow/DebugShadowMap
 include/osgShadow/Export
@@ -437,14 +446,12 @@ include/osgShadow/LightSpacePerspectiveShadowMap
 include/osgShadow/MinimalCullBoundsShadowMap
 include/osgShadow/MinimalDrawBoundsShadowMap
 include/osgShadow/MinimalShadowMap
-include/osgShadow/OccluderGeometry
 include/osgShadow/ParallelSplitShadowMap
 include/osgShadow/ProjectionShadowMap
 include/osgShadow/ShadowMap
 include/osgShadow/ShadowSettings
 include/osgShadow/ShadowTechnique
 include/osgShadow/ShadowTexture
-include/osgShadow/ShadowVolume
 include/osgShadow/ShadowedScene
 include/osgShadow/SoftShadowMap
 include/osgShadow/StandardShadowMap
@@ -571,6 +578,12 @@ include/osgViewer/ViewerEventHandlers
 include/osgViewer/api/X11/GraphicsHandleX11
 include/osgViewer/api/X11/GraphicsWindowX11
 include/osgViewer/api/X11/PixelBufferX11
+include/osgViewer/config/AcrossAllScreens
+include/osgViewer/config/PanoramicSphericalDisplay
+include/osgViewer/config/SingleScreen
+include/osgViewer/config/SingleWindow
+include/osgViewer/config/SphericalDisplay
+include/osgViewer/config/WoWVxDisplay
 include/osgVolume/Export
 include/osgVolume/FixedFunctionTechnique
 include/osgVolume/Layer
@@ -635,9 +648,6 @@ lib/libosgParticle.so.%%OSG_SHLIBVER%%
 lib/libosgPresentation.so
 lib/libosgPresentation.so.%%OSG_VERSION%%
 lib/libosgPresentation.so.%%OSG_SHLIBVER%%
-%%QT%%lib/libosgQt.so
-%%QT%%lib/libosgQt.so.%%OSG_VERSION%%
-%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%%
 lib/libosgShadow.so
 lib/libosgShadow.so.%%OSG_VERSION%%
 lib/libosgShadow.so.%%OSG_SHLIBVER%%
@@ -673,6 +683,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_bsp.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_bvh.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_cfg.so
 %%CURL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_curl.so
+%%COLLADA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_dae.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_dds.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osg.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osganimation.so
@@ -685,8 +696,8 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgtex
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so
+%%DCMTK%%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
 %%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so
 %%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so
@@ -731,6 +742,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so
+%%ASIO%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_resthttp.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
@@ -764,7 +776,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so
 %%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so
-%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_zip.so
 libdata/pkgconfig/openscenegraph-osg.pc
 libdata/pkgconfig/openscenegraph-osgAnimation.pc
@@ -773,7 +784,6 @@ libdata/pkgconfig/openscenegraph-osgFX.pc
 libdata/pkgconfig/openscenegraph-osgGA.pc
 libdata/pkgconfig/openscenegraph-osgManipulator.pc
 libdata/pkgconfig/openscenegraph-osgParticle.pc
-%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc
 libdata/pkgconfig/openscenegraph-osgShadow.pc
 libdata/pkgconfig/openscenegraph-osgSim.pc
 libdata/pkgconfig/openscenegraph-osgTerrain.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912100107.xBA17rMK026967>