summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-connectivity/obex/obexd_0.48.bb6
-rw-r--r--meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb5
-rw-r--r--meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb6
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex_1.5.bb6
4 files changed, 9 insertions, 14 deletions
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index 6058b04662..6096bed735 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -1,13 +1,11 @@
1SUMMARY = "OBEX Server and Client" 1SUMMARY = "OBEX Server and Client"
2# obexd was integrated into bluez5 2# obexd was integrated into bluez5
3DEPENDS = "glib-2.0 dbus bluez4 libical" 3DEPENDS = "glib-2.0 dbus libical"
4RCONFLICTS_${PN} = "bluez5" 4DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
5 5
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" 7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
8 8
9PNBLACKLIST[obexd] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
10
11SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ 9SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \
12 file://ssize_t_definition.patch \ 10 file://ssize_t_definition.patch \
13" 11"
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
index 9a63b38b48..9edceb5e49 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
7PR = "r1" 7PR = "r1"
8 8
9SECTION = "x11/gnome" 9SECTION = "x11/gnome"
10DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native" 10DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify gnome-keyring virtual/libx11 libxi intltool-native"
11 11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
12PNBLACKLIST[gnome-bluetooth] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
13 12
14inherit gnomebase gtk-icon-cache 13inherit gnomebase gtk-icon-cache
15 14
diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
index 99448d052e..c2c284e93d 100644
--- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
+++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
@@ -2,10 +2,8 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex" 5DEPENDS = "gtk+ dbus-glib imagemagick openobex"
6RCONFLICTS_${PN} = "bluez5" 6DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
7
8PNBLACKLIST[obex-data-server] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
9 7
10SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" 8SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
11SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" 9SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
index ed3d6b2318..6ac7905989 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
2Object Exchange (OBEX) protocol." 2Object Exchange (OBEX) protocol."
3HOMEPAGE = "http://openobex.triq.net" 3HOMEPAGE = "http://openobex.triq.net"
4SECTION = "libs" 4SECTION = "libs"
5DEPENDS = "virtual/libusb0 bluez4" 5DEPENDS = "virtual/libusb0"
6DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
7
6LICENSE = "GPLv2 & LGPLv2.1" 8LICENSE = "GPLv2 & LGPLv2.1"
7LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
8 file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 10 file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
9" 11"
10 12
11PNBLACKLIST[openobex] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
12
13SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ 13SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \
14 file://disable-cable-test.patch \ 14 file://disable-cable-test.patch \
15 file://libusb_crosscompile_check.patch \ 15 file://libusb_crosscompile_check.patch \