From: Gaël PORTAY Date: Thu, 1 Mar 2018 21:34:28 +0000 (-0500) Subject: Revert "qt5multimedia: fix build issue with mesa3d w/out xcb" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a41e1c672fdb2b6e7f70dbdf117d0fac3a79a46;p=buildroot.git Revert "qt5multimedia: fix build issue with mesa3d w/out xcb" This reverts commit fadaaabe6f79da130f3e68fca23f12f0ffd6b20f. Superseded by: qt5base: fix build issue with mesa3d w/out xcb Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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