Accepting request 816863 from games

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/816863
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzdoom?expand=0&rev=13

g4.3.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
-size 13704956

g4.4.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+size 12613806

gzdoom-lzma.patch

@@ -9,10 +9,10 @@ Use LZMA system libraries instead of bundled code.
  tools/zipdir/CMakeLists.txt |    4 ++--
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-Index: gzdoom-g4.2.4/CMakeLists.txt
+Index: gzdoom-g4.4.0/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/CMakeLists.txt
-+++ gzdoom-g4.2.4/CMakeLists.txt
++++ gzdoom-g4.4.0/CMakeLists.txt
 @@ -12,6 +12,7 @@ endif()
  
  list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
@@ -21,28 +21,28 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
  
  # Support cross compiling
  option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
-@@ -403,7 +404,7 @@ else()
+@@ -369,7 +370,7 @@ else()
- 	set( GME_LIBRARIES gme )
  endif()
  
+ 
 -set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
 +pkg_check_modules(LZMA REQUIRED clzma)
- set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
+ 
- set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
+ if( NOT CMAKE_CROSSCOMPILING )
- set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" )
+ 	if( NOT CROSS_EXPORTS )
-@@ -433,7 +434,6 @@ option( DYN_OPENAL "Dynamically load Ope
+@@ -389,7 +390,6 @@ install(DIRECTORY docs/
- option( DYN_SNDFILE "Dynamically load libsndfile" ON )
+ 
- option( DYN_MPG123 "Dynamically load libmpg123" ON )
+ option( DYN_OPENAL "Dynamically load OpenAL" ON )
  
 -add_subdirectory( libraries/lzma )
  add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
  add_subdirectory( libraries/gdtoa )
-Index: gzdoom-g4.2.4/src/CMakeLists.txt
+ add_subdirectory( wadsrc )
+Index: gzdoom-g4.4.0/src/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/src/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
-+++ gzdoom-g4.2.4/src/CMakeLists.txt
++++ gzdoom-g4.4.0/src/CMakeLists.txt
-@@ -436,7 +436,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
+@@ -437,7 +437,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
  if (HAVE_VULKAN)
  	set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
  endif()
@@ -51,19 +51,19 @@ Index: gzdoom-g4.2.4/src/CMakeLists.txt
  
  if( ${HAVE_VM_JIT} )
  	add_definitions( -DHAVE_VM_JIT )
-@@ -1211,7 +1211,7 @@ if( UNIX )
+@@ -1238,7 +1238,7 @@ if( UNIX )
  	endif()
  endif()
  
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
+-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa lzma ${ZMUSIC_LIBRARIES} )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES} adl opn timidity timidityplus wildmidi oplsynth zmusic )
++target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa ${LZMA_LIBRARIES} ${ZMUSIC_LIBRARIES} )
  
  include_directories( .
- 	g_statusbar
+ 	common/audio/sound
-Index: gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
+Index: gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/tools/zipdir/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/tools/zipdir/CMakeLists.txt
-+++ gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
++++ gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
 @@ -1,9 +1,9 @@
  cmake_minimum_required( VERSION 2.8.7 )
  

gzdoom-sdlbug.patch

@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-06-12 02:05:34.009865606 +0200
+
+When a SDL_PollEvent is sandwiched between SDL_CreateWindow and
+SDL_CreateRenderer, SDL crashes during SDL_IME_PumpEvents because dbus message
+still references the old window (still exists and pointer is non-NULL) and
+tries to access members of window->driverdata (block was freed and pointer is
+NULL.)
+
+Workaround this by recreating the SDL_Window object and immediately afterwards
+creating the renderer.
+
+This crash only happens for gzdoom when running with the SoftPoly rasterizer,
+as that is the only place that issues SDL_CreateRenderer after the mainloop has
+started.
+
+Needs a bugreport on libsdl.org.
+
+---
+ src/common/platform/posix/sdl/sdlglvideo.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp
+===================================================================
+--- gzdoom-g4.4.1.orig/src/common/platform/posix/sdl/sdlglvideo.cpp
++++ gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp
+@@ -294,6 +294,8 @@ uint8_t *I_PolyPresentLock(int w, int h,
+ 	{
+ 		polyvsync = vsync;
+ 
++		Priv::DestroyWindow();
++		Priv::CreateWindow(Priv::VulkanWindowFlag | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0));
+ 		polyrendertarget = SDL_CreateRenderer(Priv::window, -1, vsync ? SDL_RENDERER_PRESENTVSYNC : 0);
+ 		if (!polyrendertarget)
+ 		{

gzdoom-spirv.patch

@@ -0,0 +1,23 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-06-11 15:48:28.422839234 +0200
+
+gzdoom is the only user of its own libSPIRV.so, so there is no need for a
+shared library.
+
+---
+ libraries/glslang/spirv/CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+===================================================================
+--- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
++++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
+     SPVRemapper.h
+     doc.h)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC

gzdoom-system-gme.patch

@@ -1,67 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2019-12-18 23:10:30.098185171 +0100
-
-Use GME system libraries instead of bundled code.
-
----
- CMakeLists.txt                  |   13 ++++---------
- libraries/zmusic/CMakeLists.txt |    2 +-
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-Index: gzdoom-g4.3.1/CMakeLists.txt
-===================================================================
---- gzdoom-g4.3.1.orig/CMakeLists.txt
-+++ gzdoom-g4.3.1/CMakeLists.txt
-@@ -196,12 +196,7 @@ endif()
- #endif()
- 
- # GME
--#find_path( GME_INCLUDE_DIR gme/gme.h )
--#find_library( GME_LIBRARIES gme )
--#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES )
--#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME
--#	REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR
--#)
-+pkg_check_modules(GME libgme)
- 
- if( MSVC )
- 	# Eliminate unreferenced functions and data
-@@ -325,7 +320,7 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_
- option(FORCE_INTERNAL_ZLIB "Use internal zlib")
- option(FORCE_INTERNAL_JPEG "Use internal jpeg")
- option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
--option(FORCE_INTERNAL_GME "Use internal gme" ON)
-+option(FORCE_INTERNAL_GME "Use internal gme" OFF)
- mark_as_advanced( FORCE_INTERNAL_GME )
- option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
- mark_as_advanced( FORCE_INTERNAL_ASMJIT )
-@@ -391,14 +386,14 @@ else()
- endif()
- 
- if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
--	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
-+	message( STATUS "Using system gme library, includes found at ${GME_INCLUDEDIR}" )
- else()
- 	message( STATUS "Using internal gme library" )
- 	# Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU
- 	# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
- 	set( GME_YM2612_EMU "MAME" )
- 	add_subdirectory( libraries/game-music-emu )
--	set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" )
-+	set( GME_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" )
- 	set( GME_LIBRARIES gme )
- endif()
- 
-Index: gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
-===================================================================
---- gzdoom-g4.3.1.orig/libraries/zmusic/CMakeLists.txt
-+++ gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
-@@ -46,7 +46,7 @@ else()
- endif()
- 
- 
--include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" )
-+include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDEDIR}" "${CMAKE_CURRENT_SOURCE_DIR}" )
- 
- if (WIN32)
-     set( PLAT_SOURCES

gzdoom-vulkan.patch

@@ -1,67 +1,38 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2019-04-13 15:02:22.799297208 +0200
 
-Use Vulkan system libraries instead of bundled code.
+Use Vulkan/glslang/spirv system libraries instead of bundled code.
 
 ---
- CMakeLists.txt                              |    3 ---
+ CMakeLists.txt     |    4 +---
- src/CMakeLists.txt                          |    2 +-
+ src/CMakeLists.txt |    2 +-
- src/rendering/vulkan/shaders/vk_shader.cpp  |    2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
- src/rendering/vulkan/system/vk_builders.cpp |    4 ++--
- 4 files changed, 4 insertions(+), 7 deletions(-)
 
-Index: gzdoom-g4.2.4/CMakeLists.txt
+Index: gzdoom-g4.4.0/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/CMakeLists.txt
-+++ gzdoom-g4.2.4/CMakeLists.txt
++++ gzdoom-g4.4.0/CMakeLists.txt
-@@ -330,9 +330,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
+@@ -307,9 +307,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
  mark_as_advanced( FORCE_INTERNAL_ASMJIT )
  
  if (HAVE_VULKAN)
 -	add_subdirectory( libraries/glslang/glslang)
 -	add_subdirectory( libraries/glslang/spirv )
 -	add_subdirectory( libraries/glslang/OGLCompilersDLL )
++	include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
  endif()
  
  if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
-Index: gzdoom-g4.2.4/src/CMakeLists.txt
+Index: gzdoom-g4.4.0/src/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/src/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
-+++ gzdoom-g4.2.4/src/CMakeLists.txt
++++ gzdoom-g4.4.0/src/CMakeLists.txt
-@@ -434,7 +434,7 @@ add_custom_target( revision_check ALL
+@@ -435,7 +435,7 @@ add_custom_target( revision_check ALL
  
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" )
+ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" )
  if (HAVE_VULKAN)
 -	set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
 +	set( ZDOOM_LIBS ${ZDOOM_LIBS} -lglslang -lSPIRV -lOGLCompiler)
  endif()
  include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
  
-Index: gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp
-===================================================================
---- gzdoom-g4.2.4.orig/src/rendering/vulkan/shaders/vk_shader.cpp
-+++ gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp
-@@ -4,7 +4,7 @@
- #include "hwrenderer/utility/hw_shaderpatcher.h"
- #include "w_wad.h"
- #include "doomerrors.h"
--#include <ShaderLang.h>
-+#include <glslang/Public/ShaderLang.h>
- 
- VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)
- {
-Index: gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp
-===================================================================
---- gzdoom-g4.2.4.orig/src/rendering/vulkan/system/vk_builders.cpp
-+++ gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp
-@@ -2,8 +2,8 @@
- #include "vk_builders.h"
- #include "doomerrors.h"
- #include "r_data/renderstyle.h"
--#include <ShaderLang.h>
--#include <GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-+#include <SPIRV/GlslangToSpv.h>
- 
- static const TBuiltInResource DefaultTBuiltInResource = {
- 	/* .MaxLights = */ 32,

gzdoom-waddir.patch

@@ -1,17 +1,17 @@
 From: Jan Engelhardt <jengelh@inai.de>
-2018-01-02 15:25:05.669125932 +0100
+Date: 2018-01-02 15:25:05.669125932 +0100
 
 Ensure same IWAD directory across all Doom source ports in openSUSE
 
 ---
- src/posix/i_system.h |    2 +-
+ src/common/platform/posix/i_system.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: gzdoom-4.0.0/src/posix/i_system.h
+Index: gzdoom-g4.4.0/src/common/platform/posix/i_system.h
 ===================================================================
---- gzdoom-4.0.0.orig/src/posix/i_system.h
+--- gzdoom-g4.4.0.orig/src/common/platform/posix/i_system.h
-+++ gzdoom-4.0.0/src/posix/i_system.h
++++ gzdoom-g4.4.0/src/common/platform/posix/i_system.h
-@@ -42,7 +42,7 @@ struct ticcmd_t;
+@@ -17,7 +17,7 @@ struct ticcmd_t;
  struct WadStuff;
  
  #ifndef SHARE_DIR
@@ -19,4 +19,4 @@ Index: gzdoom-4.0.0/src/posix/i_system.h
 +#define SHARE_DIR "/usr/share/doom/"
  #endif
  
- 
+ void CalculateCPUSpeed(void);

gzdoom.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Jun 17 14:33:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.2
+  * Made the new "Build" light mode operational
+
+-------------------------------------------------------------------
+Fri Jun 12 00:26:10 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add gzdoom-sdlbug.patch.
+
+-------------------------------------------------------------------
+Thu Jun 11 15:19:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.1
+  * Heretic's "bag of holding" had incorrectly given mace capacity.
+  * Mapped "Smooth mouse" back to the "m_filter" CVAR, and
+    removed the "smooth_mouse" CVAR.
+  * Fixed crash with texture upscaling in the truecolor software
+    renderer.
+  * Fixed crash rendering 3D floors without ceiling or floor
+    textures in software.
+
+-------------------------------------------------------------------
+Sun Jun  7 23:39:42 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.0
+  * Heretic's "bag of holding" had incorrectly given mace ammo.
+  * Added per pixel lighting for decals.
+  * Added a compatibility option for a bad teleporter in the
+    final map of Strife.
+  * Add a cvar to control weapon bobbing while firing.
+  * Fixed crash on maps with out of range sidedef and sector
+    numbers.
+  * Fixed missing sound for Polyobj_MoveTo.
+  * Attenuated lights for Strife.
+  * Added MTF_NOCOUNT to spawn flags.
+- Drop gzdoom-system-gme.patch (moved to zmusic.spec),
+  gzdoom-dl.patch (unnecessary). Add gzdoom-spirv.patch.
+
 -------------------------------------------------------------------
 Wed Jan 29 17:43:59 UTC 2020 - Michael Scafidi <raptir@gmail.com>
 
@@ -7,10 +47,14 @@ Wed Jan 29 17:43:59 UTC 2020 - Michael Scafidi <raptir@gmail.com>
   * fixed calling a function on string CVar
   * added ability to filter VM disassembly dump
   * add check for unity version of Nerve.wad
-  * infrastructure in place in case Nerve.wad changes again, this can be extended
+  * infrastructure in place in case Nerve.wad changes again, this
-  * customized invulnerability colormap does not interfere with Powerup.ColorMap
+    can be extended.
+  * customized invulnerability colormap does not interfere with
+    Powerup.ColorMap.
   * precache a few sounds being referenced in common game code.
-  * define misc/secret for Hexen, too. By now there are some mods defining secrets for the game so this sound should be present there.
+  * define misc/secret for Hexen, too. By now there are some mods
+    defining secrets for the game so this sound should be present
+    there.
   * Implement special colormap support for softpoly
   * Softpoly: Fix broken fixed camera light for walls
   * make nosave standalone CVar flag, alongside server and user

gzdoom.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gzdoom
-Version:        4.3.3
+Version:        4.4.2
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
@@ -28,38 +28,31 @@ URL:            https://zdoom.org/
 Source:         https://github.com/coelckers/gzdoom/archive/g%version.tar.gz
 Patch1:         gzdoom-waddir.patch
 Patch2:         gzdoom-lzma.patch
-Patch3:         gzdoom-vulkan.patch
+Patch3:         gzdoom-asmjit.patch
-Patch4:         gzdoom-asmjit.patch
+Patch4:         gzdoom-spirv.patch
-Patch5:         gzdoom-system-gme.patch
+Patch5:         gzdoom-sdlbug.patch
-Patch6:         gzdoom-dl.patch
+Patch6:         gzdoom-vulkan.patch
 BuildRequires:  cmake >= 2.8.7
 BuildRequires:  gcc-c++
-BuildRequires:  glslang-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  pkg-config
-BuildRequires:  spirv-tools-devel
 BuildRequires:  unzip
-BuildRequires:  xz
+BuildRequires:  zmusic-devel
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(clzma) >= 17.01
 BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libgme)
-BuildRequires:  pkgconfig(libmpg123)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(sndfile)
-BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(zlib)
-%if 0%{?suse_version} >= 1500
+%if 0%{?sle_version} >= 150200
-BuildRequires:  pkgconfig(clzma) >= 17.01
+BuildRequires:  glslang-devel >= 6.3
+BuildRequires:  pkgconfig(vulkan) >= 1.1.77
 %else
-Provides:       bundled(lzma-sdk) = 19.00
+Provides:       bundled(glslang) = 8.13.3559
-%endif
+Provides:       bundled(vulkan) = 1.1.114
-%if 0%{?suse_version} == 1315
-BuildRequires:  gcc6-c++
 %endif
 Recommends:     freedoom
 Recommends:     timidity
@@ -67,7 +60,6 @@ Recommends:     timidity-eawpats
 Provides:       qzdoom = 1.3.0
 Provides:       zdoom = 2.8.1
 # DUMB is modified to read OggVorbis samples
-Provides:       bundled(dumb) = 0.9.3
 Provides:       bundled(gdtoa)
 Provides:       bundled(re2c) = 0.16.0
 Provides:       bundled(xbrz) = 1.7
@@ -85,41 +77,30 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
 * Demo record/playback of classic and Boom demos is not supported.
 
 %prep
-%setup -q -n %name-g%version
+%setup -qn %name-g%version
-%patch -P 1 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
-
+%if 0%{?sle_version} >= 150200
-%if 0%{?suse_version} >= 1500
+%patch -P 6 -p1
-%patch -P 2 -p1
+rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
 %endif
-%if 0%{?suse_version} >= 1550
-%patch -P 3 -p1
-rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan
-%endif
-%patch -P 4 -P 5 -P 6 -p1
 perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
-perl -i -pe 's{<unknown version>}{%version}g' \
-	tools/updaterevision/updaterevision.c
 
 %build
+# There is handcrafted assembler, which LTO does not play nice with.
 %define _lto_cflags %nil
-# We must not strip - %%debug_package will take care of it
-# Deactivate -Wl,--as-needed
 
 %ifarch %ix86
-# program does a cpuid check, so it is ok to enable
+# Allow sw to use intrinsics (functions like _mm_set_sd).
+# Guarded by cpuid calls by sw.
 export CFLAGS="%optflags -msse -msse2"
 export CXXFLAGS="%optflags -msse -msse2"
 %endif
 %cmake -DNO_STRIP=1 \
-%if 0%{suse_version} == 1315
-	-DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 \
-%endif
 	-DCMAKE_SHARED_LINKER_FLAGS="" \
 	-DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \
 	-DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \
 	-DINSTALL_PK3_PATH="%_datadir/doom" \
-	-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF \
+	-DDYN_OPENAL=OFF
-	-DDYN_SNDFILE=OFF -DDYN_MPG123=OFF
 make %{?_smp_mflags}
 
 %install