Fix build with libsigc++ >=2.8.0.

This port could seriously use an update; it's always in the way...

audio/ardour/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2016/03/18 23:12:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2016/03/20 11:58:32 ajacoutot Exp $
 
 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@@ -8,7 +8,8 @@ ONLY_FOR_ARCHS =	amd64 i386 powerpc
 COMMENT =		digital audio workstation
 
 DISTNAME =		ardour-2.8.16
-REVISION =		2
+REVISION =		3
+
 CATEGORIES =		audio
 HOMEPAGE =		http://ardour.org
 

audio/ardour/patches/patch-gtk2_ardour_au_pluginui_mm

@@ -0,0 +1,15 @@
+$OpenBSD: patch-gtk2_ardour_au_pluginui_mm,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- gtk2_ardour/au_pluginui.mm.orig	Sun Mar 20 11:13:47 2016
++++ gtk2_ardour/au_pluginui.mm	Sun Mar 20 11:14:52 2016
+@@ -196,7 +196,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert
+ 		create_cocoa_view ();
+ 	}
+ 
+-	low_box.signal_realize().connect (mem_fun (this, &AUPluginUI::lower_box_realized));
++	low_box.signal_realize().connect (mem_fun (*this, &AUPluginUI::lower_box_realized));
+ }
+ 
+ AUPluginUI::~AUPluginUI ()

audio/ardour/patches/patch-gtk2_ardour_automation_line_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-gtk2_ardour_automation_line_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- gtk2_ardour/automation_line.cc.orig	Sun Mar 20 11:13:51 2016
++++ gtk2_ardour/automation_line.cc	Sun Mar 20 11:15:01 2016
+@@ -73,7 +73,7 @@ ControlPoint::ControlPoint (AutomationLine& al)
+ 	item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointOutline.get();
+ 	item->property_outline_pixels() = 1;
+ 	item->set_data ("control_point", this);
+-	item->signal_event().connect (mem_fun (this, &ControlPoint::event_handler));
++	item->signal_event().connect (mem_fun (*this, &ControlPoint::event_handler));
+ 
+ 	hide ();
+ 	set_visible (false);

audio/ardour/patches/patch-gtk2_ardour_editor_timefx_cc

