* [Buildroot] [git commit] Revert "qt5multimedia: fix build issue with mesa3d w/out xcb"
@ 2018-04-01 21:48 Arnout Vandecappelle
0 siblings, 0 replies; only message in thread
From: Arnout Vandecappelle @ 2018-04-01 21:48 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=7a41e1c672fdb2b6e7f70dbdf117d0fac3a79a46
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This reverts commit fadaaabe6f79da130f3e68fca23f12f0ffd6b20f.
Superseded by:
qt5base: fix build issue with mesa3d w/out xcb
Signed-off-by: Ga??l PORTAY <gael.portay@savoirfairelinux.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/qt5/qt5multimedia/qt5multimedia.mk | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 041ef49092..6df96bcab4 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -34,15 +34,8 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
QT5MULTIMEDIA_DEPENDENCIES += alsa-lib
endif
-# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag
-# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if
-# the libxcb is not selected.
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx)
-QT5MULTIMEDIA_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS
-endif
-
define QT5MULTIMEDIA_CONFIGURE_CMDS
- (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5MULTIMEDIA_QMAKEFLAGS))
+ (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
endef
define QT5MULTIMEDIA_BUILD_CMDS
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-04-01 21:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-01 21:48 [Buildroot] [git commit] Revert "qt5multimedia: fix build issue with mesa3d w/out xcb" Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.