make openmw use qt5, fixes for osg/openmw on linux

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: make openmw use qt5, fixes for osg/openmw on linux
From: Nia Alarie <nia.alarie%gmail.com@localhost>
Date: Sun, 30 Jul 2017 22:15:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sun Jul 30 23:15:55 2017 +0100
Changeset:	faa1b3239fbf9f6ab1754e868639602a15d97d87

Modified Files:
	openmw/Makefile
	osg/Makefile
	osg/PLIST
	osg/buildlink3.mk

Log Message:
make openmw use qt5, fixes for osg/openmw on linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=faa1b3239fbf9f6ab1754e868639602a15d97d87

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openmw/Makefile   |  9 +++++----
 osg/Makefile      |  4 +++-
 osg/PLIST         | 38 +++++++++++++++++++-------------------
 osg/buildlink3.mk |  2 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

diffs:
diff --git a/openmw/Makefile b/openmw/Makefile
index 1dfa6f083b..d21b009628 100644
--- a/openmw/Makefile
+++ b/openmw/Makefile
@@ -14,8 +14,10 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
-BUILDLINK_API_DEPENDS.bullet+=	bullet>=2.83
-BUILDLINK_API_DEPENDS.osg+=	osg>=3.3.4
+DEPENDS+=	bullet>=2.83:../../wip/bullet
+DEPENDS+=	osg>=3.3.4:../../wip/osg
+
+CMAKE_ARGS+=	-DDESIRED_QT_VERSION=5
 
 .include "../../archivers/unshield/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
@@ -25,8 +27,7 @@ BUILDLINK_API_DEPENDS.osg+=	osg>=3.3.4
 .include "../../wip/bullet/buildlink3.mk" # XXX requires version in wip
 .include "../../wip/mygui-git/buildlink3.mk" # XXX
 .include "../../wip/osg/buildlink3.mk" # XXX requires version in wip
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/osg/Makefile b/osg/Makefile
index dcc7b1a7ce..c814d2b89a 100644
--- a/osg/Makefile
+++ b/osg/Makefile
@@ -33,7 +33,6 @@ PLIST.x11=	yes
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
@@ -49,4 +48,7 @@ PLIST.x11=	yes
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/osg/PLIST b/osg/PLIST
index 5c2eba42f9..3e1af22b2c 100644
--- a/osg/PLIST
+++ b/osg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/08/19 13:35:22 joerg Exp $
+@comment $NetBSD$
 bin/osgarchive
 bin/osgconv
 bin/osgfilecache
@@ -608,56 +608,56 @@ lib/libOpenThreads.so
 lib/libOpenThreads.so.20
 lib/libOpenThreads.so.3.3.0
 lib/libosg.so
-lib/libosg.so.${PKGVERSION}
 lib/libosg.so.130
+lib/libosg.so.${PKGVERSION}
 lib/libosgAnimation.so
-lib/libosgAnimation.so.${PKGVERSION}
 lib/libosgAnimation.so.130
+lib/libosgAnimation.so.${PKGVERSION}
 lib/libosgDB.so
-lib/libosgDB.so.${PKGVERSION}
 lib/libosgDB.so.130
+lib/libosgDB.so.${PKGVERSION}
 lib/libosgFX.so
-lib/libosgFX.so.${PKGVERSION}
 lib/libosgFX.so.130
+lib/libosgFX.so.${PKGVERSION}
 lib/libosgGA.so
-lib/libosgGA.so.${PKGVERSION}
 lib/libosgGA.so.130
+lib/libosgGA.so.${PKGVERSION}
 lib/libosgManipulator.so
-lib/libosgManipulator.so.${PKGVERSION}
 lib/libosgManipulator.so.130
+lib/libosgManipulator.so.${PKGVERSION}
 lib/libosgParticle.so
-lib/libosgParticle.so.${PKGVERSION}
 lib/libosgParticle.so.130
+lib/libosgParticle.so.${PKGVERSION}
 lib/libosgPresentation.so
-lib/libosgPresentation.so.${PKGVERSION}
 lib/libosgPresentation.so.130
+lib/libosgPresentation.so.${PKGVERSION}
 lib/libosgShadow.so
-lib/libosgShadow.so.${PKGVERSION}
 lib/libosgShadow.so.130
+lib/libosgShadow.so.${PKGVERSION}
 lib/libosgSim.so
-lib/libosgSim.so.${PKGVERSION}
 lib/libosgSim.so.130
+lib/libosgSim.so.${PKGVERSION}
 lib/libosgTerrain.so
-lib/libosgTerrain.so.${PKGVERSION}
 lib/libosgTerrain.so.130
+lib/libosgTerrain.so.${PKGVERSION}
 lib/libosgText.so
-lib/libosgText.so.${PKGVERSION}
 lib/libosgText.so.130
+lib/libosgText.so.${PKGVERSION}
 lib/libosgUI.so
-lib/libosgUI.so.${PKGVERSION}
 lib/libosgUI.so.130
+lib/libosgUI.so.${PKGVERSION}
 lib/libosgUtil.so
-lib/libosgUtil.so.${PKGVERSION}
 lib/libosgUtil.so.130
+lib/libosgUtil.so.${PKGVERSION}
 lib/libosgViewer.so
-lib/libosgViewer.so.${PKGVERSION}
 lib/libosgViewer.so.130
+lib/libosgViewer.so.${PKGVERSION}
 lib/libosgVolume.so
-lib/libosgVolume.so.${PKGVERSION}
 lib/libosgVolume.so.130
+lib/libosgVolume.so.${PKGVERSION}
 lib/libosgWidget.so
-lib/libosgWidget.so.${PKGVERSION}
 lib/libosgWidget.so.130
+lib/libosgWidget.so.${PKGVERSION}
 lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
@@ -682,6 +682,7 @@ lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
 ${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
@@ -751,7 +752,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_txp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_x.so
-${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_xine.so
 lib/osgPlugins-${PKGVERSION}/osgdb_zip.so
 lib/pkgconfig/openscenegraph-osg.pc
 lib/pkgconfig/openscenegraph-osgAnimation.pc
diff --git a/osg/buildlink3.mk b/osg/buildlink3.mk
index e378ef51e5..df46bde92d 100644
--- a/osg/buildlink3.mk
+++ b/osg/buildlink3.mk
@@ -20,10 +20,10 @@ BUILDLINK_PKGSRCDIR.osg?=	../../wip/osg
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .endif	# OSG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-osg
Prev by Date: Add support for CFLAGS and LDFLAGS
Next by Date: gnucash-git: disable errors on warnings
Previous by Thread: Add support for CFLAGS and LDFLAGS
Next by Thread: gnucash-git: disable errors on warnings
Indexes:
Home | Main Index | Thread Index | Old Index