diff options
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch | 27 | ||||
| -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 @@ -From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001 -From: Tomek Bury <tomek.bury@broadcom.com> -Date: Fri, 4 Aug 2017 16:16:38 +0100 -Subject: Use sysroot prefix for pkgdatadir variable - -The pc_sysroot is automatically added to cflags and libs but not -to 'pkg-config --variable' - -Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43] - -Reviewed-by: Daniel Stone <daniels@collabora.com> - -diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in -index a26744c..379be06 100644 ---- a/wayland-protocols.pc.in -+++ b/wayland-protocols.pc.in -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - - Name: Wayland Protocols - Description: Wayland protocol files --- -cgit v0.10.2 - 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 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://usesysrootprefixforpkgdatadirvariable.patch \ " -SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60" -SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" +SRC_URI[md5sum] = "8d0338556d77ad86d7fca84ff086af88" +SRC_URI[sha256sum] = "3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804" inherit allarch autotools pkgconfig |