Index: head/audio/drumstick/Makefile =================================================================== --- head/audio/drumstick/Makefile (revision 514412) +++ head/audio/drumstick/Makefile (revision 514413) @@ -1,40 +1,39 @@ # $FreeBSD$ PORTNAME= drumstick -DISTVERSION= 1.1.2 -PORTREVISION= 6 +DISTVERSION= 1.1.3 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 widgets buildtools_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 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: @${REINPLACE_CMD} -e 's|"default.sf2"|"${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2"|' \ ${WRKSRC}/utils/vpiano/fluidsettingsdialog.cpp \ - ${WRKSRC}/library/rt-backends/synth/synthengine.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 Index: head/audio/drumstick/distinfo =================================================================== --- head/audio/drumstick/distinfo (revision 514412) +++ head/audio/drumstick/distinfo (revision 514413) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543211012 -SHA256 (drumstick-1.1.2.tar.bz2) = 7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e -SIZE (drumstick-1.1.2.tar.bz2) = 1012371 +TIMESTAMP = 1567656913 +SHA256 (drumstick-1.1.3.tar.bz2) = 75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9 +SIZE (drumstick-1.1.3.tar.bz2) = 1037699 Index: head/audio/drumstick/files/patch-library_rt-backends_CMakeLists.txt =================================================================== --- head/audio/drumstick/files/patch-library_rt-backends_CMakeLists.txt (revision 514412) +++ head/audio/drumstick/files/patch-library_rt-backends_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- library/rt-backends/CMakeLists.txt.orig 2018-02-26 17:05:42 UTC -+++ library/rt-backends/CMakeLists.txt -@@ -17,7 +17,7 @@ - #add_subdirectory(dummy-in) - #add_subdirectory(dummy-out) - --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD") - if(ALSA_FOUND) - add_subdirectory(alsa-in) - add_subdirectory(alsa-out) Property changes on: head/audio/drumstick/files/patch-library_rt-backends_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/drumstick/files/patch-CMakeLists.txt =================================================================== --- head/audio/drumstick/files/patch-CMakeLists.txt (revision 514412) +++ head/audio/drumstick/files/patch-CMakeLists.txt (revision 514413) @@ -1,80 +1,62 @@ ---- CMakeLists.txt.orig 2018-11-25 16:14:19 UTC +--- CMakeLists.txt.orig 2019-09-01 13:59:42 UTC +++ CMakeLists.txt -@@ -25,7 +25,7 @@ endif() - project(DRUMSTICK) +@@ -54,7 +54,7 @@ set(_DBUS_INIT OFF) - if(CMAKE_SIZEOF_VOID_P MATCHES "8") -- set(_INIT_LIB_SUFFIX "64") -+ set(_INIT_LIB_SUFFIX "") - else() - set(_INIT_LIB_SUFFIX "") - endif() -@@ -72,7 +72,7 @@ set(_DBUS_INIT OFF) - # User options 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}") -@@ -100,8 +100,8 @@ else() - message(FATAL_ERROR "Program pkg-config not found") +@@ -84,8 +84,8 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") + endif() endif() -if(${CMAKE_SYSTEM} MATCHES "Linux") - pkg_check_modules(ALSA alsa>=1.0.0) +if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") + #pkg_check_modules(ALSA alsa>=1.0.0) if(ALSA_FOUND) set(ALSA_LIBS ${ALSA_LIBRARIES}) list(APPEND ALSA_LIB_DIR ${ALSA_LIBRARY_DIRS} ${ALSA_LIBDIR}) -@@ -111,7 +111,9 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") - endif() +@@ -96,7 +96,9 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") endif() --pkg_check_modules(PULSE libpulse-simple) -+if (USE_PULSEAUDIO) -+ pkg_check_modules(PULSE libpulse-simple) -+endif() - if(NOT PULSE_FOUND) - message(STATUS "Warning: PulseAudio library not found.") - endif() -@@ -134,7 +136,7 @@ if(BUILD_TESTING) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PULSE libpulse-simple) ++ if (USE_PULSEAUDIO) ++ pkg_check_modules(PULSE 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(${CMAKE_SYSTEM} MATCHES "Linux") +if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") find_package(Doxygen) if(DOXYGEN_FOUND) configure_file( -@@ -145,12 +147,14 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") +@@ -128,12 +130,14 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") ${DOXYGEN} Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) 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 -- DESTINATION lib${LIB_SUFFIX}/pkgconfig ) +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + #install(FILES -+ # ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc -+ # DESTINATION lib${LIB_SUFFIX}/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" ) -@@ -180,7 +184,7 @@ configure_file( - add_custom_target( uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - --if(${CMAKE_SYSTEM} MATCHES "Linux") -+if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") - # tarball target - add_custom_target( tarball - COMMAND mkdir -p drumstick-${VERSION} Index: head/audio/drumstick/pkg-plist =================================================================== --- head/audio/drumstick/pkg-plist (revision 514412) +++ head/audio/drumstick/pkg-plist (revision 514413) @@ -1,41 +1,45 @@ bin/drumstick-dumpove bin/drumstick-dumpsmf bin/drumstick-dumpwrk bin/drumstick-vpiano include/drumstick/backendmanager.h include/drumstick/macros.h include/drumstick/qove.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 lib/libdrumstick-file.so lib/libdrumstick-file.so.%%SHL1%% lib/libdrumstick-file.so.%%SHL3%% lib/libdrumstick-rt.so lib/libdrumstick-rt.so.%%SHL1%% lib/libdrumstick-rt.so.%%SHL3%% 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 %%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 %%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/mime/packages/drumstick.xml