gphoto2: update to 2.4.2 and fix libtool 2.x issues

6 files changed, 143 insertions, 1 deletions

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/gphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb
new file mode 100644
index 0000000000..fed7c41e40
--- /dev/null
+++ b/packages/gphoto2/libgphoto2_2.1.4.bb
@@ -0,0 +1,29 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
+
+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
+}
diff --git a/packages/gphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb
new file mode 100644
index 0000000000..67efc38785
--- /dev/null
+++ b/packages/gphoto2/libgphoto2_2.1.5.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
+}
diff --git a/packages/gphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb
new file mode 100644
index 0000000000..ad57ba8cf1
--- /dev/null
+++ b/packages/gphoto2/libgphoto2_2.1.6.bb
@@ -0,0 +1,36 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+RPEDENDS = "libusb"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+PR = "r6"
+
+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
+}
+PACKAGES =+ "libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/"
+RDEPENDS_libgphoto2 = "libgphoto2-camlibs"
+
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
+}
+
+