summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2020-10-07 12:17:43 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2020-10-07 15:05:12 -0300
commit342fe6e4a9bbcc84d4909c09501f86e34b4a464f (patch)
treef6c2599c0b4f220ba5f5ac0bf16e267b8015241b
parent1e119770f76318e9e541de759b507039244d98f6 (diff)
downloadmeta-freescale-342fe6e4a9bbcc84d4909c09501f86e34b4a464f.tar.gz
Revert "imx-gpu-viv: Fix packaging for various libraries"
This reverts commit aa5521274f88d4d652d271cae814662f569b67ff. Change-Id: I2a8534dd71baaaa4694200e06bd07b26898597d0 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Change-Id: Ie2e1cb6df1142eb54b3bf0573cdc9a1edb5e2b92
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc26
1 files changed, 16 insertions, 10 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 c3df40d8..414f98b2 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -303,8 +303,10 @@ ALLOW_EMPTY_${PN} = "1"
303FILES_libclc-imx = "${libdir}/libCLC${SOLIBS}" 303FILES_libclc-imx = "${libdir}/libCLC${SOLIBS}"
304FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" 304FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
305 305
306FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS}" 306# libEGL.so is used by some demo apps from Freescale
307FILES_libegl-imx-dev = "${libdir}/libEGL${SOLIBSDEV} ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 307INSANE_SKIP_libegl-imx += "dev-so"
308FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
309FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
308 310
309FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" 311FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
310FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL" 312FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
@@ -323,22 +325,26 @@ FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_v
323FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" 325FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
324 326
325FILES_libopenvx-imx = " \ 327FILES_libopenvx-imx = " \
326 ${libdir}/libOpenVX${REALSOLIBS} \ 328 ${libdir}/libOpenVX*${SOLIBS} \
327 ${libdir}/libOpenVXU${SOLIBS} \
328 ${libdir}/libOvx*${SOLIBS} \ 329 ${libdir}/libOvx*${SOLIBS} \
330 ${libdir}/libovx*${SOLIBS} \
329 " 331 "
330FILES_libopenvx-imx-dev = "${libdir}/libOpenVX${SOLIBSDEV} ${includedir}/VX ${includedir}/OVXLIB" 332FILES_libopenvx-imx-dev = "${includedir}/VX ${includedir}/OVXLIB"
331RDEPENDS_libopenvx-imx = "libnn-imx" 333RDEPENDS_libopenvx-imx = "libnn-imx"
332 334
333FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" 335FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}"
334FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" 336FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL"
335 337
336FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLES_*${REALSOLIBS}" 338# libEGL needs to open libGLESv1.so
337FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" 339INSANE_SKIP_libgles1-imx += "dev-so"
340FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
341FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
338RPROVIDES_libgles1-imx = "libgles-imx" 342RPROVIDES_libgles1-imx = "libgles-imx"
339RPROVIDES_libgles1-imx-dev = "libgles-imx-dev" 343RPROVIDES_libgles1-imx-dev = "libgles-imx-dev"
340 344
341FILES_libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS}" 345# libEGL needs to open libGLESv2.so
346INSANE_SKIP_libgles2-imx += "dev-so"
347FILES_libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
342FILES_libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" 348FILES_libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
343RDEPENDS_libgles2-imx = "libglslc-imx" 349RDEPENDS_libgles2-imx = "libglslc-imx"
344 350
@@ -350,7 +356,7 @@ RDEPENDS_libgles2-imx-dev += "libgles3-imx-dev"
350FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" 356FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}"
351FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" 357FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
352 358
353FILES_libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ 359FILES_libopencl-imx = "${libdir}/libOpenCL${SOLIBS} \
354 ${libdir}/libVivanteOpenCL${SOLIBS} \ 360 ${libdir}/libVivanteOpenCL${SOLIBS} \
355 ${libdir}/libLLVM_viv${SOLIBS} \ 361 ${libdir}/libLLVM_viv${SOLIBS} \
356 ${sysconfdir}/OpenCL/vendors/Vivante.icd" 362 ${sysconfdir}/OpenCL/vendors/Vivante.icd"
@@ -382,7 +388,7 @@ FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
382FILES_imx-gpu-viv-demos = "/opt" 388FILES_imx-gpu-viv-demos = "/opt"
383INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" 389INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps"
384 390
385FILES_libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" 391FILES_libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}"
386FILES_libnn-imx-dev = "${includedir}/nnrt" 392FILES_libnn-imx-dev = "${includedir}/nnrt"
387 393
388# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" 394# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)"