GNOME.org
 

[f-spot/FSPOT_0_6_0_STABLE] drop Tao and other unused parts

commit 4d1a7cf74e80c5026f5f0de385f6558dcd86b43e
Author: Stephane Delcroix <stephane delcroix org>
Date:   Wed Aug 19 09:04:57 2009 +0200

    drop Tao and other unused parts

 Makefile.include                                   |    8 -
 configure.ac                                       |    5 -
 .../DissolveTransition/DissolveTransition.cs       |    3 +-
 .../Transitions/DissolveTransition/Makefile.am     |    1 -
 lib/Makefile.am                                    |    3 +-
 lib/Tao/.gitignore                                 |    4 -
 lib/Tao/COPYING                                    |   22 -
 lib/Tao/Makefile.am                                |    7 -
 lib/Tao/Tao.GlPostProcess/.gitignore               |    4 -
 lib/Tao/Tao.GlPostProcess/AssemblyInfo.cs          |   66 -
 lib/Tao/Tao.GlPostProcess/GlPostProcess.cs         |  588 -
 lib/Tao/Tao.GlPostProcess/Makefile.am              |   29 -
 lib/Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk    |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.ExtensionLoader/.gitignore      |    4 -
 lib/Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs |   52 -
 .../GlExtensionLoader.cs                           |  425 -
 lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile.am     |   35 -
 .../Tao.OpenGl.ExtensionLoader.dll.config          |    4 -
 .../Tao.OpenGl.ExtensionLoader.snk                 |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.Glu/.gitignore                  |    4 -
 lib/Tao/Tao.OpenGl.Glu/AssemblyInfo.cs             |   53 -
 lib/Tao/Tao.OpenGl.Glu/Glu.cs                      |48356 --------------------
 lib/Tao/Tao.OpenGl.Glu/Makefile.am                 |   36 -
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config   |    4 -
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk          |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml          |46954 -------------------
 lib/Tao/Tao.OpenGl/.gitignore                      |    4 -
 lib/Tao/Tao.OpenGl/AssemblyInfo.cs                 |   53 -
 lib/Tao/Tao.OpenGl/ContextGl.cs                    |39495 ----------------
 lib/Tao/Tao.OpenGl/Gl.cs                           |42310 -----------------
 lib/Tao/Tao.OpenGl/Makefile.am                     |   46 -
 lib/Tao/Tao.OpenGl/Tao.OpenGl.dll.config           |    4 -
 lib/Tao/Tao.OpenGl/Tao.OpenGl.snk                  |  Bin 596 -> 0 bytes
 po/POTFILES.in                                     |    1 -
 src/GdkGlx.cs                                      |    1 -
 src/GlTransition.cs                                |  394 -
 src/Makefile.am                                    |    4 -
 src/Texture.cs                                     |  163 -
 src/TextureDisplay.cs                              |  452 -
 src/Widgets/PushTransition.cs                      |    3 +-
 40 files changed, 3 insertions(+), 179594 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index efd6d72..ca739b8 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -16,10 +16,6 @@ DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
 DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
 DIR_SRC = $(top_builddir)/src
-DIR_TAO_OPENGL = $(top_builddir)/lib/Tao/Tao.OpenGl
-DIR_TAO_GLU = $(top_builddir)/lib/Tao/Tao.OpenGl.Glu
-DIR_TAO_EXTENSIONLOADER = $(top_builddir)/lib/Tao/Tao.OpenGl.ExtensionLoader
-DIR_TAO_GLPOSTPROCESS = $(top_builddir)/lib/Tao/Tao.GlPostProcess
 DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
 DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 
@@ -33,10 +29,6 @@ LINK_MONO_ADDINS =					\
 	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
 	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_TAO = 								\
-	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
-	-r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll				\
-	-r:$(DIR_TAO_EXTENSIONLOADER)/Tao.OpenGl.ExtensionLoader.dll
 LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
 LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 
diff --git a/configure.ac b/configure.ac
index 5ef12f5..b230fa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,11 +307,6 @@ lib/mono-addins/Mono.Addins.Gui/Makefile
 lib/mono-addins/Mono.Addins/Makefile
 lib/mono-addins/Mono.Addins.Setup/Makefile
 lib/semweb/Makefile
-lib/Tao/Makefile
-lib/Tao/Tao.GlPostProcess/Makefile
-lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile
-lib/Tao/Tao.OpenGl.Glu/Makefile
-lib/Tao/Tao.OpenGl/Makefile
 docs/Makefile
 icons/Makefile
 tools/Makefile
