* applied patch for ardour-3.0 to compile on OS X thanks to Sakari Bergen

git-svn-id: svn://localhost/ardour2/branches/3.0@3338 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 16 insertions, 10 deletions

diff --git a/libs/cairomm/cairomm/Makefile.am b/libs/cairomm/cairomm/Makefile.am
index d4de9bdcbb..547242d240 100644
--- a/libs/cairomm/cairomm/Makefile.am
+++ b/libs/cairomm/cairomm/Makefile.am
@@ -3,9 +3,9 @@ SUBDIRS =
 INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@
 
 h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h
-h_sources_private = private.h
+h_sources_private = private.h context_private.h
 cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc
-cc_sources_private = private.cc
+cc_sources_private = private.cc context_surface_quartz.cc context_surface_win32.cc context_surface_xlib.cc
 
 # Support for DLL on cygwin/mingw using libtool > 1.4
 if PLATFORM_WIN32
diff --git a/libs/cairomm/cairomm/context.cc b/libs/cairomm/cairomm/context.cc
index a4b60e914d..107b195079 100644
--- a/libs/cairomm/cairomm/context.cc
+++ b/libs/cairomm/cairomm/context.cc
@@ -17,11 +17,9 @@
  */
 
 #include <cairomm/context.h>
+#include <cairomm/context_private.h>
 #include <cairomm/private.h>
 #include <cairomm/surface.h>
-#include <cairomm/win32_surface.h>
-#include <cairomm/xlib_surface.h>
-#include <cairomm/quartz_surface.h>
 
 /* M_PI is defined in math.h in the case of Microsoft Visual C++ */
 #if defined(_MSC_VER)
@@ -29,6 +27,8 @@
 #include <math.h>
 #endif 
 
+using namespace Cairo::Private;
+
 namespace Cairo
 {
 
@@ -674,7 +674,7 @@ RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
 #endif
 #if CAIRO_HAS_XLIB_SURFACE
     case CAIRO_SURFACE_TYPE_XLIB:
-      return RefPtr<XlibSurface>(new XlibSurface(surface, false /* does not have reference */));
+      return wrap_surface_xlib(surface);
       break;
 #endif
 #if CAIRO_HAS_GLITZ_SURFACE
@@ -684,12 +684,12 @@ RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
 #endif
 #if CAIRO_HAS_QUARTZ_SURFACE
     case CAIRO_SURFACE_TYPE_QUARTZ:
-      return RefPtr<QuartzSurface>(new QuartzSurface(surface, false /* does not have reference */));
+      return wrap_surface_quartz(surface);
       break;
 #endif
 #if CAIRO_HAS_WIN32_SURFACE
     case CAIRO_SURFACE_TYPE_WIN32:
-      return RefPtr<Win32Surface>(new Win32Surface(surface, false /* does not have reference */));
+      return wrap_surface_win32(surface);
       break;
 #endif
 #if CAIRO_HAS_SVG_SURFACE
diff --git a/libs/cairomm/cairomm/context.h b/libs/cairomm/cairomm/context.h
index 6c47e3bd23..4e31cda1f6 100644
--- a/libs/cairomm/cairomm/context.h
+++ b/libs/cairomm/cairomm/context.h
@@ -967,6 +967,10 @@ protected:
   cobject* m_cobject;
 };
 
+  RefPtr<Surface> get_surface_quartz(cairo_surface_t*);
+  RefPtr<Surface> get_surface_win32(cairo_surface_t*);
+  RefPtr<Surface> get_surface_xlib(cairo_surface_t*);
+
 } // namespace Cairo
 
 #endif //__CAIROMM_CONTEXT_H
diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index 4737ab3904..66434396a3 100644
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -10,7 +10,9 @@ glibmm2_files = glob.glob('glib/glibmm/*.cc')
 Import('env libraries install_prefix')
 
 glibmm2 = env.Copy()
-glibmm2.Merge([libraries['sigc2'], libraries['glib2'], libraries['glibmm2']])
+glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
+glibmm2.Append(LIBPATH='#libs/glibmm2',
+                 CPPPATH='#libs/glibmm2/glib')
 
 glibmm2.Append(CXXFLAGS=['-DHAVE_CONFIG_H', '-DGLIBMM_EXCEPTIONS_ENABLED', '-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED', '-DGLIBMM_PROPERTIES_ENABLED'])
 #glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED')
diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript
index 0e7ccfc5a3..02d75193a0 100644
--- a/libs/gtkmm2/pango/SConscript
+++ b/libs/gtkmm2/pango/SConscript
@@ -8,7 +8,7 @@ pangomm_files = glob.glob('pangomm/*.cc')
 
 Import('env libraries install_prefix')
 pangomm = env.Copy()
-pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2'], libraries['cairomm'], libraries['cairo']])
+pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2'], libraries['cairomm'], libraries['cairo'], libraries['pangocairo'] ])
 
 if pangomm['IS_OSX']:
 	pangomm.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")