Re: spotifyd: add build_options

Re: spotifyd: add build_options

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/21446#issuecomment-621478521

Comment:
You can keep it a bit shorter by using `vopt_if`.

Re: [PR PATCH] [Updated] spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages spotifyd-options
https://github.com/void-linux/void-packages/pull/21446

spotifyd: add build_options
Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.

--

Removing the dbus option as a default one would be ok too.

I'd also like to leave the template as an idea for how to start implementing the feature flags straight into the cargo build style.

@abenson can you review this one, please?

Also, the aarch64-musl error still happens, unfortunately, but is supposed to have been fixed in a next version of the `nix` crate. So perhaps when there's a next release we can re-enable the package for that arch as well.

A patch file from https://github.com/void-linux/void-packages/pull/21446.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotifyd-options-21446.patch --]
[-- Type: text/x-diff, Size: 2672 bytes --]

From d1d75be757143408b754f5cc16036487bd95ce61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Apr 2020 19:59:08 -0300
Subject: [PATCH] spotifyd: add build_options

Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.
---
 srcpkgs/spotifyd/template | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d6eab3b7bac..993bb84a9a3 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,10 +1,12 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.2.24
-revision=1
+revision=2
 build_style=cargo
+configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel libressl-devel pulseaudio-devel dbus-devel"
+makedepends="libressl-deve $(vopt_if alsa alsa-devel)
+$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
@@ -12,14 +14,23 @@ homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 
+build_options="alsa pulseaudio dbus"
+build_options_default="alsa pulseaudio dbus"
+desc_option_alsa="Enable ALSA backend"
+desc_option_pulseaudio="Enable Pulseaudio backend"
+desc_option_dbus="Enable D-Bus integration"
+
+_features="$(vopt_if alsa 'alsa_backend,')
+$(vopt_if pulseaudio 'pulseaudio_backend,')
+$(vopt_if dbus 'dbus_mpris,dbus_keyring')"
+
+if [ "$_features" ]; then
+	configure_args="$configure_args --features $_features"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
 export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
-
-pre_configure() {
-	vsed -e 's/default = \[/& "dbus", "dbus-tokio", "pulseaudio_backend", "keyring", /' \
-	 -i Cargo.toml
-}

Re: spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21446#issuecomment-622172985

Comment:
@jnbr thanks for the suggestion, looks much better!

Re: [PR PATCH] [Updated] spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages spotifyd-options
https://github.com/void-linux/void-packages/pull/21446

spotifyd: add build_options
Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.

--

Removing the dbus option as a default one would be ok too.

I'd also like to leave the template as an idea for how to start implementing the feature flags straight into the cargo build style.

@abenson can you review this one, please?

Also, the aarch64-musl error still happens, unfortunately, but is supposed to have been fixed in a next version of the `nix` crate. So perhaps when there's a next release we can re-enable the package for that arch as well.

A patch file from https://github.com/void-linux/void-packages/pull/21446.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotifyd-options-21446.patch --]
[-- Type: text/x-diff, Size: 2673 bytes --]

From 193245e1f898925eeaa6798c989c1d76963b73cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Apr 2020 19:59:08 -0300
Subject: [PATCH] spotifyd: add build_options

Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.
---
 srcpkgs/spotifyd/template | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d6eab3b7bac..a722e20b809 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,10 +1,12 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.2.24
-revision=1
+revision=2
 build_style=cargo
+configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel libressl-devel pulseaudio-devel dbus-devel"
+makedepends="libressl-devel $(vopt_if alsa alsa-devel)
+$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
@@ -12,14 +14,23 @@ homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 
+build_options="alsa pulseaudio dbus"
+build_options_default="alsa pulseaudio dbus"
+desc_option_alsa="Enable ALSA backend"
+desc_option_pulseaudio="Enable Pulseaudio backend"
+desc_option_dbus="Enable D-Bus integration"
+
+_features="$(vopt_if alsa 'alsa_backend,')
+$(vopt_if pulseaudio 'pulseaudio_backend,')
+$(vopt_if dbus 'dbus_mpris,dbus_keyring')"
+
+if [ "$_features" ]; then
+	configure_args="$configure_args --features $_features"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
 export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
-
-pre_configure() {
-	vsed -e 's/default = \[/& "dbus", "dbus-tokio", "pulseaudio_backend", "keyring", /' \
-	 -i Cargo.toml
-}

Re: [PR PATCH] [Updated] spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages spotifyd-options
https://github.com/void-linux/void-packages/pull/21446

spotifyd: add build_options
Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.

--

Removing the dbus option as a default one would be ok too.

I'd also like to leave the template as an idea for how to start implementing the feature flags straight into the cargo build style.

@abenson can you review this one, please?

Also, the aarch64-musl error still happens, unfortunately, but is supposed to have been fixed in a next version of the `nix` crate. So perhaps when there's a next release we can re-enable the package for that arch as well.

