wayland-utils: update to 1.2.0

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

diff --git a/libs/wayland-utils/Makefile b/libs/wayland-utils/Makefile
index f9bc2371c61942185687da1ca432f0ea0b53ffa8..2e8afaeac4fca1dc886830f9bae25cfe8653e7f7 100644 (file)
--- a/libs/wayland-utils/Makefile
+++ b/libs/wayland-utils/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wayland-utils
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=1.2.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://wayland.freedesktop.org/releases/
-PKG_HASH:=64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(PKG_VERSION)/downloads/
+PKG_HASH:=d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=MIT
@@ -24,15 +24,12 @@ define Package/wayland-info
   SUBMENU:=Video
   TITLE:=wayland-utils
   URL:=https://wayland.freedesktop.org/
-  DEPENDS:=+libwayland +wayland-protocols
+  DEPENDS:=+libwayland +wayland-protocols +libdrm
 endef
 
 define Package/wayland-info/description
 endef
 
-MESON_ARGS += \
-       -Dscanner_bin="$(STAGING_DIR_HOSTPKG)/bin/wayland-scanner"
-
 define Package/wayland-info/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wayland-info $(1)/usr/bin

diff --git a/libs/wayland-utils/patches/001-fix-wayland-scanner-detect.patch b/libs/wayland-utils/patches/001-fix-wayland-scanner-detect.patch
deleted file mode 100644 (file)
index 5a4dcd8..0000000
--- a/libs/wayland-utils/patches/001-fix-wayland-scanner-detect.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/wayland-info/meson.build
-+++ b/wayland-info/meson.build
-@@ -1,5 +1,9 @@
- dep_scanner = dependency('wayland-scanner', native: true)
--prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
-+if (get_option('scanner_bin') == '')
-+      prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
-+else
-+      prog_scanner = find_program(get_option('scanner_bin'))
-+endif
- 
- dep_wp = dependency('wayland-protocols', version: '>= 1.18')
- dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,6 @@
-+option(
-+      'scanner_bin',
-+      description: 'Path to wayland-scanner binary',
-+      type: 'string',
-+      value: ''
-+)