Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/ardour Fix operand-specific lookup for operator<...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bfc418f38b73
branches: trunk
changeset: 428860:bfc418f38b73
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Apr 12 19:36:26 2020 +0000
description:
Fix operand-specific lookup for operator<<. Unlimit stack size and avoid
very long chains in luabindings.cc to workaround clang issues.
diffstat:
audio/ardour/Makefile | 4 +-
audio/ardour/distinfo | 18 +-
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_presentation__info.cc | 17 +
audio/ardour/patches/patch-libs_ardour_tempo.cc | 19 +
audio/ardour/patches/patch-libs_pbd_id.cc | 19 +
audio/ardour/patches/patch-libs_pbd_pbd_id.h | 17 +
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 +
18 files changed, 439 insertions(+), 2 deletions(-)
diffs (truncated from 535 to 300 lines):
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/Makefile
--- a/audio/ardour/Makefile Sun Apr 12 19:34:47 2020 +0000
+++ b/audio/ardour/Makefile Sun Apr 12 19:36:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/03/10 22:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2020/04/12 19:36:26 joerg Exp $
DISTNAME= Ardour-5.12.0
PKGNAME= ${DISTNAME:tl}
@@ -15,6 +15,8 @@
COMMENT= Digital Audio Workstation
LICENSE= gnu-gpl-v2
+UNLIMIT_RESOURCES= stacksize
+
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++11
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/distinfo
--- a/audio/ardour/distinfo Sun Apr 12 19:34:47 2020 +0000
+++ b/audio/ardour/distinfo Sun Apr 12 19:36:26 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2020/03/04 10:56:35 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/04/12 19:36:26 joerg Exp $
SHA1 (Ardour-5.12.0.tar.bz2) = 8bf06a17638e89531cab14af67cfd59d7185518f
RMD160 (Ardour-5.12.0.tar.bz2) = 71c25f13445f4036ff7127d071d8c1e0851d5eb8
@@ -7,8 +7,24 @@
SHA1 (patch-.waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a_waflib_Tools_c__config.py) = 6b6c776485def8e57ab1ec7fb4b8207ac6d3094a
SHA1 (patch-gtk2__ardour_ardour__ui.cc) = 83d5fe364d068fc619781ae76fb37f8ed4cda41b
SHA1 (patch-gtk2__ardour_wscript) = f78f4028e20d9d917fd1251618136c51ce3fa28a
+SHA1 (patch-libs_ardour_ardour_chan__count.h) = b8b175a41cc7c6fa540e97af9267daaefb7a36d1
+SHA1 (patch-libs_ardour_ardour_chan__mapping.h) = 1eb6a8f6e475545db57755ba1543255221252ad7
+SHA1 (patch-libs_ardour_ardour_plugin__insert.h) = 2c3bf28ebceabb217fb81d5350089745b87f21c8
+SHA1 (patch-libs_ardour_ardour_presentation__info.h) = 5fa8c228a583468a423369f24626eb0d986129f6
+SHA1 (patch-libs_ardour_ardour_tempo.h) = 08c70b1a141fe22c999f64234b4d48e7dc5d8d0f
+SHA1 (patch-libs_ardour_chan__count.cc) = 9ab0958a9641d34f80157706c458f77215227a7d
+SHA1 (patch-libs_ardour_chan__mapping.cc) = 2f6078e25b9fb76f479af82e5b0946343623ce29
+SHA1 (patch-libs_ardour_luabindings.cc) = 4c34733d35fed48860580cae7d3de809a906447f
+SHA1 (patch-libs_ardour_plugin__insert.cc) = b87e903555f5853c3256357c74414650d27d7e9f
+SHA1 (patch-libs_ardour_presentation__info.cc) = e9c89b9519cf7a13682b83b5582c6ebfa6e5948e
+SHA1 (patch-libs_ardour_tempo.cc) = 5796d6f3a51b7763b4a30ae9e2738e657a394b08
SHA1 (patch-libs_backends_jack_jack__audiobackend.cc) = 9fc4201948a6e88711d18d9218e1dacc1dd2700b
SHA1 (patch-libs_backends_jack_jack__audiobackend.h) = e7cd23f39e31d3a4af3ed513b7e41503c4a6b16c
SHA1 (patch-libs_backends_jack_jack__utils.cc) = 61ce895e998e359fa3801bcdd3ce6e83926f6ec0
SHA1 (patch-libs_backends_jack_jack__utils.h) = d2bdfca276271c67f49a06ea63077c52cac803d7
+SHA1 (patch-libs_pbd_id.cc) = 264ec2889f8481972c32df33b307292802925fa1
+SHA1 (patch-libs_pbd_pbd_id.h) = 6ffa31d7bcf88f0cdb3c0f3701dd28426b21e2ca
+SHA1 (patch-libs_timecode_src_time.cc) = cf18341b5ea2050f73c93f67743168b817e29c9d
+SHA1 (patch-libs_timecode_timecode_bbt__time.h) = 3ce496fa6a08717004e222d171cca68ed155b2d4
+SHA1 (patch-libs_timecode_timecode_time.h) = 1b47ce9be05ae98b11dedb07f906bd16fccd525a
SHA1 (patch-wscript) = 9cfa56ac1ccbb9706f009ce4001dc0b55146338b
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_ardour_chan__count.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_ardour_chan__count.h Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_ardour_ardour_chan__count.h,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/ardour/chan_count.h.orig 2020-04-11 23:20:16.360459913 +0000
++++ libs/ardour/ardour/chan_count.h
+@@ -207,9 +207,9 @@ private:
+ uint32_t _counts[DataType::num_types];
+ };
+
+-} // namespace ARDOUR
++LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ChanCount& c);
+
+-LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
++} // namespace ARDOUR
+
+ #endif // __ardour_chan_count_h__
+
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_ardour_chan__mapping.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_ardour_chan__mapping.h Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_ardour_ardour_chan__mapping.h,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/ardour/chan_mapping.h.orig 2020-04-11 23:30:11.328024715 +0000
++++ libs/ardour/ardour/chan_mapping.h
+@@ -118,9 +118,9 @@ private:
+ Mappings _mappings;
+ };
+
+-} // namespace ARDOUR
++std::ostream& operator<<(std::ostream& o, const ChanMapping& m);
+
+-std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& m);
++} // namespace ARDOUR
+
+ #endif // __ardour_chan_mapping_h__
+
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_ardour_plugin__insert.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_ardour_plugin__insert.h Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-libs_ardour_ardour_plugin__insert.h,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/ardour/plugin_insert.h.orig 2020-04-11 23:36:29.754327360 +0000
++++ libs/ardour/ardour/plugin_insert.h
+@@ -386,8 +386,8 @@ class LIBARDOUR_API PluginInsert : publi
+ void preset_load_set_value (uint32_t, float);
+ };
+
+-} // namespace ARDOUR
++std::ostream& operator<<(std::ostream& o, const PluginInsert::Match& m);
+
+-std::ostream& operator<<(std::ostream& o, const ARDOUR::PluginInsert::Match& m);
++} // namespace ARDOUR
+
+ #endif /* __ardour_plugin_insert_h__ */
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_ardour_presentation__info.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_ardour_presentation__info.h Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-libs_ardour_ardour_presentation__info.h,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/ardour/presentation_info.h.orig 2020-04-11 23:14:40.532791103 +0000
++++ libs/ardour/ardour/presentation_info.h
+@@ -267,8 +267,8 @@ class LIBARDOUR_API PresentationInfo : p
+ static int selection_counter;
+ };
+
+-}
++std::ostream& operator<<(std::ostream& o, PresentationInfo const& rid);
+
+-std::ostream& operator<<(std::ostream& o, ARDOUR::PresentationInfo const& rid);
++}
+
+ #endif /* __libardour_presentation_info_h__ */
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_ardour_tempo.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_ardour_tempo.h Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-libs_ardour_ardour_tempo.h,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/ardour/tempo.h.orig 2020-04-11 23:40:21.653152350 +0000
++++ libs/ardour/ardour/tempo.h
+@@ -618,11 +618,11 @@ private:
+ MeterSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section) const;
+ };
+
+-}; /* namespace ARDOUR */
++LIBARDOUR_API std::ostream& operator<< (std::ostream&, const Meter&);
++LIBARDOUR_API std::ostream& operator<< (std::ostream&, const Tempo&);
++LIBARDOUR_API std::ostream& operator<< (std::ostream&, const MetricSection&);
+
+-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Meter&);
+-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Tempo&);
+-LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::MetricSection&);
++}; /* namespace ARDOUR */
+
+ namespace PBD {
+ DEFINE_ENUM_CONVERT (ARDOUR::TempoSection::Type)
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_chan__count.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_chan__count.cc Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-libs_ardour_chan__count.cc,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/chan_count.cc.orig 2020-04-12 00:31:30.948259759 +0000
++++ libs/ardour/chan_count.cc
+@@ -67,8 +67,8 @@ ChanCount::state(const std::string& name
+ // Statics
+ const ChanCount ChanCount::ZERO = ChanCount();
+
+-} // namespace ARDOUR
+-
+ std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c) {
+ return o << "AUDIO=" << c.n_audio() << ":MIDI=" << c.n_midi();
+ }
++
++} // namespace ARDOUR
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_chan__mapping.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_chan__mapping.cc Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-libs_ardour_chan__mapping.cc,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Ensure operators are defined in the namespace of one of the arguments.
+
+--- libs/ardour/chan_mapping.cc.orig 2020-04-12 00:31:19.718822358 +0000
++++ libs/ardour/chan_mapping.cc
+@@ -241,10 +241,6 @@ ChanMapping::count () const
+ return rv;
+ }
+
+-
+-
+-} // namespace ARDOUR
+-
+ std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& cm)
+ {
+ const ARDOUR::ChanMapping::Mappings& mp (cm.mappings());
+@@ -258,3 +254,5 @@ std::ostream& operator<<(std::ostream& o
+
+ return o;
+ }
++
++} // namespace ARDOUR
diff -r 3ea3b041d520 -r bfc418f38b73 audio/ardour/patches/patch-libs_ardour_luabindings.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ardour/patches/patch-libs_ardour_luabindings.cc Sun Apr 12 19:36:26 2020 +0000
@@ -0,0 +1,127 @@
+$NetBSD: patch-libs_ardour_luabindings.cc,v 1.1 2020/04/12 19:36:26 joerg Exp $
+
+Avoid extensive intermediate object chains.
+
+--- libs/ardour/luabindings.cc.orig 2020-04-11 23:24:29.090389555 +0000
++++ libs/ardour/luabindings.cc
+@@ -807,7 +807,10 @@ LuaBindings::common (lua_State* L)
+ .addFunction ("writing", &AutomationList::writing)
+ .addFunction ("touch_enabled", &AutomationList::touch_enabled)
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .deriveClass <Location, PBD::StatefulDestructible> ("Location")
+ .addFunction ("name", &Location::name)
+ .addFunction ("locked", &Location::locked)
+@@ -875,7 +878,10 @@ LuaBindings::common (lua_State* L)
+
+ .deriveWSPtrClass <AudioPort, Port> ("AudioPort")
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .deriveWSPtrClass <MidiPort, Port> ("MidiPort")
+ .addFunction ("input_active", &MidiPort::input_active)
+ .addFunction ("set_input_active", &MidiPort::set_input_active)
+@@ -1013,7 +1019,10 @@ LuaBindings::common (lua_State* L)
+ .addFunction ("presentation_info_ptr", &Stripable::presentation_info_ptr)
+
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .deriveWSPtrClass <VCA, Stripable> ("VCA")
+ .addFunction ("full_name", &VCA::full_name)
+ .addFunction ("number", &VCA::number)
+@@ -1116,7 +1125,10 @@ LuaBindings::common (lua_State* L)
+ .addFunction ("bounce_range", &Track::bounce_range)
+ .addFunction ("playlist", &Track::playlist)
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .deriveWSPtrClass <AudioTrack, Track> ("AudioTrack")
+ .endClass ()
+
+@@ -1195,7 +1207,10 @@ LuaBindings::common (lua_State* L)
+ .addFunction ("source", &Region::source)
+ .addFunction ("control", static_cast<boost::shared_ptr<Evoral::Control>(Region::*)(const Evoral::Parameter&, bool)>(&Region::control))
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .deriveWSPtrClass <MidiRegion, Region> ("MidiRegion")
+ .addFunction ("do_export", &MidiRegion::do_export)
+ .addFunction ("midi_source", &MidiRegion::midi_source)
+@@ -1298,7 +1313,10 @@ LuaBindings::common (lua_State* L)
+ .addData ("label", &ParameterDescriptor::label)
+ .addStaticFunction ("midi_note_name", &ParameterDescriptor::midi_note_name)
+ .endClass ()
++ .endNamespace ();
+
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+ .beginStdVector <boost::shared_ptr<ARDOUR::Processor> > ("ProcessorVector").endClass ()
+
+ .deriveWSPtrClass <Processor, SessionObject> ("Processor")
+@@ -1408,6 +1426,10 @@ LuaBindings::common (lua_State* L)
+ .addFunction ("writable", &AutomationControl::writable)
+ .addFunction ("alist", &AutomationControl::alist)
+ .endClass ()
++ .endNamespace ();
++
++ luabridge::getGlobalNamespace (L)
++ .beginNamespace ("ARDOUR")
+
+ .deriveWSPtrClass <SlavableAutomationControl, AutomationControl> ("SlavableAutomationControl")
+ .addFunction ("add_master", &SlavableAutomationControl::add_master)
+@@ -1501,6 +1523,10 @@ LuaBindings::common (lua_State* L)
Home |
Main Index |
Thread Index |
Old Index