diff options
author | Max Krummenacher <max.oss.09@gmail.com> | 2015-08-01 18:23:19 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 11:38:46 +0200 |
commit | e063a4f3bde0633575aabe9ce25777d970b272f0 (patch) | |
tree | fe743405ed8e46f28f74e99fd424e013ba2ea1d1 /meta-gnome | |
parent | 06767ed98d9c910129ad33c070d42e2f658b5e70 (diff) | |
download | meta-openembedded-e063a4f3bde0633575aabe9ce25777d970b272f0.tar.gz |
gvfs: add packageconfig for libgphoto2
default to compile with libgphoto2, thus no change to old behaviour.
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 5 |
1 files 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 131c84948..7ed1bb5e2 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 @@ | |||
1 | require gvfs.inc | 1 | require gvfs.inc |
2 | 2 | ||
3 | DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf libgphoto2 intltool-native" | 3 | DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf intltool-native" |
4 | # optional: obexftp libcdio libimobiledevice | 4 | # optional: obexftp libcdio libimobiledevice |
5 | 5 | ||
6 | PR = "${INC_PR}.0" | 6 | PR = "${INC_PR}.0" |
@@ -22,8 +22,9 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun | |||
22 | RDEPENDS_${PN} = "gvfs-gdu-volume-monitor" | 22 | RDEPENDS_${PN} = "gvfs-gdu-volume-monitor" |
23 | RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" | 23 | RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" |
24 | 24 | ||
25 | PACKAGECONFIG ?= "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}" | 25 | PACKAGECONFIG ?= "libgphoto2 ${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}" |
26 | 26 | ||
27 | PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" | ||
27 | PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \ | 28 | PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \ |
28 | --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba" | 29 | --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba" |
29 | # needs meta-filesystems | 30 | # needs meta-filesystems |