cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to warzone2100 4.2.4.

Browse Source 
tweaks/ok sdk@
This commit is contained in:
pascal 2021-12-31 14:28:31 +00:00
parent 358770744b
commit 3856ccd807
12 changed files with 135 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
games/warzone2100/Makefile
View File

@ -1,70 +1,50 @@
# $OpenBSD: Makefile,v 1.43 2021/02/26 18:20:34 naddy Exp $
# $OpenBSD: Makefile,v 1.44 2021/12/31 14:28:31 pascal Exp $
ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
DISTNAME= warzone2100-3.2.3
V= 4.2.4
DISTNAME= warzone2100-$V
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/$V/
DISTFILES= warzone2100-${V}{warzone2100_src}${EXTRACT_SUFX}
EXTRACT_SUFX= .tar.xz
REVISION= 4
HOMEPAGE= https://wz2100.net/
# GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB += GL GLEW GLU Qt5Core Qt5Gui Qt5Script Qt5Widgets SDL2 X11
WANTLIB += Xrandr c crypto fontconfig freetype fribidi harfbuzz iconv
WANTLIB += intl m ogg openal physfs png pthread theora vorbis
WANTLIB += vorbisfile z ${COMPILER_LIBCXX}
WANTLIB += ${COMPILER_LIBCXX} SDL2 c curl freetype harfbuzz intl
WANTLIB += m miniupnpc ogg openal physfs png sodium sqlite3 theoradec
WANTLIB += vorbis vorbisfile z
FIX_CRLF_FILES= 3rdparty/glm/core/type_half.inl
MODULES= devel/cmake
MODULES= x11/qt5
COMPILER = base-clang ports-gcc
COMPILER= base-clang ports-gcc
LIB_DEPENDS= audio/libogg \
audio/libvorbis \
audio/openal>=20110627 \
devel/fribidi \
databases/sqlite3 \
devel/harfbuzz \
devel/physfs \
devel/sdl2 \
graphics/glew \
graphics/png \
multimedia/libtheora \
x11/qt5/qtscript
net/curl \
net/miniupnp/miniupnpc \
security/libsodium
BUILD_DEPENDS= archivers/unzip \
archivers/zip \
textproc/asciidoc
devel/gettext,-tools \
graphics/vulkan-headers \
textproc/asciidoc \
textproc/asciidoctor
RUN_DEPENDS= devel/desktop-file-utils
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS+= --with-distributor="OpenBSD"
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \
ac_cv_path_UIC4="${LOCALBASE}/bin/uic4"
# XXX this is a horrible hack to make sure we get to our glm
# which is 100% incompatible with ports glm
MAKE_FLAGS += "DEFS=-DHAVE_CONFIG_H -I${WRKSRC}/includefirst"
# libogg routines are called from the main program, so we need to
# explicitly link against it. Wedge it in.
MAKE_FLAGS += VORBIS_LIBS="`pkg-config --libs vorbis` -logg"
pre-configure:
mkdir -p ${WRKSRC}/includefirst
ln -sf ${WRKSRC}/3rdparty/glm ${WRKSRC}/includefirst/glm
.for _prog in git svn svnversion
@cd ${WRKDIR}/bin && ln -sf /usr/bin/true ${_prog}
.endfor
@cd ${WRKDIR}/bin && ln -sf ${LOCALBASE}/bin/gflex flex
WRKDIST = ${WRKDIR}/warzone2100
.include <bsd.port.mk>

4
games/warzone2100/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (warzone2100-3.2.3.tar.xz) = /KuehgID59rNpu5gOE2kkKnUSur8B6ox/yX5xUi+dYI=
SIZE (warzone2100-3.2.3.tar.xz) = 81314060
SHA256 (warzone2100-4.2.4.tar.xz) = IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=
SIZE (warzone2100-4.2.4.tar.xz) = 338685080

18
games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-3rdparty_glm_core_type_half_inl,v 1.2 2021/02/26 18:20:34 naddy Exp $
Index: 3rdparty/glm/core/type_half.inl
--- 3rdparty/glm/core/type_half.inl.orig
+++ 3rdparty/glm/core/type_half.inl
@@ -135,9 +135,9 @@ namespace detail
// of float and half (127 versus 15).
//
- register int s = (i >> 16) & 0x00008000;
- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
- register int m = i & 0x007fffff;
+ int s = (i >> 16) & 0x00008000;
+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
+ int m = i & 0x007fffff;
//
// Now reassemble s, e and m into a half:

13
games/warzone2100/patches/patch-configure_ac
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.11 2017/05/27 08:18:46 espie Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -289,7 +289,7 @@ fi
WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security"
AX_C_CHECK_FLAG([-Werror -Wno-expansion-to-defined -Wno-error=cpp], [#warning x], , WZ_WARNINGS_GCC="${WZ_WARNINGS_GCC} -Wno-expansion-to-defined")
WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}"
-WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}"
+WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
if test "x$enable_debug" = "xyes" ; then
if test "x$cc_icc" = "xyes" ; then
WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"

14
games/warzone2100/patches/patch-doc_CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2021/12/31 14:28:31 pascal Exp $
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
@@ -261,7 +261,7 @@ if(UNIX)
)
endif()
- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+ install(FILES "${_warzone2100_6_uncompressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
else()
message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
endif()

14
games/warzone2100/patches/patch-icons_CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-icons_CMakeLists_txt,v 1.1 2021/12/31 14:28:31 pascal Exp $
Index: icons/CMakeLists.txt
--- icons/CMakeLists.txt.orig
+++ icons/CMakeLists.txt
@@ -13,7 +13,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
COMPONENT Core
)
install(FILES warzone2100.png
- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/warzone2100/icons"
RENAME "warzone2100${WZ_OUTPUT_NAME_SUFFIX}.png"
COMPONENT Core
)

