diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile index 849280d9fb51..c13dfdf67a95 100644 --- a/audio/drumstick/Makefile +++ b/audio/drumstick/Makefile @@ -1,36 +1,36 @@ PORTNAME= drumstick -DISTVERSION= 2.2.1 +DISTVERSION= 2.3.0 CATEGORIES= audio multimedia MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MAINTAINER= yuri@FreeBSD.org COMMENT= MIDI libraries for Qt5/C++ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont USES= compiler:c++11-lang cmake pkgconfig qt:5 shared-mime-info tar:bz2 USE_QT= core gui network svg testlib uiplugin widgets buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes OPTIONS_DEFINE= PULSEAUDIO MANPAGES OPTIONS_DEFAULT= PULSEAUDIO MANPAGES OPTIONS_SUB= yes PULSEAUDIO_CMAKE_BOOL= USE_PULSEAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio MANPAGES_CMAKE_BOOL= BUILD_DOCS MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt \ docbook-xsl>0:textproc/docbook-xsl post-patch: # instead of default.sf2 use FluidR3_GM.sf2 installed by fluid-soundfont @${REINPLACE_CMD} -e 's|"default.sf2"|"${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2"|' \ ${WRKSRC}/library/widgets/fluidsettingsdialog.cpp \ ${WRKSRC}/library/rt-backends/fluidsynth/synthengine.cpp .include diff --git a/audio/drumstick/distinfo b/audio/drumstick/distinfo index ab5cbb83521e..c39f4fbce189 100644 --- a/audio/drumstick/distinfo +++ b/audio/drumstick/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622537489 -SHA256 (drumstick-2.2.1.tar.bz2) = 5315d41243b9a973c88f0f7d05d900b298a447d365bb7d9c95fdbc713c9ff96e -SIZE (drumstick-2.2.1.tar.bz2) = 1461686 +TIMESTAMP = 1625100496 +SHA256 (drumstick-2.3.0.tar.bz2) = 132ab9af7504939eb1ffd3500d89e4484bc2591e8c5ade0a2f2a87e4ac9e0a8a +SIZE (drumstick-2.3.0.tar.bz2) = 1463890 diff --git a/audio/drumstick/files/patch-CMakeLists.txt b/audio/drumstick/files/patch-CMakeLists.txt index eb7077a07302..fe58b34635eb 100644 --- a/audio/drumstick/files/patch-CMakeLists.txt +++ b/audio/drumstick/files/patch-CMakeLists.txt @@ -1,57 +1,35 @@ ---- CMakeLists.txt.orig 2021-05-09 10:45:44 UTC +--- CMakeLists.txt.orig 2021-06-28 15:28:22 UTC +++ CMakeLists.txt -@@ -69,7 +69,7 @@ endif () - option(BUILD_DOCS "Build Doxygen documentation and man pages" ${_DOCS_INIT}) - option(BUILD_UTILS "Build Utilities and Examples" ON) - option(STATIC_DRUMSTICK "Build static libraries instead of dynamic" OFF) --option(USE_DBUS "Include DBus support (required for RealtimeKit)" ${_DBUS_INIT}) -+#option(USE_DBUS "Include DBus support (required for RealtimeKit)" ${_DBUS_INIT}) - - if(STATIC_DRUMSTICK) - set(BUILD_SHARED_LIBS OFF) -@@ -96,15 +96,17 @@ else() +@@ -111,8 +111,8 @@ else() message(FATAL_ERROR "Program pkg-config not found") endif() -if(${CMAKE_SYSTEM} MATCHES "Linux") - pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa>=1.0.0) +if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") + #pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa>=1.0.0) if(ALSA_FOUND) message(STATUS "Found ALSA version = ${ALSA_VERSION}") endif() - endif() - - if(UNIX AND NOT APPLE) -- pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple) -+ if (USE_PULSEAUDIO) -+ pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple) -+ endif() - if(PULSE_FOUND) - message(STATUS "Found PulseAudio version = ${PULSE_VERSION}") - else() -@@ -149,7 +151,7 @@ endif() +@@ -179,7 +179,7 @@ endif() if(UNIX AND NOT APPLE) if (BUILD_DOCS) - find_package(Doxygen REQUIRED dot) + #find_package(Doxygen REQUIRED dot) if(DOXYGEN_FOUND) - string(REPLACE ";" " " DOXYGEN_INCLUDE_DIRS "${Qt5Core_INCLUDE_DIRS}") + string(REPLACE ";" " " DOXYGEN_INCLUDE_DIRS "${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}") configure_file("${CMAKE_SOURCE_DIR}/Doxyfile.in" -@@ -160,11 +162,11 @@ if(UNIX AND NOT APPLE) - endif() - add_subdirectory(doc) +@@ -192,9 +192,9 @@ if(UNIX AND NOT APPLE) endif() -- configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY) -+ #configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY) configure_file(drumstick.spec.in drumstick.spec IMMEDIATE @ONLY) -- install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) -+ #install(FILES -+ # ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc -+ # DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + if(ALSA_FOUND AND PKG_CONFIG_FOUND) +- configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) ++ #configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY) ++ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + endif() # XML mime types set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" ) - set( XDG_MIME_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages" ) diff --git a/audio/drumstick/pkg-plist b/audio/drumstick/pkg-plist index ddb2ad593860..e2f0e5240338 100644 --- a/audio/drumstick/pkg-plist +++ b/audio/drumstick/pkg-plist @@ -1,76 +1,76 @@ bin/drumstick-dumpsmf bin/drumstick-dumpwrk bin/drumstick-vpiano include/drumstick/backendmanager.h include/drumstick/configurationdialogs.h include/drumstick/macros.h include/drumstick/pianokeybd.h include/drumstick/pianopalette.h include/drumstick/qsmf.h include/drumstick/qwrk.h include/drumstick/rtmidiinput.h include/drumstick/rtmidioutput.h include/drumstick/settingsfactory.h lib/cmake/drumstick/drumstick-config-version.cmake lib/cmake/drumstick/drumstick-config.cmake lib/cmake/drumstick/drumstick-file-config-version.cmake lib/cmake/drumstick/drumstick-file-config.cmake lib/cmake/drumstick/drumstick-file-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/drumstick/drumstick-file-targets.cmake lib/cmake/drumstick/drumstick-rt-config-version.cmake lib/cmake/drumstick/drumstick-rt-config.cmake lib/cmake/drumstick/drumstick-rt-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/drumstick/drumstick-rt-targets.cmake lib/cmake/drumstick/drumstick-widgets-config-version.cmake lib/cmake/drumstick/drumstick-widgets-config.cmake lib/cmake/drumstick/drumstick-widgets-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/drumstick/drumstick-widgets-targets.cmake %%PULSEAUDIO%%lib/drumstick2/libdrumstick-rt-eassynth.so lib/drumstick2/libdrumstick-rt-fluidsynth.so lib/drumstick2/libdrumstick-rt-net-in.so lib/drumstick2/libdrumstick-rt-net-out.so lib/drumstick2/libdrumstick-rt-oss-in.so lib/drumstick2/libdrumstick-rt-oss-out.so lib/libdrumstick-file.so lib/libdrumstick-file.so.2 -lib/libdrumstick-file.so.2.2.1 +lib/libdrumstick-file.so.2.3.0 lib/libdrumstick-rt.so lib/libdrumstick-rt.so.2 -lib/libdrumstick-rt.so.2.2.1 +lib/libdrumstick-rt.so.2.3.0 lib/libdrumstick-widgets.so lib/libdrumstick-widgets.so.2 -lib/libdrumstick-widgets.so.2.2.1 +lib/libdrumstick-widgets.so.2.3.0 %%QT_PLUGINDIR%%/designer/libdrumstick-vpiano-plugin.so libdata/pkgconfig/drumstick-file.pc libdata/pkgconfig/drumstick-rt.pc libdata/pkgconfig/drumstick-widgets.pc %%MANPAGES%%man/man1/drumstick-drumgrid.1.gz %%MANPAGES%%man/man1/drumstick-dumpmid.1.gz %%MANPAGES%%man/man1/drumstick-dumpsmf.1.gz %%MANPAGES%%man/man1/drumstick-dumpwrk.1.gz %%MANPAGES%%man/man1/drumstick-guiplayer.1.gz %%MANPAGES%%man/man1/drumstick-metronome.1.gz %%MANPAGES%%man/man1/drumstick-playsmf.1.gz %%MANPAGES%%man/man1/drumstick-sysinfo.1.gz %%MANPAGES%%man/man1/drumstick-vpiano.1.gz share/applications/drumstick-vpiano.desktop %%DATADIR%%/drumstick-vpiano_en.qm %%DATADIR%%/drumstick-vpiano_es.qm %%DATADIR%%/drumstick-widgets_cs.qm %%DATADIR%%/drumstick-widgets_de.qm %%DATADIR%%/drumstick-widgets_en.qm %%DATADIR%%/drumstick-widgets_es.qm %%DATADIR%%/drumstick-widgets_fr.qm %%DATADIR%%/drumstick-widgets_gl.qm %%DATADIR%%/drumstick-widgets_nl.qm %%DATADIR%%/drumstick-widgets_ru.qm %%DATADIR%%/drumstick-widgets_sr.qm %%DATADIR%%/drumstick-widgets_sv.qm %%DATADIR%%/drumstick-widgets_tr.qm %%DATADIR%%/drumstick-widgets_zh_CN.qm share/icons/hicolor/16x16/apps/drumstick.png share/icons/hicolor/32x32/apps/drumstick.png share/icons/hicolor/48x48/apps/drumstick.png share/icons/hicolor/64x64/apps/drumstick.png share/icons/hicolor/scalable/apps/drumstick.svgz share/mime/packages/drumstick.xml