GNOME.org
 

[f-spot/rubenv-gsoc-2009: 5/86] Add libfspotraw-sharp as a build dependency.

commit 242665523b1f2f6698a03de1828e5ca9df0e2b8a
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Jul 18 11:17:01 2009 +0200

    Add libfspotraw-sharp as a build dependency.

 Makefile.addins                                  |    3 ++-
 Makefile.include                                 |    2 ++
 extensions/Editors/BWEditor/Makefile.am          |    2 +-
 extensions/Exporters/FacebookExport/Makefile.am  |    1 +
 extensions/Exporters/FlickrExport/Makefile.am    |    1 +
 extensions/Exporters/FolderExport/Makefile.am    |    1 +
 extensions/Exporters/GalleryExport/Makefile.am   |    1 +
 extensions/Exporters/PicasaWebExport/Makefile.am |    1 +
 extensions/Exporters/SmugMugExport/Makefile.am   |    1 +
 extensions/Exporters/TabbloExport/Makefile.am    |    1 +
 extensions/Exporters/ZipExport/Makefile.am       |    1 +
 extensions/Tools/LiveWebGallery/Makefile.am      |    3 ---
 lib/libfspotraw-sharp/.gitignore                 |    4 ++++
 lib/libfspotraw-sharp/libfspotraw.metadata       |    5 +++++
 src/Loaders/LibrawImageLoader.cs                 |   19 +++++++++++++++++++
 src/Makefile.am                                  |    2 ++
 tests/src/Makefile.am                            |    1 +
 17 files changed, 44 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.addins b/Makefile.addins
index bcf3727..09700f2 100644
--- a/Makefile.addins
+++ b/Makefile.addins
@@ -22,7 +22,8 @@ build_references =					\
 	$(LINK_GPHOTO2)					\
 	$(LINK_GIOSHARP)				\
 	$(LINK_UNIQUESHARP)				\
-	$(LINK_GTKSHARPBEANS)
+	$(LINK_GTKSHARPBEANS)			\
+	$(LINK_FSPOTRAWSHARP)
 
 
 mpack: $(ASSEMBLY)
diff --git a/Makefile.include b/Makefile.include
index 30b8ac6..e6fcea8 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -14,6 +14,7 @@ DIR_SRC = $(top_builddir)/src
 DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
 DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+DIR_FSPOTRAWSHARP = $(top_builddir)/lib/libfspotraw-sharp
 
 ## Links
 
@@ -23,6 +24,7 @@ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
 LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+LINK_FSPOTRAWSHARP = -r:$(DIR_FSPOTRAWSHARP)/libfspotraw-sharp.dll
 
 ## Build
 
diff --git a/extensions/Editors/BWEditor/Makefile.am b/extensions/Editors/BWEditor/Makefile.am
index 744de85..ff00244 100644
--- a/extensions/Editors/BWEditor/Makefile.am
+++ b/extensions/Editors/BWEditor/Makefile.am
@@ -12,7 +12,7 @@ addin_references =		\
 	Mono.Posix		\
 	Mono.Simd
 
-addin_packages =		\	
+addin_packages =		\
 	gtk-sharp-2.0
 
 addin_extraflags = -unsafe
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index 3d4afcf..10f4c05 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -44,6 +44,7 @@ REFS =							\
 	$(LINK_GPHOTO2)					\
 	$(LINK_GIOSHARP)				\
 	$(LINK_UNIQUESHARP)				\
+	$(LINK_FSPOTRAWSHARP)						\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index e75a9f8..dc3754a 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -19,6 +19,7 @@ REFS =						\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)		\
 	-r:FlickrNet/FlickrNet.dll	\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 3f5c274..c4762ca 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -18,6 +18,7 @@ REFS =					\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
 	$(LINK_UNIQUESHARP)		\
+	$(LINK_FSPOTRAWSHARP)		\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index c5d82f9..4809fda 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -20,6 +20,7 @@ REFS =						\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)		\
 	-r:System.Web				\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index b5bfd9f..2d99f7c 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -19,6 +19,7 @@ REFS =						\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)			\
 	-r:System.Web				\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 166de02..b42c01c 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -20,6 +20,7 @@ REFS =						\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_KEYRING)				\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)			\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index 056be8d..04f9218 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -35,6 +35,7 @@ REFS = \
 	$(LINK_GTKSHARPBEANS)	\	
 	$(LINK_GPHOTO2)		\
 	$(LINK_UNIQUESHARP)	\
