From 1973081fd575b66265b7ab2bf13c141b08d64746 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 8 Jul 2005 21:53:19 +0000
Subject: Upstream upgrade to 2.1.6

---
 packages/gphoto2/gphoto2_2.1.6.bb       |  8 ++++++++
 packages/libgphoto2/libgphoto2_2.1.6.bb | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 packages/gphoto2/gphoto2_2.1.6.bb
 create mode 100644 packages/libgphoto2/libgphoto2_2.1.6.bb

diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb
new file mode 100644
index 0000000000..51dacccd0f
--- /dev/null
+++ b/packages/gphoto2/gphoto2_2.1.6.bb
@@ -0,0 +1,8 @@
+LICENSE = GPL
+SECTION = "console/utils"
+DEPENDS = "libgphoto2 popt"
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
new file mode 100644
index 0000000000..67efc38785
--- /dev/null
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -0,0 +1,32 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+RPEDENDS = "libusb"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
+
+EXTRA_OECONF = " --with-drivers=all"
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
+LICENSE = "GPL"
+inherit autotools pkgconfig
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
+
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
-- 
cgit v1.2.3