configure.ac: check for libdrm when using VL with X11

Submitted by Emil Velikov on May 6, 2019, 3:32 p.m.

Details

Message ID 20190506153238.8126-1-emil.l.velikov@gmail.com
State New
Headers show
Series "configure.ac: check for libdrm when using VL with X11" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Emil Velikov May 6, 2019, 3:32 p.m.
From: Emil Velikov <emil.velikov@collabora.com>

The X11 specific code uses libdrm, yet we are missing the dependency.
This has gone unnoticed since all drivers which use VL already mandate
the library.

Note: this is applicable only for the stable branches.

Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
Alyssa this should resolve the failure with minimal churn. Please let
me know if it works on your end or not.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index 1ef68fe68e6..b288ecbd265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2357,7 +2357,7 @@  if test "x$enable_xvmc" = xyes -o \
         "x$enable_omx_tizonia" = xyes -o \
         "x$enable_va" = xyes; then
     if echo $platforms | grep -q "x11"; then
-        PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
+        PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED libdrm >= $LIBDRM_REQUIRED])
     fi
     need_gallium_vl_winsys=yes
 fi

Comments

Wrong Alyssa, cc'ing the right one :)

On Mon, May 06, 2019 at 04:32:38PM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov@collabora.com>
> 
> The X11 specific code uses libdrm, yet we are missing the dependency.
> This has gone unnoticed since all drivers which use VL already mandate
> the library.
> 
> Note: this is applicable only for the stable branches.
> 
> Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
> Cc: <mesa-stable@lists.freedesktop.org>
> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
> ---
> Alyssa this should resolve the failure with minimal churn. Please let
> me know if it works on your end or not.
> ---
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 1ef68fe68e6..b288ecbd265 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2357,7 +2357,7 @@ if test "x$enable_xvmc" = xyes -o \
>          "x$enable_omx_tizonia" = xyes -o \
>          "x$enable_va" = xyes; then
>      if echo $platforms | grep -q "x11"; then
> -        PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
> +        PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED libdrm >= $LIBDRM_REQUIRED])
>      fi
>      need_gallium_vl_winsys=yes
>  fi
> -- 
> 2.21.0


On Wed, 8 May 2019 at 00:48, Dylan Baker <dylan@pnwbakers.com> wrote:
>
> Quoting Alyssa Ross (2019-05-07 06:17:15)
> > On Mon, May 06, 2019 at 04:38:20PM -0700, Alyssa Rosenzweig wrote:
> > > Wrong Alyssa, cc'ing the right one :)
> >
> > Thank you for the CC, fellow Alyssa! :)
> >
Ahem, totally meant to do that :-)

> > > On Mon, May 06, 2019 at 04:32:38PM +0100, Emil Velikov wrote:
> > > > Alyssa this should resolve the failure with minimal churn. Please let
> > > > me know if it works on your end or not.
> >
> > Emil, this works for me. Thank you.
> >
> > Tested-by: Alyssa Ross <hi@alyssa.is>
> >
> >
> > _______________________________________________
> > mesa-stable mailing list
> > mesa-stable@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-stable
>
> Staged for 19.0, thanks.

Thanks Dylan. I suspect the meson build needs an equivalent patch, yet
haven't looked at it recently.

HTH
-Emil