merge of '793123b8aee6579f62157a3bbd186814b632fadf'

     and 'fb519bd271114f10438a7eb00519a410dfecab92'

4 files changed, 0 insertions, 128 deletions

diff --git a/packages/gphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb
deleted file mode 100644
index fed7c41e40..0000000000
--- a/packages/gphoto2/libgphoto2_2.1.4.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 67efc38785..0000000000
--- a/packages/gphoto2/libgphoto2_2.1.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index ad57ba8cf1..0000000000
--- a/packages/gphoto2/libgphoto2_2.1.6.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-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.0.bb b/packages/gphoto2/libgphoto2_2.4.0.bb
deleted file mode 100644
index c6f63374cc..0000000000
--- a/packages/gphoto2/libgphoto2_2.4.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
-
-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
-}
-
-