[Libva] [PATCH 05/16] always use egl for wayland

[Zhao, Halley]

It took me some time to reproduce my previous issue.

libegl-mesa-dev is not installed in my system, while there are lib and dev files in $WLD from mesa.
So egl check fails but it is still ok to build VA/Wayland.

It seems the following check doesn't respect $PKG_CONFIG_PATH
    AC_CHECK_HEADERS([EGL/egl.h])
    AC_CHECK_LIB(EGL, eglGetDisplay, [
        USE_EGL="yes"
        EGL_DEPS_LIBS="-lEGL"
    ])

So the patch is better to be:

diff --git a/configure.ac b/configure.ac
index dcd27fe..1bfe8cf 100755
--- a/configure.ac
+++ b/configure.ac
@@ -219,10 +219,12 @@ WAYLAND_DRM_CFLAGS=""
 WAYLAND_DRM_LIBS=""
 if test "$enable_wayland" = "yes"; then
     PKG_CHECK_MODULES([WAYLAND], [wayland-client], [USE_WAYLAND=1], [])
+    USE_WAYLAND_DRM=1
+    WAYLAND_DRM_CFLAGS="$DRM_CFLAGS"
     if test "$USE_EGL" = "yes"; then
-        USE_WAYLAND_DRM=1
-        WAYLAND_DRM_CFLAGS="$DRM_CFLAGS"
-       WAYLAND_DRM_LIBS="$DRM_LIBS $EGL_DEPS_LIBS"
+        WAYLAND_DRM_LIBS="$DRM_LIBS $EGL_DEPS_LIBS"
+    else 
+        WAYLAND_DRM_LIBS="$DRM_LIBS -lEGL"
     fi
 fi
 AC_DEFINE_UNQUOTED(USE_WAYLAND, $USE_WAYLAND,


> -----Original Message-----
> From: Gwenole Beauchesne [mailto:gb.devel at gmail.com]
> Sent: Wednesday, June 27, 2012 11:02 PM
> To: Zhao, Halley
> Subject: Re: [Libva] [PATCH 05/16] always use egl for wayland
> 
> Hi,
> 
> 2012/6/5 Zhao Halley <halley.zhao at intel.com>:
> 
> > diff --git a/configure.ac b/configure.ac index dcd27fe..c07a974
> 100755
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -219,11 +219,9 @@ WAYLAND_DRM_CFLAGS=""
> >  WAYLAND_DRM_LIBS=""
> >  if test "$enable_wayland" = "yes"; then
> >     PKG_CHECK_MODULES([WAYLAND], [wayland-client], [USE_WAYLAND=1],
> > [])
> > -    if test "$USE_EGL" = "yes"; then
> >         USE_WAYLAND_DRM=1
> >         WAYLAND_DRM_CFLAGS="$DRM_CFLAGS"
> >        WAYLAND_DRM_LIBS="$DRM_LIBS $EGL_DEPS_LIBS"
> > -    fi
> >  fi
> >  AC_DEFINE_UNQUOTED(USE_WAYLAND, $USE_WAYLAND,
> >     [Defined to 1 if building the Wayland windowing system])
> 
> This doesn't do what you commented in the headline. Rather, this forces
> compilation of VA/Wayland event if libEGL is not available.
> 
> Regards,
> Gwenole.