diff options
Diffstat (limited to 'bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb')
| -rw-r--r-- | bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index f5c803e4..1138da86 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -6,17 +6,18 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" +PROVIDES += "virtual/libomxil" RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "d574b51a60a075baefe863670466ee24e6c4256e" +SRCREV = "188d3bfe4a0ac36b119a2cee35a6be8d0c68e09e" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20181120" +PV = "20200624" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ @@ -38,6 +39,9 @@ SRC_URI = "\ file://0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch \ file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ file://0018-Add-EGL_IMG_context_priority-related-defines.patch \ + file://0019-libfdt-Undefine-__wordsize-if-already-defined.patch \ + file://0020-openmaxil-add-pkg-config-file.patch \ + file://0021-cmake-Disable-format-overflow-warning-as-error.patch \ " S = "${WORKDIR}/git" @@ -64,6 +68,7 @@ do_install_append () { sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f} sed -i 's/include "vcos_platform_types.h"/include "pthreads\/vcos_platform_types.h"/g' ${f} done + rm -rf ${D}${prefix}${sysconfdir} if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "1" ]; then rm -rf ${D}${libdir}/libEGL* rm -rf ${D}${libdir}/libGLES* @@ -71,6 +76,10 @@ do_install_append () { rm -rf ${D}${libdir}/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/glesv2.pc \ ${D}${libdir}/pkgconfig/wayland-egl.pc rm -rf ${D}${includedir}/EGL ${D}${includedir}/GLES* ${D}${includedir}/KHR + else + ln -sf brcmglesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + ln -sf brcmegl.pc ${D}${libdir}/pkgconfig/egl.pc + ln -sf brcmvg.pc ${D}${libdir}/pkgconfig/vg.pc fi } @@ -88,7 +97,5 @@ FILES_${PN}-dev += "${includedir} \ FILES_${PN}-doc += "${datadir}/install" FILES_${PN}-dbg += "${libdir}/plugins/.debug" -PACKAGE_ARCH = "${MACHINE_ARCH}" - RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" |