[OE-core][PATCH 1/2] libva: add PACKAGECONFIG and additonal rules for glx.

[OE-core][PATCH 1/2] libva: add PACKAGECONFIG and additonal rules for glx.

[Bartłomiej Burdukiewicz]

* glx PACKAGECONFIG by default is selected when x11 and opengl
flag is present in DISTRO_FEATURES.

* virtual/mesa is only required when glx driver is selected to
build.

Signed-off-by: Bartłomiej Burdukiewicz <bartlomiej.burdukiewicz@gmail.com>
---
 meta/recipes-graphics/libva/libva_2.6.1.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb
index 92cea83bc1..8c495bad70 100644
--- a/meta/recipes-graphics/libva/libva_2.6.1.bb
+++ b/meta/recipes-graphics/libva/libva_2.6.1.bb
@@ -23,15 +23,21 @@ SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e4862940
 
 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
 
-DEPENDS = "libdrm virtual/mesa"
+DEPENDS = "libdrm"
 
 inherit meson pkgconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
-PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes"
-PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no,wayland-native wayland"
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
+"
+
+PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes"
+PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa"
+
+PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland"
 
 PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland"
 
-- 
2.26.2

[OE-core][PATCH 2/2] libva: removed opengl from REQUIRED_DISTRO_FEATURES.

[Bartłomiej Burdukiewicz]

Since libva can be built without virtual/mesa, opengl
requirement is only true for glx backend and it's
incorrect for wayland and x11 backends.

Signed-off-by: Bartłomiej Burdukiewicz <bartlomiej.burdukiewicz@gmail.com>
---
 meta/recipes-graphics/libva/libva_2.6.1.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb
index 8c495bad70..071be345d2 100644
--- a/meta/recipes-graphics/libva/libva_2.6.1.bb
+++ b/meta/recipes-graphics/libva/libva_2.6.1.bb
@@ -27,8 +27,6 @@ DEPENDS = "libdrm"
 
 inherit meson pkgconfig features_check
 
-REQUIRED_DISTRO_FEATURES = "opengl"
-
 PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
-- 
2.26.2

Re: [OE-core][PATCH 1/2] libva: add PACKAGECONFIG and additonal rules for glx.

[Denys Dmytriyenko]

On Wed, Apr 29, 2020 at 10:27:44PM +0200, Bartłomiej Burdukiewicz wrote:
> * glx PACKAGECONFIG by default is selected when x11 and opengl
> flag is present in DISTRO_FEATURES.
> 
> * virtual/mesa is only required when glx driver is selected to
> build.

Thank you so much!

It was very unfortunate that hard dependency on mesa and 
REQUIRED_DISTRO_FEATURES="opengl" was slapped all over oe-core 
(not just this recipe) - rather one-sided approach... :)

Very glad to see overall situation improving here. Thanks again!


> Signed-off-by: Bartłomiej Burdukiewicz <bartlomiej.burdukiewicz@gmail.com>
> ---
>  meta/recipes-graphics/libva/libva_2.6.1.bb | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb
> index 92cea83bc1..8c495bad70 100644
> --- a/meta/recipes-graphics/libva/libva_2.6.1.bb
> +++ b/meta/recipes-graphics/libva/libva_2.6.1.bb
> @@ -23,15 +23,21 @@ SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e4862940
>
>  UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
>
> -DEPENDS = "libdrm virtual/mesa"
> +DEPENDS = "libdrm"
>
>  inherit meson pkgconfig features_check
>
>  REQUIRED_DISTRO_FEATURES = "opengl"
>
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
> -PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes"
> -PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no,wayland-native wayland"
> +PACKAGECONFIG ??= " \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
> +    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
> +"
> +
> +PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes"
> +PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa"
> +
> +PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland"
>
>  PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland"
>
> -- 
> 2.26.2
> 

>