summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-10-30 15:59:25 +0800
committerKhem Raj <raj.khem@gmail.com>2018-11-02 10:05:06 -0700
commitfae12cab32703ee68f116beef9570ceddb5a6bc4 (patch)
tree502abc56e28f151e6c7609a9fcbababb1c6e99de
parent31d701261fb70336ccf04713e0022b64965a9687 (diff)
downloadmeta-openembedded-fae12cab32703ee68f116beef9570ceddb5a6bc4.tar.gz
gvfs: 1.36.2 -> 1.39.1
Upgrade gvfs from 1.36.2 to 1.39.1. * autotools has been removed, use meson instead * add packageconfigs dnssd and logind * disable options bluray, goa, google and nfs Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb (renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb)44
1 files changed, 23 insertions, 21 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb
index 1e8f8d180..ca1eb6aa7 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb
@@ -2,24 +2,25 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem"
2LICENSE = "LGPLv2" 2LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" 3LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
4 4
5GNOMEBASEBUILDCLASS = "meson"
5inherit gnome bash-completion gettext 6inherit gnome bash-completion gettext
6 7
7DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native" 8DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native"
8 9
9SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" 10SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
10 11
11SRC_URI[archive.md5sum] = "10b84073fe5f3d540abd9d36ed342b37" 12SRC_URI[archive.md5sum] = "4c68899cfd80d57a153771534193bb9a"
12SRC_URI[archive.sha256sum] = "c4e279a33dd9cd208135e8bfc4788ceaf264c61a24a85255f6696a934a0101f7" 13SRC_URI[archive.sha256sum] = "6e7213570389b17b67433695f515f3b17705ba976168a4c8828fc177cce50223"
13 14
14do_configure_prepend() {
15 # make automake happy..
16 touch ${S}/ABOUT-NLS
17}
18 15
19EXTRA_OECONF = " \ 16EXTRA_OEMESON = " \
20 --disable-gdu \ 17 -Dbluray=false \
21 --enable-udisks2 \ 18 -Dgdu=false \
22 --disable-documentation \ 19 -Dgoa=false \
20 -Dgoogle=false \
21 -Dnfs=false \
22 -Dudisks2=true \
23 -Ddocumentation=false \
23" 24"
24 25
25PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" 26PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
@@ -45,21 +46,22 @@ RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh"
45 46
46PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 47PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
47 48
48PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist" 49PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist"
49PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive" 50PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive"
50PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi" 51PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi"
51PACKAGECONFIG[gcr] = "--enable-gcr, --disable-gcr, gcr" 52PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
52PACKAGECONFIG[http] = "--enable-http, --disable-http, libsoup-2.4" 53PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4"
53PACKAGECONFIG[libmtp] = "--enable-libmtp, --disable-libmtp, libmtp" 54PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp"
54PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" 55PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd"
55PACKAGECONFIG[samba] = "--enable-samba, --disable-samba, samba" 56PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2"
56PACKAGECONFIG[systemd] = "--with-systemduserunitdir=${systemd_user_unitdir},--without-systemduserunitdir,systemd" 57PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba"
58PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd"
57 59
58# needs meta-filesystems 60# needs meta-filesystems
59PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse" 61PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse"
60 62
61# libcdio-paranoia recipe doesn't exist yet 63# libcdio-paranoia recipe doesn't exist yet
62PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio-paranoia" 64PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
63 65
64# Fix up permissions on polkit rules.d to work with rpm4 constraints 66# Fix up permissions on polkit rules.d to work with rpm4 constraints
65do_install_append() { 67do_install_append() {