From d3df71dd56bd1aafc79e4578b9b1071d301c2e9b Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 28 Dec 2023 17:42:53 -0500 Subject: [PATCH 1/3] weston: update to 13.0.0. --- common/shlibs | 1 - srcpkgs/weston-devel | 1 + srcpkgs/weston/files/README.voidlinux | 6 +++-- srcpkgs/weston/template | 34 ++++++++++----------------- 4 files changed, 18 insertions(+), 24 deletions(-) create mode 120000 srcpkgs/weston-devel diff --git a/common/shlibs b/common/shlibs index cdee5382e28f6..22ab5e783fce2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2948,7 +2948,6 @@ libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 libqalculate.so.22 libqalculate-3.20.1_1 -libweston-9.so.0 weston-9.0.0_1 libostree-1.so.1 ostree-2023.1_1 librhash.so.1 rhash-1.4.4_1 libserialport.so.0 libserialport-0.1.1_1 diff --git a/srcpkgs/weston-devel b/srcpkgs/weston-devel new file mode 120000 index 0000000000000..d103f6c5f48ab --- /dev/null +++ b/srcpkgs/weston-devel @@ -0,0 +1 @@ +weston \ No newline at end of file diff --git a/srcpkgs/weston/files/README.voidlinux b/srcpkgs/weston/files/README.voidlinux index 907324979cd8b..85677e8a85fed 100644 --- a/srcpkgs/weston/files/README.voidlinux +++ b/srcpkgs/weston/files/README.voidlinux @@ -1,2 +1,4 @@ -Add your user to the "weston-launch" group to be able to run weston -with a regular user and then execute "weston-launch". +"weston-launch" was deprecated and has been removed +To launch weston, enable either elogind, or seatd and run "weston" + +For more information on session management: https://docs.voidlinux.org/config/session-management.html diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index d58693b255012..8f4f4b5ed10c0 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,30 +1,27 @@ # Template file for 'weston' pkgname=weston -version=9.0.0 +version=13.0.0 revision=1 build_style=meson -configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false - -Dremoting=false -Dlauncher-logind=$(vopt_if elogind true false) - -Dbackend-drm-screencast-vaapi=$(vopt_if vaapi true false) -Dpipewire=false" +configure_args=" $(vopt_bool vaapi backend-drm-screencast-vaapi) " hostmakedepends="pkg-config wayland-devel wayland-protocols" makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel - libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel - $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel) - libevdev-devel" + libinput-devel libxcb-devel libXcursor-devel dbus-devel libevdev-devel + xorg-server-xwayland neatvnc-devel libseat-devel pipewire-devel + gst-plugins-base1-devel libdisplay-info-devel freerdp-devel freerdp-server-devel + $(vopt_if vaapi 'glu-devel libva-devel')" short_desc="Reference implementation of a Wayland compositor" maintainer="Orphaned " license="MIT" homepage="https://wayland.freedesktop.org/" distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe -system_groups="weston-launch" +checksum=52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a lib32disabled=yes # Package build options -build_options="elogind vaapi" -desc_option_elogind="Use elogind for suidless startup" +build_options="vaapi" case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|aarch64*|ppc*) @@ -41,21 +38,16 @@ pre_configure() { } post_install() { - # weston-launch must be setuid - if [ -z "$build_option_elogind" ]; then - chmod u+s ${DESTDIR}/usr/bin/weston-launch - fi vlicense COPYING LICENSE - # Remove development files. - rm -rf ${DESTDIR}/usr/include - rm -rf ${DESTDIR}/usr/lib/pkgconfig vdoc "${FILESDIR}/README.voidlinux" } -weston-colord_package() { - short_desc+=" - colord plugin" +weston-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { - vmove /usr/lib/weston/cms-colord.so + vmove usr/include + vmove usr/lib/pkgconfig } } From 70c8f248c2e9fe595ba34f96c4d7e40349e0ce75 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 28 Dec 2023 17:44:27 -0500 Subject: [PATCH 2/3] Removed package: weston-colord --- srcpkgs/removed-packages/template | 1 + srcpkgs/weston-colord | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 srcpkgs/weston-colord diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index fd9d350d4ad4f..98459a9dc569b 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -695,6 +695,7 @@ replaces=" vte290<=0.36.5_5 vte<=0.28.2_16 w_scan<=20170107_1 + weston-colord<=9.0.0 wicd-gtk<=1.7.4_6 wireguard-go<=0.0.20181222_2 wireshark-gtk<=3.0.7_1 diff --git a/srcpkgs/weston-colord b/srcpkgs/weston-colord deleted file mode 120000 index d103f6c5f48ab..0000000000000 --- a/srcpkgs/weston-colord +++ /dev/null @@ -1 +0,0 @@ -weston \ No newline at end of file From a90017a27b2da9f89cfdf4e19aa5bf5574cc3875 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 28 Dec 2023 17:47:22 -0500 Subject: [PATCH 3/3] lcms2: update to 2.16. --- srcpkgs/lcms2/template | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template index 4607451d89e24..80d9ecb1e81fe 100644 --- a/srcpkgs/lcms2/template +++ b/srcpkgs/lcms2/template @@ -1,18 +1,26 @@ # Template file for 'lcms2' pkgname=lcms2 -version=2.15 +version=2.16 revision=1 build_style=meson -makedepends="tiff-devel" +configure_args="-Dutils=true -Dsamples=true $(vopt_bool plugins fastfloat) $(vopt_bool plugins threaded)" +hostmakedepends="pkg-config" +makedepends="tiff-devel libjpeg-turbo-devel" short_desc="Small-footprint color management engine, version 2" maintainer="skmpz " -license="MIT" +license="$(vopt_if plugins GPL-3.0-or-later MIT)" homepage="https://littlecms.com" distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz" -checksum=b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39 +checksum=d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51 +build_options="plugins" +build_options_default="plugins" +desc_option_plugins="Build with threaded and fast float plugins, package becomes GPL-3.0-or-later" post_install() { - vlicense COPYING + if [ -z "$build_option_plugins" ]; then + # Package is GPL-3.0-or-later when built with plugins + vlicense LICENSE + fi } lcms2-devel_package() { @@ -21,9 +29,10 @@ lcms2-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" + vmove usr/lib/liblcms2.so } } + lcms2-tools_package() { short_desc+=" - bundled tools" pkg_install() {