@@ -0,0 +1,27 @@
+$OpenBSD: patch-gtk2_ardour_editor_timefx_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- gtk2_ardour/editor_timefx.cc.orig	Sun Mar 20 11:40:16 2016
++++ gtk2_ardour/editor_timefx.cc	Sun Mar 20 11:40:30 2016
+@@ -323,9 +323,9 @@ Editor::time_fx (RegionSelection& regions, float val, 
+ 	current_timefx->first_delete.disconnect();
+ 	
+ 	current_timefx->first_cancel = current_timefx->cancel_button->signal_clicked().connect 
+-		(mem_fun (current_timefx, &TimeFXDialog::cancel_in_progress));
++		(mem_fun (*current_timefx, &TimeFXDialog::cancel_in_progress));
+ 	current_timefx->first_delete = current_timefx->signal_delete_event().connect 
+-		(mem_fun (current_timefx, &TimeFXDialog::delete_in_progress));
++		(mem_fun (*current_timefx, &TimeFXDialog::delete_in_progress));
+ 
+ 	if (pthread_create_and_store ("timefx", &current_timefx->request.thread, 0, timefx_thread, current_timefx)) {
+ 		current_timefx->hide ();
+@@ -335,7 +335,7 @@ Editor::time_fx (RegionSelection& regions, float val, 
+ 
+ 	pthread_detach (current_timefx->request.thread);
+ 
+-	sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timefx, &TimeFXDialog::update_progress), 100);
++	sigc::connection c = Glib::signal_timeout().connect (mem_fun (*current_timefx, &TimeFXDialog::update_progress), 100);
+ 
+ 	while (!current_timefx->request.done && !current_timefx->request.cancel) {
+ 		gtk_main_iteration ();

audio/ardour/patches/patch-gtk2_ardour_imageframe_time_axis_cc

@@ -0,0 +1,34 @@
+$OpenBSD: patch-gtk2_ardour_imageframe_time_axis_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- gtk2_ardour/imageframe_time_axis.cc.orig	Sun Mar 20 12:18:55 2016
++++ gtk2_ardour/imageframe_time_axis.cc	Sun Mar 20 12:19:21 2016
+@@ -285,12 +285,12 @@ ImageFrameTimeAxis::create_imageframe_menu()
+ 
+ 	if(view)
+ 	{
+-		duration_items.push_back(MenuElem (_("0.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 0.5))) ;
+-		duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.0))) ;
+-		duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.5))) ;
+-		duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.0))) ;
+-		duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.5))) ;
+-		duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 3.0))) ;
++		duration_items.push_back(MenuElem (_("0.5 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 0.5))) ;
++		duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.0))) ;
++		duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.5))) ;
++		duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.0))) ;
++		duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.5))) ;
++		duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (*view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 3.0))) ;
+ 		//duration_items.push_back(SeparatorElem()) ;
+ 		//duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_imageframe_duration_custom))) ;
+ 	}
+@@ -300,7 +300,7 @@ ImageFrameTimeAxis::create_imageframe_menu()
+ 	imageframe_sub_items.push_back(SeparatorElem()) ;
+ 	if(view)
+ 	{
+-		imageframe_sub_items.push_back(MenuElem (_("Remove Frame"), bind(mem_fun (view, &ImageFrameTimeAxisView::remove_selected_imageframe_item), (void*)this))) ;
++		imageframe_sub_items.push_back(MenuElem (_("Remove Frame"), bind(mem_fun (*view, &ImageFrameTimeAxisView::remove_selected_imageframe_item), (void*)this))) ;
+ 	}
+ 	
+ 	items.push_back(MenuElem(_("Image Frame"), *imageframe_item_menu)) ;

audio/ardour/patches/patch-gtk2_ardour_marker_time_axis_cc

@@ -0,0 +1,32 @@
+$OpenBSD: patch-gtk2_ardour_marker_time_axis_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- gtk2_ardour/marker_time_axis.cc.orig	Sun Mar 20 12:27:25 2016
++++ gtk2_ardour/marker_time_axis.cc	Sun Mar 20 12:27:54 2016
+@@ -236,11 +236,11 @@ MarkerTimeAxis::build_marker_menu()
+ 	
+ 	if(view)
+ 	{
+-		duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.0))) ;
+-		duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.5))) ;
+-		duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.0))) ;
+-		duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.5))) ;
+-		duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 3.0))) ;
++		duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (*view, &MarkerTimeAxisView::set_marker_duration_sec), 1.0))) ;
++		duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (*view, &MarkerTimeAxisView::set_marker_duration_sec), 1.5))) ;
++		duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (*view, &MarkerTimeAxisView::set_marker_duration_sec), 2.0))) ;
++		duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (*view, &MarkerTimeAxisView::set_marker_duration_sec), 2.5))) ;
++		duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (*view, &MarkerTimeAxisView::set_marker_duration_sec), 3.0))) ;
+ 	}
+ 	//duration_items.push_back(SeparatorElem()) ;
+ 	//duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_marker_duration_custom))) ;
+@@ -248,7 +248,7 @@ MarkerTimeAxis::build_marker_menu()
+ 	marker_sub_items.push_back(MenuElem(_("Duration (sec)"), *duration_menu)) ;
+ 
+ 	marker_sub_items.push_back(SeparatorElem()) ;
+-	marker_sub_items.push_back(MenuElem (_("Remove Marker"), bind(mem_fun(view, &MarkerTimeAxisView::remove_selected_marker_view),(void*)this))) ;
++	marker_sub_items.push_back(MenuElem (_("Remove Marker"), bind(mem_fun(*view, &MarkerTimeAxisView::remove_selected_marker_view),(void*)this))) ;
+ 	
+ 	items.push_back(MenuElem(_("Marker"), *marker_item_menu)) ;
+ 	items.push_back(MenuElem (_("Rename Track"), mem_fun(*this,&MarkerTimeAxis::start_time_axis_rename))) ;

