From 699ccd99571119bdf28930a9f64d71650a48fe4c Mon Sep 17 00:00:00 2001 From: "chromebrew-actions[bot]" <220035932+chromebrew-actions[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:03:17 -0500 Subject: [PATCH] =?UTF-8?q?Update=20Weston,=20fix=20filelist=20generation?= =?UTF-8?q?=20bug,=20adjust=20commit=20list=20in=20PRs=20=E2=80=94=20aml?= =?UTF-8?q?=20=E2=86=92=201.0.0,neatvnc=20=E2=86=92=200.10,weston=20?= =?UTF-8?q?=E2=86=92=2014.0.2=20(#12476)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add unbuilt weston to updater-weston-14.0.2 * Add hwdata dep. Signed-off-by: Satadru Pramanik * Disable backend-vnc Signed-off-by: Satadru Pramanik * updater-weston-14.0.2: Build Run on linux/arm/v7. * updater-weston-14.0.2: Build Run on linux/amd64. * updater-weston-14.0.2: Package File Update Run on linux/amd64 container. * Adjust for neatvnc update. * lint Signed-off-by: Satadru Pramanik * lint Signed-off-by: Satadru Pramanik * Refactor weston to use new aml and neatvnc packages as deps. Signed-off-by: Satadru Pramanik * lint Signed-off-by: Satadru Pramanik * Fix commit list in Generate PR workflow. Signed-off-by: Satadru Pramanik * Remove solitary lint from commit list. Signed-off-by: Satadru Pramanik * updater-weston-14.0.2: Package File Update Run on linux/amd64 container. * updater-weston-14.0.2: Package File Update Run on linux/arm/v7 container. * Catch files in dot subdirs under HOME when generating filelists. Signed-off-by: Satadru Pramanik * Bump version further. Signed-off-by: Satadru Pramanik * updater-weston-14.0.2: Build Run on linux/amd64. * updater-weston-14.0.2: Build Run on linux/arm/v7. * updater-weston-14.0.2: Package File Update Run on linux/amd64 container. --------- Signed-off-by: Satadru Pramanik Co-authored-by: satmandu Co-authored-by: Satadru Pramanik Co-authored-by: chromebrew-actions[bot] --- .github/workflows/Generate-PR.yml | 2 +- bin/crew | 2 +- lib/const.rb | 2 +- manifest/armv7l/a/aml.filelist | 6 ++ manifest/armv7l/n/neatvnc.filelist | 6 ++ manifest/armv7l/w/weston.filelist | 100 +++++++++++++++-------------- manifest/x86_64/a/aml.filelist | 6 ++ manifest/x86_64/n/neatvnc.filelist | 6 ++ manifest/x86_64/w/weston.filelist | 100 +++++++++++++++-------------- packages/aml.rb | 23 +++++++ packages/neatvnc.rb | 37 +++++++++++ packages/weston.rb | 56 ++++++++++++---- tools/packages.yaml | 10 +++ 13 files changed, 242 insertions(+), 114 deletions(-) create mode 100644 manifest/armv7l/a/aml.filelist create mode 100644 manifest/armv7l/n/neatvnc.filelist create mode 100644 manifest/x86_64/a/aml.filelist create mode 100644 manifest/x86_64/n/neatvnc.filelist create mode 100644 packages/aml.rb create mode 100644 packages/neatvnc.rb diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml index a4659cb10..46260186f 100644 --- a/.github/workflows/Generate-PR.yml +++ b/.github/workflows/Generate-PR.yml @@ -349,7 +349,7 @@ jobs: fi git log --oneline -10 git checkout master && git pull - git log --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Build Run on\|Package File Update Run on" | tr '\n' '\0' | xargs -0 -n1 echo "- $*" >> /tmp/commits.txt + git log --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Merge branch 'master'\|Build Run on\|Package File Update Run on\|lint$" | tr '\n' '\0' | xargs -0 -n1 echo "- $*" >> /tmp/commits.txt git checkout "${{ inputs.branch || github.ref_name }}" - name: Get changed files id: changed-files diff --git a/bin/crew b/bin/crew index 1c17fe461..c0475fdb6 100755 --- a/bin/crew +++ b/bin/crew @@ -856,7 +856,7 @@ def prepare_package(destdir) strip_dir destdir # Create file list and calculate file size - filelist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*}"].select do |e| + filelist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*/**}"].select do |e| File.file?(e) || File.symlink?(e) end.to_h do |e| # Ignore symlinks to prevent duplicating calculation. diff --git a/lib/const.rb b/lib/const.rb index a4e646829..c5d7c670a 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.66.9' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.67.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/manifest/armv7l/a/aml.filelist b/manifest/armv7l/a/aml.filelist new file mode 100644 index 000000000..9435f0851 --- /dev/null +++ b/manifest/armv7l/a/aml.filelist @@ -0,0 +1,6 @@ +# Total size: 29875 +/usr/local/include/aml1/aml.h +/usr/local/lib/libaml.so +/usr/local/lib/libaml.so.1 +/usr/local/lib/libaml.so.1.0.0 +/usr/local/lib/pkgconfig/aml1.pc diff --git a/manifest/armv7l/n/neatvnc.filelist b/manifest/armv7l/n/neatvnc.filelist new file mode 100644 index 000000000..01493b990 --- /dev/null +++ b/manifest/armv7l/n/neatvnc.filelist @@ -0,0 +1,6 @@ +# Total size: 133419 +/usr/local/include/neatvnc.h +/usr/local/lib/libneatvnc.so +/usr/local/lib/libneatvnc.so.0 +/usr/local/lib/libneatvnc.so.0.0.0 +/usr/local/lib/pkgconfig/neatvnc.pc diff --git a/manifest/armv7l/w/weston.filelist b/manifest/armv7l/w/weston.filelist index 731eb8d3d..4af056be4 100644 --- a/manifest/armv7l/w/weston.filelist +++ b/manifest/armv7l/w/weston.filelist @@ -1,5 +1,6 @@ -# Total size: 2531785 +# Total size: 3798400 /home/chronos/user/.config/weston.ini +/usr/local/bin/di-edid-decode /usr/local/bin/wcap-decode /usr/local/bin/weston /usr/local/bin/weston-calibrator @@ -34,50 +35,51 @@ /usr/local/bin/weston-touch-calibrator /usr/local/bin/weston-transformed /usr/local/etc/pam.d/weston-remote-access -/usr/local/include/aml.h -/usr/local/include/libweston-13/libweston/backend-drm.h -/usr/local/include/libweston-13/libweston/backend-headless.h -/usr/local/include/libweston-13/libweston/backend-pipewire.h -/usr/local/include/libweston-13/libweston/backend-vnc.h -/usr/local/include/libweston-13/libweston/backend-wayland.h -/usr/local/include/libweston-13/libweston/backend-x11.h -/usr/local/include/libweston-13/libweston/config-parser.h -/usr/local/include/libweston-13/libweston/desktop.h -/usr/local/include/libweston-13/libweston/libweston.h -/usr/local/include/libweston-13/libweston/matrix.h -/usr/local/include/libweston-13/libweston/pipewire-plugin.h -/usr/local/include/libweston-13/libweston/plugin-registry.h -/usr/local/include/libweston-13/libweston/remoting-plugin.h -/usr/local/include/libweston-13/libweston/shell-utils.h -/usr/local/include/libweston-13/libweston/version.h -/usr/local/include/libweston-13/libweston/weston-log.h -/usr/local/include/libweston-13/libweston/windowed-output-api.h -/usr/local/include/libweston-13/libweston/xwayland-api.h -/usr/local/include/libweston-13/libweston/zalloc.h -/usr/local/include/neatvnc.h +/usr/local/include/libdisplay-info/cta.h +/usr/local/include/libdisplay-info/cvt.h +/usr/local/include/libdisplay-info/displayid.h +/usr/local/include/libdisplay-info/dmt.h +/usr/local/include/libdisplay-info/edid.h +/usr/local/include/libdisplay-info/gtf.h +/usr/local/include/libdisplay-info/info.h +/usr/local/include/libweston-14/libweston/backend-drm.h +/usr/local/include/libweston-14/libweston/backend-headless.h +/usr/local/include/libweston-14/libweston/backend-pipewire.h +/usr/local/include/libweston-14/libweston/backend-vnc.h +/usr/local/include/libweston-14/libweston/backend-wayland.h +/usr/local/include/libweston-14/libweston/backend-x11.h +/usr/local/include/libweston-14/libweston/config-parser.h +/usr/local/include/libweston-14/libweston/desktop.h +/usr/local/include/libweston-14/libweston/libweston.h +/usr/local/include/libweston-14/libweston/matrix.h +/usr/local/include/libweston-14/libweston/pipewire-plugin.h +/usr/local/include/libweston-14/libweston/plugin-registry.h +/usr/local/include/libweston-14/libweston/remoting-plugin.h +/usr/local/include/libweston-14/libweston/shell-utils.h +/usr/local/include/libweston-14/libweston/version.h +/usr/local/include/libweston-14/libweston/weston-log.h +/usr/local/include/libweston-14/libweston/windowed-output-api.h +/usr/local/include/libweston-14/libweston/xwayland-api.h +/usr/local/include/libweston-14/libweston/zalloc.h /usr/local/include/weston/weston.h -/usr/local/lib/libaml.so -/usr/local/lib/libaml.so.0 -/usr/local/lib/libaml.so.0.0.0 -/usr/local/lib/libneatvnc.so -/usr/local/lib/libneatvnc.so.0 -/usr/local/lib/libneatvnc.so.0.0.0 -/usr/local/lib/libweston-13.so -/usr/local/lib/libweston-13.so.0 -/usr/local/lib/libweston-13.so.0.0.0 -/usr/local/lib/libweston-13/drm-backend.so -/usr/local/lib/libweston-13/gl-renderer.so -/usr/local/lib/libweston-13/headless-backend.so -/usr/local/lib/libweston-13/pipewire-backend.so -/usr/local/lib/libweston-13/pipewire-plugin.so -/usr/local/lib/libweston-13/remoting-plugin.so -/usr/local/lib/libweston-13/vnc-backend.so -/usr/local/lib/libweston-13/wayland-backend.so -/usr/local/lib/libweston-13/x11-backend.so -/usr/local/lib/libweston-13/xwayland.so -/usr/local/lib/pkgconfig/aml.pc -/usr/local/lib/pkgconfig/libweston-13.pc -/usr/local/lib/pkgconfig/neatvnc.pc +/usr/local/lib/libdisplay-info.so +/usr/local/lib/libdisplay-info.so.0.1.1 +/usr/local/lib/libdisplay-info.so.1 +/usr/local/lib/libweston-14.so +/usr/local/lib/libweston-14.so.0 +/usr/local/lib/libweston-14.so.0.0.2 +/usr/local/lib/libweston-14/drm-backend.so +/usr/local/lib/libweston-14/gl-renderer.so +/usr/local/lib/libweston-14/headless-backend.so +/usr/local/lib/libweston-14/pipewire-backend.so +/usr/local/lib/libweston-14/pipewire-plugin.so +/usr/local/lib/libweston-14/remoting-plugin.so +/usr/local/lib/libweston-14/vnc-backend.so +/usr/local/lib/libweston-14/wayland-backend.so +/usr/local/lib/libweston-14/x11-backend.so +/usr/local/lib/libweston-14/xwayland.so +/usr/local/lib/pkgconfig/libdisplay-info.pc +/usr/local/lib/pkgconfig/libweston-14.pc /usr/local/lib/pkgconfig/weston.pc /usr/local/lib/weston/desktop-shell.so /usr/local/lib/weston/fullscreen-shell.so @@ -89,17 +91,17 @@ /usr/local/libexec/weston-desktop-shell /usr/local/libexec/weston-keyboard /usr/local/libexec/weston-simple-im -/usr/local/share/libweston-13/protocols/weston-content-protection.xml -/usr/local/share/libweston-13/protocols/weston-debug.xml -/usr/local/share/libweston-13/protocols/weston-direct-display.xml -/usr/local/share/libweston-13/protocols/weston-output-capture.xml +/usr/local/share/libweston-14/protocols/weston-content-protection.xml +/usr/local/share/libweston-14/protocols/weston-debug.xml +/usr/local/share/libweston-14/protocols/weston-direct-display.xml +/usr/local/share/libweston-14/protocols/weston-output-capture.xml /usr/local/share/man/man1/weston-debug.1.zst /usr/local/share/man/man1/weston.1.zst /usr/local/share/man/man5/weston.ini.5.zst /usr/local/share/man/man7/weston-bindings.7.zst /usr/local/share/man/man7/weston-drm.7.zst /usr/local/share/man/man7/weston-vnc.7.zst -/usr/local/share/pkgconfig/libweston-13-protocols.pc +/usr/local/share/pkgconfig/libweston-14-protocols.pc /usr/local/share/wayland-sessions/weston.desktop /usr/local/share/weston/background.png /usr/local/share/weston/border.png diff --git a/manifest/x86_64/a/aml.filelist b/manifest/x86_64/a/aml.filelist new file mode 100644 index 000000000..bc8aaadf0 --- /dev/null +++ b/manifest/x86_64/a/aml.filelist @@ -0,0 +1,6 @@ +# Total size: 39109 +/usr/local/include/aml1/aml.h +/usr/local/lib64/libaml.so +/usr/local/lib64/libaml.so.1 +/usr/local/lib64/libaml.so.1.0.0 +/usr/local/lib64/pkgconfig/aml1.pc diff --git a/manifest/x86_64/n/neatvnc.filelist b/manifest/x86_64/n/neatvnc.filelist new file mode 100644 index 000000000..58a525910 --- /dev/null +++ b/manifest/x86_64/n/neatvnc.filelist @@ -0,0 +1,6 @@ +# Total size: 197329 +/usr/local/include/neatvnc.h +/usr/local/lib64/libneatvnc.so +/usr/local/lib64/libneatvnc.so.0 +/usr/local/lib64/libneatvnc.so.0.0.0 +/usr/local/lib64/pkgconfig/neatvnc.pc diff --git a/manifest/x86_64/w/weston.filelist b/manifest/x86_64/w/weston.filelist index 29ab2f9ac..916323624 100644 --- a/manifest/x86_64/w/weston.filelist +++ b/manifest/x86_64/w/weston.filelist @@ -1,5 +1,6 @@ -# Total size: 3150559 +# Total size: 5543906 /home/chronos/user/.config/weston.ini +/usr/local/bin/di-edid-decode /usr/local/bin/wcap-decode /usr/local/bin/weston /usr/local/bin/weston-calibrator @@ -34,50 +35,51 @@ /usr/local/bin/weston-touch-calibrator /usr/local/bin/weston-transformed /usr/local/etc/pam.d/weston-remote-access -/usr/local/include/aml.h -/usr/local/include/libweston-13/libweston/backend-drm.h -/usr/local/include/libweston-13/libweston/backend-headless.h -/usr/local/include/libweston-13/libweston/backend-pipewire.h -/usr/local/include/libweston-13/libweston/backend-vnc.h -/usr/local/include/libweston-13/libweston/backend-wayland.h -/usr/local/include/libweston-13/libweston/backend-x11.h -/usr/local/include/libweston-13/libweston/config-parser.h -/usr/local/include/libweston-13/libweston/desktop.h -/usr/local/include/libweston-13/libweston/libweston.h -/usr/local/include/libweston-13/libweston/matrix.h -/usr/local/include/libweston-13/libweston/pipewire-plugin.h -/usr/local/include/libweston-13/libweston/plugin-registry.h -/usr/local/include/libweston-13/libweston/remoting-plugin.h -/usr/local/include/libweston-13/libweston/shell-utils.h -/usr/local/include/libweston-13/libweston/version.h -/usr/local/include/libweston-13/libweston/weston-log.h -/usr/local/include/libweston-13/libweston/windowed-output-api.h -/usr/local/include/libweston-13/libweston/xwayland-api.h -/usr/local/include/libweston-13/libweston/zalloc.h -/usr/local/include/neatvnc.h +/usr/local/include/libdisplay-info/cta.h +/usr/local/include/libdisplay-info/cvt.h +/usr/local/include/libdisplay-info/displayid.h +/usr/local/include/libdisplay-info/dmt.h +/usr/local/include/libdisplay-info/edid.h +/usr/local/include/libdisplay-info/gtf.h +/usr/local/include/libdisplay-info/info.h +/usr/local/include/libweston-14/libweston/backend-drm.h +/usr/local/include/libweston-14/libweston/backend-headless.h +/usr/local/include/libweston-14/libweston/backend-pipewire.h +/usr/local/include/libweston-14/libweston/backend-vnc.h +/usr/local/include/libweston-14/libweston/backend-wayland.h +/usr/local/include/libweston-14/libweston/backend-x11.h +/usr/local/include/libweston-14/libweston/config-parser.h +/usr/local/include/libweston-14/libweston/desktop.h +/usr/local/include/libweston-14/libweston/libweston.h +/usr/local/include/libweston-14/libweston/matrix.h +/usr/local/include/libweston-14/libweston/pipewire-plugin.h +/usr/local/include/libweston-14/libweston/plugin-registry.h +/usr/local/include/libweston-14/libweston/remoting-plugin.h +/usr/local/include/libweston-14/libweston/shell-utils.h +/usr/local/include/libweston-14/libweston/version.h +/usr/local/include/libweston-14/libweston/weston-log.h +/usr/local/include/libweston-14/libweston/windowed-output-api.h +/usr/local/include/libweston-14/libweston/xwayland-api.h +/usr/local/include/libweston-14/libweston/zalloc.h /usr/local/include/weston/weston.h -/usr/local/lib64/libaml.so -/usr/local/lib64/libaml.so.0 -/usr/local/lib64/libaml.so.0.0.0 -/usr/local/lib64/libneatvnc.so -/usr/local/lib64/libneatvnc.so.0 -/usr/local/lib64/libneatvnc.so.0.0.0 -/usr/local/lib64/libweston-13.so -/usr/local/lib64/libweston-13.so.0 -/usr/local/lib64/libweston-13.so.0.0.0 -/usr/local/lib64/libweston-13/drm-backend.so -/usr/local/lib64/libweston-13/gl-renderer.so -/usr/local/lib64/libweston-13/headless-backend.so -/usr/local/lib64/libweston-13/pipewire-backend.so -/usr/local/lib64/libweston-13/pipewire-plugin.so -/usr/local/lib64/libweston-13/remoting-plugin.so -/usr/local/lib64/libweston-13/vnc-backend.so -/usr/local/lib64/libweston-13/wayland-backend.so -/usr/local/lib64/libweston-13/x11-backend.so -/usr/local/lib64/libweston-13/xwayland.so -/usr/local/lib64/pkgconfig/aml.pc -/usr/local/lib64/pkgconfig/libweston-13.pc -/usr/local/lib64/pkgconfig/neatvnc.pc +/usr/local/lib64/libdisplay-info.so +/usr/local/lib64/libdisplay-info.so.0.1.1 +/usr/local/lib64/libdisplay-info.so.1 +/usr/local/lib64/libweston-14.so +/usr/local/lib64/libweston-14.so.0 +/usr/local/lib64/libweston-14.so.0.0.2 +/usr/local/lib64/libweston-14/drm-backend.so +/usr/local/lib64/libweston-14/gl-renderer.so +/usr/local/lib64/libweston-14/headless-backend.so +/usr/local/lib64/libweston-14/pipewire-backend.so +/usr/local/lib64/libweston-14/pipewire-plugin.so +/usr/local/lib64/libweston-14/remoting-plugin.so +/usr/local/lib64/libweston-14/vnc-backend.so +/usr/local/lib64/libweston-14/wayland-backend.so +/usr/local/lib64/libweston-14/x11-backend.so +/usr/local/lib64/libweston-14/xwayland.so +/usr/local/lib64/pkgconfig/libdisplay-info.pc +/usr/local/lib64/pkgconfig/libweston-14.pc /usr/local/lib64/pkgconfig/weston.pc /usr/local/lib64/weston/desktop-shell.so /usr/local/lib64/weston/fullscreen-shell.so @@ -89,17 +91,17 @@ /usr/local/libexec/weston-desktop-shell /usr/local/libexec/weston-keyboard /usr/local/libexec/weston-simple-im -/usr/local/share/libweston-13/protocols/weston-content-protection.xml -/usr/local/share/libweston-13/protocols/weston-debug.xml -/usr/local/share/libweston-13/protocols/weston-direct-display.xml -/usr/local/share/libweston-13/protocols/weston-output-capture.xml +/usr/local/share/libweston-14/protocols/weston-content-protection.xml +/usr/local/share/libweston-14/protocols/weston-debug.xml +/usr/local/share/libweston-14/protocols/weston-direct-display.xml +/usr/local/share/libweston-14/protocols/weston-output-capture.xml /usr/local/share/man/man1/weston-debug.1.zst /usr/local/share/man/man1/weston.1.zst /usr/local/share/man/man5/weston.ini.5.zst /usr/local/share/man/man7/weston-bindings.7.zst /usr/local/share/man/man7/weston-drm.7.zst /usr/local/share/man/man7/weston-vnc.7.zst -/usr/local/share/pkgconfig/libweston-13-protocols.pc +/usr/local/share/pkgconfig/libweston-14-protocols.pc /usr/local/share/wayland-sessions/weston.desktop /usr/local/share/weston/background.png /usr/local/share/weston/border.png diff --git a/packages/aml.rb b/packages/aml.rb new file mode 100644 index 000000000..140b0deef --- /dev/null +++ b/packages/aml.rb @@ -0,0 +1,23 @@ +# Adapted from Arch Linux aml PKGBUILD at: +# https://github.com/archlinux/svntogit-community/raw/packages/aml/trunk/PKGBUILD + +require 'buildsystems/meson' + +class Aml < Meson + description 'Another Main Loop' + homepage 'https://github.com/any1/aml' + version '1.0.0' + license 'ISC' + compatibility 'aarch64 armv7l x86_64' + source_url 'https://github.com/any1/aml.git' + git_hashtag "v#{version}" + binary_compression 'tar.zst' + + binary_sha256({ + aarch64: '608a9263a2d384fe68f2b73ab2155cb1e62b4c3441c5c0cd36693c4106365705', + armv7l: '608a9263a2d384fe68f2b73ab2155cb1e62b4c3441c5c0cd36693c4106365705', + x86_64: '524c27c5bdb6b6e4331b9c3872d8ccc66fca210aa7faef074087f802a8880387' + }) + + depends_on 'glibc' # R +end diff --git a/packages/neatvnc.rb b/packages/neatvnc.rb new file mode 100644 index 000000000..49f34b34a --- /dev/null +++ b/packages/neatvnc.rb @@ -0,0 +1,37 @@ +# Adapted from Arch Linux neatvnc PKGBUILD at: +# https://github.com/archlinux/svntogit-community/raw/packages/neatvnc/trunk/PKGBUILD + +require 'buildsystems/meson' + +class Neatvnc < Meson + description 'Fast and neat VNC server library' + homepage 'https://github.com/any1/neatvnc' + version '0.10-4962e0a' + license 'ISC' + compatibility 'aarch64 armv7l x86_64' + source_url 'https://github.com/any1/neatvnc.git' + # git_hashtag "v#{version}" + git_hashtag '4962e0af5d550b2c4fd34c79dbdca543f233d87c' + binary_compression 'tar.zst' + + binary_sha256({ + aarch64: 'c4a0dbf10bb184aaa1af6227a7528dc960730a8780bd96734511abeb53d2be8d', + armv7l: 'c4a0dbf10bb184aaa1af6227a7528dc960730a8780bd96734511abeb53d2be8d', + x86_64: 'a4e61730f3859e6bfb5514385b81dd00750d7fc11b4ebe87fe36affd0792f07a' + }) + + depends_on 'aml' # R + depends_on 'ffmpeg' # R + depends_on 'glibc' # R + depends_on 'gmp' # R + depends_on 'gnutls' # R + depends_on 'libdrm' # R + depends_on 'libjpeg_turbo' # R + depends_on 'mesa' # R + depends_on 'nettle' # R + depends_on 'pixman' # R + depends_on 'zlib' # R + + meson_options '-Djpeg=enabled \ + -Dtls=enabled' +end diff --git a/packages/weston.rb b/packages/weston.rb index 48a6f3c63..12228019b 100644 --- a/packages/weston.rb +++ b/packages/weston.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Weston < Meson description 'Weston is the reference implementation of a Wayland compositor, and a useful compositor in its own right.' homepage 'https://wayland.freedesktop.org' - version '13.0.0' + version '14.0.2' license 'MIT and CC-BY-SA-3.0' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.freedesktop.org/wayland/weston.git' @@ -11,24 +11,23 @@ class Weston < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: '463fafa09122de01bf4c8dbba4eb157ae9741aa0aec68561e3ef03878d262161', - armv7l: '463fafa09122de01bf4c8dbba4eb157ae9741aa0aec68561e3ef03878d262161', - x86_64: 'daacfeb06185e4ff3a0fef2b7845a7b4f2528a02d1569957d5a61a70cc3e5bd2' + aarch64: '645c1955ebbf4b2c0cf0aa027542010e30151f270b159bf56343ef9ac25f5b1a', + armv7l: '645c1955ebbf4b2c0cf0aa027542010e30151f270b159bf56343ef9ac25f5b1a', + x86_64: '5774bad67970b3b94b802f3b52fc1e4ce211aefdc4f335764c70f1556b4de6e1' }) + depends_on 'aml' # R depends_on 'cairo' # R depends_on 'dbus' => :build depends_on 'eudev' # R - depends_on 'ffmpeg' # R depends_on 'fontconfig' # R depends_on 'gcc_lib' # R - depends_on 'glibc' # R depends_on 'glib' # R - depends_on 'gmp' # R - depends_on 'gnutls' # R + depends_on 'glibc' # R depends_on 'graphite' => :build depends_on 'gstreamer' # R depends_on 'harfbuzz' # R + depends_on 'hwdata' => :build depends_on 'libdrm' # R depends_on 'libevdev' # R depends_on 'libglvnd' # R @@ -48,16 +47,15 @@ class Weston < Meson depends_on 'libxxf86vm' depends_on 'linux_pam' # R depends_on 'mesa' # R - depends_on 'nettle' # R + depends_on 'neatvnc' # R depends_on 'pango' # R depends_on 'pipewire' # R depends_on 'pixman' # R depends_on 'seatd' # R - depends_on 'wayland_protocols' depends_on 'wayland' # R + depends_on 'wayland_protocols' depends_on 'xcb_util_cursor' => :build depends_on 'xdg_base' => :build - depends_on 'zlib' # R meson_options "-Dbackend-default=wayland \ -Dbackend-drm=true \ @@ -68,8 +66,40 @@ class Weston < Meson -Dsystemd=false \ -Dxwayland-path=#{CREW_PREFIX}/bin/Xwayland" - def self.install - system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" + def self.patch + # https://gitlab.freedesktop.org/wayland/weston/-/issues/1049 + # file = File.read 'subprojects/neatvnc.wrap' + # file.gsub!('revision = v0.7.0', 'revision = v0.9.5') + # File.write('subprojects/neatvnc.wrap', file) + # + # Install Top of Tree neatvnc and aml as deps instead, and make + # weston handle those versions. + FileUtils.rm_rf 'subprojects/neatvnc' + FileUtils.rm_rf 'subprojects/aml.wrap' + FileUtils.rm_rf 'subprojects/neatvnc.wrap' + File.write 'weston_vnc.patch', <<~'VNCPATCHEOF' + --- a/libweston/backend-vnc/meson.build 2025-09-24 09:44:35.000000000 -0400 + +++ b/libweston/backend-vnc/meson.build 2025-09-24 10:36:09.653992251 -0400 + @@ -3,12 +3,12 @@ if not get_option('backend-vnc') + endif + + config_h.set('BUILD_VNC_COMPOSITOR', '1') + -dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + +dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.11.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif + + -dep_aml = dependency('aml', version: ['>= 0.3.0', '< 0.4.0'], required: false, fallback: ['aml', 'aml_dep']) + +dep_aml = dependency('aml1', version: ['>= 0.3.0', '< 1.1.0'], required: false, fallback: ['aml', 'aml_dep']) + if not dep_aml.found() + error('VNC backend requires libaml which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif + VNCPATCHEOF + system 'patch -Np1 -i weston_vnc.patch' + end + + meson_install_extras do File.write 'weston.ini', <<~WESTON_INI_EOF [core] xwayland=true diff --git a/tools/packages.yaml b/tools/packages.yaml index 87b3df8c4..ef14a179b 100644 --- a/tools/packages.yaml +++ b/tools/packages.yaml @@ -85,6 +85,11 @@ url: https://www.chiark.greenend.org.uk/~sgtatham/agedu/ activity: none --- kind: url +name: aml +url: https://github.com/any1/aml/releases +activity: low +--- +kind: url name: angle_grinder url: https://github.com/rcoh/angle-grinder/releases activity: medium @@ -6370,6 +6375,11 @@ url: https://www.remlab.net/files/ndisc6/ activity: none --- kind: url +name: neatvnc +url: https://github.com/any1/neatvnc/releases +activity: low +--- +kind: url name: nedit url: https://sourceforge.net/projects/nedit/files/nedit-source/ activity: none