On Mon, 6 Nov 2017 12:45:05 +0100, Landry Breuil wrote:
> On Sat, Nov 04, 2017 at 06:58:25PM +0100, Pascal Stumpf wrote:
> > 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.
>
> Have you managed to do this testing ? In that case we'd be able to just
> move OSG to qt5, which might be much simpler for osgearth/qgis3 :)
>
> Landry
This just works(tm) for me, though I haven't yet tested anything other
than OpenMW.
Index: graphics/openscenegraph/Makefile
===================================================================
RCS file: /cvs/ports/graphics/openscenegraph/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- graphics/openscenegraph/Makefile 26 Jul 2017 22:45:24 -0000 1.12
+++ graphics/openscenegraph/Makefile 7 Nov 2017 08:51:15 -0000
@@ -4,10 +4,11 @@ PORTROACH = limitw:1,even
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 = OpenSceneGraph-$V
+DISTNAME = openscenegraph-${V}
SUBST_VARS += V
@@ -40,26 +41,25 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# OSGPL (see LICENSE.txt)
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL Half Iex IlmImf IlmThread QtGui QtOpenGL SDL X11
-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
+WANTLIB += ${COMPILER_LIBCXX} GL Half Iex IlmImf IlmThread Qt5Core
+WANTLIB += Qt5Gui Qt5OpenGL Qt5Widgets SDL X11 Xrandr avcodec
+WANTLIB += avdevice avformat avresample avutil c cairo curl freetype
+WANTLIB += gdal gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 intl
+WANTLIB += jasper jpeg m png poppler-glib rsvg-2 swresample swscale
+WANTLIB += tiff z
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 \
+CONFIGURE_ARGS = -DDESIRED_QT_VERSION=5 \
-DOSG_USE_AGGRESSIVE_WARNINGS=OFF
NO_TEST = Yes
Index: graphics/openscenegraph/distinfo
===================================================================
RCS file: /cvs/ports/graphics/openscenegraph/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- graphics/openscenegraph/distinfo 22 Sep 2015 18:49:15 -0000 1.3
+++ graphics/openscenegraph/distinfo 7 Nov 2017 08:51:15 -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: graphics/openscenegraph/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/openscenegraph/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- graphics/openscenegraph/patches/patch-CMakeLists_txt 29 Jun 2017
09:35:45 -0000 1.6
+++ graphics/openscenegraph/patches/patch-CMakeLists_txt 7 Nov 2017
08:51:15 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 201
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 @@ Index: CMakeLists.txt
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: graphics/openscenegraph/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 -p -r1.3 patch-applications_present3D_Cluster_cpp
--- graphics/openscenegraph/patches/patch-applications_present3D_Cluster_cpp
22 Sep 2015 18:49:15 -0000 1.3
+++ graphics/openscenegraph/patches/patch-applications_present3D_Cluster_cpp
7 Nov 2017 08:51:15 -0000
@@ -1,21 +1,23 @@
$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,8 @@ 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: graphics/openscenegraph/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 -p -r1.2 patch-src_osgPlugins_CMakeLists_txt
--- graphics/openscenegraph/patches/patch-src_osgPlugins_CMakeLists_txt 22 Sep
2015 18:49:15 -0000 1.2
+++ graphics/openscenegraph/patches/patch-src_osgPlugins_CMakeLists_txt 7 Nov
2017 08:51:15 -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 @@ $OpenBSD: patch-src_osgPlugins_CMakeList
IF(DIRECTSHOW_FOUND)
ADD_SUBDIRECTORY(directshow)
ENDIF()
-@@ -275,11 +267,6 @@ ENDIF()
+@@ -275,11 +271,6 @@ ENDIF()
#
# ScriptEngines
#
Index: graphics/openscenegraph/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/openscenegraph/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- graphics/openscenegraph/pkg/PLIST 22 Sep 2015 18:49:15 -0000 1.2
+++ graphics/openscenegraph/pkg/PLIST 7 Nov 2017 08:51:15 -0000
@@ -179,6 +179,7 @@ include/osg/TransferFunction
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/
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
@@ -675,6 +683,7 @@ lib/osgPlugins-${V}/osgdb_dxf.so
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 +700,7 @@ lib/osgPlugins-${V}/osgdb_md2.so
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 +718,6 @@ lib/osgPlugins-${V}/osgdb_png.so
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
Index: games/openmw/Makefile
===================================================================
RCS file: /cvs/ports/games/openmw/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- games/openmw/Makefile 6 Aug 2017 09:39:56 -0000 1.11
+++ games/openmw/Makefile 7 Nov 2017 08:51:15 -0000
@@ -6,6 +6,7 @@ COMMENT = open source implementation of
V = 0.42.0
DISTNAME = openmw-$V
+REVISION = 0
CATEGORIES = games
@@ -16,18 +17,18 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# GPLv3 / custom BSD-like font license / DejaVu license
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += BulletCollision GL LinearMath MyGUIEngine OpenThreads
-WANTLIB += QtGui QtNetwork QtOpenGL SDL2 avcodec avformat avutil
-WANTLIB += boost_filesystem-mt boost_program_options-mt boost_system-mt
-WANTLIB += c m openal osg osgAnimation
-WANTLIB += osgDB osgFX osgGA osgParticle osgText osgUtil
-WANTLIB += osgViewer pthread swresample swscale unshield ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} BulletCollision GL LinearMath MyGUIEngine
+WANTLIB += OpenThreads Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5Widgets
+WANTLIB += SDL2 avcodec avformat avutil boost_filesystem-mt
boost_program_options-mt
+WANTLIB += boost_system-mt c m openal osg osgAnimation osgDB osgFX
+WANTLIB += osgGA osgParticle osgText osgUtil osgViewer swresample
+WANTLIB += swscale unshield
GH_ACCOUNT = OpenMW
GH_PROJECT = openmw
GH_TAGNAME = openmw-$V
-MODULES = devel/cmake x11/qt4
+MODULES = devel/cmake x11/qt5
COMPILER = gcc
BUILD_DEPENDS = sysutils/e2fsprogs
LIB_DEPENDS = audio/openal \
@@ -45,7 +46,9 @@ CONFIGURE_ARGS += -DBINDIR=${LOCALBASE}
-DGLOBAL_CONFIG_PATH="${SYSCONFDIR}" \
-DCMAKE_EXE_LINKER_FLAGS="-L${X11BASE}/lib" \
-DMORROWIND_DATA_FILES="${LOCALBASE}/share/openmw/data"\
-
-DOPENMW_RESOURCE_FILES="${LOCALBASE}/share/openmw/resources"
+
-DOPENMW_RESOURCE_FILES="${LOCALBASE}/share/openmw/resources" \
+ -DDESIRED_QT_VERSION=5 \
+ -DCMAKE_PREFIX_PATH="${LOCALBASE}/lib/qt5/cmake"
NO_TEST = Yes