audio/ardour/patches/patch-libs_ardour_audioengine_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libs_ardour_audioengine_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/ardour/audioengine.cc.orig	Sun Mar 20 11:21:30 2016
++++ libs/ardour/audioengine.cc	Sun Mar 20 11:21:46 2016
+@@ -486,7 +486,7 @@ AudioEngine::start_metering_thread ()
+ {
+ 	if (m_meter_thread == 0) {
+ 		g_atomic_int_set (&m_meter_exit, 0);
+-		m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread),
++		m_meter_thread = Glib::Thread::create (sigc::mem_fun(*this, &AudioEngine::meter_thread),
+ 						       500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
+ 	}
+ }

audio/ardour/patches/patch-libs_ardour_playlist_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libs_ardour_playlist_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/ardour/playlist.cc.orig	Sun Mar 20 11:14:23 2016
++++ libs/ardour/playlist.cc	Sun Mar 20 11:16:13 2016
+@@ -588,7 +588,7 @@ Playlist::add_region_internal (boost::shared_ptr<Regio
+ 		}
+ 	}
+ 
+-	region->StateChanged.connect (sigc::bind (mem_fun (this, &Playlist::region_changed_proxy), 
++	region->StateChanged.connect (sigc::bind (mem_fun (*this, &Playlist::region_changed_proxy), 
+ 						  boost::weak_ptr<Region> (region)));
+ }
+ 

audio/ardour/patches/patch-libs_ardour_route_cc

@@ -0,0 +1,17 @@
+$OpenBSD: patch-libs_ardour_route_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/ardour/route.cc.orig	Sun Mar 20 11:14:27 2016
++++ libs/ardour/route.cc	Sun Mar 20 11:16:23 2016
+@@ -108,8 +108,8 @@ Route::init ()
+ 
+ 	_control_outs = 0;
+ 
+-	input_changed.connect (mem_fun (this, &Route::input_change_handler));
+-	output_changed.connect (mem_fun (this, &Route::output_change_handler));
++	input_changed.connect (mem_fun (*this, &Route::input_change_handler));
++	output_changed.connect (mem_fun (*this, &Route::output_change_handler));
+ }
+ 
+ Route::~Route ()

audio/ardour/patches/patch-libs_ardour_session_cc

