bulk update: switch to vopt_feature

2023-07-27 14:32:35 -04:00 · 2023-07-27 14:32:35 -04:00 · eb9c22322f
parent b6d7a1471a
commit eb9c22322f
37 changed files with 89 additions and 95 deletions
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@ -5,13 +5,13 @@ revision=3
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
 -Dsystemd=disabled -Drfkill=enabled
- -Dlibnl=$(vopt_if libnl enabled disabled)
- -Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
- -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)
- -Dmpd=$(vopt_if mpd enabled disabled)
- -Dsndio=$(vopt_if sndio enabled disabled)
- -Djack=$(vopt_if jack enabled disabled)
- -Dwireplumber=$(vopt_if pipewire enabled disabled)"
+ $(vopt_feature libnl libnl)
+ $(vopt_feature pulseaudio pulseaudio)
+ $(vopt_feature dbusmenugtk dbusmenu-gtk)
+ $(vopt_feature mpd mpd)
+ $(vopt_feature sndio sndio)
+ $(vopt_feature jack jack)
+ $(vopt_feature pipewire wireplumber)"
 hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
 $(vopt_if dbusmenugtk gobject-introspection)"
 makedepends="libevdev-devel libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@ -4,7 +4,7 @@ version=2.48.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
+configure_args="$(vopt_feature gir introspection)"
 hostmakedepends="pkg-config dbus glib-devel gettext"
 makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel
 libxml2-devel"
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@ -3,8 +3,8 @@ pkgname=fcft
 version=3.1.6
 revision=1
 build_style=meson
-configure_args="-Drun-shaping=$(vopt_if textshaping enabled disabled)
- -Ddocs=enabled"
+configure_args="-Ddocs=enabled
+ $(vopt_feature textshaping run-shaping)"
 hostmakedepends="pkg-config scdoc"
 makedepends="fontconfig-devel freetype-devel pixman-devel tllist
 $(vopt_if textshaping harfbuzz-devel)
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@ -11,7 +11,7 @@ configure_args="
 -Dsystem_helper_user=_flatpak
 -Dselinux_module=disabled
 -Dgdm_env_file=true
- -Dgir=$(vopt_if gir enabled disabled)"
+ $(vopt_feature gir gir)"
 hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
 python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy polkit-devel"
 makedepends="AppStream-devel libarchive-devel gpgme-devel json-glib-devel
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@ -4,7 +4,7 @@ version=2.42.10
 revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpng=enabled
+configure_args="$(vopt_feature gir introspection) -Dpng=enabled
 -Djpeg=enabled -Dtiff=enabled -Dinstalled_tests=false"
 hostmakedepends="gettext-devel glib-devel pkg-config python3-docutils"
 makedepends="libglib-devel libpng-devel tiff-devel libjpeg-turbo-devel
@ -14,7 +14,7 @@ short_desc="Image loading library for The GTK+ toolkit (v2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GdkPixbuf"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gdk-pixbuf/${version%.*}/gdk-pixbuf-${version}.tar.xz"
 checksum=ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b

 # Package build options
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@ -4,7 +4,7 @@ version=44.1
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+configure_args="$(vopt_feature gir introspection)
 $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
 desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@ -3,7 +3,7 @@ pkgname=girara
 version=0.4.0
 revision=1
 build_style=meson
-configure_args="-Dnotify=$(vopt_if notify enabled disabled)"
+configure_args="$(vopt_feature notify notify)"
 hostmakedepends="pkg-config intltool doxygen glib-devel"
 makedepends="gtk+3-devel $(vopt_if notify libnotify-devel) libglib-devel json-glib-devel"
 checkdepends="check-devel xvfb-run"
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dinstalled_tests=false
- -Dintrospection=$(vopt_if gir enabled disabled)"
+ $(vopt_feature gir introspection)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Thin layer of types for graphic libraries"
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@ -12,8 +12,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
 -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled
 -Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled
 -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
- -Dgme=$(vopt_if gme enabled disabled)
- -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
+ $(vopt_feature gme gme) $(vopt_feature gir introspection) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
 orc $(vopt_if wayland wayland-devel)"
 makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@ -5,9 +5,8 @@ revision=1
 build_style=meson
 build_helper="gir"
 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)"
+ $(vopt_feature cdparanoia cdparanoia) $(vopt_feature gir introspection)
+ $(vopt_feature sndio sndio)"
 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
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@ -4,7 +4,7 @@ version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ $(vopt_feature gtk3 gtk3)"
 # XXX: libdv, dv1394 and shout2 modules.
 hostmakedepends="pkg-config intltool glib-devel orc qt5-qmake qt5-host-tools"
 makedepends="
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dptp-helper-permissions=capabilities
 -Dpackage-origin=https://www.voidlinux.org -Ddbghelp=disabled
