Index: audio/musescore/Makefile =================================================================== --- audio/musescore/Makefile (revision 448846) +++ audio/musescore/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= musescore -PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTVERSION= 2.1 CATEGORIES= audio MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/ DISTNAME= MuseScore-${PORTVERSION} @@ -14,23 +13,29 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPL +BROKEN_aarch64= Fails to compile: error: constant expression evaluates to -1 + LIB_DEPENDS= libmp3lame.so:audio/lame \ libsndfile.so:audio/libsndfile \ - libvorbis.so:audio/libvorbis + libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg \ + libfreetype.so:print/freetype2 USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ pkgconfig shared-mime-info zip -USE_QT5= concurrent designer help network scripttools svg \ - webkit xml xmlpatterns \ +USE_QT5= core gui widgets opengl concurrent designer help network \ + scripttools qml quick svg sql printsupport testlib webkit \ + xml xmlpatterns \ buildtools_build linguisttools_build qmake_build uitools_build ALL_TARGET= lrelease manpages all +INSTALLS_ICONS= yes +CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" -DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} +DATADIR= ${PREFIX}/share/mscore-${PORTVERSION} -BROKEN_aarch64= Fails to compile: error: constant expression evaluates to -1 - -OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO +OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OCR OPTIONS_DEFAULT= PORTAUDIO +OCR_DESC= Optical Character Recognition ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= BUILD_ALSA @@ -40,6 +45,7 @@ PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO +OCR_CMAKE_BOOL= OCR .include @@ -47,11 +53,15 @@ CXXFLAGS+= -Wno-inconsistent-missing-override .endif +post-extract: + @${RM} -r ${WRKSRC}/thirdparty/freetype + post-patch: @${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e \ - '/RELEASE/s|-O2 || ; \ - /COMPILE_FLAGS/s|-g || ; \ + '/RELEASE/s|-O2 ||; \ + /COMPILE_FLAGS/s|-g ||; \ + s|share/man|man|; \ /COMPILE_FLAGS/s|$${PCH_INCLUDE} |-include $${PROJECT_BINARY_DIR}/all.h |' @${REINPLACE_CMD} -e \ 's||| ; \ Index: audio/musescore/distinfo =================================================================== --- audio/musescore/distinfo (revision 448846) +++ audio/musescore/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (MuseScore-2.0.2.zip) = 21d5339a2a5fa15af6f085a52d3484d2e0d7aee697933150848d19ba6f4764d5 -SIZE (MuseScore-2.0.2.zip) = 47590201 +TIMESTAMP = 1502602140 +SHA256 (MuseScore-2.1.zip) = 51b2fd09d8d0afff84ce6aee0e14854465462616b0ef92ad8dd2325257d3bc12 +SIZE (MuseScore-2.1.zip) = 55072555 Index: audio/musescore/files/patch-CMakeLists.txt =================================================================== --- audio/musescore/files/patch-CMakeLists.txt (revision 448846) +++ audio/musescore/files/patch-CMakeLists.txt (nonexistent) @@ -1,79 +0,0 @@ ---- CMakeLists.txt.orig 2015-07-16 21:02:34 UTC -+++ CMakeLists.txt -@@ -74,6 +74,10 @@ option(HAS_AUDIOFILE "enable audio expor - option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" OFF) - option(BUILD_LAME "enable mp3 export" ON) # requires libmp3lame - -+option(BUILD_ALSA "Build with support for ALSA." ON) -+option(BUILD_PORTAUDIO "Build with support for portaudio." ON) -+option(BUILD_PULSEAUDIO "Build with support for PulseAudio." ON) -+ - SET(JACK_LONGNAME "jack (jack audio connection kit)") - SET(JACK_MIN_VERSION "0.98.0") - option(BUILD_JACK "Build with support for ${JACK_LONGNAME}. jack >= ${JACK_MIN_VERSION} will be needed." ON) -@@ -194,6 +198,7 @@ endif (APPLE) - ## alsa >= 1.0.0 - ## - -+if (BUILD_ALSA) - if (APPLE OR MINGW) - message("Disabling ALSA support due to OS X or MINGW build.") - set (USE_ALSA 0) -@@ -208,11 +213,17 @@ else (APPLE OR MINGW) - set (HAS_MIDI 1) - endif (NOT ALSA_INCDIR) - endif (APPLE OR MINGW) -+else (BUILD_ALSA) -+ MESSAGE(STATUS "alsa support disabled") -+ set (USE_ALSA 0) -+ set (HAS_MIDI 1) -+endif (BUILD_ALSA) - - ## - ## pulseaudio - ## - -+if (BUILD_PULSEAUDIO) - if (APPLE OR MINGW) - set (USE_PULSEAUDIO 0) - else (APPLE OR MINGW) -@@ -224,6 +235,10 @@ else (APPLE OR MINGW) - message("Pulseaudio not found.") - endif (PULSEAUDIO_FOUND) - endif (APPLE OR MINGW) -+else (BUILD_PULSEAUDIO) -+ MESSAGE(STATUS "PulseAudio support disabled") -+ set (USE_PULSEAUDIO 0) -+endif (BUILD_PULSEAUDIO) - - ## - ## lame -@@ -296,6 +311,7 @@ ENDIF(BUILD_JACK) - ## portaudio - ## - -+if (BUILD_PORTAUDIO) - if (MINGW) - set ( USE_PORTAUDIO 1 ) - set ( USE_PORTMIDI 1 ) -@@ -314,6 +330,11 @@ else (MINGW) - set (USE_PORTMIDI 0) - endif (APPLE) - endif (MINGW) -+else (BUILD_PORTAUDIO) -+ MESSAGE(STATUS "portaudio support disabled") -+ set (USE_PORTAUDIO 0) -+ set (USE_PORTMIDI 0) -+endif (BUILD_PORTAUDIO) - - - if (APPLE) -@@ -431,7 +452,7 @@ if (NOT MINGW AND NOT APPLE) - ) - endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") - # install man pages in either compressed or uncompressed form -- install( FILES ${MAN_TARGET} DESTINATION share/man/man1 COMPONENT doc) -+ install( FILES ${MAN_TARGET} DESTINATION man/man1 COMPONENT doc) - # add .MSCZ and .MSCX to MIME database (informs system that filetypes .MSCZ & .MSCX are MuseScore files) - install( FILES ${PROJECT_SOURCE_DIR}/build/musescore.xml DESTINATION share/mime/packages COMPONENT doc) - # Note: must now run "update-mime-database" to apply changes. This is done in the Makefile. Property changes on: audio/musescore/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: audio/musescore/files/patch-mscore_CMakeLists.txt =================================================================== --- audio/musescore/files/patch-mscore_CMakeLists.txt (revision 448846) +++ audio/musescore/files/patch-mscore_CMakeLists.txt (working copy) @@ -1,20 +1,20 @@ ---- mscore/CMakeLists.txt.orig 2015-07-16 21:02:34 UTC +--- mscore/CMakeLists.txt.orig 2017-04-27 04:14:22 UTC +++ mscore/CMakeLists.txt -@@ -474,7 +474,6 @@ else (MINGW) - ${ALSA_LIB} - ${QT_LIBRARIES} - z -- dl - pthread - ) - if (USE_PORTAUDIO) -@@ -509,9 +508,6 @@ else (MINGW) +@@ -493,7 +493,6 @@ else (MINGW) + ${ALSA_LIB} + ${QT_LIBRARIES} + z +- dl + pthread + ) - # gold does not use indirect shared libraries for symbol resolution, Linux only - if (NOT APPLE) -- if(USE_JACK) -- target_link_libraries(mscore dl) -- endif(USE_JACK) - target_link_libraries(mscore rt) - endif (NOT APPLE) +@@ -550,9 +549,6 @@ else (MINGW) + # gold does not use indirect shared libraries for symbol resolution, Linux only + if (NOT APPLE) +- if (USE_JACK) +- target_link_libraries(mscore dl) +- endif (USE_JACK) + target_link_libraries(mscore rt) + endif (NOT APPLE) + Index: audio/musescore/pkg-plist =================================================================== --- audio/musescore/pkg-plist (revision 448846) +++ audio/musescore/pkg-plist (working copy) @@ -1,11 +1,20 @@ bin/mscore +bin/musescore man/man1/mscore.1.gz +man/man1/musescore.1.gz share/applications/mscore.desktop +share/icons/hicolor/128x128/apps/mscore.png +share/icons/hicolor/16x16/apps/mscore.png +share/icons/hicolor/24x24/apps/mscore.png +share/icons/hicolor/32x32/apps/mscore.png +share/icons/hicolor/48x48/apps/mscore.png share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml+xml.png share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml.png share/icons/hicolor/48x48/mimetypes/application-x-musescore+xml.png share/icons/hicolor/48x48/mimetypes/application-x-musescore.png +share/icons/hicolor/512x512/apps/mscore.png share/icons/hicolor/64x64/apps/mscore.png +share/icons/hicolor/96x96/apps/mscore.png share/icons/hicolor/scalable/apps/mscore.svg share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml+xml.svg share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml.svg @@ -18,6 +27,9 @@ %%DATADIR%%/instruments/instruments.xml %%DATADIR%%/locale/instruments_af.qm %%DATADIR%%/locale/instruments_ar.qm +%%DATADIR%%/locale/instruments_ar_DZ.qm +%%DATADIR%%/locale/instruments_ar_EG.qm +%%DATADIR%%/locale/instruments_ar_SD.qm %%DATADIR%%/locale/instruments_ast.qm %%DATADIR%%/locale/instruments_be.qm %%DATADIR%%/locale/instruments_bg.qm @@ -38,6 +50,8 @@ %%DATADIR%%/locale/instruments_fi.qm %%DATADIR%%/locale/instruments_fo.qm %%DATADIR%%/locale/instruments_fr.qm +%%DATADIR%%/locale/instruments_ga.qm +%%DATADIR%%/locale/instruments_gd.qm %%DATADIR%%/locale/instruments_gl.qm %%DATADIR%%/locale/instruments_he.qm %%DATADIR%%/locale/instruments_hi_IN.qm @@ -50,6 +64,7 @@ %%DATADIR%%/locale/instruments_ko.qm %%DATADIR%%/locale/instruments_lt.qm %%DATADIR%%/locale/instruments_lv.qm +%%DATADIR%%/locale/instruments_ml.qm %%DATADIR%%/locale/instruments_mn_MN.qm %%DATADIR%%/locale/instruments_nb.qm %%DATADIR%%/locale/instruments_nl.qm @@ -62,6 +77,7 @@ %%DATADIR%%/locale/instruments_sk.qm %%DATADIR%%/locale/instruments_sl.qm %%DATADIR%%/locale/instruments_sr.qm +%%DATADIR%%/locale/instruments_sr_RS.qm %%DATADIR%%/locale/instruments_sv.qm %%DATADIR%%/locale/instruments_th.qm %%DATADIR%%/locale/instruments_tr.qm @@ -73,6 +89,9 @@ %%DATADIR%%/locale/languages.xml %%DATADIR%%/locale/mscore_af.qm %%DATADIR%%/locale/mscore_ar.qm +%%DATADIR%%/locale/mscore_ar_DZ.qm +%%DATADIR%%/locale/mscore_ar_EG.qm +%%DATADIR%%/locale/mscore_ar_SD.qm %%DATADIR%%/locale/mscore_ast.qm %%DATADIR%%/locale/mscore_be.qm %%DATADIR%%/locale/mscore_bg.qm @@ -93,6 +112,8 @@ %%DATADIR%%/locale/mscore_fi.qm %%DATADIR%%/locale/mscore_fo.qm %%DATADIR%%/locale/mscore_fr.qm +%%DATADIR%%/locale/mscore_ga.qm +%%DATADIR%%/locale/mscore_gd.qm %%DATADIR%%/locale/mscore_gl.qm %%DATADIR%%/locale/mscore_he.qm %%DATADIR%%/locale/mscore_hi_IN.qm @@ -105,6 +126,7 @@ %%DATADIR%%/locale/mscore_ko.qm %%DATADIR%%/locale/mscore_lt.qm %%DATADIR%%/locale/mscore_lv.qm +%%DATADIR%%/locale/mscore_ml.qm %%DATADIR%%/locale/mscore_mn_MN.qm %%DATADIR%%/locale/mscore_nb.qm %%DATADIR%%/locale/mscore_nl.qm @@ -117,6 +139,7 @@ %%DATADIR%%/locale/mscore_sk.qm %%DATADIR%%/locale/mscore_sl.qm %%DATADIR%%/locale/mscore_sr.qm +%%DATADIR%%/locale/mscore_sr_RS.qm %%DATADIR%%/locale/mscore_sv.qm %%DATADIR%%/locale/mscore_th.qm %%DATADIR%%/locale/mscore_tr.qm @@ -146,6 +169,7 @@ %%DATADIR%%/locale/qt_lt.qm %%DATADIR%%/locale/qt_nb.qm %%DATADIR%%/locale/qt_nl.qm +%%DATADIR%%/locale/qt_nl_BE.qm %%DATADIR%%/locale/qt_pl.qm %%DATADIR%%/locale/qt_pt.qm %%DATADIR%%/locale/qt_pt_BR.qm @@ -208,6 +232,7 @@ %%DATADIR%%/manual/plugins/measure.html %%DATADIR%%/manual/plugins/measurebase.html %%DATADIR%%/manual/plugins/mscore.png +%%DATADIR%%/manual/plugins/mtext.html %%DATADIR%%/manual/plugins/musescore.html %%DATADIR%%/manual/plugins/note.html %%DATADIR%%/manual/plugins/notedot.html @@ -246,7 +271,6 @@ %%DATADIR%%/manual/plugins/system.html %%DATADIR%%/manual/plugins/tbox.html %%DATADIR%%/manual/plugins/tempotext.html -%%DATADIR%%/manual/plugins/text.html %%DATADIR%%/manual/plugins/textline.html %%DATADIR%%/manual/plugins/textlinesegment.html %%DATADIR%%/manual/plugins/tie.html @@ -313,7 +337,15 @@ %%DATADIR%%/templates/05-Jazz/02-Big_Band.mscz %%DATADIR%%/templates/05-Jazz/03-Jazz_Combo.mscz %%DATADIR%%/templates/06-Popular/01-Rock_Band.mscz -%%DATADIR%%/templates/07-Band/01-Concert_Band.mscz +%%DATADIR%%/templates/06-Popular/02-Bluegrass_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/01-Concert_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/02-Small_Concert_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/03-Brass_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/04-Marching_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/05-Small_Marching_Band.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/06-Battery_Percussion.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscz +%%DATADIR%%/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscz %%DATADIR%%/templates/08-Orchestral/01-Classical_Orchestra.mscz %%DATADIR%%/templates/08-Orchestral/02-Concert_Orchestra.mscz %%DATADIR%%/templates/08-Orchestral/03-String_Orchestra.mscz