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 5.12.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca94c3a7d5fd
branches:  trunk
changeset: 345075:ca94c3a7d5fd
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Dec 02 13:34:33 2019 +0000

description:
ardour: Update to 5.12.0

Notable changes in pkgsrc:
- Put a lot of effort into autoconfiguring JACK support for NetBSD.
  (Install latest JACK).

Release notes for 5.0:
https://www.ardour.org/news/5.0.html

diffstat:

 audio/ardour/Makefile                                               |  273 +--
 audio/ardour/PLIST                                                  |  857 +++++----
 audio/ardour/distinfo                                               |   36 +-
 audio/ardour/files/revision.cc                                      |    2 -
 audio/ardour/options.mk                                             |   44 +-
 audio/ardour/patches/patch-gtk2__ardour_ardour.sh.in                |   35 -
 audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc               |   15 +
 audio/ardour/patches/patch-gtk2__ardour_editor.cc                   |   27 -
 audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc               |   24 -
 audio/ardour/patches/patch-gtk2__ardour_startup.cc                  |   35 -
 audio/ardour/patches/patch-gtk2__ardour_wscript                     |   30 +-
 audio/ardour/patches/patch-libs_ardour_session__state.cc            |   32 -
 audio/ardour/patches/patch-libs_ardouralsautil_wscript              |   29 -
 audio/ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc     |   32 -
 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        |  103 +
 audio/ardour/patches/patch-libs_backends_jack_jack__utils.h         |   22 +
 audio/ardour/patches/patch-libs_backends_jack_wscript               |   18 -
 audio/ardour/patches/patch-libs_canvas_stateful__image.cc           |   15 -
 audio/ardour/patches/patch-libs_fst_wscript                         |   15 -
 audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc                |   15 -
 audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc              |   15 -
 audio/ardour/patches/patch-libs_pbd_fpu.cc                          |   16 -
 audio/ardour/patches/patch-libs_pbd_mountpoint.cc                   |   18 -
 audio/ardour/patches/patch-libs_pbd_wscript                         |   26 -
 audio/ardour/patches/patch-libs_ptformat_ptfformat.cc               |   12 -
 audio/ardour/patches/patch-libs_vfork_wscript                       |   13 -
 audio/ardour/patches/patch-wscript                                  |   60 +-
 29 files changed, 785 insertions(+), 1083 deletions(-)

diffs (truncated from 2062 to 300 lines):

diff -r c9f9a4141a68 -r ca94c3a7d5fd audio/ardour/Makefile
--- a/audio/ardour/Makefile     Mon Dec 02 11:48:38 2019 +0000
+++ b/audio/ardour/Makefile     Mon Dec 02 13:34:33 2019 +0000
@@ -1,204 +1,111 @@
-# $NetBSD: Makefile,v 1.30 2019/11/02 21:09:12 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2019/12/02 13:34:33 nia Exp $
 
-DISTNAME=      ardour-4.7
-PKGREVISION=   23
+DISTNAME=      Ardour-5.12.0
+PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    audio
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=Ardour/}
-GITHUB_TAG=    ${PKGVERSION_NOREV}
+# 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=  #
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://ardour.org/
+HOMEPAGE=      https://ardour.org/
 COMMENT=       Digital Audio Workstation
 LICENSE=       gnu-gpl-v2
 
