disapproval of revision '40cd64edf16241a37663807e311fba8e23f0d258'

diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
index 2b7913e..b814f9a 100644 (file)
--- a/packages/libgphoto2/libgphoto2_2.1.6.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-PR = "r5"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
@@ -12,9 +12,25 @@ LICENSE = "GPL"
 inherit autotools pkgconfig
 
 do_stage() {
-       autotools_stage_all
-}
+       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"
+