Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
weston-ini-conf: (re)move Weston remoting support
[AGL/meta-agl.git]
/
meta-agl-core
/
recipes-graphics
/
wayland
/
agl-compositor_git.bb
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
a76da66
..
4e2f922
100644
(file)
--- a/
meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/
meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
@@
-8,15
+8,16
@@
SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=fac6abe0003c4d142ff8fa1f18316df0"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=fac6abe0003c4d142ff8fa1f18316df0"
-DEPENDS = "wayland wayland-protocols wayland-native weston \
- ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}"
+DEPENDS = "wayland wayland-protocols wayland-native weston"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "
7ef34e0c465a7596f87866e88bc5a9eed2ca7c05
"
+SRCREV = "
e3f8379e48433d1ba9236f959c2cb4c78da4c38a
"
AGL_BRANCH:aglnext = "next"
SRCREV:aglnext = "${AUTOREV}"
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 ?= ""
S = "${WORKDIR}/git"
PACKAGECONFIG ?= ""
@@
-26,13
+27,18
@@
PACKAGECONFIG[grpc-proxy] = "-Dgrpc-proxy=true,-Dgrpc-proxy=false,grpc grpc-nati
inherit meson pkgconfig python3native
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"
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 \
FILES:${PN} = " \
${bindir}/agl-compositor \
${bindir}/agl-screenshooter \
${libdir}/agl-compositor/libexec_compositor.so.0 \
- ${libdir}/agl-compositor/libexec_compositor.so.
0.0.0
\
+ ${libdir}/agl-compositor/libexec_compositor.so.
${AGL_COMPOSITOR_VERSION}
\
"
FILES:agl-shell-grpc-server = " \
"
FILES:agl-shell-grpc-server = " \
@@
-42,8
+48,6
@@
FILES:agl-shell-grpc-server = " \
RDEPENDS:${PN} += " \
agl-compositor-init \
xkeyboard-config \
RDEPENDS:${PN} += " \
agl-compositor-init \
xkeyboard-config \
- ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
- ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)} \
"
FILES:${PN}-dev += " \
"
FILES:${PN}-dev += " \