diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch new file mode 100644 index 0000000..a5f4960 --- /dev/null +++ b/gzdoom-asmjit.patch @@ -0,0 +1,16 @@ +--- + libraries/asmjit/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +Index: gzdoom-g4.2.1/libraries/asmjit/CMakeLists.txt +=================================================================== +--- gzdoom-g4.2.1.orig/libraries/asmjit/CMakeLists.txt ++++ gzdoom-g4.2.1/libraries/asmjit/CMakeLists.txt +@@ -140,6 +140,7 @@ endforeach() + + add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS}) + set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) ++target_link_libraries(${ASMJITNAME} rt) + + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + install(TARGETS ${ASMJITNAME} diff --git a/gzdoom.changes b/gzdoom.changes index 536c959..26543a8 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 1 06:23:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de> + +- Add gzdoom-asmjit.patch. +- Enable SSE/SSE2. + ------------------------------------------------------------------- Fri Sep 13 11:39:15 UTC 2019 - Jan Engelhardt <jengelh@inai.de> diff --git a/gzdoom.spec b/gzdoom.spec index 1f33a78..f1c00fc 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -29,6 +29,7 @@ Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch Patch3: gzdoom-vulkan.patch +Patch4: gzdoom-asmjit.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: glslang-devel @@ -92,6 +93,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %patch -P 3 -p1 rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan %endif +%patch -P 4 -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 @@ -100,6 +102,12 @@ perl -i -pe 's{<unknown version>}{%version}g' \ %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 +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 \