| Message ID | 20160601033811.6031-1-akihiko.odaki.4i@stu.hosei.ac.jp |
|---|---|
| State | Superseded |
| Headers | show |
Hello, Thanks for this patch! Bernd, Gustavo, could you comment on the part that changes in what condition the .pc files are removed? Also, rather than having this hack in Buildroot, what about fixing the issue upstream? mesa3d should not install the .pc file if it is not configured to build/install the corresponding libraries. Akihiko, I also have a comment for you below. On Wed, 1 Jun 2016 12:38:08 +0900, Akihiko Odaki wrote: > ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) > @@ -137,6 +140,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) > MESA3D_PROVIDES += libegl > ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) > MESA3D_EGL_PLATFORMS = drm > +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) > +MESA3D_EGL_PLATFORMS = drm This change is unrelated, so it should be part of a separate patch. > else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) > MESA3D_EGL_PLATFORMS = drm > endif Thanks! Thomas
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4e0d255..a4d84e4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -94,7 +94,6 @@ endef ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ --without-dri-drivers --disable-dri3 -MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC else ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto @@ -115,6 +114,10 @@ MESA3D_CONF_OPTS += \ --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC +endif + # APIs ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) @@ -137,6 +140,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) MESA3D_EGL_PLATFORMS = drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) +MESA3D_EGL_PLATFORMS = drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) MESA3D_EGL_PLATFORMS = drm endif
Gallium driver also provides DRI-like infrastructure and OpenGL. This change prevents from removing pkg-configs of them also when installing the driver. Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> --- package/mesa3d/mesa3d.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)