Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 79 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 03090351fc..d8355adbd3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8210,6 +8210,10 @@ sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
 md5=9c57dd8b89ccfeafdd2037516185f6e9
 sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
 
+[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.4.tar.bz2]
+md5=bcc5621e09802e114c7f72a6f6172230
+sha256=68cd94664882fdab5fa781b4b8fabe1ac49db7d97bdf3aa917563439afa9b9b6
+
 [http://heanet.dl.sourceforge.net/lxde/gpicview-0.1.5.tar.gz]
 md5=5c484ea089f5a6455265e1e1f472240e
 sha256=7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
@@ -11506,6 +11510,10 @@ sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
 md5=deee153b1ded5a944ea05d041d959eca
 sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
 
+[http://downloads.sourceforge.net/libexif/libexif-0.6.17.tar.bz2]
+md5=f7cf4e623a48c9a3b13f7f95f0a41015
+sha256=dceb9355b148a8ee6aa96e3dff82a06c066c81e6ab18c190c946ed3b30fc7353
+
 [http://downloads.sourceforge.net/libexif/libexif-0.6.9.tar.gz]
 md5=0aa142335a8a00c32bb6c7dbfe95fc24
 sha256=a2f309c702ee72967676d96b1a9d06806d069fde8e88076200cca6479c3d3c38
@@ -11922,6 +11930,10 @@ sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
 md5=714859617c0b616855f6906280010c5d
 sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
 
+[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.4.tar.bz2]
+md5=8aff5ac4ca72cba17de633078cf1612e
+sha256=2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
+
 [http://kent.dl.sourceforge.net/sourceforge/gtkpod/libgpod-0.6.0.tar.gz]
 md5=b44d8aee3f6610370b6faf61770c5f3c
 sha256=a2c8c998588361d8aaa4c662a38f50db164b8b4fce4e7bc49ac445a9ac87f80f
@@ -16466,6 +16478,10 @@ sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1
 md5=b0aac48e4528aa1fa2b6759f53508643
 sha256=6ae71591d0184debcafb134896577447574c8b29545af6e99f6ff09dc3448571
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2]
+md5=9d870b9947ce0618cf18445e4be33e15
+sha256=c4d69706880f274b84c8f5ef36ce955b3173e6ea3c083f724c0371096b27e738
+
 [http://kernel.org/pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2]
 md5=be6ff6fc5eb746e66a1a15629d05bedd
 sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
@@ -24841,11 +24857,4 @@ sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
 [http://heanet.dl.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
-<<<<<<< HEAD:conf/checksums.ini
-[http://davehylands.com/gumstix-wiki/gpio-event/gpio-event-2.6.21-1444-select.tar.gz]
-md5=b5cc96cba5a70e19d58534c250de67e2
-sha256=a937f4ba6b450b1330049c90e5e787490eff5bb376dbfe9099abbcdc7a8f6b6c
 
-[http://www.davehylands.com/gumstix-wiki/char-driver/char-driver-2.6.21.tar.gz]
-md5=70113b86db5dea86c282053e15f36cb7
-sha256=9a87282052a8c0807bbcb46367102f97896a1cf4fcc0d35cfe34b2e5a1456a31
diff --git a/packages/gphoto2/gphoto2_2.4.4.bb b/packages/gphoto2/gphoto2_2.4.4.bb
new file mode 100644
index 0000000000..8af31d15dc
--- /dev/null
+++ b/packages/gphoto2/gphoto2_2.4.4.bb
@@ -0,0 +1,15 @@
+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\
+           file://gphoto-popt-fixup.patch;patch=1"
+
+inherit autotools
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
diff --git a/packages/gphoto2/libgphoto2_2.4.4.bb b/packages/gphoto2/libgphoto2_2.4.4.bb
new file mode 100644
index 0000000000..d5eb039cac
--- /dev/null
+++ b/packages/gphoto2/libgphoto2_2.4.4.bb
@@ -0,0 +1,30 @@
+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
+}
+
+
diff --git a/packages/libexif/libexif_0.6.17.bb b/packages/libexif/libexif_0.6.17.bb
new file mode 100644
index 0000000000..2f896352db
--- /dev/null
+++ b/packages/libexif/libexif_0.6.17.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
+HOMEPAGE = "http://sourceforge.net/projects/libexif"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
+
+inherit autotools 
+
+do_configure_append() {
+	sed -i s:doc\ binary:binary:g Makefile
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+	autotools_stage_all
+}