From f8e997803ce1f4af660bf527e8a47805af440baf Mon Sep 17 00:00:00 2001 From: Thao Nguyen Date: Sat, 15 Jul 2017 18:34:21 +0700 Subject: rcar-gen3: libegl: Create new recipe to fix build dependency issues This commit adds libegl recipe which provides build dependencies on virtual/egl. Signed-off-by: Thuy Tran Signed-off-by: Thao Nguyen Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/README.proprietary | 2 +- .../h3ulcb/linaro-gcc/gfx-only/local-wayland.conf | 2 +- .../conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf | 2 +- .../m3ulcb/linaro-gcc/gfx-only/local-wayland.conf | 2 +- .../conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf | 2 +- .../salvator-x/linaro-gcc/gfx-only/local-wayland.conf | 2 +- .../conf/salvator-x/linaro-gcc/mmp/local-wayland.conf | 2 +- .../recipes-graphics/gles-module/gles-user-module.bb | 2 -- meta-rcar-gen3/recipes-graphics/wayland/libegl.bb | 19 +++++++++++++++++++ 9 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 meta-rcar-gen3/recipes-graphics/wayland/libegl.bb diff --git a/meta-rcar-gen3/README.proprietary b/meta-rcar-gen3/README.proprietary index ac3a958..72f916c 100644 --- a/meta-rcar-gen3/README.proprietary +++ b/meta-rcar-gen3/README.proprietary @@ -53,7 +53,7 @@ II/ Build with GLES DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" - PREFERRED_PROVIDER_virtual/egl = "gles-user-module" + PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf index 5e7f6f6..44c5741 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf @@ -258,7 +258,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf index bfe3fa4..45772ea 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf @@ -258,7 +258,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf index ba5a64d..89d741a 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf @@ -258,7 +258,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf index 8ce2402..04ef841 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf @@ -258,7 +258,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf index 9a80463..3c58e58 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf @@ -263,7 +263,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf index c8d75f3..971b546 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf @@ -263,7 +263,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/ DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "libegl" PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_libgbm = "libgbm" diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb index 5c21a9f..e66164f 100644 --- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb +++ b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb @@ -105,8 +105,6 @@ RPROVIDES_${PN} += " \ libgles2-mesa-dev \ libgles2 \ libgles2-dev \ - libegl \ - libegl1 \ " RDEPENDS_${PN} = " \ diff --git a/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb b/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb new file mode 100644 index 0000000..0bde4ae --- /dev/null +++ b/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb @@ -0,0 +1,19 @@ +SUMMARY = "Recipe for libegl" +LICENSE = "CLOSED" + +DEPENDS = "gles-user-module \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgbm wayland-kms', '', d)} \ +" + +PR = "r0" + +RDEPENDS_${PN} = " \ + gles-user-module \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgbm wayland-kms', '', d)} \ +" + +PROVIDES = "virtual/egl" +RPROVIDES_${PN} += " \ + libegl \ + libegl1 \ +" -- cgit 1.2.3-korg