From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
Date: Sun, 22 Sep 2024 13:07:12 +0000 (UTC) [thread overview]
Message-ID: <1727010389.e6974ed62678850a6429cbb7a88c37eb23c82d52.sam@gentoo> (raw)
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
-}
next reply other threads:[~2024-09-22 13:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-22 13:07 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-08 9:34 [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/ Sam James
2023-05-18 10:42 Joonas Niilola
2022-12-18 2:33 Sam James
2020-10-05 14:31 Louis Sautier
2018-11-15 14:00 Mikle Kolyada
2015-09-16 16:29 Christoph Mende
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1727010389.e6974ed62678850a6429cbb7a88c37eb23c82d52.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox