mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-29 17:02:56 +02:00
gzdoom: update to version 4.10.0.
This commit is contained in:
parent
1e03d6378a
commit
45928773a1
3 changed files with 9 additions and 77 deletions
|
@ -1,32 +0,0 @@
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index 26c617e..e162638 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -1361,11 +1361,11 @@ endif()
|
|
||||||
if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
|
|
||||||
# Need to enable intrinsics for these files.
|
|
||||||
if( SSE_MATTERS )
|
|
||||||
- set_property( SOURCE
|
|
||||||
+ set_source_files_properties(
|
|
||||||
common/rendering/polyrenderer/poly_all.cpp
|
|
||||||
rendering/swrenderer/r_all.cpp
|
|
||||||
- utility/palette.cpp
|
|
||||||
- utility/x86.cpp
|
|
||||||
+ common/utility/palette.cpp
|
|
||||||
+ common/utility/x86.cpp
|
|
||||||
APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
|
|
||||||
index f2a2987..b8de208 100644
|
|
||||||
--- a/src/common/utility/palette.cpp
|
|
||||||
+++ b/src/common/utility/palette.cpp
|
|
||||||
@@ -33,6 +33,8 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
+#include <cfloat>
|
|
||||||
+#include <cmath>
|
|
||||||
#include "palutil.h"
|
|
||||||
#include "palentry.h"
|
|
||||||
#include "sc_man.h"
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 2c69afa1187f55c2634c67c3ece47d89fd1b4f67 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christoph Oelckers <coelckers@users.noreply.github.com>
|
|
||||||
Date: Tue, 31 May 2022 11:00:10 +0200
|
|
||||||
Subject: [PATCH] - fixed SDL version check
|
|
||||||
|
|
||||||
---
|
|
||||||
src/common/platform/posix/sdl/sdlglvideo.cpp | 4 +---
|
|
||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp
|
|
||||||
index a5f7e6b527e..335dc620657 100644
|
|
||||||
--- a/src/common/platform/posix/sdl/sdlglvideo.cpp
|
|
||||||
+++ b/src/common/platform/posix/sdl/sdlglvideo.cpp
|
|
||||||
@@ -394,9 +394,7 @@ SDLVideo::SDLVideo ()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6.
|
|
||||||
- SDL_version sdlver;
|
|
||||||
- SDL_GetVersion(&sdlver);
|
|
||||||
- if (!(sdlver.patch >= 6))
|
|
||||||
+ if (!SDL_VERSION_ATLEAST(2, 0, 6))
|
|
||||||
{
|
|
||||||
I_FatalError("Only SDL 2.0.6 or later is supported.");
|
|
||||||
}
|
|
|
@ -1,34 +1,31 @@
|
||||||
# Template file for 'gzdoom'
|
# Template file for 'gzdoom'
|
||||||
pkgname=gzdoom
|
pkgname=gzdoom
|
||||||
version=4.7.1
|
version=4.10.0
|
||||||
revision=2
|
revision=1
|
||||||
_tagdate=2021-10-20
|
archs="~i686* ~arm*"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
|
configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
|
||||||
hostmakedepends="pkg-config tar xz"
|
hostmakedepends="pkg-config tar xz"
|
||||||
makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel"
|
makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel libvpx-devel"
|
||||||
short_desc="Advanced Doom source port with OpenGL support"
|
short_desc="Advanced Doom source port with OpenGL support"
|
||||||
maintainer="Érico Nogueira <ericonr@disroot.org>"
|
maintainer="Érico Nogueira <ericonr@disroot.org>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://www.zdoom.org"
|
homepage="https://www.zdoom.org"
|
||||||
# WARNING: watch out for new submodules
|
# WARNING: watch out for new submodules
|
||||||
distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
|
distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
|
||||||
https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
|
https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
|
||||||
checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102
|
checksum="8702522c05048dfd4a765c6ac82a270d8bd0942e813d5bc6f4b69795a5d23a20
|
||||||
af1501c05815a7945a335704f6f05ac263c5877549fa3f476478077b56ea14f2"
|
1baf9f577839daff89073768eeccf561dd330eabec65217ba67eba799a4dfcab"
|
||||||
skip_extraction="${pkgname}_${version}_amd64.deb"
|
skip_extraction="${pkgname}_${version}_amd64.deb"
|
||||||
nocross=yes
|
nocross=yes
|
||||||
|
|
||||||
CXXFLAGS=-std=gnu++11
|
CXXFLAGS=-std=gnu++11
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||||
|
CFLAGS="-D_7ZIP_AFFINITY_DISABLE"
|
||||||
makedepends+=" musl-fts-devel libexecinfo-devel"
|
makedepends+=" musl-fts-devel libexecinfo-devel"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
i686*) configure_args+=" -DSSE_MATTERS=true" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||||
makedepends+=" libatomic-devel"
|
makedepends+=" libatomic-devel"
|
||||||
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
|
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
|
||||||
|
@ -39,15 +36,6 @@ post_extract() {
|
||||||
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
|
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_patch() {
|
|
||||||
vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
|
|
||||||
vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
|
|
||||||
vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
|
|
||||||
vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
|
|
||||||
-i src/common/platform/posix/i_system.h
|
|
||||||
vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
|
|
||||||
}
|
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vmkdir usr/share/licenses
|
vmkdir usr/share/licenses
|
||||||
mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}
|
mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}
|
||||||
|
|
Loading…
Add table
Reference in a new issue