projects / feed / video.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 29d0443)
weston: update to 14.0.1
authorDaniel Golle <daniel@makrotopia.org>
Tue, 5 Nov 2024 05:29:35 +0000 (05:29 +0000)
committerDaniel Golle <daniel@makrotopia.org>
Thu, 5 Dec 2024 01:15:41 +0000 (01:15 +0000)
Move to frameworks which is a batter match than libs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
frameworks/weston/Makefile [new file with mode: 0644] patch | blob
frameworks/weston/patches/100-timespec.patch [new file with mode: 0644] patch | blob
libs/weston/Makefile [deleted file] patch | blob | history
libs/weston/patches/001-fix-wayland-scanner-detect.patch [deleted file] patch | blob | history
libs/weston/patches/100-timespec.patch [deleted file] patch | blob | history

diff --git a/frameworks/weston/Makefile b/frameworks/weston/Makefile
new file mode 100644 (file)
index 0000000..417c2a8
--- /dev/null
+++ b/frameworks/weston/Makefile
@@ -0,0 +1,99 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=weston
+PKG_RELEASE:=1
+
+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 <daniel@makrotopia.org>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=wayland/host
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
+
+define Package/weston
+  SECTION:=video-frameworks
+  CATEGORY:=Video
+  SUBMENU:=Frameworks and Toolkits
+  TITLE:=weston
+  URL:=https://wayland.freedesktop.org/
+  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
+endef
+
+define Package/weston/description
+endef
+
+MESON_ARGS += \
+       -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 \
+       -Dsystemd=false \
+       -Dpipewire=false \
+       -Dtest-junit-xml=false \
+       -Ddemo-clients=true \
+       -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
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
+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-$(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
+       $(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-$(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
+endef
+
+$(eval $(call BuildPackage,weston))
diff --git a/frameworks/weston/patches/100-timespec.patch b/frameworks/weston/patches/100-timespec.patch
new file mode 100644 (file)
index 0000000..7c2c8f6
--- /dev/null
+++ b/frameworks/weston/patches/100-timespec.patch
@@ -0,0 +1,10 @@
+--- a/tests/timespec-test.c
++++ b/tests/timespec-test.c
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ 
++#include <time.h>
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <stdio.h>
diff --git a/libs/weston/Makefile b/libs/weston/Makefile
deleted file mode 100644 (file)
index daf5ae1..0000000
--- a/libs/weston/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=weston
-PKG_RELEASE:=$(AUTORELEASE)
-
-#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_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=wayland/host
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/meson.mk
-
-define Package/weston
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=Video
-  TITLE:=weston
-  URL:=https://wayland.freedesktop.org/
-  DEPENDS:=+gstreamer1-plugins-base +libcairo +libevdev \
-       +libgst1allocators +libgst1app +libgst1video +libgstreamer1 +libinput \
-       +libmesa +libpango +libseat +libwayland +libwebp +libxkbcommon +pixman \
-       +seatd +wayland-protocols +xkeyboard-config
-endef
-
-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-rdp=false \
-       -Dbackend-x11=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"
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
-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/
-       $(INSTALL_DIR) $(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/
-       $(INSTALL_DIR) $(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/001-fix-wayland-scanner-detect.patch b/libs/weston/patches/001-fix-wayland-scanner-detect.patch
deleted file mode 100644 (file)
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')
diff --git a/libs/weston/patches/100-timespec.patch b/libs/weston/patches/100-timespec.patch
deleted file mode 100644 (file)
index 7c2c8f6..0000000
--- a/libs/weston/patches/100-timespec.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/timespec-test.c
-+++ b/tests/timespec-test.c
-@@ -25,6 +25,7 @@
- 
- #include "config.h"
- 
-+#include <time.h>
- #include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
Mirror of video feed