Patchwork [v2] weston : refactor to identify EGL, cairoglesv2 support

login
register
mail settings
Submitter Otavio Salvador
Date March 28, 2014, 2:02 p.m.
Message ID <1396015357-27637-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/69581/
State New
Headers show

Comments

Otavio Salvador - March 28, 2014, 2:02 p.m.
From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>

Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Valentin Popa - March 28, 2014, 3:32 p.m.
On 03/28/2014 04:02 PM, Otavio Salvador wrote:
> From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>
> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb
> index e0c354d..5213166 100644
> --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
> @@ -23,13 +23,12 @@ EXTRA_OECONF = "--enable-setuid-install \
>                   --enable-simple-clients \
>                   --enable-clients \
>                   --enable-demo-clients-install \
> -                --disable-simple-egl-clients \
>                   --disable-libunwind \
>                   --disable-rpi-compositor \
>                   --disable-rdp-compositor"
>   
>   
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
>                      ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
>                      ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
>                     "
> @@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev way
>   # Weston on KMS
>   PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
>   # Weston on Wayland (nested Weston)
> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl --disable-wayland-compositor,virtual/mesa"
> +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
>   # Weston on X11
>   PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
>   # Headless Weston
> @@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
>   PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
>   # VA-API desktop recorder
>   PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
> +# Weston with EGL support
> +PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
> +# Weston with cairo glesv2 support
> +PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
>   
>   do_install_append() {
>   	# Weston doesn't need the .la files to load modules, so wipe them

Looks good to me.
Sorry Otavio for the delay introduced by the discussions. Hope it will 
be merged quickly and get your issue solved :)
Thanks!
Otavio Salvador - March 28, 2014, 3:37 p.m.
On Fri, Mar 28, 2014 at 12:32 PM, Valentin Popa <valentin.popa@intel.com> wrote:
> On 03/28/2014 04:02 PM, Otavio Salvador wrote:
>>
>> From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>>
>> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>   meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++---
>>   1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb
>> b/meta/recipes-graphics/wayland/weston_1.4.0.bb
>> index e0c354d..5213166 100644
>> --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
>> +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
>> @@ -23,13 +23,12 @@ EXTRA_OECONF = "--enable-setuid-install \
>>                   --enable-simple-clients \
>>                   --enable-clients \
>>                   --enable-demo-clients-install \
>> -                --disable-simple-egl-clients \
>>                   --disable-libunwind \
>>                   --disable-rpi-compositor \
>>                   --disable-rdp-compositor"
>>     -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland',
>> 'kms fbdev wayland', '', d)} \
>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms
>> fbdev wayland egl', '', d)} \
>>                      ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '',
>> d)} \
>>                      ${@base_contains('DISTRO_FEATURES', 'pam', 'launch',
>> '', d)} \
>>                     "
>> @@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES',
>> 'wayland', 'kms fbdev way
>>   # Weston on KMS
>>   PACKAGECONFIG[kms] =
>> "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa
>> mtdev"
>>   # Weston on Wayland (nested Weston)
>> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl
>> --disable-wayland-compositor,virtual/mesa"
>> +PACKAGECONFIG[wayland] =
>> "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
>>   # Weston on X11
>>   PACKAGECONFIG[x11] =
>> "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb
>> libxcb libxcursor cairo"
>>   # Headless Weston
>> @@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] =
>> "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
>>   PACKAGECONFIG[launch] =
>> "--enable-weston-launch,--disable-weston-launch,libpam drm"
>>   # VA-API desktop recorder
>>   PACKAGECONFIG[vaapi] =
>> "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
>> +# Weston with EGL support
>> +PACKAGECONFIG[egl] = "--enable-egl
>> --enable-simple-egl-clients,--disable-egl
>> --disable-simple-egl-clients,virtual/egl"
>> +# Weston with cairo glesv2 support
>> +PACKAGECONFIG[cairo-glesv2] =
>> "--with-cairo-glesv2,--with-cairo=image,cairo"
>>     do_install_append() {
>>         # Weston doesn't need the .la files to load modules, so wipe them
>
>
> Looks good to me.
> Sorry Otavio for the delay introduced by the discussions. Hope it will be
> merged quickly and get your issue solved :)