A patch file from https://github.com/void-linux/void-packages/pull/21446.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotifyd-options-21446.patch --]
[-- Type: text/x-diff, Size: 2677 bytes --]

From 34427fc95a8a6bfae5352c487d4ee1b02449cf0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Apr 2020 19:59:08 -0300
Subject: [PATCH] spotifyd: add build_options

Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.
---
 srcpkgs/spotifyd/template | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d6eab3b7bac..a9d8a71df50 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,10 +1,12 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.2.24
-revision=1
+revision=2
 build_style=cargo
+configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel libressl-devel pulseaudio-devel dbus-devel"
+makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
@@ -12,14 +14,23 @@ homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 
+build_options="alsa pulseaudio dbus"
+build_options_default="alsa pulseaudio dbus"
+desc_option_alsa="Enable ALSA backend"
+desc_option_pulseaudio="Enable Pulseaudio backend"
+desc_option_dbus="Enable D-Bus integration"
+
+_features="$(vopt_if alsa 'alsa_backend,')
+$(vopt_if pulseaudio 'pulseaudio_backend,')
+$(vopt_if dbus 'dbus_mpris,dbus_keyring')"
+
+if [ "$_features" ]; then
+	configure_args="$configure_args --features $_features"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
 export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
-
-pre_configure() {
-	vsed -e 's/default = \[/& "dbus", "dbus-tokio", "pulseaudio_backend", "keyring", /' \
-	 -i Cargo.toml
-}

Re: [PR PATCH] [Updated] spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages spotifyd-options
https://github.com/void-linux/void-packages/pull/21446

spotifyd: add build_options
Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.

--

Removing the dbus option as a default one would be ok too.

I'd also like to leave the template as an idea for how to start implementing the feature flags straight into the cargo build style.

@abenson can you review this one, please?

Also, the aarch64-musl error still happens, unfortunately, but is supposed to have been fixed in a next version of the `nix` crate. So perhaps when there's a next release we can re-enable the package for that arch as well.

A patch file from https://github.com/void-linux/void-packages/pull/21446.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotifyd-options-21446.patch --]
[-- Type: text/x-diff, Size: 2582 bytes --]

From 2709af4a611664fd63c9b6a81959a909ba82ace7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Apr 2020 19:59:08 -0300
Subject: [PATCH] spotifyd: add build_options

Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.
---
 srcpkgs/spotifyd/template | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d6eab3b7bac..7a7ddc789e8 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,10 +1,12 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.2.24
-revision=1
+revision=2
 build_style=cargo
+configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel libressl-devel pulseaudio-devel dbus-devel"
+makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
@@ -12,14 +14,21 @@ homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 
+build_options="alsa pulseaudio dbus"
+build_options_default="alsa pulseaudio dbus"
+
+_features="$(vopt_if alsa 'alsa_backend,')"
+_features+="$(vopt_if pulseaudio 'pulseaudio_backend,')"
+_features+="$(vopt_if dbus 'dbus_mpris,dbus_keyring')"
+
+if [ "$_features" ]; then
+	echo $_features
+	configure_args="$configure_args --features $_features"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
 export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
-
-pre_configure() {
-	vsed -e 's/default = \[/& "dbus", "dbus-tokio", "pulseaudio_backend", "keyring", /' \
-	 -i Cargo.toml
-}

Re: spotifyd: add build_options

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21446#issuecomment-622951712

Comment:
Sorry for this one! I made some changes after testing that I'd thought wouldn't affect the package. Turns out they did. Things should be mostly ok, now.

Re: [PR PATCH] [Merged]: spotifyd: add build_options

[abenson]

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

There's a merged pull request on the void-packages repository

spotifyd: add build_options
https://github.com/void-linux/void-packages/pull/21446

Description:
Instead of manually altering the Cargo.toml file, we use the feature
flags available in cargo. There are three build options now:

- alsa: ALSA backend
- pulseaudio: Pulseaudio backend
- dbus: D-Bus functionality, both mpris and keyring

This also allows for a greater granularity when specifying dependencies.
All build options are selected as default, both to keep the package the
same as it was before (alsa and pulseaudio) and because the dependency
needed by the dbus option (dbus-libs) is required by pulseaudio already.

This commit allows builders to easily disable D-Bus functionality or
either audio backend without altering the template.

--

Removing the dbus option as a default one would be ok too.

I'd also like to leave the template as an idea for how to start implementing the feature flags straight into the cargo build style.

@abenson can you review this one, please?

Also, the aarch64-musl error still happens, unfortunately, but is supposed to have been fixed in a next version of the `nix` crate. So perhaps when there's a next release we can re-enable the package for that arch as well.

Re: spotifyd: add build_options

[abenson]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/21446#issuecomment-621302406

Comment:
Lgtm. Originally editing the Cargo.toml was needed because the compilation flags weren't working. It seems that's been fixed since then.