From 9a05084a4d58bd67ac02ab7f591fe8bcd1931356 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Sep 2008 15:40:55 +0000
Subject: [PATCH] gphoto2: update to 2.4.2 and fix libtool 2.x issues

---
 packages/gphoto2/gphoto2_2.4.0.bb             |  2 +-
 packages/gphoto2/gphoto2_2.4.2.bb             | 14 +++++++++
 .../libgphoto2_2.1.4.bb                       |  0
 .../libgphoto2_2.1.5.bb                       |  0
 .../libgphoto2_2.1.6.bb                       |  0
 packages/gphoto2/libgphoto2_2.4.2.bb          | 31 +++++++++++++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 packages/gphoto2/gphoto2_2.4.2.bb
 rename packages/{libgphoto2 => gphoto2}/libgphoto2_2.1.4.bb (100%)
 rename packages/{libgphoto2 => gphoto2}/libgphoto2_2.1.5.bb (100%)
 rename packages/{libgphoto2 => gphoto2}/libgphoto2_2.1.6.bb (100%)
 create mode 100644 packages/gphoto2/libgphoto2_2.4.2.bb

diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb
index 6bc1a42f9e..996edb25a0 100644
--- a/packages/gphoto2/gphoto2_2.4.0.bb
+++ b/packages/gphoto2/gphoto2_2.4.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
 SECTION = "console/utils"
 LICENSE = "GPL"
-DEPENDS = "libgphoto2 popt"
+DEPENDS = "libtool libgphoto2 popt"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb
new file mode 100644
index 0000000000..996edb25a0
--- /dev/null
+++ b/packages/gphoto2/gphoto2_2.4.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libtool libgphoto2 popt"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb
similarity index 100%
rename from packages/libgphoto2/libgphoto2_2.1.4.bb
rename to packages/gphoto2/libgphoto2_2.1.4.bb
diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb
similarity index 100%
rename from packages/libgphoto2/libgphoto2_2.1.5.bb
rename to packages/gphoto2/libgphoto2_2.1.5.bb
diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb
similarity index 100%
rename from packages/libgphoto2/libgphoto2_2.1.6.bb
rename to packages/gphoto2/libgphoto2_2.1.6.bb
diff --git a/packages/gphoto2/libgphoto2_2.4.2.bb b/packages/gphoto2/libgphoto2_2.4.2.bb
new file mode 100644
index 0000000000..991f3ec759
--- /dev/null
+++ b/packages/gphoto2/libgphoto2_2.4.2.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "libtool jpeg libusb libexif"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
+
+inherit autotools pkgconfig lib_package
+
+OE_LT_RPATH_ALLOW=":${libdir}:"
+OE_LT_RPATH_ALLOW[export]="1"
+
+EXTRA_OECONF = " --with-drivers=all ac_cv_lib_ltdl_lt_dlcaller_register=yes"
+
+PACKAGES =+ "libgphotoport libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
+RDEPENDS_${PN} = "libgphoto2-camlibs"
+
+FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" 
+
+FILES_${PN} += "${libdir}/udev/*"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
-- 
2.39.5