Arch Linux User Repository

Update source, makedepends; fix build, package:

--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,16 +10,34 @@ arch=('i686' 'x86_64')
 url="http://wz2100.net/"
 license=('GPL')
 depends=('qt5-script' 'sdl2' 'libtheora' 'openal' 'libvorbis' 'physfs' 'ttf-dejavu' 'glew' 'fribidi' 'xorg-xrandr' 'miniupnpc' 'libsodium')
-makedepends=('zip' 'unzip' 'git' 'asciidoc' 'cmake' 'ninja')
+makedepends=('zip' 'unzip' 'git' 'cmake' 'ninja' 'asciidoctor' 'vulkan-headers' 'shaderc')
 provides=('warzone' 'warzone2100' 'warzone-svn' 'warzone2100-beta')
 conflicts=('warzone2100')
 source=('git+https://github.com/Warzone2100/warzone2100.git'
+        'git+https://github.com/Warzone2100/data-texpages.git'
+        'git+https://github.com/Warzone2100/data-music.git'
+        'git+https://github.com/past-due/EmbeddedJSONSignature.git'
+        'git+https://github.com/SRombauts/SQLiteCpp.git'
+        'git+https://github.com/HowardHinnant/date.git'
+        'git+https://github.com/past-due/discord-rpc.git'
+        'git+https://github.com/fmtlib/fmt.git'
         'git+https://github.com/g-truc/glm.git'
+        'git+https://github.com/past-due/launchinfo.git'
         'git+https://github.com/miniupnp/miniupnp.git'
-        'git+https://github.com/BrianGladman/sha.git'
+        'git+https://github.com/google/re2.git'
+        'git+https://github.com/cameron314/readerwriterqueue.git'
         'git+https://github.com/JuliaStrings/utf8proc.git'
         'git+https://github.com/nemtrif/utfcpp.git')
 sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -35,19 +53,29 @@ prepare() {
   cd "$srcdir/$_gitname"

   git submodule init
+  git config submodule.data/base/texpages.url "$srcdir/data-texpages"
+  git config submodule.data/music.url "$srcdir/data-music"
+  git config submodule.3rdparty/EmbeddedJSONSignature.url "$srcdir/EmbeddedJSONSignature"
+  git config submodule.3rdparty/SQLiteCpp.url "$srcdir/SQLiteCpp"
+  git config submodule.3rdparty/date.url "$srcdir/date"
+  git config submodule.3rdparty/discord-rpc.url "$srcdir/discord-rpc"
+  git config submodule.3rdparty/fmt.url "$srcdir/fmt"
   git config submodule.3rdparty/glm.url "$srcdir/glm"
+  git config submodule.3rdparty/launchinfo.url "$srcdir/launchinfo"
   git config submodule.3rdparty/miniupnp.url "$srcdir/miniupnp"
-  git config submodule.3rdparty/sha.url "$srcdir/sha"
+  git config submodule.3rdparty/re2.url "$srcdir/re2"
+  git config submodule.3rdparty/readerwriterqueue.url "$srcdir/readerwriterqueue"
   git config submodule.3rdparty/utf8proc.url "$srcdir/utf8proc"
   git config submodule.3rdparty/utfcpp.url "$srcdir/utfcpp"
   git submodule update
 }

 build() {
-  cmake -B build -S "$_gitname" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja ../warzone2100
+  cmake -B build -S "$_gitname" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja
   ninja -C build
 }

 package() {
   DESTDIR="$pkgdir" ninja -C build install
+  rm -f "$pkgdir/usr/bin/.portable"     # https://github.com/Warzone2100/warzone2100/issues/2645
 }

Can you add aarch64 to the pkgbuild build file please

arch=('i686' 'x86_64' 'armv7h' 'aarch64')

CMake and Ninja now used for building as per upstream, please report any issues

configure: error: *** This build toolchain is deprecated (and will be removed) - please use the CMake build toolchain. (If you really want to ignore this for now, specify: --enable-promise-to-use-cmake) ***

It seems warzone2100 isn't going to use autotools anymore, and has switched to CMake. The package should be updated for that.

After fetching the source code repository, it is necessary to execute git submodule update --init --recursive within it.

The PhysFS patches are out-of-date and should be removed. Also, support for the Qt backend has been deprecated in favor of SDL.

@Forgon Thank you for the suggestions. Not using https for git is a remnant from the past, I'll change that.

As for the debugging, I've thought about this long and hard already and also discussed this in IRC and this is the way I am happy with for now. makepkg will strip debug symbols by default, and the package, even if -git, isn't meant to be a debug package. Anyone can remove --disable-debug themselves and add the necessary makepkg options when they need debugging.

Thank you for your improvements, disastro.

I further suggest:

• replace 'git' with 'git+https' for the source

• remove the '--disable-debug' option for the configure script (this package is for testing, no one plays the latest builds online)

I've replaced my horrible physfs patch with the patchset at http://developer.wz2100.net/ticket/4693

Config directory moves because of that again from ~/.local/share/.warzone2100-master to ~/.warzone2100-master

Sorry for the inconvenience. I've also updated the dependencies

Disabled Debug works... but there is a "Relaxed" option. that still builds with debug options, but ignores warnings. Please consider this, and i use the debug ingame menu, for testing maps and changes, im pushing upstream. --- Also, i was using native. I specified "Piledriver" in my comment instead of "bdver2", by mistake. i havent used the platform specific flag, in a long time. so i had forgotten. I avoid Generic because i see a measurable 31% decrease in performance. As well as a 11% decrease from -O2, vs -03 or -fast. - Which may seem fine to you, but im working on a mod and every little bit helps...

Hello EndlessEden, Me and a couple of people ran multiple builds of the package and couldn't replicate your build failure unfortunately. The only time we could break the build on a different error was by using clang instead of clang++, so make sure your CXX is set to clang++. clang++ (03) worked with both debugging enabled or disabled while g++ still fails on that unitialized error if using O3 with debugging. EDIT2: Actually seems it's just gcc that can't use piledriver because such mtune setting doesn't seem to exist? clang just ignores it? (I could only test march=native or mtune=generic and couldn't test piledriver personally but the people on IRC did and it built fine for them even on clang++, with only -fno-plt as an extra CFLAG to yours.) What I suggest based on the build error and our testbuilds is try with either g++ or mtune=generic although it's hard to say if that will fix anything since I am not sure of the other changes to your system. I want to remind you that Arch uses g++ and O2 by default so it's all extra if a package builds with special flags. That being said I am unsure why the CFLAGS, while unsupported, work on the system or two tried on IRC and not on yours. EDIT: PS. Based on some of the discussions on IRC I've decided to --disable-debug for everyone and trust that the makepkg debugging build works if one enables it.