On Sat, 4 Nov 2017 12:38:06 +0100, Landry Breuil wrote:
> Hi,
>
> here's the update for OSG 3.4.1, and while here addded a qt5 FLAVOR i
> need for the 3d globe in the upcoming qgis3, via osgearth for which a
> port is in the works. I also enabled the gdal/ogr bits.
>
> comments/testing welcome, especially with the other OSG consumers
> (openmw?)
Hold on, OpenMW might be fine with Qt5. If so, a FLAVOR is unnecessary.
I'll do some testing tomorrow.
> Landry
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/openscenegraph/Makefile,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile
> --- Makefile 26 Jul 2017 22:45:24 -0000 1.12
> +++ Makefile 4 Nov 2017 11:31:18 -0000
> @@ -4,10 +4,11 @@
>
> COMMENT = 3D graphics toolkit
>
> -V = 3.4.0
> -DISTNAME = OpenSceneGraph-${V}
> -PKGNAME = openscenegraph-${V}
> -REVISION = 2
> +V = 3.4.1
> +GH_ACCOUNT = openscenegraph
> +GH_PROJECT = OpenSceneGraph
> +GH_TAGNAME = ${GH_PROJECT}-${V}
> +DISTNAME = ${GH_PROJECT:L}-${V}
>
> SUBST_VARS += V
>
> @@ -40,27 +41,41 @@
> # OSGPL (see LICENSE.txt)
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += GL Half Iex IlmImf IlmThread QtGui QtOpenGL SDL X11
> +FLAVORS = qt5
> +FLAVOR ?=
> +
> +WANTLIB += GL Half Iex IlmImf IlmThread SDL X11 gdal
> WANTLIB += Xrandr avcodec avdevice avformat avresample avutil
> WANTLIB += c cairo curl freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
> WANTLIB += gobject-2.0 intl jasper jpeg m png poppler-glib pthread
> WANTLIB += rsvg-2 ${COMPILER_LIBCXX} swresample swscale tiff z
>
> -MASTER_SITES =
> ${HOMEPAGE}/downloads/stable_releases/OpenSceneGraph-$V/source/
> -EXTRACT_SUFX = .zip
> -
> MODULES = devel/cmake \
> - x11/qt4
> + x11/qt5
> LIB_DEPENDS = graphics/openexr \
> graphics/ffmpeg \
> graphics/gdk-pixbuf2 \
> graphics/giflib \
> + geo/gdal \
> net/curl \
> print/poppler \
> x11/gnome/librsvg
>
> -CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4 \
> - -DOSG_USE_AGGRESSIVE_WARNINGS=OFF
> +.if ${FLAVOR:Mqt5}
> +MODULES += x11/qt5
> +CONFIGURE_ARGS = -DDESIRED_QT_VERSION=5
> +SHARED_LIBS += osgQt5 1.0 # 3.0
> +WANTLIB += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
> +post-install:
> + ln ${PREFIX}/lib/libosgQt{,5}.so.${LIBosgQt_VERSION}
> +
> +.else
> +MODULES += x11/qt4
> +CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4
> +WANTLIB += QtGui QtOpenGL
> +.endif
> +
> +CONFIGURE_ARGS += -DOSG_USE_AGGRESSIVE_WARNINGS=OFF
>
> NO_TEST = Yes
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/openscenegraph/distinfo,v
> retrieving revision 1.3
> diff -u -r1.3 distinfo
> --- distinfo 22 Sep 2015 18:49:15 -0000 1.3
> +++ distinfo 4 Nov 2017 11:31:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (OpenSceneGraph-3.4.0.zip) =
> XHJ9hHVdonat+MSko6i6nJVw/EtJafBvHS6fibHjBA4=
> -SIZE (OpenSceneGraph-3.4.0.zip) = 7975023
> +SHA256 (openscenegraph-3.4.1.tar.gz) =
> kw60bwV4GnaIPsFsX0nPspoFlCHbExAF11vsTXhAH9U=
> +SIZE (openscenegraph-3.4.1.tar.gz) = 5686385
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/graphics/openscenegraph/patches/patch-CMakeLists_txt,v
> retrieving revision 1.6
> diff -u -r1.6 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 29 Jun 2017 09:35:45 -0000 1.6
> +++ patches/patch-CMakeLists_txt 4 Nov 2017 11:31:18 -0000
> @@ -2,7 +2,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -658,13 +658,15 @@ ELSE()
> +@@ -654,13 +654,15 @@ ELSE()
> FIND_PACKAGE(COLLADA)
> FIND_PACKAGE(FBX)
> FIND_PACKAGE(ZLIB)
> @@ -20,7 +20,7 @@
> FIND_PACKAGE(OurDCMTK)
> FIND_PACKAGE(FFmpeg)
> FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
> -@@ -848,12 +850,6 @@ IF(CYGWIN)
> +@@ -844,12 +846,6 @@ IF(CYGWIN)
> SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
> ENDIF()
>
> Index: patches/patch-applications_present3D_Cluster_cpp
> ===================================================================
> RCS file:
> /cvs/ports/graphics/openscenegraph/patches/patch-applications_present3D_Cluster_cpp,v
> retrieving revision 1.3
> diff -u -r1.3 patch-applications_present3D_Cluster_cpp
> --- patches/patch-applications_present3D_Cluster_cpp 22 Sep 2015 18:49:15
> -0000 1.3
> +++ patches/patch-applications_present3D_Cluster_cpp 4 Nov 2017 11:31:18
> -0000
> @@ -1,21 +1,22 @@
> $OpenBSD: patch-applications_present3D_Cluster_cpp,v 1.3 2015/09/22 18:49:15
> pascal Exp $
> ---- applications/present3D/Cluster.cpp.orig Mon Apr 13 12:43:56 2015
> -+++ applications/present3D/Cluster.cpp Thu Sep 10 20:46:22 2015
> +Index: applications/present3D/Cluster.cpp
> +--- applications/present3D/Cluster.cpp.orig
> ++++ applications/present3D/Cluster.cpp
> @@ -33,7 +33,7 @@
> #if defined(__linux)
> #include <unistd.h>
> #include <linux/sockios.h>
> --#elif defined(__FreeBSD__) || defined(__DragonFly__)
> -+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
> +-#elif defined(__FreeBSD__) || defined(__DragonFly__) ||
> defined(__FreeBSD_kernel__)
> ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ||
> defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
> #include <unistd.h>
> #include <sys/sockio.h>
> #elif defined(__sgi)
> -@@ -338,7 +338,7 @@ void Receiver::sync( void )
> +@@ -340,7 +340,7 @@ void Receiver::sync( void )
> }
>
> #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
> -- defined(__DragonFly__)
> -+ defined(__DragonFly__) || defined(__OpenBSD__)
> +- defined(__DragonFly__) || defined(__FreeBSD_kernel__) ||
> defined(__GNU__)
> ++ defined(__DragonFly__) || defined(__FreeBSD_kernel__) ||
> defined(__GNU__) || defined(__OpenBSD__)
> socklen_t
> #else
> int
> Index: patches/patch-src_osgPlugins_CMakeLists_txt
> ===================================================================
> RCS file:
> /cvs/ports/graphics/openscenegraph/patches/patch-src_osgPlugins_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_osgPlugins_CMakeLists_txt
> --- patches/patch-src_osgPlugins_CMakeLists_txt 22 Sep 2015 18:49:15
> -0000 1.2
> +++ patches/patch-src_osgPlugins_CMakeLists_txt 4 Nov 2017 11:31:18
> -0000
> @@ -1,18 +1,8 @@
> $OpenBSD: patch-src_osgPlugins_CMakeLists_txt,v 1.2 2015/09/22 18:49:15
> pascal Exp $
> ---- src/osgPlugins/CMakeLists.txt.orig Tue Aug 11 10:44:46 2015
> -+++ src/osgPlugins/CMakeLists.txt Fri Sep 11 14:35:33 2015
> -@@ -97,10 +97,6 @@ ENDIF()
> - IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
> - ADD_SUBDIRECTORY(tiff)
> - ENDIF()
> --IF(GDAL_FOUND)
> -- ADD_SUBDIRECTORY(gdal)
> -- ADD_SUBDIRECTORY(ogr)
> --ENDIF()
> - IF(GTA_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
> - ADD_SUBDIRECTORY(gta)
> - ENDIF()
> -@@ -203,10 +199,6 @@ IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
> +Index: src/osgPlugins/CMakeLists.txt
> +--- src/osgPlugins/CMakeLists.txt.orig
> ++++ src/osgPlugins/CMakeLists.txt
> +@@ -203,10 +203,6 @@ IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
> ADD_SUBDIRECTORY(ffmpeg)
> ENDIF()
>
> @@ -23,7 +13,7 @@
> IF(DIRECTSHOW_FOUND)
> ADD_SUBDIRECTORY(directshow)
> ENDIF()
> -@@ -275,11 +267,6 @@ ENDIF()
> +@@ -275,11 +271,6 @@ ENDIF()
> #
> # ScriptEngines
> #
> Index: pkg/PFRAG.qt5
> ===================================================================
> RCS file: pkg/PFRAG.qt5
> diff -N pkg/PFRAG.qt5
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PFRAG.qt5 4 Nov 2017 11:31:18 -0000
> @@ -0,0 +1,2 @@
> +@comment $OpenBSD$
> +@lib lib/libosgQt5.so.${LIBosgQt5_VERSION}
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/openscenegraph/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- pkg/PLIST 22 Sep 2015 18:49:15 -0000 1.2
> +++ pkg/PLIST 4 Nov 2017 11:31:18 -0000
> @@ -179,6 +179,7 @@
> include/osg/Transform
> include/osg/TriangleFunctor
> include/osg/TriangleIndexFunctor
> +include/osg/TriangleLinePointIndexFunctor
> include/osg/Types
> include/osg/Uniform
> include/osg/UserDataContainer
> @@ -590,6 +591,13 @@
> include/osgViewer/api/X11/GraphicsHandleX11
> include/osgViewer/api/X11/GraphicsWindowX11
> include/osgViewer/api/X11/PixelBufferX11
> +include/osgViewer/config/
> +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/
> include/osgVolume/Export
> include/osgVolume/FixedFunctionTechnique
> @@ -629,6 +637,7 @@
> include/osgWidget/Widget
> include/osgWidget/Window
> include/osgWidget/WindowManager
> +%%qt5%%
> @lib lib/libOpenThreads.so.${LIBOpenThreads_VERSION}
> @lib lib/libosg.so.${LIBosg_VERSION}
> @lib lib/libosgAnimation.so.${LIBosgAnimation_VERSION}
> @@ -675,6 +684,7 @@
> lib/osgPlugins-${V}/osgdb_exr.so
> lib/osgPlugins-${V}/osgdb_ffmpeg.so
> lib/osgPlugins-${V}/osgdb_freetype.so
> +lib/osgPlugins-${V}/osgdb_gdal.so
> lib/osgPlugins-${V}/osgdb_gif.so
> lib/osgPlugins-${V}/osgdb_gles.so
> lib/osgPlugins-${V}/osgdb_glsl.so
> @@ -691,6 +701,7 @@
> lib/osgPlugins-${V}/osgdb_mdl.so
> lib/osgPlugins-${V}/osgdb_normals.so
> lib/osgPlugins-${V}/osgdb_obj.so
> +lib/osgPlugins-${V}/osgdb_ogr.so
> lib/osgPlugins-${V}/osgdb_openflight.so
> lib/osgPlugins-${V}/osgdb_osc.so
> lib/osgPlugins-${V}/osgdb_osg.so
> @@ -708,7 +719,6 @@
> lib/osgPlugins-${V}/osgdb_pnm.so
> lib/osgPlugins-${V}/osgdb_pov.so
> lib/osgPlugins-${V}/osgdb_pvr.so
> -lib/osgPlugins-${V}/osgdb_qfont.so
> lib/osgPlugins-${V}/osgdb_revisions.so
> lib/osgPlugins-${V}/osgdb_rgb.so
> lib/osgPlugins-${V}/osgdb_rot.so
>
