CVS commit: pkgsrc/audio/ardour

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 31 17:15:11 UTC 2025

Modified Files:
        pkgsrc/audio/ardour: Makefile PLIST distinfo options.mk
        pkgsrc/audio/ardour/patches: patch-gtk2__ardour_wscript
            patch-libs_aaf_aaf_LibCFB.h patch-libs_pbd_cpus.cc
            patch-libs_qm-dsp_wscript
            patch-libs_vst3_pluginterfaces_base_fplatform.h
Added Files:
        pkgsrc/audio/ardour/patches: patch-libs_aaf_utils.c
            patch-libs_tk_ydk_config.h patch-libs_tk_ytk_config.h
Removed Files:
        pkgsrc/audio/ardour/patches: patch-libs_aaf_AAFIAudioFiles.c
            patch-libs_aaf_wscript patch-libs_ardour_audiofile__tagger.cc
            patch-session__utils_wscript

Log Message:
ardour: update to 8.10.0.

Fixes build.

Ardour 8.10 is now available for Linux, Windows and macOS. As with
the last several releases, 8.9 turned out to have at least a couple
of new major issues that required a hot-fix. We believe that we
have corrected issues with performance caused by scheduling of disk
input/output threads (these problems tended to be system dependent,
but were very real on systems where they occured).  Importing SMF
(MIDI) via drag-n-drop now uses the file name once again.
Content-slipping a region correctly causes an update of the playback
buffers so you can hear the result as expected.

In addition to those hot-fixes, 8.10 sees small updates to all our
non-default color themes, a new MIDI binding map for the M-Audio
Axiom 49 MkII and a new Lua script to duplicate regions on the
grid.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/audio/ardour/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/ardour/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/ardour/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/ardour/options.mk
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/audio/ardour/patches/patch-libs_aaf_AAFIAudioFiles.c \
    pkgsrc/audio/ardour/patches/patch-libs_aaf_wscript \
    pkgsrc/audio/ardour/patches/patch-libs_ardour_audiofile__tagger.cc \
    pkgsrc/audio/ardour/patches/patch-session__utils_wscript
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h \
    pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc \
    pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ardour/patches/patch-libs_aaf_utils.c \
    pkgsrc/audio/ardour/patches/patch-libs_tk_ydk_config.h \
    pkgsrc/audio/ardour/patches/patch-libs_tk_ytk_config.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/ardour/Makefile
diff -u pkgsrc/audio/ardour/Makefile:1.95 pkgsrc/audio/ardour/Makefile:1.96
--- pkgsrc/audio/ardour/Makefile:1.95   Sun Dec 29 15:09:38 2024
+++ pkgsrc/audio/ardour/Makefile        Fri Jan 31 17:15:11 2025
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.95 2024/12/29 15:09:38 adam Exp $
+# $NetBSD: Makefile,v 1.96 2025/01/31 17:15:11 wiz Exp $
 
-DISTNAME=      Ardour-8.2.0
+DISTNAME=      Ardour-8.10.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   12
 CATEGORIES=    audio
-# currently, distfiles must be downloaded by hand from ardour.org
-# and uploaded using `make upload-distfiles`.
-# there is no canonical URL, only https://community.ardour.org/srctar
-MASTER_SITES=  ${MASTER_SITE_LOCAL}
+MASTER_SITES=  https://community.ardour.org/src/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -24,7 +20,8 @@ EGDIR=                ${PREFIX}/share/examples/ardour8
 
 WAF_ENV+=      EGDIR=${EGDIR}
 
-USE_CXX_FEATURES+=     c++11
+USE_CXX_FEATURES+=     c++14
+FORCE_CXX_STD=         c++14
 
 CXXFLAGS+=     -fpermissive
 