- -Dintrospection=$(vopt_if gir enabled disabled)"
+ $(vopt_feature gir introspection)"
 hostmakedepends="gettext pkg-config flex python3 docbook-xsl glib-devel
 libcap-progs"
 makedepends="libxml2-devel libglib-devel libcap-devel bash-completion"
@ -15,7 +15,7 @@ short_desc="Core GStreamer libraries and elements (1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
+distfiles="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz"
 checksum=b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21

 pre_check() {
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@ -4,7 +4,7 @@ version=1.3.1
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dwith-vala=$(vopt_if gir enabled disabled) -Dpulseaudio=enabled"
+configure_args="$(vopt_feature gir with-vala) -Dpulseaudio=enabled"
 hostmakedepends="gettext perl glib-devel pkg-config $(vopt_if gir vala)"
 makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel pulseaudio-devel
 $(vopt_if gir vala)"
@ -12,7 +12,7 @@ short_desc="VNC viewer widget for GTK"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gtk-vnc"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gtk-vnc/${version%.*}/gtk-vnc-${version}.tar.xz"
 checksum=512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce

 build_options="gir"
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@ -6,14 +6,14 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
 -Dbuild-testsuite=false -Dbuild-examples=false
- -Dbroadway-backend=$(vopt_if broadway true false)
- -Dx11-backend=$(vopt_if x11 true false)
- -Dwayland-backend=$(vopt_if wayland true false)
- -Dintrospection=$(vopt_if gir enabled disabled)
- -Dcolord=$(vopt_if colord enabled disabled)
- -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dtracker=$(vopt_if tracker enabled disabled)"
+ $(vopt_feature broadway broadway-backend)
+ $(vopt_feature x11 x11-backend)
+ $(vopt_feature wayland wayland-backend)
+ $(vopt_feature gir introspection)
+ $(vopt_feature colord colord)
+ $(vopt_feature cloudproviders cloudproviders)
+ $(vopt_feature vulkan vulkan)
+ $(vopt_feature tracker tracker)"
 hostmakedepends="gettext-devel glib-devel gi-docgen perl
 pkg-config sassc gettext libxslt docbook-xsl python3-docutils
 $(vopt_if wayland 'wayland-devel wayland-protocols')"
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@ -4,8 +4,8 @@ version=5.8.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
+configure_args="$(vopt_if gir introspection) $(vopt_bool gir vapi)
+ $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
 $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@ -4,7 +4,7 @@ version=1.6.6
 revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
+configure_args="$(vopt_feature gir introspection)"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+ $(vopt_bool gir vapi) $(vopt_feature gir introspection)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
 $(vopt_if gir vala-devel) gettext sassc"
 makedepends="gtk4-devel libglib-devel harfbuzz-devel"
--- a/srcpkgs/libdecor/template
+++ b/srcpkgs/libdecor/template
@ -3,7 +3,7 @@ pkgname=libdecor
 version=0.1.1
 revision=1
 build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+configure_args="-Ddemo=false $(vopt_feature dbus dbus)"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel wayland-protocols pango-devel
 $(vopt_if dbus dbus-devel)"
--- a/srcpkgs/libdex/template
+++ b/srcpkgs/libdex/template
@ -5,8 +5,8 @@ revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dexamples=false
- -Ddocs=$(vopt_if gtk_doc true false)
- -Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_feature gtk_doc docs)
+ $(vopt_feature gir introspection)
 $(vopt_bool vala vapi)"
 hostmakedepends="pkg-config glib-devel gettext
 $(vopt_if vala vala) $(vopt_if gtk_doc gi-docgen)"
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@ -4,15 +4,14 @@ version=237
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvapi=$(vopt_if vala enabled disabled)"
+configure_args="$(vopt_feature gir introspection) $(vopt_feature vala vapi)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://wiki.gnome.org/Projects/libgudev"
-distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgudev/${version}/libgudev-${version}.tar.xz"
 checksum=0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa

 build_options="gir vala"
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@ -5,8 +5,8 @@ revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true
- $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
- -Dintrospection=$(vopt_if gir enabled disabled)"
+ $(vopt_bool gir vapi) $(vopt_feature glade glade_catalog)
+ $(vopt_feature gir introspection)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@ -5,8 +5,8 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
- $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
- -Dintrospection=$(vopt_if gir enabled disabled)"
+ $(vopt_bool gir vapi) $(vopt_feature glade glade_catalog)
+ $(vopt_feature gir introspection)"
 hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
