diff --git a/yoshimi-cflags.patch b/yoshimi-cflags.patch index 9b45484..3367142 100644 --- a/yoshimi-cflags.patch +++ b/yoshimi-cflags.patch @@ -1,7 +1,6 @@ -diff -ur yoshimi-1.5.1/src/CMakeLists.txt yoshimi-1.5.1.new/src/CMakeLists.txt ---- yoshimi-1.5.1/src/CMakeLists.txt 2017-03-30 13:57:26.000000000 +0100 -+++ yoshimi-1.5.1.new/src/CMakeLists.txt 2017-04-09 19:47:52.797194278 +0100 -@@ -41,6 +41,7 @@ +--- yoshimi-1.5.7/src/CMakeLists.txt 2018-03-21 17:30:00.000000000 +0000 ++++ yoshimi-1.5.7.new/src/CMakeLists.txt 2018-03-28 22:05:21.292620746 +0100 +@@ -47,6 +47,7 @@ # relative paths break some scripts(?) set (CMAKE_SKIP_RULE_DEPENDENCY OFF) # Rebuild objects if rules have changed, even if source hasn't. @@ -9,27 +8,18 @@ diff -ur yoshimi-1.5.1/src/CMakeLists.txt yoshimi-1.5.1.new/src/CMakeLists.txt message (STATUS "Building Yoshimi version ${YOSHIMI_VERSION} for ${CMAKE_SYSTEM_NAME}") -@@ -82,12 +83,12 @@ - option (ShowNoteOnTimes "Report Note-On Times" OFF) +@@ -97,12 +98,12 @@ + ) - set (BuildOptions_x86_64AMD -- "-O3 -march=athlon64 -m64 -Wall -ffast-math -fno-finite-math-only -fomit-frame-pointer" -+ ${CMAKE_C_FLAGS} + set (BuildOptions_X86_64AMD +- "-O3 -march=athlon64 -m64 -Wall -msse -msse2 -mfpmath=sse -ffast-math -fno-finite-math-only -fomit-frame-pointer" ++ ${CMAKE_C_FLAGS} CACHE STRING "X86_64 compiler options" ) set (BuildOptions_X86_64Core2 -- "-O3 -march=core2 -m64 -Wall -ffast-math -fno-finite-math-only -fomit-frame-pointer" -+ ${CMAKE_C_FLAGS} +- "-O3 -march=core2 -m64 -Wall -msse -msse2 -mfpmath=sse -ffast-math -fno-finite-math-only -fomit-frame-pointer" ++ ${CMAKE_C_FLAGS} CACHE STRING "X86_64 compiler options" ) -@@ -102,7 +103,7 @@ - ) - - set (BuildOptionsBasic -- "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer" -+ ${CMAKE_C_FLAGS} - CACHE STRING "basic X86 complier options" - ) - diff --git a/yoshimi.spec b/yoshimi.spec index a5332cd..b72852f 100644 --- a/yoshimi.spec +++ b/yoshimi.spec @@ -1,6 +1,6 @@ Name: yoshimi -Version: 1.5.4.1 -Release: 3%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: Rewrite of ZynAddSubFx aiming for better JACK support Group: Applications/Multimedia @@ -44,7 +44,7 @@ effects like Reverb, Echo, Chorus, Phaser... %build cd src export CFLAGS="%{optflags}" -%cmake -DCMAKE_CXX_FLAGS="$cxxflags" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl . +%cmake -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl . make VERBOSE=1 %{?_smp_mflags} @@ -64,10 +64,10 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/banks/* chmod 755 %{buildroot}%{_datadir}/%{name}/presets chmod 755 %{buildroot}%{_datadir}/%{name}/presets/* -rm %{buildroot}%{_datadir}/%{name}/yoshimi-user-manual.pdf +rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-1.5.7.pdf %files -%doc Changelog COPYING README.txt doc/* yoshimi-user-manual.pdf +%doc Changelog COPYING README.txt doc/* %{_bindir}/%{name} %{_datadir}/%{name}/banks/ %{_datadir}/applications/%{name}.desktop @@ -82,6 +82,9 @@ rm %{buildroot}%{_datadir}/%{name}/yoshimi-user-manual.pdf %{_mandir}/man1/yoshimi.1* %changelog +* Thu Mar 22 2018 Adam Huffman - 1.5.7-1 +- Update to upstream bugfix release 1.5.7 + * Fri Feb 09 2018 Fedora Release Engineering - 1.5.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild