Skip to contentSkip to conversation

package/freescale-imx/imx-gpu-viv: remove fb headers fixup

PATCH New Gary Bisson 2 participants 2 messages Oct 27, 2020 – Oct 29, 2020 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/freescale-imx/imx-gpu-viv: remove fb headers fixup

As it doesn't seem to be needed any longer. Also it was agreed to fix packages not using pkgconfig properly instead of doing this sed.

Tested on i.MX6 platform with Qt5, no more issues.

---
 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 10 ----------
 1 file changed, 10 deletions(-)
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +0 -10
index b6b070e4f6..fca8a4d447 100644
@@ -58,15 +58,6 @@ define IMX_GPU_VIV_BUILD_CMDS
 	ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so
 endef
 
-ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
-define IMX_GPU_VIV_FIXUP_FB_HEADERS
-	$(SED) '39i\
-		#if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
-		#define EGL_API_FB \n\
-		#endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h
-endef
-endif
-
 ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
 define IMX_GPU_VIV_FIXUP_PKGCONFIG
 	ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
@@ -89,7 +80,6 @@ endif
 
 define IMX_GPU_VIV_INSTALL_STAGING_CMDS
 	cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
-	$(IMX_GPU_VIV_FIXUP_FB_HEADERS)
 	$(IMX_GPU_VIV_FIXUP_PKGCONFIG)
 	for lib in egl gbm glesv1_cm glesv2 vg; do \
 		$(INSTALL) -m 0644 -D \
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/freescale-imx/imx-gpu-viv: remove fb headers fixup

Quoted 9 lines · On Tue, 27 Oct 2020 18:12:45 +0100 Gary Bisson…

As it doesn't seem to be needed any longer. Also it was agreed to fix packages not using pkgconfig properly instead of doing this sed.

Tested on i.MX6 platform with Qt5, no more issues.

---
 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 10 ----------
 1 file changed, 10 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com