summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2017-10-17 19:51:30 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-08 22:24:04 +0000
commit6bb1f4a88b634ea25281e9eacd377aeac41b9c5e (patch)
treecc02a1209b95a41c246113012e7ff0237e947c1c
parent1714a598b189027939588d88847a19bbabe72905 (diff)
downloadpoky-6bb1f4a88b634ea25281e9eacd377aeac41b9c5e.tar.gz
wayland-protocols: upgrade to 1.11
usesysrootprefixforpkgdatadirvariable.patch was a backport from 1.11, no longer needed. (From OE-Core rev: d4cb21de07f6f63f5aa703d6dc4f13a1e0d74b44) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch27
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols_1.11.bb (renamed from meta/recipes-graphics/wayland/wayland-protocols_1.10.bb)5
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
deleted file mode 100644
index 0922a4d2c2..0000000000
--- a/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001
2From: Tomek Bury <tomek.bury@broadcom.com>
3Date: Fri, 4 Aug 2017 16:16:38 +0100
4Subject: Use sysroot prefix for pkgdatadir variable
5
6The pc_sysroot is automatically added to cflags and libs but not
7to 'pkg-config --variable'
8
9Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43]
10
11Reviewed-by: Daniel Stone <daniels@collabora.com>
12
13diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in
14index a26744c..379be06 100644
15--- a/wayland-protocols.pc.in
16+++ b/wayland-protocols.pc.in
17@@ -1,6 +1,6 @@
18 prefix=@prefix@
19 datarootdir=@datarootdir@
20-pkgdatadir=@datadir@/@PACKAGE@
21+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
22
23 Name: Wayland Protocols
24 Description: Wayland protocol files
25--
26cgit v0.10.2
27
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb
index 1ff12c607b..26b0094c3c 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" 10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
11 11
12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
13 file://usesysrootprefixforpkgdatadirvariable.patch \
14 " 13 "
15SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60" 14SRC_URI[md5sum] = "8d0338556d77ad86d7fca84ff086af88"
16SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" 15SRC_URI[sha256sum] = "3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804"
17 16
18inherit allarch autotools pkgconfig 17inherit allarch autotools pkgconfig
19 18