@@ -0,0 +1,59 @@
+$OpenBSD: patch-libs_ardour_session_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/ardour/session.cc.orig	Sun Mar 20 11:14:18 2016
++++ libs/ardour/session.cc	Sun Mar 20 11:16:06 2016
+@@ -1035,7 +1035,7 @@ Session::diskstream_playlist_changed (boost::weak_ptr<
+ 	boost::shared_ptr<Playlist> playlist;
+ 
+ 	if ((playlist = dstream->playlist()) != 0) {
+-		playlist->LengthChanged.connect (mem_fun (this, &Session::playlist_length_changed));
++		playlist->LengthChanged.connect (mem_fun (*this, &Session::playlist_length_changed));
+ 	}
+ 	
+ 	/* see comment in playlist_length_changed () */
+@@ -1174,9 +1174,9 @@ Session::set_auto_punch_location (Location* location)
+ 	auto_punch_end_changed_connection.disconnect();
+ 	auto_punch_changed_connection.disconnect();
+ 		
+-	auto_punch_start_changed_connection = location->start_changed.connect (mem_fun (this, &Session::auto_punch_start_changed));
+-	auto_punch_end_changed_connection = location->end_changed.connect (mem_fun (this, &Session::auto_punch_end_changed));
+-	auto_punch_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_punch_changed));
++	auto_punch_start_changed_connection = location->start_changed.connect (mem_fun (*this, &Session::auto_punch_start_changed));
++	auto_punch_end_changed_connection = location->end_changed.connect (mem_fun (*this, &Session::auto_punch_end_changed));
++	auto_punch_changed_connection = location->changed.connect (mem_fun (*this, &Session::auto_punch_changed));
+ 
+ 	location->set_auto_punch (true, this);
+ 
+@@ -1217,9 +1217,9 @@ Session::set_auto_loop_location (Location* location)
+ 	auto_loop_end_changed_connection.disconnect();
+ 	auto_loop_changed_connection.disconnect();
+ 	
+-	auto_loop_start_changed_connection = location->start_changed.connect (mem_fun (this, &Session::auto_loop_changed));
+-	auto_loop_end_changed_connection = location->end_changed.connect (mem_fun (this, &Session::auto_loop_changed));
+-	auto_loop_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_loop_changed));
++	auto_loop_start_changed_connection = location->start_changed.connect (mem_fun (*this, &Session::auto_loop_changed));
++	auto_loop_end_changed_connection = location->end_changed.connect (mem_fun (*this, &Session::auto_loop_changed));
++	auto_loop_changed_connection = location->changed.connect (mem_fun (*this, &Session::auto_loop_changed));
+ 
+ 	location->set_auto_loop (true, this);
+ 
+@@ -1823,7 +1823,7 @@ Session::new_audio_track (int input_channels, int outp
+ 
+ 			track->audio_diskstream()->non_realtime_input_change();
+ 			
+-			track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
++			track->DiskstreamChanged.connect (mem_fun (*this, &Session::resort_routes));
+ 			track->set_remote_control_id (control_id);
+ 			++control_id;
+ 
+@@ -3060,7 +3060,7 @@ Session::add_source (boost::shared_ptr<Source> source)
+ 		}
+ 
+ 		if (result.second) {
+-			source->GoingAway.connect (sigc::bind (mem_fun (this, &Session::remove_source), boost::weak_ptr<Source> (source)));
++			source->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_source), boost::weak_ptr<Source> (source)));
+ 			set_dirty();
+ 		}
+ 

audio/ardour/patches/patch-libs_ardour_session_state_cc

@@ -0,0 +1,17 @@
+$OpenBSD: patch-libs_ardour_session_state_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/ardour/session_state.cc.orig	Sun Mar 20 11:13:54 2016
++++ libs/ardour/session_state.cc	Sun Mar 20 11:15:24 2016
+@@ -317,8 +317,8 @@ Session::second_stage_init (bool new_session)
+ 	_state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading);
+ 
+ 
+-	_locations.changed.connect (mem_fun (this, &Session::locations_changed));
+-	_locations.added.connect (mem_fun (this, &Session::locations_added));
++	_locations.changed.connect (mem_fun (*this, &Session::locations_changed));
++	_locations.added.connect (mem_fun (*this, &Session::locations_added));
+ 	setup_click_sounds (0);
+ 	setup_midi_control ();
+ 

audio/ardour/patches/patch-libs_pbd_controllable_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libs_pbd_controllable_cc,v 1.1 2016/03/20 11:58:32 ajacoutot Exp $
+
+Fix build with libsigc++ >=2.8.0
+
+--- libs/pbd/controllable.cc.orig	Sun Mar 20 11:14:35 2016
++++ libs/pbd/controllable.cc	Sun Mar 20 11:16:32 2016
+@@ -74,7 +74,7 @@ Controllable::add ()
+ {
+ 	Glib::Mutex::Lock lm (*registry_lock);
+ 	registry.insert (this);
+-	this->GoingAway.connect (mem_fun (this, &Controllable::remove));
++	this->GoingAway.connect (mem_fun (*this, &Controllable::remove));
+ }
+ 
+ void