Update to Warzone2100 4.3.2.

tested by and ok op@, tiny tweak from Brad.
This commit is contained in:
pascal 2022-11-22 11:00:35 +00:00
parent d5d65fb851
commit 69e9ffc54b
7 changed files with 69 additions and 48 deletions

View File

@ -2,34 +2,36 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
V= 4.2.4
V= 4.3.2
DISTNAME= warzone2100-$V
CATEGORIES= games
MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/$V/
DISTFILES= warzone2100-${V}{warzone2100_src}${EXTRACT_SUFX}
EXTRACT_SUFX= .tar.xz
REVISION= 2
HOMEPAGE= https://wz2100.net/
# GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} SDL2 c curl freetype harfbuzz intl
WANTLIB += m miniupnpc ogg openal physfs png sodium sqlite3 theoradec
WANTLIB += vorbis vorbisfile z
WANTLIB += ${COMPILER_LIBCXX} X11 Xcursor Xext Xfixes Xi Xrandr
WANTLIB += Xss c curl freetype fribidi harfbuzz intl m miniupnpc
WANTLIB += ogg openal opus physfs png samplerate sndio sodium
WANTLIB += sqlite3 theoradec usbhid vorbis vorbisfile z
MODULES= devel/cmake
COMPILER= base-clang ports-gcc
LIB_DEPENDS= audio/libogg \
audio/libsamplerate \
audio/libvorbis \
audio/openal>=20110627 \
audio/openal \
audio/opus \
databases/sqlite3 \
devel/fribidi \
devel/harfbuzz \
devel/physfs \
devel/sdl2 \
graphics/png \
multimedia/libtheora \
net/curl \
@ -39,12 +41,13 @@ LIB_DEPENDS= audio/libogg \
BUILD_DEPENDS= archivers/unzip \
archivers/zip \
devel/gettext,-tools \
graphics/vulkan-headers \
textproc/asciidoc \
textproc/asciidoctor
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
# needs glslc
CONFIGURE_ARGS+= -DWZ_ENABLE_BACKEND_VULKAN=OFF
MODCMAKE_LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
WRKDIST = ${WRKDIR}/warzone2100

View File

@ -1,2 +1,2 @@
SHA256 (warzone2100-4.2.4.tar.xz) = IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=
SIZE (warzone2100-4.2.4.tar.xz) = 338685080
SHA256 (warzone2100-4.3.2.tar.xz) = RcpHk+p9Adu9zkd2J54hspeolZr/xsBsY8eUHLGY0xw=
SIZE (warzone2100-4.3.2.tar.xz) = 320455376

View File

@ -0,0 +1,12 @@
Index: 3rdparty/fmt/src/os.cc
--- 3rdparty/fmt/src/os.cc.orig
+++ 3rdparty/fmt/src/os.cc
@@ -203,7 +203,7 @@ void buffered_file::close() {
}
int buffered_file::descriptor() const {
- int fd = FMT_POSIX_CALL(fileno(file_));
+ int fd = fileno(file_);
if (fd == -1) FMT_THROW(system_error(errno, "cannot get file descriptor"));
return fd;
}

View File

@ -1,7 +1,7 @@
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
@@ -261,7 +261,7 @@ if(UNIX)
@@ -261,7 +261,7 @@ if(UNIX AND NOT SKIPPED_DOC_GENERATION)
)
endif()

View File

@ -1,12 +1,12 @@
Index: icons/CMakeLists.txt
--- icons/CMakeLists.txt.orig
+++ icons/CMakeLists.txt
@@ -13,7 +13,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
@@ -53,7 +53,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"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/warzone2100/"
RENAME "${WZ_APPSTREAM_ID}${WZ_OUTPUT_NAME_SUFFIX}.png"
COMPONENT Core
)

View File

@ -1,13 +0,0 @@
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

View File

@ -1,6 +1,6 @@
@bin bin/warzone2100
@man man/man6/warzone2100.6
share/applications/warzone2100.desktop
share/applications/net.wz2100.warzone2100.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/doc/warzone2100/
@comment share/doc/warzone2100/AUTHORS
@ -66,6 +66,8 @@ share/doc/warzone2100/js-globals.md
share/doc/warzone2100/js-objects.md
share/doc/warzone2100/quickstartguide.html
share/doc/warzone2100/warzone2100.6.html
share/icons/warzone2100/
share/icons/warzone2100/net.wz2100.warzone2100.png
share/locale/af_ZA/
share/locale/af_ZA/LC_MESSAGES/
share/locale/af_ZA/LC_MESSAGES/warzone2100.mo
@ -134,41 +136,58 @@ 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/metainfo/net.wz2100.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/fonts/Noto.LICENSE.txt
share/warzone2100/fonts/NotoSansCJK-VF.otf.ttc
share/warzone2100/mp.wz
share/warzone2100/music/
share/warzone2100/music/albums/
share/warzone2100/music/albums/aftermath_soundtrack/
share/warzone2100/music/albums/aftermath_soundtrack/album.json
share/warzone2100/music/albums/aftermath_soundtrack/albumcover.png
share/warzone2100/music/albums/aftermath_soundtrack/license.txt
share/warzone2100/music/albums/aftermath_soundtrack/menu_enhanced.opus
share/warzone2100/music/albums/aftermath_soundtrack/track17.opus
share/warzone2100/music/albums/aftermath_soundtrack/track18.opus
share/warzone2100/music/albums/aftermath_soundtrack/track19.opus
share/warzone2100/music/albums/aftermath_soundtrack/track20.opus
share/warzone2100/music/albums/aftermath_soundtrack/track21.opus
share/warzone2100/music/albums/aftermath_soundtrack/track22.opus
share/warzone2100/music/albums/aftermath_soundtrack/track23.opus
share/warzone2100/music/albums/aftermath_soundtrack/track24.opus
share/warzone2100/music/albums/aftermath_soundtrack/track25.opus
share/warzone2100/music/albums/aftermath_soundtrack/track26.opus
share/warzone2100/music/albums/aftermath_soundtrack/track27.opus
share/warzone2100/music/albums/aftermath_soundtrack/track3_enhanced.opus
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/legacy_soundtrack/track10.opus
share/warzone2100/music/albums/legacy_soundtrack/track11.opus
share/warzone2100/music/albums/legacy_soundtrack/track12.opus
share/warzone2100/music/albums/legacy_soundtrack/track13.opus
share/warzone2100/music/albums/legacy_soundtrack/track14.opus
share/warzone2100/music/albums/legacy_soundtrack/track15.opus
share/warzone2100/music/albums/legacy_soundtrack/track16.opus
share/warzone2100/music/albums/legacy_soundtrack/track4.opus
share/warzone2100/music/albums/legacy_soundtrack/track5.opus
share/warzone2100/music/albums/legacy_soundtrack/track6.opus
share/warzone2100/music/albums/legacy_soundtrack/track7.opus
share/warzone2100/music/albums/legacy_soundtrack/track8.opus
share/warzone2100/music/albums/legacy_soundtrack/track9.opus
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/albums/original_soundtrack/track1.opus
share/warzone2100/music/albums/original_soundtrack/track2.opus
share/warzone2100/music/albums/original_soundtrack/track3.opus
share/warzone2100/music/menu.opus
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/warzone2100