Index: head/audio/drumstick/Makefile =================================================================== --- head/audio/drumstick/Makefile (revision 485917) +++ head/audio/drumstick/Makefile (revision 485918) @@ -1,40 +1,39 @@ # $FreeBSD$ PORTNAME= drumstick -DISTVERSION= 1.1.1 -PORTREVISION= 1 +DISTVERSION= 1.1.2 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= cmake:outsource 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 @${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 485917) +++ head/audio/drumstick/distinfo (revision 485918) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519663446 -SHA256 (drumstick-1.1.1.tar.bz2) = 367743764c8f5c6e40bb19b9581f083da2881b9c9516d6b3b247e5644dee7c2b -SIZE (drumstick-1.1.1.tar.bz2) = 1011275 +TIMESTAMP = 1543211012 +SHA256 (drumstick-1.1.2.tar.bz2) = 7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e +SIZE (drumstick-1.1.2.tar.bz2) = 1012371 Index: head/audio/drumstick/files/patch-library_rt_backendmanager.cpp =================================================================== --- head/audio/drumstick/files/patch-library_rt_backendmanager.cpp (revision 485917) +++ head/audio/drumstick/files/patch-library_rt_backendmanager.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- library/rt/backendmanager.cpp.orig 2016-09-24 21:08:23 UTC -+++ library/rt/backendmanager.cpp -@@ -140,7 +140,7 @@ namespace rt { - d->appendDir( appPath + QStringLiteral("../PlugIns/") + QSTR_DRUMSTICK, result ); - #endif // Linux, Unix... - QStringList libs; -- libs << "../lib/" << "../lib32/" << "../lib64/"; -+ libs << "../lib/"; - foreach(const QString& lib, libs) { - d->appendDir( appPath + lib + QSTR_DRUMSTICK, result ); - } Property changes on: head/audio/drumstick/files/patch-library_rt_backendmanager.cpp ___________________________________________________________________ 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 485917) +++ head/audio/drumstick/files/patch-CMakeLists.txt (revision 485918) @@ -1,88 +1,80 @@ ---- CMakeLists.txt.orig 2018-02-24 20:04:23 UTC +--- CMakeLists.txt.orig 2018-11-25 16:14:19 UTC +++ CMakeLists.txt -@@ -22,7 +22,7 @@ endif() +@@ -25,7 +25,7 @@ endif() project(DRUMSTICK) if(CMAKE_SIZEOF_VOID_P MATCHES "8") - set(_INIT_LIB_SUFFIX "64") + set(_INIT_LIB_SUFFIX "") else() set(_INIT_LIB_SUFFIX "") endif() -@@ -63,13 +63,13 @@ add_definitions(-DVERSION=${VERSION}) - message(STATUS "drumstick ${VERSION} prefix: ${CMAKE_INSTALL_PREFIX}") +@@ -72,7 +72,7 @@ set(_DBUS_INIT OFF) - set(_DBUS_INIT OFF) --if(${CMAKE_SYSTEM} MATCHES "Linux") -+if(${CMAKE_SYSTEM} MATCHES "Linux|FreeBSD") - set(_DBUS_INIT ON) - endif() - # 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}") -@@ -97,8 +97,8 @@ else() +@@ -100,8 +100,8 @@ else() message(FATAL_ERROR "Program pkg-config not found") 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}) -@@ -107,7 +107,10 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") - message(STATUS "Warning: ALSA library not found.") +@@ -111,7 +111,9 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") endif() endif() + -pkg_check_modules(PULSE libpulse-simple) -+#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() -@@ -126,7 +129,7 @@ if(BUILD_TESTING) +@@ -134,7 +136,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( -@@ -137,12 +140,14 @@ if(${CMAKE_SYSTEM} MATCHES "Linux") +@@ -145,12 +147,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 ) + #install(FILES + # ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc + # DESTINATION lib${LIB_SUFFIX}/pkgconfig ) # XML mime types set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" ) set( XDG_MIME_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages" ) -@@ -172,7 +177,7 @@ configure_file( +@@ -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}