- updated system-libs patch to use system gtk-canvas library

  (system soundtouch can't be used now, ardour contains modified version)

Changed files:
    ardour-system-libs.patch -> 1.2
    ardour.spec -> 1.6

diff --git a/ardour-system-libs.patch b/ardour-system-libs.patch
index a5dde3a8d3b089a1244f59176dffa12640d2730a..f1892ad2ed92904c0c6b48c29f4ccb323867fa3e 100644 (file)
--- a/ardour-system-libs.patch
+++ b/ardour-system-libs.patch
@@ -5,7 +5,7 @@
  ARDOUR_TOP=`cd $ARDOUR_TOP; pwd`
  
 -export LIBDIRS="sigc++ pbd soundtouch midi++ ardour gtkmm gtkmmext gtk-canvas"
-+export LIBDIRS="pbd soundtouch midi++ ardour gtkmmext gtk-canvas"
++export LIBDIRS="pbd soundtouch midi++ ardour gtkmmext"
  
  ACLOCAL_FLAGS="-I $ARDOUR_TOP/aclocal"
  ACLOCAL_AMFLAGS="-I $ARDOUR_TOP/aclocal `if test -d m4 ; then echo -I m4; fi`"
@@ -21,8 +21,8 @@
 -LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a $ARDOUR_TOP/libs/sigc++/sigc++/libsigc.a"
 +BASE_LIBS="$ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`"
 +BASE_INCLUDES="`sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TIP/libs/soundtouch"
-+GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/gtk-canvas/libgtk-canvas.a `gtkmm-config --libs`"
-+GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtk-canvas -I$ARDOUR_TOP/libs/gtk-canvas/gtk-canvas -I$ARDOUR_TOP/libs/gtkmmext `gtkmm-config --cflags`"
++GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a -lgtk-canvas `gtkmm-config --libs`"
++GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtkmmext `gtkmm-config --cflags`"
 +CFLAGS="$CFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch"
 +CXXFLAGS="$CXXFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch"
 +LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`"
@@ -39,7 +39,7 @@
  
  if test x$WITH_GTK_GUI != x ; then
 -   AC_CONFIG_SUBDIRS(gtkmm gtkmmext gtk-canvas)
-+   AC_CONFIG_SUBDIRS(gtkmmext gtk-canvas)
++   AC_CONFIG_SUBDIRS(gtkmmext)
  fi
  
  if test x$WITH_VST_WIN != x ; then

diff --git a/ardour.spec b/ardour.spec
index f7a8321ffbee672a4624314f75046be1c7748cee..00b7b20a2234daad4239f045bbefc7b6ca21842c 100644 (file)
--- a/ardour.spec
+++ b/ardour.spec
@@ -17,6 +17,7 @@ BuildRequires:        autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: gtk+-devel >= 1.0.0
+BuildRequires: gtk-canvas-devel >= 0.1
 BuildRequires: gtkmm1-devel >= 1.2.6
 BuildRequires: jack-audio-connection-kit-devel >= 0.66.0
 BuildRequires: libart_lgpl >= 2.3