@@ -71,10 +68,6 @@ LDFLAGS+=    ${COMPILER_RPATH_FLAG}${PREFIX
 # strdup prototype difficulties...
 CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE
 
-WAF_REPLACE_EXECUTABLE=                no
-# No release with python 3 support yet.
-# Patches are available.
-PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
 
 INSTALLATION_DIRS+=    share/appdata

Index: pkgsrc/audio/ardour/PLIST
diff -u pkgsrc/audio/ardour/PLIST:1.5 pkgsrc/audio/ardour/PLIST:1.6
--- pkgsrc/audio/ardour/PLIST:1.5       Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/PLIST   Fri Jan 31 17:15:11 2025
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2024/03/18 15:36:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/31 17:15:11 wiz Exp $
 bin/ardour8
 bin/ardour8-copy-mixer
 bin/ardour8-export
 bin/ardour8-lua
-bin/ardour8-new_aaf_session
 bin/ardour8-new_empty_session
 bin/ardour8-new_session
 lib/ardour8/LV2/a-comp.lv2/a-comp#stereo.ttl
@@ -69,6 +68,10 @@ lib/ardour8/libpbd.so.4.1.0
 lib/ardour8/libptformat.so
 lib/ardour8/libptformat.so.0
 lib/ardour8/libptformat.so.0.0.0
+lib/ardour8/libsuil.so
+lib/ardour8/libsuil.so.0
+lib/ardour8/libsuil.so.0.10.8
+lib/ardour8/libsuil_x11_in_gtk2.so
 lib/ardour8/libtemporal.so
 lib/ardour8/libtemporal.so.0
 lib/ardour8/libtemporal.so.0.0.0
@@ -78,6 +81,27 @@ lib/ardour8/libwaveview.so.0.0.0
 lib/ardour8/libwidgets.so
 lib/ardour8/libwidgets.so.0
 lib/ardour8/libwidgets.so.0.0.0
+lib/ardour8/libydk-pixbuf.so
+lib/ardour8/libydk-pixbuf.so.2
+lib/ardour8/libydk-pixbuf.so.2.31.1
+lib/ardour8/libydk.so
+lib/ardour8/libydk.so.2
+lib/ardour8/libydk.so.2.24.23
+lib/ardour8/libydkmm.so
+lib/ardour8/libydkmm.so.2
+lib/ardour8/libydkmm.so.2.24.5
+lib/ardour8/libytk.so
+lib/ardour8/libytk.so.2
+lib/ardour8/libytk.so.2.24.23
+lib/ardour8/libytkmm.so
+lib/ardour8/libytkmm.so.2
+lib/ardour8/libytkmm.so.2.24.5
+lib/ardour8/libztk.so
+lib/ardour8/libztk.so.2
+lib/ardour8/libztk.so.2.14.0
+lib/ardour8/libztkmm.so
+lib/ardour8/libztkmm.so.2
+lib/ardour8/libztkmm.so.2.22.7
 lib/ardour8/luasession
 lib/ardour8/panners/libpan1in2out.so
 lib/ardour8/panners/libpan2in2out.so
@@ -93,6 +117,7 @@ lib/ardour8/surfaces/libardour_faderport
 lib/ardour8/surfaces/libardour_faderport8.so
 lib/ardour8/surfaces/libardour_generic_midi.so
 lib/ardour8/surfaces/libardour_launch_control_xl.so
+lib/ardour8/surfaces/libardour_launchkey_4.so
 lib/ardour8/surfaces/libardour_launchpad_mini.so
 lib/ardour8/surfaces/libardour_launchpad_pro.so
 lib/ardour8/surfaces/libardour_launchpad_x.so
@@ -104,7 +129,6 @@ lib/ardour8/surfaces/libardour_us2400.so
 lib/ardour8/utils/ardour-util.sh
 lib/ardour8/utils/ardour8-copy-mixer
 lib/ardour8/utils/ardour8-export
-lib/ardour8/utils/ardour8-new_aaf_session
 lib/ardour8/utils/ardour8-new_empty_session
 lib/ardour8/utils/ardour8-new_session
 lib/ardour8/vamp/libardourvampplugins.so
@@ -185,6 +209,8 @@ share/ardour8/icons/launch_control_xl.pn
 share/ardour8/icons/launchpad-mini.png
 share/ardour8/icons/launchpad-pro.png
 share/ardour8/icons/launchpad-x.png
+share/ardour8/icons/lkmk4.png
+share/ardour8/icons/lkmk4mini.png
 share/ardour8/icons/mezzforte.png
 share/ardour8/icons/mezzoforte.png
 share/ardour8/icons/mezzopiano.png
@@ -306,11 +332,13 @@ share/ardour8/midi_maps/AKAI_MPK225_Plug
 share/ardour8/midi_maps/AKAI_MPK249.map
 share/ardour8/midi_maps/AKAI_MPK61.map
 share/ardour8/midi_maps/AKAI_MPKmini.map
+share/ardour8/midi_maps/AKAI_MPKmini_mk3.map
 share/ardour8/midi_maps/AKAI_MPKminiplus.map
 share/ardour8/midi_maps/Alesis_Q49v2.map
 share/ardour8/midi_maps/Alesis_QX25.map
 share/ardour8/midi_maps/Alesis_VI25.map
 share/ardour8/midi_maps/Arturia_KeyLab49.map
+share/ardour8/midi_maps/Arturia_MiniLab_3.map
 share/ardour8/midi_maps/Arturia_MiniLab_mkII.map
 share/ardour8/midi_maps/DDX3216.map
 share/ardour8/midi_maps/Devine_Versakey.map
@@ -323,6 +351,7 @@ share/ardour8/midi_maps/Korg_nanoKONTROL
 share/ardour8/midi_maps/Korg_taktile.map
 share/ardour8/midi_maps/M-Audio_Axiom25.map
 share/ardour8/midi_maps/M-Audio_Axiom61.map
+share/ardour8/midi_maps/M-Audio_Axiom_49_mkII.map
 share/ardour8/midi_maps/M-Audio_Axiom_AIR_Mini_32.map
 share/ardour8/midi_maps/M-Audio_Axiom_Air_25_2015_Model_Transport_Only.map
 share/ardour8/midi_maps/M-Audio_Oxygen49.map
@@ -340,6 +369,7 @@ share/ardour8/midi_maps/Yamaha_KX25.map
 share/ardour8/midi_maps/akai-mpd-32.map
 share/ardour8/midi_maps/bcf2000.map
 share/ardour8/midi_maps/bcf2000_mackie.map
+share/ardour8/midi_maps/donnerdmk25.map
 share/ardour8/midi_maps/m-audio-oxygen61v3.map
 share/ardour8/midi_maps/m-audio_oxygen25.map
 share/ardour8/midi_maps/m-audio_oxygen25_3rdGen.map
@@ -572,6 +602,7 @@ share/ardour8/patchfiles/Korg_Wavestatio
 share/ardour8/patchfiles/Korg_Wavestation_SR.midnam
 share/ardour8/patchfiles/Korg_X2_3_3R.midnam
 share/ardour8/patchfiles/Korg_X5(D).midnam
+share/ardour8/patchfiles/Korg_X50.midnam
 share/ardour8/patchfiles/Korg_X5DR.midnam
 share/ardour8/patchfiles/Korg_Z1.midnam
 share/ardour8/patchfiles/Korg_iSeries.midnam
@@ -585,6 +616,7 @@ share/ardour8/patchfiles/Kurzweil_K2500X
 share/ardour8/patchfiles/Kurzweil_K2500_2600_Expansion.midnam
 share/ardour8/patchfiles/Kurzweil_K2600.midnam
 share/ardour8/patchfiles/Kurzweil_K2661.midnam
+share/ardour8/patchfiles/Kurzweil_K2700.midnam
 share/ardour8/patchfiles/Kurzweil_Mark_12_152.midnam
 share/ardour8/patchfiles/Kurzweil_Micro_Piano.midnam
 share/ardour8/patchfiles/Kurzweil_PC2_PC2r_w_Orch.midnam
@@ -598,6 +630,7 @@ share/ardour8/patchfiles/Kurzweil_SP88x.
 share/ardour8/patchfiles/Lexicon_DR_Music_FX_Expansion.midnam
 share/ardour8/patchfiles/Lexicon_Dual_FX_Expansion.midnam
 share/ardour8/patchfiles/Lexicon_Dual_Vrb_Expansion.midnam
+share/ardour8/patchfiles/Lexicon_MPX100.midnam
 share/ardour8/patchfiles/Lexicon_MPX500.midnam
 share/ardour8/patchfiles/Lexicon_MPX_1.midnam
 share/ardour8/patchfiles/Lexicon_MPX_500.midnam
@@ -796,6 +829,7 @@ share/ardour8/patchfiles/Yamaha_RM50.mid
 share/ardour8/patchfiles/Yamaha_S30_80.midnam
 share/ardour8/patchfiles/Yamaha_S90.midnam
 share/ardour8/patchfiles/Yamaha_SY77.midnam
+share/ardour8/patchfiles/Yamaha_SY85.midnam
 share/ardour8/patchfiles/Yamaha_SY99.midnam
 share/ardour8/patchfiles/Yamaha_So3.midnam
 share/ardour8/patchfiles/Yamaha_So8.midnam
@@ -835,6 +869,8 @@ share/ardour8/scripts/bypass_all_plugins
 share/ardour8/scripts/collapse_playlists.lua
 share/ardour8/scripts/create_drum_tracks.lua
 share/ardour8/scripts/delete_xrun_markers.lua
+share/ardour8/scripts/dm10studio.lua
+share/ardour8/scripts/duplicate_to_grid.lua
 share/ardour8/scripts/export_mp4chaps.lua
 share/ardour8/scripts/jump_to_marker.lua
 share/ardour8/scripts/lfo_automation.lua
@@ -856,6 +892,7 @@ share/ardour8/scripts/post_export_save_h
 share/ardour8/scripts/preare_record_example.lua
 share/ardour8/scripts/raptor_arp.lua
 share/ardour8/scripts/record_now.lua
+share/ardour8/scripts/remove_sysex_from_region.lua
 share/ardour8/scripts/remove_unknown_procs.lua
 share/ardour8/scripts/reset_mixer.lua
 share/ardour8/scripts/reverse_midi.lua
@@ -888,6 +925,7 @@ share/ardour8/scripts/s_whoami.lua
 share/ardour8/scripts/scl_to_mts.lua
 share/ardour8/scripts/scope.lua
 share/ardour8/scripts/select_every_2nd_region.lua
+share/ardour8/scripts/select_regions_at_playhead.lua
 share/ardour8/scripts/send_to_bus.lua
 share/ardour8/scripts/session_template_advanced.lua
 share/ardour8/scripts/session_template_record.lua
@@ -907,8 +945,10 @@ share/ardour8/scripts/vamp_audio_to_midi
 share/ardour8/scripts/voice_activate.lua
 share/ardour8/scripts/x-fade.lua
 share/ardour8/templates/.stub
+share/ardour8/themes/adwaita_dark-ardour.colors
 share/ardour8/themes/blueberry_milk-ardour.colors
 share/ardour8/themes/caineville-ardour.colors
+share/ardour8/themes/captain_light-ardour.colors
 share/ardour8/themes/clear_gray-ardour.colors
 share/ardour8/themes/cubasish-ardour.colors
 share/ardour8/themes/dark-ardour.colors

Index: pkgsrc/audio/ardour/distinfo
diff -u pkgsrc/audio/ardour/distinfo:1.12 pkgsrc/audio/ardour/distinfo:1.13
--- pkgsrc/audio/ardour/distinfo:1.12   Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/distinfo        Fri Jan 31 17:15:11 2025
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.12 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2025/01/31 17:15:11 wiz Exp $
 
-BLAKE2s (Ardour-8.2.0.tar.bz2) = 29575950e77ed4261ddc4e79ef62c9200f68c696ddc6532e722c195d94ca9354
-SHA512 (Ardour-8.2.0.tar.bz2) = 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1
-Size (Ardour-8.2.0.tar.bz2) = 13897958 bytes
-SHA1 (patch-gtk2__ardour_wscript) = 511fd28b3815d490e39371ad26ac8acf1bc6fb4a
-SHA1 (patch-libs_aaf_AAFIAudioFiles.c) = b9bf289e409ec344a13ab9580ce6087e9f8596c9
-SHA1 (patch-libs_aaf_aaf_LibCFB.h) = 171512787650749979767117ada9260774998ec7
-SHA1 (patch-libs_aaf_wscript) = 11731e5b2f9b9b49477ea6bb3bc1ff571a77bbb0
-SHA1 (patch-libs_ardour_audiofile__tagger.cc) = 01c2f87cffecc55c5b148eb1f468db79afdeb520
+BLAKE2s (Ardour-8.10.0.tar.bz2) = 97bd16f9004040c247fe25da6a14f256cc23b505237d87dc5b708c6cc0fff7b6
+SHA512 (Ardour-8.10.0.tar.bz2) = 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
+Size (Ardour-8.10.0.tar.bz2) = 17811275 bytes
+SHA1 (patch-gtk2__ardour_wscript) = 18241b4e68a807792c3f48f29784d7c30a251c8d
+SHA1 (patch-libs_aaf_aaf_LibCFB.h) = b9549eac9f9c290cc49b5f59fc191930a2ca276d
+SHA1 (patch-libs_aaf_utils.c) = d0a84069147234df913840560011e001021d650c
 SHA1 (patch-libs_ardour_plugin__manager.cc) = 92564dc05e7f8febe6146f591f0a9c26d1ae0b60
 SHA1 (patch-libs_backends_jack_jack__utils.cc) = 5bf08ead83b3a2c4355a0424262878a1b89e1648
-SHA1 (patch-libs_pbd_cpus.cc) = 48bec2917d7bf2a72306fce4d4135cb266aab00e
-SHA1 (patch-libs_qm-dsp_wscript) = c316676c696576555d2de8675cc44911e5b3807b
-SHA1 (patch-libs_vst3_pluginterfaces_base_fplatform.h) = a32d55b40e30d2662da881971251efe2052125ac
-SHA1 (patch-session__utils_wscript) = 9a56aa6c63b6174fb46f716a263e8bad803c51a1
+SHA1 (patch-libs_pbd_cpus.cc) = 03d4a6d2da56722cb653053b1d439756137ecf95
+SHA1 (patch-libs_qm-dsp_wscript) = 84a6ae4ca9c696e862a4408a69856aafb0067073
+SHA1 (patch-libs_tk_ydk_config.h) = d96fe92215e7a462995b38bb4b7c1fd3e1b01ad0
+SHA1 (patch-libs_tk_ytk_config.h) = 242d42a8e99d607c06b90e94b0c1ea4bb4b4caaf
+SHA1 (patch-libs_vst3_pluginterfaces_base_fplatform.h) = 72c37163c22779415199acc1895ff1d7d1b8ecd6
 SHA1 (patch-wscript) = cc2b59aa3a556129bcf0d26dd25937124c60dc73

Index: pkgsrc/audio/ardour/options.mk
diff -u pkgsrc/audio/ardour/options.mk:1.6 pkgsrc/audio/ardour/options.mk:1.7
--- pkgsrc/audio/ardour/options.mk:1.6  Thu Sep 16 08:26:52 2021
+++ pkgsrc/audio/ardour/options.mk      Fri Jan 31 17:15:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2021/09/16 08:26:52 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2025/01/31 17:15:11 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ardour
 PKG_SUPPORTED_OPTIONS= alsa jack
@@ -13,16 +13,12 @@ PKG_SUGGESTED_OPTIONS=      jack
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   alsa
 .if !empty(PKG_OPTIONS:Malsa)
-PLIST.alsa=    yes
 ARD_BACKENDS+= alsa
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 
-PLIST_VARS+=   jack
 .if !empty(PKG_OPTIONS:Mjack)
-PLIST.jack=    yes
 ARD_BACKENDS+= jack
 .  include "../../audio/jack/buildlink3.mk"
 .endif

Index: pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript
diff -u pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript:1.4 pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript:1.5
--- pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript:1.4  Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/patches/patch-gtk2__ardour_wscript      Fri Jan 31 17:15:11 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-gtk2__ardour_wscript,v 1.4 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: patch-gtk2__ardour_wscript,v 1.5 2025/01/31 17:15:11 wiz Exp $
 
 Install config files to examples, per pkgsrc policy
 
---- gtk2_ardour/wscript.orig   2023-12-13 14:20:57.000000000 +0000
+--- gtk2_ardour/wscript.orig   2024-10-17 04:04:34.000000000 +0000
 +++ gtk2_ardour/wscript
-@@ -779,7 +779,7 @@ def build(bld):
+@@ -825,7 +825,7 @@ def build(bld):
      obj              = bld(features = 'subst')
      obj.source       = [ 'clearlooks.rc.in' ]
      obj.target       = 'clearlooks.rc'
@@ -13,7 +13,7 @@ Install config files to examples, per pk
      set_subst_dict(obj, font_subst_dict)
  
      font_subst_dict['FONTFAMILY'] = 'ArdourSans'
-@@ -787,13 +787,13 @@ def build(bld):
+@@ -833,13 +833,13 @@ def build(bld):
      obj              = bld(features = 'subst')
      obj.source       = [ 'clearlooks.rc.in' ]
      obj.target       = 'clearlooks.ardoursans.rc'
@@ -29,16 +29,16 @@ Install config files to examples, per pk
      set_subst_dict(obj, font_subst_dict)
  
      # Menus
-@@ -823,7 +823,7 @@ def build(bld):
-         obj.dep_vars = ['PTFORMAT', 'MIXBUS', 'MIXBUS32C', 'WINDOWS']
-         obj.stdin = program + '.menus.in'
-         obj.stdout = program + '.menus'
--        bld.install_files (bld.env['CONFDIR'], program + '.menus')
-+        bld.install_files (os.environ['EGDIR'], program + '.menus')
+@@ -872,7 +872,7 @@ def build(bld):
+     else:
+         obj.stdin = 'ardour.menus.in'
+     obj.stdout = 'ardour.menus'        
+-    bld.install_files (bld.env['CONFDIR'], 'ardour.menus')
++    bld.install_files (os.environ['EGDIR'], 'ardour.menus')
  
      # Freedesktop
      freedesktop_subst_dict = {
-@@ -880,7 +880,7 @@ def build(bld):
+@@ -929,7 +929,7 @@ def build(bld):
              source = [ b + '.keys.in', 'mixer.bindings', 'processor_box.bindings', 'step_editing.bindings', 'monitor.bindings', 'trigger.bindings' ],
              rule = a_rule
              )
@@ -47,7 +47,7 @@ Install config files to examples, per pk
  
      # Icons/Images
      bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))
