pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/ardour ardour: update to 6.9.0. builds again wit...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c4026d9a698
branches:  trunk
changeset: 458198:4c4026d9a698
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Sep 11 16:33:11 2021 +0000

description:
ardour: update to 6.9.0. builds again with latest GTK libraries...

diffstat:

 audio/ardour/Makefile                                                                             |    64 +-
 audio/ardour/PLIST                                                                                |  1525 +++++++--
 audio/ardour/distinfo                                                                             |    40 +-
 audio/ardour/patches/patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py |    16 -
 audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc                                             |    17 -
 audio/ardour/patches/patch-gtk2__ardour_wscript                                                   |    32 +-
 audio/ardour/patches/patch-libs_ardour_ardour_audio__backend.h                                    |    19 +
 audio/ardour/patches/patch-libs_ardour_ardour_chan__count.h                                       |    18 -
 audio/ardour/patches/patch-libs_ardour_ardour_chan__mapping.h                                     |    18 -
 audio/ardour/patches/patch-libs_ardour_ardour_plugin__insert.h                                    |    17 -
 audio/ardour/patches/patch-libs_ardour_ardour_presentation__info.h                                |    17 -
 audio/ardour/patches/patch-libs_ardour_ardour_tempo.h                                             |    22 -
 audio/ardour/patches/patch-libs_ardour_chan__count.cc                                             |    17 -
 audio/ardour/patches/patch-libs_ardour_chan__mapping.cc                                           |    23 -
 audio/ardour/patches/patch-libs_ardour_luabindings.cc                                             |   127 -
 audio/ardour/patches/patch-libs_ardour_plugin__insert.cc                                          |    19 -
 audio/ardour/patches/patch-libs_ardour_plugin__manager.cc                                         |    17 +
 audio/ardour/patches/patch-libs_ardour_presentation__info.cc                                      |    17 -
 audio/ardour/patches/patch-libs_ardour_tempo.cc                                                   |    19 -
 audio/ardour/patches/patch-libs_backends_jack_jack__audiobackend.cc                               |    34 -
 audio/ardour/patches/patch-libs_backends_jack_jack__audiobackend.h                                |    15 -
 audio/ardour/patches/patch-libs_backends_jack_jack__utils.cc                                      |   140 +-
 audio/ardour/patches/patch-libs_pbd_id.cc                                                         |    19 -
 audio/ardour/patches/patch-libs_pbd_pbd_id.h                                                      |    17 -
 audio/ardour/patches/patch-libs_qm-dsp_wscript                                                    |    27 +
 audio/ardour/patches/patch-libs_timecode_src_time.cc                                              |    19 -
 audio/ardour/patches/patch-libs_timecode_timecode_bbt__time.h                                     |    33 -
 audio/ardour/patches/patch-libs_timecode_timecode_time.h                                          |    17 -
 audio/ardour/patches/patch-wscript                                                                |    40 +-
 29 files changed, 1273 insertions(+), 1132 deletions(-)

diffs (truncated from 2636 to 300 lines):

diff -r 99f033327856 -r 4c4026d9a698 audio/ardour/Makefile
--- a/audio/ardour/Makefile     Sat Sep 11 15:54:51 2021 +0000
+++ b/audio/ardour/Makefile     Sat Sep 11 16:33:11 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2021/09/08 21:04:53 nia Exp $
+# $NetBSD: Makefile,v 1.53 2021/09/11 16:33:11 nia Exp $
 
-DISTNAME=      Ardour-5.12.0
+DISTNAME=      Ardour-6.9.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   17
 CATEGORIES=    audio
 # currently, distfiles must be downloaded by hand from ardour.org
 # and uploaded using `make upload-distfiles`.
@@ -17,17 +16,21 @@
 
 UNLIMIT_RESOURCES=     stacksize
 
-USE_TOOLS+=    pkg-config perl itstool
-USE_LANGUAGES= c c++11
+USE_TOOLS+=    pkg-config perl itstool msgfmt perl
+USE_LANGUAGES= c c++
 
-EGDIR=         ${PREFIX}/share/examples/ardour5
+# C++11
+GCC_REQD+=     4.7
+
+EGDIR=         ${PREFIX}/share/examples/ardour6
 
 WAF_ENV+=      EGDIR=${EGDIR}
 
