From 69efd317afd94af1a774fa67a2a2466e42578c3b8ec623991a66fcf6f660b07f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 15 Jun 2021 12:34:27 +0000 Subject: [PATCH] Accepting request 900154 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Refresh patch to fix build on aarch64: * disable_sse.patch OBS-URL: https://build.opensuse.org/request/show/900154 OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=40 --- disable_sse.patch | 10 +++++----- slade.changes | 6 ++++++ slade.spec | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/disable_sse.patch b/disable_sse.patch index 54a78a3..2a5b138 100644 --- a/disable_sse.patch +++ b/disable_sse.patch @@ -1,5 +1,5 @@ ---- src/CMakeLists.txt.orig 2020-04-29 12:44:22.087112317 +0000 -+++ src/CMakeLists.txt 2020-04-29 12:44:38.886604020 +0000 +--- SLADE-3.1.13/src/CMakeLists.txt.orig 2021-06-15 14:13:13.473287606 +0200 ++++ SLADE-3.1.13/src/CMakeLists.txt 2021-06-15 14:13:28.233451010 +0200 @@ -159,9 +159,6 @@ if(APPLE) set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif(APPLE) @@ -7,6 +7,6 @@ -# enable SSE instructions for dumb library -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse") - - # External libraries are compiled separately to enable unity builds - add_subdirectory(External) - + if(USE_SANITIZER) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") diff --git a/slade.changes b/slade.changes index 341d52b..c6a90f6 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 15 12:14:46 UTC 2021 - Guillaume GARDET + +- Refresh patch to fix build on aarch64: + * disable_sse.patch + ------------------------------------------------------------------- Tue Jun 1 11:00:31 UTC 2021 - Jan Engelhardt diff --git a/slade.spec b/slade.spec index 28348d5..3024302 100644 --- a/slade.spec +++ b/slade.spec @@ -60,7 +60,7 @@ from/to other generic formats such as PNG. %setup -q -n SLADE-%version %patch -P 1 -P 2 -P 3 -P 4 -p1 %ifnarch %ix86 x86_64 -%patch10 -p0 +%patch10 -p1 %endif %if 0%{?suse_version} >= 1550 %patch -P 11 -p1