jengelh/slade
SHA256
1
0
Fork 0
forked from pool/slade
Code Pull Requests Activity

Accepting request 798915 from games:tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/798915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slade?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2020-04-29 18:53:35 +00:00 committed by Git OBS Bridge
commit ee4199546e
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
disable_sse.patch
View File

@ -1,12 +1,12 @@
--- src/CMakeLists.txt.orig 2018-04-18 16:11:00.227988702 +0200 --- src/CMakeLists.txt.orig 2020-04-29 12:44:22.087112317 +0000
+++ src/CMakeLists.txt 2018-04-18 16:11:14.228041424 +0200 +++ src/CMakeLists.txt 2020-04-29 12:44:38.886604020 +0000
@@ -97,9 +97,6 @@ if(APPLE) @@ -159,9 +159,6 @@ if(APPLE)
set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif(APPLE) endif(APPLE)
-# enable SSE instructions for dumb library -# enable SSE instructions for dumb library
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse")
- -
add_executable(slade WIN32 MACOSX_BUNDLE # External libraries are compiled separately to enable unity builds
External/lzma/C/LzmaDec.c add_subdirectory(External)
External/mus2mid/mus2mid.cpp

5
slade.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 29 12:45:36 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Refresh disable_sse.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

5
slade.spec
View File

@ -33,6 +33,7 @@ BuildRequires: ImageMagick
BuildRequires: cmake >= 3.1 BuildRequires: cmake >= 3.1
BuildRequires: freeimage-devel BuildRequires: freeimage-devel
BuildRequires: gcc-c++ >= 6 BuildRequires: gcc-c++ >= 6
BuildRequires: pkgconfig
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel BuildRequires: wxWidgets-3_0-devel
BuildRequires: zip BuildRequires: zip
@ -54,7 +55,7 @@ game-specific formats, and even convert between some of them, or
from/to other generic formats such as PNG. from/to other generic formats such as PNG.
%prep %prep
%setup -qn SLADE-%version %setup -q -n SLADE-%version
%patch -P 1 -P 2 -p1 %patch -P 1 -P 2 -p1
%ifnarch %ix86 x86_64 %ifnarch %ix86 x86_64
%patch10 -p0 %patch10 -p0
@ -69,7 +70,7 @@ make %{?_smp_mflags}
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
strip-nondeterminism build/slade.pk3 strip-nondeterminism build/slade.pk3
%endif %endif
b="%buildroot" b=%{buildroot}
install -Dm755 build/slade "$b/%_bindir/slade" install -Dm755 build/slade "$b/%_bindir/slade"
install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3" install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"