diff options
author | Mihai Lindner <mihai.lindner@nxp.com> | 2019-12-18 19:28:06 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-12-23 09:34:16 -0300 |
commit | c1f57b426317c792ac302a52ef363d4b44619fc4 (patch) | |
tree | 82e9e088ef78441b8bb143da788072c28d21acb3 /recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |
parent | 24e83e3bbc5caf725acfb85bc75df506e3b27f2e (diff) | |
download | meta-freescale-c1f57b426317c792ac302a52ef363d4b44619fc4.tar.gz |
imx-gpu-viv: Upgrade to 6.4.0.p1.0
Signed-off-by: Mihai Lindner <mihai.lindner@nxp.com>
Diffstat (limited to 'recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc')
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 26 |
1 files changed, 20 insertions, 6 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 43d86ef2..cf7b1fa2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -6,7 +6,7 @@ | |||
6 | DESCRIPTION = "GPU driver and apps for i.MX" | 6 | DESCRIPTION = "GPU driver and apps for i.MX" |
7 | SECTION = "libs" | 7 | SECTION = "libs" |
8 | LICENSE = "Proprietary" | 8 | LICENSE = "Proprietary" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3" |
10 | 10 | ||
11 | DEPENDS += " \ | 11 | DEPENDS += " \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
@@ -33,8 +33,6 @@ EXTRA_PROVIDES_append_imxgpu3d = " \ | |||
33 | " | 33 | " |
34 | EXTRA_PROVIDES_append_mx8 = " \ | 34 | EXTRA_PROVIDES_append_mx8 = " \ |
35 | virtual/libgbm \ | 35 | virtual/libgbm \ |
36 | " | ||
37 | EXTRA_PROVIDES_append_mx8qm = " \ | ||
38 | virtual/libopenvx \ | 36 | virtual/libopenvx \ |
39 | " | 37 | " |
40 | PROVIDES += " \ | 38 | PROVIDES += " \ |
@@ -81,6 +79,7 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \ | |||
81 | imx-gpu-viv-demos \ | 79 | imx-gpu-viv-demos \ |
82 | libvulkan-imx libvulkan-imx-dev \ | 80 | libvulkan-imx libvulkan-imx-dev \ |
83 | libopenvx-imx libopenvx-imx-dev \ | 81 | libopenvx-imx libopenvx-imx-dev \ |
82 | libnn-imx \ | ||
84 | " | 83 | " |
85 | python __anonymous () { | 84 | python __anonymous () { |
86 | has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') | 85 | has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') |
@@ -94,6 +93,7 @@ USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" | |||
94 | # Inhibit warnings about files being stripped. | 93 | # Inhibit warnings about files being stripped. |
95 | INHIBIT_PACKAGE_STRIP = "1" | 94 | INHIBIT_PACKAGE_STRIP = "1" |
96 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 95 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
96 | INSANE_SKIP_${BPN} += "already-stripped" | ||
97 | 97 | ||
98 | # FIXME: The provided binary doesn't provide soname. If in future BSP | 98 | # FIXME: The provided binary doesn't provide soname. If in future BSP |
99 | # release the libraries are fixed, we can drop this hack. | 99 | # release the libraries are fixed, we can drop this hack. |
@@ -206,6 +206,10 @@ do_install () { | |||
206 | install -d ${D}${sysconfdir}/OpenCL/vendors/ | 206 | install -d ${D}${sysconfdir}/OpenCL/vendors/ |
207 | install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd | 207 | install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd |
208 | 208 | ||
209 | if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then | ||
210 | cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2 | ||
211 | fi | ||
212 | |||
209 | # We'll only have one backend here so we rename it to generic name | 213 | # We'll only have one backend here so we rename it to generic name |
210 | # and avoid rework in other packages, when possible | 214 | # and avoid rework in other packages, when possible |
211 | mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0 | 215 | mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0 |
@@ -302,15 +306,22 @@ INSANE_SKIP_libgal-imx += "build-deps" | |||
302 | 306 | ||
303 | FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" | 307 | FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" |
304 | 308 | ||
305 | FILES_libgbm-imx_mx8 = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}" | 309 | FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS} ${libdir}/gbm_viv${SOLIBS}" |
306 | FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" | 310 | FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" |
307 | RDEPENDS_libgbm-imx_append_mx8 = " libdrm" | 311 | RDEPENDS_libgbm-imx_append_mx8 = " libdrm" |
308 | 312 | ||
309 | FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" | 313 | FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" |
310 | FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" | 314 | FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" |
311 | 315 | ||
312 | FILES_libopenvx-imx = "${libdir}/libOpenVX${SOLIBS} ${libdir}/libOpenVXC${SOLIBS} ${libdir}/libOpenVXU${SOLIBS}" | 316 | FILES_libopenvx-imx = " \ |
313 | FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libopenVX${SOLIBSDEV}" | 317 | ${libdir}/libOpenVX*${SOLIBS} \ |
318 | ${libdir}/libOpenVXC${SOLIBS} \ | ||
319 | ${libdir}/libOpenVXU${SOLIBS} \ | ||
320 | ${libdir}/libOvx*${SOLIBS} \ | ||
321 | ${libdir}/libovx*${SOLIBS} \ | ||
322 | " | ||
323 | FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libopenVX${SOLIBSDEV} " | ||
324 | RDEPENDS_libopenvx-imx = "libnn-imx" | ||
314 | 325 | ||
315 | FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" | 326 | FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" |
316 | FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" | 327 | FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" |
@@ -368,4 +379,7 @@ FILES_imx-gpu-viv-tools = "${bindir}/gmem_info" | |||
368 | FILES_imx-gpu-viv-demos = "/opt" | 379 | FILES_imx-gpu-viv-demos = "/opt" |
369 | INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" | 380 | INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" |
370 | 381 | ||
382 | FILES_libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" | ||
383 | FILES_libnn-imx-dev = "${includedir}/NNRT" | ||
384 | |||
371 | # COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" | 385 | # COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" |