openwrt-mirror/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2025-12-21 17:04:37 +04:00
Code Issues Packages Projects Releases Wiki Activity

wayland-utils: update to 1.2.0

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2024-11-05 04:45:58 +00:00
parent af0b6d4d74
commit f43ba4f676
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/wayland-utils/Makefile
View File

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

22
libs/wayland-utils/patches/001-fix-wayland-scanner-detect.patch
View File

@@ -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: ''
+)