forked from pool/gzdoom
- Update to release 4.8.1
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=71
This commit is contained in:
Git OBS Bridge
parent
65cd753c6e
commit
3ba480fad7
@ -1,29 +0,0 @@
|
||||
From 984839295b4160a5859273399254225b9967c570 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sat, 18 Jun 2022 22:28:20 +0200
|
||||
Subject: [PATCH] Resolve build failure on i686-linux
|
||||
|
||||
gcc had to say:
|
||||
gzdoom-g4.8.0/src/common/engine/stats.h:83:13: error: 'CPU' was not declared in this scope
|
||||
83 | if (CPU.bRDTSC)
|
||||
---
|
||||
src/common/engine/stats.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/common/engine/stats.h b/src/common/engine/stats.h
|
||||
index d6e976ea5..0794455d2 100644
|
||||
--- a/src/common/engine/stats.h
|
||||
+++ b/src/common/engine/stats.h
|
||||
@@ -35,6 +35,9 @@
|
||||
#define __STATS_H__
|
||||
|
||||
#include "zstring.h"
|
||||
+#if defined __i386__
|
||||
+#include "x86.h"
|
||||
+#endif
|
||||
|
||||
#if !defined _WIN32 && !defined __APPLE__
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f749120e8151bf3b4a9ac6cc923820cf9559a123bf60298e8f83e70e4cffc245
|
||||
size 24121381
|
||||
3
g4.8.1.tar.gz
Normal file
3
g4.8.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6b48ed09e88200a29472fcaa2591d40ef783f4c66b2e3bee903d9799c5ea238d
|
||||
size 24246900
|
||||
@ -3,19 +3,18 @@ Date: 2022-06-12 10:37:00.984596068 +0200
|
||||
|
||||
Unbundle discord-rpc.
|
||||
---
|
||||
CMakeLists.txt | 7 +++----
|
||||
CMakeLists.txt | 6 +++---
|
||||
libraries/discordrpc/src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 4 insertions(+), 5 deletions(-)
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: gzdoom-g4.8.0/CMakeLists.txt
|
||||
Index: gzdoom-g4.8.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.8.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.0/CMakeLists.txt
|
||||
@@ -328,10 +328,9 @@ if (HAVE_VULKAN)
|
||||
include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
|
||||
--- gzdoom-g4.8.1.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.1/CMakeLists.txt
|
||||
@@ -329,9 +329,9 @@ if (HAVE_VULKAN)
|
||||
endif()
|
||||
|
||||
-add_subdirectory( libraries/discordrpc )
|
||||
add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL )
|
||||
-set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" )
|
||||
-set( DRPC_LIBRARIES discord-rpc )
|
||||
-set( DRPC_LIBRARY discord-rpc )
|
||||
@ -25,10 +24,10 @@ Index: gzdoom-g4.8.0/CMakeLists.txt
|
||||
|
||||
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
|
||||
message( STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIR}" )
|
||||
Index: gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
|
||||
Index: gzdoom-g4.8.1/libraries/discordrpc/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.8.0.orig/libraries/discordrpc/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
|
||||
--- gzdoom-g4.8.1.orig/libraries/discordrpc/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.1/libraries/discordrpc/src/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS})
|
||||
if(WIN32)
|
||||
add_definitions(-DDISCORD_WINDOWS)
|
||||
|
||||
@ -6,13 +6,13 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code.
|
||||
---
|
||||
CMakeLists.txt | 4 +---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++++
|
||||
3 files changed, 6 insertions(+), 4 deletions(-)
|
||||
src/common/rendering/vulkan/system/vk_builders.cpp | 1 +
|
||||
3 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: gzdoom-g4.8.0/CMakeLists.txt
|
||||
Index: gzdoom-g4.8.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.8.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.0/CMakeLists.txt
|
||||
--- gzdoom-g4.8.1.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.1/CMakeLists.txt
|
||||
@@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
|
||||
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
||||
|
||||
@ -23,11 +23,11 @@ Index: gzdoom-g4.8.0/CMakeLists.txt
|
||||
+ include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
|
||||
endif()
|
||||
|
||||
add_subdirectory( libraries/discordrpc )
|
||||
Index: gzdoom-g4.8.0/src/CMakeLists.txt
|
||||
add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL )
|
||||
Index: gzdoom-g4.8.1/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.8.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.0/src/CMakeLists.txt
|
||||
--- gzdoom-g4.8.1.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.8.1/src/CMakeLists.txt
|
||||
@@ -368,7 +368,7 @@ add_custom_target( revision_check ALL
|
||||
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}")
|
||||
@ -37,10 +37,10 @@ Index: gzdoom-g4.8.0/src/CMakeLists.txt
|
||||
endif()
|
||||
|
||||
# ZMUSIC
|
||||
Index: gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
Index: gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.8.0.orig/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
+++ gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
--- gzdoom-g4.8.1.orig/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
+++ gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "renderstyle.h"
|
||||
#include <ShaderLang.h>
|
||||
@ -49,13 +49,3 @@ Index: gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp
|
||||
|
||||
static const TBuiltInResource DefaultTBuiltInResource = {
|
||||
/* .MaxLights = */ 32,
|
||||
@@ -119,6 +120,9 @@ static const TBuiltInResource DefaultTBu
|
||||
/* .maxTaskWorkGroupSizeY_NV = */ 1,
|
||||
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
|
||||
/* .maxMeshViewCountNV = */ 4,
|
||||
+#if defined(GLSLANG_VERSION_MAJOR) && GLSLANG_VERSION_MAJOR >= 11
|
||||
+ /* .maxDualSourceDrawBuffersEXT = */ 4,
|
||||
+#endif
|
||||
|
||||
/* .limits = */ {
|
||||
/* .nonInductiveForLoops = */ 1,
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 26 13:02:04 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 4.8.1
|
||||
* Bugfix for software mode mirrors not working
|
||||
* Feature: Add +ONLYVISIBLEINMIRRORS and +INVISIBLEINMIRRORS
|
||||
actor flags. The former makes the actor only visible in
|
||||
reflections, while the latter makes the actor not cast
|
||||
reflections in mirrors.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 23 21:42:38 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: gzdoom
|
||||
Version: 4.8.0
|
||||
Version: 4.8.1
|
||||
Release: 0
|
||||
Summary: A DOOM source port with graphic and modding extensions
|
||||
License: GPL-3.0-only
|
||||
@ -32,7 +32,6 @@ Patch3: gzdoom-asmjit.patch
|
||||
Patch4: gzdoom-sdlbug.patch
|
||||
Patch5: gzdoom-vulkan.patch
|
||||
Patch6: gzdoom-discord.patch
|
||||
Patch7: 0001-Resolve-build-failure-on-i686-linux.patch
|
||||
Patch8: 0001-Revert-load-the-hex-font-as-early-as-possible.patch
|
||||
BuildRequires: cmake >= 2.8.7
|
||||
BuildRequires: discord-rpc-devel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user