warzone2100: update to 3.2.3 ChangeLog: A lot a things since 2.3.2! See https://github.com/Warzone2100/warzone2100/blob/master/ChangeLogdiff -r1.23 -r1.24 pkgsrc/games/warzone2100/Makefile
(triaxx)
@@ -1,42 +1,48 @@ | @@ -1,42 +1,48 @@ | |||
1 | # $NetBSD: Makefile,v 1.23 2018/03/12 11:16:36 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.24 2018/12/14 17:27:01 triaxx Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= warzone2100-2.2.2 | 4 | DISTNAME= warzone2100-3.2.3 | |
5 | PKGREVISION= 10 | |||
6 | CATEGORIES= games | 5 | CATEGORIES= games | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/} | |
7 | EXTRACT_SUFX= .tar.xz | |||
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://wz2100.net/ | 10 | HOMEPAGE= http://wz2100.net/ | |
11 | COMMENT= Real-time strategy and real-time tactics hybrid computer game | 11 | COMMENT= Real-time strategy and real-time tactics hybrid computer game | |
12 | LICENSE= gnu-gpl-v2 | |||
12 | 13 | |||
13 | DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf | 14 | DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf | |
14 | 15 | |||
15 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
16 | USE_LANGUAGES= c c++ | 17 | USE_LANGUAGES= c c++ | |
17 | USE_TOOLS+= pkg-config bison msgfmt intltool gmake gawk flex unzip zip | 18 | USE_TOOLS+= pkg-config bison msgfmt intltool gmake gawk flex unzip zip | |
18 | FLEX_REQD= 2.5.35 | 19 | FLEX_REQD= 2.5.35 | |
19 | 20 | |||
21 | .include "../../games/warzone2100/options.mk" | |||
22 | ||||
20 | CONFIGURE_ARGS+= --with-distributor=pkgsrc | 23 | CONFIGURE_ARGS+= --with-distributor=pkgsrc | |
21 | 24 | |||
22 | LDFLAGS.DragonFly= -lX11 -lintl | 25 | LDFLAGS.DragonFly= -lX11 -lintl | |
23 | 26 | |||
24 | post-build: | 27 | post-build: | |
25 | cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo | 28 | cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo | |
26 | 29 | |||
27 | .include "../../audio/openal-soft/buildlink3.mk" | 30 | .include "../../audio/openal-soft/buildlink3.mk" | |
28 | .include "../../audio/libvorbis/buildlink3.mk" | 31 | .include "../../audio/libvorbis/buildlink3.mk" | |
32 | .include "../../converters/fribidi/buildlink3.mk" | |||
29 | .include "../../converters/libiconv/buildlink3.mk" | 33 | .include "../../converters/libiconv/buildlink3.mk" | |
30 | .include "../../devel/SDL/buildlink3.mk" | |||
31 | .include "../../devel/gettext-lib/buildlink3.mk" | 34 | .include "../../devel/gettext-lib/buildlink3.mk" | |
32 | .include "../../devel/physfs/buildlink3.mk" | 35 | .include "../../devel/physfs/buildlink3.mk" | |
33 | .include "../../devel/popt/buildlink3.mk" | 36 | .include "../../devel/popt/buildlink3.mk" | |
34 | .include "../../fonts/fontconfig/buildlink3.mk" | 37 | .include "../../fonts/fontconfig/buildlink3.mk" | |
38 | .include "../../fonts/harfbuzz/buildlink3.mk" | |||
35 | .include "../../graphics/freetype2/buildlink3.mk" | 39 | .include "../../graphics/freetype2/buildlink3.mk" | |
40 | .include "../../graphics/glew/buildlink3.mk" | |||
36 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 41 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
37 | .include "../../graphics/png/buildlink3.mk" | 42 | .include "../../graphics/png/buildlink3.mk" | |
38 | .include "../../graphics/quesoglc/buildlink3.mk" | 43 | .include "../../graphics/quesoglc/buildlink3.mk" | |
39 | .include "../../multimedia/libtheora/buildlink3.mk" | 44 | .include "../../multimedia/libtheora/buildlink3.mk" | |
40 | .include "../../net/SDL_net/buildlink3.mk" | |||
41 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 45 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
46 | .include "../../x11/qt5-qtbase/buildlink3.mk" | |||
47 | .include "../../x11/qt5-qtscript/buildlink3.mk" | |||
42 | .include "../../mk/bsd.pkg.mk" | 48 | .include "../../mk/bsd.pkg.mk" |
@@ -1,47 +1,99 @@ | @@ -1,47 +1,99 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2009/08/16 21:21:51 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2018/12/14 17:27:01 triaxx Exp $ | |
2 | bin/warzone2100 | 2 | bin/warzone2100 | |
3 | man/man6/warzone2100.6 | |||
3 | share/applications/warzone2100.desktop | 4 | share/applications/warzone2100.desktop | |
4 | share/doc/warzone2100/AUTHORS | 5 | share/doc/warzone2100/AUTHORS | |
5 | share/doc/warzone2100/COPYING | 6 | share/doc/warzone2100/COPYING | |
6 | share/doc/warzone2100/COPYING.NONGPL | 7 | share/doc/warzone2100/COPYING.NONGPL | |
7 | share/doc/warzone2100/COPYING.README | 8 | share/doc/warzone2100/COPYING.README | |
8 | share/doc/warzone2100/ChangeLog | 9 | share/doc/warzone2100/ChangeLog | |
9 | share/doc/warzone2100/Readme.de | 10 | share/doc/warzone2100/README.md | |
10 | share/doc/warzone2100/Readme.de.xhtml | |||
11 | share/doc/warzone2100/Readme.en | |||
12 | share/doc/warzone2100/Readme.en.xhtml | |||
13 | share/doc/warzone2100/ScriptingManual.htm | 11 | share/doc/warzone2100/ScriptingManual.htm | |
14 | share/doc/warzone2100/styles/readme.print.css | 12 | share/doc/warzone2100/docbook-xsl.css | |
15 | share/doc/warzone2100/styles/readme.screen.css | 13 | share/doc/warzone2100/images/artillery-far-away.jpg | |
16 | share/doc/warzone2100/styles/scriptingmanual.css | 14 | share/doc/warzone2100/images/artillery-sensor.jpg | |
15 | share/doc/warzone2100/images/attackrange.jpg | |||
16 | share/doc/warzone2100/images/awaymission.jpg | |||
17 | share/doc/warzone2100/images/building-select.jpg | |||
18 | share/doc/warzone2100/images/building.jpg | |||
19 | share/doc/warzone2100/images/cb-sensor-vtol.png | |||
20 | share/doc/warzone2100/images/cb-sensor.png | |||
21 | share/doc/warzone2100/images/cheapweapon.png | |||
22 | share/doc/warzone2100/images/commander-factory-assignment.jpg | |||
23 | share/doc/warzone2100/images/commander-panel.jpg | |||
24 | share/doc/warzone2100/images/commander.png | |||
25 | share/doc/warzone2100/images/commandpanel.png | |||
26 | share/doc/warzone2100/images/design-bars.jpg | |||
27 | share/doc/warzone2100/images/design-more.png | |||
28 | share/doc/warzone2100/images/design-screen.jpg | |||
29 | share/doc/warzone2100/images/design-unit.jpg | |||
30 | share/doc/warzone2100/images/design.jpg | |||
31 | share/doc/warzone2100/images/expensiveweapon.png | |||
32 | share/doc/warzone2100/images/firing.jpg | |||
33 | share/doc/warzone2100/images/hq.png | |||
34 | share/doc/warzone2100/images/indirect-fire-support.jpg | |||
35 | share/doc/warzone2100/images/intelligencedisplay.jpg | |||
36 | share/doc/warzone2100/images/interface.jpg | |||
37 | share/doc/warzone2100/images/logo.png | |||
38 | share/doc/warzone2100/images/manufacture-select.jpg | |||
39 | share/doc/warzone2100/images/manufacture.jpg | |||
40 | share/doc/warzone2100/images/minimap.jpg | |||
41 | share/doc/warzone2100/images/movement.jpg | |||
42 | share/doc/warzone2100/images/oilresource.jpg | |||
43 | share/doc/warzone2100/images/powerbar.jpg | |||
44 | share/doc/warzone2100/images/powerupgrade.png | |||
45 | share/doc/warzone2100/images/rallypoints.jpg | |||
46 | share/doc/warzone2100/images/recycling.jpg | |||
47 | share/doc/warzone2100/images/research-select.jpg | |||
48 | share/doc/warzone2100/images/research.jpg | |||
49 | share/doc/warzone2100/images/retreatthreshold.jpg | |||
50 | share/doc/warzone2100/images/return.jpg | |||
51 | share/doc/warzone2100/images/satellite-uplink.png | |||
52 | share/doc/warzone2100/images/sensor-tower.png | |||
53 | share/doc/warzone2100/images/sensor.png | |||
54 | share/doc/warzone2100/images/transport.jpg | |||
55 | share/doc/warzone2100/images/unitordersmenu.jpg | |||
56 | share/doc/warzone2100/images/wss.png | |||
57 | share/doc/warzone2100/images/www.png | |||
58 | share/doc/warzone2100/quickstartguide.html | |||
17 | share/icons/warzone2100.png | 59 | share/icons/warzone2100.png | |
60 | share/locale/ca_ES/LC_MESSAGES/warzone2100.mo | |||
18 | share/locale/cs/LC_MESSAGES/warzone2100.mo | 61 | share/locale/cs/LC_MESSAGES/warzone2100.mo | |
19 | share/locale/da/LC_MESSAGES/warzone2100.mo | 62 | share/locale/da/LC_MESSAGES/warzone2100.mo | |
20 | share/locale/de/LC_MESSAGES/warzone2100.mo | 63 | share/locale/de/LC_MESSAGES/warzone2100.mo | |
64 | share/locale/el/LC_MESSAGES/warzone2100.mo | |||
21 | share/locale/en_GB/LC_MESSAGES/warzone2100.mo | 65 | share/locale/en_GB/LC_MESSAGES/warzone2100.mo | |
66 | share/locale/eo/LC_MESSAGES/warzone2100.mo | |||
22 | share/locale/es/LC_MESSAGES/warzone2100.mo | 67 | share/locale/es/LC_MESSAGES/warzone2100.mo | |
68 | share/locale/et_EE/LC_MESSAGES/warzone2100.mo | |||
23 | share/locale/fi/LC_MESSAGES/warzone2100.mo | 69 | share/locale/fi/LC_MESSAGES/warzone2100.mo | |
24 | share/locale/fr/LC_MESSAGES/warzone2100.mo | 70 | share/locale/fr/LC_MESSAGES/warzone2100.mo | |
25 | share/locale/fy/LC_MESSAGES/warzone2100.mo | 71 | share/locale/fy/LC_MESSAGES/warzone2100.mo | |
26 | share/locale/ga/LC_MESSAGES/warzone2100.mo | 72 | share/locale/ga/LC_MESSAGES/warzone2100.mo | |
73 | share/locale/hr/LC_MESSAGES/warzone2100.mo | |||
74 | share/locale/hu/LC_MESSAGES/warzone2100.mo | |||
27 | share/locale/it/LC_MESSAGES/warzone2100.mo | 75 | share/locale/it/LC_MESSAGES/warzone2100.mo | |
76 | share/locale/ko/LC_MESSAGES/warzone2100.mo | |||
28 | share/locale/la/LC_MESSAGES/warzone2100.mo | 77 | share/locale/la/LC_MESSAGES/warzone2100.mo | |
29 | share/locale/lt/LC_MESSAGES/warzone2100.mo | 78 | share/locale/lt/LC_MESSAGES/warzone2100.mo | |
30 | share/locale/nb/LC_MESSAGES/warzone2100.mo | 79 | share/locale/nb/LC_MESSAGES/warzone2100.mo | |
31 | share/locale/nl/LC_MESSAGES/warzone2100.mo | 80 | share/locale/nl/LC_MESSAGES/warzone2100.mo | |
32 | share/locale/pl/LC_MESSAGES/warzone2100.mo | 81 | share/locale/pl/LC_MESSAGES/warzone2100.mo | |
33 | share/locale/pt/LC_MESSAGES/warzone2100.mo | 82 | share/locale/pt/LC_MESSAGES/warzone2100.mo | |
34 | share/locale/pt_BR/LC_MESSAGES/warzone2100.mo | 83 | share/locale/pt_BR/LC_MESSAGES/warzone2100.mo | |
35 | share/locale/ro/LC_MESSAGES/warzone2100.mo | 84 | share/locale/ro/LC_MESSAGES/warzone2100.mo | |
36 | share/locale/ru/LC_MESSAGES/warzone2100.mo | 85 | share/locale/ru/LC_MESSAGES/warzone2100.mo | |
86 | share/locale/sk/LC_MESSAGES/warzone2100.mo | |||
37 | share/locale/sl/LC_MESSAGES/warzone2100.mo | 87 | share/locale/sl/LC_MESSAGES/warzone2100.mo | |
88 | share/locale/tr/LC_MESSAGES/warzone2100.mo | |||
89 | share/locale/uk_UA/LC_MESSAGES/warzone2100.mo | |||
38 | share/locale/zh_CN/LC_MESSAGES/warzone2100.mo | 90 | share/locale/zh_CN/LC_MESSAGES/warzone2100.mo | |
39 | share/locale/zh_TW/LC_MESSAGES/warzone2100.mo | 91 | share/locale/zh_TW/LC_MESSAGES/warzone2100.mo | |
92 | share/metainfo/warzone2100.appdata.xml | |||
40 | share/warzone2100/base.wz | 93 | share/warzone2100/base.wz | |
41 | share/warzone2100/mods/multiplay/aivolution.wz | |||
42 | share/warzone2100/mods/multiplay/ntw.wz | |||
43 | share/warzone2100/mp.wz | 94 | share/warzone2100/mp.wz | |
44 | share/warzone2100/music/menu.ogg | 95 | share/warzone2100/music/menu.ogg | |
45 | share/warzone2100/music/music.wpl | 96 | share/warzone2100/music/music.wpl | |
46 | share/warzone2100/music/track1.ogg | 97 | share/warzone2100/music/track1.ogg | |
47 | share/warzone2100/music/track2.ogg | 98 | share/warzone2100/music/track2.ogg | |
99 | share/warzone2100/music/track3.ogg |
@@ -1,15 +1,8 @@ | @@ -1,15 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2015/11/03 20:57:06 agc Exp $ | 1 | $NetBSD: distinfo,v 1.8 2018/12/14 17:27:01 triaxx Exp $ | |
2 | 2 | |||
3 | SHA1 (warzone2100-2.2.2.tar.gz) = d61bd1a87f0a6c1184c640987f759b1ac702b9e1 | 3 | SHA1 (warzone2100-3.2.3.tar.xz) = 33bf08ac130d54d36550ada4e3db99c3545ef153 | |
4 | RMD160 (warzone2100-2.2.2.tar.gz) = d7af614267acdb548fcbe5f78ed46e8c4d6f33de | 4 | RMD160 (warzone2100-3.2.3.tar.xz) = 12b5615b6cea9ea13848dc1a130ca535c7539ad5 | |
5 | SHA512 (warzone2100-2.2.2.tar.gz) = 763eb464687323aadaab3d679629e36902fbd3e2bdd88b3cf426b0b282eb55c184cf9f56bae24245ae2ee7edaf208352a813cdf1f065cd792fc2c38bf1f47d08 | 5 | SHA512 (warzone2100-3.2.3.tar.xz) = 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746 | |
6 | Size (warzone2100-2.2.2.tar.gz) = 50163580 bytes | 6 | Size (warzone2100-3.2.3.tar.xz) = 81314060 bytes | |
7 | SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704 | 7 | SHA1 (patch-lib_exceptionhandler_exceptionhandler.cpp) = 04345173f2fc98da9f26c30963507972786571c0 | |
8 | SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79 | 8 | SHA1 (patch-lib_qtgame_wzapp__qt.cpp) = 45564765d911a52534a14966c1f9418fd417956f | |
9 | SHA1 (patch-ac) = c09fcad63f725f414667980efce48157a04169a9 | |||
10 | SHA1 (patch-ad) = af29beef3b2014bf1b3d1068b2b3caa7d948de80 | |||
11 | SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3 | |||
12 | SHA1 (patch-af) = 46ea523fb72ed0f081d85dfea0813fde79087c82 | |||
13 | SHA1 (patch-ag) = 2604a894e8579377f4b3ac8eae7250ed2c73a21c | |||
14 | SHA1 (patch-build__tools_autorevision_autorevision.cpp) = b68854d02ee6d0fe1b4293c6b1b5c0e1e36fb3a6 | |||
15 | SHA1 (patch-lib_ivis__common_png__util.c) = 6a0ac9f5a29d431041af01c1d5acbb6fdbb919fe |
$NetBSD: patch-lib_exceptionhandler_exceptionhandler.cpp,v 1.1 2018/12/14 17:27:01 triaxx Exp $
Disable unsupported sigcodes for DragonFlyBSD.
--- lib/exceptionhandler/exceptionhandler.cpp.orig 2017-04-23 13:12:16.000000000 +0000
+++ lib/exceptionhandler/exceptionhandler.cpp
@@ -192,18 +192,21 @@ static const char *wz_strsignal(int sign
case SIGBUS:
switch (sigcode)
{
+#if !defined(__DragonFly__)
case BUS_ADRALN:
return "SIGBUS: Access to an undefined portion of a memory object: Invalid address alignment";
case BUS_ADRERR:
return "SIGBUS: Access to an undefined portion of a memory object: Nonexistent physical address";
case BUS_OBJERR:
return "SIGBUS: Access to an undefined portion of a memory object: Object-specific hardware error";
+#endif
default:
return "SIGBUS: Access to an undefined portion of a memory object";
}
case SIGFPE:
switch (sigcode)
{
+#if !defined(__DragonFly__)
case FPE_INTDIV:
return "SIGFPE: Erroneous arithmetic operation: Integer divide by zero";
case FPE_INTOVF:
@@ -220,6 +223,7 @@ static const char *wz_strsignal(int sign
return "SIGFPE: Erroneous arithmetic operation: Invalid floating-point operation";
case FPE_FLTSUB:
return "SIGFPE: Erroneous arithmetic operation: Subscript out of range";
+#endif
default:
return "SIGFPE: Erroneous arithmetic operation";
};
@@ -228,6 +232,7 @@ static const char *wz_strsignal(int sign
case SIGILL:
switch (sigcode)
{
+#if !defined(__DragonFly__)
case ILL_ILLOPC:
return "SIGILL: Illegal instruction: Illegal opcode";
case ILL_ILLOPN:
@@ -244,6 +249,7 @@ static const char *wz_strsignal(int sign
return "SIGILL: Illegal instruction: Coprocessor error";
case ILL_BADSTK:
return "SIGILL: Illegal instruction: Internal stack error";
+#endif
default:
return "SIGILL: Illegal instruction";
}
@@ -258,10 +264,12 @@ static const char *wz_strsignal(int sign
case SIGSEGV:
switch (sigcode)
{
+#if !defined(__DragonFly__)
case SEGV_MAPERR:
return "SIGSEGV: Invalid memory reference: Address not mapped to object";
case SEGV_ACCERR:
return "SIGSEGV: Invalid memory reference: Invalid permissions for mapped object";
+#endif
default:
return "SIGSEGV: Invalid memory reference";
}
@@ -279,10 +287,12 @@ static const char *wz_strsignal(int sign
case SIGTRAP:
switch (sigcode)
{
+#if !defined(__DragonFly__)
case TRAP_BRKPT:
return "SIGTRAP: Trace/breakpoint trap: Process breakpoint";
case TRAP_TRACE:
return "SIGTRAP: Trace/breakpoint trap: Process trace trap";
+#endif
default:
return "SIGTRAP: Trace/breakpoint trap";
}
$NetBSD: patch-lib_qtgame_wzapp__qt.cpp,v 1.1 2018/12/14 17:27:01 triaxx Exp $
The clip() function was not declared in the scope.
--- lib/qtgame/wzapp_qt.cpp.orig 2017-04-23 13:12:16.000000000 +0000
+++ lib/qtgame/wzapp_qt.cpp
@@ -42,6 +42,7 @@
#include "lib/exceptionhandler/dumpinfo.h"
#include "lib/framework/file.h"
+#include "lib/framework/math_ext.h"
#include "lib/ivis_opengl/piestate.h"
#include "lib/ivis_opengl/pieclip.h"
#include "lib/ivis_opengl/screen.h"