[oe-commits] org.oe.dev merge of '7a4784a76121e6cf9b4204ebe5c812e2e540767f'

[mickeyl commit]

merge of '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
     and 'b5b94ebf56fcb87ac967b302ae3570b7f59d3dc2'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: db6f45f9d0ec176762024ff3c9318cabca11dba8
ViewMTN: http://monotone.openembedded.org/revision/info/db6f45f9d0ec176762024ff3c9318cabca11dba8
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/vino/vino_2.22.2.bb
classes/cmake.bbclass
Diffs:

#
# mt diff -r7a4784a76121e6cf9b4204ebe5c812e2e540767f -rdb6f45f9d0ec176762024ff3c9318cabca11dba8
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [c7bf22a704aa46b6931b3a1de5cc783c1255d69a]
#    to [7aec3eae30fb1cc31ce0a6a602951d5408edd8c8]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	c7bf22a704aa46b6931b3a1de5cc783c1255d69a
+++ conf/distro/include/sane-srcrevs.inc	7aec3eae30fb1cc31ce0a6a602951d5408edd8c8
@@ -89,8 +89,8 @@ SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
-SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "27380"
@@ -166,7 +166,7 @@ SRCREV_pn-python-lightmediascanner = "68
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"


#
# mt diff -rb5b94ebf56fcb87ac967b302ae3570b7f59d3dc2 -rdb6f45f9d0ec176762024ff3c9318cabca11dba8
#
#
#
# add_file "packages/vino/vino_2.22.2.bb"
#  content [296d9e7dd69cfbb385a02cb1292b458634f3054b]
# 
# patch "classes/cmake.bbclass"
#  from [fd1b88d5d95f59fad2e97aac4309d906b1c5c471]
#    to [c6c4af05023abbc7b7b71bf8adf45ae3f98af0c0]
#
============================================================
--- packages/vino/vino_2.22.2.bb	296d9e7dd69cfbb385a02cb1292b458634f3054b
+++ packages/vino/vino_2.22.2.bb	296d9e7dd69cfbb385a02cb1292b458634f3054b
@@ -0,0 +1,8 @@
+DESCRIPTION = "Vino is an integrated VNC server for GNOME."
+LICENSE = "GPLv2"
+
+DEPENDS = "libgnomeui libglade gnome-keyring esound dbus-glib libxml2 gnutls gnome-vfs"
+
+inherit gnome gconf
+
+
============================================================
--- classes/cmake.bbclass	fd1b88d5d95f59fad2e97aac4309d906b1c5c471
+++ classes/cmake.bbclass	c6c4af05023abbc7b7b71bf8adf45ae3f98af0c0
@@ -5,7 +5,8 @@ cmake_do_configure() {
 
 cmake_do_configure() {
      cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
-     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST}
+     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
+     ${EXTRA_OECMAKE}
 }
 
 EXPORT_FUNCTIONS do_configure