X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fagl-compositor_git.bb;h=4e2f92229e383886deb75f12ab299647f17f9108;hb=refs%2Fchanges%2F89%2F29689%2F2;hp=db42a8f1347f13c6cb6ecbbf77c8d7c7dadfc5c8;hpb=128d81f7b8c9653b334fab613ba9e9782fff7e21;p=AGL%2Fmeta-agl.git diff --git a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb index db42a8f13..4e2f92229 100644 --- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb +++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb @@ -11,11 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fac6abe0003c4d142ff8fa1f18316df0" DEPENDS = "wayland wayland-protocols wayland-native weston" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "01171e9abf8a132aa872bf2880e11a464a8ce3cc" +SRCREV = "e3f8379e48433d1ba9236f959c2cb4c78da4c38a" AGL_BRANCH:aglnext = "next" SRCREV:aglnext = "${AUTOREV}" -PV = "0.0.10+git${SRCPV}" +AGL_COMPOSITOR_VERSION = "0.0.22" + +PV = "${AGL_COMPOSITOR_VERSION}+git${SRCPV}" S = "${WORKDIR}/git" PACKAGECONFIG ?= "" @@ -25,13 +27,18 @@ PACKAGECONFIG[grpc-proxy] = "-Dgrpc-proxy=true,-Dgrpc-proxy=false,grpc grpc-nati inherit meson pkgconfig python3native +# Reuse include file from upstream weston since we have the same requirements +require recipes-graphics/wayland/required-distro-features.inc + PACKAGES =+ "agl-shell-grpc-server" +LDFLAGS:append:riscv64 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + FILES:${PN} = " \ ${bindir}/agl-compositor \ ${bindir}/agl-screenshooter \ ${libdir}/agl-compositor/libexec_compositor.so.0 \ - ${libdir}/agl-compositor/libexec_compositor.so.0.0.21 \ + ${libdir}/agl-compositor/libexec_compositor.so.${AGL_COMPOSITOR_VERSION} \ " FILES:agl-shell-grpc-server = " \ @@ -41,7 +48,6 @@ FILES:agl-shell-grpc-server = " \ RDEPENDS:${PN} += " \ agl-compositor-init \ xkeyboard-config \ - ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ " FILES:${PN}-dev += " \