From bc1ba12b7292c0bf40f1fe0ff98fb85201c7356f Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Apr 22 2019 17:39:07 +0000 Subject: Upstream release 4.0.0 --- diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch deleted file mode 100644 index 3c03cc0..0000000 --- a/gzdoom-asmjit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gzdoom/asmjit/CMakeLists.txt 2019-02-25 15:40:17.195766808 -0700 -+++ gzdoomnew/asmjit/CMakeLists.txt 2019-02-25 17:58:00.964376439 -0700 -@@ -97,7 +97,7 @@ - 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) - diff --git a/gzdoom-g3.7.2.tar.gz b/gzdoom-g3.7.2.tar.gz deleted file mode 100644 index 420a073..0000000 Binary files a/gzdoom-g3.7.2.tar.gz and /dev/null differ diff --git a/gzdoom-g4.0.0.tar.gz b/gzdoom-g4.0.0.tar.gz new file mode 100644 index 0000000..c3418f5 Binary files /dev/null and b/gzdoom-g4.0.0.tar.gz differ diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch deleted file mode 100644 index 00a6115..0000000 --- a/gzdoom-lzma.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1328491d3..219c20461 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,7 @@ endif() - - list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) - include( FindPackageHandleStandardArgs ) -+include(FindPkgConfig) - - # Produce a warning if XP support will be missing when building a 32 bit target for MSVC. - if( MSVC ) -@@ -320,7 +321,7 @@ else() - set( GME_LIBRARIES gme ) - endif() - --set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) -+pkg_check_modules(LZMA REQUIRED clzma) - - if( NOT CMAKE_CROSSCOMPILING ) - if( NOT CROSS_EXPORTS ) -@@ -338,7 +339,6 @@ install(DIRECTORY docs/ - DESTINATION ${INSTALL_DOCS_PATH} - COMPONENT "Documentation") - --add_subdirectory( lzma ) - add_subdirectory( tools ) - add_subdirectory( dumb ) - add_subdirectory( gdtoa ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 993952e8d..ea222f12a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -460,7 +460,7 @@ add_custom_target( revision_check ALL - - message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" ) --include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) -+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) - - if( SNDFILE_FOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" ) -@@ -1285,7 +1285,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") - set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket) - endif() - --target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) -+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) - - include_directories( . - g_statusbar -diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt -index 6a36b2cb5..75cadf47e 100644 ---- a/tools/zipdir/CMakeLists.txt -+++ b/tools/zipdir/CMakeLists.txt -@@ -1,9 +1,9 @@ - cmake_minimum_required( VERSION 2.8.7 ) - - if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) -+ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) - add_executable( zipdir - zipdir.c ) -- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) -+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS}) - set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) - endif() diff --git a/gzdoom-staticlibs.patch b/gzdoom-staticlibs.patch index 6661509..67a1e75 100644 --- a/gzdoom-staticlibs.patch +++ b/gzdoom-staticlibs.patch @@ -1,23 +1,17 @@ -From: Jan Engelhardt -Date: 2018-01-02 19:17:14.364202580 +0100 - -Some bundled code (which is also an older version and cannot simply be switched -out just yet) 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. - ---- - CMakeLists.txt | 1 - - dumb/CMakeLists.txt | 2 +- - gdtoa/CMakeLists.txt | 2 +- - lzma/CMakeLists.txt | 2 +- - 4 files changed, 3 insertions(+), 4 deletions(-) - -Index: gzdoom-g3.2.4/dumb/CMakeLists.txt -=================================================================== ---- gzdoom-g3.2.4.orig/dumb/CMakeLists.txt -+++ gzdoom-g3.2.4/dumb/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() +--- gzdoom-g4.0.0-orig/asmjit/CMakeLists.txt 2019-04-07 00:11:51.000000000 -0700 ++++ gzdoom-g4.0.0/asmjit/CMakeLists.txt 2019-04-16 11:57:58.349522685 -0700 +@@ -97,7 +97,7 @@ + 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) + +--- gzdoom-g4.0.0-orig/dumb/CMakeLists.txt 2019-04-07 00:11:51.000000000 -0700 ++++ gzdoom-g4.0.0/dumb/CMakeLists.txt 2019-04-16 11:50:31.315715842 -0700 +@@ -24,7 +24,7 @@ include_directories( include ) @@ -26,11 +20,9 @@ Index: gzdoom-g3.2.4/dumb/CMakeLists.txt src/core/unload.c src/core/rendsig.c src/core/rendduh.c -Index: gzdoom-g3.2.4/gdtoa/CMakeLists.txt -=================================================================== ---- gzdoom-g3.2.4.orig/gdtoa/CMakeLists.txt -+++ gzdoom-g3.2.4/gdtoa/CMakeLists.txt -@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE ) +--- gzdoom-g4.0.0-orig/gdtoa/CMakeLists.txt 2019-04-07 00:11:51.000000000 -0700 ++++ gzdoom-g4.0.0/gdtoa/CMakeLists.txt 2019-04-16 11:51:11.654326836 -0700 +@@ -35,7 +35,7 @@ set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h ) endif() @@ -39,14 +31,21 @@ Index: gzdoom-g3.2.4/gdtoa/CMakeLists.txt ${GEN_FP_FILES} dmisc.c dtoa.c -Index: gzdoom-g3.2.4/lzma/CMakeLists.txt -=================================================================== ---- gzdoom-g3.2.4.orig/lzma/CMakeLists.txt -+++ gzdoom-g3.2.4/lzma/CMakeLists.txt -@@ -34,5 +34,5 @@ else() +--- gzdoom-g4.0.0-orig/lzma/CMakeLists.txt 2019-04-07 00:11:51.000000000 -0700 ++++ gzdoom-g4.0.0/lzma/CMakeLists.txt 2019-04-16 11:51:36.964710203 -0700 +@@ -34,5 +34,5 @@ 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-g4.0.0-orig/CMakeLists.txt 2019-04-21 14:07:26.902658189 +0200 ++++ gzdoom-g4.0.0/CMakeLists.txt 2019-04-22 12:49:30.892920893 +0200 +@@ -1,5 +1,6 @@ + cmake_minimum_required( VERSION 2.8.7 ) + project(GZDoom) ++set( LIB_TYPE "STATIC" ) + + if( COMMAND cmake_policy ) + if( POLICY CMP0011 ) diff --git a/gzdoom-waddir.patch b/gzdoom-waddir.patch index e93c42d..0355b8f 100644 --- a/gzdoom-waddir.patch +++ b/gzdoom-waddir.patch @@ -7,11 +7,11 @@ Ensure same IWAD directory across all Doom source ports in openSUSE src/posix/i_system.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: gzdoom-g3.2.4/src/posix/i_system.h +Index: gzdoom-g4.0.0/src/posix/i_system.h =================================================================== ---- gzdoom-g3.2.4.orig/src/posix/i_system.h -+++ gzdoom-g3.2.4/src/posix/i_system.h -@@ -40,7 +40,7 @@ struct ticcmd_t; +--- gzdoom-g4.0.0/orig/src/posix/i_system.h ++++ gzdoom-g4.0.0/src/posix/i_system.h +@@ -45,7 +45,7 @@ struct ticcmd_t; struct WadStuff; #ifndef SHARE_DIR @@ -19,4 +19,4 @@ Index: gzdoom-g3.2.4/src/posix/i_system.h +#define SHARE_DIR "/usr/share/doom/" #endif - // Index values into the LanguageIDs array + diff --git a/gzdoom-wadsrc-extra.patch b/gzdoom-wadsrc-extra.patch deleted file mode 100644 index 12e5ab7..0000000 --- a/gzdoom-wadsrc-extra.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -Date: 2018-01-09 00:35:47.044540108 +0100 - -Since the openSUSE _service file downloads and creates a tarball -without wadsrc_extra, it now needs to be removed from CMakeLists -so that cmake does not fail with an error. ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -Index: gzdoom-3.2.5/CMakeLists.txt -=================================================================== ---- gzdoom-3.2.5.orig/CMakeLists.txt -+++ gzdoom-3.2.5/CMakeLists.txt -@@ -336,7 +336,6 @@ add_subdirectory( gdtoa ) - add_subdirectory( wadsrc ) - add_subdirectory( wadsrc_bm ) - add_subdirectory( wadsrc_lights ) --add_subdirectory( wadsrc_extra ) - add_subdirectory( src ) - - if( NOT CMAKE_CROSSCOMPILING ) diff --git a/gzdoom.desktop b/gzdoom.desktop index 504c968..db2fe54 100644 --- a/gzdoom.desktop +++ b/gzdoom.desktop @@ -7,4 +7,4 @@ Terminal=false Type=Application Categories=Game;ActionGame; Keywords=game;gzdoom;zdoom;doom;first;person;shooter; -X-Desktop-File-Install-Version=0.23 \ No newline at end of file +X-Desktop-File-Install-Version=0.23 diff --git a/gzdoom.spec b/gzdoom.spec index c046ba4..ebdddd9 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -1,5 +1,5 @@ Name: gzdoom -Version: 3.7.2 +Version: 4.0.0 Release: 1%{?dist} Summary: An OpenGL DOOM source port with graphic and modding extensions License: GPLv3 @@ -10,26 +10,29 @@ Source1: gzdoom.desktop Provides: bundled(lzma-sdk) = 17.01 Provides: bundled(dumb) = 0.9.3 Provides: bundled(gdtoa) +Provides: bundled(glslang) +Provides: bundled(SPIRV) Provides: bundled(re2c) = 0.16.0 Patch1: gzdoom-waddir.patch -Patch2: gzdoom-wadsrc-extra.patch -Patch3: gzdoom-staticlibs.patch -Patch6: gzdoom-asmjit.patch -Patch7: gzdoom-fl2.patch +Patch2: gzdoom-staticlibs.patch +Patch3: gzdoom-fl2.patch -BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: make BuildRequires: cmake BuildRequires: tar BuildRequires: git +BuildRequires: nasm BuildRequires: glew-devel # pkgconfig -#BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(fluidsynth) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sndfile) @@ -37,6 +40,11 @@ BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(libmpg123) +BuildRequires: timidity++ +BuildRequires: libjpeg-turbo-devel +BuildRequires: wildmidi-devel +Requires: wildmidi + Requires: openal-soft Requires: fluidsynth Requires: SDL2 @@ -70,7 +78,10 @@ GZDoom provides an OpenGL renderer and HQnX rescaling. %prep %setup -q -n %{name}-g%{version} -%patch -P 1 -P 2 -P 3 -P 6 -P 7 -p1 +%patch -P 1 -P 2 -P 3 -p1 + +perl -i -pe 's{}{%version}g' \ +tools/updaterevision/updaterevision.c %build %cmake -DNO_STRIP=1 \ @@ -116,5 +127,8 @@ echo "INFO: %{name}: The global IWAD directory is %{_datadir}/doom." %changelog +* Sat Apr 20 2019 Dmitri Smirnov - 4.0.0-1 +- Upstream release 4.0.0 + * Sun Apr 14 2019 Dmitri Smirnov - 3.7.2-1 - Upstream release 3.7.2 \ No newline at end of file