-@@ -898,7 +898,7 @@ def build(bld):
+@@ -947,7 +947,7 @@ def build(bld):
          bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), 'icons/cursor_square/hotspots')
  
      # Default UI configuration

Index: pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h
diff -u pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h:1.1 pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h:1.2
--- pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h:1.1 Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/patches/patch-libs_aaf_aaf_LibCFB.h     Fri Jan 31 17:15:11 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-libs_aaf_aaf_LibCFB.h,v 1.1 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: patch-libs_aaf_aaf_LibCFB.h,v 1.2 2025/01/31 17:15:11 wiz Exp $
+
+Fix build on NetBSD.
 
 --- libs/aaf/aaf/LibCFB.h.orig 2024-02-04 02:25:00.306525205 +0000
 +++ libs/aaf/aaf/LibCFB.h
Index: pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc
diff -u pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc:1.1 pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc:1.2
--- pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc:1.1      Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/patches/patch-libs_pbd_cpus.cc  Fri Jan 31 17:15:11 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-libs_pbd_cpus.cc,v 1.1 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: patch-libs_pbd_cpus.cc,v 1.2 2025/01/31 17:15:11 wiz Exp $
+
+Fix build on NetBSD and OpenBSD.
 
 --- libs/pbd/cpus.cc.orig      2024-02-04 02:25:51.019870123 +0000
 +++ libs/pbd/cpus.cc
