From nobody Thu Oct 31 18:52:53 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XfY5y0l9Pz5cBq8; Thu, 31 Oct 2024 18:52:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfY5y0BRhz4F7M; Thu, 31 Oct 2024 18:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730400774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+UFtAkP7f9QAG6SiBsZcO0HWSFX8Uhp67aBe1bfIXk=; b=vrPCWOJqlAGLAvfPmmT6kFvBIZjGHdvpu+Hq7Q+KgPAFNsTrQQ+BDqeHWIOyKlfxWLb+NO ElUyj72Js5aivaAq0UU/0t8QYigbUeiGpp04bkZwmLhUy55M/qHduIf2HBMIyZocmCmk46 ge58FcnuiByKJj+aA3Ucf+HkbiwfSlWOH0T1VJ8PAyZMUMitkeFi5LzOG5IGuMAviSisn2 FRRUiA05QCeeP9hYxoNc8LxrTJh7yuGRiZtG7WJNil1qDGlWifeCpR/uLV4YojCFqEPuj6 igz46Ne+UVKgyGfDq/7lTrXFCVxzRNBurafI3nAIaNsZzIMwGnJZ5LymcIfs9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730400774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+UFtAkP7f9QAG6SiBsZcO0HWSFX8Uhp67aBe1bfIXk=; b=iJWI1fMMUlCFykBPtD7iHVPNbpip3ig1AQybvUuMU6YmDLJLpSV5QJfHDz5iFW3SOpzs+d iQhcrMt6f7vv72fqWU7OwJIUTSXnJQlBcVi7TrcAKz1I8Pdv3jgMdfV9p5G53Y8NEavR23 w9YephgziskvVRcpmw+jyU/I+qDO9dfNWtRe8gQ3J/DlJ/Ta4NaxtGOvzVuogUMKwK+DzG w5cO8g4Uy7GLUnccuiVZkDoA+EeXfD522OHXJd8VsKlJxwRvUGHJiV84EdFI77sRmItmjJ N/eCWwJ8hZmTe+nSuBz5LT1FEHs5hBXVGvR489tKirh7G8zkcC/VzfiFmLaDJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730400774; a=rsa-sha256; cv=none; b=C/Mul+xvpbPWkdVSwUwq6crBE8cx/uOs19k8gfLop5OY8eDPasAu3gcPRjTOTISyXsdaQE Is4iX2RPVRrJL8DpPtxgGzHzrLsHa0wL1F3F/wudXR1M6rpC/3V+B7Uh5SWOiY7uWrL+Re MI6UDCCBofBQMmF+LKwpXE8WgPIQqAUWWwNDTgZ7zhQ8lD+hh61EQB1giw5ZhhDvSmjkUW ebZmWFHcDud8zFoJYQtNjxlihPriKnRbL9IwpIDSPHHQ4cQlIU6wAZUeXQrdekbjJ3Qj1g ZQpMaJlduRnAu0TyBeeiwOpknfKEFb/O9r5CpEs7ESNgwxdu9NhJabILxKDfDQ== 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 4XfY5x6vZ9znGN; Thu, 31 Oct 2024 18:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49VIqrOX094441; Thu, 31 Oct 2024 18:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VIqrnw094438; Thu, 31 Oct 2024 18:52:53 GMT (envelope-from git) Date: Thu, 31 Oct 2024 18:52:53 GMT Message-Id: <202410311852.49VIqrnw094438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 7f7fd58342d0 - main - audio/ardour: Update 8.6.0 =?utf-8?Q?=E2=86=92?= 8.10.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f7fd58342d0271f2c357318247c54c8cc6c4df5 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f7fd58342d0271f2c357318247c54c8cc6c4df5 commit 7f7fd58342d0271f2c357318247c54c8cc6c4df5 Author: Florian Walpen AuthorDate: 2024-10-31 18:50:36 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-31 18:52:37 +0000 audio/ardour: Update 8.6.0 → 8.10.0 We skipped three minor release versions due to some major issues with Ardour 8.7.0, 8.8.0 and 8.9.0, causing crashes. See changes for details. Changes: https://ardour.org/whatsnew.html PR: 282061 --- audio/ardour/Makefile | 15 +++++----- audio/ardour/distinfo | 6 ++-- .../patch-libs_surfaces_websockets_message.cc | 32 ---------------------- audio/ardour/pkg-plist | 12 ++++++++ 4 files changed, 23 insertions(+), 42 deletions(-) diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 0c0bab56e3fb..6fa62e70aec4 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -1,12 +1,11 @@ PORTNAME= ardour -DISTVERSION= 8.6.0 -PORTREVISION= 2 +DISTVERSION= 8.10.0 CATEGORIES= audio # Official source download is tailored to browsers, downloads from github are # deliberately made empty. Put the badly named distfile into a subdirectory. MASTER_SITES= https://community.ardour.org/download/release/ DISTNAME= Ardour-${DISTVERSION} -DISTFILES= 574 +DISTFILES= 598 DIST_SUBDIR= ${DISTNAME} MAINTAINER= dev@submerge.ch @@ -16,7 +15,8 @@ WWW= https://ardour.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= lv2>=1.18.0:audio/lv2 \ +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ + lv2>=1.18.0:audio/lv2 \ itstool>2.0.0:textproc/itstool \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= as:devel/binutils @@ -33,7 +33,6 @@ LIB_DEPENDS= libserd-0.so:devel/serd \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ - libboost_date_time.so:devel/boost-libs \ libvamp-hostsdk.so:audio/vamp-plugin-sdk \ libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile \ @@ -45,11 +44,13 @@ LIB_DEPENDS= libserd-0.so:devel/serd \ libFLAC.so:audio/flac \ libwebsockets.so:net/libwebsockets +# libboost_date_time.so:devel/boost-libs + USES= compiler:c++11-lang desktop-file-utils gettext gnome \ - libarchive pkgconfig python:build readline tar:bzip2 \ + libarchive pkgconfig python:build readline ssl tar:bzip2 \ waf xorg shared-mime-info USE_CXXSTD= c++11 -USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango +USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libxml2 pango USE_LDCONFIG= yes USE_XORG= x11 diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo index f90f518145c8..cc8731ad1bc5 100644 --- a/audio/ardour/distinfo +++ b/audio/ardour/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713026350 -SHA256 (Ardour-8.6.0/574) = e19740e980b162ecd22379b735000741609f89c7553796b75f47b75e2f1e0a8e -SIZE (Ardour-8.6.0/574) = 17588463 +TIMESTAMP = 1729206695 +SHA256 (Ardour-8.10.0/598) = ef7a9db00d80f114f8d0869ea3cdc202fdaa1202f273755f1219ff757880881c +SIZE (Ardour-8.10.0/598) = 17811275 diff --git a/audio/ardour/files/patch-libs_surfaces_websockets_message.cc b/audio/ardour/files/patch-libs_surfaces_websockets_message.cc deleted file mode 100644 index 8c10908bc672..000000000000 --- a/audio/ardour/files/patch-libs_surfaces_websockets_message.cc +++ /dev/null @@ -1,32 +0,0 @@ -commit f94bde59d740d65e67c5cd13af4d7ea51453aeaa -Author: Fabio Pesari -Date: Sun Sep 15 11:04:30 2024 +0200 - - Fix for Boost 1.8.5 - - Recent boost prevents calls to `get_child` with temporary - default values. - -diff --git libs/surfaces/websockets/message.cc libs/surfaces/websockets/message.cc -index eff8e48ac3..0aee14d0df 100644 ---- libs/surfaces/websockets/message.cc -+++ libs/surfaces/websockets/message.cc -@@ -58,14 +58,16 @@ NodeStateMessage::NodeStateMessage (void* buf, size_t len) - - _state = NodeState (root.get ("node")); - -- pt::ptree addr = root.get_child ("addr", pt::ptree ()); -+ pt::ptree addr = pt::ptree (); -+ addr = root.get_child ("addr", addr); - - for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) { - // throws if datatype not uint32_t - _state.add_addr (boost::lexical_cast (it->second.data ())); - } - -- pt::ptree val = root.get_child ("val", pt::ptree ()); -+ pt::ptree val = pt::ptree (); -+ val = root.get_child ("val", val); - - for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) { - std::string val = it->second.data (); diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist index bc547f0dda51..a2a018aa2d25 100644 --- a/audio/ardour/pkg-plist +++ b/audio/ardour/pkg-plist @@ -98,6 +98,7 @@ lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport2.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so +lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchkey_4.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_mini.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_pro.so lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_x.so @@ -189,6 +190,8 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/icons/launchpad-mini.png %%DATADIR%%/icons/launchpad-pro.png %%DATADIR%%/icons/launchpad-x.png +%%DATADIR%%/icons/lkmk4.png +%%DATADIR%%/icons/lkmk4mini.png %%DATADIR%%/icons/mezzforte.png %%DATADIR%%/icons/mezzoforte.png %%DATADIR%%/icons/mezzopiano.png @@ -310,6 +313,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/midi_maps/AKAI_MPK249.map %%DATADIR%%/midi_maps/AKAI_MPK61.map %%DATADIR%%/midi_maps/AKAI_MPKmini.map +%%DATADIR%%/midi_maps/AKAI_MPKmini_mk3.map %%DATADIR%%/midi_maps/AKAI_MPKminiplus.map %%DATADIR%%/midi_maps/Alesis_Q49v2.map %%DATADIR%%/midi_maps/Alesis_QX25.map @@ -328,6 +332,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/midi_maps/Korg_taktile.map %%DATADIR%%/midi_maps/M-Audio_Axiom25.map %%DATADIR%%/midi_maps/M-Audio_Axiom61.map +%%DATADIR%%/midi_maps/M-Audio_Axiom_49_mkII.map %%DATADIR%%/midi_maps/M-Audio_Axiom_AIR_Mini_32.map %%DATADIR%%/midi_maps/M-Audio_Axiom_Air_25_2015_Model_Transport_Only.map %%DATADIR%%/midi_maps/M-Audio_Oxygen49.map @@ -578,6 +583,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/patchfiles/Korg_Wavestation_SR.midnam %%DATADIR%%/patchfiles/Korg_X2_3_3R.midnam %%DATADIR%%/patchfiles/Korg_X5(D).midnam +%%DATADIR%%/patchfiles/Korg_X50.midnam %%DATADIR%%/patchfiles/Korg_X5DR.midnam %%DATADIR%%/patchfiles/Korg_Z1.midnam %%DATADIR%%/patchfiles/Korg_iSeries.midnam @@ -591,6 +597,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/patchfiles/Kurzweil_K2500_2600_Expansion.midnam %%DATADIR%%/patchfiles/Kurzweil_K2600.midnam %%DATADIR%%/patchfiles/Kurzweil_K2661.midnam +%%DATADIR%%/patchfiles/Kurzweil_K2700.midnam %%DATADIR%%/patchfiles/Kurzweil_Mark_12_152.midnam %%DATADIR%%/patchfiles/Kurzweil_Micro_Piano.midnam %%DATADIR%%/patchfiles/Kurzweil_PC2_PC2r_w_Orch.midnam @@ -843,6 +850,8 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/scripts/collapse_playlists.lua %%DATADIR%%/scripts/create_drum_tracks.lua %%DATADIR%%/scripts/delete_xrun_markers.lua +%%DATADIR%%/scripts/dm10studio.lua +%%DATADIR%%/scripts/duplicate_to_grid.lua %%DATADIR%%/scripts/export_mp4chaps.lua %%DATADIR%%/scripts/jump_to_marker.lua %%DATADIR%%/scripts/lfo_automation.lua @@ -864,6 +873,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/scripts/preare_record_example.lua %%DATADIR%%/scripts/raptor_arp.lua %%DATADIR%%/scripts/record_now.lua +%%DATADIR%%/scripts/remove_sysex_from_region.lua %%DATADIR%%/scripts/remove_unknown_procs.lua %%DATADIR%%/scripts/reset_mixer.lua %%DATADIR%%/scripts/reverse_midi.lua @@ -896,6 +906,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/scripts/scl_to_mts.lua %%DATADIR%%/scripts/scope.lua %%DATADIR%%/scripts/select_every_2nd_region.lua +%%DATADIR%%/scripts/select_regions_at_playhead.lua %%DATADIR%%/scripts/send_to_bus.lua %%DATADIR%%/scripts/session_template_advanced.lua %%DATADIR%%/scripts/session_template_record.lua @@ -918,6 +929,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop %%DATADIR%%/themes/adwaita_dark-ardour.colors %%DATADIR%%/themes/blueberry_milk-ardour.colors %%DATADIR%%/themes/caineville-ardour.colors +%%DATADIR%%/themes/captain_light-ardour.colors %%DATADIR%%/themes/clear_gray-ardour.colors %%DATADIR%%/themes/cubasish-ardour.colors %%DATADIR%%/themes/dark-ardour.colors