mirror of
https://github.com/openwrt/video.git
synced 2025-12-21 17:04:37 +04:00
wayland: update to 1.23.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=wayland
|
PKG_NAME:=wayland
|
||||||
PKG_VERSION:=1.20.0
|
PKG_VERSION:=1.23.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/-/releases/$(PKG_VERSION)/downloads/
|
||||||
PKG_HASH:=b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725
|
PKG_HASH:=05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2
|
||||||
|
|
||||||
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
@@ -27,6 +27,7 @@ define Package/libwayland
|
|||||||
TITLE:=wayland
|
TITLE:=wayland
|
||||||
URL:=https://wayland.freedesktop.org/
|
URL:=https://wayland.freedesktop.org/
|
||||||
DEPENDS:=+libexpat +libffi
|
DEPENDS:=+libexpat +libffi
|
||||||
|
USERID:=:video=40
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libwayland/description
|
define Package/libwayland/description
|
||||||
@@ -47,6 +48,7 @@ endef
|
|||||||
MESON_HOST_ARGS += \
|
MESON_HOST_ARGS += \
|
||||||
-Dscanner=true \
|
-Dscanner=true \
|
||||||
-Dlibraries=false \
|
-Dlibraries=false \
|
||||||
|
-Dtests=false \
|
||||||
-Ddocumentation=false \
|
-Ddocumentation=false \
|
||||||
-Ddtd_validation=true
|
-Ddtd_validation=true
|
||||||
|
|
||||||
@@ -66,11 +68,16 @@ define Build/InstallDev
|
|||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
|
||||||
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
|
||||||
|
$(SED) 's/^wayland_scanner=$$$${bindir}\/\(.*\)/wayland_scanner=$$$${prefix_hostpkg}\/bin\/\1/' $(1)/usr/lib/pkgconfig/wayland-scanner.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libwayland/install
|
define Package/libwayland/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
|
||||||
|
$(INSTALL_DIR) $(1)/etc/profile.d
|
||||||
|
$(INSTALL_DATA) ./files/xdg-runtime-dir.profile $(1)/etc/profile.d/xdr-runtime-dir.sh
|
||||||
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/drm
|
||||||
|
$(INSTALL_BIN) ./files/video.hotplug $(1)/etc/hotplug.d/drm/wayland
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/wayland-scanner/install
|
define Package/wayland-scanner/install
|
||||||
|
|||||||
6
frameworks/wayland/files/video.hotplug
Normal file
6
frameworks/wayland/files/video.hotplug
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
[ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && {
|
||||||
|
chown root:video "/dev/$DEVNAME"
|
||||||
|
chmod 0660 "/dev/$DEVNAME"
|
||||||
|
}
|
||||||
2
frameworks/wayland/files/xdg-runtime-dir.profile
Normal file
2
frameworks/wayland/files/xdg-runtime-dir.profile
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export XDG_RUNTIME_DIR="/tmp/run/$LOGNAME"
|
||||||
|
mkdir -m 0700 -p "$XDG_RUNTIME_DIR"
|
||||||
@@ -1,30 +1,30 @@
|
|||||||
--- a/src/meson.build
|
--- a/src/meson.build
|
||||||
+++ b/src/meson.build
|
+++ b/src/meson.build
|
||||||
@@ -70,8 +70,12 @@ if get_option('scanner')
|
@@ -81,8 +81,12 @@ if get_option('scanner')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if meson.is_cross_build() or not get_option('scanner')
|
if meson.is_cross_build() or not get_option('scanner')
|
||||||
- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
||||||
- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
|
- wayland_scanner_for_build = find_program(scanner_dep.get_variable(pkgconfig: 'wayland_scanner'))
|
||||||
+ if (get_option('scanner_bin') != '')
|
+ if (get_option('scanner_bin') != '')
|
||||||
+ wayland_scanner_for_build = get_option('scanner_bin')
|
+ wayland_scanner_for_build = get_option('scanner_bin')
|
||||||
+ else
|
+ else
|
||||||
+ scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
+ scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
||||||
+ wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
|
+ wayland_scanner_for_build = find_program(scanner_dep.get_variable(pkgconfig: 'wayland_scanner'))
|
||||||
+ endif
|
+ endif
|
||||||
else
|
else
|
||||||
wayland_scanner_for_build = wayland_scanner
|
wayland_scanner_for_build = wayland_scanner
|
||||||
endif
|
endif
|
||||||
--- a/meson_options.txt
|
--- a/meson_options.txt
|
||||||
+++ b/meson_options.txt
|
+++ b/meson_options.txt
|
||||||
@@ -10,6 +10,10 @@ option('tests',
|
@@ -6,6 +6,10 @@ option('scanner',
|
||||||
description: 'Compile Wayland tests',
|
description: 'Compile wayland-scanner binary',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
value: 'true')
|
value: true)
|
||||||
+option('scanner_bin',
|
+option('scanner_bin',
|
||||||
+ description: 'Path to wayland-scanner binary',
|
+ description: 'Path to wayland-scanner binary',
|
||||||
+ type: 'string',
|
+ type: 'string',
|
||||||
+ value: '')
|
+ value: '')
|
||||||
option('documentation',
|
option('tests',
|
||||||
description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
|
description: 'Compile Wayland tests',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
|||||||
Reference in New Issue
Block a user