From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kguiaddons, plasma-framework, mesa, gst-plugins-*: add wayland build option
Date: Mon, 25 Jul 2022 17:39:21 +0200 [thread overview]
Message-ID: <20220725153921.moVKiE-dkw1cvZ7zyGTiJNhTbO6DVgpXde5yMNEevss@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37201@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org wayland-option
https://github.com/void-linux/void-packages/pull/37201
kguiaddons, plasma-framework, mesa, gst-plugins-*: add wayland build option
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37201.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayland-option-37201.patch --]
[-- Type: text/x-diff, Size: 10696 bytes --]
From 1aa02832fdee0231e5f00c78025a3f940b05f685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:17 +0200
Subject: [PATCH 1/6] kguiaddons: add wayland and x11 build options
---
srcpkgs/kguiaddons/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index db66b082a692..5a4fba58fc70 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -3,11 +3,12 @@ pkgname=kguiaddons
version=5.94.0
revision=1
build_style=cmake
-configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ $(vopt_bool wayland WITH_WAYLAND)"
hostmakedepends="kcoreaddons pkg-config extra-cmake-modules
- wayland-devel qt5-wayland qt5-host-tools qt5-tools-devel"
-makedepends="qt5-tools-devel qt5-x11extras-devel xcb-util-devel
- plasma-wayland-protocols qt5-wayland-devel wayland-devel"
+ $(vopt_if wayland 'wayland-devel qt5-wayland') qt5-host-tools qt5-tools-devel"
+makedepends="qt5-tools-devel $(vopt_if x11 qt5-x11extras-devel)
+ $(vopt_if wayland 'plasma-wayland-protocols xcb-util-devel qt5-wayland-devel wayland-devel')"
short_desc="KDE frameworks - Addons to QtGui"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
@@ -15,6 +16,9 @@ homepage="https://invent.kde.org/frameworks/kguiaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f23182a7268d37cbc32eaa77bdc9dddc6429a8eff912f57841f6d96c71973873
+build_options="wayland x11"
+build_options_default="wayland x11"
+
kguiaddons-devel_package() {
short_desc+=" - development"
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
From f20d49d2328f2f4b22eab5445543858f0891cb07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:17 +0200
Subject: [PATCH 2/6] gst-plugins-bad1: wayland build option
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 4684ac8c4dc6..9b44958ec1ea 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -16,14 +16,14 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
-Dgme=$(vopt_if gme enabled disabled)
-Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
- orc wayland-devel"
+ orc $(vopt_if wayland wayland-devel)"
makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
xvidcore-devel jasper-devel libmodplug-devel libcurl-devel lcms2-devel
libvdpau-devel libgsm-devel librtmp-devel libass-devel libvpx-devel
- soundtouch-devel opus-devel libwebp-devel wayland-devel x265-devel
+ soundtouch-devel opus-devel libwebp-devel $(vopt_if wayland wayland-devel) x265-devel
libsrtp-devel libopenal-devel gtk+3-devel libnice-devel libbluetooth-devel
libgudev-devel libusb-devel libaom-devel libbs2b-devel chromaprint-devel
fdk-aac-devel flite-devel fluidsynth-devel liblrdf-devel ladspa-sdk
@@ -39,8 +39,8 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
-build_options="gir gme"
-build_options_default="gir"
+build_options="gir gme wayland"
+build_options_default="gir wayland"
desc_option_gme="Build with Game Music Emulator support"
CFLAGS="-fcommon"
From 0e1cc2c561374705b6dd49dd6fa0a77c34923026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:17 +0200
Subject: [PATCH 3/6] mesa: add wayland build option
---
srcpkgs/mesa/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 1a0de99bd990..d8ba564ea8c5 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -5,14 +5,14 @@ revision=1
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
-Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
- -Dlmsensors=enabled -Dplatforms=x11,wayland
+ -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
- wayland-protocols wayland-devel"
+ $(vopt_if wayland 'wayland-protocols wayland-devel')"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- wayland-devel wayland-protocols llvm libsensors-devel
+ $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
libarchive-devel"
depends="libglvnd"
@@ -24,6 +24,9 @@ changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
checksum=b98f32ba7aa2a1ff5725fb36eb999c693079f0ca16f70aa2f103e2b6c3f093e3
+build_options="wayland"
+build_options_default="wayland"
+
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
fi
From 1eaf5e5e3a2bbd27ea70f056c917ce02bc6ca14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:18 +0200
Subject: [PATCH 4/6] plasma-framework: add wayland build option
---
srcpkgs/plasma-framework/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 670f0892379a..796eeb474386 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -6,8 +6,8 @@ build_style=cmake
configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
kpackage kconfig python3 qt5-host-tools qt5-qmake gettext kdoctools"
-makedepends="kactivities5-devel kdeclarative-devel kdoctools-devel kwayland-devel
- kirigami2-devel"
+makedepends="kactivities5-devel kdeclarative-devel kdoctools-devel kirigami2-devel
+ $(vopt_if wayland kwayland-devel)"
depends="qt5-quickcontrols qt5-graphicaleffects qt5-multimedia"
checkdepends="mesa-dri"
short_desc="Foundational libraries, components, and tools of the Plasma workspaces"
@@ -22,6 +22,9 @@ do_check() {
ctest -E 'plasma-configmodeltest|coronatest|plasma-sortfiltermodeltest|i18ndcheck|plasma-dialogstatetest|plasma-iconitemtest|plasma-themetest|dialognativetest'
}
+build_options="wayland"
+build_options_default="wayland"
+
plasma-framework-devel_package() {
short_desc+=" - development"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From bb3ca974454ba1bc6066bf8de10d987d238d02b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:18 +0200
Subject: [PATCH 5/6] gst-plugins-base1: add wayland build option
---
srcpkgs/gst-plugins-base1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 43629c9f27c9..28e93ece32c7 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -9,13 +9,13 @@ configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
-Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
-Dintrospection=$(vopt_if gir enabled disabled)
-Dsndio=$(vopt_if sndio enabled disabled)"
-hostmakedepends="gettext pkg-config glib-devel orc wayland-devel"
+hostmakedepends="gettext pkg-config glib-devel orc $(vopt_if wayland wayland-devel)"
makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel
- wayland-devel wayland-protocols"
+ $(vopt_if wayland 'wayland-devel wayland-protocols')"
depends="orc>=0.4.18 gstreamer1>=${version}"
checkdepends="mesa-dri"
short_desc="GStreamer Base Plug-ins (v1.x)"
@@ -25,8 +25,8 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
-build_options="cdparanoia gir sndio"
-build_options_default="cdparanoia gir"
+build_options="cdparanoia gir sndio wayland"
+build_options_default="cdparanoia gir wayland"
desc_option_sndio="Enable sndio support (unsupported, known to be problematic)"
# Remove sndio if not upstreamed
From 831311e922223de722a7c1aaa4c4b5f945ffbead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 19 May 2022 22:23:18 +0200
Subject: [PATCH 6/6] gst-plugins-good1: ad wayland build option
---
srcpkgs/gst-plugins-good1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 8d0d6c828672..dfe764857f78 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -15,7 +15,7 @@ makedepends="
pulseaudio-devel orc-devel libXv-devel wavpack-devel
v4l-utils-devel jack-devel speex-devel libvpx-devel lame-devel
mpg123-devel twolame-devel qt5-devel qt5-declarative-devel
- qt5-x11extras-devel qt5-wayland-devel
+ qt5-x11extras-devel $(vopt_if wayland qt5-wayland-devel)
$(vopt_if gtk3 gtk+3-devel)"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
@@ -25,8 +25,8 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 wayland"
+build_options_default="gtk3 wayland"
do_check() {
ninja -C build test || : #Fails on i686
next prev parent reply other threads:[~2022-07-25 15:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 20:26 [PR PATCH] " Chocimier
2022-07-13 19:09 ` [PR PATCH] [Updated] " Chocimier
2022-07-25 15:39 ` Chocimier [this message]
2022-07-25 17:28 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220725153921.moVKiE-dkw1cvZ7zyGTiJNhTbO6DVgpXde5yMNEevss@z \
--to=chocimier@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).