Accepting request 708833 from home:mnhauke:games

- Update to new upstream release 4.1.3
  * bug fixes for both zscript and vulkan (the vulkan renderer is
    pretty much complete at this point)
  * added native double round(double) function
  * added a crosshair on/off toggle
  * cl_blockcheats 2 blocks cheats without showing any messages,
    useful for streamers who happen to be mappers/modders/etc
- Update to new upstream release 4.1.0
  * workaround buggy preprocessor in old AMD OpenGL drivers
  * fix bloom pass regression
  * fixed scale calculations for option menus.
  * implement custom post process shaders for vulkan backend
  * improve error handling during vulkan initialization
  * fixed inverted logic for displaying the generic log in Strife.
- Remove patch:
  * gzdoom-staticlibs.patch (fixed by upstream)
- Update patch:
  * gzdoom-vulkan.patch

OBS-URL: https://build.opensuse.org/request/show/708833
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=24

g4.1.3.tar.gz

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

gzdoom-4.0.0.tar.xz

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

gzdoom-staticlibs.patch

@@ -1,99 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2018-01-02 19:17:14.364202580 +0100
-
-Bundled code needs to be explicitly set to STATIC, or cmake will generate files
-like "liblzma.so" etc. with no versioning and which are not installed by
-cmake_install. Some of the code is also an older version and may not
-necessarily be suitable for getting switched out by system library copies.
-
----
- asmjit/CMakeLists.txt          |    2 +-
- dumb/CMakeLists.txt            |    2 +-
- gdtoa/CMakeLists.txt           |    2 +-
- glslang/glslang/CMakeLists.txt |    2 +-
- glslang/spirv/CMakeLists.txt   |    4 ++--
- lzma/CMakeLists.txt            |    2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-Index: gzdoom-4.0.0/asmjit/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/asmjit/CMakeLists.txt
-+++ gzdoom-4.0.0/asmjit/CMakeLists.txt
-@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
-     asmjit/x86/x86regalloc.cpp
- )
- 
--add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
-+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
- 
- set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
- 
-Index: gzdoom-4.0.0/dumb/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/dumb/CMakeLists.txt
-+++ gzdoom-4.0.0/dumb/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
- 
- include_directories( include )
- 
--add_library( dumb
-+add_library( dumb STATIC
-     src/core/unload.c
-     src/core/rendsig.c
-     src/core/rendduh.c
-Index: gzdoom-4.0.0/gdtoa/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/gdtoa/CMakeLists.txt
-+++ gzdoom-4.0.0/gdtoa/CMakeLists.txt
-@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
- 	set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
- endif()
- 
--add_library( gdtoa
-+add_library( gdtoa STATIC
- 	${GEN_FP_FILES}
- 	dmisc.c
- 	dtoa.c
-Index: gzdoom-4.0.0/glslang/glslang/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/glslang/glslang/CMakeLists.txt
-+++ gzdoom-4.0.0/glslang/glslang/CMakeLists.txt
-@@ -106,7 +106,7 @@ set(HEADERS
- #                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
- 
--add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
-+add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
- set_property(TARGET glslang PROPERTY FOLDER glslang)
- set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_link_libraries(glslang OGLCompiler OSDependent)
-Index: gzdoom-4.0.0/glslang/spirv/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/glslang/spirv/CMakeLists.txt
-+++ gzdoom-4.0.0/glslang/spirv/CMakeLists.txt
-@@ -56,12 +56,12 @@ if(ENABLE_NV_EXTENSIONS)
-          GLSL.ext.NV.h)
- endif(ENABLE_NV_EXTENSIONS)
- 
--add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
-+add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
- set_property(TARGET SPIRV PROPERTY FOLDER glslang)
- set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(SPIRV PUBLIC ..)
- 
--add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
-+add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
- set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
- set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
- 
-Index: gzdoom-4.0.0/lzma/CMakeLists.txt
-===================================================================
---- gzdoom-4.0.0.orig/lzma/CMakeLists.txt
-+++ gzdoom-4.0.0/lzma/CMakeLists.txt
-@@ -34,5 +34,5 @@ else()
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
- endif()
- 
--add_library( lzma ${LZMA_FILES} )
-+add_library( lzma STATIC ${LZMA_FILES} )
- target_link_libraries( lzma )

gzdoom-vulkan.patch

@@ -65,28 +65,3 @@ Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp
  
  static const TBuiltInResource DefaultTBuiltInResource = {
  	/* .MaxLights = */ 32,
-@@ -89,15 +89,15 @@ static const TBuiltInResource DefaultTBu
- 	/* .MaxCullDistances = */ 8,
- 	/* .MaxCombinedClipAndCullDistances = */ 8,
- 	/* .MaxSamples = */ 4,
--//	/* .maxMeshOutputVerticesNV = */ 256,
--//	/* .maxMeshOutputPrimitivesNV = */ 512,
--//	/* .maxMeshWorkGroupSizeX_NV = */ 32,
--//	/* .maxMeshWorkGroupSizeY_NV = */ 1,
--//	/* .maxMeshWorkGroupSizeZ_NV = */ 1,
--//	/* .maxTaskWorkGroupSizeX_NV = */ 32,
--//	/* .maxTaskWorkGroupSizeY_NV = */ 1,
--//	/* .maxTaskWorkGroupSizeZ_NV = */ 1,
--//	/* .maxMeshViewCountNV = */ 4,
-+	/* .maxMeshOutputVerticesNV = */ 256,
-+	/* .maxMeshOutputPrimitivesNV = */ 512,
-+	/* .maxMeshWorkGroupSizeX_NV = */ 32,
-+	/* .maxMeshWorkGroupSizeY_NV = */ 1,
-+	/* .maxMeshWorkGroupSizeZ_NV = */ 1,
-+	/* .maxTaskWorkGroupSizeX_NV = */ 32,
-+	/* .maxTaskWorkGroupSizeY_NV = */ 1,
-+	/* .maxTaskWorkGroupSizeZ_NV = */ 1,
-+	/* .maxMeshViewCountNV = */ 4,
- 
- 	/* .limits = */ {
- 		/* .nonInductiveForLoops = */ 1,

gzdoom.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Jun  9 11:31:24 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to new upstream release 4.1.3
+  * bug fixes for both zscript and vulkan (the vulkan renderer is
+    pretty much complete at this point)
+  * added native double round(double) function
+  * added a crosshair on/off toggle
+  * cl_blockcheats 2 blocks cheats without showing any messages,
+    useful for streamers who happen to be mappers/modders/etc
+- Update to new upstream release 4.1.0
+  * workaround buggy preprocessor in old AMD OpenGL drivers
+  * fix bloom pass regression
+  * fixed scale calculations for option menus.
+  * implement custom post process shaders for vulkan backend
+  * improve error handling during vulkan initialization
+  * fixed inverted logic for displaying the generic log in Strife.
+- Remove patch:
+  * gzdoom-staticlibs.patch (fixed by upstream)
+- Update patch:
+  * gzdoom-vulkan.patch
+
 -------------------------------------------------------------------
 Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

gzdoom.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gzdoom
-Version:        4.0.0
+Version:        4.1.3
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
@@ -25,14 +25,12 @@ Group:          Amusements/Games/3D/Shoot
 Url:            http://zdoom.org/
 
 #Git-Clone:     https://github.com/coelckers/gzdoom
-Source:         %name-%version.tar.xz
+Source:         https://github.com/coelckers/gzdoom/archive/g%{version}.tar.gz
 Patch1:         gzdoom-waddir.patch
 Patch2:         gzdoom-wadsrc-extra.patch
-Patch3:         gzdoom-staticlibs.patch
 Patch4:         fl2.patch
 Patch5:         gzdoom-lzma.patch
 Patch6:         gzdoom-vulkan.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake >= 2.8.7
 BuildRequires:  gcc-c++
 BuildRequires:  glslang-devel
@@ -85,8 +83,8 @@ 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
+%setup -q -n %{name}-g%{version}
-%patch -P 1 -P 2 -P 3 -P 4 -p1
+%patch -P 1 -P 2 -P 4 -p1
 
 %if 0%{?suse_version} >= 1500
 %patch -P 5 -p1