From 5bc7fe56920e9bc5a9a2193f1e0e5fc179e3fb00 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 5 Nov 2024 05:29:35 +0000 Subject: [PATCH] weston: update to 14.0.1 Move to frameworks which is a batter match than libs. Signed-off-by: Daniel Golle --- {libs => frameworks}/weston/Makefile | 72 +++++++++++-------- .../weston/patches/100-timespec.patch | 0 .../001-fix-wayland-scanner-detect.patch | 25 ------- 3 files changed, 41 insertions(+), 56 deletions(-) rename {libs => frameworks}/weston/Makefile (52%) rename {libs => frameworks}/weston/patches/100-timespec.patch (100%) delete mode 100644 libs/weston/patches/001-fix-wayland-scanner-detect.patch diff --git a/libs/weston/Makefile b/frameworks/weston/Makefile similarity index 52% rename from libs/weston/Makefile rename to frameworks/weston/Makefile index daf5ae1..417c2a8 100644 --- a/libs/weston/Makefile +++ b/frameworks/weston/Makefile @@ -1,19 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=weston -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 -#PKG_VERSION:=9.0.0 -#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -#PKG_SOURCE_URL:=https://wayland.freedesktop.org/releases/ -#PKG_HASH:=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitlab.freedesktop.org/wayland/weston.git -PKG_SOURCE_DATE:=2021-11-23 -PKG_VERSION:=10.0.0~pre0-$(PKG_SOURCE_DATE) -PKG_SOURCE_VERSION:=a8827940274391d658ef2ea69bce4fade45bff5f -PKG_MIRROR_HASH:=a24b98f7a1ae5a75a690af81a5b194d20379679c4e7be33867d8edb8f3b2bc7d +PKG_VERSION:=14.0.1 +PKG_MAJOR_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION))) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gitlab.freedesktop.org/wayland/$(PKG_NAME)/-/releases/$(PKG_VERSION)/downloads/ +PKG_HASH:=a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT @@ -26,12 +20,12 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/meson.mk define Package/weston - SECTION:=libs - CATEGORY:=Libraries - SUBMENU:=Video + SECTION:=video-frameworks + CATEGORY:=Video + SUBMENU:=Frameworks and Toolkits TITLE:=weston URL:=https://wayland.freedesktop.org/ - DEPENDS:=+gstreamer1-plugins-base +libcairo +libevdev \ + DEPENDS:=+gstreamer1-plugins-base +libcairo +libevdev +libdisplay-info \ +libgst1allocators +libgst1app +libgst1video +libgstreamer1 +libinput \ +libmesa +libpango +libseat +libwayland +libwebp +libxkbcommon +pixman \ +seatd +wayland-protocols +xkeyboard-config @@ -41,24 +35,36 @@ define Package/weston/description endef MESON_ARGS += \ - -Dlauncher-logind=false \ - -Dweston-launch=false \ - -Dlauncher-libseat=true \ -Dbackend-drm=true \ -Dbackend-drm-screencast-vaapi=false \ -Dbackend-headless=false \ + -Dbackend-pipewire=false \ -Dbackend-rdp=false \ + -Dbackend-vnc=false \ -Dbackend-x11=false \ + -Dbackend-wayland=true \ + -Dscreenshare=false \ -Dxwayland=false \ -Dcolor-management-lcms=false \ - -Dcolor-management-colord=false \ -Dsystemd=false \ -Dpipewire=false \ - -Dtest-gl-renderer=false \ -Dtest-junit-xml=false \ -Ddemo-clients=true \ - -Ddoc=false \ - -Dscanner_bin="$(STAGING_DIR_HOSTPKG)/bin/wayland-scanner" + -Drenderer-gl=true \ + -Dshell-desktop=true \ + -Dshell-fullscreen=true \ + -Dshell-ivi=true \ + -Dshell-kiosk=true \ + -Dremoting=false \ + -Dshell-desktop=true \ + -Dshell-fullscreen=true \ + -Dshell-ivi=true \ + -Dshell-kiosk=true \ + -Dimage-jpeg=true \ + -Dimage-webp=true \ + -Dtools=calibrator,debug,info,terminal,touch-calibrator \ + -Dtests=false \ + -Ddoc=false define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -71,19 +77,23 @@ endef define Package/weston/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/libweston-10 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libweston-10/*.so* $(1)/usr/lib/libweston-10/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/libweston-$(PKG_MAJOR_VERSION) + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libweston-$(PKG_MAJOR_VERSION)/*.so* \ + $(1)/usr/lib/libweston-$(PKG_MAJOR_VERSION) $(INSTALL_DIR) $(1)/usr/lib/weston - $(CP) $(PKG_INSTALL_DIR)/usr/lib/weston/*.so* $(1)/usr/lib/weston/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/weston/*.so* $(1)/usr/lib/weston $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/libexec - $(CP) $(PKG_INSTALL_DIR)/usr/libexec/* $(1)/usr/libexec/ - $(INSTALL_DIR) $(1)/usr/share/libweston-10/protocols - $(CP) $(PKG_INSTALL_DIR)/usr/share/libweston-10/protocols/* $(1)/usr/share/libweston-10/protocols/ + $(CP) $(PKG_INSTALL_DIR)/usr/libexec/* $(1)/usr/libexec + $(INSTALL_DIR) $(1)/usr/share/libweston-$(PKG_MAJOR_VERSION)/protocols + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/libweston-$(PKG_MAJOR_VERSION)/protocols/* \ + $(1)/usr/share/libweston-$(PKG_MAJOR_VERSION)/protocols $(INSTALL_DIR) $(1)/usr/share/weston - $(CP) $(PKG_INSTALL_DIR)/usr/share/weston/* $(1)/usr/share/weston/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/weston/* $(1)/usr/share/weston endef $(eval $(call BuildPackage,weston)) diff --git a/libs/weston/patches/100-timespec.patch b/frameworks/weston/patches/100-timespec.patch similarity index 100% rename from libs/weston/patches/100-timespec.patch rename to frameworks/weston/patches/100-timespec.patch diff --git a/libs/weston/patches/001-fix-wayland-scanner-detect.patch b/libs/weston/patches/001-fix-wayland-scanner-detect.patch deleted file mode 100644 index 277c45b..0000000 --- a/libs/weston/patches/001-fix-wayland-scanner-detect.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -242,3 +242,9 @@ option( - value: false, - description: 'Generate documentation' - ) -+option( -+ 'scanner_bin', -+ description: 'Path to wayland-scanner binary', -+ type: 'string', -+ value: '' -+) ---- a/protocol/meson.build -+++ b/protocol/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.19') - dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') -- 2.30.2