Date: Wed, 26 May 2021 18:05:44 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a7a3bcf72b0c - main - audio/drumstick: Update 1.1.3 -> 2.2.0 Message-ID: <202105261805.14QI5iDt050457@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7a3bcf72b0c7c6a62d74639d31a9d2296057011 commit a7a3bcf72b0c7c6a62d74639d31a9d2296057011 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-05-26 18:04:08 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-05-26 18:05:38 +0000 audio/drumstick: Update 1.1.3 -> 2.2.0 --- audio/drumstick/Makefile | 17 ++++--- audio/drumstick/distinfo | 6 +-- audio/drumstick/files/patch-CMakeLists.txt | 69 +++++++++++++-------------- audio/drumstick/pkg-plist | 75 +++++++++++++++++++++--------- 4 files changed, 96 insertions(+), 71 deletions(-) diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile index 0f9b86dcfcc0..25c097547684 100644 --- a/audio/drumstick/Makefile +++ b/audio/drumstick/Makefile @@ -1,5 +1,5 @@ PORTNAME= drumstick -DISTVERSION= 1.1.3 +DISTVERSION= 2.2.0 CATEGORIES= audio multimedia MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -13,25 +13,24 @@ 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 widgets buildtools_build qmake_build +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_LIB_DEPENDS= libpulse.so:audio/pulseaudio + 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 -MANPAGES_CMAKE_BOOL= BUILD_DOCS - -PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} 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}/utils/vpiano/fluidsettingsdialog.cpp \ + ${WRKSRC}/library/widgets/fluidsettingsdialog.cpp \ ${WRKSRC}/library/rt-backends/fluidsynth/synthengine.cpp - @${REINPLACE_CMD} -e 's|"$${CMAKE_INSTALL_DATAROOTDIR}/man/man1"|"${PREFIX}/man/man1"|' \ - ${WRKSRC}/cmake_admin/CreateManpages.cmake .include <bsd.port.mk> diff --git a/audio/drumstick/distinfo b/audio/drumstick/distinfo index 0f2ddb140ba1..d68b56f47b5f 100644 --- a/audio/drumstick/distinfo +++ b/audio/drumstick/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567656913 -SHA256 (drumstick-1.1.3.tar.bz2) = 75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9 -SIZE (drumstick-1.1.3.tar.bz2) = 1037699 +TIMESTAMP = 1622046962 +SHA256 (drumstick-2.2.0.tar.bz2) = 62dbacfe480bd81b34bd140644ea093bd78eea56a33926902d58f0b05e18ca96 +SIZE (drumstick-2.2.0.tar.bz2) = 1454612 diff --git a/audio/drumstick/files/patch-CMakeLists.txt b/audio/drumstick/files/patch-CMakeLists.txt index dd9a52506d88..eb7077a07302 100644 --- a/audio/drumstick/files/patch-CMakeLists.txt +++ b/audio/drumstick/files/patch-CMakeLists.txt @@ -1,62 +1,57 @@ ---- CMakeLists.txt.orig 2019-09-01 13:59:42 UTC +--- CMakeLists.txt.orig 2021-05-09 10:45:44 UTC +++ CMakeLists.txt -@@ -54,7 +54,7 @@ set(_DBUS_INIT OFF) - - # User options +@@ -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}) - message(STATUS "Build configuration: ${CMAKE_BUILD_TYPE}") - -@@ -84,8 +84,8 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - endif() + if(STATIC_DRUMSTICK) + set(BUILD_SHARED_LIBS OFF) +@@ -96,15 +96,17 @@ else() + message(FATAL_ERROR "Program pkg-config not found") endif() -if(${CMAKE_SYSTEM} MATCHES "Linux") -- pkg_check_modules(ALSA alsa>=1.0.0) +- pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa>=1.0.0) +if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") -+ #pkg_check_modules(ALSA alsa>=1.0.0) ++ #pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa>=1.0.0) if(ALSA_FOUND) - set(ALSA_LIBS ${ALSA_LIBRARIES}) - list(APPEND ALSA_LIB_DIR ${ALSA_LIBRARY_DIRS} ${ALSA_LIBDIR}) -@@ -96,7 +96,9 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") + message(STATUS "Found ALSA version = ${ALSA_VERSION}") + endif() endif() - if(PKG_CONFIG_FOUND) -- pkg_check_modules(PULSE libpulse-simple) + if(UNIX AND NOT APPLE) +- pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple) + if (USE_PULSEAUDIO) -+ pkg_check_modules(PULSE libpulse-simple) ++ pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple) + endif() - if(NOT PULSE_FOUND) - message(STATUS "Warning: PulseAudio library not found.") - endif() -@@ -117,7 +119,7 @@ if(BUILD_TESTING) - add_subdirectory(tests) - endif() + if(PULSE_FOUND) + message(STATUS "Found PulseAudio version = ${PULSE_VERSION}") + else() +@@ -149,7 +151,7 @@ endif() --if(${CMAKE_SYSTEM} MATCHES "Linux") -+if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") - find_package(Doxygen) - if(DOXYGEN_FOUND) - configure_file( -@@ -128,12 +130,14 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") - ${DOXYGEN} Doxyfile - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + 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}") + configure_file("${CMAKE_SOURCE_DIR}/Doxyfile.in" +@@ -160,11 +162,11 @@ if(UNIX AND NOT APPLE) + endif() + add_subdirectory(doc) endif() -- add_subdirectory(doc) - configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY) -+ if (BUILD_DOCS) -+ add_subdirectory(doc) -+ endif() + #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 +- ${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 ) ++ # ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) # 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 81b9eb5fa19e..debc6b64c80b 100644 --- a/audio/drumstick/pkg-plist +++ b/audio/drumstick/pkg-plist @@ -1,40 +1,51 @@ -bin/drumstick-dumpove bin/drumstick-dumpsmf bin/drumstick-dumpwrk bin/drumstick-vpiano include/drumstick/backendmanager.h +include/drumstick/configurationdialogs.h include/drumstick/macros.h -include/drumstick/qove.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 -lib/drumstick/libdrumstick-rt-net-in.so -lib/drumstick/libdrumstick-rt-net-out.so -lib/drumstick/libdrumstick-rt-oss-in.so -lib/drumstick/libdrumstick-rt-oss-out.so -%%PULSEAUDIO%%lib/drumstick/libdrumstick-rt-eassynth.so +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.%%SHL1%% -lib/libdrumstick-file.so.%%SHL3%% +lib/libdrumstick-file.so.2 +lib/libdrumstick-file.so.2.2.0 lib/libdrumstick-rt.so -lib/libdrumstick-rt.so.%%SHL1%% -lib/libdrumstick-rt.so.%%SHL3%% +lib/libdrumstick-rt.so.2 +lib/libdrumstick-rt.so.2.2.0 +lib/libdrumstick-widgets.so +lib/libdrumstick-widgets.so.2 +lib/libdrumstick-widgets.so.2.2.0 +%%QT_PLUGINDIR%%/designer/libdrumstick-vpiano-plugin.so libdata/pkgconfig/drumstick-file.pc libdata/pkgconfig/drumstick-rt.pc -share/applications/drumstick-vpiano.desktop -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 -%%DATADIR%%/cmake/drumstick-file-config-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/cmake/drumstick-file-config.cmake -%%DATADIR%%/cmake/drumstick-rt-config-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/cmake/drumstick-rt-config.cmake +libdata/pkgconfig/drumstick-widgets.pc %%MANPAGES%%man/man1/drumstick-drumgrid.1.gz %%MANPAGES%%man/man1/drumstick-dumpmid.1.gz -%%MANPAGES%%man/man1/drumstick-dumpove.1.gz %%MANPAGES%%man/man1/drumstick-dumpsmf.1.gz %%MANPAGES%%man/man1/drumstick-dumpwrk.1.gz %%MANPAGES%%man/man1/drumstick-guiplayer.1.gz @@ -42,4 +53,24 @@ share/icons/hicolor/scalable/apps/drumstick.svgz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105261805.14QI5iDt050457>