[OE-core] [PATCH V2 2/2] piglit: support build piglit without x11

[Changqing Li]

ping

On 1/16/19 11:04 AM, changqing.li at windriver.com wrote:
> From: Changqing Li <changqing.li at windriver.com>
>
> *  test PIGLIT_BUILD_GL_TESTS depend on glx library, so depend
>     on x11, so respect the DISTRO_FEATURES, only enable it when
>     x11 is enabled.
> *  mesa-demos depend on libGL.so which is provide by recipe
>     mesa, but when x11 is disabled, libGL.so is not generated.
>     so we can only rdepend on this when x11 is enabled
> *  add x11 PACKAGECONFIG to add correct config/depend/rdepend
>
> Signed-off-by: Changqing Li <changqing.li at windriver.com>
> ---
>   meta/recipes-graphics/piglit/piglit_git.bb | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
> index 622e046..0737d02 100644
> --- a/meta/recipes-graphics/piglit/piglit_git.bb
> +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> @@ -17,11 +17,12 @@ PV = "1.0+gitr${SRCPV}"
>   
>   S = "${WORKDIR}/git"
>   
> -DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native virtual/egl"
> +X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
> +X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
> +
> +DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl"
>   
>   inherit cmake pkgconfig python3native distro_features_check bash-completion
> -# depends on virtual/libx11
> -REQUIRED_DISTRO_FEATURES = "x11"
>   
>   # depends on virtual/libgl
>   REQUIRED_DISTRO_FEATURES += "opengl"
> @@ -32,8 +33,10 @@ REQUIRED_DISTRO_FEATURES += "opengl"
>   export TEMP = "${B}/temp/"
>   do_compile[dirs] =+ "${B}/temp/"
>   
> -PACKAGECONFIG ??= ""
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
>   PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
> +PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
> +
>   
>   do_configure_prepend() {
>      if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
> @@ -48,7 +51,7 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
>   	python3-misc \
>   	python3-unixadmin python3-xml python3-multiprocessing \
>   	python3-six python3-shell python3-io \
> -	python3-netserver mesa-demos bash \
> +	python3-netserver bash \
>   	"
>   
>   INSANE_SKIP_${PN} += "dev-so already-stripped"

-- 
BRs

Sandy(Li Changqing)