mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
wayland-protocols: Upgrade 1.3 -> 1.4
Remove backported patch. (From OE-Core rev: 4c6de7dc96648db134cff85250026e307d0700b0) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d18a28c09a
commit
534cc8612c
@@ -1,29 +0,0 @@
|
|||||||
Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
|
|
||||||
will fail if the host cpu is not recognised (which can happen when
|
|
||||||
e.g. Yocto builds for "allarch").
|
|
||||||
|
|
||||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
|
||||||
Upstream-Status: Backport [cc276dfa41]
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 5b48b1a..3d45a4b 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
|
|
||||||
|
|
||||||
-AC_CANONICAL_HOST
|
|
||||||
-AC_CANONICAL_BUILD
|
|
||||||
-
|
|
||||||
AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
|
|
||||||
AC_PATH_PROG([wayland_scanner], [wayland-scanner])
|
|
||||||
if test x$wayland_scanner = x; then
|
|
||||||
- if test x$host = x$build; then
|
|
||||||
+ if test "x$cross_compiling" != "xyes"; then
|
|
||||||
PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
|
|
||||||
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
|
|
||||||
else
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
+3
-3
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
|
|||||||
file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
|
file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
|
||||||
|
|
||||||
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
||||||
file://dont-use-AC_CANONICAL.patch"
|
"
|
||||||
SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0"
|
SRC_URI[md5sum] = "fd8089abf13a1d04e4baa6509ee72baf"
|
||||||
SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f"
|
SRC_URI[sha256sum] = "014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572"
|
||||||
|
|
||||||
inherit allarch autotools pkgconfig
|
inherit allarch autotools pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user