gzdoom: update to 4.2.3.
This commit is contained in:
parent
9f527c7497
commit
2ce1fbe276
3 changed files with 59 additions and 3 deletions
|
@ -0,0 +1,21 @@
|
|||
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()
|
35
srcpkgs/gzdoom/patches/i686.patch
Normal file
35
srcpkgs/gzdoom/patches/i686.patch
Normal file
|
@ -0,0 +1,35 @@
|
|||
--- 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,6 +1,6 @@
|
|||
# Template file for 'gzdoom'
|
||||
pkgname=gzdoom
|
||||
version=4.1.3
|
||||
version=4.2.3
|
||||
revision=1
|
||||
_tagdate=2019-07-09
|
||||
wrksrc="${pkgname}-g${version}"
|
||||
|
@ -15,8 +15,8 @@ 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="5174c73e553d8ebbb5939255a6bdc56aecd4ff862ed20e544f271d59290a2d2b
|
||||
bdcd19779d0c37ffeef2ef06252bd427f714546c6767f6ce61cb0bd5e99f99b9"
|
||||
checksum="6dad7c0be3a780f7cf3a3aea13768d58e3b49745ee84cc7ac46fe137daaf30b9
|
||||
102848ff2e82d121f180541a79322f66a836c1b249280e5aad7ea51f429bb3a3"
|
||||
skip_extraction="${pkgname}_${version}_amd64.deb"
|
||||
nocross=yes
|
||||
|
||||
|
|
Loading…
Reference in a new issue