Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
fbc2375d
Commit
fbc2375d
authored
Feb 27, 2018
by
Nicolas Dufresne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gl: Move DRM_CFLAGS into gst-gl.m4
parent
b8bc2b87
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
configure.ac
configure.ac
+0
-3
gst-libs/gst/gl/Makefile.am
gst-libs/gst/gl/Makefile.am
+0
-1
m4/gst-gl.m4
m4/gst-gl.m4
+10
-6
No files found.
configure.ac
View file @
fbc2375d
...
...
@@ -295,9 +295,6 @@ GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
AC_SUBST(GLIB_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
dnl check for gudev
...
...
gst-libs/gst/gl/Makefile.am
View file @
fbc2375d
...
...
@@ -154,7 +154,6 @@ libgstgl_@GST_API_VERSION@_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS)
\
$(GST_BASE_CFLAGS)
\
$(GST_CFLAGS)
\
$(DRM_CFLAGS)
\
$(GL_CFLAGS)
libgstgl_@GST_API_VERSION@
_la_LDFLAGS
=
\
...
...
m4/gst-gl.m4
View file @
fbc2375d
...
...
@@ -172,10 +172,15 @@ case $host in
AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes])
fi
if test "x$HAVE_EGL" = "xyes" -a "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)
if test "x$HAVE_EGL" = "xyes"; then
PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
AC_SUBST(DRM_CFLAGS)
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
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])
else
HAVE_WINDOW_GBM=yes
GL_LIBS="$GL_LIBS"
GL_CFLAGS="$GL_CFLAGS"
GL_CFLAGS="$GL_CFLAGS DRM_CFLAGS"
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment