Merge branch 'main' into f32

Merge branch 'master' into f32
2021-04-18 17:22:51 +01:00 · 2021-03-02 12:40:06 +00:00 · 2021-03-02 11:10:05 +00:00 · 2020-12-22 12:18:28 +00:00 · 2020-08-19 13:26:12 +01:00
1 changed files with 2 additions and 1 deletions
--- a/yoshimi.spec
+++ b/yoshimi.spec
@ -45,7 +45,7 @@ effects like Reverb, Echo, Chorus, Phaser...

 %build
 export CFLAGS="%{optflags}"
-%cmake -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
+%cmake -S src -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
 %cmake_build


@ -99,6 +99,7 @@ rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-2.0.pdf

 * Wed Aug 19 2020 Adam Huffman <bloch@verdurin.com> - 1.7.2-1
 - Update to upstream release 1.7.2
+- Hard-code CMake to use src as builddir

 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Author	SHA1	Message	Date
Adam Huffman	f478188a17	Merge branch 'main' into f32	2021-04-18 17:22:51 +01:00
Adam Huffman	4c725071d1	Merge branch 'main' into f32	2021-03-02 12:40:06 +00:00
Adam Huffman	f715567ea4	Merge branch 'master' into f32	2021-03-02 11:10:05 +00:00
Adam Huffman	25d4636426	Merge branch 'master' into f32	2020-12-22 12:18:28 +00:00
Adam Huffman	911929b7c0	Hard-code builddir for CMake	2020-08-19 13:26:12 +01:00