No problem; it was for the better and ensures we have a full
understanding of it :-) Please 'ack' it if you can.
Valentin Popa - March 28, 2014, 3:44 p.m.
On 03/28/2014 05:37 PM, Otavio Salvador wrote:
> On Fri, Mar 28, 2014 at 12:32 PM, Valentin Popa <valentin.popa@intel.com> wrote:
>> On 03/28/2014 04:02 PM, Otavio Salvador wrote:
>>> From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>>>
>>> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>> ---
>>>    meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++---
>>>    1 file changed, 6 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb
>>> b/meta/recipes-graphics/wayland/weston_1.4.0.bb
>>> index e0c354d..5213166 100644
>>> --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
>>> +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
>>> @@ -23,13 +23,12 @@ EXTRA_OECONF = "--enable-setuid-install \
>>>                    --enable-simple-clients \
>>>                    --enable-clients \
>>>                    --enable-demo-clients-install \
>>> -                --disable-simple-egl-clients \
>>>                    --disable-libunwind \
>>>                    --disable-rpi-compositor \
>>>                    --disable-rdp-compositor"
>>>      -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland',
>>> 'kms fbdev wayland', '', d)} \
>>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms
>>> fbdev wayland egl', '', d)} \
>>>                       ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '',
>>> d)} \
>>>                       ${@base_contains('DISTRO_FEATURES', 'pam', 'launch',
>>> '', d)} \
>>>                      "
>>> @@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES',
>>> 'wayland', 'kms fbdev way
>>>    # Weston on KMS
>>>    PACKAGECONFIG[kms] =
>>> "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa
>>> mtdev"
>>>    # Weston on Wayland (nested Weston)
>>> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl
>>> --disable-wayland-compositor,virtual/mesa"
>>> +PACKAGECONFIG[wayland] =
>>> "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
>>>    # Weston on X11
>>>    PACKAGECONFIG[x11] =
>>> "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb
>>> libxcb libxcursor cairo"
>>>    # Headless Weston
>>> @@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] =
>>> "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
>>>    PACKAGECONFIG[launch] =
>>> "--enable-weston-launch,--disable-weston-launch,libpam drm"
>>>    # VA-API desktop recorder
>>>    PACKAGECONFIG[vaapi] =
>>> "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
>>> +# Weston with EGL support
>>> +PACKAGECONFIG[egl] = "--enable-egl
>>> --enable-simple-egl-clients,--disable-egl
>>> --disable-simple-egl-clients,virtual/egl"
>>> +# Weston with cairo glesv2 support
>>> +PACKAGECONFIG[cairo-glesv2] =
>>> "--with-cairo-glesv2,--with-cairo=image,cairo"
>>>      do_install_append() {
>>>          # Weston doesn't need the .la files to load modules, so wipe them
>>
>> Looks good to me.
>> Sorry Otavio for the delay introduced by the discussions. Hope it will be
>> merged quickly and get your issue solved :)
> No problem; it was for the better and ensures we have a full
> understanding of it :-) Please 'ack' it if you can.
>
Acked-by: valentin.popa@intel.com.
Denys Dmytriyenko - March 28, 2014, 4:14 p.m.
On Fri, Mar 28, 2014 at 11:02:37AM -0300, Otavio Salvador wrote:
> From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
> 
> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb
> index e0c354d..5213166 100644
> --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
> @@ -23,13 +23,12 @@ EXTRA_OECONF = "--enable-setuid-install \
>                  --enable-simple-clients \
>                  --enable-clients \
>                  --enable-demo-clients-install \
> -                --disable-simple-egl-clients \
>                  --disable-libunwind \
>                  --disable-rpi-compositor \
>                  --disable-rdp-compositor"
>  
>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
>                    "
> @@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev way
>  # Weston on KMS
>  PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
>  # Weston on Wayland (nested Weston)
> -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl --disable-wayland-compositor,virtual/mesa"
> +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
>  # Weston on X11
>  PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
>  # Headless Weston
> @@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
>  PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
>  # VA-API desktop recorder
>  PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
> +# Weston with EGL support
> +PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
> +# Weston with cairo glesv2 support
> +PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"

Thanks! This was something I was also looking at recently. I'll give it a shot 
in my testing.

Patch

diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb
index e0c354d..5213166 100644
--- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
@@ -23,13 +23,12 @@  EXTRA_OECONF = "--enable-setuid-install \
                 --enable-simple-clients \
                 --enable-clients \
                 --enable-demo-clients-install \
-                --disable-simple-egl-clients \
                 --disable-libunwind \
                 --disable-rpi-compositor \
                 --disable-rdp-compositor"
 
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
                   "
@@ -39,7 +38,7 @@  PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev way
 # Weston on KMS
 PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
 # Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl --disable-wayland-compositor,virtual/mesa"
+PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
 # Weston on X11
 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
 # Headless Weston
@@ -50,6 +49,10 @@  PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
 PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
 # VA-API desktop recorder
 PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+# Weston with EGL support
+PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
+# Weston with cairo glesv2 support
+PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
 
 do_install_append() {
 	# Weston doesn't need the .la files to load modules, so wipe them