[v2][PATCH 1/2] directfb: Upgrade to 1.6.3

[v2][PATCH 1/2] directfb: Upgrade to 1.6.3

[Lauren Post]

directfb: Upgrade to 1.6.3

Remove mesa patch as 1.6.3 provides compatibility with mesa

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-graphics/directfb/directfb.inc        |    3 +-
 .../recipes-graphics/directfb/directfb/mesa9.patch |   29 --------------------
 meta/recipes-graphics/directfb/directfb_1.6.1.bb   |   27 ------------------
 meta/recipes-graphics/directfb/directfb_1.6.3.bb   |   26 ++++++++++++++++++
 4 files changed, 27 insertions(+), 58 deletions(-)
 delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch
 delete mode 100644 meta/recipes-graphics/directfb/directfb_1.6.1.bb
 create mode 100755 meta/recipes-graphics/directfb/directfb_1.6.3.bb

diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 7295c35..60b12f7 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,8 +14,7 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
 INC_PR = "r0"
 
 SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
-           file://configurefix.patch \
-           file://mesa9.patch"
+           file://configurefix.patch"
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch b/meta/recipes-graphics/directfb/directfb/mesa9.patch
deleted file mode 100644
index 43fd5c2..0000000
--- a/meta/recipes-graphics/directfb/directfb/mesa9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch from upstream to fix build against Mesa 9.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001
-From: Andreas Shimokawa <andi@directfb.org>
-Date: Wed, 24 Oct 2012 18:01:15 +0200
-Subject: [PATCH] mesa: fix compatibility with mesa 9.0
-
----
- systems/mesa/mesa_surface_pool.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systems/mesa/mesa_surface_pool.c b/systems/mesa/mesa_surface_pool.c
-index 0a588bb..bfb5ff3 100644
---- a/systems/mesa/mesa_surface_pool.c
-+++ b/systems/mesa/mesa_surface_pool.c
-@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool       *pool,
-      alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w, surface->config.size.h, GBM_BO_FORMAT_ARGB8888,
-                                                                             GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING );
-      alloc->handle = gbm_bo_get_handle( alloc->bo ).u32;
--     alloc->pitch  = gbm_bo_get_pitch( alloc->bo );
-+     alloc->pitch  = gbm_bo_get_stride( alloc->bo );
- 
-      alloc->image  = eglCreateImageKHR( mesa->dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL );
- 
--- 
-1.7.9.5
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
deleted file mode 100644
index 1230d12..0000000
--- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require directfb.inc
-
-RV = "1.6-0"
-PR = "${INC_PR}.2"
-
-DEPENDS += "sysfsutils"
-
-SRC_URI += "file://fix-compilation-with-zlib.patch \
-            file://rename-no-instrument-function-macro.patch \
-            file://fixsepbuild.patch"
-
-EXTRA_OECONF = "\
-  --enable-freetype=yes \
-  --enable-zlib \
-  --with-gfxdrivers=none \
-  --disable-sdl \
-  --disable-vnc \
-  --disable-x11 \
-  --disable-imlib2 \
-  --disable-mesa \
-"
-
-LEAD_SONAME = "libdirectfb-1.6.so.0"
-
-SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
-SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
-
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.3.bb b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
new file mode 100755
index 0000000..277e9a9
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
@@ -0,0 +1,26 @@
+require directfb.inc
+
+RV = "1.6-0"
+PR = "${INC_PR}.2"
+
+DEPENDS += "sysfsutils"
+
+SRC_URI += "file://fix-compilation-with-zlib.patch \
+            file://rename-no-instrument-function-macro.patch \
+            file://fixsepbuild.patch"
+
+EXTRA_OECONF = "\
+  --enable-freetype=yes \
+  --enable-zlib \
+  --with-gfxdrivers=none \
+  --disable-sdl \
+  --disable-vnc \
+  --disable-x11 \
+  --disable-imlib2 \
+  --disable-mesa \
+"
+
+LEAD_SONAME = "libdirectfb-1.6.so.0"
+
+SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906"
+SRC_URI[sha256sum] = "7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70"
-- 
1.7.9.5

[v2][PATCH 2/2] directfb: add fusion patch for hangs on exit with

[Lauren Post]

directfb: add fusion patch for hangs on exit with
 
following tests:   direct_test, fusion_skirmish

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-graphics/directfb/directfb.inc        |    3 +-
 .../directfb/directfb/fusion.patch                 |   36 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch

diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 60b12f7..a23209f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,7 +14,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
 INC_PR = "r0"
 
 SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
-           file://configurefix.patch"
+           file://configurefix.patch \
+           file://fusion.patch"
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch
new file mode 100755
index 0000000..1f81a67
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
@@ -0,0 +1,36 @@
+directfb: Fix for hangs in direct_test, fusion_skirmish on exit
+
+Upstream-Status: Pending
+Signed-off-by: Lauren Post <lauren.post@freescale.com>
+
+--- a/lib/fusion/fusion.c	2013-01-18 22:57:11.000000000 +0800
++++ b/lib/fusion/fusion.c	2013-07-04 10:42:56.502699119 +0800
+@@ -2853,9 +2853,14 @@
+           direct_mutex_lock( &world->event_dispatcher_mutex );
+ 
+           while (1) {
+-               if (!world->event_dispatcher_buffers)
++               if (!world->event_dispatcher_buffers){
+                     direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
+-
++                    if (world->dispatch_stop) {
++                         D_DEBUG_AT( Fusion_Main_Dispatch, "  -> IGNORING (dispatch_stop!)\n" );
++                         direct_mutex_unlock( &world->event_dispatcher_mutex );
++                         return NULL;
++                    }
++               }
+                buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
+                D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
+ 
+@@ -2872,6 +2877,11 @@
+ //D_INFO("waiting...\n");
+                     D_ASSERT( buf->read_pos == buf->write_pos );
+                     direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
++		      if (world->dispatch_stop) {
++                         D_DEBUG_AT( Fusion_Main_Dispatch, "  -> IGNORING (dispatch_stop!)\n" );
++                         direct_mutex_unlock( &world->event_dispatcher_mutex );
++                         return NULL;
++                    }
+                }
+ 
+                buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
-- 
1.7.9.5

Re: [v2][PATCH 1/2] directfb: Upgrade to 1.6.3

[Andre Draszik]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

Hi,

On 19 Aug 2013 20:24, "Lauren Post" <lauren.post@freescale.com> wrote:
>
> directfb: Upgrade to 1.6.3
>
> [...]
>  delete mode 100644 meta/recipes-graphics/directfb/directfb_1.6.1.bb
>  create mode 100755 meta/recipes-graphics/directfb/directfb_1.6.3.bb

Not sure you really wanted the mode change.

Cheers,
André

[-- Attachment #2: Type: text/html, Size: 586 bytes --]

[PATCH 00/11] Change all bluez4 references to virtual/bluez

[Lauren Post]

This group of patches support the change of hardcoded bluez4 to
virtual/bluez so that the upgrade to bluez5 is easier.

This group of patches must be applied together.  Bluez4 is still
default provider but it will be easier to override and provide bluez5
support in future.

Note there is one related patch for openobex in meta-oe.

Lauren Post (11):
  bluez4:  Add virtual/bluez as provider
  conman:  Change RDEPENDS on bluez4 to virtual/bluez
  libpcap:  Change PACKAGECONFIG from bluez4 to virutal/bluez
  neard:  Change RRECOMMENDS from bluez4 to virtual/bluez
  ofono:  Change DEPENDS from bluez4 to virtual/bluez
  pulseaudio:  Change PACKAGECONFIG from bluez4 to virtual/bluez
  gst-plugin-bluetooth:  Change DEPENDS from bluez4 to virtual/bluez
  gstreamer1.0-plugins-bad:  Change PACKAGECONFIG from bluez4 to
    virtual/bluez
  bluez-hcidump:  Change depends from bluez4 to virtual/bluez
  default-providers:  Add virtual/bluez PROVIDER support to bluez4
  package-group:  Change bluez4 to virtual/bluez

 meta/conf/distro/include/default-providers.inc     |    2 +-
 .../bluez/bluez-hcidump_2.5.bb                     |    2 +-
 meta/recipes-connectivity/bluez/bluez4.inc         |    4 ++++
 .../bluez/gst-plugin-bluetooth_4.101.bb            |    2 +-
 meta/recipes-connectivity/connman/connman.inc      |    4 ++--
 meta/recipes-connectivity/libpcap/libpcap.inc      |    2 +-
 meta/recipes-connectivity/neard/neard.inc          |    2 +-
 meta/recipes-connectivity/ofono/ofono.inc          |    2 +-
 .../packagegroups/packagegroup-base.bb             |    2 +-
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |    2 +-
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |    2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    4 +++-
 12 files changed, 18 insertions(+), 12 deletions(-)

-- 
1.7.9.5

[PATCH 01/11] bluez4: Add virtual/bluez as provider

[Lauren Post]

This will make it easier to allow bluez5 support later
Without this change too many components depend directly on bluez4
If these components depend on virtual/bluez then easier to upgrade.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-connectivity/bluez/bluez4.inc |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 0827005..dce9642 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,9 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
                     file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
                     file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
+
 DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
 RDEPENDS_${PN}-dev = "bluez-hcidump"
 
+PROVIDES += "virtual/bluez"
+RPROVIDES_${PN} += "virtual/bluez"
+
 PACKAGECONFIG ??= "\
     ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
     ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
-- 
1.7.9.5

Re: [PATCH 01/11] bluez4: Add virtual/bluez as provider

[Burton, Ross]

Surely there should also be a patch to do the same for bluez5 so the
switch can be compile-tested?

Ross

On 26 March 2014 14:27, Lauren Post <lauren.post@freescale.com> wrote:
> This will make it easier to allow bluez5 support later
> Without this change too many components depend directly on bluez4
> If these components depend on virtual/bluez then easier to upgrade.
>
> Signed-off-by: Lauren Post <lauren.post@freescale.com>
> ---
>  meta/recipes-connectivity/bluez/bluez4.inc |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
> index 0827005..dce9642 100644
> --- a/meta/recipes-connectivity/bluez/bluez4.inc
> +++ b/meta/recipes-connectivity/bluez/bluez4.inc
> @@ -7,9 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
>                      file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
>                      file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
>                      file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> +
>  DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
>  RDEPENDS_${PN}-dev = "bluez-hcidump"
>
> +PROVIDES += "virtual/bluez"
> +RPROVIDES_${PN} += "virtual/bluez"
> +
>  PACKAGECONFIG ??= "\
>      ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
>      ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
> --
> 1.7.9.5
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 01/11] bluez4: Add virtual/bluez as provider

[Lauren Post]

Yes, I am working on it with all the feedback for other patches.  I missed it on last batch but before I send it going to add all the other changes in v2 version.

I'll review with Otavio before I resubmit and test with both bluez4 and bluez5.

Lauren

-----Original Message-----
From: Burton, Ross [mailto:ross.burton@intel.com] 
Sent: Wednesday, March 26, 2014 12:04 PM
To: Post Lauren-RAA013
Cc: OE-core
Subject: Re: [OE-core] [PATCH 01/11] bluez4: Add virtual/bluez as provider

Surely there should also be a patch to do the same for bluez5 so the switch can be compile-tested?

Ross

[PATCH 02/11] conman: Change RDEPENDS on bluez4 to virtual/bluez

[Lauren Post]

This will allow seamless upgrade to bluez5 later

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-connectivity/connman/connman.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index b3147c9..694f480 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -41,7 +41,7 @@ PACKAGECONFIG ??= "wispr \
 # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
 
 PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
+PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, virtual/bluez"
 PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
 PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
 PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
