mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-30 04:00:37 +00:00
gl: Move DRM_CFLAGS into gst-gl.m4
This commit is contained in:
parent
b8bc2b87d0
commit
fbc2375d57
3 changed files with 10 additions and 10 deletions
|
@ -295,9 +295,6 @@ GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
|
||||||
AC_SUBST(GLIB_PREFIX)
|
AC_SUBST(GLIB_PREFIX)
|
||||||
AC_SUBST(GST_PREFIX)
|
AC_SUBST(GST_PREFIX)
|
||||||
|
|
||||||
dnl check for libdrm
|
|
||||||
PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
|
|
||||||
|
|
||||||
AG_GST_GL_CHECKS
|
AG_GST_GL_CHECKS
|
||||||
|
|
||||||
dnl check for gudev
|
dnl check for gudev
|
||||||
|
|
|
@ -154,7 +154,6 @@ libgstgl_@GST_API_VERSION@_la_CFLAGS = \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) \
|
$(GST_CFLAGS) \
|
||||||
$(DRM_CFLAGS) \
|
|
||||||
$(GL_CFLAGS)
|
$(GL_CFLAGS)
|
||||||
|
|
||||||
libgstgl_@GST_API_VERSION@_la_LDFLAGS = \
|
libgstgl_@GST_API_VERSION@_la_LDFLAGS = \
|
||||||
|
|
16
m4/gst-gl.m4
16
m4/gst-gl.m4
|
@ -172,10 +172,15 @@ case $host in
|
||||||
AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes])
|
AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$HAVE_EGL" = "xyes" -a "x$HAVE_DRM" = "xyes"; then
|
if test "x$HAVE_EGL" = "xyes"; then
|
||||||
PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no)
|
PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
|
||||||
AC_SUBST(GBM_CFLAGS)
|
AC_SUBST(DRM_CFLAGS)
|
||||||
AC_SUBST(GBM_LIBS)
|
AC_SUBST(DRM_LIBS)
|
||||||
|
if test "x$HAVE_DRM" = "xyes"; then
|
||||||
|
PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no)
|
||||||
|
AC_SUBST(GBM_CFLAGS)
|
||||||
|
AC_SUBST(GBM_LIBS)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
|
dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
|
||||||
|
@ -479,8 +484,7 @@ case $host in
|
||||||
AC_MSG_WARN([EGL is required by the Mesa GBM EGL backend])
|
AC_MSG_WARN([EGL is required by the Mesa GBM EGL backend])
|
||||||
else
|
else
|
||||||
HAVE_WINDOW_GBM=yes
|
HAVE_WINDOW_GBM=yes
|
||||||
GL_LIBS="$GL_LIBS"
|
GL_CFLAGS="$GL_CFLAGS DRM_CFLAGS"
|
||||||
GL_CFLAGS="$GL_CFLAGS"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue