From owner-dev-commits-ports-main@freebsd.org Thu Jul 1 01:07:46 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 648ED6536F0; Thu, 1 Jul 2021 01:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GFg762Hj4z4mQt; Thu, 1 Jul 2021 01:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 381EA17486; Thu, 1 Jul 2021 01:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16117kcP006963; Thu, 1 Jul 2021 01:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16117klN006962; Thu, 1 Jul 2021 01:07:46 GMT (envelope-from git) Date: Thu, 1 Jul 2021 01:07:46 GMT Message-Id: <202107010107.16117klN006962@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 56fbc050a13f - main - audio/drumstick: Update 2.2.1 -> 2.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56fbc050a13f0a72a2d77b98426d4f387157f01e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2021 01:07:46 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=56fbc050a13f0a72a2d77b98426d4f387157f01e commit 56fbc050a13f0a72a2d77b98426d4f387157f01e Author: Yuri Victorovich AuthorDate: 2021-07-01 01:00:31 +0000 Commit: Yuri Victorovich CommitDate: 2021-07-01 01:07:41 +0000 audio/drumstick: Update 2.2.1 -> 2.3.0 Reported by: portscout --- audio/drumstick/Makefile | 2 +- audio/drumstick/distinfo | 6 ++-- audio/drumstick/files/patch-CMakeLists.txt | 48 ++++++++---------------------- audio/drumstick/pkg-plist | 6 ++-- 4 files changed, 20 insertions(+), 42 deletions(-) diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile index 849280d9fb51..c13dfdf67a95 100644 --- a/audio/drumstick/Makefile +++ b/audio/drumstick/Makefile @@ -1,5 +1,5 @@ PORTNAME= drumstick -DISTVERSION= 2.2.1 +DISTVERSION= 2.3.0 CATEGORIES= audio multimedia MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ 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,15 +1,6 @@ ---- 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() @@ -20,38 +11,25 @@ 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 @@ -33,13 +33,13 @@ 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