From 4f63fe50a9c56b7aea05561ab85f540e9a94f41c Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 26 Dec 2002 01:01:22 +0000 Subject: [PATCH] 2002-12-25 Rodrigo Moya * sources/gtk-sharp.sources: added libgphoto2. * api/gphoto-api.xml: added API file for libgphoto2. * gphoto/Makefile.in: added Makefile for building libgphoto2 bindings. * makefile: * configure.in: * api/Makefile.in: added libgphoto2 to build. svn path=/trunk/gtk-sharp/; revision=9895 --- ChangeLog | 13 ++ api/Makefile.in | 3 +- api/gphoto-api.xml | 255 ++++++++++++++++++++++++++++++++++++++ configure.in | 9 ++ makefile | 2 +- sources/gtk-sharp.sources | 1 + 6 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 api/gphoto-api.xml diff --git a/ChangeLog b/ChangeLog index fbbd26992..ff59c4fb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-12-25 Rodrigo Moya + + * sources/gtk-sharp.sources: added libgphoto2. + + * api/gphoto-api.xml: added API file for libgphoto2. + + * gphoto/Makefile.in: added Makefile for building libgphoto2 + bindings. + + * makefile: + * configure.in: + * api/Makefile.in: added libgphoto2 to build. + 2002-12-25 Alp Toker * doc/makefile: Accept the RUNTIME parameter for platforms without diff --git a/api/Makefile.in b/api/Makefile.in index 33286e4b9..87c47e668 100644 --- a/api/Makefile.in +++ b/api/Makefile.in @@ -10,7 +10,8 @@ APIS = \ gnome-api.xml \ gda-api.xml \ gst-api.xml \ - gnomedb-api.xml + gnomedb-api.xml \ + gphoto-api.xml RUNTIME=mono diff --git a/api/gphoto-api.xml b/api/gphoto-api.xml new file mode 100644 index 000000000..f24bbbf30 --- /dev/null +++ b/api/gphoto-api.xml @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configure.in b/configure.in index 8e34dc700..b927e19f1 100644 --- a/configure.in +++ b/configure.in @@ -88,6 +88,13 @@ if test "x$enable_gda" = "xyes"; then fi fi +LIBGPHOTO2_REQUIRED_VERSION=2.1.1 +PKG_CHECK_MODULES(LIBGPHOTO2_DEPENDENCIES, libgphoto2 >= $LIBGPHOTO2_REQUIRED_VERSION, enable_gphoto2=yes, enable_gphoto2=no) +if test "x$enable_gphoto2" = "xyes"; then + BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $LIBGPHOTO2_DEPENDENCIES_CFLAGS" + BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $LIBGPHOTO2_DEPENDENCIES_LIBS" +fi + AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_LIBS) @@ -95,6 +102,7 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") +AM_CONDITIONAL(ENABLE_GPHOTO2, test "x$enable_gphoto2" = "xyes") AC_SUBST(CFLAGS) @@ -118,6 +126,7 @@ gconf/GConf/Makefile gconf/GConf.PropertyEditors/Makefile gconf/tools/Makefile gst/Makefile +gphoto/Makefile sample/Makefile ]) diff --git a/makefile b/makefile index df3f304c4..bc4c41ca5 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ NATIVE_DIRS = glue parser -DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb gconf sample +DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb gconf gphoto sample ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe MCS=mcs diff --git a/sources/gtk-sharp.sources b/sources/gtk-sharp.sources index a7cf94269..535d83e85 100644 --- a/sources/gtk-sharp.sources +++ b/sources/gtk-sharp.sources @@ -12,3 +12,4 @@ libart_lgpl-2.3.10 Art art_lgpl libgda-0.8.193/libgda Gda gda-2 libgnomedb-0.8.193/libgnomedb GnomeDb gnomedb-2 gstreamer-0.4.2/gst Gst gstreamer +libgphoto2-2.1.2dev1/libgphoto2 Gphoto libgphoto2