-PKG_SYSCONFSUBDIR=     ardour5
+PKG_SYSCONFSUBDIR=     ardour6
 
 CONF_FILES+=   ${EGDIR}/ardour.keys ${PKG_SYSCONFDIR}/ardour.keys
 CONF_FILES+=   ${EGDIR}/ardour.menus ${PKG_SYSCONFDIR}/ardour.menus
+CONF_FILES+=   ${EGDIR}/clearlooks.ardoursans.rc ${PKG_SYSCONFDIR}/clearlooks.ardoursans.rc
 CONF_FILES+=   ${EGDIR}/clearlooks.rc ${PKG_SYSCONFDIR}/clearlooks.rc
 CONF_FILES+=   ${EGDIR}/default_ui_config ${PKG_SYSCONFDIR}/default_ui_config
 CONF_FILES+=   ${EGDIR}/system_config ${PKG_SYSCONFDIR}/system_config
@@ -44,23 +47,26 @@
 WAF_ARGS+=     --cxx11
 WAF_ARGS+=     --freedesktop
 WAF_ARGS+=     --no-phone-home
+WAF_ARGS+=     --no-vst3
+WAF_ARGS+=     --use-external-libs
+WAF_ARGS+=     --nls
 
 # Does not set runtime search path for internal libraries...
 
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-comp.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-delay.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-eq.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-fluidsynth.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-reverb.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/LV2/a-reasonablesynth.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/backends
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/engines
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/panners
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/surfaces
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/utils
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour5/vamp
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-comp.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-delay.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-eq.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-fluidsynth.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-reverb.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/LV2/a-reasonablesynth.lv2
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/backends
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/engines
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/panners
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/surfaces
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/utils
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour6/vamp
 
 # strdup prototype difficulties...
 CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE
@@ -74,34 +80,34 @@
 INSTALLATION_DIRS+=    share/appdata
 INSTALLATION_DIRS+=    share/applications
 
-pre-patch:
-       cd ${WRKSRC} && ${PYTHONBIN} waf --help > /dev/null
-       rm ${WRKSRC}/.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a/waflib/Tools/c_config.pyc
-
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour5.appdata.xml \
+       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour6.appdata.xml \
            ${DESTDIR}${PREFIX}/share/appdata
-       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour5.desktop \
+       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour6.desktop \
            ${DESTDIR}${PREFIX}/share/applications
 .for s in 16 22 32 48 256 512
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
-       ${INSTALL_DATA} ${DESTDIR}${PREFIX}/share/ardour5/resources/Ardour-icon_${s}px.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/ardour5.png
+       ${INSTALL_DATA} ${DESTDIR}${PREFIX}/share/ardour6/resources/Ardour-icon_${s}px.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/ardour6.png
 .endfor
 
 .include "../../devel/waf/waf.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../audio/aubio/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
+.include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/liblo/buildlink3.mk"
+.include "../../audio/libltc/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../audio/rubberband/buildlink3.mk"
+.include "../../audio/soundtouch/buildlink3.mk"
 .include "../../audio/suil/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../comms/libhidapi/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