@@ -113,7 +113,7 @@ RPROVIDES_${PN} = "\
 
 RDEPENDS_${PN} = "\
 	dbus \
-	${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
+	${@base_contains('PACKAGECONFIG', 'bluetooth', 'virtual/bluez', '', d)} \
 	${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
 	${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
 	xuser-account \
-- 
1.7.9.5

[PATCH 03/11] libpcap: Change PACKAGECONFIG from bluez4 to virutal/bluez

[Lauren Post]

This will allow easy transition to upgrade to bluez5

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-connectivity/libpcap/libpcap.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 3a08afe..3a67ecc 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
 DEPENDS = "flex-native bison-native libnl"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,virtual/bluez"
 PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
 
 INC_PR = "r5"
-- 
1.7.9.5

[PATCH 04/11] neard: Change RRECOMMENDS from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-connectivity/neard/neard.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 1dde1da..184f371 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -47,7 +47,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
 
 # Bluez & Wifi are not mandatory except for handover
 RRECOMMENDS_${PN} = "\
-                     ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+                     ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'virtual/bluez', '', d)} \
                      ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
                     "
 
-- 
1.7.9.5

[PATCH 05/11] ofono: Change DEPENDS from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-connectivity/ofono/ofono.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 3972e06..ff34265 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 inherit autotools pkgconfig update-rc.d systemd
 
-DEPENDS  = "dbus glib-2.0 udev mobile-broadband-provider-info ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
+DEPENDS  = "dbus glib-2.0 udev mobile-broadband-provider-info ${@base_contains('DISTRO_FEATURES', 'bluetooth','virtual/bluez', '', d)}"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
-- 
1.7.9.5

[PATCH 06/11] pulseaudio: Change PACKAGECONFIG from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2176731..59148c7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -31,10 +31,12 @@ EXTRA_OECONF = "\
                 ac_cv_header_valgrind_memcheck_h=no \
 "
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'virtual/bluez', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,virtual/bluez sbc"
 PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
 PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
 PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
-- 
1.7.9.5

Re: [PATCH 06/11] pulseaudio: Change PACKAGECONFIG from bluez4 to virtual/bluez

[Burton, Ross]

On 26 March 2014 14:28, Lauren Post <lauren.post@freescale.com> wrote:
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'virtual/bluez', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +
> +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,virtual/bluez sbc"

I'm pretty sure you either didn't look at this patch, or didn't
understand what it's doing.

As it's clearly been untested, I'm NAKing the entire series.

Ross

[PATCH 07/11] gst-plugin-bluetooth: Change DEPENDS from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../bluez/gst-plugin-bluetooth_4.101.bb            |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
index f2dc0da..5135eff 100644
--- a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
+++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
@@ -6,7 +6,7 @@ PR = "r1"
 SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
 SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
 
-DEPENDS = "bluez4 gst-plugins-base"
+DEPENDS = "virtual/bluez gst-plugins-base"
 
 EXTRA_OECONF = "\
   --enable-gstreamer \
-- 
1.7.9.5

Re: [PATCH 07/11] gst-plugin-bluetooth: Change DEPENDS from bluez4 to virtual/bluez

[Burton, Ross]

On 26 March 2014 14:28, Lauren Post <lauren.post@freescale.com> wrote:
> -DEPENDS = "bluez4 gst-plugins-base"
> +DEPENDS = "virtual/bluez gst-plugins-base"

gst-plugin-bluetooth is literally a rebuild of bluez with
--enable-gstreamer where everything else gets deleted.  This is pretty
vile and it should be a PACKAGECONFIG option, but in this case using
virtual/bluez is incorrect.

Ross

[PATCH 08/11] gstreamer1.0-plugins-bad: Change PACKAGECONFIG from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |    2 +-
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 08440a2..aa1fe61 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -41,7 +41,7 @@ PACKAGECONFIG[bz2]             = "--enable-bz2,--disable-bz2,bzip2"
 PACKAGECONFIG[fluidsynth]      = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
 PACKAGECONFIG[schroedinger]    = "--enable-schro,--disable-schro,schroedinger"
 PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
-PACKAGECONFIG[bluez]           = "--enable-bluez,--disable-bluez,bluez4"
+PACKAGECONFIG[bluez]           = "--enable-bluez,--disable-bluez,virtual/bluez"
 PACKAGECONFIG[rsvg]            = "--enable-rsvg,--disable-rsvg,librsvg"
 
 # these plugins have not been ported to 1.0 (yet):
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index e1a5904..8f37be8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
 
 SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce"
 
-PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4"
+PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,virtual/bluez"
 PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
 PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
 
-- 
1.7.9.5

Re: [PATCH 08/11] gstreamer1.0-plugins-bad: Change PACKAGECONFIG from bluez4 to virtual/bluez

[Burton, Ross]

On 26 March 2014 14:28, Lauren Post <lauren.post@freescale.com> wrote:
> This allows easy transition to bluez5 in future

I'd say that whilst you're editing this file the duplication should be
removed, but gst-plugins-bad has this in configure.ac:

  PKG_CHECK_MODULES([BLUEZ], [bluez < 5.0],

So no, I don't think this will work.

Ross

[PATCH 09/11] bluez-hcidump: Change depends from bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../bluez/bluez-hcidump_2.5.bb                     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
index 5c1f476..4cbc3ec 100644
--- a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
+++ b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bl
 and displays the commands, events and data in a human-readable form."
 
 SECTION = "console"
-DEPENDS = "bluez4"
+DEPENDS = "virtual/bluez"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
-- 
1.7.9.5

Re: [PATCH 09/11] bluez-hcidump: Change depends from bluez4 to virtual/bluez

[Burton, Ross]

On 26 March 2014 14:28, Lauren Post <lauren.post@freescale.com> wrote:
> -DEPENDS = "bluez4"
> +DEPENDS = "virtual/bluez"

bluez-hcidump is integrated into bluez5, so this should remain as a
DEPENDS on bluez4 and bluez5 should provide bluez-hcidump.

Ross

[PATCH 10/11] default-providers: Add virtual/bluez PROVIDER support to bluez4

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 meta/conf/distro/include/default-providers.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 419ffcd..5c51e4b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -42,6 +42,6 @@ PREFERRED_PROVIDER_make ?= "make"
 PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
 # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
 # on this rather strange entry.
-PREFERRED_PROVIDER_bluez4 ?= "bluez4"
+PREFERRED_PROVIDER_virtual/bluez ?= "bluez4"
 # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
 PREFERRED_PROVIDER_ltp ?= "ltp"
-- 
1.7.9.5

Re: [PATCH 10/11] default-providers: Add virtual/bluez PROVIDER support to bluez4

[Burton, Ross]

On 26 March 2014 14:28, Lauren Post <lauren.post@freescale.com> wrote:
>  # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
>  # on this rather strange entry.
> -PREFERRED_PROVIDER_bluez4 ?= "bluez4"
> +PREFERRED_PROVIDER_virtual/bluez ?= "bluez4"

Pretty sure you'll want to keep this as it is due to the bug referred to.

Ross

[PATCH 11/11] package-group: Change bluez4 to virtual/bluez

[Lauren Post]

This allows easy transition to bluez5 in future

Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 .../packagegroups/packagegroup-base.bb             |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 368c318..d920082 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -210,7 +210,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
 
 SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
 RDEPENDS_packagegroup-base-bluetooth = "\
-    bluez4 \
+    virtual/bluez \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
     "
 
-- 
1.7.9.5

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2572 bytes --]

On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
> This group of patches support the change of hardcoded bluez4 to
> virtual/bluez so that the upgrade to bluez5 is easier.
> 
> This group of patches must be applied together.  Bluez4 is still
> default provider but it will be easier to override and provide bluez5
> support in future.
> 
> Note there is one related patch for openobex in meta-oe.

virtual/* still doesn't work correctly in runtime variables, use
VIRTUAL-RUNTIME_bluez variable.

Last time I've asked for bluez4->bluez5 upgrade path fix on target I was
told that it's not supported and bluez5 isn't drop-in replacement for
bluez4 (yet), did that change already?

> Lauren Post (11):
>   bluez4:  Add virtual/bluez as provider
>   conman:  Change RDEPENDS on bluez4 to virtual/bluez
>   libpcap:  Change PACKAGECONFIG from bluez4 to virutal/bluez
>   neard:  Change RRECOMMENDS from bluez4 to virtual/bluez
>   ofono:  Change DEPENDS from bluez4 to virtual/bluez
>   pulseaudio:  Change PACKAGECONFIG from bluez4 to virtual/bluez
>   gst-plugin-bluetooth:  Change DEPENDS from bluez4 to virtual/bluez
>   gstreamer1.0-plugins-bad:  Change PACKAGECONFIG from bluez4 to
>     virtual/bluez
>   bluez-hcidump:  Change depends from bluez4 to virtual/bluez
>   default-providers:  Add virtual/bluez PROVIDER support to bluez4
>   package-group:  Change bluez4 to virtual/bluez
> 
>  meta/conf/distro/include/default-providers.inc     |    2 +-
>  .../bluez/bluez-hcidump_2.5.bb                     |    2 +-
>  meta/recipes-connectivity/bluez/bluez4.inc         |    4 ++++
>  .../bluez/gst-plugin-bluetooth_4.101.bb            |    2 +-
>  meta/recipes-connectivity/connman/connman.inc      |    4 ++--
>  meta/recipes-connectivity/libpcap/libpcap.inc      |    2 +-
>  meta/recipes-connectivity/neard/neard.inc          |    2 +-
>  meta/recipes-connectivity/ofono/ofono.inc          |    2 +-
>  .../packagegroups/packagegroup-base.bb             |    2 +-
>  .../gstreamer/gstreamer1.0-plugins-bad.inc         |    2 +-
>  .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |    2 +-
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    4 +++-
>  12 files changed, 18 insertions(+), 12 deletions(-)
> 
> -- 
> 1.7.9.5
> 
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Lauren Post]

On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
> This group of patches support the change of hardcoded bluez4 to 
> virtual/bluez so that the upgrade to bluez5 is easier.
> 
> This group of patches must be applied together.  Bluez4 is still 
> default provider but it will be easier to override and provide bluez5 
> support in future.
> 

> virtual/* still doesn't work correctly in runtime variables, use VIRTUAL-RUNTIME_bluez variable.

> Last time I've asked for bluez4->bluez5 upgrade path fix on target I was told that it's not supported and
> uez5 isn't drop-in replacement for
> bluez4 (yet), did that change already?

We are using bluez5.8 and have bbappends for all these components I patched.  I just thought it would be easier to upstream rather than maintain all these bbappends.  

I missed the bluez5 change to virtual/bluez so will submit that once I rebuild with bluez5 as preferred provider on master. 

Lauren

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Otavio Salvador]

Hello Martin,

On Wed, Mar 26, 2014 at 11:51 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
>> This group of patches support the change of hardcoded bluez4 to
>> virtual/bluez so that the upgrade to bluez5 is easier.
>>
>> This group of patches must be applied together.  Bluez4 is still
>> default provider but it will be easier to override and provide bluez5
>> support in future.
>>
>> Note there is one related patch for openobex in meta-oe.
>
> virtual/* still doesn't work correctly in runtime variables, use
> VIRTUAL-RUNTIME_bluez variable.
...

Those patches are for /depends/. Did I miss any runtime dependency here?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

On Wed, Mar 26, 2014 at 12:07:13PM -0300, Otavio Salvador wrote:
> Hello Martin,
> 
> On Wed, Mar 26, 2014 at 11:51 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
> >> This group of patches support the change of hardcoded bluez4 to
> >> virtual/bluez so that the upgrade to bluez5 is easier.
> >>
> >> This group of patches must be applied together.  Bluez4 is still
> >> default provider but it will be easier to override and provide bluez5
> >> support in future.
> >>
> >> Note there is one related patch for openobex in meta-oe.
> >
> > virtual/* still doesn't work correctly in runtime variables, use
> > VIRTUAL-RUNTIME_bluez variable.
> ...
> 
> Those patches are for /depends/. Did I miss any runtime dependency here?

yes, in 11/11 4/11 2/11 and 1/11

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Otavio Salvador]

Hello Martin,

On Wed, Mar 26, 2014 at 12:35 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Mar 26, 2014 at 12:07:13PM -0300, Otavio Salvador wrote:
>> On Wed, Mar 26, 2014 at 11:51 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
>> >> This group of patches support the change of hardcoded bluez4 to
>> >> virtual/bluez so that the upgrade to bluez5 is easier.
>> >>
>> >> This group of patches must be applied together.  Bluez4 is still
>> >> default provider but it will be easier to override and provide bluez5
>> >> support in future.
>> >>
>> >> Note there is one related patch for openobex in meta-oe.
>> >
>> > virtual/* still doesn't work correctly in runtime variables, use
>> > VIRTUAL-RUNTIME_bluez variable.
>> ...
>>
>> Those patches are for /depends/. Did I miss any runtime dependency here?
>
> yes, in 11/11 4/11 2/11 and 1/11

Oh; I missed those indeed.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Chris Larson]

[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]

On Wed, Mar 26, 2014 at 7:51 AM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Wed, Mar 26, 2014 at 09:27:54AM -0500, Lauren Post wrote:
> > This group of patches support the change of hardcoded bluez4 to
> > virtual/bluez so that the upgrade to bluez5 is easier.
> >
> > This group of patches must be applied together.  Bluez4 is still
> > default provider but it will be easier to override and provide bluez5
> > support in future.
> >
> > Note there is one related patch for openobex in meta-oe.
>
> virtual/* still doesn't work correctly in runtime variables, use
> VIRTUAL-RUNTIME_bluez variable.
>
> Last time I've asked for bluez4->bluez5 upgrade path fix on target I was
> told that it's not supported and bluez5 isn't drop-in replacement for
> bluez4 (yet), did that change already?


Afaik libbluetooth is API compatible, but the dbus api isn't. I haven't
done much runtime testing, though. So I don't think virtual/bluez is an
appropriate name given they aren't 100% compatible bluetooth implmentations
across the board. In meta-mentor, we moved to a combination of two
virtual-runtimes (for flexibility, to facilitate replacement not just with
bluez5, but also potentially with a third party implementation, two
virtual-runtimes, one for hardware support, one for the userland bluetooth
stack, (and potentially others in the future)) with a virtual/libbluetooth
build virtual, and then you need to ensure obexd/hcidump are left out of
the build, since they were merged into bluez5.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 2102 bytes --]

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Otavio Salvador]

Hello Chris,

On Wed, Mar 26, 2014 at 12:40 PM, Chris Larson <clarson@kergoth.com> wrote:
>> Last time I've asked for bluez4->bluez5 upgrade path fix on target I was
>> told that it's not supported and bluez5 isn't drop-in replacement for
>> bluez4 (yet), did that change already?
>
> Afaik libbluetooth is API compatible, but the dbus api isn't. I haven't done
> much runtime testing, though. So I don't think virtual/bluez is an
> appropriate name given they aren't 100% compatible bluetooth implmentations
> across the board. In meta-mentor, we moved to a combination of two
> virtual-runtimes (for flexibility, to facilitate replacement not just with
> bluez5, but also potentially with a third party implementation, two
> virtual-runtimes, one for hardware support, one for the userland bluetooth
> stack, (and potentially others in the future)) with a virtual/libbluetooth
> build virtual, and then you need to ensure obexd/hcidump are left out of the
> build, since they were merged into bluez5.

I did a look in meta-mentor and I think the interesting commit is:

http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/commit/?id=1444d8b0d3617bea503e498150e558abe5b20114

and a blog post about the API changes:

http://www.bluez.org/bluez-5-api-introduction-and-porting-guide/

and an issue in Fedora, which might help in the migration:

https://fedoraproject.org/wiki/Changes/Bluez5

I don't know if someone is tracking the packages which uses the D-Bus
API of BlueZ to be check if there are available patches for it.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/11] Change all bluez4 references to virtual/bluez

[Burton, Ross]

On 26 March 2014 16:33, Otavio Salvador <otavio@ossystems.com.br> wrote:
> I don't know if someone is tracking the packages which uses the D-Bus
> API of BlueZ to be check if there are available patches for it.

So the big problem is PulseAudio.  It finally supports Bluez5 with the
latest release but migrating to Bluez5 right now means a regression in
bluetooth headset support, IIRC.

Ross