From: Joshua Watt <Joshua.Watt@garmin.com>
Date: Wed, 1 May 2019 21:49:30 +0000 (-0500)
Subject: imx-gpu-viv: Fix GLESv1 packaging
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=refs%2Fpull%2F174%2Fhead;p=meta-freescale.git

imx-gpu-viv: Fix GLESv1 packaging

The GLESv1 library was being packaged with the name "libgles" instead of
the canonical "libglesv1". The latter is the name that recipes used when
RDEPENDing on GLESv1. Correct this so that the package is correctly
named "libglesv1", but RPROVIDES the old "libgles" name in case there
are recipes still depending on it.

Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
---

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 38d3510d..9c310065 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -62,7 +62,7 @@ IMX_PACKAGES_GBM     = ""
 IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev"
 PACKAGES =+ "libclc-imx libclc-imx-dev \
 	libgl-imx libgl-imx-dev \
-	libgles-imx libgles-imx-dev \
+	libgles1-imx libgles1-imx-dev \
 	libgles2-imx libgles2-imx-dev \
 	libgles3-imx-dev \
 	libglslc-imx libglslc-imx-dev \
@@ -112,7 +112,7 @@ python __anonymous() {
               ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
               ("libgles3",) , ("libvulkan",), ("libgbm",)):
         fullp = p[0] + "-imx"
-        pkgs = " ".join(p)
+        pkgs = "".join(' %s' % i for i in p)
         d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
         d.appendVar("RREPLACES_" + fullp, pkgs)
         d.appendVar("RPROVIDES_" + fullp, pkgs)
@@ -318,9 +318,11 @@ FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}"
 FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL"
 
 # libEGL needs to open libGLESv1.so
-INSANE_SKIP_libgles-imx += "dev-so"
-FILES_libgles-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
-FILES_libgles-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
+INSANE_SKIP_libgles1-imx += "dev-so"
+FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
+FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
+RPROVIDES_libgles1-imx = "libgles-imx"
+RPROVIDES_libgles1-imx-dev = "libgles-imx-dev"
 
 # libEGL needs to open libGLESv2.so
 INSANE_SKIP_libgles2-imx += "dev-so"