Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev

6 files changed, 71 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index eab312b999..acb7fef1b2 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8230,6 +8230,10 @@ sha256=666ba1186b2697c3a99ee943775fbc7a7aa18f3c8cc3d335a2581dea62f812bf
 md5=2dc76415b22d805cfacfcd5fb98f185c
 sha256=2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
 
+[http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-2.28.0.tar.bz2]
+md5=dad2999d8bbf88cf581fa512041d735e
+sha256=3daa3719f773cfc9fcee84766f60eab4579209978425221997120662bd621a52
+
 [http://www.boutell.com/gd/http/gd-2.0.21.tar.gz]
 md5=3134158635f5048dba99281c6b712a54
 sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
@@ -10622,6 +10626,10 @@ sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
 md5=bcc5621e09802e114c7f72a6f6172230
 sha256=68cd94664882fdab5fa781b4b8fabe1ac49db7d97bdf3aa917563439afa9b9b6
 
+[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.7.tar.bz2]
+md5=a0bd7629040735f16e510b63edf386dd
+sha256=16e21ab5387220ad885e1d27f936f3add4081d15a1039577002682be521b2c03
+
 [http://downloads.sourceforge.net/lxde/gpicview-0.1.5.tar.gz]
 md5=5c484ea089f5a6455265e1e1f472240e
 sha256=7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
@@ -15158,6 +15166,10 @@ sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
 md5=8aff5ac4ca72cba17de633078cf1612e
 sha256=2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
 
+[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.7.tar.bz2]
+md5=3c1f1b1e56214e83b97e2bc7aadba4c5
+sha256=9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f
+
 [http://kent.dl.sourceforge.net/sourceforge/gtkpod/libgpod-0.6.0.tar.gz]
 md5=b44d8aee3f6610370b6faf61770c5f3c
 sha256=a2c8c998588361d8aaa4c662a38f50db164b8b4fce4e7bc49ac445a9ac87f80f
@@ -20726,6 +20738,10 @@ sha256=bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
 md5=129f8623dc4f70188a015e3cbd7eae82
 sha256=74188aff5f2e5b77515a8cf3979199a598d58da8e4f573462b59cbf94cf1c99d
 
+[http://0pointer.de/lennart/projects/paprefs/paprefs-0.9.9.tar.gz]
+md5=0592ccb28c8f601a8fe3607b64e9f5bc
+sha256=1237939f0cea478ecd51452e817e08877e914c919239fcb63aa2471a389769a9
+
 [ftp://ftp.gnu.org/gnu/parted/parted-1.6.23.tar.gz]
 md5=7e46a32def60ea355c193d9225691742
 sha256=5144f413dcce1a0b94263ebf3730f2a2afe6a9557bf261f9d6f48c890423f4c8
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 0e1f39a7a6..c9fc16365b 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -23,7 +23,7 @@
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
 DISTRO_REVISION = "3"
-DISTRO_PR = ".4"
+DISTRO_PR = ".5"
 
 OLDEST_KERNEL ?= "2.6.16"
 
diff --git a/recipes/gnome/gconfmm_2.28.0.bb b/recipes/gnome/gconfmm_2.28.0.bb
new file mode 100644
index 0000000000..b7e57d2e59
--- /dev/null
+++ b/recipes/gnome/gconfmm_2.28.0.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "C++ bindings for GConf"
+LICENSE = "LGPLv2"
+DEPENDS = "glibmm gconf gtkmm"
+
+inherit gnome
diff --git a/recipes/gphoto2/gphoto2_2.4.7.bb b/recipes/gphoto2/gphoto2_2.4.7.bb
new file mode 100644
index 0000000000..8af31d15dc
--- /dev/null
+++ b/recipes/gphoto2/gphoto2_2.4.7.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/recipes/gphoto2/libgphoto2_2.4.7.bb b/recipes/gphoto2/libgphoto2_2.4.7.bb
new file mode 100644
index 0000000000..45d42c398c
--- /dev/null
+++ b/recipes/gphoto2/libgphoto2_2.4.7.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "libtool jpeg virtual/libusb0 libexif"
+
+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"
+
+
+
diff --git a/recipes/pulseaudio/paprefs_0.9.9.bb b/recipes/pulseaudio/paprefs_0.9.9.bb
new file mode 100644
index 0000000000..2b62bce013
--- /dev/null
+++ b/recipes/pulseaudio/paprefs_0.9.9.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog for the PulseAudio sound server"
+LICENSE = "GPLv2"
+DEPENDS = "gconfmm libglademm libcanberra gtk+ libnotify gconf pulseaudio"
+
+inherit gnome
+
+SRC_URI = "http://0pointer.de/lennart/projects/${PN}/${PN}-${PV}.tar.gz"
+
+