[oe-commits] Max Krummenacher : gvfs: add packageconfig for libgphoto2

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 9381fc995aa46ca97a90ab8e9ee05b1a294e19ed
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9381fc995aa46ca97a90ab8e9ee05b1a294e19ed

Author: Max Krummenacher <max.oss.09 at gmail.com>
Date:   Sat Aug  1 18:23:19 2015 +0200

gvfs: add packageconfig for libgphoto2

default to compile with libgphoto2, thus no change to old behaviour.

Signed-off-by: Max Krummenacher <max.oss.09 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
index 131c849..7ed1bb5 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -1,6 +1,6 @@
 require gvfs.inc
 
-DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf libgphoto2 intltool-native"
+DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf intltool-native"
 # optional: obexftp libcdio libimobiledevice 
 
 PR = "${INC_PR}.0"
@@ -22,8 +22,9 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun
 RDEPENDS_${PN} = "gvfs-gdu-volume-monitor"
 RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh"
 
-PACKAGECONFIG ?= "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}"
+PACKAGECONFIG ?= "libgphoto2 ${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}"
 
+PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2"
 PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \
                         --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba"
 # needs meta-filesystems