openmw: Update to 0.43.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openmw: Update to 0.43.0
From: Nia Alarie <nia.alarie%gmail.com@localhost>
Date: Tue, 13 Feb 2018 18:31:32 +0000
Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Tue Feb 13 18:31:32 2018 +0000
Changeset:	eb92aebdfb467d9d1a9c3bd1540975e8827ae9cc

Modified Files:
	openmw/Makefile
	openmw/PLIST
	openmw/distinfo
	openmw/patches/patch-apps_openmw_crashcatcher.cpp
	openmw/patches/patch-components_files_fixedpath.hpp
	openmw/patches/patch-components_files_linuxpath.cpp
	openmw/patches/patch-components_files_linuxpath.hpp
Added Files:
	openmw/options.mk

Log Message:
openmw: Update to 0.43.0

Add options for qt5/qt4/none because I can't build Qt5 on Linux any more D:

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

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

diffstat:
 openmw/Makefile                                    |  6 ++----
 openmw/PLIST                                       | 13 ++++++------
 openmw/distinfo                                    | 16 +++++++--------
 openmw/options.mk                                  | 24 ++++++++++++++++++++++
 openmw/patches/patch-apps_openmw_crashcatcher.cpp  |  2 +-
 .../patches/patch-components_files_fixedpath.hpp   |  2 +-
 .../patches/patch-components_files_linuxpath.cpp   |  6 +++---
 .../patches/patch-components_files_linuxpath.hpp   |  2 +-
 8 files changed, 47 insertions(+), 24 deletions(-)

diffs:
diff --git a/openmw/Makefile b/openmw/Makefile
index d1828ecaef..69d6e78801 100644
--- a/openmw/Makefile
+++ b/openmw/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	openmw-0.42.0
+DISTNAME=	openmw-0.43.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenMW/}
 
@@ -17,8 +17,7 @@ USE_TOOLS+=	pkg-config
 DEPENDS+=	bullet>=2.83:../../wip/bullet
 DEPENDS+=	osg>=3.3.4:../../wip/osg
 
-CMAKE_ARGS+=	-DDESIRED_QT_VERSION=5
-
+.include "options.mk"
 .include "../../archivers/unshield/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
@@ -27,7 +26,6 @@ CMAKE_ARGS+=	-DDESIRED_QT_VERSION=5
 .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/qt5-qtbase/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openmw/PLIST b/openmw/PLIST
index ac4fdae330..bc332353cd 100644
--- a/openmw/PLIST
+++ b/openmw/PLIST
@@ -2,17 +2,17 @@
 bin/bsatool
 bin/esmtool
 bin/openmw
-bin/openmw-cs
+${PLIST.gui}bin/openmw-cs
 bin/openmw-essimporter
 bin/openmw-iniimporter
-bin/openmw-launcher
-bin/openmw-wizard
+${PLIST.gui}bin/openmw-launcher
+${PLIST.gui}bin/openmw-wizard
 etc/openmw/gamecontrollerdb.txt
-etc/openmw/openmw-cs.cfg
+${PLIST.gui}etc/openmw/openmw-cs.cfg
 etc/openmw/openmw.cfg
 etc/openmw/settings-default.cfg
 etc/openmw/version
-share/applications/openmw-cs.desktop
+${PLIST.gui}share/applications/openmw-cs.desktop
 share/applications/openmw.desktop
 share/games/openmw/resources/defaultfilters
 share/games/openmw/resources/mygui/DejaVuLGCSansMono.ttf
@@ -55,6 +55,7 @@ share/games/openmw/resources/mygui/openmw_hud_box.skin.xml
 share/games/openmw/resources/mygui/openmw_hud_energybar.skin.xml
 share/games/openmw/resources/mygui/openmw_infobox.layout
 share/games/openmw/resources/mygui/openmw_interactive_messagebox.layout
+share/games/openmw/resources/mygui/openmw_interactive_messagebox_notransp.layout
 share/games/openmw/resources/mygui/openmw_inventory_window.layout
 share/games/openmw/resources/mygui/openmw_itemselection_dialog.layout
 share/games/openmw/resources/mygui/openmw_jail_screen.layout
@@ -112,6 +113,6 @@ share/games/openmw/resources/shaders/water_vertex.glsl
 share/games/openmw/resources/version
 share/licenses/openmw/DejaVu Font License.txt
 share/metainfo/openmw.appdata.xml
-share/pixmaps/openmw-cs.png
+${PLIST.gui}share/pixmaps/openmw-cs.png
 share/pixmaps/openmw.png
 @pkgdir share/games/openmw/data
