wayland: update to version 1.19.92 (1.20 beta)

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/frameworks/wayland/Makefile b/frameworks/wayland/Makefile
index 05be356c9228dc10f798811a2680e4749efb0d87..48d53bd248e0538320fdc85338706f7f12f9d46d 100644 (file)
--- a/frameworks/wayland/Makefile
+++ b/frameworks/wayland/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wayland
-PKG_VERSION:=1.19.0
+PKG_VERSION:=1.19.92
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://wayland.freedesktop.org/releases/
-PKG_HASH:=baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15
+PKG_SOURCE_URL:=https://wayland.freedesktop.org/releases
+PKG_HASH:=f8cbd8a8c713ed393e63e7c6ac81c6b9ef5a49a2b631717377fa78b80ac34cfa
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=MIT
@@ -14,6 +14,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=libffi/host libxml2/host expat/host wayland/host
+HOST_BUILD_DEPENDS:=$(PKG_BUILD_DEPENDS)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -49,6 +50,8 @@ MESON_HOST_ARGS += \
        -Ddocumentation=false \
        -Ddtd_validation=true
 
+HOST_LDFLAGS += $(STAGING_DIR_HOST)/lib/libz.a -lm
+
 MESON_ARGS += \
        -Dscanner=true \
        -Dlibraries=true \

diff --git a/frameworks/wayland/patches/001-fix-wayland-scanner-detect.patch b/frameworks/wayland/patches/001-fix-wayland-scanner-detect.patch
index b9d462fccd022147b69b89b8cb705cae91813549..6a066019928864c7abccd0609f698fd959b582b5 100644 (file)
--- a/frameworks/wayland/patches/001-fix-wayland-scanner-detect.patch
+++ b/frameworks/wayland/patches/001-fix-wayland-scanner-detect.patch
@@ -1,6 +1,6 @@
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -59,8 +59,12 @@ if get_option('scanner')
+@@ -70,8 +70,12 @@ if get_option('scanner')
  endif
  
  if meson.is_cross_build() or not get_option('scanner')
@@ -17,8 +17,8 @@
  endif
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -6,6 +6,10 @@ option('scanner',
-   description: 'Compile wayland-scanner binary',
+@@ -10,6 +10,10 @@ option('tests',
+   description: 'Compile Wayland tests',
    type: 'boolean',
    value: 'true')
 +option('scanner_bin',