-EXTRACT_USING= bsdtar
-USE_TOOLS+=    bsdtar pkg-config perl bash
-USE_LANGUAGES= c c++
-
-REPLACE_PYTHON+=       export/wscript
-REPLACE_PYTHON+=       libs/pbd/pbd/signals.py
-REPLACE_PYTHON+=       mcp/wscript
-REPLACE_PYTHON+=       midi_maps/wscript
-REPLACE_PYTHON+=       patchfiles/wscript
-REPLACE_PYTHON+=       templates/wscript
-REPLACE_PYTHON+=       tools/bug_tool/ardour_bugs
-REPLACE_PYTHON+=       tools/cstyle.py
-REPLACE_PYTHON+=       tools/session_exchange.py
-
-REPLACE_PYTHON+=       cfgtool/wscript
-REPLACE_PYTHON+=       gtk2_ardour/wscript
-REPLACE_PYTHON+=       headless/wscript
-REPLACE_PYTHON+=       libs/appleutility/wscript
-REPLACE_PYTHON+=       libs/ardour/wscript
-REPLACE_PYTHON+=       libs/ardouralsautil/wscript
-REPLACE_PYTHON+=       libs/audiographer/wscript
-REPLACE_PYTHON+=       libs/backends/alsa/wscript
-REPLACE_PYTHON+=       libs/backends/asio/wscript
-REPLACE_PYTHON+=       libs/backends/coreaudio/wscript
-REPLACE_PYTHON+=       libs/backends/dummy/wscript
-REPLACE_PYTHON+=       libs/backends/jack/wscript
-REPLACE_PYTHON+=       libs/backends/portaudio/wscript
-REPLACE_PYTHON+=       libs/backends/wavesaudio/wscript
-REPLACE_PYTHON+=       libs/backends/wscript
-REPLACE_PYTHON+=       libs/canvas/wscript
-REPLACE_PYTHON+=       libs/clearlooks-newer/wscript
-REPLACE_PYTHON+=       libs/evoral/wscript
-REPLACE_PYTHON+=       libs/fst/wscript
-REPLACE_PYTHON+=       libs/gtkmm2ext/wscript
-REPLACE_PYTHON+=       libs/libltc/wscript
-REPLACE_PYTHON+=       libs/midi++2/wscript
-REPLACE_PYTHON+=       libs/panners/1in2out/wscript
-REPLACE_PYTHON+=       libs/panners/2in2out/wscript
-REPLACE_PYTHON+=       libs/panners/stereobalance/wscript
-REPLACE_PYTHON+=       libs/panners/vbap/wscript
-REPLACE_PYTHON+=       libs/panners/wscript
-REPLACE_PYTHON+=       libs/pbd/wscript
-REPLACE_PYTHON+=       libs/plugins/reasonablesynth.lv2/wscript
-REPLACE_PYTHON+=       libs/ptformat/wscript
-REPLACE_PYTHON+=       libs/qm-dsp/wscript
-REPLACE_PYTHON+=       libs/surfaces/control_protocol/wscript
-REPLACE_PYTHON+=       libs/surfaces/frontier/wscript
-REPLACE_PYTHON+=       libs/surfaces/generic_midi/wscript
-REPLACE_PYTHON+=       libs/surfaces/mackie/wscript
-REPLACE_PYTHON+=       libs/surfaces/osc/wscript
-REPLACE_PYTHON+=       libs/surfaces/tranzport/wscript
-REPLACE_PYTHON+=       libs/surfaces/wiimote/wscript
-REPLACE_PYTHON+=       libs/surfaces/wscript
-REPLACE_PYTHON+=       libs/timecode/wscript
-REPLACE_PYTHON+=       libs/vamp-plugins/wscript
-REPLACE_PYTHON+=       libs/vfork/wscript
-REPLACE_PYTHON+=       tools/autowaf.py
-REPLACE_PYTHON+=       tools/gccabicheck/wscript
-REPLACE_PYTHON+=       tools/sanity_check/wscript
-REPLACE_PYTHON+=       wscript
-REPLACE_PYTHON+=       waf
-
-REPLACE_PERL+=         tools/fmt-bindings
-REPLACE_PERL+=         tools/resample_session.pl
-REPLACE_PERL+=         tools/synthesize_sources.pl
+USE_TOOLS+=    pkg-config perl
+USE_LANGUAGES= c c++11
 