diff --git a/extensions/Transitions/DissolveTransition/DissolveTransition.cs b/extensions/Transitions/DissolveTransition/DissolveTransition.cs
index cb23805..c51ed38 100644
--- a/extensions/Transitions/DissolveTransition/DissolveTransition.cs
+++ b/extensions/Transitions/DissolveTransition/DissolveTransition.cs
@@ -16,7 +16,6 @@ using Gdk;
 
 using FSpot.Utils;
 using FSpot.Widgets;
-using Mono.Unix;
 
 using Color = Cairo.Color;
 
@@ -24,7 +23,7 @@ namespace DissolveTransition
 {
 	public class DissolveTransition : CairoTransition
 	{
-		public DissolveTransition () : base (Catalog.GetString ("Dissolve"))
+		public DissolveTransition () : base ("Dissolve")
 		{
 		}
 
diff --git a/extensions/Transitions/DissolveTransition/Makefile.am b/extensions/Transitions/DissolveTransition/Makefile.am
index dd513b1..d81fa4e 100644
--- a/extensions/Transitions/DissolveTransition/Makefile.am
+++ b/extensions/Transitions/DissolveTransition/Makefile.am
@@ -17,7 +17,6 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Widgets.dll\
 	-r:Mono.Cairo				\
 	-pkg:gtk-sharp-2.0			\
-	-r:Mono.Posix				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_SEMWEB)				\
 	$(LINK_GPHOTO2)				\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..f2adf82 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,8 +11,7 @@ UNCONDITIONAL_SUBDIRS = \
 	libfspot			\
 	libgphoto2-sharp	\
 	mono-addins			\
-	semweb				\
-	Tao
+	semweb
 
 # Depending on whether the packaged ndesk-dbus is used, we might not want to
 # build it, but we will always want to ship it. Also, dpap-sharp isn't built,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2ce90fe..dbbcdf1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -79,7 +79,6 @@ src/FormClient.cs
 src/FSpot.addin.xml
 src/f-spot.glade
 src/FullScreenView.cs
-src/GlTransition.cs
 src/GroupSelector.cs
 src/Imaging/Exif.cs
 src/Imaging/ImageFile.cs
diff --git a/src/GdkGlx.cs b/src/GdkGlx.cs
index 77b1a6e..fa6c482 100644
--- a/src/GdkGlx.cs
+++ b/src/GdkGlx.cs
@@ -2,7 +2,6 @@ using System;
 using System.Runtime.InteropServices;
 using FSpot.Widgets;
 using FSpot.Utils;
-using Tao.OpenGl;
 
 namespace GdkGlx {
 	public enum GlxAttribute {
diff --git a/src/Makefile.am b/src/Makefile.am
index 381aef2..1e4bdcf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,6 @@ F_SPOT_CSDISTFILES =				\
 	$(srcdir)/FormClient.cs			\
 	$(srcdir)/FullScreenView.cs		\
 	$(srcdir)/GdkGlx.cs			\
-	$(srcdir)/GlTransition.cs		\
 	$(srcdir)/GroupAdaptor.cs		\
 	$(srcdir)/GroupSelector.cs		\
 	$(srcdir)/Accelerometer.cs		\
@@ -250,8 +249,6 @@ F_SPOT_CSDISTFILES =				\
 	$(srcdir)/TagStore.cs			\
 	$(srcdir)/ThumbnailCache.cs		\
 	$(srcdir)/ThumbnailGenerator.cs		\
-	$(srcdir)/Texture.cs			\
-	$(srcdir)/TextureDisplay.cs             \
 	$(srcdir)/Term.cs			\
 	$(srcdir)/TimeAdaptor.cs		\
 	$(srcdir)/TipWindow.cs			\
@@ -385,7 +382,6 @@ F_SPOT_ASSEMBLIES = 				\
 	$(LINK_FLICKR)				\
 	$(LINK_KEYRING)				\
 	$(LINK_SMUGMUG)				\
-	$(LINK_TAO)				\
 	$(LINK_SEMWEB)				\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
diff --git a/src/Widgets/PushTransition.cs b/src/Widgets/PushTransition.cs
index 4a68e2e..2a54484 100644
--- a/src/Widgets/PushTransition.cs
+++ b/src/Widgets/PushTransition.cs
@@ -13,7 +13,6 @@ using System;
 
 using Cairo;
 using Gdk;
-using Mono.Unix;
 
 using FSpot.Utils;
 
@@ -23,7 +22,7 @@ namespace FSpot.Widgets
 {
 	public class PushTransition : CairoTransition
 	{
-		public PushTransition () : base (Catalog.GetString ("Push"))
+		public PushTransition () : base ("Push")
 		{
 		}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]