Date: Tue, 24 Dec 2013 12:50:17 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337344 - in branches/2014Q1/audio/ardour: . files Message-ID: <201312241250.rBOCoH8E084116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Dec 24 12:50:16 2013 New Revision: 337344 URL: http://svnweb.freebsd.org/changeset/ports/337344 Log: MFH: r337311 - Fix several C++ issues with modern compilers - While here, stagify and mute REINPLACE_CMD's Approved by: portmgr (implicit) Added: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript - copied unchanged from r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc - copied unchanged from r337311, head/audio/ardour/files/patch-libs-ardour-session.cc branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc - copied unchanged from r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h - copied unchanged from r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h Modified: branches/2014Q1/audio/ardour/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/ardour/Makefile ============================================================================== --- branches/2014Q1/audio/ardour/Makefile Tue Dec 24 12:48:52 2013 (r337343) +++ branches/2014Q1/audio/ardour/Makefile Tue Dec 24 12:50:16 2013 (r337344) @@ -20,14 +20,13 @@ LIB_DEPENDS= liblo.so:${PORTSDIR}/audio/ libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 USE_BZIP2= yes -NO_STAGE= yes USES= gettext pkgconfig USE_SCONS= yes SCONS_ENV+= SYSLIBS=yes PREFIX=${PREFIX} NLS=yes CFLAGS+= -I${LOCALBASE}/include USE_GNOME= libxslt USE_LDCONFIG= ${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces -TEMPLATESDIR= ${PREFIX}/share/ardour2/templates + PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= OPTIMIZED_CFLAGS VST @@ -67,11 +66,15 @@ SCONS_ENV+= FPU_OPTIMIZATION=0 .endif post-patch: - ${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct - ${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template + @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template + +pre-build: + @${MKDIR} ${STAGEDIR} post-install: - @${MKDIR} ${TEMPLATESDIR} - ${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates + ${INSTALL_DATA} ${WRKSRC}/templates/*.template \ + ${STAGEDIR}${PREFIX}/share/ardour2/templates .include <bsd.port.mk> Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript (from r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript) @@ -0,0 +1,14 @@ +--- gtk2_ardour/SConscript.orig ++++ gtk2_ardour/SConscript +@@ -411,9 +411,9 @@ for style in ['', 'BOLD', 'ITALIC']: + # + + if env['GTKOSX']: +- ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1) ++ ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR -o ardour.menus ardour.menus.in", chdir=1) + else: +- ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1) ++ ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -o ardour.menus ardour.menus.in", chdir=1) + + ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict) + ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict) Copied: branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc (from r337311, head/audio/ardour/files/patch-libs-ardour-session.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-ardour-session.cc) @@ -0,0 +1,359 @@ +--- libs/ardour/session.cc.orig ++++ libs/ardour/session.cc +@@ -79,7 +79,6 @@ + using namespace std; + using namespace ARDOUR; + using namespace PBD; +-using boost::shared_ptr; + + #ifdef __x86_64__ + static const int CPU_CACHE_ALIGN = 64; +@@ -399,14 +398,14 @@ Session::Session (AudioEngine &eng, + int control_id = 1; + + if (control_out_channels) { +- shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut)); ++ boost::shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut)); + r->set_remote_control_id (control_id++); + + rl.push_back (r); + } + + if (master_out_channels) { +- shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut)); ++ boost::shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut)); + r->set_remote_control_id (control_id); + + rl.push_back (r); +@@ -984,8 +983,8 @@ Session::hookup_io () + boost::shared_ptr<Session::RouteList> + Session::get_routes_with_regions_at (nframes64_t const p) const + { +- shared_ptr<RouteList> r = routes.reader (); +- shared_ptr<RouteList> rl (new RouteList); ++ boost::shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> rl (new RouteList); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i); +@@ -1590,9 +1589,9 @@ struct RouteSorter { + }; + + static void +-trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase) ++trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase) + { +- shared_ptr<Route> r2; ++ boost::shared_ptr<Route> r2; + + if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) { + info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg; +@@ -1601,13 +1600,13 @@ trace_terminal (shared_ptr<Route> r1, sh + + /* make a copy of the existing list of routes that feed r1 */ + +- set<shared_ptr<Route> > existing = r1->fed_by; ++ set<boost::shared_ptr<Route> > existing = r1->fed_by; + + /* for each route that feeds r1, recurse, marking it as feeding + rbase as well. + */ + +- for (set<shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) { ++ for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) { + r2 =* i; + + /* r2 is a route that feeds r1 which somehow feeds base. mark +@@ -1651,14 +1650,14 @@ Session::resort_routes () + { + + RCUWriter<RouteList> writer (routes); +- shared_ptr<RouteList> r = writer.get_copy (); ++ boost::shared_ptr<RouteList> r = writer.get_copy (); + resort_routes_using (r); + /* writer goes out of scope and forces update */ + } + } + + void +-Session::resort_routes_using (shared_ptr<RouteList> r) ++Session::resort_routes_using (boost::shared_ptr<RouteList> r) + { + RouteList::iterator i, j; + +@@ -1723,7 +1722,7 @@ Session::new_audio_track (int input_chan + /* count existing audio tracks */ + + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast<AudioTrack*>((*i).get()) != 0) { +@@ -1776,7 +1775,7 @@ Session::new_audio_track (int input_chan + nphysical_out = 0; + } + +- shared_ptr<AudioTrack> track; ++ boost::shared_ptr<AudioTrack> track; + + try { + track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode))); +@@ -1884,7 +1883,7 @@ Session::set_remote_control_ids () + { + RemoteModel m = Config->get_remote_model(); + +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ( MixerOrdered == m) { +@@ -1913,7 +1912,7 @@ Session::new_audio_route (int input_chan + /* count existing audio busses */ + + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast<AudioTrack*>((*i).get()) == 0) { +@@ -1945,7 +1944,7 @@ Session::new_audio_route (int input_chan + } while (bus_id < (UINT_MAX-1)); + + try { +- shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO)); ++ boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO)); + + if (bus->ensure_io (input_channels, output_channels, false, this)) { + error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"), +@@ -2060,7 +2059,7 @@ Session::new_route_from_template (uint32 + Track::zero_diskstream_id_in_xml (node_copy); + + try { +- shared_ptr<Route> route (XMLRouteFactory (node_copy)); ++ boost::shared_ptr<Route> route (XMLRouteFactory (node_copy)); + + if (route == 0) { + error << _("Session: cannot create track/bus from template description") << endmsg; +@@ -2107,7 +2106,7 @@ boost::shared_ptr<Route> + Session::new_video_track (string name) + { + uint32_t control_id = ntracks() + nbusses() + 1; +- shared_ptr<Route> new_route ( ++ boost::shared_ptr<Route> new_route ( + new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL)); + new_route->set_remote_control_id (control_id); + +@@ -2115,7 +2114,7 @@ Session::new_video_track (string name) + rl.push_back (new_route); + { + RCUWriter<RouteList> writer (routes); +- shared_ptr<RouteList> r = writer.get_copy (); ++ boost::shared_ptr<RouteList> r = writer.get_copy (); + r->insert (r->end(), rl.begin(), rl.end()); + resort_routes_using (r); + } +@@ -2127,7 +2126,7 @@ Session::add_routes (RouteList& new_rout + { + { + RCUWriter<RouteList> writer (routes); +- shared_ptr<RouteList> r = writer.get_copy (); ++ boost::shared_ptr<RouteList> r = writer.get_copy (); + r->insert (r->end(), new_routes.begin(), new_routes.end()); + resort_routes_using (r); + } +@@ -2198,14 +2197,14 @@ Session::add_diskstream (boost::shared_p + } + + void +-Session::remove_route (shared_ptr<Route> route) ++Session::remove_route (boost::shared_ptr<Route> route) + { + //clear solos before removing the route + route->set_solo ( false, this); + + { + RCUWriter<RouteList> writer (routes); +- shared_ptr<RouteList> rs = writer.get_copy (); ++ boost::shared_ptr<RouteList> rs = writer.get_copy (); + + rs->remove (route); + +@@ -2215,11 +2214,11 @@ Session::remove_route (shared_ptr<Route> + */ + + if (route == _master_out) { +- _master_out = shared_ptr<Route> (); ++ _master_out = boost::shared_ptr<Route> (); + } + + if (route == _control_out) { +- _control_out = shared_ptr<Route> (); ++ _control_out = boost::shared_ptr<Route> (); + + /* cancel control outs for all routes */ + +@@ -2308,7 +2307,7 @@ Session::route_solo_changed (void* src, + + is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0); + +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -2404,7 +2403,7 @@ Session::update_route_solo_state () + the solo mute setting of each track. + */ + +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->soloed()) { +@@ -2446,7 +2445,7 @@ Session::update_route_solo_state () + void + Session::modify_solo_mute (bool is_track, bool mute) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -2511,7 +2510,7 @@ Session::catch_up_on_solo_mute_override + /* this is called whenever the param solo-mute-override is + changed. + */ +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + (*i)->catch_up_on_solo_mute_override (); +@@ -2521,7 +2520,7 @@ Session::catch_up_on_solo_mute_override + bool + Session::io_name_is_legal (const std::string& name) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == name) { +@@ -2536,10 +2535,10 @@ Session::io_name_is_legal (const std::st + return true; + } + +-shared_ptr<Route> ++boost::shared_ptr<Route> + Session::route_by_name (const std::string& name) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == name) { +@@ -2547,13 +2546,13 @@ Session::route_by_name (const std::strin + } + } + +- return shared_ptr<Route> ((Route*) 0); ++ return boost::shared_ptr<Route> ((Route*) 0); + } + +-shared_ptr<Route> ++boost::shared_ptr<Route> + Session::route_by_id (PBD::ID id) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->id() == id) { +@@ -2561,13 +2560,13 @@ Session::route_by_id (PBD::ID id) + } + } + +- return shared_ptr<Route> ((Route*) 0); ++ return boost::shared_ptr<Route> ((Route*) 0); + } + +-shared_ptr<Route> ++boost::shared_ptr<Route> + Session::route_by_remote_id (uint32_t id) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->remote_control_id() == id) { +@@ -2575,7 +2574,7 @@ Session::route_by_remote_id (uint32_t id + } + } + +- return shared_ptr<Route> ((Route*) 0); ++ return boost::shared_ptr<Route> ((Route*) 0); + } + + void +@@ -3595,7 +3594,7 @@ Session::is_auditioning () const + void + Session::set_all_solo (bool yn) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (!(*i)->hidden()) { +@@ -3609,7 +3608,7 @@ Session::set_all_solo (bool yn) + void + Session::set_all_mute (bool yn) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (!(*i)->hidden()) { +@@ -3680,7 +3679,7 @@ Session::record_enable_all () + void + Session::record_enable_change_all (bool yn) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + AudioTrack* at; +@@ -4071,7 +4070,7 @@ Session::reset_native_file_format () + bool + Session::route_name_unique (string n) const + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == n) { +@@ -4117,7 +4116,7 @@ Session::allocate_pan_automation_buffers + int + Session::freeze (InterThreadInfo& itt) + { +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -4355,7 +4354,7 @@ uint32_t + Session::ntracks () const + { + uint32_t n = 0; +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast<AudioTrack*> ((*i).get())) { +@@ -4370,7 +4369,7 @@ uint32_t + Session::nbusses () const + { + uint32_t n = 0; +- shared_ptr<RouteList> r = routes.reader (); ++ boost::shared_ptr<RouteList> r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) { Copied: branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc (from r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc) @@ -0,0 +1,11 @@ +--- libs/pbd/mountpoint.cc.orig ++++ libs/pbd/mountpoint.cc +@@ -19,7 +19,7 @@ + */ + + #include <cstdio> +-#include <cstring> ++#include <cstdlib> + #include <string> + #include <cstring> + #include <limits.h> Copied: branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h (from r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h) @@ -0,0 +1,20 @@ +--- libs/pbd/pbd/stl_delete.h.orig ++++ libs/pbd/pbd/stl_delete.h +@@ -23,7 +23,7 @@ + /* To actually use any of these deletion functions, you need to + first include the revelant container type header. + */ +-#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) ++#if defined(_LIBCPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) + template<class T> void vector_delete (std::vector<T *> *vec) + { + typename std::vector<T *>::iterator i; +@@ -33,7 +33,7 @@ template<class T> void vector_delete (st + } + vec->clear (); + } +-#endif // _CPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR ++#endif // _LIBCPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR + + #if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP) + template<class K, class T> void map_delete (std::map<K, T *> *m)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312241250.rBOCoH8E084116>