diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index 53a76eb95328..efaca9df4bd2 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -6,8 +6,7 @@ # PORTNAME= musescore -PORTVERSION= 1.1 -PORTREVISION= 2 +PORTVERSION= 1.2 CATEGORIES= audio MASTER_SITES= SF/mscore/mscore/MuseScore-${PORTVERSION} DISTNAME= mscore-${PORTVERSION} @@ -15,56 +14,53 @@ DISTNAME= mscore-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Free music composition & notation software -LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ - sndfile.1:${PORTSDIR}/audio/libsndfile -BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator -RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator +LICENSE= GPLv2 +BUILD_DEPENDS= qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator +LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile +RUN_DEPENDS= qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator + +OPTIONS_DEFINE= JACK PORTAUDIO +OPTIONS_DEFAULT=PORTAUDIO + +USE_LDCONFIG= yes USE_BZIP2= yes +USE_QT4= corelib designer gui network script scripttools svg webkit xml \ + linguist_build moc_build qmake_build rcc_build uic_build USE_CMAKE= yes -USE_QT4= corelib gui network svg xml script scripttools designer webkit \ - qmake_build moc_build uic_build linguist_build rcc_build -MAKE_JOBS_UNSAFE= yes - -CMAKE_SOURCE_PATH= ${WRKSRC}/mscore CMAKE_OUTSOURCE= yes - +CMAKE_SOURCE_PATH= ${WRKSRC}/mscore +CMAKE_ARGS= -DBUILD_ALSA:BOOL=OFF ALL_TARGET= lrelease all +MAKE_JOBS_UNSAFE= yes DATADIR= ${PREFIX}/share/mscore-${PORTVERSION} -# Couldn't get portaudio to work, so disable it by default -OPTIONS= JACK "Jack support" on \ - PORTAUDIO "Portaudio support" off - .include -.if ${OSVERSION} < 802502 || ( ${OSVERSION} >= 900000 && ${OSVERSION} < 900027 ) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-log2 -.endif - -.if !defined(WITHOUT_JACK) +.if ${PORT_OPTIONS:MJACK} +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack CMAKE_ARGS+= -DBUILD_JACK:BOOL=ON -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .else CMAKE_ARGS+= -DBUILD_JACK:BOOL=OFF .endif -.if !defined(WITHOUT_PORTAUDIO) -LIB_DEPENDS+= portaudio.2:${PORTSDIR}/audio/portaudio2 +.if ${PORT_OPTIONS:MPORTAUDIO} +BUILD_DEPENDS+= portaudio>=19:${PORTSDIR}/audio/portaudio2 +RUN_DEPENDS+= portaudio>=19:${PORTSDIR}/audio/portaudio2 +CMAKE_ARGS+= -DBUILD_PORTAUDIO:BOOL=ON +.else +CMAKE_ARGS+= -DBUILD_PORTAUDIO:BOOL=OFF .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/include/freetype2|${LOCALBASE}/include/freetype2|; \ - s|-lfreetype|${LOCALBASE}/lib/libfreetype.so|' \ - ${WRKSRC}/mscore/mscore/CMakeLists.txt - @${FIND} ${WRKSRC} -name CMakeLists.txt -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e \ - '/set(CMAKE_CXX_FLAGS/ { s|-g||; /$${CMAKE_CXX_FLAGS}/ ! s|"|&$${CMAKE_CXX_FLAGS} |; }' -.if defined(WITHOUT_PORTAUDIO) - @${REINPLACE_CMD} -e '/PKGCONFIG.*portaudio/ d' ${WRKSRC}/mscore/CMakeLists.txt -.endif - -post-install: - @${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO} + @${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \ + ${REINPLACE_CMD} -e \ + 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|-g -Wall|-Wall|g' +# add newline +.for file in mscore.cpp updatechecker.h webpage.cpp + @${ECHO_CMD} >> ${WRKSRC}/mscore/mscore/${file} +.endfor .include diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo index 9c1f4fcebd50..57eddce7b928 100644 --- a/audio/musescore/distinfo +++ b/audio/musescore/distinfo @@ -1,2 +1,2 @@ -SHA256 (mscore-1.1.tar.bz2) = d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab7fffed2c6991b65123fee10c -SIZE (mscore-1.1.tar.bz2) = 82410619 +SHA256 (mscore-1.2.tar.bz2) = e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 +SIZE (mscore-1.2.tar.bz2) = 85739954 diff --git a/audio/musescore/files/extra-patch-log2 b/audio/musescore/files/extra-patch-log2 deleted file mode 100644 index 8ff535c5747d..000000000000 --- a/audio/musescore/files/extra-patch-log2 +++ /dev/null @@ -1,22 +0,0 @@ ---- mscore/awl/denomspinbox.cpp.orig 2011-07-27 17:32:23.000000000 +0400 -+++ mscore/awl/denomspinbox.cpp 2011-07-28 23:50:11.000000000 +0400 -@@ -20,6 +20,8 @@ - - #include "denomspinbox.h" - -+#define log2(x) (log(x)/log(2.0)) -+ - namespace Awl { - - //--------------------------------------------------------- ---- mscore/mscore/measure.cpp.orig 2011-07-27 17:32:43.000000000 +0400 -+++ mscore/mscore/measure.cpp 2011-07-29 04:44:58.000000000 +0400 -@@ -77,6 +77,8 @@ - #include "spacer.h" - #include "duration.h" - -+#define log2(x) (log(x)/log(2.0)) -+ - //--------------------------------------------------------- - // MStaff - //--------------------------------------------------------- diff --git a/audio/musescore/files/patch-mscore-CMakeLists.txt b/audio/musescore/files/patch-mscore-CMakeLists.txt index 3ac8cb5bc11b..f5846edcdbd7 100644 --- a/audio/musescore/files/patch-mscore-CMakeLists.txt +++ b/audio/musescore/files/patch-mscore-CMakeLists.txt @@ -1,15 +1,82 @@ ---- mscore/CMakeLists.txt.orig 2011-07-27 17:33:18.000000000 +0400 -+++ mscore/CMakeLists.txt 2011-08-03 23:08:24.000000000 +0400 -@@ -31,7 +31,7 @@ - set(GCC_VISIBILITY TRUE) # requires gcc 4.x? +--- mscore/CMakeLists.txt.orig 2012-03-13 22:37:09.000000000 +0900 ++++ mscore/CMakeLists.txt 2012-06-09 20:56:18.000000000 +0900 +@@ -32,7 +32,7 @@ set(HAS_AUDIOFILE TRUE) # requires libsndfile + set(OSC TRUE) # osc remote control -set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) +set(BUILD_SCRIPTGEN FALSE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) set(STATIC_SCRIPT_BINDINGS FALSE) set(USE_SSE FALSE) -@@ -255,9 +255,9 @@ +@@ -147,6 +147,8 @@ + ## alsa >= 1.0.0 + ## + ++SET(BUILD_ALSA AUTO CACHE STRING "Build with support for ALSA. [ON/OFF/AUTO]") ++IF(BUILD_ALSA) + if (APPLE OR MINGW) + message("Disabling ALSA support due to OS X or MINGW build.") + set (USE_ALSA 0) +@@ -161,6 +163,11 @@ + 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) + + + ## +@@ -215,6 +222,8 @@ + ## portaudio + ## + ++SET(BUILD_PORTAUDIO AUTO CACHE STRING "Build with support for portaudio. [ON/OFF/AUTO]") ++IF(BUILD_PORTAUDIO) + if (MINGW) + set ( USE_PORTAUDIO 1 ) + set ( USE_PORTMIDI 1 ) +@@ -233,6 +242,9 @@ + set (USE_PORTMIDI 0) + endif (APPLE) + endif (MINGW) ++ELSE(BUILD_PORTAUDIO) ++ MESSAGE(STATUS "portaudio support disabled") ++ENDIF(BUILD_PORTAUDIO) + + ## + ## produce config.h file +@@ -254,7 +266,7 @@ + ) + + set(CMAKE_CXX_FLAGS_DEBUG "") +-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") ++set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") + + if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") + if (MINGW) +@@ -276,7 +288,7 @@ + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch + COMMAND ${CMAKE_CXX_COMPILER} +- -x c++-header -g ${FLAGS} ++ -x c++-header ${FLAGS} + -I${QT_INCLUDE_DIR} + -o all.h.pch all.h + DEPENDS ${PROJECT_BINARY_DIR}/all.h +@@ -287,7 +299,7 @@ + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch + COMMAND ${CMAKE_CXX_COMPILER} +- -x c++-header -g ${FLAGS} -m32 ++ -x c++-header ${FLAGS} + -I${QT_HEADERS_DIR} + -o all.h.gch all.h + DEPENDS ${PROJECT_BINARY_DIR}/all.h +@@ -324,9 +336,10 @@ ${PROJECT_SOURCE_DIR}/mscore ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/mscore @@ -17,15 +84,18 @@ ${ALSA_INCDIR} ${JACK_INCDIR} - ${PORTAUDIO_INCDIR} ++ %%LOCALBASE%%/include ) ## -@@ -352,7 +352,7 @@ +@@ -421,8 +434,8 @@ add_custom_target(lrelease COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro - COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts +- COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts + COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts ++ COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) diff --git a/audio/musescore/files/patch-mscore-mscore-CMakeLists.txt b/audio/musescore/files/patch-mscore-mscore-CMakeLists.txt index 2d84e0cf8cca..8cebd87bed24 100644 --- a/audio/musescore/files/patch-mscore-mscore-CMakeLists.txt +++ b/audio/musescore/files/patch-mscore-mscore-CMakeLists.txt @@ -1,15 +1,25 @@ ---- mscore/mscore/CMakeLists.txt.orig 2011-07-27 17:32:44.000000000 +0400 -+++ mscore/mscore/CMakeLists.txt 2011-07-29 05:31:28.000000000 +0400 -@@ -61,7 +61,7 @@ - PROPERTIES generated true - ) +--- mscore/mscore/CMakeLists.txt.orig 2012-03-13 22:32:27.000000000 +0900 ++++ mscore/mscore/CMakeLists.txt 2012-06-09 20:57:43.000000000 +0900 +@@ -32,7 +32,7 @@ + + SET_SOURCE_FILES_PROPERTIES(revision.h PROPERTIES GENERATED TRUE) -include_directories( +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/scriptdebug -@@ -281,8 +281,8 @@ +@@ -160,9 +160,6 @@ + + # gold does not use indirect shared libraries for symbol resolution, Linux only + if (NOT MINGW AND NOT APPLE) +- if(USE_JACK) +- target_link_libraries(mscore dl) +- endif(USE_JACK) + target_link_libraries(mscore rt) + endif (NOT MINGW AND NOT APPLE) + +@@ -264,8 +261,8 @@ ${QT_LIBRARIES} ${QT_QTSCRIPT_LIBRARY_RELEASE} ${QT_QTSCRIPT_TOOLS_LIBRARY_RELEASE} @@ -19,3 +29,24 @@ al awl bww +@@ -277,7 +274,7 @@ + ) + + if (HAS_AUDIOFILE) +- target_link_libraries(mscore sndfile) ++ target_link_libraries(mscore %%LOCALBASE%%/lib/libsndfile.so) + endif (HAS_AUDIOFILE) + + if (APPLE) +@@ -343,9 +340,9 @@ + ${ui_headers} + genft.cpp + ) +- target_link_libraries(genft al ${QT_LIBRARIES} -lfreetype ) ++ target_link_libraries(genft al ${QT_LIBRARIES} %%LOCALBASE%%/lib/libfreetype.so ) + set_target_properties(genft +- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -I/usr/include/freetype2" ++ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -I%%LOCALBASE%%/include/freetype2" + ) + endif (NOT MINGW AND NOT APPLE) + diff --git a/audio/musescore/files/patch-mscore__awl__denomspinbox.cpp b/audio/musescore/files/patch-mscore__awl__denomspinbox.cpp new file mode 100644 index 000000000000..83c3dd23119d --- /dev/null +++ b/audio/musescore/files/patch-mscore__awl__denomspinbox.cpp @@ -0,0 +1,14 @@ +--- mscore/awl/denomspinbox.cpp.orig 2012-03-13 22:31:52.000000000 +0900 ++++ mscore/awl/denomspinbox.cpp 2012-06-09 13:58:01.000000000 +0900 +@@ -20,6 +20,11 @@ + + #include "denomspinbox.h" + ++#include ++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) ++#define log2(x) (log(x)/log(2.0)) ++#endif ++ + namespace Awl { + + //--------------------------------------------------------- diff --git a/audio/musescore/files/patch-mscore__mscore__measure.cpp b/audio/musescore/files/patch-mscore__mscore__measure.cpp new file mode 100644 index 000000000000..81dd11aaed34 --- /dev/null +++ b/audio/musescore/files/patch-mscore__mscore__measure.cpp @@ -0,0 +1,14 @@ +--- mscore/mscore/measure.cpp.orig 2012-03-13 22:32:27.000000000 +0900 ++++ mscore/mscore/measure.cpp 2012-06-09 13:58:36.000000000 +0900 +@@ -77,6 +77,11 @@ + #include "spacer.h" + #include "duration.h" + ++#include ++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) ++#define log2(x) (log(x)/log(2.0)) ++#endif ++ + //--------------------------------------------------------- + // MStaff + //--------------------------------------------------------- diff --git a/audio/musescore/pkg-message b/audio/musescore/pkg-message deleted file mode 100644 index c537dc87ac04..000000000000 --- a/audio/musescore/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -====================================================================== - -The only supported sound output is currently JACK. You should make -sure jackd is running (jackd -r -d oss), then enable it in MuseScore -preferences: - -Edit -> Preferences -> I/O -> [X] Use internal synthesizer -> - -> [X] JACK Audio Server - -Restart MuseScore, and the sound should work. You may still need to -select different JACK ports for left/right channel in preferences. - -====================================================================== - -Also, CJK users may want to install some of - -chinese/qt4-codecs-cn chinese/qt4-codecs-tw -japanese/qt4-codecs-jp korean/qt4-codecs-kr - -ports for legacy-encoding text to be displayed correctly. - -====================================================================== diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist index eafb4a1fc977..4ddec873ebe4 100644 --- a/audio/musescore/pkg-plist +++ b/audio/musescore/pkg-plist @@ -1,8 +1,10 @@ bin/mscore +%%QT_PLUGINDIR_REL%%/designer/libawlplugin.so share/applications/mscore.desktop %%DATADIR%%/demos/All_Dudes.mscz %%DATADIR%%/demos/Estudio-No1-Tarrega.mscx %%DATADIR%%/demos/PlanxtyCarolan.mscx +%%DATADIR%%/demos/Reunion.mscz %%DATADIR%%/demos/Triumph.mscz %%DATADIR%%/demos/adeste.mscx %%DATADIR%%/demos/bach-bc2.mscx @@ -26,6 +28,7 @@ share/applications/mscore.desktop %%DATADIR%%/locale/mscore_af.qm %%DATADIR%%/locale/mscore_ar.qm %%DATADIR%%/locale/mscore_ast.qm +%%DATADIR%%/locale/mscore_be.qm %%DATADIR%%/locale/mscore_bg.qm %%DATADIR%%/locale/mscore_ca.qm %%DATADIR%%/locale/mscore_cs.qm @@ -36,6 +39,7 @@ share/applications/mscore.desktop %%DATADIR%%/locale/mscore_en_US.qm %%DATADIR%%/locale/mscore_eo.qm %%DATADIR%%/locale/mscore_es.qm +%%DATADIR%%/locale/mscore_et.qm %%DATADIR%%/locale/mscore_eu.qm %%DATADIR%%/locale/mscore_fa.qm %%DATADIR%%/locale/mscore_fi.qm @@ -125,6 +129,9 @@ share/applications/mscore.desktop %%DATADIR%%/plugins/musescore.com/README.txt %%DATADIR%%/plugins/musescore.com/icons/filesaveonline.svg %%DATADIR%%/plugins/musescore.com/musescore.com.js +%%DATADIR%%/plugins/musescore.com/translations/locale_de.qm +%%DATADIR%%/plugins/musescore.com/translations/locale_es.qm +%%DATADIR%%/plugins/musescore.com/translations/locale_fr.qm %%DATADIR%%/plugins/musescore.com/ui/authorize_dialog.ui %%DATADIR%%/plugins/musescore.com/ui/musescore_dialog.ui %%DATADIR%%/plugins/musescore.com/ui/musescore_progress.ui @@ -148,9 +155,16 @@ share/applications/mscore.desktop %%DATADIR%%/templates/Choir SATB.mscx %%DATADIR%%/templates/Concert Band.mscx %%DATADIR%%/templates/Hymn.mscz +%%DATADIR%%/templates/Jazz Big Band.mscz +%%DATADIR%%/templates/Jazz Combo.mscz %%DATADIR%%/templates/Jazz Lead Sheet.mscz %%DATADIR%%/templates/Lead Sheet.mscx %%DATADIR%%/templates/Piano.mscx +%%DATADIR%%/templates/SA Festival Series.mscz +%%DATADIR%%/templates/SA General Series.mscz +%%DATADIR%%/templates/SA Triumph Series.mscz +%%DATADIR%%/templates/UK Brass Band.mscz +%%DATADIR%%/templates/drumset_fr.drm %%DATADIR%%/templates/instruments.xml %%DATADIR%%/templates/instruments_ca.xml %%DATADIR%%/templates/instruments_de.xml @@ -174,12 +188,12 @@ share/applications/mscore.desktop %%DATADIR%%/wallpaper/paper5.png share/pixmaps/mscore.png share/pixmaps/mscore.xpm -%%QT_PLUGINDIR_REL%%/designer/libawlplugin.so @dirrm %%DATADIR%%/wallpaper @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%%/styles @dirrm %%DATADIR%%/sound @dirrm %%DATADIR%%/plugins/musescore.com/ui +@dirrm %%DATADIR%%/plugins/musescore.com/translations @dirrm %%DATADIR%%/plugins/musescore.com/icons @dirrm %%DATADIR%%/plugins/musescore.com @dirrm %%DATADIR%%/plugins/break