summaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorJoshua Watt <Joshua.Watt@garmin.com>2019-05-01 16:49:30 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2019-09-04 14:33:46 -0300
commit68be54442eaed2b5060c774f3bb0ab7b3459bcca (patch)
tree4f051bbc7199bd8e2ff08008c09b7fb9b403dea1 /recipes-graphics
parent6e1f0d9fbeb9f09bb95ebf451704762194d1d9b7 (diff)
downloadmeta-freescale-68be54442eaed2b5060c774f3bb0ab7b3459bcca.tar.gz
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>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc12
1 files changed, 7 insertions, 5 deletions
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 70435b9c..1127d161 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 = ""
62IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev" 62IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev"
63PACKAGES =+ "libclc-imx libclc-imx-dev \ 63PACKAGES =+ "libclc-imx libclc-imx-dev \
64 libgl-imx libgl-imx-dev \ 64 libgl-imx libgl-imx-dev \
65 libgles-imx libgles-imx-dev \ 65 libgles1-imx libgles1-imx-dev \
66 libgles2-imx libgles2-imx-dev \ 66 libgles2-imx libgles2-imx-dev \
67 libgles3-imx-dev \ 67 libgles3-imx-dev \
68 libglslc-imx libglslc-imx-dev \ 68 libglslc-imx libglslc-imx-dev \
@@ -112,7 +112,7 @@ python __anonymous() {
112 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), 112 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
113 ("libgles3",) , ("libvulkan",), ("libgbm",)): 113 ("libgles3",) , ("libvulkan",), ("libgbm",)):
114 fullp = p[0] + "-imx" 114 fullp = p[0] + "-imx"
115 pkgs = " ".join(p) 115 pkgs = "".join(' %s' % i for i in p)
116 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 116 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
117 d.appendVar("RREPLACES_" + fullp, pkgs) 117 d.appendVar("RREPLACES_" + fullp, pkgs)
118 d.appendVar("RPROVIDES_" + fullp, pkgs) 118 d.appendVar("RPROVIDES_" + fullp, pkgs)
@@ -318,9 +318,11 @@ FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}"
318FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" 318FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL"
319 319
320# libEGL needs to open libGLESv1.so 320# libEGL needs to open libGLESv1.so
321INSANE_SKIP_libgles-imx += "dev-so" 321INSANE_SKIP_libgles1-imx += "dev-so"
322FILES_libgles-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" 322FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
323FILES_libgles-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" 323FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
324RPROVIDES_libgles1-imx = "libgles-imx"
325RPROVIDES_libgles1-imx-dev = "libgles-imx-dev"
324 326
325# libEGL needs to open libGLESv2.so 327# libEGL needs to open libGLESv2.so
326INSANE_SKIP_libgles2-imx += "dev-so" 328INSANE_SKIP_libgles2-imx += "dev-so"