- -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
+ -Dexamples=disabled $(vopt_feature gir introspection)"
 hostmakedepends="glib-devel pkg-config"
 makedepends="gstreamer1-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@ -4,8 +4,8 @@ version=0.8.2
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=false -Ddocbook_docs=disabled -Dtests=false"
+configure_args="$(vopt_feature gir introspection) -Dgtk_doc=false
+ -Ddocbook_docs=disabled -Dtests=false"
 hostmakedepends="pkg-config glib-devel libxslt docbook-xsl-ns"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
 short_desc="Desktop notification library"
--- a/srcpkgs/libosinfo/template
+++ b/srcpkgs/libosinfo/template
@ -4,9 +4,8 @@ version=1.10.0
 revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-introspection=$(vopt_if gir enabled disabled)
- -Denable-vala=$(vopt_if vala enabled disabled)
- -Denable-gtk-doc=$(vopt_if gtk_doc true false)"
+configure_args="$(vopt_feature gir enable-introspection)
+ $(vopt_feature vala enable-vala) $(vopt_bool gtk_doc enable-gtk-doc)"
 hostmakedepends="glib-devel intltool pkg-config wget hwids
 $(vopt_if gtk_doc gtk-doc)
 $(vopt_if vala vala)"
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgssapi=disabled -Dntlm=disabled -Dsysprof=disabled
- -Dtls_check=false -Dintrospection=$(vopt_if gir enabled disabled)
- -Dvapi=$(vopt_if gir enabled disabled)"
+ -Dtls_check=false $(vopt_feature gir introspection) $(vopt_feature gir vapi)"
 hostmakedepends="gettext-devel glib-devel pkg-config gettext
 $(vopt_if gir vala)"
 makedepends="libglib-devel libxml2-devel sqlite-devel libpsl-devel
@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libsoup"
 changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/libsoup-2-74/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz"
 checksum=33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e
 make_check=no # gio tests can't run in chroot

--- a/srcpkgs/libsoup3/template
+++ b/srcpkgs/libsoup3/template
@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgssapi=disabled -Dntlm=disabled -Dsysprof=disabled
- -Dtls_check=false -Dintrospection=$(vopt_if gir enabled disabled)
- -Dvapi=$(vopt_if gir enabled disabled)"
+ -Dtls_check=false $(vopt_feature gir introspection) $(vopt_feature gir vapi)"
 hostmakedepends="gettext-devel glib-devel pkg-config gettext
 $(vopt_if gir vala) python3-gobject"
 makedepends="libglib-devel nghttp2-devel sqlite-devel libpsl-devel brotli-devel
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@ -4,8 +4,8 @@ version=4.0.0
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+configure_args="$(vopt_feature gir introspection) $(vopt_feature vala vapi)
+ $(vopt_feature doc docs)"
 hostmakedepends="pkg-config gettext glib-devel
 $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel"
@ -13,7 +13,7 @@ short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+distfiles="http://libvirt.org/sources/glib/libvirt-glib-${version}.tar.xz"
 checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"

--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@ -4,7 +4,7 @@ version=43.0
 revision=2
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
+configure_args="$(vopt_feature gir introspection)"
 hostmakedepends="gdk-pixbuf-devel pkg-config gettext glib-devel
 $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@ -10,13 +10,12 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
 -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
 -Dshine=disabled -Ddocumentation=enabled -Daudiofile=enabled -Dtremor=disabled
 -Dsolaris_output=disabled -Dhtml_manual=false -Dmanpages=true
- -Djack=$(vopt_if jack enabled disabled) -Dlame=$(vopt_if lame enabled disabled)
- -Dao=$(vopt_if libao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled)
- -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
- -Dwavpack=$(vopt_if wavpack enabled disabled) -Dcdio_paranoia=$(vopt_if cdio enabled disabled)
- -Dopenal=$(vopt_if openal enabled disabled) -Dshout=$(vopt_if shoutcast enabled disabled)
- -Dio_uring=$(vopt_if io_uring enabled disabled) -Dopenmpt=$(vopt_if openmpt enabled disabled)
- -Dpipewire=$(vopt_if pipewire enabled disabled)"
+ $(vopt_feature jack jack) $(vopt_feature lame lame) $(vopt_feature libao ao)
+ $(vopt_feature mpcdec mpcdec) $(vopt_feature sndio sndio)
+ $(vopt_feature pulseaudio pulse) $(vopt_feature wavpack wavpack)
+ $(vopt_feature cdio cdio_paranoia) $(vopt_feature openal openal)
+ $(vopt_feature shoutcast shout) $(vopt_feature io_uring io_uring)
+ $(vopt_feature openmpt openmpt) $(vopt_feature pipewire pipewire)"
 conf_files="/etc/mpd.conf"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@ -5,22 +5,22 @@ revision=3
 build_style=meson
 configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
 -Dlibmpv=true -Dcplugins=enabled
- -Dalsa=$(vopt_if alsa enabled disabled)
- -Dcaca=$(vopt_if caca enabled disabled)
- -Djack=$(vopt_if jack enabled disabled)
- -Dlcms2=$(vopt_if lcms enabled disabled)
- -Dlua=$(vopt_if lua enabled disabled)
- -Dopenal=$(vopt_if openal enabled disabled)
- -Dpulse=$(vopt_if pulseaudio enabled disabled)
- -Dsdl2=$(vopt_if sdl2 enabled disabled)
- -Dvapoursynth=$(vopt_if vapoursynth enabled disabled)
- -Dvdpau=$(vopt_if vdpau enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dshaderc=$(vopt_if vulkan enabled disabled)
- -Dwayland=$(vopt_if wayland enabled disabled)
- -Dx11=$(vopt_if x11 enabled disabled)
- -Dpipewire=$(vopt_if pipewire enabled disabled)
- -Dsndio=$(vopt_if sndio enabled disabled)"
+ $(vopt_feature alsa alsa)
+ $(vopt_feature caca caca)
+ $(vopt_feature jack jack)
+ $(vopt_feature lcms lcms2)
+ $(vopt_feature lua lua)
+ $(vopt_feature openal openal)
+ $(vopt_feature pulseaudio pulse)
+ $(vopt_feature sdl2 sdl2)
+ $(vopt_feature vapoursynth vapoursynth)
+ $(vopt_feature vdpau vdpau)
+ $(vopt_feature vulkan vulkan)
+ $(vopt_feature vulkan shaderc)
+ $(vopt_feature wayland wayland)
+ $(vopt_feature x11 x11)
+ $(vopt_feature pipewire pipewire)
+ $(vopt_feature sndio sndio)"
 hostmakedepends="pkg-config python3-docutils $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel
 libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@ -3,7 +3,7 @@ pkgname=nautilus-python
 version=4.0
 revision=1
 build_style=meson
-configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+configure_args="$(vopt_feature gtk_doc docs)"
 hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 makedepends="python3-gobject-devel nautilus-devel"
 depends="nautilus python3-gobject"
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@ -4,7 +4,8 @@ version=0.4.33
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+configure_args="-Dexamples=disabled -Dtests=disabled
+ $(vopt_feature gtk_doc gtk_doc)"
 hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 short_desc="Oild Runtime Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@ -4,7 +4,7 @@ version=1.50.14
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
+configure_args="$(vopt_feature gir introspection)"
 hostmakedepends="glib-devel help2man pkg-config"
 makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel"
 checkdepends="dejavu-fonts-ttf liberation-fonts-ttf cantarell-fonts"
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@ -9,14 +9,14 @@ configure_args="
 -Ddocs=enabled
 -Dlibcamera=disabled
 -Droc=disabled
- -Dsdl2=$(vopt_if sdl2 enabled disabled)
+ $(vopt_feature sdl2 sdl2)
 -Dsystemd=disabled
 -Dudevrulesdir=/usr/lib/udev/rules.d
 -Dvulkan=enabled
 -Dbluez5-codec-lc3plus=disabled
 -Dsession-managers=[]
 -Drlimits-match=@_pipewire
- -Dlibffado=$(vopt_if ffado enabled disabled)
+ $(vopt_feature ffado libffado)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@ -4,8 +4,8 @@ version=0.41
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
+configure_args="$(vopt_feature gir introspection)
+ $(vopt_feature vala vapi) -Dsmartcard=disabled
 -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
 -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://spice-space.org"
 changelog="https://gitlab.freedesktop.org/spice/spice-gtk/-/raw/master/CHANGELOG.md"
-distfiles="https://spice-space.org/download/gtk/${pkgname}-${version}.tar.xz"
+distfiles="https://spice-space.org/download/gtk/spice-gtk-${version}.tar.xz"
 checksum=d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f

 CFLAGS="-Wno-error -Wno-error=unused-but-set-variable"
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@ -5,7 +5,7 @@ revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
- -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
+ $(vopt_feature gir introspection) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
 hostmakedepends="gettext glib-devel gobject-introspection
 $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config"