Rerelease game

.ci/configure-ffmpeg.sh

@@ -0,0 +1,76 @@
+#!/bin/sh -e
+
+OPTS_COMMON="--disable-everything \
+    --enable-decoder=theora \
+    --enable-decoder=vorbis \
+    --enable-decoder=idcin \
+    --enable-decoder=pcm_* \
+    --disable-decoder=pcm_bluray \
+    --disable-decoder=pcm_dvd \
+    --disable-decoder=pcm_alaw_at \
+    --disable-decoder=pcm_mulaw_at \
+    --enable-demuxer=ogg \
+    --enable-demuxer=idcin \
+    --enable-demuxer=wav \
+    --enable-parser=vp3 \
+    --enable-parser=vorbis \
+    --disable-protocols \
+    --enable-protocol=file \
+    --disable-avdevice \
+    --disable-avfilter \
+    --disable-postproc \
+    --disable-programs \
+    --disable-autodetect \
+    --disable-network \
+    --disable-doc \
+    --disable-swscale-alpha \
+    --enable-small \
+    --disable-pthreads \
+    --disable-w32threads"
+
+config_linux() {
+    ../configure --prefix="$1" $OPTS_COMMON
+}
+
+config_win32() {
+    ../configure \
+        --prefix="$1" \
+        --cross-prefix=i686-w64-mingw32- \
+        --arch=x86 \
+        --target-os=mingw32 \
+        --extra-cflags='-msse2 -mfpmath=sse' \
+        $OPTS_COMMON
+}
+
+config_win64() {
+    ../configure \
+        --prefix="$1" \
+        --cross-prefix=x86_64-w64-mingw32- \
+        --arch=x86 \
+        --target-os=mingw64 \
+        $OPTS_COMMON
+}
+
+usage() {
+    echo "Usage: $0 <build type> <prefix>"
+    exit 1
+}
+
+if [ -z "$2" ] ; then
+    usage
+fi
+
+case "$1" in
+    --win32)
+        config_win32 "$2"
+        ;;
+    --win64)
+        config_win64 "$2"
+        ;;
+    --linux)
+        config_linux "$2"
+        ;;
+    *)
+        usage
+        ;;
+esac

.ci/i686-w64-mingw32.txt

@@ -4,6 +4,8 @@ cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
 windres = 'i686-w64-mingw32-windres'
+nasm = 'nasm'
+pkg-config = 'pkg-config'
 
 [host_machine]
 system = 'windows'

.ci/nightly.sh

