Update to 1.14.93

This commit is contained in:
Kalev Lember 2018-04-03 10:44:00 +02:00
parent cc3e55fda6
commit ac0e0c98bf
4 changed files with 6 additions and 55 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/wayland-1.14.0.tar.xz
/wayland-1.14.91.tar.xz
/wayland-1.14.92.tar.xz
/wayland-1.14.93.tar.xz

View File

@ -1,50 +0,0 @@
From 05fd07f4277414ae39a0336ac04c94a58ef2aa96 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Tue, 20 Mar 2018 11:01:02 +0000
Subject: [PATCH] wayland-egl: Ignore underscored symbols in ABI check
Rather than a hard-coded list of platform symbols, just ignore anything
prefaced with an underscore. This fixes breakage on ARM, which declares
several slightly different platform symbols to x86.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Fixes: 21b1f22eb056 ("wayland-egl: enhance the symbol test")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105620
Cc: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
---
egl/wayland-egl-symbols-check | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check
index 70fe1f4cfdb5..d04fd042f43a 100755
--- a/egl/wayland-egl-symbols-check
+++ b/egl/wayland-egl-symbols-check
@@ -16,14 +16,6 @@ fi
AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')"
-# Platform specific symbols.
-PLAT_FUNCS="__bss_start
-_edata
-_end
-_fini
-_init
-"
-
# Official ABI, taken from the header.
REQ_FUNCS="wl_egl_window_resize
wl_egl_window_create
@@ -32,8 +24,8 @@ wl_egl_window_get_attached_size
"
NEW_ABI=$(echo "$AVAIL_FUNCS" | while read func; do
+ echo "$func" | grep -q "^_" && continue
echo "$REQ_FUNCS" | grep -q "^$func$" && continue
- echo "$PLAT_FUNCS" | grep -q "^$func$" && continue
echo $func
done)
--
2.16.2

View File

@ -1 +1 @@
SHA512 (wayland-1.14.92.tar.xz) = d0ba6838652165d65399bd11e7e5abdf13a6cf9cb2c54fe5534ac7d3056922844001b237064224c82bb7dcea2b92111c1c25e798c2d39e5637cc1615c318e618
SHA512 (wayland-1.14.93.tar.xz) = 6d617b2025505e599c25c8a42062e7f78fe5bcbab58a96fcbc6afb54cf4b92e44a3f5a096c8d55e58539530f98a549f1cd20615c378cc591d50abdefa56b7656

View File

@ -1,5 +1,5 @@
Name: wayland
Version: 1.14.92
Version: 1.14.93
Release: 1%{?dist}
Summary: Wayland Compositor Infrastructure
@ -7,9 +7,6 @@ License: MIT
URL: http://wayland.freedesktop.org/
Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch
BuildRequires: chrpath
BuildRequires: docbook-style-xsl
BuildRequires: doxygen
@ -138,6 +135,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%{_libdir}/libwayland-server.so.0*
%changelog
* Tue Apr 03 2018 Kalev Lember <klember@redhat.com> - 1.14.93-1
- Update to 1.14.93
* Tue Mar 20 2018 Kalev Lember <klember@redhat.com> - 1.14.92-1
- Update to 1.14.92
- Remove F22 upgrade path obsoletes