sdk
/
patches
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
patches/warzone2100-4.2.4.diff

436 lines
18 KiB
Diff
Raw Permalink Blame History

Index: games/warzone2100/Makefile
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- games/warzone2100/Makefile 26 Feb 2021 18:20:34 -0000 1.43
+++ games/warzone2100/Makefile 31 Dec 2021 12:47:52 -0000
@@ -4,67 +4,47 @@ 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>
Index: games/warzone2100/distinfo
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- games/warzone2100/distinfo 24 May 2017 13:06:47 -0000 1.14
+++ games/warzone2100/distinfo 30 Dec 2021 21:56:06 -0000
@@ -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
Index: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
===================================================================
RCS file: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
diff -N games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
--- games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl 26 Feb 2021 18:20:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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:
Index: games/warzone2100/patches/patch-configure_ac
===================================================================
RCS file: games/warzone2100/patches/patch-configure_ac
diff -N games/warzone2100/patches/patch-configure_ac
--- games/warzone2100/patches/patch-configure_ac 27 May 2017 08:18:46 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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"
Index: games/warzone2100/patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-doc_CMakeLists_txt
diff -N games/warzone2100/patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-doc_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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()
Index: games/warzone2100/patches/patch-icons_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-icons_CMakeLists_txt
diff -N games/warzone2100/patches/patch-icons_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-icons_CMakeLists_txt 31 Dec 2021 13:01:03 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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
+ )
Index: games/warzone2100/patches/patch-icons_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-icons_Makefile_in
diff -N games/warzone2100/patches/patch-icons_Makefile_in
--- games/warzone2100/patches/patch-icons_Makefile_in 19 Dec 2016 12:29:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_exceptionhandler_exceptionhandler_cpp
--- games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 27 May 2017 08:18:46 -0000 1.4
+++ games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 30 Dec 2021 21:56:06 -0000
@@ -3,11 +3,11 @@ $OpenBSD: patch-lib_exceptionhandler_exc
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>
Index: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
===================================================================
RCS file: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
diff -N games/warzone2100/patches/patch-lib_netplay_netplay_cpp
--- games/warzone2100/patches/patch-lib_netplay_netplay_cpp 27 May 2017 08:18:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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:
Index: games/warzone2100/patches/patch-src_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-src_CMakeLists_txt
diff -N games/warzone2100/patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-src_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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
+
Index: games/warzone2100/patches/patch-src_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-src_Makefile_in
diff -N games/warzone2100/patches/patch-src_Makefile_in
--- games/warzone2100/patches/patch-src_Makefile_in 19 Dec 2016 12:29:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.
Index: games/warzone2100/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- games/warzone2100/pkg/PLIST 27 Jun 2018 21:03:51 -0000 1.12
+++ games/warzone2100/pkg/PLIST 31 Dec 2021 13:02:26 -0000
@@ -2,6 +2,7 @@
@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.j
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.
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.
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
Reference in New Issue View Git Blame Copy Permalink