diff -r 99f033327856 -r 4c4026d9a698 audio/ardour/PLIST
--- a/audio/ardour/PLIST        Sat Sep 11 15:54:51 2021 +0000
+++ b/audio/ardour/PLIST        Sat Sep 11 16:33:11 2021 +0000
@@ -1,438 +1,1087 @@
-@comment $NetBSD: PLIST,v 1.2 2019/12/02 13:34:33 nia Exp $
-bin/ardour5
-bin/ardour5-copy-mixer
-bin/ardour5-export
-bin/ardour5-fix_bbtppq
-lib/ardour5/LV2/a-comp.lv2/a-comp#stereo.ttl
-lib/ardour5/LV2/a-comp.lv2/a-comp.so
-lib/ardour5/LV2/a-comp.lv2/a-comp.ttl
-lib/ardour5/LV2/a-comp.lv2/manifest.ttl
-lib/ardour5/LV2/a-comp.lv2/presets.ttl
-lib/ardour5/LV2/a-delay.lv2/a-delay.so
-lib/ardour5/LV2/a-delay.lv2/a-delay.ttl
-lib/ardour5/LV2/a-delay.lv2/manifest.ttl
-lib/ardour5/LV2/a-delay.lv2/presets.ttl
-lib/ardour5/LV2/a-eq.lv2/a-eq.so
-lib/ardour5/LV2/a-eq.lv2/a-eq.ttl
-lib/ardour5/LV2/a-eq.lv2/manifest.ttl
-lib/ardour5/LV2/a-fluidsynth.lv2/a-fluidsynth.so
-lib/ardour5/LV2/a-fluidsynth.lv2/a-fluidsynth.ttl
-lib/ardour5/LV2/a-fluidsynth.lv2/manifest.ttl
-lib/ardour5/LV2/a-reverb.lv2/a-reverb.so
-lib/ardour5/LV2/a-reverb.lv2/a-reverb.ttl
-lib/ardour5/LV2/a-reverb.lv2/manifest.ttl
-lib/ardour5/LV2/reasonablesynth.lv2/manifest.ttl
-lib/ardour5/LV2/reasonablesynth.lv2/reasonablesynth.so
-lib/ardour5/LV2/reasonablesynth.lv2/reasonablesynth.ttl
-lib/ardour5/${PKGNAME}
-lib/ardour5/ardour-exec-wrapper
-lib/ardour5/ardour-vst-scanner
-${PLIST.alsa}lib/ardour5/backends/libalsa_audiobackend.so
-lib/ardour5/backends/libdummy_audiobackend.so
-${PLIST.jack}lib/ardour5/backends/libjack_audiobackend.so
-lib/ardour5/engines/libclearlooks.so
-lib/ardour5/h${PKGNAME}
-lib/ardour5/libardour.so
-lib/ardour5/libardour.so.3
-lib/ardour5/libardour.so.3.0.0
-lib/ardour5/libardourcp.so
-lib/ardour5/libaudiographer.so
-lib/ardour5/libaudiographer.so.0
-lib/ardour5/libaudiographer.so.0.0.0
-lib/ardour5/libcanvas.so
-lib/ardour5/libcanvas.so.0
-lib/ardour5/libcanvas.so.0.0.0
-lib/ardour5/libevoral.so
-lib/ardour5/libevoral.so.0
-lib/ardour5/libevoral.so.0.0.0
-lib/ardour5/libgtkmm2ext.so
-lib/ardour5/libgtkmm2ext.so.0
-lib/ardour5/libgtkmm2ext.so.0.8.3
-lib/ardour5/libmidipp.so
-lib/ardour5/libmidipp.so.4
-lib/ardour5/libmidipp.so.4.1.0
-lib/ardour5/libpbd.so
-lib/ardour5/libpbd.so.4
-lib/ardour5/libpbd.so.4.1.0
-lib/ardour5/libptformat.so
-lib/ardour5/libptformat.so.0
-lib/ardour5/libptformat.so.0.0.0
-lib/ardour5/libqm-dsp.a
-lib/ardour5/libtimecode.so
-lib/ardour5/libwaveview.so
-lib/ardour5/libwaveview.so.0
-lib/ardour5/libwaveview.so.0.0.0
-lib/ardour5/libwidgets.so
-lib/ardour5/libwidgets.so.0
-lib/ardour5/libwidgets.so.0.0.0
-lib/ardour5/panners/libpan1in2out.so
-lib/ardour5/panners/libpan2in2out.so
-lib/ardour5/panners/libpanbalance.so
-lib/ardour5/panners/libpanvbap.so
-lib/ardour5/sanityCheck
-lib/ardour5/surfaces/libardour_cc121.so
-lib/ardour5/surfaces/libardour_faderport.so
-lib/ardour5/surfaces/libardour_faderport8.so
-lib/ardour5/surfaces/libardour_generic_midi.so
-lib/ardour5/surfaces/libardour_mcp.so
-lib/ardour5/surfaces/libardour_osc.so
-lib/ardour5/surfaces/libardour_push2.so
-lib/ardour5/utils/ardour-util.sh
-lib/ardour5/utils/ardour5-copy-mixer
-lib/ardour5/utils/ardour5-export
-lib/ardour5/utils/ardour5-fix_bbtppq
-lib/ardour5/vamp/libardourvampplugins.so
-lib/ardour5/vamp/libardourvampplugins.so.0
-lib/ardour5/vamp/libardourvampplugins.so.0.0.0
-share/appdata/ardour5.appdata.xml
-share/applications/ardour5.desktop
-share/ardour5/ArdourMono.ttf
-share/ardour5/export/BWAV 24bit Export.format
-share/ardour5/export/BWAV 32float Export.format
-share/ardour5/export/CD (Red Book).format
-share/ardour5/export/CD + DVD-A.preset
-share/ardour5/export/CD + FLAC (tagged).preset
-share/ardour5/export/CD + FLAC.preset
-share/ardour5/export/CD + Ogg_Vorbis (tagged).preset
-share/ardour5/export/CD + Ogg_Vorbis + FLAC (tagged).preset
-share/ardour5/export/CD + Ogg_Vorbis.preset
-share/ardour5/export/CD only.preset
-share/ardour5/export/DVD-A only.preset
-share/ardour5/export/DVD-A.format
-share/ardour5/export/FLAC (tagged).preset
-share/ardour5/export/FLAC 24 bit (tagged).format
-share/ardour5/export/FLAC 24 bit .format
-share/ardour5/export/FLAC.preset
-share/ardour5/export/Ogg_Vorbis (tagged).format
-share/ardour5/export/Ogg_Vorbis (tagged).preset
-share/ardour5/export/Ogg_Vorbis + FLAC (tagged).preset
-share/ardour5/export/Ogg_Vorbis + FLAC.preset
-share/ardour5/export/Ogg_Vorbis .preset
-share/ardour5/export/Ogg_Vorbis.format
-share/ardour5/export/Ring Tone.format
-share/ardour5/icons/act-disabled.png
-share/ardour5/icons/add.png
-share/ardour5/icons/anchored_trim_left_cursor.png
-share/ardour5/icons/anchored_trim_right_cursor.png
-share/ardour5/icons/application-x-ardour_16px.png
-share/ardour5/icons/application-x-ardour_22px.png
-share/ardour5/icons/application-x-ardour_32px.png
-share/ardour5/icons/application-x-ardour_48px.png
-share/ardour5/icons/ardour-app-icon_osx.png
-share/ardour5/icons/ardour-app-icon_osx_mask.png
-share/ardour5/icons/cc121.png
-share/ardour5/icons/chord.png
-share/ardour5/icons/close.png
-share/ardour5/icons/computer_keyboard.png
-share/ardour5/icons/computer_keyboard_active.png
-share/ardour5/icons/eighthnote.png
-share/ardour5/icons/expand_left_right_cursor.png
-share/ardour5/icons/expand_up_down_cursor.png
-share/ardour5/icons/fade_in_cursor.png
-share/ardour5/icons/fade_out_cursor.png
-share/ardour5/icons/fadein-constant-power.png
-share/ardour5/icons/fadein-fast-cut.png
-share/ardour5/icons/fadein-linear.png
-share/ardour5/icons/fadein-slow-cut.png
-share/ardour5/icons/fadein-symmetric.png
-share/ardour5/icons/fadeout-constant-power.png
-share/ardour5/icons/fadeout-fast-cut.png
-share/ardour5/icons/fadeout-linear.png
-share/ardour5/icons/fadeout-slow-cut.png
-share/ardour5/icons/fadeout-symmetric.png
-share/ardour5/icons/faderport-small.png
-share/ardour5/icons/faderport8-small.png
-share/ardour5/icons/ferret_02.png
-share/ardour5/icons/forte.png
-share/ardour5/icons/fortissimo.png
-share/ardour5/icons/fortississimo.png
-share/ardour5/icons/grabber.png
-share/ardour5/icons/grabber_edit_point.png
-share/ardour5/icons/grabber_note.png
-share/ardour5/icons/halfnote.png
-share/ardour5/icons/i_beam_cursor.png
-share/ardour5/icons/mezzforte.png
-share/ardour5/icons/mezzoforte.png
-share/ardour5/icons/mezzopiano.png
-share/ardour5/icons/midi-input-active.png
-share/ardour5/icons/midi-input-inactive.png
-share/ardour5/icons/midi_socket_small.png
-share/ardour5/icons/midi_sound_notes.png
-share/ardour5/icons/midi_tool_erase.png
-share/ardour5/icons/midi_tool_pencil.png
-share/ardour5/icons/midi_tool_select.png
-share/ardour5/icons/move_cursor.png
-share/ardour5/icons/mute-disabled.png
-share/ardour5/icons/mute-enabled.png
-share/ardour5/icons/muted-by-others.png
-share/ardour5/icons/padlock_closed.png
-share/ardour5/icons/padlock_open.png
-share/ardour5/icons/pianissimo.png
-share/ardour5/icons/pianississimo.png
-share/ardour5/icons/piano.png



Home | Main Index | Thread Index | Old Index