<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1082631e0c5b7ca299ff7c98fc638e0cd9136ed0">https://github.com/macports/macports-ports/commit/1082631e0c5b7ca299ff7c98fc638e0cd9136ed0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1082631e0c5b7ca299ff7c98fc638e0cd9136ed0
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Feb 24 15:44:53 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> mpd: reduce number of variants and fix default_variants conflict
</span>---
audio/mpd/Portfile | 87 +++++++++++++++++++-----------------------------------
1 file changed, 30 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mpd/Portfile b/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2196d7635b8..7817d89e7e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,22 @@ depends_build-append \
</span> port:boost
depends_lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:audiofile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:faad2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcue \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu \
</span> port:libao \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcdio-paranoia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcue \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libid3tag \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libopus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wavpack \
</span> port:zlib
configure.args \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,21 +66,21 @@ configure.args \
</span> -Dlibmpdclient=disabled \
-Dwebdav=disabled \
-Dcue=true \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcdio_paranoia=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcurl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcdio_paranoia=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcurl=enabled \
</span> -Dmms=disabled \
-Dnfs=disabled \
-Dsmbclient=disabled \
-Dqobuz=disabled \
-Dsoundcloud=disabled \
-Dtidal=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Did3tag=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Did3tag=enabled \
</span> -Dchromaprint=disabled \
-Dadplug=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Daudiofile=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dfaad=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Daudiofile=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dfaad=enabled \
</span> -Dffmpeg=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dflac=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dflac=enabled \
</span> -Dfluidsynth=disabled \
-Dgme=disabled \
-Dmad=disabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,14 +88,14 @@ configure.args \
</span> -Dmodplug=disabled \
-Dmpcdec=disabled \
-Dmpg123=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dopus=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dopus=enabled \
</span> -Dsidplay=disabled \
-Dsndfile=disabled \
-Dtremor=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dvorbis=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dwavpack=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvorbis=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwavpack=enabled \
</span> -Dwildmidi=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dvorbisenc=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvorbisenc=enabled \
</span> -Dlame=disabled \
-Dtwolame=disabled \
-Dshine=disabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,9 +117,9 @@ configure.args \
</span> -Dsolaris_output=disabled \
-Ddbus=disabled \
-Dexpat=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dicu=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Diconv=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dpcre=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dicu=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Diconv=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpcre=enabled \
</span> -Dsqlite=disabled \
-Dyajl=disabled \
-Dzeroconf=auto \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,37 +128,16 @@ configure.args \
</span>
configure.cflags-append -I${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant faad description {Support for AAC format via faad2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:faad2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dfaad=disabled -Dfaad=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant ffmpeg description {Support for myriad formats (including ALAC) via FFmpeg} {
depends_lib-append path:lib/libavcodec.dylib:ffmpeg
configure.args-replace -Dffmpeg=disabled -Dffmpeg=enabled
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant flac description {Support for FLAC format} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:flac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dflac=disabled -Dflac=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pcre description {Support for regular expressions via pcre2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:pcre2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dpcre=disabled -Dpcre=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant stickers description {Support for stickers database} {
depends_lib-append port:sqlite3
configure.args-replace -Dsqlite=disabled -Dsqlite=enabled
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ogg description {Support for Ogg Vorbis (encoding/decoding)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libogg port:libvorbis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dvorbis=disabled -Dvorbis=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dvorbisenc=disabled -Dvorbisenc=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant libmpdclient description {Support for libmpdclient proxy database} {
depends_lib-append port:libmpdclient
configure.args-replace -Dlibmpdclient=disabled -Dlibmpdclient=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,11 +153,6 @@ variant twolame description {Support for MP3 encoding via twolame} {
</span> configure.args-replace -Dtwolame=disabled -Dtwolame=enabled
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant CD description {Support for CD-ROM access via libcdio-paranoia} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libcdio-paranoia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcdio_paranoia=disabled -Dcdio_paranoia=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant mpcdec description {Support for Musepack via libmpcdec} {
depends_lib-append port:libmpcdec
configure.args-replace --Dmpcdec=disabled Dmpcdec=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,16 +173,6 @@ variant fluidsynth description {Support for FluidSynth MIDI} {
</span> configure.args-append -Dfluidsynth=enabled
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opus description {Support for Opus format} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libopus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dopus=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wavpack description {Support for WavPack format} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:wavpack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwavpack=disabled -Dwavpack=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant jack description {Support for JACK output} {
depends_lib-append port:jack
configure.args-replace -Djack=disabled -Djack=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,7 +205,6 @@ variant mad conflicts mpg123 description {Use mad rather than mpg123 as mp3 deco
</span>
variant webdav description {Support WebDAV storage} {
depends_lib-append port:curl port:expat
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcurl=disabled -Dcurl=enabled
</span> configure.args-replace -Dexpat=disabled -Dexpat=enabled
configure.args-replace -Dwebdav=disabled -Dwebdav=enabled
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,11 +214,6 @@ variant upnp description {Support UPnP database} {
</span> configure.args-replace -Dupnp=disabled -Dupnp=enabled
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant curl description {Support HTTP client using CURL} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcurl=disabled -Dcurl=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant mms description {Support MMS input via libmms} {
depends_lib-append port:libmms
configure.args-replace -Dmms=disabled -Dmms=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,7 +267,9 @@ post-activate {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +mad +flac +faad +pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset mpg123]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
notes "A basic configuration file has been created for you.
To add music to mpd's database, create symbolic links in
</pre><pre style='margin:0'>
</pre>