Index: pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h
diff -u pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h:1.1 pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h:1.2
--- pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h:1.1     Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/patches/patch-libs_vst3_pluginterfaces_base_fplatform.h Fri Jan 31 17:15:11 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-libs_vst3_pluginterfaces_base_fplatform.h,v 1.1 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: patch-libs_vst3_pluginterfaces_base_fplatform.h,v 1.2 2025/01/31 17:15:11 wiz Exp $
+
+Fix build on *BSD.
 
 --- libs/vst3/pluginterfaces/base/fplatform.h.orig     2024-02-04 02:22:43.806501710 +0000
 +++ libs/vst3/pluginterfaces/base/fplatform.h

Index: pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript
diff -u pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript:1.2 pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript:1.3
--- pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript:1.2   Mon Mar 18 15:36:15 2024
+++ pkgsrc/audio/ardour/patches/patch-libs_qm-dsp_wscript       Fri Jan 31 17:15:11 2025
@@ -1,7 +1,6 @@
-$NetBSD: patch-libs_qm-dsp_wscript,v 1.2 2024/03/18 15:36:15 ryoon Exp $
+$NetBSD: patch-libs_qm-dsp_wscript,v 1.3 2025/01/31 17:15:11 wiz Exp $
 
-- Use internal copy of qm-dsp. From Arch Linux.
-- Install config files to examples, per pkgsrc policy
+Use internal copy of qm-dsp. From Arch Linux.
 
 --- libs/qm-dsp/wscript.orig   2024-02-04 01:47:23.964028392 +0000
 +++ libs/qm-dsp/wscript