diff --git a/openmw/distinfo b/openmw/distinfo
index 391f7a6973..b3118aac34 100644
--- a/openmw/distinfo
+++ b/openmw/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (openmw-0.42.0.tar.gz) = c06c28ffa10df14140756cd59c02e7e86be8b872
-RMD160 (openmw-0.42.0.tar.gz) = c30f8df06c2d4316b39c9b50f084f73b0c5e9f6a
-SHA512 (openmw-0.42.0.tar.gz) = f638e804e03e965db8e19cb37b3be67804202c1e43b0abf2730e0be104093edc31fc3656f90c570980b66ece4f5c889b44f0f59789e865327d221714a9ed65f3
-Size (openmw-0.42.0.tar.gz) = 4956838 bytes
-SHA1 (patch-apps_openmw_crashcatcher.cpp) = cacf31ba2a7dbccb73f791312221d67a9abaca9e
-SHA1 (patch-components_files_fixedpath.hpp) = ff3e27a7f22094a790471df55baba9ef485f74ac
-SHA1 (patch-components_files_linuxpath.cpp) = 71a2980bc82c9f962d317dde4c8db03e3fe08e61
-SHA1 (patch-components_files_linuxpath.hpp) = 0e867fdb5e73a546583ffc1738cb1110f3a34cfb
+SHA1 (openmw-0.43.0.tar.gz) = 7b25120b311b79ff3bb098f852754bc50aa97d6d
+RMD160 (openmw-0.43.0.tar.gz) = 21cc4bed8394f7160a758974eb977ad66006ac48
+SHA512 (openmw-0.43.0.tar.gz) = e902dd2274c05838bb1171f07d7a673fc7b85d1290a9e01c8ab89f1c279bd236332ecdc0f2b7944ec7209a0e6022ff472639b5724bf26904e3a2d338c7be401a
+Size (openmw-0.43.0.tar.gz) = 5023421 bytes
+SHA1 (patch-apps_openmw_crashcatcher.cpp) = e8088a07f31f4b2bedddf470dc2b5a7602a2badb
+SHA1 (patch-components_files_fixedpath.hpp) = c4047ee90e1771228ce5179d8a082345a0310e03
+SHA1 (patch-components_files_linuxpath.cpp) = 6e88791100706a0cb020874ac975832e70dffdcb
+SHA1 (patch-components_files_linuxpath.hpp) = 0627dc0a15e62b2e3c7314d19d1bb2b099af576e
diff --git a/openmw/options.mk b/openmw/options.mk
new file mode 100644
index 0000000000..419a57841b
--- /dev/null
+++ b/openmw/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.openmw
+PKG_OPTIONS_GROUP.qt=		qt4 qt5
+PKG_OPTIONS_OPTIONAL_GROUPS=	qt
+PKG_SUGGESTED_OPTIONS=		qt5
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	gui
+
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.gui=	yes
+CMAKE_ARGS+=	-DDESIRED_QT_VERSION=5
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mqt4)
+PLIST.gui=	yes
+CMAKE_ARGS+=	-DDESIRED_QT_VERSION=4
+.include "../../x11/qt4-libs/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DBUILD_LAUNCHER=0
+CMAKE_ARGS+=	-DBUILD_OPENCS=0
+CMAKE_ARGS+=	-DBUILD_WIZARD=0
+.endif
diff --git a/openmw/patches/patch-apps_openmw_crashcatcher.cpp b/openmw/patches/patch-apps_openmw_crashcatcher.cpp
index 7ce62a6228..1c9fc4db05 100644
--- a/openmw/patches/patch-apps_openmw_crashcatcher.cpp
+++ b/openmw/patches/patch-apps_openmw_crashcatcher.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Support NetBSD.
 
---- apps/openmw/crashcatcher.cpp.orig	2016-12-19 14:28:49.000000000 +0000
+--- apps/openmw/crashcatcher.cpp.orig	2017-11-15 17:20:40.000000000 +0000
 +++ apps/openmw/crashcatcher.cpp
 @@ -24,7 +24,7 @@
  #ifndef PR_SET_PTRACER
diff --git a/openmw/patches/patch-components_files_fixedpath.hpp b/openmw/patches/patch-components_files_fixedpath.hpp
index a79f0edf5a..a3cb60d291 100644
--- a/openmw/patches/patch-components_files_fixedpath.hpp
+++ b/openmw/patches/patch-components_files_fixedpath.hpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Support NetBSD.
 
---- components/files/fixedpath.hpp.orig	2016-12-19 14:28:49.000000000 +0000
+--- components/files/fixedpath.hpp.orig	2017-11-15 17:20:40.000000000 +0000
 +++ components/files/fixedpath.hpp
 @@ -4,7 +4,7 @@
  #include <string>
diff --git a/openmw/patches/patch-components_files_linuxpath.cpp b/openmw/patches/patch-components_files_linuxpath.cpp
index fc903f9f7d..41daa38b20 100644
--- a/openmw/patches/patch-components_files_linuxpath.cpp
+++ b/openmw/patches/patch-components_files_linuxpath.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Support NetBSD.
 
---- components/files/linuxpath.cpp.orig	2016-12-19 14:28:49.000000000 +0000
+--- components/files/linuxpath.cpp.orig	2017-11-15 17:20:40.000000000 +0000
 +++ components/files/linuxpath.cpp
 @@ -1,6 +1,6 @@
  #include "linuxpath.hpp"
@@ -10,5 +10,5 @@ Support NetBSD.
 -#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 +#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)
  
- #include <cstdlib>
- #include <cstring>
+ #include <pwd.h>
+ #include <unistd.h>
diff --git a/openmw/patches/patch-components_files_linuxpath.hpp b/openmw/patches/patch-components_files_linuxpath.hpp
index 719197481e..f44078872f 100644
--- a/openmw/patches/patch-components_files_linuxpath.hpp
+++ b/openmw/patches/patch-components_files_linuxpath.hpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Support NetBSD.
 
---- components/files/linuxpath.hpp.orig	2016-12-19 14:28:49.000000000 +0000
+--- components/files/linuxpath.hpp.orig	2017-11-15 17:20:40.000000000 +0000
 +++ components/files/linuxpath.hpp
 @@ -1,7 +1,7 @@
  #ifndef COMPONENTS_FILES_LINUXPATH_H
Prev by Date: mygui-git: Update to 20171012
Next by Date: osg: Update to 3.4.1. Disabling some dependencies to match freebsd's defaults.
Previous by Thread: mygui-git: Update to 20171012
Next by Thread: osg: Update to 3.4.1. Disabling some dependencies to match freebsd's defaults.
Indexes:
Home | Main Index | Thread Index | Old Index