diff --git a/disable_sse.patch b/disable_sse.patch new file mode 100644 index 0000000..6e1b149 --- /dev/null +++ b/disable_sse.patch @@ -0,0 +1,12 @@ +--- src/CMakeLists.txt.orig 2018-04-18 16:11:00.227988702 +0200 ++++ src/CMakeLists.txt 2018-04-18 16:11:14.228041424 +0200 +@@ -97,9 +97,6 @@ if(APPLE) + set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + endif(APPLE) + +-# enable SSE instructions for dumb library +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse") +- + add_executable(slade WIN32 MACOSX_BUNDLE + External/lzma/C/LzmaDec.c + External/mus2mid/mus2mid.cpp diff --git a/slade.changes b/slade.changes index 42e2085..30654a0 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 18 14:26:53 UTC 2018 - guillaume.gardet@opensuse.org + +- Disable SSE with disable_sse.patch on non x86* archs + ------------------------------------------------------------------- Tue Jun 27 23:26:49 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/slade.spec b/slade.spec index 83be979..b422aa7 100644 --- a/slade.spec +++ b/slade.spec @@ -1,7 +1,7 @@ # # spec file for package slade # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: slade Version: 3.1.1.5 Release: 0 Summary: An editor for DOOM maps and WAD/PK3 archives -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/3D/Shoot Url: https://github.com/sirjuddington/SLADE Source: https://github.com/sirjuddington/%name/archive/%version.tar.gz @@ -28,14 +28,15 @@ Source2: slade.desktop Source100: slade.appdata.xml Patch1: basepk3.diff Patch2: wxChar.patch +Patch10: disable_sse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: freeimage-devel BuildRequires: gcc-c++ +BuildRequires: p7zip BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel -BuildRequires: p7zip BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(gl) @@ -56,6 +57,9 @@ from/to other generic formats such as PNG. %prep %setup -qn SLADE-%version %patch -P 1 -P 2 -p1 +%ifnarch %{ix86} x86_64 +%patch10 -p0 +%endif %build %cmake -DUSE_WEBKIT_STARTPAGE=ON