Added files:

Index: pkgsrc/audio/ardour/patches/patch-libs_aaf_utils.c
diff -u /dev/null pkgsrc/audio/ardour/patches/patch-libs_aaf_utils.c:1.1
--- /dev/null   Fri Jan 31 17:15:12 2025
+++ pkgsrc/audio/ardour/patches/patch-libs_aaf_utils.c  Fri Jan 31 17:15:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_aaf_utils.c,v 1.1 2025/01/31 17:15:11 wiz Exp $
+
+Fix build on NetBSD.
+
+--- libs/aaf/utils.c.orig      2025-01-31 16:58:13.463705776 +0000
++++ libs/aaf/utils.c
+@@ -32,7 +32,7 @@
+ #include <arpa/inet.h>
+ #include <mntent.h>
+ #include <unistd.h> /* access() */
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__NetBSD__)
+ #include <sys/syslimits.h>
+ #include <unistd.h> /* access() */
+ #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
Index: pkgsrc/audio/ardour/patches/patch-libs_tk_ydk_config.h
diff -u /dev/null pkgsrc/audio/ardour/patches/patch-libs_tk_ydk_config.h:1.1
--- /dev/null   Fri Jan 31 17:15:12 2025
+++ pkgsrc/audio/ardour/patches/patch-libs_tk_ydk_config.h      Fri Jan 31 17:15:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_tk_ydk_config.h,v 1.1 2025/01/31 17:15:11 wiz Exp $
+
+Only assume GNU ftw on Linux.
+
+--- libs/tk/ydk/config.h.orig  2024-10-17 04:04:34.000000000 +0000
++++ libs/tk/ydk/config.h
+@@ -25,7 +25,7 @@
+ #define HAVE_GETRESUID 1
+ #endif
+ 
+-#ifndef __APPLE__
++#ifdef __Linux__
+ /* Have GNU ftw */
+ #define HAVE_GNU_FTW 1
+ #endif
Index: pkgsrc/audio/ardour/patches/patch-libs_tk_ytk_config.h
diff -u /dev/null pkgsrc/audio/ardour/patches/patch-libs_tk_ytk_config.h:1.1
--- /dev/null   Fri Jan 31 17:15:12 2025
+++ pkgsrc/audio/ardour/patches/patch-libs_tk_ytk_config.h      Fri Jan 31 17:15:11 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-libs_tk_ytk_config.h,v 1.1 2025/01/31 17:15:11 wiz Exp $
+
+No getresuid() on NetBSD.
+Only assume GNU ftw on Linux.
+
+--- libs/tk/ytk/config.h.orig  2024-10-17 04:04:34.000000000 +0000
++++ libs/tk/ytk/config.h
+@@ -18,11 +18,11 @@
+ #define HAVE_FTW_H 1
+ 
+ /* Define to 1 if you have the `getresuid' function. */
+-#if !(defined PLATFORM_WINDOWS || defined __APPLE__)
++#if !(defined PLATFORM_WINDOWS || defined __APPLE__ || defined(__NetBSD__))
+ #define HAVE_GETRESUID 1
+ #endif
+ 
+-#ifndef __APPLE__
++#ifdef __Linux__
+ /* Have GNU ftw */
+ #define HAVE_GNU_FTW 1
+ #endif