-REPLACE_BASH+= gtk2_ardour/icons/export_icons.sh
-REPLACE_BASH+= libs/ardour/run-profiling.sh
-REPLACE_BASH+= libs/ardour/run-session-tests.sh
-REPLACE_BASH+= libs/ardour/run-tests.sh
-REPLACE_BASH+= libs/canvas/build-and-run-benchmark.sh
-REPLACE_BASH+= libs/canvas/build-and-run-manual-test.sh
-REPLACE_BASH+= libs/canvas/build-and-run-tests.sh
-REPLACE_BASH+= libs/canvas/run-manual-test.sh
-REPLACE_BASH+= libs/canvas/run-tests.sh
-REPLACE_BASH+= libs/pbd/run-tests.sh
-REPLACE_BASH+= tools/linux_packaging/build
-REPLACE_BASH+= tools/linux_packaging/package
-REPLACE_BASH+= tools/osx_packaging/osx_build
-REPLACE_BASH+= tools/windows_packaging/clean.sh
-REPLACE_BASH+= tools/windows_packaging/configure-debug.sh
-REPLACE_BASH+= tools/windows_packaging/configure-distcc-debug.sh
-REPLACE_BASH+= tools/windows_packaging/configure-distcc-release.sh
-REPLACE_BASH+= tools/windows_packaging/configure-release.sh
-REPLACE_BASH+= tools/windows_packaging/copydll-fedora.sh
-REPLACE_BASH+= tools/windows_packaging/copydll-waves.sh
-REPLACE_BASH+= tools/windows_packaging/cptovmshare.sh
-REPLACE_BASH+= tools/windows_packaging/make-installer.sh
-REPLACE_BASH+= tools/windows_packaging/mingw-env.sh
-REPLACE_BASH+= tools/windows_packaging/package-f19.sh
-REPLACE_BASH+= tools/windows_packaging/package-f20.sh
-REPLACE_BASH+= tools/windows_packaging/package.sh
-REPLACE_BASH+= tools/windows_packaging/package_win32.sh
-REPLACE_BASH+= tools/windows_packaging/waf.sh
-REPLACE_BASH+= tools/windows_packaging/win32-env.sh
-REPLACE_BASH+= tools/windows_packaging/wine-ardour-tests.sh
-REPLACE_BASH+= tools/windows_packaging/wine-ardour.sh
-REPLACE_BASH+= tools/windows_packaging/wine-env.sh
-REPLACE_BASH+= tools/windows_packaging/wine-evoral-tests.sh
-REPLACE_BASH+= tools/windows_packaging/wine-pbd-tests.sh
-REPLACE_BASH+= tools/x-win/compile.sh
-REPLACE_BASH+= tools/x-win/package.sh
-
-PKGCONFIG_OVERRIDE+=   libs/gtkmm2ext/libgtkmm2ext.pc.in
-PKGCONFIG_OVERRIDE+=   libs/midi++2/libmidi++.pc.in
-PKGCONFIG_OVERRIDE+=   libs/pbd/libpbd.pc.in
-
-BUILD_DEFS+=           PKG_SYSCONFBASE
-
-EGDIR=                 ${PREFIX}/share/examples/ardour4
-PKG_SYSCONFSUBDIR=     ardour4
+EGDIR=         ${PREFIX}/share/examples/ardour5
 
