summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/freescale-imx/gpu-viv-bin-mx6q/egl.pc2
-rw-r--r--package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc2
-rw-r--r--package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk14
-rw-r--r--package/freescale-imx/gpu-viv-bin-mx6q/vg.pc2
4 files changed, 13 insertions, 7 deletions
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
index c9842471d8..d1d09a0cac 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
@@ -7,4 +7,4 @@ Name: egl
Description: Freescale gpu-viv-bin-mx6q implementation of EGL
Version: 1.0
Libs: -L${libdir} -lGAL -lEGL
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+Cflags: -I${includedir}/
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
index 7cfb5e7d68..74ce792602 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
@@ -7,4 +7,4 @@ Name: glesv2
Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
Version: 2.0
Libs: -L${libdir} -lGAL -lEGL -lGLESv2
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+Cflags: -I${includedir}/
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index 79c7a926e0..bad1658b94 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -46,16 +46,22 @@ define GPU_VIV_BIN_MX6Q_BUILD_CMDS
ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1.2.0
endef
+ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)
+define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS
+ $(SED) '/#define EGLAPIENTRY/ a \
+ #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/eglvivante.h
+endef
+endif
+
define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
cp -r $(@D)/usr/* $(STAGING_DIR)/usr
+ $(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)
for lib in egl glesv2 vg; do \
$(INSTALL) -m 0644 -D \
package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
- if [ "$(GPU_VIV_BIN_MX6Q_LIB_TARGET)" != "fb" ]; then \
- $(SED) "s/-DEGL_API_FB=1//" \
- $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
- fi; \
done
endef
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
index fb14005571..677a7ee5ac 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
@@ -7,4 +7,4 @@ Name: vg
Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
Version: 1.1
Libs: -L${libdir} -lGAL -lEGL -lOpenVG
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+Cflags: -I${includedir}/
OpenPOWER on IntegriCloud