* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2015-09-16 16:29 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2015-09-16 16:29 UTC (permalink / raw
To: gentoo-commits
commit: aaa4bac1496c4beb7e05d5a970ae1e6439959bf5
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 16:28:50 2015 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 16:29:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa4bac1
media-sound/mpd: remove old versions
Package-Manager: portage-2.2.20.1
media-sound/mpd/Manifest | 6 -
media-sound/mpd/files/mpd-0.16.conf.patch | 70 ------
media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch | 19 --
.../mpd/files/mpd-0.17.6-opus-linking.patch | 15 --
media-sound/mpd/files/mpd.init | 32 ---
media-sound/mpd/metadata.xml | 2 -
media-sound/mpd/mpd-0.17.6.ebuild | 208 ------------------
media-sound/mpd/mpd-0.18.16.ebuild | 211 ------------------
media-sound/mpd/mpd-0.18.20.ebuild | 211 ------------------
media-sound/mpd/mpd-0.18.23.ebuild | 210 ------------------
media-sound/mpd/mpd-0.19.6-r1.ebuild | 237 ---------------------
media-sound/mpd/mpd-0.19.6.ebuild | 237 ---------------------
media-sound/mpd/mpd-0.19.9-r1.ebuild | 236 --------------------
media-sound/mpd/mpd-0.19.9.ebuild | 236 --------------------
14 files changed, 1930 deletions(-)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index eafcad9..2879f09 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,7 +1 @@
-DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79f6b935e4fc9f93cb60c332 SHA512 014629b913e7bd537f38303ffee295648b55fe18dc0ea669b463b82c3d60334792eeedb624f96849c834cf32e0bb5107f804e59d62be293ff78d3d940dbbb9e2 WHIRLPOOL dee52fe02174b3818ce4483385b7b91e0667fddfd4912023551032b29a67b80a9d3aba2f2d49781266eceb25d5af2c3fe1285f46ad1513cafcd0f5d3766d2705
-DIST mpd-0.18.16.tar.xz 587724 SHA256 7524c7a7695acfc6a5ce4117b30c74b172cef681a4bb9032db20c3671ad5765a SHA512 bddd0236066bae97ef690b24a0eac46d892fe10ce7c5455634cb8b84210bf2ceb1b5ee8c7754fcf581de7fbd165c9b805f179e243b88bc87e6254e72fa6c8f45 WHIRLPOOL cdf7488fee33b18880b24686bcc86b8d4696023e72011d1310d81f067a8ae99590441c61214e5e371b3cd4da6fb99575963343765c9defa4fb3b41582193c407
-DIST mpd-0.18.20.tar.xz 587320 SHA256 0de4f79fb4f0788ec7e7db7d5abc18bd54d32b7bdaf6fbd244c44e5d56b69f2b SHA512 743761c9ab9bf3c856e2355f417f90a9dfb8d8df5d75d3fc904d874516743ffee969f6ae225f88ed128588e508d82e558a7a279f3b18888c29f7f9d592ce9a29 WHIRLPOOL 21ab9870a42be68d8073d84422ea368ab58c1435e41f81daf9e151230b5b64022f8b91b2856d2c01c585a219e5082d97eb8bde0c16b99b7ddaef585c19da4f2b
-DIST mpd-0.18.23.tar.xz 584160 SHA256 647cf5a27ca68307ab4b28b0c58a3f7461d1f8dad1ab4d3e2ac9a2c380d92e70 SHA512 99641514b4c7dac8d814f891072e0131efa54bc03d9abd54165cbbea3398fb21b01236ab43374a763184c4aad06b3b27cc9455c6f78168e2bf49d7c8c945b975 WHIRLPOOL 9416e88e0071966fc06bd9cfb6ec4a536cf2eeb5c66f3646fb3425a9ffd7edd268858d0ef1b23fbff374306b2c4d4b61610862fd60aa06d5502de313754c1f1c
DIST mpd-0.19.10.tar.xz 701668 SHA256 c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851 SHA512 037e1ccd69456bd7d388cbcba26de83144816684fb266995b173df960051e84203d3fc7255d7766eee5dbe0629dbb7745b9821664486158d33da4f29189edef8 WHIRLPOOL 02c2ec2c898fbeb9bf39ae9a2b57d85881825489a033f56b6140602f7cd6176f39d4aa09f0dfd2391214bd70d3ffab0e7a7eefcba8085e5ea7d15168028efa53
-DIST mpd-0.19.6.tar.xz 703328 SHA256 fac25376ee46b89249ee28a1ae13b2d5d1df7ff62464340c33c077015364d1e0 SHA512 b679c42169ad0815c69de817b7d59531e6afb9a88ed15ddbe4648f103815b513605081ffddb12a92c9e52e402fcb80c9df984c05c70491a4f3cc4f7efc5e3d86 WHIRLPOOL 7c02eaf842a89417e2a97ee0d6bae4ab22e3233c015496b8bb93bcff2eca40104ae5bdbe50a91d27a1130e531be515e2ff551424f0466cc5525953eb29ab044c
-DIST mpd-0.19.9.tar.xz 701480 SHA256 47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f SHA512 7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 WHIRLPOOL 04ee826f55512c5f4b28f0bfbf78e23710070970be2f7da07b421483da1d9dad20b0b3513a2529f88d83c92f8202cb57bad09fee894eb18387cbc156312e3a06
diff --git a/media-sound/mpd/files/mpd-0.16.conf.patch b/media-sound/mpd/files/mpd-0.16.conf.patch
deleted file mode 100644
index 8f193c8..0000000
--- a/media-sound/mpd/files/mpd-0.16.conf.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: mpd-0.16/doc/mpdconf.dist
-===================================================================
---- mpd-0.16.orig/doc/mpdconf.dist
-+++ mpd-0.16/doc/mpdconf.dist
-@@ -10,14 +10,14 @@
- # be disabled and audio files will only be accepted over ipc socket (using
- # file:// protocol) or streaming files over an accepted protocol.
- #
--#music_directory "~/music"
-+music_directory "/var/lib/mpd/music"
- #
- # This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use
- # playlist files not created by the server but only if they are in the MPD
- # format. This setting defaults to playlist saving being disabled.
- #
--#playlist_directory "~/.mpd/playlists"
-+playlist_directory "/var/lib/mpd/playlists"
- #
- # This setting sets the location of the MPD database. This file is used to
- # load the database at server start up and store the database while the
-@@ -25,7 +25,7 @@
- # MPD to accept files over ipc socket (using file:// protocol) or streaming
- # files over an accepted protocol.
- #
--#db_file "~/.mpd/database"
-+db_file "/var/lib/mpd/database"
- #
- # These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
-@@ -34,7 +34,7 @@
- # The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog, otherwise logging is disabled.
- #
--#log_file "~/.mpd/log"
-+log_file "/var/lib/mpd/log"
- #
- # This setting sets the location of the file which stores the process ID
- # for use of mpd --kill and some init scripts. This setting is disabled by
-@@ -47,7 +47,7 @@
- # it was brought down. This setting is disabled by default and the server
- # state will be reset on server start up.
- #
--#state_file "~/.mpd/state"
-+state_file "/var/lib/mpd/state"
- #
- # The location of the sticker database. This is a database which
- # manages dynamic information attached to songs.
-@@ -64,7 +64,7 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user "nobody"
-+user "mpd"
- #
- # This setting specifies the group that MPD will run as. If not specified
- # primary group of user specified with "user" setting will be used (if set).
-@@ -78,10 +78,10 @@
- # This setting can deny access to control of the daemon.
- #
- # For network
--#bind_to_address "any"
-+bind_to_address "localhost"
- #
- # And for Unix Socket
--#bind_to_address "~/.mpd/socket"
-+bind_to_address "/var/lib/mpd/socket"
- #
- # This setting is the TCP port that is desired for the daemon to get assigned
- # to.
diff --git a/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch b/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
deleted file mode 100644
index 07c3e48..0000000
--- a/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build with FFmpeg 2.0.
-
-Upstream status: Better patch sent and merged upstream.
-
-Index: mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
-===================================================================
---- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c
-+++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
-@@ -47,6 +47,10 @@
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "ffmpeg"
-
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- static GLogLevelFlags
- level_ffmpeg_to_glib(int level)
- {
diff --git a/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch b/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
deleted file mode 100644
index fa3250c..0000000
--- a/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun May 4 11:59:48 UTC 2014
-Subject: fix linking
-
---- mpd-0.17.6/configure.ac
-+++ mpd-0.17.6/configure.ac
-@@ -1149,7 +1149,7 @@
- AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)
-
- dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
--MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc],
-+MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
- [Ogg Vorbis encoder], [libvorbisenc not found])
-
- if test x$enable_vorbis_encoder = xyes; then
diff --git a/media-sound/mpd/files/mpd.init b/media-sound/mpd/files/mpd.init
deleted file mode 100644
index f9934fc..0000000
--- a/media-sound/mpd/files/mpd.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount
- use net netmount nfsmount alsasound esound pulseaudio
-}
-
-checkconfig() {
- if ! [ -f /etc/mpd.conf ]; then
- eerror "Configuration file /etc/mpd.conf does not exist."
- return 1
- fi
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting Music Player Daemon"
- start-stop-daemon --start --quiet --background --wait 50 --exec /usr/bin/mpd --pidfile /var/run/mpd.pid --make-pidfile -- --no-daemon /etc/mpd.conf 2>/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping Music Player Daemon"
- start-stop-daemon --stop --exec /usr/bin/mpd --pidfile /var/run/mpd.pid
- eend $?
-}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 2c475cc..bd5d3c4 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -23,7 +23,6 @@
<flag name="id3tag">Support for ID3 tags</flag>
<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
<flag name="lame">Support for MP3 streaming via Icecast2</flag>
- <flag name="lastfmradio">Support listening to last.fm radio stations</flag>
<flag name="libmpdclient">Enable support for remote mpd databases</flag>
<flag name="libsoxr">Enable the libsoxr resampler</flag>
<flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
@@ -35,7 +34,6 @@
<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
<flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
<flag name="soundcloud">Build plugin to access soundcloud</flag>
- <flag name="soup">Use <pkg>net-libs/libsoup</pkg> for HTTP streaming</flag>
<flag name="systemd">Enable support for systemd socket activation</flag>
<flag name="twolame">Support twolame MPEG-2 encoding</flag>
<flag name="wildmidi">Enable MIDI support via wildmidi</flag>
diff --git a/media-sound/mpd/mpd-0.17.6.ebuild b/media-sound/mpd/mpd-0.17.6.ebuild
deleted file mode 100644
index 6e0ce92..0000000
--- a/media-sound/mpd/mpd-0.17.6.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="+alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
-fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
-selinux sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
-wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-INPUT_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123
- musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${INPUT_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
- dev-libs/glib:2
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- faad? ( media-libs/faad2 )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- pulseaudio? ( media-sound/pulseaudio )
- selinux? ( sec-policy/selinux-mpd )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- soup? ( net-libs/libsoup:2.4 )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is unset."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
- "${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch \
- "${FILESDIR}"/${PN}-0.17.6-opus-linking.patch
-
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- src/input/cdio_paranoia_input_plugin.c || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local mpdconf="--disable-despotify --disable-documentation --disable-ffado
- --disable-mvp --disable-roar --enable-largefile
- --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable faad aac) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable lastfmradio lastfm) \
- $(use_enable libsamplerate lsr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable mpg123) \
- $(use_enable musepack mpc) \
- $(use_enable openal) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable soundcloud) \
- $(use_enable soup) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable tcpd libwrap) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/mpd.init mpd
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.18.16.ebuild b/media-sound/mpd/mpd-0.18.16.ebuild
deleted file mode 100644
index a30bd3b..0000000
--- a/media-sound/mpd/mpd-0.18.16.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
- fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
- libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
- oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
- twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- opus? ( ogg )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- dev-libs/glib:2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- src/input/CdioParanoiaInputPlugin.cxx || die
- fi
-}
-
-src_configure() {
- local mpdconf="--disable-despotify --disable-documentation --disable-roar
- --enable-largefile --enable-tcp --enable-un
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable faad aac) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable libmpdclient) \
- $(use_enable libsamplerate lsr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable mpg123) \
- $(use_enable musepack mpc) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable soundcloud) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable tcpd libwrap) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.18.20.ebuild b/media-sound/mpd/mpd-0.18.20.ebuild
deleted file mode 100644
index c272a33..0000000
--- a/media-sound/mpd/mpd-0.18.20.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
- fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
- libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
- oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
- twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- opus? ( ogg )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- dev-libs/glib:2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- src/input/CdioParanoiaInputPlugin.cxx || die
- fi
-}
-
-src_configure() {
- local mpdconf="--disable-despotify --disable-documentation --disable-roar
- --enable-largefile --enable-tcp --enable-un
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable faad aac) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable libmpdclient) \
- $(use_enable libsamplerate lsr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable mpg123) \
- $(use_enable musepack mpc) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable soundcloud) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable tcpd libwrap) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.18.23.ebuild b/media-sound/mpd/mpd-0.18.23.ebuild
deleted file mode 100644
index ff063cd..0000000
--- a/media-sound/mpd/mpd-0.18.23.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
- fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
- libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
- oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
- twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- opus? ( ogg )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- dev-libs/glib:2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- src/input/CdioParanoiaInputPlugin.cxx || die
- fi
-}
-
-src_configure() {
- local mpdconf="--disable-documentation --disable-roar --enable-largefile
- --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable faad aac) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable libmpdclient) \
- $(use_enable libsamplerate lsr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable mpg123) \
- $(use_enable musepack mpc) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable soundcloud) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable tcpd libwrap) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.19.6-r1.ebuild b/media-sound/mpd/mpd-0.19.6-r1.ebuild
deleted file mode 100644
index ec3d569..0000000
--- a/media-sound/mpd/mpd-0.19.6-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
- flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
- libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
- +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
- sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
- wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- ao? ( glib )
- gme? ( glib )
- jack? ( glib )
- network? ( || ( ${ENCODER_PLUGINS} )
- glib )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- sid? ( glib )
- soundcloud? ( glib )
- sqlite? ( glib )
- opus? ( ogg )
- upnp? ( expat )
- vorbis? ( glib )
- wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- glib? ( dev-libs/glib:2 )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? ( dev-libs/icu:= )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- nfs? ( net-fs/libnfs )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- libsoxr? ( media-libs/soxr )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-}
-
-src_configure() {
- local mpdconf="--enable-database --disable-roar --disable-documentation
- --enable-dsd --enable-largefile --disable-despotify --disable-osx
- --disable-shine-encoder --disable-solaris-output --enable-tcp
- --enable-un --disable-werror
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- if use samba || use upnp; then
- mpdconf+=" --enable-neighbor-plugins"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable libmpdclient) \
- $(use_enable expat) \
- $(use_enable upnp) \
- $(use_enable adplug) \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable samba smbclient) \
- $(use_enable nfs) \
- $(use_enable debug) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable soundcloud) \
- $(use_enable tcpd libwrap) \
- $(use_enable libsamplerate lsr) \
- $(use_enable libsoxr soxr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable musepack mpc) \
- $(use_enable mpg123) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_enable icu) \
- $(use_enable glib) \
- $(use_enable faad aac) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.19.6.ebuild b/media-sound/mpd/mpd-0.19.6.ebuild
deleted file mode 100644
index 2c54b82..0000000
--- a/media-sound/mpd/mpd-0.19.6.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
- flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
- libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
- +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
- sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
- wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- ao? ( glib )
- gme? ( glib )
- jack? ( glib )
- network? ( || ( ${ENCODER_PLUGINS} )
- glib )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- sid? ( glib )
- soundcloud? ( glib )
- sqlite? ( glib )
- opus? ( ogg )
- upnp? ( expat )
- vorbis? ( glib )
- wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- glib? ( dev-libs/glib:2 )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? ( dev-libs/icu:= )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- nfs? ( net-fs/libnfs )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( net-fs/samba[smbclient] )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- libsoxr? ( media-libs/soxr )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-}
-
-src_configure() {
- local mpdconf="--enable-database --disable-roar --disable-documentation
- --enable-dsd --enable-largefile --disable-despotify --disable-osx
- --disable-shine-encoder --disable-solaris-output --enable-tcp
- --enable-un --disable-werror
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- if use samba || use upnp; then
- mpdconf+=" --enable-neighbor-plugins"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable libmpdclient) \
- $(use_enable expat) \
- $(use_enable upnp) \
- $(use_enable adplug) \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable samba smbclient) \
- $(use_enable nfs) \
- $(use_enable debug) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable soundcloud) \
- $(use_enable tcpd libwrap) \
- $(use_enable libsamplerate lsr) \
- $(use_enable libsoxr soxr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable musepack mpc) \
- $(use_enable mpg123) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_enable icu) \
- $(use_enable glib) \
- $(use_enable faad aac) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.19.9-r1.ebuild b/media-sound/mpd/mpd-0.19.9-r1.ebuild
deleted file mode 100644
index 9c438b6..0000000
--- a/media-sound/mpd/mpd-0.19.9-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
- flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
- libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
- +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
- sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
- wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- ao? ( glib )
- gme? ( glib )
- jack? ( glib )
- network? ( || ( ${ENCODER_PLUGINS} )
- glib )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- sid? ( glib )
- soundcloud? ( glib )
- sqlite? ( glib )
- opus? ( ogg )
- upnp? ( expat )
- vorbis? ( glib )
- wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- glib? ( dev-libs/glib:2 )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? ( dev-libs/icu:= )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- nfs? ( net-fs/libnfs )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- libsoxr? ( media-libs/soxr )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-}
-
-src_configure() {
- local mpdconf="--enable-database --disable-roar --disable-documentation
- --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
- --disable-solaris-output --enable-tcp --enable-un --disable-werror
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- if use samba || use upnp; then
- mpdconf+=" --enable-neighbor-plugins"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable libmpdclient) \
- $(use_enable expat) \
- $(use_enable upnp) \
- $(use_enable adplug) \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable samba smbclient) \
- $(use_enable nfs) \
- $(use_enable debug) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable soundcloud) \
- $(use_enable tcpd libwrap) \
- $(use_enable libsamplerate lsr) \
- $(use_enable libsoxr soxr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable musepack mpc) \
- $(use_enable mpg123) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_enable icu) \
- $(use_enable glib) \
- $(use_enable faad aac) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.19.9.ebuild b/media-sound/mpd/mpd-0.19.9.ebuild
deleted file mode 100644
index e27b47a..0000000
--- a/media-sound/mpd/mpd-0.19.9.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
- flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
- libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
- +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
- sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
- wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- ao? ( glib )
- gme? ( glib )
- jack? ( glib )
- network? ( || ( ${ENCODER_PLUGINS} )
- glib )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- sid? ( glib )
- soundcloud? ( glib )
- sqlite? ( glib )
- opus? ( ogg )
- upnp? ( expat )
- vorbis? ( glib )
- wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- adplug? ( media-libs/adplug )
- alsa? ( media-sound/alsa-utils
- media-libs/alsa-lib )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- glib? ( dev-libs/glib:2 )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? ( dev-libs/icu:= )
- id3tag? ( media-libs/libid3tag )
- jack? ( media-sound/jack-audio-connection-kit )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
- nfs? ( net-fs/libnfs )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( net-fs/samba[smbclient] )
- sid? ( media-libs/libsidplay:2 )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2 )
- libsoxr? ( media-libs/soxr )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )"
-DEPEND="${CDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- epatch "${FILESDIR}"/${PN}-0.18.conf.patch
-}
-
-src_configure() {
- local mpdconf="--enable-database --disable-roar --disable-documentation
- --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
- --disable-solaris-output --enable-tcp --enable-un --disable-werror
- --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
- if use network; then
- mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)"
- else
- mpdconf+=" --disable-shout --disable-vorbis-encoder
- --disable-httpd-output --disable-lame-encoder
- --disable-twolame-encoder --disable-wave-encoder"
- fi
-
- if use samba || use upnp; then
- mpdconf+=" --enable-neighbor-plugins"
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- econf \
- $(use_enable libmpdclient) \
- $(use_enable expat) \
- $(use_enable upnp) \
- $(use_enable adplug) \
- $(use_enable alsa) \
- $(use_enable ao) \
- $(use_enable audiofile) \
- $(use_enable bzip2) \
- $(use_enable cdio cdio-paranoia) \
- $(use_enable cdio iso9660) \
- $(use_enable curl) \
- $(use_enable samba smbclient) \
- $(use_enable nfs) \
- $(use_enable debug) \
- $(use_enable ffmpeg) \
- $(use_enable fifo) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable gme) \
- $(use_enable id3tag id3) \
- $(use_enable inotify) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable soundcloud) \
- $(use_enable tcpd libwrap) \
- $(use_enable libsamplerate lsr) \
- $(use_enable libsoxr soxr) \
- $(use_enable mad) \
- $(use_enable mikmod) \
- $(use_enable mms) \
- $(use_enable modplug) \
- $(use_enable musepack mpc) \
- $(use_enable mpg123) \
- $(use_enable openal) \
- $(use_enable opus) \
- $(use_enable oss) \
- $(use_enable pipe pipe-output) \
- $(use_enable pulseaudio pulse) \
- $(use_enable recorder recorder-output) \
- $(use_enable sid sidplay) \
- $(use_enable sndfile sndfile) \
- $(use_enable sqlite) \
- $(use_enable systemd systemd-daemon) \
- $(use_enable vorbis) \
- $(use_enable wavpack) \
- $(use_enable wildmidi) \
- $(use_enable zip zzip) \
- $(use_enable icu) \
- $(use_enable glib) \
- $(use_enable faad aac) \
- $(use_with zeroconf zeroconf avahi) \
- "$(systemd_with_unitdir)" \
- ${mpdconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2018-11-15 14:00 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2018-11-15 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 950e2bdecd79461a5eb2b04c1f641f372ac8ca6f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 14:00:28 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 14:00:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950e2bde
media-sound/mpd: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-sound/mpd/Manifest | 1 -
media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch | 27 ---
media-sound/mpd/files/mpd-0.20.4.logrotate | 6 -
media-sound/mpd/mpd-0.20.10.ebuild | 263 ----------------------
4 files changed, 297 deletions(-)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b84c463d156..e3c66a4a4f9 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,4 +1,3 @@
-DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
DIST mpd-0.21.1.tar.xz 662308 BLAKE2B 59da1cf186d5a171d447bde8e17386b49e3b4e821b4afc429b5e70a7633fe23f9ef671debda4bdf46632a12f008dbfe68966c52e4d298aca0a063dda6ca615da SHA512 9af720f7bb7120a6c6006ad21cd80a61c0f1976ced7b2e6815d5e33d8b1e9caf4e8a0047754db3eb37875176754fbf03bfd77b26232ef4aec9da48667694ba92
DIST mpd-0.21.2.tar.xz 664408 BLAKE2B da1cde9b5f87c3e52c90d9a743ec8bf7acbcf52f3bf28969414bcc0f3f29151fd47157dc153a094844c94f6eb50e5a3564baf66a2e87d840b7b34efc8d0f760b SHA512 a98ff2636a22f7f0e377f814d0312b03344624317a68fcd89a7c5f33a40629908cd19f8bfff5dde1eef96cebd93e92cef63153bf60b02791803532357a38e020
diff --git a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
deleted file mode 100644
index 9153a87dcf9..00000000000
--- a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max@musicpd.org>
-Date: Sat, 3 Feb 2018 19:32:31 +0100
-Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility
-
-Closes #173
----
- src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
-index 536745d85..363921527 100644
---- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
-+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
-@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
- visitor.VisitArchiveEntry(path + 1);
- }
- }
-+
-+#if LIBCDIO_VERSION_NUM >= 20000
-+ iso9660_filelist_free(entlist);
-+#else
- _cdio_list_free (entlist, true);
-+#endif
- }
-
- static ArchiveFile *
diff --git a/media-sound/mpd/files/mpd-0.20.4.logrotate b/media-sound/mpd/files/mpd-0.20.4.logrotate
deleted file mode 100644
index ff47d1098cf..00000000000
--- a/media-sound/mpd/files/mpd-0.20.4.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/lib/mpd/log {
- missingok
- postrotate
- /etc/init.d/mpd reload
- endscript
-}
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
deleted file mode 100644
index e61366e3f1d..00000000000
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
- +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
- lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
- mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
- samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
- unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
- || ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- opus? ( ogg )
- upnp? ( expat )
- webdav? ( curl expat )
-"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
- adplug? ( media-libs/adplug )
- alsa? (
- media-sound/alsa-utils
- media-libs/alsa-lib
- )
- ao? ( media-libs/libao[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio-paranoia )
- curl? ( net-misc/curl )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( media-libs/flac[ogg?] )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? ( dev-libs/icu:= )
- id3tag? ( media-libs/libid3tag )
- jack? ( virtual/jack )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- libsoxr? ( media-libs/soxr )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod:0 )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( >=media-sound/mpg123-1.12.2 )
- musepack? ( media-sound/musepack-tools )
- network? (
- >=media-libs/libshout-2
- !lame? ( !vorbis? ( media-libs/libvorbis ) )
- )
- nfs? ( net-fs/libnfs )
- ogg? ( media-libs/libogg )
- openal? ( media-libs/openal )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-4.0.25 )
- sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
- sndfile? ( media-libs/libsndfile )
- soundcloud? ( >=dev-libs/yajl-2:= )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd )
- tcpd? ( sys-apps/tcp-wrappers )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp:= )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib )
- zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.18.conf.patch
- "${FILESDIR}"/${P}-libcdio-2.patch
-)
-
-pkg_setup() {
- use network || ewarn "Icecast and Shoutcast streaming needs networking."
- use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
- enewuser mpd "" "" "/var/lib/mpd" audio
-
- if use eventfd; then
- CONFIG_CHECK+=" ~EVENTFD"
- ERROR_EVENTFD="${P} requires eventfd in-kernel support."
- fi
- if use signalfd; then
- CONFIG_CHECK+=" ~SIGNALFD"
- ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
- fi
- if use inotify; then
- CONFIG_CHECK+=" ~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- fi
- if use eventfd || use signalfd || use inotify; then
- linux-info_pkg_setup
- fi
-
- elog "If you will be starting mpd via /etc/init.d/mpd, please make
- sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
- cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-database --disable-roar --disable-documentation
- --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
- --disable-solaris-output --enable-tcp --enable-un --disable-werror
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- )
-
- if use network; then
- myeconfargs+=(
- --enable-shout
- $(use_enable vorbis vorbis-encoder)
- --enable-httpd-output
- $(use_enable lame lame-encoder)
- $(use_enable twolame twolame-encoder)
- $(use_enable audiofile wave-encoder)
- )
- else
- myeconfargs+=(
- --disable-shout
- --disable-vorbis-encoder
- --disable-httpd-output
- --disable-lame-encoder
- --disable-twolame-encoder
- --disable-wave-encoder
- )
- fi
-
- if use samba || use upnp; then
- myeconfargs+=( --enable-neighbor-plugins )
- fi
-
- append-lfs-flags
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
- myeconfargs+=(
- $(use_enable eventfd)
- $(use_enable signalfd)
- $(use_enable libmpdclient)
- $(use_enable expat)
- $(use_enable upnp)
- $(use_enable adplug)
- $(use_enable alsa)
- $(use_enable ao)
- $(use_enable audiofile)
- $(use_enable zlib)
- $(use_enable bzip2)
- $(use_enable cdio cdio-paranoia)
- $(use_enable curl)
- $(use_enable samba smbclient)
- $(use_enable nfs)
- $(use_enable debug)
- $(use_enable ffmpeg)
- $(use_enable fifo)
- $(use_enable flac)
- $(use_enable fluidsynth)
- $(use_enable gme)
- $(use_enable id3tag id3)
- $(use_enable inotify)
- $(use_enable ipv6)
- $(use_enable cdio iso9660)
- $(use_enable jack)
- $(use_enable soundcloud)
- $(use_enable tcpd libwrap)
- $(use_enable libsamplerate lsr)
- $(use_enable libsoxr soxr)
- $(use_enable mad)
- $(use_enable mikmod)
- $(use_enable mms)
- $(use_enable modplug)
- $(use_enable musepack mpc)
- $(use_enable mpg123)
- $(use_enable openal)
- $(use_enable opus)
- $(use_enable oss)
- $(use_enable pipe pipe-output)
- $(use_enable pulseaudio pulse)
- $(use_enable recorder recorder-output)
- $(use_enable sid sidplay)
- $(use_enable sndfile sndfile)
- $(use_enable sqlite)
- $(use_enable systemd systemd_daemon)
- $(use_enable vorbis)
- $(use_enable wavpack)
- $(use_enable wildmidi)
- $(use_enable zip zzip)
- $(use_enable icu)
- $(use_enable webdav)
- $(use_enable faad aac)
- $(use_with zeroconf zeroconf avahi)
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
- --with-systemduserunitdir=$(systemd_get_userunitdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- newins doc/mpdconf.dist mpd.conf
-
- newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
- if use unicode; then
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- "${ED}"/etc/mpd.conf || die "sed failed"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
-
- use prefix || diropts -m0755 -o mpd -g audio
- dodir /var/lib/mpd
- keepdir /var/lib/mpd
- dodir /var/lib/mpd/music
- keepdir /var/lib/mpd/music
- dodir /var/lib/mpd/playlists
- keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
- # also change the homedir if the user has existed before
- usermod -d "/var/lib/mpd" mpd
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2020-10-05 14:31 Louis Sautier
0 siblings, 0 replies; 7+ messages in thread
From: Louis Sautier @ 2020-10-05 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 1c7f58dcf770e00fff1ff516398f38064490edad
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 13:32:01 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 14:31:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7f58dc
media-sound/mpd: fix io_uring initialization with OpenRC service
Mirror what upstream does with their systemd unit:
https://github.com/MusicPlayerDaemon/MPD/commit/c031f9aa5d7a516af488f4cd4d9c22c4dc748439
Otherwise, io_uring fails to initialize with:
"Failed to initialize io_uring: io_uring_queue_init() failed:
Cannot allocate memory"
https://github.com/MusicPlayerDaemon/MPD/issues/972
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
media-sound/mpd/files/mpd-0.21.4.init | 4 +++-
media-sound/mpd/{mpd-0.22.ebuild => mpd-0.22-r1.ebuild} | 0
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
index 7f0950c6293..72fede85765 100644
--- a/media-sound/mpd/files/mpd-0.21.4.init
+++ b/media-sound/mpd/files/mpd-0.21.4.init
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
: CFGFILE=${CFGFILE:=/etc/mpd.conf}
@@ -19,6 +19,8 @@ get_config() {
}
extra_started_commands='reload'
+# Required by io_uring
+rc_ulimit="-l 65535"
command=/usr/bin/mpd
command_args=${CFGFILE}
required_files=${CFGFILE}
diff --git a/media-sound/mpd/mpd-0.22.ebuild b/media-sound/mpd/mpd-0.22-r1.ebuild
similarity index 100%
rename from media-sound/mpd/mpd-0.22.ebuild
rename to media-sound/mpd/mpd-0.22-r1.ebuild
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2022-12-18 2:33 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-18 2:33 UTC (permalink / raw
To: gentoo-commits
commit: f8242bade2bbe771e44880615f3c10cde7f27284
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 02:28:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 02:32:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8242bad
media-sound/mpd: add 0.23.11
Closes: https://bugs.gentoo.org/886521
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/mpd/Manifest | 1 +
media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch | 30 +++
media-sound/mpd/mpd-0.23.11.ebuild | 293 +++++++++++++++++++++
3 files changed, 324 insertions(+)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index cf7a2e728d60..b2850379477d 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,4 @@
DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
DIST mpd-0.23.10.tar.xz 774196 BLAKE2B 6b648971412a5f83fe9ff2694c030b451393c415de9c34cbea9894555ac7ea87c5a991edfdd41c7cd76511ae0680ecab35eb36ceae5e372900518c9cf5e9c55c SHA512 15e51a1fab2e187529141ebb25f0bb6cc9c2ad5127c1a9f4c40d1a944ed5bc4e7e76b26eb71f659ddd8a5ce448089e6d3dcf0c302ced8a4d08951ef1b1f09c49
+DIST mpd-0.23.11.tar.xz 774592 BLAKE2B 70cc22abe78f6457bcec20a8e668647f9a2f38417956133ba5fde286179acaa710337461461d73b907a069fc0cfe6cb3787bc0db6bf61d82ad9fb082cbd2776d SHA512 971ae6b8ee5bf963a0f2408194fa01089713b606b3a2423081621b80a25e1b480f0e80a6d155ac8c2083960d99681c90f4bf00bf0baffa1f977259f1687c4ceb
DIST mpd-0.23.9.tar.xz 774156 BLAKE2B 2c045c86ecbe2267d032ebfd4a18835e9b1323860eb348b047d0900a284f5457ca4f18fdd50ea2f678e07a63817b4e4e3245cf0d3948e1f14cf3539d47b314d2 SHA512 67db093e35693f79267f955463ecaa284773b5e47a38f1548a0d16c9ba82aecc3434fd805e224b78782c5978c07e16d26f7632823e536f5304f557985f028d6e
diff --git a/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch b/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch
new file mode 100644
index 000000000000..cb40b14926e2
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/886521
+https://github.com/MusicPlayerDaemon/MPD/issues/1693
+https://github.com/MusicPlayerDaemon/MPD/commit/e4b055eb6d08c5c8f8d85828ce4005d410e462cb
+
+From e4b055eb6d08c5c8f8d85828ce4005d410e462cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Dec 2022 08:29:23 +0700
+Subject: [PATCH] v0.23.x: RemoteTagCache: add missing include
+
+Fix build with Boost 1.81.0. `<array>` was included by one of those boost headers,
+however, it's no longer included as of Boost 1.81.0.
+
+`master` doesn't use `std::array` in this file.
+
+While we're at it, add all necessary inclusion files.
+--- a/src/RemoteTagCache.hxx
++++ b/src/RemoteTagCache.hxx
+@@ -28,7 +28,11 @@
+ #include <boost/intrusive/list.hpp>
+ #include <boost/intrusive/unordered_set.hpp>
+
++#include <array>
++#include <functional>
++#include <memory>
+ #include <string>
++#include <utility>
+
+ class RemoteTagCacheHandler;
+
diff --git a/media-sound/mpd/mpd-0.23.11.ebuild b/media-sound/mpd/mpd-0.23.11.ebuild
new file mode 100644
index 000000000000..d209e7dbdf1f
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.11.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+ +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+ jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+ modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+ recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+ test twolame udisks vorbis wavpack webdav wildmidi upnp
+ zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+ modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+ || ( ${OUTPUT_PLUGINS} )
+ || ( ${DECODER_PLUGINS} )
+ network? ( || ( ${ENCODER_PLUGINS} ) )
+ recorder? ( || ( ${ENCODER_PLUGINS} ) )
+ qobuz? ( curl soundcloud )
+ soundcloud? ( curl qobuz )
+ udisks? ( dbus )
+ upnp? ( curl expat )
+ webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-user/mpd
+ dev-libs/libfmt:=
+ dev-libs/libpcre2
+ media-libs/libogg
+ sys-libs/liburing:=
+ alsa? (
+ media-libs/alsa-lib
+ media-sound/alsa-utils
+ )
+ ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+ audiofile? ( media-libs/audiofile:= )
+ bzip2? ( app-arch/bzip2 )
+ cdio? (
+ dev-libs/libcdio:=
+ dev-libs/libcdio-paranoia
+ )
+ chromaprint? ( media-libs/chromaprint )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ doc? ( dev-python/sphinx )
+ expat? ( dev-libs/expat )
+ faad? ( media-libs/faad2 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ flac? ( media-libs/flac:= )
+ fluidsynth? ( media-sound/fluidsynth )
+ gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+ icu? (
+ dev-libs/icu:=
+ virtual/libiconv
+ )
+ id3tag? ( media-libs/libid3tag:= )
+ jack? ( virtual/jack )
+ lame? ( network? ( media-sound/lame ) )
+ libmpdclient? ( media-libs/libmpdclient )
+ libsamplerate? ( media-libs/libsamplerate )
+ libsoxr? ( media-libs/soxr )
+ mad? ( media-libs/libmad )
+ mikmod? ( media-libs/libmikmod )
+ mms? ( media-libs/libmms )
+ modplug? ( media-libs/libmodplug )
+ mpg123? ( media-sound/mpg123 )
+ musepack? ( media-sound/musepack-tools )
+ network? ( >=media-libs/libshout-2.4.0 )
+ nfs? ( net-fs/libnfs )
+ openal? ( media-libs/openal )
+ openmpt? ( media-libs/libopenmpt )
+ opus? ( media-libs/opus )
+ pulseaudio? ( media-sound/pulseaudio )
+ pipewire? ( media-video/pipewire:= )
+ qobuz? ( dev-libs/libgcrypt:0 )
+ samba? ( net-fs/samba )
+ selinux? ( sec-policy/selinux-mpd )
+ sid? ( || (
+ media-libs/libsidplay:2
+ media-libs/libsidplayfp
+ ) )
+ snapcast? ( media-sound/snapcast )
+ sndfile? ( media-libs/libsndfile )
+ sndio? ( media-sound/sndio )
+ soundcloud? ( >=dev-libs/yajl-2:= )
+ sqlite? ( dev-db/sqlite:3 )
+ systemd? ( sys-apps/systemd:= )
+ twolame? ( media-sound/twolame )
+ udisks? ( sys-fs/udisks:2 )
+ upnp? ( net-libs/libupnp:0 )
+ vorbis? ( media-libs/libvorbis )
+ wavpack? ( media-sound/wavpack )
+ wildmidi? ( media-sound/wildmidi )
+ zeroconf? ( net-dns/avahi[dbus] )
+ zip? ( dev-libs/zziplib:= )
+ zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+ dev-libs/boost:=
+ test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-boost-1.81.patch
+)
+
+pkg_setup() {
+ if use eventfd; then
+ CONFIG_CHECK+=" ~EVENTFD"
+ ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+ fi
+
+ if use signalfd; then
+ CONFIG_CHECK+=" ~SIGNALFD"
+ ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+ fi
+
+ if use inotify; then
+ CONFIG_CHECK+=" ~INOTIFY_USER"
+ ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+ fi
+
+ if use eventfd || use signalfd || use inotify; then
+ linux-info_pkg_setup
+ fi
+
+ elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+ sed -i \
+ -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+ -e 's:^#user.*$:user "mpd":' \
+ -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+ -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+ -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+ -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+ -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+ -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+ -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+ -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+ doc/mpdconf.example || die
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature bzip2)
+ $(meson_feature cdio cdio_paranoia)
+ $(meson_feature chromaprint)
+ $(meson_use cue)
+ $(meson_feature curl)
+ $(meson_feature dbus)
+ $(meson_use eventfd)
+ $(meson_feature expat)
+ $(meson_feature icu)
+ $(meson_feature id3tag)
+ $(meson_use inotify)
+ -Dipv6=enabled
+ $(meson_feature cdio iso9660)
+ $(meson_feature libmpdclient)
+ $(meson_feature libsamplerate)
+ $(meson_feature mms)
+ $(meson_feature nfs)
+ $(meson_use signalfd)
+ $(meson_feature samba smbclient)
+ $(meson_feature libsoxr soxr)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test)
+ $(meson_feature udisks)
+ -Dupnp=$(usex upnp pupnp disabled)
+ $(meson_feature webdav)
+ -Dzeroconf=$(usex zeroconf avahi disabled)
+ $(meson_feature zlib)
+ $(meson_feature zip zzip)
+ )
+
+ emesonargs+=(
+ $(meson_feature alsa)
+ $(meson_feature ao)
+ $(meson_use fifo)
+ $(meson_feature jack)
+ $(meson_feature openal)
+ $(meson_feature oss)
+ $(meson_use pipe)
+ $(meson_feature pipewire)
+ $(meson_feature pulseaudio pulse)
+ $(meson_use recorder)
+ $(meson_use snapcast)
+ $(meson_feature sndio)
+ )
+
+ if use samba || use upnp; then
+ emesonargs+=( -Dneighbor=true )
+ fi
+
+ append-lfs-flags
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+ if use network; then
+ emesonargs+=(
+ -Dshine=disabled
+ -Dshout=enabled
+ $(meson_feature vorbis vorbisenc)
+ -Dhttpd=true
+ $(meson_feature lame)
+ $(meson_feature twolame)
+ $(meson_use audiofile wave_encoder)
+ )
+ fi
+
+ emesonargs+=(
+ # media-libs/adplug is not packaged anymore
+ -Dadplug=disabled
+ $(meson_feature audiofile)
+ $(meson_feature faad)
+ $(meson_feature ffmpeg)
+ $(meson_feature flac)
+ $(meson_feature fluidsynth)
+ $(meson_feature gme)
+ $(meson_feature mad)
+ $(meson_feature mikmod)
+ $(meson_feature modplug)
+ $(meson_feature musepack mpcdec)
+ $(meson_feature mpg123)
+ $(meson_feature openmpt)
+ $(meson_feature opus)
+ $(meson_feature sid sidplay)
+ $(meson_feature sndfile)
+ $(meson_feature vorbis)
+ $(meson_feature wavpack)
+ $(meson_feature wildmidi)
+ $(meson_feature qobuz)
+ $(meson_feature soundcloud)
+
+ --libdir="/usr/$(get_libdir)"
+ $(meson_feature doc documentation)
+ -Dsolaris_output=disabled
+
+ -Ddatabase=true
+ -Ddsd=true
+ -Dio_uring=enabled
+ -Dtcp=true
+
+ -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+ -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+ $(meson_feature icu iconv)
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ insinto /etc
+ newins doc/mpdconf.example mpd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+ sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+ keepdir /var/lib/mpd
+ keepdir /var/lib/mpd/music
+ keepdir /var/lib/mpd/playlists
+
+ rm -r "${ED}"/usr/share/doc/mpd || die
+
+ fowners mpd:audio -R /var/lib/mpd
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2023-05-18 10:42 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2023-05-18 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 3289028845b64db719bd2634750c7a04f39b2ac2
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Mon May 15 22:07:46 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 18 10:42:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32890288
media-sound/mpd: drop 0.23.11
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/31048
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/mpd/Manifest | 1 -
media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch | 30 ---
media-sound/mpd/mpd-0.23.11.ebuild | 293 ---------------------
3 files changed, 324 deletions(-)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dd57ec3cd831..433f7dbac89a 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,2 +1 @@
-DIST mpd-0.23.11.tar.xz 774592 BLAKE2B 70cc22abe78f6457bcec20a8e668647f9a2f38417956133ba5fde286179acaa710337461461d73b907a069fc0cfe6cb3787bc0db6bf61d82ad9fb082cbd2776d SHA512 971ae6b8ee5bf963a0f2408194fa01089713b606b3a2423081621b80a25e1b480f0e80a6d155ac8c2083960d99681c90f4bf00bf0baffa1f977259f1687c4ceb
DIST mpd-0.23.12.tar.xz 774708 BLAKE2B b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71 SHA512 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
diff --git a/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch b/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch
deleted file mode 100644
index cb40b14926e2..000000000000
--- a/media-sound/mpd/files/mpd-0.23.11-boost-1.81.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/886521
-https://github.com/MusicPlayerDaemon/MPD/issues/1693
-https://github.com/MusicPlayerDaemon/MPD/commit/e4b055eb6d08c5c8f8d85828ce4005d410e462cb
-
-From e4b055eb6d08c5c8f8d85828ce4005d410e462cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Dec 2022 08:29:23 +0700
-Subject: [PATCH] v0.23.x: RemoteTagCache: add missing include
-
-Fix build with Boost 1.81.0. `<array>` was included by one of those boost headers,
-however, it's no longer included as of Boost 1.81.0.
-
-`master` doesn't use `std::array` in this file.
-
-While we're at it, add all necessary inclusion files.
---- a/src/RemoteTagCache.hxx
-+++ b/src/RemoteTagCache.hxx
-@@ -28,7 +28,11 @@
- #include <boost/intrusive/list.hpp>
- #include <boost/intrusive/unordered_set.hpp>
-
-+#include <array>
-+#include <functional>
-+#include <memory>
- #include <string>
-+#include <utility>
-
- class RemoteTagCacheHandler;
-
diff --git a/media-sound/mpd/mpd-0.23.11.ebuild b/media-sound/mpd/mpd-0.23.11.ebuild
deleted file mode 100644
index 3c94bc93825b..000000000000
--- a/media-sound/mpd/mpd-0.23.11.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
- +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
- jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
- modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
- recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
- test twolame udisks vorbis wavpack webdav wildmidi upnp
- zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
- || ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- qobuz? ( curl soundcloud )
- soundcloud? ( curl qobuz )
- udisks? ( dbus )
- upnp? ( curl expat )
- webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-user/mpd
- dev-libs/libfmt:=
- dev-libs/libpcre2
- media-libs/libogg
- sys-libs/liburing:=
- alsa? (
- media-libs/alsa-lib
- media-sound/alsa-utils
- )
- ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile:= )
- bzip2? ( app-arch/bzip2 )
- cdio? (
- dev-libs/libcdio:=
- dev-libs/libcdio-paranoia
- )
- chromaprint? ( media-libs/chromaprint )
- curl? ( net-misc/curl )
- dbus? ( sys-apps/dbus )
- doc? ( dev-python/sphinx )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? ( media-video/ffmpeg:= )
- flac? ( media-libs/flac:= )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? (
- dev-libs/icu:=
- virtual/libiconv
- )
- id3tag? ( media-libs/libid3tag:= )
- jack? ( virtual/jack )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- libsoxr? ( media-libs/soxr )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( media-sound/mpg123 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2.4.0 )
- nfs? ( net-fs/libnfs )
- openal? ( media-libs/openal )
- openmpt? ( media-libs/libopenmpt )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- pipewire? ( media-video/pipewire:= )
- qobuz? ( dev-libs/libgcrypt:0 )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-mpd )
- sid? ( || (
- media-libs/libsidplay:2
- media-libs/libsidplayfp
- ) )
- snapcast? ( media-sound/snapcast )
- sndfile? ( media-libs/libsndfile )
- sndio? ( media-sound/sndio )
- soundcloud? ( >=dev-libs/yajl-2:= )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd:= )
- twolame? ( media-sound/twolame )
- udisks? ( sys-fs/udisks:2 )
- upnp? ( net-libs/libupnp:0 )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib:= )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-boost-1.81.patch
-)
-
-pkg_setup() {
- if use eventfd; then
- CONFIG_CHECK+=" ~EVENTFD"
- ERROR_EVENTFD="${P} requires eventfd in-kernel support."
- fi
-
- if use signalfd; then
- CONFIG_CHECK+=" ~SIGNALFD"
- ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
- fi
-
- if use inotify; then
- CONFIG_CHECK+=" ~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- fi
-
- if use eventfd || use signalfd || use inotify; then
- linux-info_pkg_setup
- fi
-
- elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
- sed -i \
- -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- -e 's:^#user.*$:user "mpd":' \
- -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
- -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
- -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
- -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
- -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
- -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
- -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
- -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
- doc/mpdconf.example || die
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature bzip2)
- $(meson_feature cdio cdio_paranoia)
- $(meson_feature chromaprint)
- $(meson_use cue)
- $(meson_feature curl)
- $(meson_feature dbus)
- $(meson_use eventfd)
- $(meson_feature expat)
- $(meson_feature icu)
- $(meson_feature id3tag)
- $(meson_use inotify)
- -Dipv6=enabled
- $(meson_feature cdio iso9660)
- $(meson_feature libmpdclient)
- $(meson_feature libsamplerate)
- $(meson_feature mms)
- $(meson_feature nfs)
- $(meson_use signalfd)
- $(meson_feature samba smbclient)
- $(meson_feature libsoxr soxr)
- $(meson_feature sqlite)
- $(meson_feature systemd)
- $(meson_use test)
- $(meson_feature udisks)
- -Dupnp=$(usex upnp pupnp disabled)
- $(meson_feature webdav)
- -Dzeroconf=$(usex zeroconf avahi disabled)
- $(meson_feature zlib)
- $(meson_feature zip zzip)
- )
-
- emesonargs+=(
- $(meson_feature alsa)
- $(meson_feature ao)
- $(meson_use fifo)
- $(meson_feature jack)
- $(meson_feature openal)
- $(meson_feature oss)
- $(meson_use pipe)
- $(meson_feature pipewire)
- $(meson_feature pulseaudio pulse)
- $(meson_use recorder)
- $(meson_use snapcast)
- $(meson_feature sndio)
- )
-
- if use samba || use upnp; then
- emesonargs+=( -Dneighbor=true )
- fi
-
- append-lfs-flags
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
- if use network; then
- emesonargs+=(
- -Dshine=disabled
- -Dshout=enabled
- $(meson_feature vorbis vorbisenc)
- -Dhttpd=true
- $(meson_feature lame)
- $(meson_feature twolame)
- $(meson_use audiofile wave_encoder)
- )
- fi
-
- emesonargs+=(
- # media-libs/adplug is not packaged anymore
- -Dadplug=disabled
- $(meson_feature audiofile)
- $(meson_feature faad)
- $(meson_feature ffmpeg)
- $(meson_feature flac)
- $(meson_feature fluidsynth)
- $(meson_feature gme)
- $(meson_feature mad)
- $(meson_feature mikmod)
- $(meson_feature modplug)
- $(meson_feature musepack mpcdec)
- $(meson_feature mpg123)
- $(meson_feature openmpt)
- $(meson_feature opus)
- $(meson_feature sid sidplay)
- $(meson_feature sndfile)
- $(meson_feature vorbis)
- $(meson_feature wavpack)
- $(meson_feature wildmidi)
- $(meson_feature qobuz)
- $(meson_feature soundcloud)
-
- --libdir="/usr/$(get_libdir)"
- $(meson_feature doc documentation)
- -Dsolaris_output=disabled
-
- -Ddatabase=true
- -Ddsd=true
- -Dio_uring=enabled
- -Dtcp=true
-
- -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
- $(meson_feature icu iconv)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- insinto /etc
- newins doc/mpdconf.example mpd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
-
- keepdir /var/lib/mpd
- keepdir /var/lib/mpd/music
- keepdir /var/lib/mpd/playlists
-
- rm -r "${ED}"/usr/share/doc/mpd || die
-
- fowners mpd:audio -R /var/lib/mpd
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2024-09-22 13:07 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-09-22 13:07 UTC (permalink / raw
To: gentoo-commits
commit: e6974ed62678850a6429cbb7a88c37eb23c82d52
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sat Sep 21 14:47:23 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 13:06:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6974ed6
media-sound/mpd: drop 0.23.12-r3, 0.23.13-r1
This also removes any files used by these versions, which are no longer
needed in later versions.
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/38716
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/mpd/Manifest | 2 -
media-sound/mpd/files/mpd-0.21.1.logrotate | 9 -
media-sound/mpd/files/mpd-0.21.4.init | 34 ---
.../mpd/files/mpd-0.23.12-libfmt10-906074.patch | 102 -------
media-sound/mpd/files/mpd-0.23.12-stringview.patch | 235 ----------------
media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch | 14 -
media-sound/mpd/mpd-0.23.12-r3.ebuild | 295 ---------------------
media-sound/mpd/mpd-0.23.13-r1.ebuild | 294 --------------------
8 files changed, 985 deletions(-)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 800fb21c8859..0accc3634bf6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1 @@
-DIST mpd-0.23.12.tar.xz 774708 BLAKE2B b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71 SHA512 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
-DIST mpd-0.23.13.tar.xz 776668 BLAKE2B 02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26 SHA512 1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d
DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
diff --git a/media-sound/mpd/files/mpd-0.21.1.logrotate b/media-sound/mpd/files/mpd-0.21.1.logrotate
deleted file mode 100644
index 597c4fb2306d..000000000000
--- a/media-sound/mpd/files/mpd-0.21.1.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/lib/mpd/log {
- missingok
- weekly
- delaycompress
- compress
- postrotate
- /etc/init.d/mpd --quiet reload
- endscript
-}
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
deleted file mode 100644
index 31336a5b1254..000000000000
--- a/media-sound/mpd/files/mpd-0.21.4.init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: CFGFILE=${CFGFILE:=/etc/mpd.conf}
-
-depend() {
- need localmount
- use net netmount alsasound esound pulseaudio
- config ${CFGFILE}
-}
-
-get_config() {
- x=$1
- test -e ${CFGFILE} || return 1
- sed -n \
- -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
- ${CFGFILE}
-}
-
-extra_started_commands='reload'
-# Required by io_uring
-rc_ulimit="-l 65535"
-command=/usr/bin/mpd
-command_args=${CFGFILE}
-required_files=${CFGFILE}
-pidfile=$(get_config pid_file)
-description="Music Player Daemon"
-
-reload() {
- ebegin "Reloading ${RC_SVCNAME}"
- start-stop-daemon --pidfile ${pidfile} --signal HUP
- eend $?
- }
diff --git a/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch b/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch
deleted file mode 100644
index 7fc5187a54f3..000000000000
--- a/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-libfmt 10 changed the API, requiring a few adjustments to the codebase.
-This backports the upstream fixes for building against libfmt 10.
-
-Bug: https://bugs.gentoo.org/906074
-
---- a/src/SongPrint.cxx
-+++ b/src/SongPrint.cxx
-@@ -24,6 +24,7 @@
- #include "TagPrint.hxx"
- #include "client/Response.hxx"
- #include "fs/Traits.hxx"
-+#include "lib/fmt/AudioFormatFormatter.hxx"
- #include "time/ChronoUtil.hxx"
- #include "util/StringBuffer.hxx"
- #include "util/UriUtil.hxx"
-@@ -93,7 +94,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept
- time_print(r, "Last-Modified", song.mtime);
-
- if (song.audio_format.IsDefined())
-- r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format));
-+ r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format);
-
- tag_print_values(r, song.tag);
-
-@@ -116,7 +117,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept
- time_print(r, "Last-Modified", song.GetLastModified());
-
- if (const auto &f = song.GetAudioFormat(); f.IsDefined())
-- r.Fmt(FMT_STRING("Format: {}\n"), ToString(f));
-+ r.Fmt(FMT_STRING("Format: {}\n"), f);
-
- tag_print_values(r, song.GetTag());
-
---- a/src/TagPrint.cxx
-+++ b/src/TagPrint.cxx
-@@ -21,7 +21,6 @@
- #include "tag/Tag.hxx"
- #include "tag/Settings.hxx"
- #include "client/Response.hxx"
--#include "util/StringView.hxx"
-
- #include <fmt/format.h>
-
-@@ -35,7 +34,7 @@ tag_print_types(Response &r) noexcept
- }
-
- void
--tag_print(Response &r, TagType type, StringView value) noexcept
-+tag_print(Response &r, TagType type, std::string_view value) noexcept
- {
- r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], value);
- }
---- a/src/TagPrint.hxx
-+++ b/src/TagPrint.hxx
-@@ -21,6 +21,7 @@
- #define MPD_TAG_PRINT_HXX
-
- #include <cstdint>
-+#include <string_view>
-
- enum TagType : uint8_t;
-
-@@ -32,7 +33,7 @@ void
- tag_print_types(Response &response) noexcept;
-
- void
--tag_print(Response &response, TagType type, StringView value) noexcept;
-+tag_print(Response &response, TagType type, std::string_view value) noexcept;
-
- void
- tag_print(Response &response, TagType type, const char *value) noexcept;
---- a/src/TimePrint.cxx
-+++ b/src/TimePrint.cxx
-@@ -36,5 +36,5 @@ time_print(Response &r, const char *name,
- return;
- }
-
-- r.Fmt(FMT_STRING("{}: {}\n"), name, s);
-+ r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str());
- }
---- a/src/command/PlayerCommands.cxx
-+++ b/src/command/PlayerCommands.cxx
-@@ -28,6 +28,7 @@
- #include "Partition.hxx"
- #include "Instance.hxx"
- #include "IdleFlags.hxx"
-+#include "lib/fmt/AudioFormatFormatter.hxx"
- #include "util/StringBuffer.hxx"
- #include "util/ScopeExit.hxx"
- #include "util/Exception.hxx"
-@@ -185,7 +186,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r)
-
- if (player_status.audio_format.IsDefined())
- r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"),
-- ToString(player_status.audio_format));
-+ player_status.audio_format);
- }
-
- #ifdef ENABLE_DATABASE
---
-2.39.2
-
diff --git a/media-sound/mpd/files/mpd-0.23.12-stringview.patch b/media-sound/mpd/files/mpd-0.23.12-stringview.patch
deleted file mode 100644
index fa0f77f2a712..000000000000
--- a/media-sound/mpd/files/mpd-0.23.12-stringview.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Backport of upstream commit ec66ee3bfb, which is a prerequisite to
-backport the fix for dev-libs/libfmt-10.
-
---- a/src/command/FileCommands.cxx
-+++ b/src/command/FileCommands.cxx
-@@ -106,7 +106,7 @@ handle_listfiles_local(Response &r, Path path_fs)
-
- gcc_pure
- static bool
--IsValidName(const StringView s) noexcept
-+IsValidName(const std::string_view s) noexcept
- {
- if (s.empty() || !IsAlphaASCII(s.front()))
- return false;
-@@ -118,7 +118,7 @@ IsValidName(const StringView s) noexcept
-
- gcc_pure
- static bool
--IsValidValue(const StringView s) noexcept
-+IsValidValue(const std::string_view s) noexcept
- {
- return std::none_of(s.begin(), s.end(), [](const auto &ch) { return (unsigned char)ch < 0x20; });
- }
-@@ -130,7 +130,7 @@ public:
- explicit PrintCommentHandler(Response &_response) noexcept
- :NullTagHandler(WANT_PAIR), response(_response) {}
-
-- void OnPair(StringView key, StringView value) noexcept override {
-+ void OnPair(std::string_view key, std::string_view value) noexcept override {
- if (IsValidName(key) && IsValidValue(value))
- response.Fmt(FMT_STRING("{}: {}\n"), key, value);
- }
---- a/src/command/OtherCommands.cxx
-+++ b/src/command/OtherCommands.cxx
-@@ -147,7 +147,7 @@ public:
- explicit PrintTagHandler(Response &_response) noexcept
- :NullTagHandler(WANT_TAG), response(_response) {}
-
-- void OnTag(TagType type, StringView value) noexcept override {
-+ void OnTag(TagType type, std::string_view value) noexcept override {
- if (response.GetClient().tag_mask.Test(type))
- tag_print(response, type, value);
- }
---- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
-+++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
-@@ -81,11 +81,11 @@ adplug_file_decode(DecoderClient &client, Path path_fs)
- }
-
- static void
--adplug_scan_tag(TagType type, const std::string &value,
-+adplug_scan_tag(TagType type, const std::string_view value,
- TagHandler &handler) noexcept
- {
- if (!value.empty())
-- handler.OnTag(type, {value.data(), value.size()});
-+ handler.OnTag(type, value);
- }
-
- static bool
---- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
-+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
-@@ -39,6 +39,8 @@
-
- #include <string.h>
-
-+using std::string_view_literals::operator""sv;
-+
- class EmbeddedCuePlaylist final : public SongEnumerator {
- public:
- /**
-@@ -69,14 +71,15 @@ public:
-
- ExtractCuesheetTagHandler() noexcept:NullTagHandler(WANT_PAIR) {}
-
-- void OnPair(StringView key, StringView value) noexcept override;
-+ void OnPair(std::string_view key, std::string_view value) noexcept override;
- };
-
- void
--ExtractCuesheetTagHandler::OnPair(StringView name, StringView value) noexcept
-+ExtractCuesheetTagHandler::OnPair(std::string_view name, std::string_view value) noexcept
- {
-- if (cuesheet.empty() && name.EqualsIgnoreCase("cuesheet"))
-- cuesheet = {value.data, value.size};
-+ if (cuesheet.empty() &&
-+ StringView{name}.EqualsIgnoreCase("cuesheet"sv))
-+ cuesheet = value;
- }
-
- static std::unique_ptr<SongEnumerator>
---- a/src/tag/Handler.cxx
-+++ b/src/tag/Handler.cxx
-@@ -25,13 +25,15 @@
-
- #include <algorithm>
-
-+using std::string_view_literals::operator""sv;
-+
- void
--NullTagHandler::OnTag(TagType, StringView) noexcept
-+NullTagHandler::OnTag(TagType, std::string_view) noexcept
- {
- }
-
- void
--NullTagHandler::OnPair(StringView, StringView) noexcept
-+NullTagHandler::OnPair(std::string_view, std::string_view) noexcept
- {
- }
-
-@@ -54,18 +56,18 @@ AddTagHandler::OnDuration(SongTime duration) noexcept
- /**
- * Skip leading zeroes and a non-decimal suffix.
- */
--static StringView
--NormalizeDecimal(StringView s)
-+static std::string_view
-+NormalizeDecimal(std::string_view s)
- {
- auto start = std::find_if(s.begin(), s.end(),
- [](char ch){ return ch != '0'; });
- auto end = std::find_if(start, s.end(),
- [](char ch){ return !IsDigitASCII(ch); });
-- return {start, end};
-+ return StringView{start, end};
- }
-
- void
--AddTagHandler::OnTag(TagType type, StringView value) noexcept
-+AddTagHandler::OnTag(TagType type, std::string_view value) noexcept
- {
- if (type == TAG_TRACK || type == TAG_DISC) {
- /* filter out this extra data and leading zeroes */
-@@ -77,9 +79,9 @@ AddTagHandler::OnTag(TagType type, StringView value) noexcept
- }
-
- void
--FullTagHandler::OnPair(StringView name, StringView) noexcept
-+FullTagHandler::OnPair(std::string_view name, std::string_view) noexcept
- {
-- if (name.EqualsIgnoreCase("cuesheet"))
-+ if (StringView{name}.EqualsIgnoreCase("cuesheet"sv))
- tag.SetHasPlaylist(true);
- }
-
---- a/src/tag/Handler.hxx
-+++ b/src/tag/Handler.hxx
-@@ -24,8 +24,11 @@
- #include "Chrono.hxx"
- #include "util/Compiler.h"
-
-+#include <cstddef>
-+#include <span>
-+#include <string_view>
-+
- template<typename T> struct ConstBuffer;
--struct StringView;
- struct AudioFormat;
- class TagBuilder;
-
-@@ -81,13 +84,14 @@ public:
- * @param the value of the tag; the pointer will become
- * invalid after returning
- */
-- virtual void OnTag(TagType type, StringView value) noexcept = 0;
-+ virtual void OnTag(TagType type, std::string_view value) noexcept = 0;
-
- /**
- * A name-value pair has been read. It is the codec specific
- * representation of tags.
- */
-- virtual void OnPair(StringView key, StringView value) noexcept = 0;
-+ virtual void OnPair(std::string_view key,
-+ std::string_view value) noexcept = 0;
-
- /**
- * Declare the audio format of a song.
-@@ -125,8 +129,9 @@ public:
- :TagHandler(_want_mask) {}
-
- void OnDuration([[maybe_unused]] SongTime duration) noexcept override {}
-- void OnTag(TagType type, StringView value) noexcept override;
-- void OnPair(StringView key, StringView value) noexcept override;
-+ void OnTag(TagType type, std::string_view value) noexcept override;
-+ void OnPair(std::string_view key,
-+ std::string_view value) noexcept override;
- void OnAudioFormat(AudioFormat af) noexcept override;
- void OnPicture(const char *mime_type,
- ConstBuffer<void> buffer) noexcept override;
-@@ -149,7 +154,7 @@ public:
- :AddTagHandler(0, _builder) {}
-
- void OnDuration(SongTime duration) noexcept override;
-- void OnTag(TagType type, StringView value) noexcept override;
-+ void OnTag(TagType type, std::string_view value) noexcept override;
- };
-
- /**
-@@ -173,7 +178,8 @@ public:
- AudioFormat *_audio_format=nullptr) noexcept
- :FullTagHandler(0, _builder, _audio_format) {}
-
-- void OnPair(StringView key, StringView value) noexcept override;
-+ void OnPair(std::string_view key,
-+ std::string_view value) noexcept override;
- void OnAudioFormat(AudioFormat af) noexcept override;
- };
-
---- a/test/read_tags.cxx
-+++ b/test/read_tags.cxx
-@@ -60,16 +60,16 @@ public:
- printf("duration=%f\n", duration.ToDoubleS());
- }
-
-- void OnTag(TagType type, StringView value) noexcept override {
-+ void OnTag(TagType type, std::string_view value) noexcept override {
- printf("[%s]=%.*s\n", tag_item_names[type],
-- int(value.size), value.data);
-+ int(value.size()), value.data());
- empty = false;
- }
-
-- void OnPair(StringView key, StringView value) noexcept override {
-+ void OnPair(std::string_view key, std::string_view value) noexcept override {
- printf("\"%.*s\"=%.*s\n",
-- int(key.size), key.data,
-- int(value.size), value.data);
-+ int(key.size()), key.data(),
-+ int(value.size()), value.data());
- }
-
- void OnAudioFormat(AudioFormat af) noexcept override {
---
-2.39.2
-
diff --git a/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch b/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch
deleted file mode 100644
index e9515c632c7c..000000000000
--- a/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/918421
-https://github.com/MusicPlayerDaemon/MPD/issues/1898
---- a/src/decoder/plugins/FfmpegIo.cxx
-+++ b/src/decoder/plugins/FfmpegIo.cxx
-@@ -26,6 +26,9 @@
-
- extern "C" {
- #include <libavutil/mem.h>
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
-+#include <libavutil/error.h>
-+#endif
- }
-
- AvioStream::~AvioStream()
diff --git a/media-sound/mpd/mpd-0.23.12-r3.ebuild b/media-sound/mpd/mpd-0.23.12-r3.ebuild
deleted file mode 100644
index abec625c27fa..000000000000
--- a/media-sound/mpd/mpd-0.23.12-r3.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
- +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
- jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
- modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
- recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
- test twolame udisks vorbis wavpack webdav wildmidi upnp
- zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
- || ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- qobuz? ( curl soundcloud )
- soundcloud? ( curl qobuz )
- udisks? ( dbus )
- upnp? ( curl expat )
- webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-user/mpd
- dev-libs/libfmt:=
- dev-libs/libpcre2
- media-libs/libogg
- sys-libs/liburing:=
- alsa? (
- media-libs/alsa-lib
- media-sound/alsa-utils
- )
- ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile:= )
- bzip2? ( app-arch/bzip2 )
- cdio? (
- dev-libs/libcdio:=
- dev-libs/libcdio-paranoia
- )
- chromaprint? ( media-libs/chromaprint )
- curl? ( net-misc/curl )
- dbus? ( sys-apps/dbus )
- doc? ( dev-python/sphinx )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? ( media-video/ffmpeg:= )
- flac? ( media-libs/flac:= )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? (
- dev-libs/icu:=
- virtual/libiconv
- )
- id3tag? ( media-libs/libid3tag:= )
- jack? ( virtual/jack )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- libsoxr? ( media-libs/soxr )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( media-sound/mpg123 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2.4.0 )
- nfs? ( net-fs/libnfs )
- openal? ( media-libs/openal )
- openmpt? ( media-libs/libopenmpt )
- opus? ( media-libs/opus )
- pulseaudio? ( media-libs/libpulse )
- pipewire? ( media-video/pipewire:= )
- qobuz? ( dev-libs/libgcrypt:0 )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-mpd )
- sid? ( || (
- media-libs/libsidplay:2
- media-libs/libsidplayfp
- ) )
- snapcast? ( media-sound/snapcast )
- sndfile? ( media-libs/libsndfile )
- sndio? ( media-sound/sndio )
- soundcloud? ( >=dev-libs/yajl-2:= )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd:= )
- twolame? ( media-sound/twolame )
- udisks? ( sys-fs/udisks:2 )
- upnp? ( net-libs/libupnp:0 )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib:= )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- # Backported fixes for dev-libs/libfmt-10. Remove after 0.23.12.
- "${FILESDIR}/${P}-stringview.patch"
- "${FILESDIR}/${P}-libfmt10-906074.patch"
-)
-
-pkg_setup() {
- if use eventfd; then
- CONFIG_CHECK+=" ~EVENTFD"
- ERROR_EVENTFD="${P} requires eventfd in-kernel support."
- fi
-
- if use signalfd; then
- CONFIG_CHECK+=" ~SIGNALFD"
- ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
- fi
-
- if use inotify; then
- CONFIG_CHECK+=" ~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- fi
-
- if use eventfd || use signalfd || use inotify; then
- linux-info_pkg_setup
- fi
-
- elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
- sed -i \
- -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- -e 's:^#user.*$:user "mpd":' \
- -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
- -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
- -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
- -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
- -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
- -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
- -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
- -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
- doc/mpdconf.example || die
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature bzip2)
- $(meson_feature cdio cdio_paranoia)
- $(meson_feature chromaprint)
- $(meson_use cue)
- $(meson_feature curl)
- $(meson_feature dbus)
- $(meson_use eventfd)
- $(meson_feature expat)
- $(meson_feature icu)
- $(meson_feature id3tag)
- $(meson_use inotify)
- -Dipv6=enabled
- $(meson_feature cdio iso9660)
- $(meson_feature libmpdclient)
- $(meson_feature libsamplerate)
- $(meson_feature mms)
- $(meson_feature nfs)
- $(meson_use signalfd)
- $(meson_feature samba smbclient)
- $(meson_feature libsoxr soxr)
- $(meson_feature sqlite)
- $(meson_feature systemd)
- $(meson_use test)
- $(meson_feature udisks)
- -Dupnp=$(usex upnp pupnp disabled)
- $(meson_feature webdav)
- -Dzeroconf=$(usex zeroconf avahi disabled)
- $(meson_feature zlib)
- $(meson_feature zip zzip)
- )
-
- emesonargs+=(
- $(meson_feature alsa)
- $(meson_feature ao)
- $(meson_use fifo)
- $(meson_feature jack)
- $(meson_feature openal)
- $(meson_feature oss)
- $(meson_use pipe)
- $(meson_feature pipewire)
- $(meson_feature pulseaudio pulse)
- $(meson_use recorder)
- $(meson_use snapcast)
- $(meson_feature sndio)
- )
-
- if use samba || use upnp; then
- emesonargs+=( -Dneighbor=true )
- fi
-
- append-lfs-flags
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
- if use network; then
- emesonargs+=(
- -Dshine=disabled
- -Dshout=enabled
- $(meson_feature vorbis vorbisenc)
- -Dhttpd=true
- $(meson_feature lame)
- $(meson_feature twolame)
- $(meson_use audiofile wave_encoder)
- )
- fi
-
- emesonargs+=(
- # media-libs/adplug is not packaged anymore
- -Dadplug=disabled
- $(meson_feature audiofile)
- $(meson_feature faad)
- $(meson_feature ffmpeg)
- $(meson_feature flac)
- $(meson_feature fluidsynth)
- $(meson_feature gme)
- $(meson_feature mad)
- $(meson_feature mikmod)
- $(meson_feature modplug)
- $(meson_feature musepack mpcdec)
- $(meson_feature mpg123)
- $(meson_feature openmpt)
- $(meson_feature opus)
- $(meson_feature sid sidplay)
- $(meson_feature sndfile)
- $(meson_feature vorbis)
- $(meson_feature wavpack)
- $(meson_feature wildmidi)
- $(meson_feature qobuz)
- $(meson_feature soundcloud)
-
- --libdir="/usr/$(get_libdir)"
- $(meson_feature doc documentation)
- -Dsolaris_output=disabled
-
- -Ddatabase=true
- -Ddsd=true
- -Dio_uring=enabled
- -Dtcp=true
-
- -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
- $(meson_feature icu iconv)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- insinto /etc
- newins doc/mpdconf.example mpd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
-
- keepdir /var/lib/mpd
- keepdir /var/lib/mpd/music
- keepdir /var/lib/mpd/playlists
-
- rm -r "${ED}"/usr/share/doc/mpd || die
-
- fowners mpd:audio -R /var/lib/mpd
-}
diff --git a/media-sound/mpd/mpd-0.23.13-r1.ebuild b/media-sound/mpd/mpd-0.23.13-r1.ebuild
deleted file mode 100644
index 3dcf11ed6998..000000000000
--- a/media-sound/mpd/mpd-0.23.13-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
- +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
- jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
- modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
- recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
- test twolame udisks vorbis wavpack webdav wildmidi upnp
- zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
- modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
- || ( ${OUTPUT_PLUGINS} )
- || ( ${DECODER_PLUGINS} )
- network? ( || ( ${ENCODER_PLUGINS} ) )
- recorder? ( || ( ${ENCODER_PLUGINS} ) )
- qobuz? ( curl soundcloud )
- soundcloud? ( curl qobuz )
- udisks? ( dbus )
- upnp? ( curl expat )
- webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-user/mpd
- dev-libs/libfmt:=
- dev-libs/libpcre2
- media-libs/libogg
- sys-libs/liburing:=
- alsa? (
- media-libs/alsa-lib
- media-sound/alsa-utils
- )
- ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
- audiofile? ( media-libs/audiofile:= )
- bzip2? ( app-arch/bzip2 )
- cdio? (
- dev-libs/libcdio:=
- dev-libs/libcdio-paranoia
- )
- chromaprint? ( media-libs/chromaprint )
- curl? ( net-misc/curl )
- dbus? ( sys-apps/dbus )
- doc? ( dev-python/sphinx )
- expat? ( dev-libs/expat )
- faad? ( media-libs/faad2 )
- ffmpeg? ( media-video/ffmpeg:= )
- flac? ( media-libs/flac:= )
- fluidsynth? ( media-sound/fluidsynth )
- gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
- icu? (
- dev-libs/icu:=
- virtual/libiconv
- )
- id3tag? ( media-libs/libid3tag:= )
- jack? ( virtual/jack )
- lame? ( network? ( media-sound/lame ) )
- libmpdclient? ( media-libs/libmpdclient )
- libsamplerate? ( media-libs/libsamplerate )
- libsoxr? ( media-libs/soxr )
- mad? ( media-libs/libmad )
- mikmod? ( media-libs/libmikmod )
- mms? ( media-libs/libmms )
- modplug? ( media-libs/libmodplug )
- mpg123? ( media-sound/mpg123 )
- musepack? ( media-sound/musepack-tools )
- network? ( >=media-libs/libshout-2.4.0 )
- nfs? ( net-fs/libnfs )
- openal? ( media-libs/openal )
- openmpt? ( media-libs/libopenmpt )
- opus? ( media-libs/opus )
- pulseaudio? ( media-libs/libpulse )
- pipewire? ( media-video/pipewire:= )
- qobuz? ( dev-libs/libgcrypt:0 )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-mpd )
- sid? ( || (
- media-libs/libsidplay:2
- media-libs/libsidplayfp
- ) )
- snapcast? ( media-sound/snapcast )
- sndfile? ( media-libs/libsndfile )
- sndio? ( media-sound/sndio )
- soundcloud? ( >=dev-libs/yajl-2:= )
- sqlite? ( dev-db/sqlite:3 )
- systemd? ( sys-apps/systemd:= )
- twolame? ( media-sound/twolame )
- udisks? ( sys-fs/udisks:2 )
- upnp? ( net-libs/libupnp:0 )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- wildmidi? ( media-sound/wildmidi )
- zeroconf? ( net-dns/avahi[dbus] )
- zip? ( dev-libs/zziplib:= )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.23.13-ffmpeg-6.1.patch
-)
-
-pkg_setup() {
- if use eventfd; then
- CONFIG_CHECK+=" ~EVENTFD"
- ERROR_EVENTFD="${P} requires eventfd in-kernel support."
- fi
-
- if use signalfd; then
- CONFIG_CHECK+=" ~SIGNALFD"
- ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
- fi
-
- if use inotify; then
- CONFIG_CHECK+=" ~INOTIFY_USER"
- ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
- fi
-
- if use eventfd || use signalfd || use inotify; then
- linux-info_pkg_setup
- fi
-
- elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
- sed -i \
- -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
- -e 's:^#user.*$:user "mpd":' \
- -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
- -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
- -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
- -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
- -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
- -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
- -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
- -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
- doc/mpdconf.example || die
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature bzip2)
- $(meson_feature cdio cdio_paranoia)
- $(meson_feature chromaprint)
- $(meson_use cue)
- $(meson_feature curl)
- $(meson_feature dbus)
- $(meson_use eventfd)
- $(meson_feature expat)
- $(meson_feature icu)
- $(meson_feature id3tag)
- $(meson_use inotify)
- -Dipv6=enabled
- $(meson_feature cdio iso9660)
- $(meson_feature libmpdclient)
- $(meson_feature libsamplerate)
- $(meson_feature mms)
- $(meson_feature nfs)
- $(meson_use signalfd)
- $(meson_feature samba smbclient)
- $(meson_feature libsoxr soxr)
- $(meson_feature sqlite)
- $(meson_feature systemd)
- $(meson_use test)
- $(meson_feature udisks)
- -Dupnp=$(usex upnp pupnp disabled)
- $(meson_feature webdav)
- -Dzeroconf=$(usex zeroconf avahi disabled)
- $(meson_feature zlib)
- $(meson_feature zip zzip)
- )
-
- emesonargs+=(
- $(meson_feature alsa)
- $(meson_feature ao)
- $(meson_use fifo)
- $(meson_feature jack)
- $(meson_feature openal)
- $(meson_feature oss)
- $(meson_use pipe)
- $(meson_feature pipewire)
- $(meson_feature pulseaudio pulse)
- $(meson_use recorder)
- $(meson_use snapcast)
- $(meson_feature sndio)
- )
-
- if use samba || use upnp; then
- emesonargs+=( -Dneighbor=true )
- fi
-
- append-lfs-flags
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
- if use network; then
- emesonargs+=(
- -Dshine=disabled
- -Dshout=enabled
- $(meson_feature vorbis vorbisenc)
- -Dhttpd=true
- $(meson_feature lame)
- $(meson_feature twolame)
- $(meson_use audiofile wave_encoder)
- )
- fi
-
- emesonargs+=(
- # media-libs/adplug is not packaged anymore
- -Dadplug=disabled
- $(meson_feature audiofile)
- $(meson_feature faad)
- $(meson_feature ffmpeg)
- $(meson_feature flac)
- $(meson_feature fluidsynth)
- $(meson_feature gme)
- $(meson_feature mad)
- $(meson_feature mikmod)
- $(meson_feature modplug)
- $(meson_feature musepack mpcdec)
- $(meson_feature mpg123)
- $(meson_feature openmpt)
- $(meson_feature opus)
- $(meson_feature sid sidplay)
- $(meson_feature sndfile)
- $(meson_feature vorbis)
- $(meson_feature wavpack)
- $(meson_feature wildmidi)
- $(meson_feature qobuz)
- $(meson_feature soundcloud)
-
- --libdir="/usr/$(get_libdir)"
- $(meson_feature doc documentation)
- -Dsolaris_output=disabled
-
- -Ddatabase=true
- -Ddaemon=true
- -Ddsd=true
- -Dio_uring=enabled
- -Dtcp=true
-
- -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
- $(meson_feature icu iconv)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- insinto /etc
- newins doc/mpdconf.example mpd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
- sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
-
- keepdir /var/lib/mpd
- keepdir /var/lib/mpd/music
- keepdir /var/lib/mpd/playlists
-
- rm -r "${ED}"/usr/share/doc/mpd || die
-
- fowners mpd:audio -R /var/lib/mpd
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
@ 2025-04-08 9:34 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-04-08 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 3f83d2daecdabce6ddbe39eaa26a1d4c6cb6c292
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Apr 7 15:36:59 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 8 09:32:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f83d2da
media-sound/mpd: add 0.24.2
SRC_URI : use $(ver_cut 1-2)
iuse :
* rm cue, no dep
* rm fifo, no dep
* rm pipe, no dep
* rm udisks (this is only dbus)
* rm network (was httpd+shout, but this is two different plugins)
* rm yajl, it's used only with qobuz/snapcast/soundcloud
* add httpd
* add shout
* add tremor
* upstream prefers mpg123 over mad, so +mpg123
REQUIRED_USE :
* soundcloud don't require qobuz
deps :
* boost is not longer required
* libogg is required only for opus/tremor/vorbis
* for qobuz, select ffmpeg/libgcrypt with ffmpeg/!ffmpeg
* media-libs/libsidplay is no longer supported (masked for ppc/ppc64)
* twolame/lame are only required for httpd/shout/recorder
documentation :
* add sphinx-rtd-theme
* set HTML_DOCS
* use manpages from DISTFILES if !doc
initscript :
* use eerror and return 1 for failures
* stop sed of mpd.conf after the first occurence of 'user'
Closes: https://bugs.gentoo.org/939943
Closes: https://bugs.gentoo.org/944145
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/mpd/Manifest | 1 +
media-sound/mpd/files/mpd-0.24.2.init | 64 ++++++
media-sound/mpd/files/mpd.1-0.24.2 | 105 ++++++++++
media-sound/mpd/files/mpd.conf.5-0.24.2 | 249 ++++++++++++++++++++++++
media-sound/mpd/metadata.xml | 3 +
media-sound/mpd/mpd-0.24.2.ebuild | 331 ++++++++++++++++++++++++++++++++
6 files changed, 753 insertions(+)
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c53399afb32a..7583a43d43be 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,4 @@
DIST mpd-0.23.15.16-fix-libfmt-11.1.0.patch.xz 7260 BLAKE2B 4321f48f8bf21011a1919517969ce7de6eaa5d6c051654ec96e57d01fe48f38341d7ecb206aec314bd33288b2a6a299d594328fa136b04547d6d0cb48de85f25 SHA512 a52443039a9f60c10d19e85ef1b4c8a762d6c6f135257d9a2c8f01c936f4007dd096e4bec354ffb756519794960f57d5b2a7882c8e9296d6e2f07f99e4267d20
DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
DIST mpd-0.23.16.tar.xz 778572 BLAKE2B 7e4e7dafdc60cac59b7b47898cdaf8332970dae9209f8dd408aee7f4ecf90909404ab12a263d06aae44124d795d0d1092425294034fc0728fc9b4ac973a75dd0 SHA512 1b7042cbe8543270b26c1a9e4f35d80d68e03682e4d1e039af8f52527753830972de2a763e5dfb7bde28f4c9d0308a397becd4a206d17e7a5b2fa97f48b69d20
+DIST mpd-0.24.2.tar.xz 1016792 BLAKE2B c2e04ba3f41b1aee202a94e28888a663a39fea75a6b37f310908e25cccad5c9bc036953c76f17423118a3539daad314e9047d76744aa590be40c596a2d42088b SHA512 5a4be67dd7473bf9fab429bd347fe4920866cc47b842543ae2949cb4672e343814d9fc681ad5fb76e4ffce6ed42023d102e0e383013022bdde5db9e14e233d92
diff --git a/media-sound/mpd/files/mpd-0.24.2.init b/media-sound/mpd/files/mpd-0.24.2.init
new file mode 100644
index 000000000000..a172c804525c
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.24.2.init
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: CFGFILE=${CFGFILE:=/etc/mpd.conf}
+
+depend() {
+ need localmount
+ use net netmount alsasound esound pulseaudio
+ config ${CFGFILE}
+}
+
+get_config() {
+ x=$1
+ test -e ${CFGFILE} || return 1
+ sed -n \
+ -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; {p;q} }' \
+ ${CFGFILE}
+}
+
+extra_started_commands='reload'
+# Required by io_uring
+rc_ulimit="-l 65535"
+command=/usr/bin/mpd
+command_args=${CFGFILE}
+mpd_user="$(get_config user)"
+mpd_group="$(get_config group)"
+required_files=${CFGFILE}
+pidfile=$(get_config pid_file)
+description="Music Player Daemon"
+
+check_config() {
+ if [ -z "$(get_config pid_file)" ]; then
+ eerror "pid_file must be set in ${CFGFILE}!"
+ return 1
+ fi
+ if [ -z "$(get_config user)" ]; then
+ eerror "user must be set in ${CFGFILE}!"
+ return 1
+ fi
+ if [ -z "$(get_config group)" ]; then
+ eerror "group must be set in ${CFGFILE}!"
+ return 1
+ fi
+}
+
+start_pre() {
+ check_config || return 1
+
+ local pid_dir="$(dirname "${pidfile}")"
+ checkpath -d -m 700 -o "${mpd_user}:${mpd_group}" "${pid_dir}"
+
+ local log_file="$(get_config log_file)"
+ if [ -n "${log_file}" ] && [ "${log_file}" != "syslog" ]; then
+ local log_dir="$(dirname "${log_file}")"
+ checkpath -d -m 755 -o "${mpd_user}:${mpd_group}" "${log_dir}"
+ fi
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ start-stop-daemon --pidfile ${pidfile} --signal HUP
+ eend $?
+}
diff --git a/media-sound/mpd/files/mpd.1-0.24.2 b/media-sound/mpd/files/mpd.1-0.24.2
new file mode 100644
index 000000000000..cd2980caeecc
--- /dev/null
+++ b/media-sound/mpd/files/mpd.1-0.24.2
@@ -0,0 +1,105 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "MPD" "1" "Apr 08, 2025" "0.24.2" "Music Player Daemon"
+.SH NAME
+mpd \- MPD documentation
+.SH SYNOPSIS
+.sp
+\fBmpd\fP [options] [CONF_FILE]
+.SH DESCRIPTION
+.sp
+MPD is a daemon for playing music. Music is played through the configured audio output(s) (which are generally local, but can be remote). The daemon stores info about all available music, and this info can be easily searched and retrieved. Player control, info retrieval, and playlist management can all be managed remotely.
+.sp
+MPD searches for a config file in \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP
+then \fB~/.mpdconf\fP then \fB~/.mpd/mpd.conf\fP then \fB/etc/mpd.conf\fP or uses \fBCONF_FILE\fP\&.
+.sp
+Read more about MPD at \X'tty: link http://www.musicpd.org/'\fI\%http://www.musicpd.org/\fP\X'tty: link'
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-help
+Output a brief help message.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-kill
+Kill the currently running mpd session. The pid_file parameter must be specified in the config file for this to work.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-config
+Don\(aqt read from the configuration file.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-daemon
+Don\(aqt detach from console.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-stderr
+Print messages to stderr.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-systemd
+Used on Linux only so MPD can reliably detect whether it was started as a systemd service. Users shouldn\(aqt use this switch on the command line.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-verbose
+Verbose logging.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-version
+Print version information.
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP
+User configuration file (usually \fB~/.config/mpd/mpd.conf\fP).
+.TP
+.B \fB/etc/mpd.conf\fP
+Global configuration file.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBmpd.conf(5)\fP, \fBmpc(1)\fP
+.SH BUGS
+.sp
+If you find a bug, please report it at \X'tty: link https://github.com/MusicPlayerDaemon/MPD/issues/'\fI\%https://github.com/MusicPlayerDaemon/MPD/issues/\fP\X'tty: link'
+.SH AUTHOR
+Max Kellermann
+.SH COPYRIGHT
+2003-2025 The Music Player Daemon Project
+.\" Generated by docutils manpage writer.
+.
diff --git a/media-sound/mpd/files/mpd.conf.5-0.24.2 b/media-sound/mpd/files/mpd.conf.5-0.24.2
new file mode 100644
index 000000000000..ea379c6a2b54
--- /dev/null
+++ b/media-sound/mpd/files/mpd.conf.5-0.24.2
@@ -0,0 +1,249 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "MPD.CONF" "5" "Apr 08, 2025" "0.24.2" "Music Player Daemon"
+.SH NAME
+mpd.conf \- mpd.conf documentation
+.SH DESCRIPTION
+.sp
+\fBmpd.conf\fP is the configuration file for \fBmpd(1)\fP\&. If
+not specified on the command line, MPD first searches for it at
+\fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP then at \fB~/.mpdconf\fP then
+at \fB~/.mpd/mpd.conf\fP and then in \fB/etc/mpd.conf\fP\&.
+.sp
+Each line in the configuration file contains a setting name and its value, e.g.:
+.sp
+\fBconnection_timeout \(dq5\(dq\fP
+.sp
+Lines starting with \fB#\fP are treated as comments and ignored.
+.sp
+For settings that specify a file system path, the tilde (\(aq~\(aq) is expanded to $HOME.
+In addition, the following path expansions are supported:
+.INDENT 0.0
+.IP \(bu 2
+\fI$HOME\fP
+.IP \(bu 2
+\fI$XDG_CONFIG_HOME\fP
+.IP \(bu 2
+\fI$XDG_MUSIC_DIR\fP
+.IP \(bu 2
+\fI$XDG_CACHE_HOME\fP
+.IP \(bu 2
+\fI$XDG_RUNTIME_DIR\fP
+.UNINDENT
+.sp
+\fBmusic_directory \(dq~/Music\(dq\fP
+.sp
+\fBdb_file \(dq$XDG_CONFIG_HOME/mpd/database\(dq\fP
+.sp
+Some of the settings are grouped in blocks with curly braces, e.g. per\-plugin settings:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+audio_output {
+ type \(dqalsa\(dq
+ name \(dqMy ALSA output\(dq
+ device \(dqiec958:CARD=Intel,DEV=0\(dq
+ mixer_control \(dqPCM\(dq
+}
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+The \fBinclude\fP directive can be used to include settings from
+another file; the given file name is relative to the current file:
+.sp
+\fBinclude \(dqother.conf\(dq\fP
+.sp
+You can use include_optional instead if you want the included file to be
+optional; the directive will be ignored if the file does not exist:
+.sp
+\fBinclude_optional \(dqmay_not_exist.conf\(dq\fP
+.sp
+See \fBdocs/mpdconf.example\fP in the source tarball for an example
+configuration file.
+.sp
+This manual is not complete, it lists only the most important options.
+Please read the MPD user manual for a complete configuration guide:
+\X'tty: link http://www.musicpd.org/doc/user/'\fI\%http://www.musicpd.org/doc/user/\fP\X'tty: link'
+.SH OPTIONAL PARAMETERS
+.INDENT 0.0
+.TP
+.B db_file <file>
+This specifies where the db file will be stored.
+.TP
+.B log_file <file>
+This specifies where the log file should be located. The special value \(dqsyslog\(dq makes MPD use the local syslog daemon.
+.TP
+.B sticker_file <file>
+The location of the sticker database. This is a database which manages
+dynamic information attached to songs.
+.TP
+.B pid_file <file>
+This specifies the file to save mpd\(aqs process ID in.
+.TP
+.B music_directory <directory>
+This specifies the directory where music is located. If you do not configure
+this, you can only play streams.
+.TP
+.B playlist_directory <directory>
+This specifies the directory where saved playlists are stored. If
+you do not configure this, you cannot save playlists.
+.TP
+.B state_file <file>
+This specifies if a state file is used and where it is located. The state of
+mpd will be saved to this file when mpd is terminated by a TERM signal or by
+the \fBkill\fP command. When mpd is restarted, it will read the state file and
+restore the state of mpd (including the playlist).
+.TP
+.B restore_paused <yes or no>
+Put MPD into pause mode instead of starting playback after startup.
+.TP
+.B user <username>
+This specifies the user that MPD will run as, if set. MPD should never run
+as root, and you may use this option to make MPD change its user id after
+initialization. Do not use this option if you start MPD as an unprivileged
+user.
+.TP
+.B port <port>
+This specifies the port that mpd listens on. The default is 6600.
+.TP
+.B log_level <level>
+Suppress all messages below the given threshold. The following
+log levels are available:
+.INDENT 7.0
+.IP \(bu 2
+\fBerror\fP: errors
+.IP \(bu 2
+\fBwarning\fP: warnings
+.IP \(bu 2
+\fBnotice\fP: interesting informational messages
+.IP \(bu 2
+\fBinfo\fP: unimportant informational messages
+.IP \(bu 2
+\fBverbose\fP: debug messages (for developers and for
+troubleshooting)
+.UNINDENT
+.sp
+The default is \fBnotice\fP\&.
+.TP
+.B follow_outside_symlinks <yes or no>
+Control if MPD will follow symbolic links pointing outside the music dir. You
+must recreate the database after changing this option. The default is \(dqyes\(dq.
+.TP
+.B follow_inside_symlinks <yes or no>
+Control if MPD will follow symbolic links pointing inside the music dir,
+potentially adding duplicates to the database. You must recreate the
+database after changing this option. The default is \(dqyes\(dq.
+.TP
+.B zeroconf_enabled <yes or no>
+If yes, and MPD has been compiled with support for Avahi or Bonjour, service
+information will be published with Zeroconf. The default is yes.
+.TP
+.B zeroconf_name <name>
+If Zeroconf is enabled, this is the service name to publish. This name should
+be unique to your local network, but name collisions will be properly dealt
+with. The default is \(dqMusic Player @ %h\(dq, where %h will be replaced with the
+hostname of the machine running MPD.
+.TP
+.B audio_output
+See DESCRIPTION and the various \fBAUDIO OUTPUT PARAMETERS\fP sections for the
+format of this parameter. Multiple audio_output sections may be specified. If
+no audio_output section is specified, then MPD will scan for a usable audio
+output.
+.TP
+.B filesystem_charset <charset>
+This specifies the character set used for the filesystem. A list of supported
+character sets can be obtained by running \(dqiconv \-l\(dq. The default is
+determined from the locale when the db was originally created.
+.TP
+.B save_absolute_paths_in_playlists <yes or no>
+This specifies whether relative or absolute paths for song filenames are used
+when saving playlists. The default is \(dqno\(dq.
+.TP
+.B auto_update <yes or no>
+This specifies the whether to support automatic update of music database
+when files are changed in music_directory. The default is to disable
+autoupdate of database.
+.TP
+.B auto_update_depth <N>
+Limit the depth of the directories being watched, 0 means only watch the
+music directory itself. There is no limit by default.
+.UNINDENT
+.SH REQUIRED AUDIO OUTPUT PARAMETERS
+.INDENT 0.0
+.TP
+.B type <type>
+This specifies the audio output type. See the list of supported outputs in
+\fBmpd \-\-version\fP for possible values.
+.TP
+.B name <name>
+This specifies a unique name for the audio output.
+.UNINDENT
+.SH OPTIONAL AUDIO OUTPUT PARAMETERS
+.INDENT 0.0
+.TP
+.B format <sample_rate:bits:channels>
+This specifies the sample rate, bits per sample, and number of channels of
+audio that is sent to the audio output device. See documentation for the
+\fBaudio_output_format\fP parameter for more details. The default is to use
+whatever audio format is passed to the audio output. Any of the three
+attributes may be an asterisk to specify that this attribute should not be
+enforced
+.TP
+.B replay_gain_handler <software, mixer or none>
+Specifies how replay gain is applied. The default is \(dqsoftware\(dq, which uses
+an internal software volume control. \(dqmixer\(dq uses the configured (hardware)
+mixer control. \(dqnone\(dq disables replay gain on this audio output.
+.TP
+.B mixer_type <hardware, software or none>
+Specifies which mixer should be used for this audio output: the hardware
+mixer (available for ALSA, OSS and PulseAudio), the software mixer or no
+mixer (\(dqnone\(dq). By default, the hardware mixer is used for devices which
+support it, and none for the others.
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP
+User configuration file (usually \fB~/.config/mpd/mpd.conf\fP).
+.TP
+.B \fB/etc/mpd.conf\fP
+Global configuration file.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBmpd(1)\fP, \fBmpc(1)\fP
+.SH AUTHOR
+Max Kellermann
+.SH COPYRIGHT
+2003-2025 The Music Player Daemon Project
+.\" Generated by docutils manpage writer.
+.
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 8253dae1fb75..8d41cefe55dd 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -19,6 +19,7 @@
<flag name="fifo">Support writing audio to a FIFO</flag>
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+ <flag name="httpd">Enable built-in stream server</flag>
<flag name="id3tag">Support for ID3 tags</flag>
<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
<flag name="lame">Support for MP3 streaming via Icecast2</flag>
@@ -32,11 +33,13 @@
<flag name="pipewire">PipeWire support</flag>
<flag name="qobuz">Build plugin to access qobuz</flag>
<flag name="recorder">Enables output plugin for recording radio streams</flag>
+ <flag name="shout">Enable ShoutCast/IceCast plugin using <pkg>media-libs/libshout</pkg></flag>
<flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
<flag name="snapcast">Snapcast audio plugin</flag>
<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
<flag name="soundcloud">Build plugin to access soundcloud</flag>
<flag name="systemd">Enable support for systemd socket activation</flag>
+ <flag name="tremor">Enable support for <pkg>media-libs/tremor</pkg>, a fixed-point version of the Ogg Vorbis decoder</flag>
<flag name="twolame">Support twolame MPEG-2 encoding</flag>
<flag name="webdav">Enable using music from a WebDAV share</flag>
<flag name="wildmidi">Enable MIDI support via wildmidi</flag>
diff --git a/media-sound/mpd/mpd-0.24.2.ebuild b/media-sound/mpd/mpd-0.24.2.ebuild
new file mode 100644
index 000000000000..29fc6d7d9630
--- /dev/null
+++ b/media-sound/mpd/mpd-0.24.2.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +curl doc +dbus
+ +eventfd expat faad +ffmpeg flac fluidsynth gme httpd +icu +id3tag +inotify
+ +io-uring jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+ modplug +mpg123 musepack nfs openal openmpt opus oss pipewire pulseaudio qobuz
+ recorder samba selinux shout sid signalfd snapcast sndfile sndio soundcloud sqlite
+ systemd test tremor twolame upnp vorbis wavpack webdav wildmidi
+ zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao jack httpd openal oss pipewire pulseaudio shout snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+ modplug mpg123 musepack opus openmpt flac sid tremor vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+ || ( ${OUTPUT_PLUGINS} )
+ || ( ${DECODER_PLUGINS} )
+ ?? ( tremor vorbis )
+ httpd? ( || ( ${ENCODER_PLUGINS} ) )
+ recorder? ( || ( ${ENCODER_PLUGINS} ) )
+ shout? ( || ( ${ENCODER_PLUGINS} ) )
+ qobuz? ( curl )
+ soundcloud? ( curl )
+ upnp? ( curl expat )
+ webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_ENCODERS="
+ lame? ( media-sound/lame )
+ twolame? ( media-sound/twolame )
+"
+RDEPEND="
+ acct-user/mpd
+ dev-libs/libfmt:=
+ dev-libs/libpcre2:=
+ alsa? (
+ media-libs/alsa-lib
+ media-sound/alsa-utils
+ )
+ ao? ( media-libs/libao[alsa?,pulseaudio?] )
+ audiofile? ( media-libs/audiofile:= )
+ bzip2? ( app-arch/bzip2 )
+ cdio? (
+ dev-libs/libcdio:=
+ dev-libs/libcdio-paranoia:=
+ )
+ chromaprint? ( media-libs/chromaprint:= )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ doc? (
+ dev-python/sphinx
+ dev-python/sphinx-rtd-theme
+ )
+ expat? ( dev-libs/expat )
+ faad? ( media-libs/faad2 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ flac? ( media-libs/flac:= )
+ fluidsynth? ( media-sound/fluidsynth:= )
+ gme? ( media-libs/game-music-emu )
+ httpd? ( ${COMMON_ENCODERS} )
+ icu? (
+ dev-libs/icu:=
+ virtual/libiconv
+ )
+ id3tag? ( media-libs/libid3tag:= )
+ io-uring? ( sys-libs/liburing:= )
+ jack? ( virtual/jack )
+ libmpdclient? ( media-libs/libmpdclient )
+ libsamplerate? ( media-libs/libsamplerate )
+ libsoxr? ( media-libs/soxr )
+ mad? ( media-libs/libmad )
+ mikmod? ( media-libs/libmikmod )
+ mms? ( media-libs/libmms )
+ modplug? ( media-libs/libmodplug )
+ mpg123? ( media-sound/mpg123-base )
+ musepack? ( media-sound/musepack-tools )
+ nfs? ( net-fs/libnfs:= )
+ openal? ( media-libs/openal )
+ openmpt? ( media-libs/libopenmpt )
+ opus? (
+ media-libs/libogg
+ media-libs/opus
+ )
+ pulseaudio? ( media-libs/libpulse )
+ pipewire? ( media-video/pipewire:= )
+ qobuz? (
+ dev-libs/yajl:=
+ !ffmpeg? ( dev-libs/libgcrypt:= )
+ ffmpeg? ( media-video/ffmpeg )
+ )
+ recorder? ( ${COMMON_ENCODERS} )
+ samba? ( net-fs/samba:= )
+ selinux? ( sec-policy/selinux-mpd )
+ shout? (
+ ${COMMON_ENCODERS}
+ media-libs/libshout
+ )
+ sid? ( media-libs/libsidplayfp:= )
+ snapcast? (
+ dev-libs/yajl:=
+ media-sound/snapcast
+ )
+ sndfile? ( media-libs/libsndfile )
+ sndio? ( media-sound/sndio:= )
+ soundcloud? ( dev-libs/yajl:= )
+ sqlite? ( dev-db/sqlite:3 )
+ systemd? ( sys-apps/systemd:= )
+ tremor? (
+ media-libs/libogg
+ media-libs/tremor
+ )
+ upnp? ( net-libs/libupnp:= )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ wavpack? ( media-sound/wavpack )
+ wildmidi? ( media-sound/wildmidi )
+ zeroconf? ( net-dns/avahi[dbus] )
+ zip? ( dev-libs/zziplib:= )
+ zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ if use eventfd; then
+ CONFIG_CHECK+=" ~EVENTFD"
+ ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+ fi
+
+ if use signalfd; then
+ CONFIG_CHECK+=" ~SIGNALFD"
+ ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+ fi
+
+ if use inotify; then
+ CONFIG_CHECK+=" ~INOTIFY_USER"
+ ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+ fi
+
+ if use io-uring; then
+ CONFIG_CHECK+=" ~IO_URING"
+ ERROR_IO_URING="${P} requires io-uring in-kernel support."
+ fi
+
+ if use eventfd || use signalfd || use inotify || use io-uring; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ # media-libs/adplug is not packaged anymore
+ -Dadplug=disabled
+ $(meson_feature alsa)
+ $(meson_feature ao)
+ $(meson_feature audiofile)
+ $(meson_feature bzip2)
+ $(meson_feature cdio cdio_paranoia)
+ $(meson_feature chromaprint)
+ -Dcue=true
+ $(meson_feature curl)
+ $(meson_feature dbus)
+ $(meson_use eventfd)
+ $(meson_feature expat)
+ $(meson_feature faad)
+ $(meson_feature ffmpeg)
+ -Dfifo=true
+ $(meson_feature flac)
+ $(meson_feature fluidsynth)
+ $(meson_feature gme)
+ $(meson_use httpd )
+ $(meson_feature icu)
+ $(meson_feature id3tag)
+ $(meson_use inotify)
+ -Dipv6=enabled
+ $(meson_feature cdio iso9660)
+ $(meson_feature io-uring io_uring)
+ $(meson_feature jack)
+ $(meson_feature libmpdclient)
+ $(meson_feature libsamplerate)
+ $(meson_feature mad)
+ $(meson_feature mikmod)
+ $(meson_feature mms)
+ $(meson_feature modplug)
+ $(meson_feature musepack mpcdec)
+ $(meson_feature mpg123)
+ $(meson_feature nfs)
+ $(meson_feature openal)
+ $(meson_feature openmpt)
+ $(meson_feature opus)
+ $(meson_feature oss)
+ -Dpipe=true
+ $(meson_feature pipewire)
+ $(meson_feature pulseaudio pulse)
+ $(meson_feature qobuz)
+ $(meson_use recorder)
+ $(meson_feature shout)
+ $(meson_use signalfd)
+ $(meson_feature samba smbclient)
+ $(meson_use snapcast)
+ $(meson_feature sid sidplay)
+ $(meson_feature sndfile)
+ $(meson_feature sndio)
+ $(meson_feature soundcloud)
+ $(meson_feature libsoxr soxr)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test)
+ $(meson_feature dbus udisks)
+ -Dupnp=$(usex upnp pupnp disabled)
+ $(meson_feature tremor)
+ $(meson_feature vorbis)
+ $(meson_feature wavpack)
+ $(meson_feature wildmidi)
+ $(meson_feature webdav)
+ -Dzeroconf=$(usex zeroconf avahi disabled)
+ $(meson_feature zlib)
+ $(meson_feature zip zzip)
+
+ --libdir="/usr/$(get_libdir)"
+ $(meson_feature doc documentation)
+ -Dsolaris_output=disabled
+
+ -Ddatabase=true
+ -Ddaemon=true
+ -Ddsd=true
+ -Dtcp=true
+
+ -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+ -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+ $(meson_feature icu iconv)
+ )
+
+ if use samba || use upnp; then
+ emesonargs+=( -Dneighbor=true )
+ fi
+
+ append-lfs-flags
+
+ # set useflag for encoders
+ if use httpd || use shout || use recorder; then
+ emesonargs+=(
+ # not in tree
+ -Dshine=disabled
+ $(meson_feature lame)
+ $(meson_feature twolame)
+ $(meson_feature vorbis vorbisenc)
+ $(meson_use audiofile wave_encoder)
+ )
+ else
+ # avoid links even w/o encoder
+ emesonargs+=(
+ -Dlame=disabled
+ -Dtwolame=disabled
+ )
+ fi
+
+ # yajl links only with these plugins enabled
+ if use qobuz || use snapcast || use soundcloud; then
+ emesonargs+=(
+ -Dyajl=enabled
+ )
+ fi
+
+ meson_src_configure
+}
+
+src_install() {
+ if use doc; then
+ local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ else
+ newman "${FILESDIR}"/${PN}.1-${PV} ${PN}.1
+ newman "${FILESDIR}"/${PN}.conf.5-${PV} ${PN}.conf.5
+ fi
+
+ meson_src_install
+
+ insinto /etc
+ newins doc/mpdconf.example mpd.conf
+
+ # When running MPD as system service, better switch to the user we provide
+ sed -i \
+ -e 's:^#user.*$:user "mpd":' \
+ -e 's:^#group.*$:group "audio":' \
+ "${ED}/etc/mpd.conf" || die
+
+ if ! use systemd; then
+ # Extra options for running MPD under OpenRC
+ # (options that should not be set when using systemd)
+ sed -i \
+ -e 's:^#log_file.*$:log_file "/var/log/mpd/mpd.log":' \
+ -e 's:^#pid_file.*$:pid_file "/run/mpd/mpd.pid":' \
+ "${ED}/etc/mpd.conf" || die
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}-0.23.15.logrotate" "${PN}"
+
+ newinitd "${FILESDIR}/${PN}-0.24.2.init" "${PN}"
+
+ keepdir /var/lib/mpd
+ keepdir /var/lib/mpd/music
+ keepdir /var/lib/mpd/playlists
+ keepdir /var/log/mpd
+
+ rm -r "${ED}"/usr/share/doc/mpd || die
+
+ fowners mpd:audio -R /var/lib/mpd
+ fowners mpd:audio -R /var/log/mpd
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-04-08 9:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-15 14:00 [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2025-04-08 9:34 Sam James
2024-09-22 13:07 Sam James
2023-05-18 10:42 Joonas Niilola
2022-12-18 2:33 Sam James
2020-10-05 14:31 Louis Sautier
2015-09-16 16:29 Christoph Mende
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox