diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-12 18:16:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-19 03:47:13 +0100 |
| commit | c4012542401ce202e5e4d61ebcbb38fc875d19a4 (patch) | |
| tree | c90e83fd4d3e8458e38d9edf1c1b9cfc28dc49e5 /package/wayland | |
| parent | cee21cdad9a4686842ccb54ef3b4485dcb4ab1f7 (diff) | |
weston: update to 11.0.0, update dependencies
Diffstat (limited to 'package/wayland')
| -rw-r--r-- | package/wayland/Makefile | 24 | ||||
| -rw-r--r-- | package/wayland/patches/patch-src_wayland-client_pc_in | 8 |
2 files changed, 19 insertions, 13 deletions
diff --git a/package/wayland/Makefile b/package/wayland/Makefile index c23942924..e46b96838 100644 --- a/package/wayland/Makefile +++ b/package/wayland/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland -PKG_VERSION:= 1.19.0 +PKG_VERSION:= 1.21.0 PKG_RELEASE:= 1 -PKG_HASH:= baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 +PKG_HASH:= 6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac PKG_DESCR:= wayland PKG_SECTION:= x11/libs PKG_BUILDDEP:= wayland-host meson-host -HOST_BUILDDEP:= expat-host libxml2-host -PKG_SITES:= https://wayland.freedesktop.org/releases/ +HOST_BUILDDEP:= expat-host libxml2-host libffi-host +PKG_SITES:= https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(PKG_VERSION)/downloads/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/host.mk @@ -20,16 +20,30 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,WAYLAND,wayland,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,WAYLAND,wayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_CONFIGURE_ARGS+= --disable-documentation +HOST_MESON_FLAGS+= -Ddocumentation=false \ + -Dtests=false \ + -Dscanner=true MESON_FLAGS+= -Ddocumentation=false \ + -Dtests=false \ + -Dlibraries=true \ -Dscanner=false WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +HOST_STYLE:= meson CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson +hostpost-install: + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/src/wayland-scanner \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(CP) $(WRKBUILD)/meson-private/wayland-scanner.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + + wayland-install: $(INSTALL_DIR) $(IDIR_WAYLAND)/usr/lib $(CP) $(WRKINST)/usr/lib/libwayland*.so* \ diff --git a/package/wayland/patches/patch-src_wayland-client_pc_in b/package/wayland/patches/patch-src_wayland-client_pc_in deleted file mode 100644 index 0b665638c..000000000 --- a/package/wayland/patches/patch-src_wayland-client_pc_in +++ /dev/null @@ -1,8 +0,0 @@ ---- wayland-1.19.0.orig/src/wayland-client.pc.in 2021-01-27 17:49:04.000000000 +0100 -+++ wayland-1.19.0/src/wayland-client.pc.in 2021-11-14 05:40:27.300530861 +0100 -@@ -9,4 +9,4 @@ Name: Wayland Client - Description: Wayland client side library - Version: @WAYLAND_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lwayland-client -+Libs: -L${libdir} -lwayland-client -lffi |