+	$(LINK_FSPOTRAWSHARP)	\
 	-r:Mono.Posix.dll
 
 PKGS = \
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index 52b0378..21fb754 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -18,6 +18,7 @@ REFS =						\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)			\
 	-r:System.Web				\
 	-r:ICSharpCode.SharpZipLib		\
 	-r:Mono.Posix
diff --git a/extensions/Tools/LiveWebGallery/Makefile.am b/extensions/Tools/LiveWebGallery/Makefile.am
index 74eeea2..fa7e00f 100644
--- a/extensions/Tools/LiveWebGallery/Makefile.am
+++ b/extensions/Tools/LiveWebGallery/Makefile.am
@@ -25,9 +25,6 @@ addin_resources =			\
 	ui/f-spot.js			\
 	ui/gallery.html
 
-addin_packages =			\
-	gtk-sharp-2.0
-
 addin_extradist =
 
 include $(top_srcdir)/Makefile.addins
diff --git a/lib/libfspotraw-sharp/.gitignore b/lib/libfspotraw-sharp/.gitignore
index b336cc7..2b415f2 100644
--- a/lib/libfspotraw-sharp/.gitignore
+++ b/lib/libfspotraw-sharp/.gitignore
@@ -1,2 +1,6 @@
 /Makefile
 /Makefile.in
+/generated/*.cs
+/libfspotraw-api.*
+/*.dll
+/*.dll.mdb
diff --git a/lib/libfspotraw-sharp/libfspotraw.metadata b/lib/libfspotraw-sharp/libfspotraw.metadata
new file mode 100644
index 0000000..0555939
--- /dev/null
+++ b/lib/libfspotraw-sharp/libfspotraw.metadata
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<metadata>
+	<attr path="/api/namespace" name="name">FSpot.Loaders.Native</attr>
+	<attr path="/api/namespace/object[ cname='FSpotLibrawLoader']" name="name">NativeLibrawLoader</attr>
+</metadata>
diff --git a/src/Loaders/LibrawImageLoader.cs b/src/Loaders/LibrawImageLoader.cs
new file mode 100644
index 0000000..65d96aa
--- /dev/null
+++ b/src/Loaders/LibrawImageLoader.cs
@@ -0,0 +1,19 @@
+//
+// Fspot.Loaders.LibrawImageLoader.cs
+//
+// Copyright (c) 2009 Novell, Inc.
+//
+// Author(s)
+//	Ruben Vermeersch  <ruben savanne be>
+//
+// This is free software. See COPYING for details
+//
+
+using FSpot.Loaders.Native;
+
+namespace FSpot.Loaders {
+	public class LibrawImageLoader {
+		NativeLibrawLoader loader;
+
+	}
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index b47f0ed..4469b99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,6 +191,7 @@ F_SPOT_CSDISTFILES =				\
 	$(srcdir)/Loaders/ImageLoader.cs		\
 	$(srcdir)/Loaders/IImageLoader.cs		\
 	$(srcdir)/Loaders/GdkImageLoader.cs		\
+	$(srcdir)/Loaders/LibrawImageLoader.cs		\
 	$(srcdir)/ImageLoaderThread.cs		\
 	$(srcdir)/ImportBackend.cs		\
 	$(srcdir)/ImportCommand.cs		\
@@ -392,6 +393,7 @@ F_SPOT_ASSEMBLIES = 				\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
 	$(LINK_UNIQUESHARP)			\
+	$(LINK_FSPOTRAWSHARP)		\
 	-r:System.Data				\
 	-r:System.Web				\
 	-r:Mono.Data.SqliteClient		\
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index c2eddc2..81fe2a4 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -24,6 +24,7 @@ REFS =							\
 	$(LINK_GPHOTO2)					\
 	$(LINK_GIOSHARP)				\
 	$(LINK_UNIQUESHARP)				\
+	$(LINK_FSPOTRAWSHARP)					\
 	-r:$(top_builddir)/src/f-spot.exe		\
 	-r:$(top_builddir)/src/FSpot.Core.dll		\
 	-r:$(top_builddir)/src/FSpot.Query.dll		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]