-OWN_DIRS=              ${PKG_SYSCONFDIR}
-OWN_DIRS=              ${PKG_SYSCONFDIR}/export
-
-CONF_FILES+=           ${EGDIR}/ardour.menus ${PKG_SYSCONFDIR}/ardour.menus
-CONF_FILES+=           ${EGDIR}/clearlooks.rc ${PKG_SYSCONFDIR}/clearlooks.rc
-CONF_FILES+=           ${EGDIR}/dark.colors ${PKG_SYSCONFDIR}/dark.colors
-CONF_FILES+=           ${EGDIR}/default_ui_config ${PKG_SYSCONFDIR}/default_ui_config
-CONF_FILES+=           ${EGDIR}/export/CD.format ${PKG_SYSCONFDIR}/export/CD.format
-CONF_FILES+=           ${EGDIR}/mixer.bindings ${PKG_SYSCONFDIR}/mixer.bindings
-CONF_FILES+=           ${EGDIR}/mnemonic-us.bindings ${PKG_SYSCONFDIR}/mnemonic-us.bindings
-CONF_FILES+=           ${EGDIR}/step_editing.bindings ${PKG_SYSCONFDIR}/step_editing.bindings
-CONF_FILES+=           ${EGDIR}/system_config ${PKG_SYSCONFDIR}/system_config
-CONF_FILES+=           ${EGDIR}/trx.menus ${PKG_SYSCONFDIR}/trx.menus
-
-# As of NetBSD-7.99.21 pkgsrc's checks cannot open file with rare unicode characters
-CHECK_PORTABILITY_SKIP+=       libs/pbd/test/i18n_test/*.tst
-
-PYTHON_VERSIONS_ACCEPTED=      27 # as of 4.4
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-BUILDLINK_TRANSFORM+=  rm:-ldl
-.endif
-
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/LV2/reasonablesynth.lv2
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/backends
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/engines
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/panners
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/surfaces
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/utils
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/vamp
-
-pre-configure:
-       ${SED} -e 's!REVISION!${PKGVERSION_NOREV}!' \
-               ${FILESDIR}/revision.cc > ${WRKSRC}/libs/ardour/revision.cc
-
-WAF_ARGS+=     --prefix=${PREFIX}
-WAF_ARGS+=     --configdir=${PKG_SYSCONFBASE}
-# Use dlopen(3) for the JACK library
-WAF_ARGS+=     --libjack=weak
-WAF_ARGS+=     --optimize
-# Required to build on NetBSD
-WAF_ARGS+=     --cxx11
-
-# Sources are patched to install configuration into EGDIR instead of CONFDIR
 WAF_ENV+=      EGDIR=${EGDIR}
 
-WAF_REPLACE_EXECUTABLE=        no
+PKG_SYSCONFSUBDIR=     ardour5
 
-# ./waf i18n
+CONF_FILES+=   ${EGDIR}/ardour.keys ${PKG_SYSCONFDIR}/ardour.keys
+CONF_FILES+=   ${EGDIR}/ardour.menus ${PKG_SYSCONFDIR}/ardour.menus
+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
+CONF_FILES+=   ${EGDIR}/trx.menus ${PKG_SYSCONFDIR}/trx.menus
+
+ARD_BACKENDS=  dummy
 
 .include "options.mk"
 
+WAF_ARGS+=     --with-backends=${ARD_BACKENDS:ts,}
+WAF_ARGS+=     --keepflags
+WAF_ARGS+=     --noconfirm
+WAF_ARGS+=     --dist-target=none
+WAF_ARGS+=     --cxx11
+WAF_ARGS+=     --freedesktop
+WAF_ARGS+=     --no-phone-home
+
+# 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
+
+# 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
+INSTALLATION_DIRS+=    share/applications
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour5.appdata.xml \
+           ${DESTDIR}${PREFIX}/share/appdata
+       ${INSTALL_DATA} ${WRKSRC}/build/gtk2_ardour/ardour5.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
+.endfor
+
 .include "../../devel/waf/waf.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../audio/aubio/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/liblo/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
-.include "../../converters/sratom/buildlink3.mk"
-.include "../../textproc/sord/buildlink3.mk"
-.include "../../textproc/serd/buildlink3.mk"
-.include "../../audio/lv2/buildlink3.mk"
-.include "../../textproc/liblrdf/buildlink3.mk"
-.include "../../devel/cppunit/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../audio/aubio/buildlink3.mk"
+.include "../../audio/rubberband/buildlink3.mk"
+.include "../../audio/suil/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../math/fftwf/buildlink3.mk"
-.include "../../audio/rubberband/buildlink3.mk"
-.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../audio/liblo/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/liblrdf/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/glibmm/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../lang/python/application.mk"
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/bsd.pkg.mk"
diff -r c9f9a4141a68 -r ca94c3a7d5fd audio/ardour/PLIST
--- a/audio/ardour/PLIST        Mon Dec 02 11:48:38 2019 +0000



Home | Main Index | Thread Index | Old Index