From e894493b7d10ece86f2f1affadb17ed0e34d45d7 Mon Sep 17 00:00:00 2001 From: Thomas Senyk Date: Fri, 21 Jun 2013 15:00:42 +0000 Subject: [PATCH] gpu-viv-bin-mx6q: fixing pkg-config files for non-x11 builds. egl.pc and glesv1_cm.pc had 'Requires.private' on x11 libs. This got removed from them. To keep the x11 behavior, new x11 specific pkg-config files were added and will be installed by gpu-viv-bin-mx6q.inc, if "X11'-DISTRO_FEATURE is present. For uniformity reasons, the same schema got applied to glesv2.pc Change-Id: I23c1b685d4be10119a0f90179c2e87e1db64ca05 Signed-off-by: Thomas Senyk --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 14 +++++++++++--- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc | 2 +- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc | 12 ++++++++++++ .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc | 2 +- .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc | 12 ++++++++++++ .../gpu-viv-bin-mx6q/glesv2_x11.pc | 12 ++++++++++++ 6 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index e1f10b6b..8e099a7b 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -17,8 +17,11 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ file://gc_hal_eglplatform-remove-xlib-undefs.patch \ file://fix-conflicting-TLS-definition.patch \ file://egl.pc \ + file://egl_x11.pc \ file://glesv1_cm.pc \ + file://glesv1_cm_x11.pc \ file://glesv2.pc \ + file://glesv2_x11.pc \ " PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ @@ -63,9 +66,6 @@ do_install () { cp -axr ${S}/opt ${D} install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/ - install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/ - install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/ # FIXME: Remove Wayland contents rm -r ${D}${includedir}/wayland-viv @@ -76,7 +76,15 @@ do_install () { cp -r ${S}/usr/lib/dri ${D}${libdir} find ${D}${libdir} -name '*-dfb.so' -exec rm '{}' ';' find ${D}${libdir} -name '*-fb.so' -exec rm '{}' ';' + + install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc else + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + if [ "${USE_DFB}" = "yes" ]; then find ${D}${libdir} -name '*-x11.so' -exec rm '{}' ';' find ${D}${libdir} -name '*-fb.so' -exec rm '{}' ';' diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc index 5921583f..a21922d0 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc @@ -5,7 +5,7 @@ includedir=/usr/include Name: egl Description: Vivante EGL library -Requires.private: libdrm x11 xext xdamage xfixes xcb +Requires.private: Version: 8.0 Libs: -L${libdir} -lEGL Libs.private: -lm -lpthread -ldl diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc new file mode 100644 index 00000000..5921583f --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Vivante EGL library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} -DLINUX diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc index e801633b..d97b067f 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc @@ -5,7 +5,7 @@ includedir=/usr/include Name: glesv1_cm Description: Vivante OpenGL ES 1.1 CM library -Requires.private: libdrm x11 xext xdamage xfixes xcb +Requires.private: Version: 8.0 Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL Libs.private: -lm -lpthread -ldl diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc new file mode 100644 index 00000000..e801633b --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Vivante OpenGL ES 1.1 CM library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc new file mode 100644 index 00000000..57ad8076 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Vivante OpenGL ES 2.0 library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -I${includedir} -- 2.40.1