gzdoom: update to 4.4.2.
This commit is contained in:
Érico Rolim
Michael Aldridge
parent
d16ca93336
commit
9f1e068c42
|
|
@ -1,21 +0,0 @@
|
|||
From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
|
||||
From: John Zimmermann <johnz@posteo.net>
|
||||
Date: Tue, 29 Oct 2019 01:02:09 +0100
|
||||
Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 6f6ece0a24..cb8ffc0f3d 100644
|
||||
--- src/CMakeLists.txt
|
||||
+++ src/CMakeLists.txt
|
||||
@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
|
||||
rendering/polyrenderer/poly_all.cpp
|
||||
rendering/swrenderer/r_all.cpp
|
||||
utility/x86.cpp
|
||||
+ utility/palette.cpp
|
||||
PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
|
||||
endif()
|
||||
endif()
|
||||
32
srcpkgs/gzdoom/patches/fix-i686.patch
Normal file
32
srcpkgs/gzdoom/patches/fix-i686.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 26c617e..e162638 100644
|
||||
--- src/CMakeLists.txt
|
||||
+++ 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
|
||||
--- src/common/utility/palette.cpp
|
||||
+++ 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,35 +0,0 @@
|
|||
--- src/utility/palette.cpp 2019-10-20 16:16:08.000000000 +0200
|
||||
+++ - 2019-10-30 16:45:10.882234214 +0100
|
||||
@@ -34,6 +34,10 @@
|
||||
|
||||
#include "palette.h"
|
||||
#include "palentry.h"
|
||||
+#include <cfloat>
|
||||
+#include <cstring>
|
||||
+#include <cstdlib>
|
||||
+#include <cmath>
|
||||
|
||||
/****************************/
|
||||
/* Palette management stuff */
|
||||
--- src/CMakeLists.txt 2019-10-30 16:50:46.769763172 +0100
|
||||
+++ - 2019-10-30 17:11:18.507995925 +0100
|
||||
@@ -1210,7 +1210,7 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
|
||||
+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
|
||||
|
||||
include_directories( .
|
||||
g_statusbar
|
||||
--- libraries/zmusic/CMakeLists.txt 2019-10-20 16:16:08.000000000 +0200
|
||||
+++ - 2019-10-30 17:15:11.581747039 +0100
|
||||
@@ -94,7 +94,7 @@
|
||||
zmusic/zmusic.cpp
|
||||
${PLAT_SOURCES}
|
||||
)
|
||||
-target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
|
||||
+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
|
||||
|
||||
if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
|
||||
include_directories( "${SNDFILE_INCLUDE_DIRS}" )
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Taken from libgme package.
|
||||
|
||||
--- libraries/game-music-emu/gme/blargg_endian.h
|
||||
+++ libraries/game-music-emu/gme/blargg_endian.h
|
||||
@@ -36,7 +36,7 @@
|
||||
#endif
|
||||
|
||||
#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
|
||||
- defined (__sparc__) || BLARGG_CPU_POWERPC || \
|
||||
+ defined (__sparc__) || \
|
||||
(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
|
||||
#define BLARGG_BIG_ENDIAN 1
|
||||
#elif !defined (__mips__)
|
||||
|
|
@ -1,41 +1,44 @@
|
|||
# Template file for 'gzdoom'
|
||||
pkgname=gzdoom
|
||||
version=4.3.3
|
||||
version=4.4.2
|
||||
revision=1
|
||||
_tagdate=2019-07-09
|
||||
_tagdate=2020-06-16
|
||||
wrksrc="${pkgname}-g${version}"
|
||||
build_style=cmake
|
||||
configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
|
||||
hostmakedepends="pkg-config tar xz"
|
||||
makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
|
||||
depends="libfluidsynth gtk+3"
|
||||
makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
|
||||
ppl-devel ZMusic-devel"
|
||||
depends="gtk+3"
|
||||
short_desc="Advanced Doom source port with OpenGL support"
|
||||
maintainer="Michael Straube <straubem@gmx.de>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.zdoom.org"
|
||||
distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
|
||||
https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
|
||||
checksum="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
|
||||
6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
|
||||
checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
|
||||
ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
|
||||
skip_extraction="${pkgname}_${version}_amd64.deb"
|
||||
nocross=yes
|
||||
|
||||
case "$XBPS_MACHINE" in
|
||||
*-musl)
|
||||
configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
|
||||
makedepends+=" musl-fts-devel libexecinfo-devel"
|
||||
;;
|
||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||
makedepends+=" musl-fts-devel libexecinfo-devel"
|
||||
fi
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) configure_args+=" -DSSE_MATTERS=true" ;;
|
||||
esac
|
||||
|
||||
post_extract() {
|
||||
ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
|
||||
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
|
||||
|
||||
sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
|
||||
sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
|
||||
sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
|
||||
sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
|
||||
sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
|
||||
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() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue