1 |
commit: 0c9230e8b9ae77c3db56b80ad1b6b21e547899bb |
2 |
Author: Gergely Nagy <ngg <AT> ngg <DOT> hu> |
3 |
AuthorDate: Tue Jun 27 22:13:27 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 30 15:45:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9230e8 |
7 |
|
8 |
media-sound/musescore: Version bump to 2.1.0 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5000 |
11 |
|
12 |
media-sound/musescore/Manifest | 1 + |
13 |
.../files/musescore-2.1.0-fix-buildsystem.patch | 494 +++++++++++++++++++++ |
14 |
media-sound/musescore/metadata.xml | 3 + |
15 |
media-sound/musescore/musescore-2.1.0.ebuild | 64 +++ |
16 |
4 files changed, 562 insertions(+) |
17 |
|
18 |
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest |
19 |
index 7ca5ad280e9..05a5d36252c 100644 |
20 |
--- a/media-sound/musescore/Manifest |
21 |
+++ b/media-sound/musescore/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6 |
24 |
DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2 |
25 |
+DIST musescore-2.1.0.tar.gz 51131549 SHA256 0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 WHIRLPOOL 1814cf937f1f1f9898f8aa62a60ed3dbfec4cb9af2ded6d03ccfde6c372bba6b3ddc8c6ba83677fc770363975c7c36a144adb17f16195e8b30706d6bcfea9c69 |
26 |
|
27 |
diff --git a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..9667c4fadc1 |
30 |
--- /dev/null |
31 |
+++ b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch |
32 |
@@ -0,0 +1,494 @@ |
33 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
+index 079504708..026e8289a 100644 |
35 |
+--- a/CMakeLists.txt |
36 |
++++ b/CMakeLists.txt |
37 |
+@@ -153,23 +153,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") |
38 |
+ endif() |
39 |
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") |
40 |
+ |
41 |
+-if (APPLE) |
42 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override") |
43 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override") |
44 |
+-else (APPLE) |
45 |
+- if (MINGW) |
46 |
+- # -mno-ms-bitfields see #22048 |
47 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g") |
48 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG") |
49 |
+- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware") |
50 |
+- else (MINGW) |
51 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -g") |
52 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG") |
53 |
+- endif (MINGW) |
54 |
+-endif(APPLE) |
55 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG") |
56 |
++set(CMAKE_CXX_STANDARD 11) |
57 |
++set(CMAKE_CXX_STANDARD_REQUIRED ON) |
58 |
++set(CMAKE_CXX_EXTENSIONS OFF) |
59 |
+ |
60 |
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE) |
61 |
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement) |
62 |
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement) |
63 |
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) |
64 |
+ |
65 |
+ # The Mscore version number. |
66 |
+@@ -473,7 +463,6 @@ if (NOT MINGW AND NOT APPLE) |
67 |
+ # set library search path for runtime linker to load the same |
68 |
+ # qt libraries as we used at compile time |
69 |
+ # |
70 |
+- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE" |
71 |
+ string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention |
72 |
+ if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match |
73 |
+ # Build portable AppImage as per https://github.com/probonopd/AppImageKit |
74 |
+@@ -577,9 +566,6 @@ add_custom_command( |
75 |
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h |
76 |
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR} |
77 |
+ ) |
78 |
+-if (NOT MINGW) |
79 |
+- set(BUILD_PCH true) |
80 |
+-endif(NOT MINGW) |
81 |
+ |
82 |
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH}) |
83 |
+ |
84 |
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt |
85 |
+index 7962e8781..a23aef396 100644 |
86 |
+--- a/aeolus/CMakeLists.txt |
87 |
++++ b/aeolus/CMakeLists.txt |
88 |
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC |
89 |
+ set_target_properties ( |
90 |
+ aeolus |
91 |
+ PROPERTIES |
92 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
93 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
94 |
+ ) |
95 |
+ |
96 |
+ install(DIRECTORY |
97 |
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt |
98 |
+index 5b1dd48ee..0d28df8ea 100644 |
99 |
+--- a/audiofile/CMakeLists.txt |
100 |
++++ b/audiofile/CMakeLists.txt |
101 |
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC |
102 |
+ set_target_properties ( |
103 |
+ audiofile |
104 |
+ PROPERTIES |
105 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
106 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
107 |
+ ) |
108 |
+ |
109 |
+ xcode_pch(audiofile all) |
110 |
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt |
111 |
+index 9589cceb2..f4172ed6d 100644 |
112 |
+--- a/awl/CMakeLists.txt |
113 |
++++ b/awl/CMakeLists.txt |
114 |
+@@ -43,7 +43,7 @@ add_library ( |
115 |
+ set_target_properties ( |
116 |
+ awl |
117 |
+ PROPERTIES |
118 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
119 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
120 |
+ ) |
121 |
+ |
122 |
+ xcode_pch(awl all) |
123 |
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake |
124 |
+index 6cb671afc..3d4aae3c2 100644 |
125 |
+--- a/build/CreatePrecompiledHeader.cmake |
126 |
++++ b/build/CreatePrecompiledHeader.cmake |
127 |
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch) |
128 |
+ set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch) |
129 |
+ add_custom_command( |
130 |
+ OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch |
131 |
+- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h |
132 |
++ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h |
133 |
+ DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h |
134 |
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR} |
135 |
+ VERBATIM |
136 |
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt |
137 |
+index d6b779465..acec8b5e9 100644 |
138 |
+--- a/bww2mxml/CMakeLists.txt |
139 |
++++ b/bww2mxml/CMakeLists.txt |
140 |
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE) |
141 |
+ set_target_properties ( |
142 |
+ bww2mxml |
143 |
+ PROPERTIES |
144 |
+- COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" |
145 |
++ COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" |
146 |
+ ) |
147 |
+ |
148 |
+ target_link_libraries(bww2mxml |
149 |
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt |
150 |
+index a695f1d5e..cf94caed9 100644 |
151 |
+--- a/effects/CMakeLists.txt |
152 |
++++ b/effects/CMakeLists.txt |
153 |
+@@ -44,7 +44,7 @@ add_library (effects STATIC |
154 |
+ set_target_properties ( |
155 |
+ effects |
156 |
+ PROPERTIES |
157 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
158 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
159 |
+ ) |
160 |
+ |
161 |
+ xcode_pch(effects all) |
162 |
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt |
163 |
+index 1dc8d2f8d..3fede6647 100644 |
164 |
+--- a/fluid/CMakeLists.txt |
165 |
++++ b/fluid/CMakeLists.txt |
166 |
+@@ -45,7 +45,7 @@ add_library (fluid STATIC |
167 |
+ set_target_properties ( |
168 |
+ fluid |
169 |
+ PROPERTIES |
170 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
171 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
172 |
+ ) |
173 |
+ |
174 |
+ xcode_pch(fluid all) |
175 |
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt |
176 |
+index 74a525ba3..f318f4c04 100644 |
177 |
+--- a/fonttools/CMakeLists.txt |
178 |
++++ b/fonttools/CMakeLists.txt |
179 |
+@@ -19,5 +19,5 @@ add_executable( |
180 |
+ ) |
181 |
+ |
182 |
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype) |
183 |
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch") |
184 |
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch") |
185 |
+ |
186 |
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt |
187 |
+index 446d413ee..5d871a813 100644 |
188 |
+--- a/libmscore/CMakeLists.txt |
189 |
++++ b/libmscore/CMakeLists.txt |
190 |
+@@ -71,8 +71,8 @@ add_library ( |
191 |
+ set_target_properties ( |
192 |
+ libmscore |
193 |
+ PROPERTIES |
194 |
+- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
195 |
+-# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual" |
196 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
197 |
++# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual" |
198 |
+ ) |
199 |
+ |
200 |
+ xcode_pch(libmscore all) |
201 |
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt |
202 |
+index cf6edcaed..ceffd7330 100644 |
203 |
+--- a/manual/CMakeLists.txt |
204 |
++++ b/manual/CMakeLists.txt |
205 |
+@@ -36,13 +36,13 @@ if(APPLE) |
206 |
+ set_target_properties ( |
207 |
+ genManual |
208 |
+ PROPERTIES |
209 |
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra" |
210 |
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra" |
211 |
+ ) |
212 |
+ else(APPLE) |
213 |
+ set_target_properties ( |
214 |
+ genManual |
215 |
+ PROPERTIES |
216 |
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra" |
217 |
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra" |
218 |
+ ) |
219 |
+ endif(APPLE) |
220 |
+ |
221 |
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt |
222 |
+index 05fbb83d5..ea95480c9 100644 |
223 |
+--- a/midi/CMakeLists.txt |
224 |
++++ b/midi/CMakeLists.txt |
225 |
+@@ -27,7 +27,7 @@ add_library (midi STATIC |
226 |
+ set_target_properties ( |
227 |
+ midi |
228 |
+ PROPERTIES |
229 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
230 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
231 |
+ ) |
232 |
+ |
233 |
+ xcode_pch(midi all) |
234 |
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt |
235 |
+index 6df79c41b..f8145e04a 100644 |
236 |
+--- a/miditools/CMakeLists.txt |
237 |
++++ b/miditools/CMakeLists.txt |
238 |
+@@ -13,7 +13,7 @@ |
239 |
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp) |
240 |
+ |
241 |
+ set_target_properties(smf2xml |
242 |
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra" |
243 |
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra" |
244 |
+ ) |
245 |
+ target_link_libraries(smf2xml |
246 |
+ ${QT_LIBRARIES} |
247 |
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp) |
248 |
+ |
249 |
+ set_target_properties ( |
250 |
+ xml2smf |
251 |
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra" |
252 |
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra" |
253 |
+ ) |
254 |
+ target_link_libraries(xml2smf |
255 |
+ ${QT_LIBRARIES} |
256 |
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt |
257 |
+index 36196e1c8..cb4a889cd 100644 |
258 |
+--- a/mscore/CMakeLists.txt |
259 |
++++ b/mscore/CMakeLists.txt |
260 |
+@@ -379,7 +379,7 @@ if (MINGW) |
261 |
+ if (CMAKE_BUILD_TYPE MATCHES "DEBUG") |
262 |
+ set_target_properties(mscore |
263 |
+ PROPERTIES |
264 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" |
265 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" |
266 |
+ LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib" |
267 |
+ ) |
268 |
+ else (CMAKE_BUILD_TYPE MATCHES "DEBUG") |
269 |
+@@ -507,7 +507,7 @@ else (MINGW) |
270 |
+ if (APPLE) |
271 |
+ set(PORTMIDI_LIB portmidi) |
272 |
+ else (APPLE) |
273 |
+- set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi. |
274 |
++ set(PORTMIDI_LIB -lportmidi) # -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi. |
275 |
+ endif (APPLE) |
276 |
+ target_link_libraries(mscore ${PORTMIDI_LIB}) |
277 |
+ endif (USE_PORTMIDI) |
278 |
+@@ -526,7 +526,7 @@ else (MINGW) |
279 |
+ |
280 |
+ set_target_properties(mscore |
281 |
+ PROPERTIES |
282 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch" |
283 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch" |
284 |
+ ) |
285 |
+ |
286 |
+ if (OMR) |
287 |
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt |
288 |
+index e60d901fa..d3ba64316 100644 |
289 |
+--- a/mstyle/CMakeLists.txt |
290 |
++++ b/mstyle/CMakeLists.txt |
291 |
+@@ -49,7 +49,7 @@ add_library ( |
292 |
+ set_target_properties ( |
293 |
+ mstyle |
294 |
+ PROPERTIES |
295 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
296 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
297 |
+ ) |
298 |
+ |
299 |
+ xcode_pch(mstyle all) |
300 |
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt |
301 |
+index 0831c0810..3e37b2d34 100644 |
302 |
+--- a/mtest/CMakeLists.txt |
303 |
++++ b/mtest/CMakeLists.txt |
304 |
+@@ -113,20 +113,10 @@ target_link_libraries( |
305 |
+ |
306 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") |
307 |
+ |
308 |
+-if (APPLE) |
309 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override") |
310 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override") |
311 |
+-else (APPLE) |
312 |
+- if (MINGW) |
313 |
+- # -mno-ms-bitfields see #22048 |
314 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g") |
315 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG") |
316 |
+- else (MINGW) |
317 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -g") |
318 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG") |
319 |
+- endif (MINGW) |
320 |
+-endif(APPLE) |
321 |
+- |
322 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG") |
323 |
++set(CMAKE_CXX_STANDARD 11) |
324 |
++set(CMAKE_CXX_STANDARD_REQUIRED ON) |
325 |
++set(CMAKE_CXX_EXTENSIONS OFF) |
326 |
+ |
327 |
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}") |
328 |
+ |
329 |
+@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) |
330 |
+ set_target_properties ( |
331 |
+ testutils |
332 |
+ PROPERTIES |
333 |
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra" |
334 |
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra" |
335 |
+ ) |
336 |
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) |
337 |
+ set_target_properties ( |
338 |
+ testutils |
339 |
+ PROPERTIES |
340 |
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra" |
341 |
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra" |
342 |
+ ) |
343 |
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) |
344 |
+ |
345 |
+-# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra" |
346 |
++# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra" |
347 |
+ |
348 |
+ add_custom_target(report |
349 |
+ COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report |
350 |
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc |
351 |
+index 9de4518a5..275da35b1 100644 |
352 |
+--- a/mtest/cmake.inc |
353 |
++++ b/mtest/cmake.inc |
354 |
+@@ -57,16 +57,16 @@ set_target_properties ( |
355 |
+ ${TARGET} |
356 |
+ PROPERTIES |
357 |
+ AUTOMOC true |
358 |
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra" |
359 |
+- LINK_FLAGS "-g -stdlib=libc++" |
360 |
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra" |
361 |
++ LINK_FLAGS "-stdlib=libc++" |
362 |
+ ) |
363 |
+ else(APPLE) |
364 |
+ set_target_properties ( |
365 |
+ ${TARGET} |
366 |
+ PROPERTIES |
367 |
+ AUTOMOC true |
368 |
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra" |
369 |
+- LINK_FLAGS "-g" |
370 |
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra" |
371 |
++ LINK_FLAGS "" |
372 |
+ ) |
373 |
+ endif(APPLE) |
374 |
+ |
375 |
+@@ -74,7 +74,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) |
376 |
+ set_target_properties ( |
377 |
+ ${TARGET} |
378 |
+ PROPERTIES |
379 |
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra" |
380 |
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra" |
381 |
+ ) |
382 |
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) |
383 |
+ |
384 |
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt |
385 |
+index 88615e5fe..d719e895e 100644 |
386 |
+--- a/omr/CMakeLists.txt |
387 |
++++ b/omr/CMakeLists.txt |
388 |
+@@ -42,7 +42,7 @@ add_library ( |
389 |
+ set_target_properties ( |
390 |
+ omr |
391 |
+ PROPERTIES |
392 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
393 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
394 |
+ ) |
395 |
+ |
396 |
+ xcode_pch(omr all) |
397 |
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt |
398 |
+index 0520920cf..e9bd15b4e 100644 |
399 |
+--- a/synthesizer/CMakeLists.txt |
400 |
++++ b/synthesizer/CMakeLists.txt |
401 |
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC |
402 |
+ set_target_properties ( |
403 |
+ synthesizer |
404 |
+ PROPERTIES |
405 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
406 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
407 |
+ ) |
408 |
+ |
409 |
+ xcode_pch(synthesizer all) |
410 |
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt |
411 |
+index ae905c735..9b039e8d2 100644 |
412 |
+--- a/thirdparty/beatroot/CMakeLists.txt |
413 |
++++ b/thirdparty/beatroot/CMakeLists.txt |
414 |
+@@ -14,7 +14,7 @@ add_library ( |
415 |
+ |
416 |
+ set_target_properties( beatroot |
417 |
+ PROPERTIES |
418 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
419 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
420 |
+ ) |
421 |
+ |
422 |
+ xcode_pch(beatroot all) |
423 |
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt |
424 |
+index d0155b214..35bd6ac4b 100644 |
425 |
+--- a/thirdparty/diff/CMakeLists.txt |
426 |
++++ b/thirdparty/diff/CMakeLists.txt |
427 |
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC |
428 |
+ set_target_properties ( |
429 |
+ diff_match_patch |
430 |
+ PROPERTIES |
431 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
432 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
433 |
+ ) |
434 |
+ |
435 |
+ xcode_pch(diff_match_patch all) |
436 |
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt |
437 |
+index 9beb6b1f2..f7ec1c5ba 100644 |
438 |
+--- a/thirdparty/kQOAuth/CMakeLists.txt |
439 |
++++ b/thirdparty/kQOAuth/CMakeLists.txt |
440 |
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC |
441 |
+ set_target_properties ( |
442 |
+ kqoauth |
443 |
+ PROPERTIES |
444 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch" |
445 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch" |
446 |
+ ) |
447 |
+ |
448 |
+ xcode_pch(kqoauth all) |
449 |
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt |
450 |
+index fc39a0aa1..8c11f0710 100644 |
451 |
+--- a/thirdparty/ofqf/CMakeLists.txt |
452 |
++++ b/thirdparty/ofqf/CMakeLists.txt |
453 |
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC |
454 |
+ set_target_properties ( |
455 |
+ ofqf |
456 |
+ PROPERTIES |
457 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
458 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
459 |
+ ) |
460 |
+ |
461 |
+ xcode_pch(ofqf all) |
462 |
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt |
463 |
+index 77b19979e..417017e12 100644 |
464 |
+--- a/thirdparty/qzip/CMakeLists.txt |
465 |
++++ b/thirdparty/qzip/CMakeLists.txt |
466 |
+@@ -29,7 +29,7 @@ add_library(qzip STATIC |
467 |
+ set_target_properties ( |
468 |
+ qzip |
469 |
+ PROPERTIES |
470 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
471 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
472 |
+ ) |
473 |
+ |
474 |
+ xcode_pch(qzip all) |
475 |
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt |
476 |
+index 230339bde..6c94a06ea 100644 |
477 |
+--- a/thirdparty/rtf2html/CMakeLists.txt |
478 |
++++ b/thirdparty/rtf2html/CMakeLists.txt |
479 |
+@@ -37,7 +37,7 @@ add_library ( |
480 |
+ |
481 |
+ set_target_properties( rtf2html |
482 |
+ PROPERTIES |
483 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
484 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
485 |
+ ) |
486 |
+ |
487 |
+ xcode_pch(rtf2html all) |
488 |
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt |
489 |
+index 2504b017e..936fa3f09 100644 |
490 |
+--- a/thirdparty/singleapp/src/CMakeLists.txt |
491 |
++++ b/thirdparty/singleapp/src/CMakeLists.txt |
492 |
+@@ -31,7 +31,7 @@ add_library ( |
493 |
+ set_target_properties ( |
494 |
+ qtsingleapp |
495 |
+ PROPERTIES |
496 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
497 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
498 |
+ ) |
499 |
+ |
500 |
+ xcode_pch(qtsingleapp all) |
501 |
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt |
502 |
+index 5991e09e5..7f1268e62 100644 |
503 |
+--- a/thirdparty/xmlstream/CMakeLists.txt |
504 |
++++ b/thirdparty/xmlstream/CMakeLists.txt |
505 |
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC |
506 |
+ set_target_properties ( |
507 |
+ xmlstream |
508 |
+ PROPERTIES |
509 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
510 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
511 |
+ ) |
512 |
+ |
513 |
+ xcode_pch(xmlstream all) |
514 |
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt |
515 |
+index c0db57150..58d8ddf9f 100644 |
516 |
+--- a/zerberus/CMakeLists.txt |
517 |
++++ b/zerberus/CMakeLists.txt |
518 |
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC |
519 |
+ set_target_properties ( |
520 |
+ zerberus |
521 |
+ PROPERTIES |
522 |
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" |
523 |
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch" |
524 |
+ ) |
525 |
+ |
526 |
+ xcode_pch(zerberus all) |
527 |
|
528 |
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml |
529 |
index 422ed8688f8..73e8e2334c0 100644 |
530 |
--- a/media-sound/musescore/metadata.xml |
531 |
+++ b/media-sound/musescore/metadata.xml |
532 |
@@ -9,4 +9,7 @@ |
533 |
<remote-id type="sourceforge">mscore</remote-id> |
534 |
<remote-id type="github">musescore/MuseScore</remote-id> |
535 |
</upstream> |
536 |
+ <use> |
537 |
+ <flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag> |
538 |
+ </use> |
539 |
</pkgmetadata> |
540 |
|
541 |
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild |
542 |
new file mode 100644 |
543 |
index 00000000000..4f547ddc3db |
544 |
--- /dev/null |
545 |
+++ b/media-sound/musescore/musescore-2.1.0.ebuild |
546 |
@@ -0,0 +1,64 @@ |
547 |
+# Copyright 1999-2017 Gentoo Foundation |
548 |
+# Distributed under the terms of the GNU General Public License v2 |
549 |
+ |
550 |
+EAPI=6 |
551 |
+ |
552 |
+inherit cmake-utils |
553 |
+ |
554 |
+DESCRIPTION="WYSIWYG Music Score Typesetter" |
555 |
+HOMEPAGE="http://musescore.org/" |
556 |
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
557 |
+ |
558 |
+LICENSE="GPL-2" |
559 |
+SLOT="0" |
560 |
+KEYWORDS="~amd64 ~x86" |
561 |
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio" |
562 |
+REQUIRED_USE="portmidi? ( portaudio )" |
563 |
+ |
564 |
+RDEPEND=" |
565 |
+ dev-qt/designer:5 |
566 |
+ dev-qt/qtconcurrent:5 |
567 |
+ dev-qt/qtcore:5 |
568 |
+ dev-qt/qtdeclarative:5 |
569 |
+ dev-qt/qtgui:5 |
570 |
+ dev-qt/qthelp:5 |
571 |
+ dev-qt/qtprintsupport:5 |
572 |
+ dev-qt/qtsvg:5 |
573 |
+ dev-qt/qtwebkit:5 |
574 |
+ dev-qt/qtxmlpatterns:5 |
575 |
+ >=media-libs/freetype-2.5.2 |
576 |
+ media-libs/libsndfile |
577 |
+ sys-libs/zlib |
578 |
+ alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
579 |
+ jack? ( virtual/jack ) |
580 |
+ mp3? ( media-sound/lame ) |
581 |
+ portaudio? ( media-libs/portaudio ) |
582 |
+ portmidi? ( media-libs/portmidi ) |
583 |
+ pulseaudio? ( media-sound/pulseaudio ) |
584 |
+ " |
585 |
+DEPEND="${RDEPEND} |
586 |
+ dev-qt/linguist-tools:5 |
587 |
+ virtual/pkgconfig |
588 |
+ " |
589 |
+PATCHES=( |
590 |
+ "${FILESDIR}/${PN}-2.1.0-fix-buildsystem.patch" |
591 |
+) |
592 |
+S="${WORKDIR}/MuseScore-${PV}" |
593 |
+ |
594 |
+src_configure() { |
595 |
+ local mycmakeargs=( |
596 |
+ -DBUILD_ALSA="$(usex alsa)" |
597 |
+ -DBUILD_JACK="$(usex jack)" |
598 |
+ -DBUILD_LAME="$(usex mp3)" |
599 |
+ -DBUILD_PORTAUDIO="$(usex portaudio)" |
600 |
+ -DBUILD_PORTMIDI="$(usex portmidi)" |
601 |
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)" |
602 |
+ ) |
603 |
+ cmake-utils_src_configure |
604 |
+} |
605 |
+ |
606 |
+src_compile() { |
607 |
+ cd "${BUILD_DIR}" || die |
608 |
+ cmake-utils_src_make -j1 lrelease manpages |
609 |
+ cmake-utils_src_compile |
610 |
+} |