jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/mesa3d: Remove libGL headers/pkgconfig when OpenGL is disabled

Browse Source 
mesa3d defaults to --enable-opengl due to its weird configure.ac:
http://git.buildroot.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=384d601d4ea2c41bb7928f756bfe88af4d38b38b

This leads to include/GL/*.h and lib/pkgconfig/gl.pc being installed to
STAGING_DIR. These files are enough for other packages to wrongly assume
that libGL.so is present, like vlc.

Fixes
http://autobuild.buildroot.net/results/e63/e639dabfb260006acb8a204851b96f9275ce53a7/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2015-06-07 23:11:22 +02:00 committed by Thomas Petazzoni
parent 5ba276de2a
commit 1bd494f0a8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/mesa3d/mesa3d.mk
View File

@ -85,9 +85,16 @@ MESA3D_CONF_OPTS += \
--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
endif endif
define MESA3D_REMOVE_OPENGL_PC
rm -f $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc
rm -f $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
rm -rf $(STAGING_DIR)/usr/include/GL/
endef
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \ MESA3D_CONF_OPTS += \
--without-dri-drivers --without-dri --disable-dri3 --without-dri-drivers --without-dri --disable-dri3
MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
else else
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
@ -110,7 +117,8 @@ endif
# Always enable OpenGL: # Always enable OpenGL:
# - it is needed for GLES (mesa3d's ./configure is a bit weird) # - it is needed for GLES (mesa3d's ./configure is a bit weird)
# - but if no DRI driver is enabled, then libgl is not built # - but if no DRI driver is enabled, then libgl is not built,
# remove dri.pc and gl.pc in this case (MESA3D_REMOVE_OPENGL_PC)
MESA3D_CONF_OPTS += --enable-opengl MESA3D_CONF_OPTS += --enable-opengl
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)