From 19156f3a348bc82c1ea38c00ce9151fa4abed79c Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 19 Aug 2008 03:58:22 +0200
Subject: [PATCH] buildfix

---
 src/gui/panels/timeline-panel.cpp |  3 ++-
 src/proc/Makefile.am              | 13 -------------
 wiki/compatibility.html           |  6 ++++--
 wiki/index.html                   |  5 +++--
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index 00a3c3f0f..709a18ac5 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -50,7 +50,8 @@ TimelinePanel::TimelinePanel() :
   toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
   toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
   
-  toolbar.set_icon_size(IconSize(ICON_SIZE_LARGE_TOOLBAR));
+// doesn't compile on Etch
+//  toolbar.set_icon_size(IconSize(ICON_SIZE_LARGE_TOOLBAR));
   toolbar.set_toolbar_style(TOOLBAR_ICONS);
   
   // Add the toolbar
diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am
index 9c6ca64e0..10de0d119 100644
--- a/src/proc/Makefile.am
+++ b/src/proc/Makefile.am
@@ -176,15 +176,6 @@ noinst_HEADERS +=							\
 	$(liblumiproc_a_srcdir)/asset/track.hpp				\
 	$(liblumiproc_a_srcdir)/asset/unknown.hpp			\
 	$(liblumiproc_a_srcdir)/controllerfacade.hpp			\
-	$(liblumiproc_a_srcdir)/engine/aframe.hpp			\
-	$(liblumiproc_a_srcdir)/engine/arender.hpp			\
-	$(liblumiproc_a_srcdir)/engine/codecadapter.hpp			\
-	$(liblumiproc_a_srcdir)/engine/exitnode.hpp			\
-	$(liblumiproc_a_srcdir)/engine/glbuf.hpp			\
-	$(liblumiproc_a_srcdir)/engine/glpipe.hpp			\
-	$(liblumiproc_a_srcdir)/engine/glrender.hpp			\
-	$(liblumiproc_a_srcdir)/engine/hub.hpp				\
-	$(liblumiproc_a_srcdir)/engine/link.hpp				\
 	$(liblumiproc_a_srcdir)/engine/mask.hpp				\
 	$(liblumiproc_a_srcdir)/engine/pluginadapter.hpp		\
 	$(liblumiproc_a_srcdir)/engine/procnode.hpp			\
@@ -192,14 +183,10 @@ noinst_HEADERS +=							\
 	$(liblumiproc_a_srcdir)/engine/renderengine.hpp			\
 	$(liblumiproc_a_srcdir)/engine/source.hpp			\
 	$(liblumiproc_a_srcdir)/engine/trafo.hpp			\
-	$(liblumiproc_a_srcdir)/engine/vframe.hpp			\
-	$(liblumiproc_a_srcdir)/engine/vrender.hpp			\
 	$(liblumiproc_a_srcdir)/engine/processor.hpp			\
-	$(liblumiproc_a_srcdir)/frame.hpp				\
 	$(liblumiproc_a_srcdir)/mobject/builder/assembler.hpp		\
 	$(liblumiproc_a_srcdir)/mobject/builder/buildertool.hpp		\
 	$(liblumiproc_a_srcdir)/mobject/builder/conmanager.hpp		\
-	$(liblumiproc_a_srcdir)/mobject/builder/nodecreatertool.hpp	\
 	$(liblumiproc_a_srcdir)/mobject/builder/segmentationtool.hpp	\
 	$(liblumiproc_a_srcdir)/mobject/builder/toolfactory.hpp		\
 	$(liblumiproc_a_srcdir)/mobject/builderfacade.hpp		\
diff --git a/wiki/compatibility.html b/wiki/compatibility.html
index 0d6077a15..5327731c0 100644
--- a/wiki/compatibility.html
+++ b/wiki/compatibility.html
@@ -747,7 +747,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 }
 //}}}</pre>
 </div>
-<div title="BuildDependencies" modifier="Ichthyostega" modified="200807110148" created="200803261326" changecount="13">
+<div title="BuildDependencies" modifier="Ichthyostega" modified="200808180346" created="200803261326" changecount="14">
 <pre>! Programming Languages
 * C
 ** a C99 compatible compiler, some GCC extensions are used, most are optional.
@@ -782,13 +782,15 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 * boost (see above, version 1.35 works too)
 * NoBug
 * [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] (1.0.0) 
-* for the GUI: gtkmm-2.4 gdl-1.0 cairomm-1.0 xv
+* for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
 ** libgtkmm-2.4-dev (&gt;=2.8)
 ** libcairomm-1.0-dev (&gt;=0.6.0)
 ** libgdl-1-dev (&gt;=0.6.1)
 *** libbonoboui2-dev (&gt;=2.14.0)
+** libgtkmm-2.4-dev (&gt;=2.16), requiring glib2.0 (&gt;=2.16)
 ** libxv-dev ~~(1.0.2 is known to work)~~
 
+
 //usually, newer versions are OK//
 
 </pre>
diff --git a/wiki/index.html b/wiki/index.html
index d3d5716f6..55a65446f 100644
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -759,7 +759,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 }
 //}}}</pre>
 </div>
-<div title="BuildDependenceis" modifier="Ichthyostega" modified="200807110146" created="200708120103" tags="organization buildsys" changecount="15">
+<div title="BuildDependenceis" modifier="Ichthyostega" modified="200808180346" created="200708120103" tags="organization buildsys" changecount="17">
 <pre>for __Building__
 * gcc (4.1), glibc6 (2.3), libstdc++6 (4.1)
 * [[build system|BuildSystem]] dependencies: SCons (0.96.90), Python (2.4), pkg-config
@@ -773,11 +773,12 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 ** libboost-program-options1.34.1 (&gt;=1.34.1-2) ''NOTE: binary dependency''
 ** libboost-regex-dev (&gt;=1.34.1-2)
 ** libboost-regex1.34.1 (&gt;=1.34.1-2) ''binary..''
-* for the GUI: gtkmm-2.4 gdl-1.0 cairomm-1.0 xv
+* for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
 ** libgtkmm-2.4-dev (&gt;=2.8)
 ** libcairomm-1.0-dev (&gt;=0.6.0)
 ** libgdl-1-dev (&gt;=0.6.1)
 *** libbonoboui2-dev (&gt;=2.14.0)
+** libgtkmm-2.4-dev (&gt;=2.16), requiring glib2.0 (&gt;=2.16)
 ** libxv-dev (&gt;=1.0.2)
 //usually, newer versions are OK//