On 17/03/17 07:20 PM, Mariusz Bialonczyk wrote:
> Fix commit 9232835bd16b6948442f7a4588fb9376782cb814
> glamor: use drmGetDeviceNameFromFD2 when available
> 
> No matter what libdrm version was installed, it always set
> the GLAMOR_HAS_DRM_NAME_FROM_FD_2 conditional to 1.
> This obviously leads to compilation problems.
> 
> Signed-off-by: Mariusz Bialonczyk <[email protected]>
> Cc: Qiang Yu <[email protected]>
> ---
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index ac11e6572..0f2f68abb 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2167,7 +2167,7 @@ if test "x$GLAMOR" = xyes; then
>               fi
>       fi
>  
> -     PKG_CHECK_MODULES(LIBDRM, "libdrm >= 2.4.74",
> +     PKG_CHECK_EXISTS(libdrm >= 2.4.74,
>                       [AC_DEFINE(GLAMOR_HAS_DRM_NAME_FROM_FD_2, 1, [Have 
> GLAMOR_HAS_DRM_NAME_FROM_FD_2])], [])
>  fi
>  AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes])
> 

Pushed with slightly tweaked formatting and commit log, thanks!

   eb2cf1172..ad6689b7d  master -> master


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to