11
games/warzone2100/patches/patch-icons_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-icons_Makefile_in,v 1.2 2016/12/19 12:29:01 kirby Exp $
--- icons/Makefile.in.orig Sun Dec 4 01:18:34 2016
+++ icons/Makefile.in Wed Dec 7 15:16:46 2016
@@ -519,7 +519,6 @@ install-data-local:
$(MKDIR_P) $(DESTDIR)$(appdatadir)
$(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/warzone2100.png
$(INSTALL_DATA) $(srcdir)/warzone2100.desktop $(DESTDIR)$(applicationdir)/warzone2100.desktop
- $(INSTALL_DATA) $(srcdir)/warzone2100.appdata.xml $(DESTDIR)$(appdatadir)/warzone2100.appdata.xml
uninstall-local:
$(RM) $(DESTDIR)$(icondir)/warzone2100.png

6
games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-lib_exceptionhandler_exceptionhandler_cpp,v 1.4 2017/05/27 08:18:46 espie Exp $
$OpenBSD: patch-lib_exceptionhandler_exceptionhandler_cpp,v 1.5 2021/12/31 14:28:31 pascal Exp $
Index: lib/exceptionhandler/exceptionhandler.cpp
--- lib/exceptionhandler/exceptionhandler.cpp.orig
+++ lib/exceptionhandler/exceptionhandler.cpp
@@ -117,6 +117,7 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
@@ -47,7 +47,6 @@
# include <stdint.h>
# include <signal.h>
# include <string.h>
+# include <errno.h>
-# include <errno.h>
// POSIX headers:
# include <unistd.h>

14
games/warzone2100/patches/patch-lib_netplay_netplay_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-lib_netplay_netplay_cpp,v 1.1 2017/05/27 08:18:46 espie Exp $
Index: lib/netplay/netplay.cpp
--- lib/netplay/netplay.cpp.orig
+++ lib/netplay/netplay.cpp
@@ -1783,7 +1783,7 @@ static void NETcheckPlayers(void)
// We should not block here.
bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
{
- switch (upnp_status)
+ switch (static_cast<int>(upnp_status))
{
case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
case UPNP_ERROR_DEVICE_NOT_FOUND:

15
games/warzone2100/patches/patch-src_CMakeLists_txt Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1 2021/12/31 14:28:31 pascal Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -619,9 +619,6 @@ endif()
# Install
install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
-# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only)
-install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable")
-
#####################
# Installing Required Runtime Dependencies

15
games/warzone2100/patches/patch-src_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2016/12/19 12:29:01 kirby Exp $
Fix SEPARATE_BUILD
--- src/Makefile.in.orig Sun Dec 4 01:18:34 2016
+++ src/Makefile.in Wed Dec 7 15:16:46 2016
@@ -1223,7 +1223,7 @@ uninstall-am: uninstall-binPROGRAMS
.PHONY: autorevision.h
autorevision.h autorevision.cache:
- cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_builddir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
+ cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_srcdir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
cmp -s autorevision.h.new autorevision.h && rm autorevision.h.new || mv -f autorevision.h.new autorevision.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.

73
games/warzone2100/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.12 2018/06/27 21:03:51 espie Exp $
@comment $OpenBSD: PLIST,v 1.13 2021/12/31 14:28:31 pascal Exp $
@bin bin/warzone2100
@man man/man6/warzone2100.6
share/applications/warzone2100.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/doc/warzone2100/
@comment share/doc/warzone2100/AUTHORS
@comment share/doc/warzone2100/COPYING
@ -9,7 +10,9 @@ share/doc/warzone2100/
@comment share/doc/warzone2100/COPYING.README
@comment share/doc/warzone2100/ChangeLog
share/doc/warzone2100/README.md
share/doc/warzone2100/Scripting.md
share/doc/warzone2100/ScriptingManual.htm
share/doc/warzone2100/copyright
share/doc/warzone2100/docbook-xsl.css
share/doc/warzone2100/images/
share/doc/warzone2100/images/artillery-far-away.jpg
@ -57,8 +60,22 @@ share/doc/warzone2100/images/transport.jpg
share/doc/warzone2100/images/unitordersmenu.jpg
share/doc/warzone2100/images/wss.png
share/doc/warzone2100/images/www.png
share/doc/warzone2100/js-campaign.md
share/doc/warzone2100/js-events.md
share/doc/warzone2100/js-functions.md
share/doc/warzone2100/js-globals.md
share/doc/warzone2100/js-objects.md
share/doc/warzone2100/quickstartguide.html
share/icons/warzone2100.png
share/doc/warzone2100/warzone2100.6.html
share/locale/af_ZA/
share/locale/af_ZA/LC_MESSAGES/
share/locale/af_ZA/LC_MESSAGES/warzone2100.mo
share/locale/ar_SA/
share/locale/ar_SA/LC_MESSAGES/
share/locale/ar_SA/LC_MESSAGES/warzone2100.mo
share/locale/bg_BG/
share/locale/bg_BG/LC_MESSAGES/
share/locale/bg_BG/LC_MESSAGES/warzone2100.mo
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/warzone2100.mo
@ -72,20 +89,33 @@ share/locale/es/LC_MESSAGES/warzone2100.mo
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/warzone2100.mo
share/locale/fa_IR/
share/locale/fa_IR/LC_MESSAGES/
share/locale/fa_IR/LC_MESSAGES/warzone2100.mo
share/locale/fi/LC_MESSAGES/warzone2100.mo
share/locale/fr/LC_MESSAGES/warzone2100.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/warzone2100.mo
share/locale/ga/LC_MESSAGES/warzone2100.mo
share/locale/he_IL/
share/locale/he_IL/LC_MESSAGES/
share/locale/he_IL/LC_MESSAGES/warzone2100.mo
share/locale/hr/LC_MESSAGES/warzone2100.mo
share/locale/hu/LC_MESSAGES/warzone2100.mo
share/locale/id/LC_MESSAGES/warzone2100.mo
share/locale/id_ID/
share/locale/id_ID/LC_MESSAGES/
share/locale/id_ID/LC_MESSAGES/warzone2100.mo
share/locale/it/LC_MESSAGES/warzone2100.mo
share/locale/ko/LC_MESSAGES/warzone2100.mo
share/locale/la/
share/locale/la/LC_MESSAGES/
share/locale/la/LC_MESSAGES/warzone2100.mo
share/locale/lt/LC_MESSAGES/warzone2100.mo
share/locale/my_MM/
share/locale/my_MM/LC_MESSAGES/
share/locale/my_MM/LC_MESSAGES/warzone2100.mo
share/locale/nb/LC_MESSAGES/warzone2100.mo
share/locale/nl/LC_MESSAGES/warzone2100.mo
share/locale/pl/LC_MESSAGES/warzone2100.mo
@ -96,19 +126,50 @@ share/locale/ru/LC_MESSAGES/warzone2100.mo
share/locale/sk/LC_MESSAGES/warzone2100.mo
share/locale/sl/LC_MESSAGES/warzone2100.mo
share/locale/tr/LC_MESSAGES/warzone2100.mo
share/locale/tt_RU/
share/locale/tt_RU/LC_MESSAGES/
share/locale/tt_RU/LC_MESSAGES/warzone2100.mo
share/locale/uk_UA/
share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
share/metainfo/
share/metainfo/warzone2100.appdata.xml
share/warzone2100/
share/warzone2100/base.wz
share/warzone2100/fonts/
share/warzone2100/fonts/DejaVu.LICENSE.txt
share/warzone2100/fonts/DejaVuSans-Bold.ttf
share/warzone2100/fonts/DejaVuSans.ttf
share/warzone2100/icons/
share/warzone2100/icons/warzone2100.png
share/warzone2100/mp.wz
share/warzone2100/music/
share/warzone2100/music/albums/
share/warzone2100/music/albums/legacy_soundtrack/
share/warzone2100/music/albums/legacy_soundtrack/album.json
share/warzone2100/music/albums/legacy_soundtrack/albumcover.png
share/warzone2100/music/albums/legacy_soundtrack/license.txt
share/warzone2100/music/albums/legacy_soundtrack/track10.ogg
share/warzone2100/music/albums/legacy_soundtrack/track11.ogg
share/warzone2100/music/albums/legacy_soundtrack/track12.ogg
share/warzone2100/music/albums/legacy_soundtrack/track13.ogg
share/warzone2100/music/albums/legacy_soundtrack/track14.ogg
share/warzone2100/music/albums/legacy_soundtrack/track15.ogg
share/warzone2100/music/albums/legacy_soundtrack/track16.ogg
share/warzone2100/music/albums/legacy_soundtrack/track4.ogg
share/warzone2100/music/albums/legacy_soundtrack/track5.ogg
share/warzone2100/music/albums/legacy_soundtrack/track6.ogg
share/warzone2100/music/albums/legacy_soundtrack/track7.ogg
share/warzone2100/music/albums/legacy_soundtrack/track8.ogg
share/warzone2100/music/albums/legacy_soundtrack/track9.ogg
share/warzone2100/music/albums/original_soundtrack/
share/warzone2100/music/albums/original_soundtrack/album.json
share/warzone2100/music/albums/original_soundtrack/albumcover.png
share/warzone2100/music/albums/original_soundtrack/track1.ogg
share/warzone2100/music/albums/original_soundtrack/track2.ogg
share/warzone2100/music/albums/original_soundtrack/track3.ogg
share/warzone2100/music/menu.ogg
share/warzone2100/music/music.wpl
share/warzone2100/music/track1.ogg
share/warzone2100/music/track2.ogg
share/warzone2100/music/track3.ogg
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/warzone2100