* [PR PATCH] weston: update to 13.0.0.
@ 2023-12-28 22:59 Calandracas606
2023-12-28 23:23 ` [PR PATCH] [Updated] " Calandracas606
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-28 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1397 bytes --]
There is a new pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7151 bytes --]
From d3df71dd56bd1aafc79e4578b9b1071d301c2e9b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
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 <orphan@voidlinux.org>"
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <dem.procopiou@gmail.com>"
-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() {
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
@ 2023-12-28 23:23 ` Calandracas606
2023-12-29 0:15 ` Calandracas606
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-28 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7151 bytes --]
From b5dfebaa71d73fc7681e19717389e6467494f64b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/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 <dem.procopiou@gmail.com>"
-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() {
From 7ae9a106df1fc37dfbfb281c09687d4209038669 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
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 dea2c4c4311004bf66dc7229204d81cf61700382 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/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 <orphan@voidlinux.org>"
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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
2023-12-28 23:23 ` [PR PATCH] [Updated] " Calandracas606
@ 2023-12-29 0:15 ` Calandracas606
2023-12-29 0:26 ` Calandracas606
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 0:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7431 bytes --]
From b5dfebaa71d73fc7681e19717389e6467494f64b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/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 <dem.procopiou@gmail.com>"
-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() {
From 427e62f0f6f038d9632799fda3daf0baaf17202f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/removed-packages/template | 1 +
srcpkgs/weston-colord | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/weston-colord
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/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 6291c5143eae16f7b8d7f1498b74dc749ee6743c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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..1eeca3efcffe2 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,34 @@
# 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 <orphan@voidlinux.org>"
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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -41,21 +37,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
2023-12-28 23:23 ` [PR PATCH] [Updated] " Calandracas606
2023-12-29 0:15 ` Calandracas606
@ 2023-12-29 0:26 ` Calandracas606
2023-12-29 0:43 ` [PR REVIEW] " classabbyamp
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7648 bytes --]
From b5dfebaa71d73fc7681e19717389e6467494f64b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/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 <dem.procopiou@gmail.com>"
-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() {
From eb41cc1796de828c9e8b8ab822cad1e58ef1c0fe Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/weston-colord | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 120000 srcpkgs/weston-colord
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/removed-packages/template b/srcpkgs/removed-packages/template
index fd9d350d4ad4f..02e8e04b62ffe 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20231114
+version=0.1.20231228
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -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 34997063048b7e8e39f6299e42e1c207c320948c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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..1eeca3efcffe2 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,34 @@
# 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 <orphan@voidlinux.org>"
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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -41,21 +37,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (2 preceding siblings ...)
2023-12-29 0:26 ` Calandracas606
@ 2023-12-29 0:43 ` classabbyamp
2023-12-29 0:44 ` [PR PATCH] [Updated] " Calandracas606
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2023-12-29 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#discussion_r1437933309
Comment:
```suggestion
weston-colord<=9.0.0_1
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (3 preceding siblings ...)
2023-12-29 0:43 ` [PR REVIEW] " classabbyamp
@ 2023-12-29 0:44 ` Calandracas606
2023-12-29 1:01 ` Calandracas606
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7650 bytes --]
From b5dfebaa71d73fc7681e19717389e6467494f64b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/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 <dem.procopiou@gmail.com>"
-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() {
From e83195aadb540c89240a6c04f6de54f1e6aeb7e5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/weston-colord | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 120000 srcpkgs/weston-colord
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/removed-packages/template b/srcpkgs/removed-packages/template
index fd9d350d4ad4f..604a0d6e11209 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20231114
+version=0.1.20231228
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -695,6 +695,7 @@ replaces="
vte290<=0.36.5_5
vte<=0.28.2_16
w_scan<=20170107_1
+ weston-colord<=9.0.0_1
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 87a149264ed74086ed535d0a7f31f593859f5527 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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..1eeca3efcffe2 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,34 @@
# 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 <orphan@voidlinux.org>"
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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -41,21 +37,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (4 preceding siblings ...)
2023-12-29 0:44 ` [PR PATCH] [Updated] " Calandracas606
@ 2023-12-29 1:01 ` Calandracas606
2023-12-29 4:28 ` [PR REVIEW] " sgn
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 1:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7527 bytes --]
From 97fc60ea24c18b3d5b2f7411d6ba8f689220b943 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/3] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 8fc921ee60db5064725faaba8fb31ac3e3ef5669 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/weston-colord | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 120000 srcpkgs/weston-colord
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/removed-packages/template b/srcpkgs/removed-packages/template
index fd9d350d4ad4f..604a0d6e11209 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20231114
+version=0.1.20231228
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -695,6 +695,7 @@ replaces="
vte290<=0.36.5_5
vte<=0.28.2_16
w_scan<=20170107_1
+ weston-colord<=9.0.0_1
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 7de61c3e8f5011238f4dd71e8c0037e28ff79c62 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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..1eeca3efcffe2 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,34 @@
# 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 <orphan@voidlinux.org>"
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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -41,21 +37,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (5 preceding siblings ...)
2023-12-29 1:01 ` Calandracas606
@ 2023-12-29 4:28 ` sgn
2023-12-29 4:30 ` sgn
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2023-12-29 4:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#discussion_r1437978488
Comment:
This should go to `weston` instead.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (6 preceding siblings ...)
2023-12-29 4:28 ` [PR REVIEW] " sgn
@ 2023-12-29 4:30 ` sgn
2023-12-29 16:10 ` [PR PATCH] [Updated] " Calandracas606
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2023-12-29 4:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#discussion_r1437978930
Comment:
```suggestion
lib32disabled=yes
replaces="weston-colord>=0"
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (7 preceding siblings ...)
2023-12-29 4:30 ` sgn
@ 2023-12-29 16:10 ` Calandracas606
2023-12-29 16:11 ` [PR REVIEW] " Calandracas606
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7391 bytes --]
From 97fc60ea24c18b3d5b2f7411d6ba8f689220b943 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/3] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 9633a7c50924188f48caae9fcad52134bbda4311 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/weston-colord | 1 -
srcpkgs/weston/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/weston-colord
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-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
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index d58693b255012..c94d9f1791c8e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -21,6 +21,7 @@ distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz
checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe
system_groups="weston-launch"
lib32disabled=yes
+replaces="weston-colord>=0"
# Package build options
build_options="elogind vaapi"
From 4c8023f09a0b3768c96f8e6fad53eb62487858cf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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 c94d9f1791c8e..f361f954ce8fa 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,39 +1,35 @@
# 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 <orphan@voidlinux.org>"
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
replaces="weston-colord>=0"
# 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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -42,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (8 preceding siblings ...)
2023-12-29 16:10 ` [PR PATCH] [Updated] " Calandracas606
@ 2023-12-29 16:11 ` Calandracas606
2024-01-26 14:39 ` [PR PATCH] [Updated] " Calandracas606
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2023-12-29 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#discussion_r1438320680
Comment:
should I squash the removed weston colord into the main update weston commit?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (9 preceding siblings ...)
2023-12-29 16:11 ` [PR REVIEW] " Calandracas606
@ 2024-01-26 14:39 ` Calandracas606
2024-01-26 14:39 ` Calandracas606
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2024-01-26 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 7391 bytes --]
From 423874e9b964874befe9e7ce596f895cc1e5da9e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/3] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 4a99006127364a10e7ac6d5ce5ba8f4f9d4427cd Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:44:27 -0500
Subject: [PATCH 2/3] Removed package: weston-colord
---
common/shlibs | 1 -
srcpkgs/weston-colord | 1 -
srcpkgs/weston/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/weston-colord
diff --git a/common/shlibs b/common/shlibs
index d3e2fafb0e0f4..35ce291359237 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,7 +2957,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-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
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index d58693b255012..c94d9f1791c8e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -21,6 +21,7 @@ distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz
checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe
system_groups="weston-launch"
lib32disabled=yes
+replaces="weston-colord>=0"
# Package build options
build_options="elogind vaapi"
From b1e00aae21a2895a66ee6453ab8fe484a19ae505 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 3/3] weston: update to 13.0.0.
---
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 +++--
srcpkgs/weston/template | 39 +++++++++++----------------
3 files changed, 20 insertions(+), 26 deletions(-)
create mode 120000 srcpkgs/weston-devel
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 c94d9f1791c8e..f361f954ce8fa 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,39 +1,35 @@
# 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 <orphan@voidlinux.org>"
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
replaces="weston-colord>=0"
# 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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -42,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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (10 preceding siblings ...)
2024-01-26 14:39 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-01-26 14:39 ` Calandracas606
2024-01-26 14:44 ` [PR PATCH] [Updated] " Calandracas606
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2024-01-26 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#issuecomment-1912172864
Comment:
What can I do to fix the CI failures? I believe its a false positive, since weston-colord is replaced
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (11 preceding siblings ...)
2024-01-26 14:39 ` Calandracas606
@ 2024-01-26 14:44 ` Calandracas606
2024-01-26 14:49 ` Calandracas606
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2024-01-26 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 6309 bytes --]
From a0455c9c3727425dab53247f81e1c57ac7e505f8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/2] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 5792e13e550108696690ee5c6cbe4cfbd25bff55 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 2/2] weston: update to 13.0.0.
---
common/shlibs | 1 -
srcpkgs/{weston-colord => weston-devel} | 0
srcpkgs/weston/files/README.voidlinux | 6 ++--
srcpkgs/weston/template | 40 ++++++++++---------------
4 files changed, 20 insertions(+), 27 deletions(-)
rename srcpkgs/{weston-colord => weston-devel} (100%)
diff --git a/common/shlibs b/common/shlibs
index 27763bf428b75..82a21cfa274f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2939,7 +2939,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-colord b/srcpkgs/weston-devel
similarity index 100%
rename from srcpkgs/weston-colord
rename to srcpkgs/weston-devel
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..f361f954ce8fa 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,35 @@
# 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 <orphan@voidlinux.org>"
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
+replaces="weston-colord>=0"
# 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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (12 preceding siblings ...)
2024-01-26 14:44 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-01-26 14:49 ` Calandracas606
2024-01-26 15:01 ` Calandracas606
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2024-01-26 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
I would be happy to adopt the weston package if needed.
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 6371 bytes --]
From a0455c9c3727425dab53247f81e1c57ac7e505f8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/2] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 60f497fba6f5b6d85a5b61194f0c6b2664c26432 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 2/2] weston: update to 13.0.0. Adopt.
---
common/shlibs | 1 -
srcpkgs/{weston-colord => weston-devel} | 0
srcpkgs/weston/files/README.voidlinux | 6 ++--
srcpkgs/weston/template | 42 ++++++++++---------------
4 files changed, 21 insertions(+), 28 deletions(-)
rename srcpkgs/{weston-colord => weston-devel} (100%)
diff --git a/common/shlibs b/common/shlibs
index 27763bf428b75..82a21cfa274f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2939,7 +2939,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-colord b/srcpkgs/weston-devel
similarity index 100%
rename from srcpkgs/weston-colord
rename to srcpkgs/weston-devel
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..2cd577ee32056 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,35 @@
# 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 <orphan@voidlinux.org>"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
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
+replaces="weston-colord>=0"
# 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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -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
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (13 preceding siblings ...)
2024-01-26 14:49 ` Calandracas606
@ 2024-01-26 15:01 ` Calandracas606
2024-01-27 5:04 ` [PR PATCH] [Updated] " sgn
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Calandracas606 @ 2024-01-26 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#issuecomment-1912210045
Comment:
@skmpz FYI this PR has changes to your lcms2 package
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (14 preceding siblings ...)
2024-01-26 15:01 ` Calandracas606
@ 2024-01-27 5:04 ` sgn
2024-01-27 5:05 ` sgn
2024-01-27 11:20 ` [PR PATCH] [Merged]: " sgn
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2024-01-27 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/Calandracas606/void-packages weston13
https://github.com/void-linux/void-packages/pull/47965
weston: update to 13.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- aarch64-musl
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/47965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weston13-47965.patch --]
[-- Type: text/x-diff, Size: 6645 bytes --]
From e716984167039112119343e076ea43759b93f717 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:47:22 -0500
Subject: [PATCH 1/2] lcms2: update to 2.16.
---
srcpkgs/lcms2/template | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 4607451d89e24..0116b8698b670 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,18 +1,23 @@
# 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 <dem.procopiou@gmail.com>"
-license="MIT"
+license="MIT $(vopt_if plugins GPL-3.0-or-later)"
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 (GPL-3.0-or-later)"
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
lcms2-devel_package() {
@@ -21,9 +26,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() {
From 514733c92ba6c08957ac2b130fe09c28907e1b56 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 28 Dec 2023 17:42:53 -0500
Subject: [PATCH 2/2] weston: update to 13.0.0. Adopt.
---
common/shlibs | 1 -
srcpkgs/weston-devel | 1 +
srcpkgs/weston/files/README.voidlinux | 6 ++--
srcpkgs/weston/template | 48 +++++++++++++--------------
4 files changed, 28 insertions(+), 28 deletions(-)
create mode 120000 srcpkgs/weston-devel
diff --git a/common/shlibs b/common/shlibs
index 27763bf428b75..82a21cfa274f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2939,7 +2939,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..ba9eda8f8c0d0 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,35 @@
# 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 <orphan@voidlinux.org>"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
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
+replaces="weston-colord>=0"
# 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*)
- build_options_default+=" vaapi"
- configure_args+=" -Drenderer-gl=true"
+ build_options_default="vaapi"
;;
armv*)
- configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+ configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
;;
esac
@@ -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
}
}
@@ -73,3 +65,9 @@ weston-xwayland_package() {
vmove "/usr/lib/libweston-${version%%.*}/xwayland.so"
}
}
+
+weston-colord_package() {
+ short_desc+=" - colord (folded into weston)"
+ build_style=meta
+ depends="${sourcepkg}"
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (15 preceding siblings ...)
2024-01-27 5:04 ` [PR PATCH] [Updated] " sgn
@ 2024-01-27 5:05 ` sgn
2024-01-27 11:20 ` [PR PATCH] [Merged]: " sgn
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2024-01-27 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/47965#issuecomment-1912996291
Comment:
> What can I do to fix the CI failures? I believe its a false positive, since weston-colord is replaced
It's not false positive. Your change will stage the repository.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: weston: update to 13.0.0.
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
` (16 preceding siblings ...)
2024-01-27 5:05 ` sgn
@ 2024-01-27 11:20 ` sgn
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2024-01-27 11:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]
There's a merged pull request on the void-packages repository
weston: update to 13.0.0.
https://github.com/void-linux/void-packages/pull/47965
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
- Tested the colour management, and HDR features using DRM back-end
- Only tested the DRM, and nested wayland back-ends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- aarch64-musl
- armv6l-musl (crossbuild)
- armv7l (crossbuild)
- aarch64 (crossbuild)
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-01-27 11:20 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-28 22:59 [PR PATCH] weston: update to 13.0.0 Calandracas606
2023-12-28 23:23 ` [PR PATCH] [Updated] " Calandracas606
2023-12-29 0:15 ` Calandracas606
2023-12-29 0:26 ` Calandracas606
2023-12-29 0:43 ` [PR REVIEW] " classabbyamp
2023-12-29 0:44 ` [PR PATCH] [Updated] " Calandracas606
2023-12-29 1:01 ` Calandracas606
2023-12-29 4:28 ` [PR REVIEW] " sgn
2023-12-29 4:30 ` sgn
2023-12-29 16:10 ` [PR PATCH] [Updated] " Calandracas606
2023-12-29 16:11 ` [PR REVIEW] " Calandracas606
2024-01-26 14:39 ` [PR PATCH] [Updated] " Calandracas606
2024-01-26 14:39 ` Calandracas606
2024-01-26 14:44 ` [PR PATCH] [Updated] " Calandracas606
2024-01-26 14:49 ` Calandracas606
2024-01-26 15:01 ` Calandracas606
2024-01-27 5:04 ` [PR PATCH] [Updated] " sgn
2024-01-27 5:05 ` sgn
2024-01-27 11:20 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).