@@ -0,0 +1,145 @@
+#!/bin/sh -ex
+
+MESON_OPTS_COMMON="--auto-features=enabled --fatal-meson-warnings \
+    -Dwerror=true -Dwrap_mode=forcefallback"
+
+MESON_OPTS="$MESON_OPTS_COMMON \
+    -Dgame-build-options=optimization=s,b_lto=true \
+    -Dsdl2=disabled -Dwayland=disabled -Dx11=disabled"
+
+SRC_DIR=`pwd`
+CI=$SRC_DIR/.ci
+
+TMP_DIR=$SRC_DIR/q2pro-build
+mkdir $TMP_DIR
+
+export MESON_PACKAGE_CACHE_DIR=$SRC_DIR/subprojects/packagecache
+
+### Source ###
+
+REV=$(git rev-list --count HEAD)
+SHA=$(git rev-parse --short HEAD)
+VER="r$REV~$SHA"
+SRC="q2pro-r$REV"
+
+cd $TMP_DIR
+GIT_DIR=$SRC_DIR/.git git archive --format=tar --prefix=$SRC/ HEAD | tar x
+echo "$VER" > $SRC/VERSION
+rm -rf $SRC/.gitignore $SRC/.ci $SRC/.github
+fakeroot tar czf q2pro-source.tar.gz $SRC
+
+sed -e "s/##VER##/$VER/" -e "s/##DATE##/`date -R`/" $CI/readme-template.txt    > README
+sed -e "s/##VER##/$VER/" -e "s/##DATE##/`date -R`/" $CI/readme-template-rr.txt > README.rr
+
+### FFmpeg ###
+
+cd $TMP_DIR
+git clone --depth=1 https://github.com/FFmpeg/FFmpeg.git ffmpeg
+cd ffmpeg
+
+mkdir build-mingw-32
+cd build-mingw-32
+$CI/configure-ffmpeg.sh --win32 $TMP_DIR/ffmpeg-prefix-32
+make -j4 install
+cd ..
+
+mkdir build-mingw-64
+cd build-mingw-64
+$CI/configure-ffmpeg.sh --win64 $TMP_DIR/ffmpeg-prefix-64
+make -j4 install
+cd ..
+
+### Win32 ###
+
+export PKG_CONFIG_SYSROOT_DIR="$TMP_DIR/ffmpeg-prefix-32"
+export PKG_CONFIG_LIBDIR="$PKG_CONFIG_SYSROOT_DIR/lib/pkgconfig"
+
+cd $TMP_DIR
+meson setup --cross-file $CI/i686-w64-mingw32.txt $MESON_OPTS build-mingw-32 $SRC
+cd build-mingw-32
+ninja
+i686-w64-mingw32-strip q2pro.exe q2proded.exe gamex86.dll
+
+unix2dos -k -n ../$SRC/LICENSE LICENSE.txt ../$SRC/doc/client.asciidoc MANUAL.txt ../README README.txt
+mkdir baseq2
+cp -a ../$SRC/src/client/ui/q2pro.menu baseq2/
+mv gamex86.dll baseq2/
+
+zip -9 ../q2pro-client_win32_x86.zip \
+    q2pro.exe \
+    LICENSE.txt \
+    MANUAL.txt \
+    README.txt \
+    baseq2/q2pro.menu \
+    baseq2/gamex86.dll
+
+unix2dos -k -n ../$SRC/doc/server.asciidoc MANUAL.txt
+zip -9 ../q2pro-server_win32_x86.zip \
+    q2proded.exe \
+    LICENSE.txt \
+    MANUAL.txt \
+    README.txt
+
+### Win64 ###
+
+export PKG_CONFIG_SYSROOT_DIR="$TMP_DIR/ffmpeg-prefix-64"
+export PKG_CONFIG_LIBDIR="$PKG_CONFIG_SYSROOT_DIR/lib/pkgconfig"
+
+cd $TMP_DIR
+meson setup --cross-file $CI/x86_64-w64-mingw32.txt $MESON_OPTS build-mingw-64 $SRC
+cd build-mingw-64
+ninja
+x86_64-w64-mingw32-strip q2pro.exe q2proded.exe gamex86_64.dll
+
+unix2dos -k -n ../$SRC/LICENSE LICENSE.txt ../$SRC/doc/client.asciidoc MANUAL.txt ../README README.txt
+mkdir baseq2
+cp -a ../$SRC/src/client/ui/q2pro.menu baseq2/
+mv gamex86_64.dll baseq2/
+mv q2pro.exe q2pro64.exe
+mv q2proded.exe q2proded64.exe
+
+zip -9 ../q2pro-client_win64_x64.zip \
+    q2pro64.exe \
+    LICENSE.txt \
+    MANUAL.txt \
+    README.txt \
+    baseq2/q2pro.menu \
+    baseq2/gamex86_64.dll
+
+unix2dos -k -n ../$SRC/doc/server.asciidoc MANUAL.txt
+zip -9 ../q2pro-server_win64_x64.zip \
+    q2proded64.exe \
+    LICENSE.txt \
+    MANUAL.txt \
+    README.txt
+
+### Win64-rerelease ###
+
+cd $TMP_DIR
+git clone https://github.com/skullernet/q2pro-rerelease-dll.git
+cd q2pro-rerelease-dll
+meson setup --cross-file $CI/x86_64-w64-mingw32.txt $MESON_OPTS_COMMON build-mingw
+ninja -C build-mingw
+x86_64-w64-mingw32-strip build-mingw/gamex86_64.dll
+cd etc
+zip -9 ../build-mingw/q2pro.pkz default.cfg q2pro.menu
+
+cd $TMP_DIR/build-mingw-64
+
+mv q2pro64.exe q2pro.exe
+cp -a ../q2pro-rerelease-dll/build-mingw/q2pro.pkz baseq2/
+cp -a ../q2pro-rerelease-dll/build-mingw/gamex86_64.dll baseq2/
+unix2dos -k -n ../$SRC/doc/client.asciidoc MANUAL.txt ../README.rr README.txt
+
+zip -9 ../q2pro-rerelease-client_win64_x64.zip \
+    q2pro.exe \
+    LICENSE.txt \
+    MANUAL.txt \
+    README.txt \
+    baseq2/q2pro.pkz \
+    baseq2/gamex86_64.dll
+
+### Version ###
+
+cd $TMP_DIR
+echo $VER > version.txt

.ci/readme-template-rr.txt

@@ -0,0 +1,13 @@
+Welcome to Q2PRO, an enhanced Quake 2 client and server.
+
+Version ##VER## has been automatically built ##DATE##
+from git master branch.
+
+Installation: extract this archive into new directory, then create shortcut to
+q2pro.exe with the following command line:
+
+    q2pro.exe +set basedir "<path to re-release dir>" +set homedir "."
+
+For information on using and configuring Q2PRO, refer to MANUAL file.
+
+Project homepage: https://github.com/skullernet/q2pro

.ci/readme-template.txt

@@ -0,0 +1,10 @@
+Welcome to Q2PRO, an enhanced Quake 2 client and server.
+
+Version ##VER## has been automatically built ##DATE##
+from git master branch.
+
+Installation: extract this archive into your Quake 2 directory.
+
+For information on using and configuring Q2PRO, refer to MANUAL file.
+
+Project homepage: https://github.com/skullernet/q2pro

.ci/x86_64-w64-mingw32.txt

@@ -4,6 +4,8 @@ cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
+nasm = 'nasm'
+pkg-config = 'pkg-config'
 
 [host_machine]
 system = 'windows'

.gitattributes

@@ -0,0 +1,2 @@
+copy-game-dll.py text=auto eol=lf
+embed.py text=auto eol=lf

.github/ISSUE_TEMPLATE/1_bug_report.md

@@ -11,8 +11,7 @@ assignees: ''
 
 Make sure the bug is reproducible with latest Q2PRO version. If you compile
 Q2PRO yourself, update to the latest version from git master. If you are using
-prebuilt Windows binaries, update to the latest version available from
-https://skuller.net/q2pro/nightly/
+prebuilt Windows binaries, update to the latest nightly build.
 
 ### Important information
 
@@ -51,3 +50,8 @@ Provide a link to the log file created by launching `q2pro +set developer 1
 If Q2PRO crashes, provide a crash report (Windows) or a backtrace (Linux). On
 Linux, backtrace can be created by launching Q2PRO with `gdb q2pro --args
 [...]` and typing `bt` after the crash.
+
+### Compilation issues
+
+If reporting a building / compilation issue, provide `meson setup` command
+line and full console output.