diff options
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/Manifest.gz | bin | 56937 -> 56948 bytes | |||
| -rw-r--r-- | media-sound/mpd/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.24.3.ebuild (renamed from media-sound/mpd/mpd-0.24.2.ebuild) | 26 |
3 files changed, 12 insertions, 18 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex eb22b7d069d2..6b8deb6a39ed 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 4a2c74749ff6..a32b2bf4b086 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -7,8 +7,8 @@ AUX mpd.conf.5-0.24.2 8339 BLAKE2B 3fdea10a8b35cd6ceaf166d1715006f209e58676cbc85 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 +DIST mpd-0.24.3.tar.xz 1014788 BLAKE2B 4981f89341bc936da18b2052bf03e593fc6a72e4fdf644afd4125261798ef5698f4dce242cfe3959a83170efa328f5fa3cc65dbddbc4fdf90667fb3e9656a520 SHA512 b7d61388c93670c4bbc03760066121aa4f8bbcbb33417b755fed89e6dcd55906be3b30961eba53979e65e3402e245dd976f30898445c0964fc252e2377b3e34e EBUILD mpd-0.23.15-r3.ebuild 7728 BLAKE2B 7ad0855d094a35c935f7d39a9477c9c2fa5169771363e6605ae1120c504f9ef06d075a02bbf61133b38a1179d63b3508c9a249889264505470cc9ebdcff786f5 SHA512 ffc34b9832ca38df5bf27aa8900b24007d6f218091896dd8c6eb70cfbd9892894d5398e47020391eb8d821bb0d6b8b79bc117b8ac35470b1727ab5866f740fa6 EBUILD mpd-0.23.16.ebuild 7909 BLAKE2B 2d9c6a412957ba7b09dd6872659eee120e008da930102980299643e15d6ca5fc4799e93fc7d51b978db76fab213852a57ff06e3fdb274b9747a238fe6c046dd3 SHA512 3154368e3bbdebd581258da01b33629caea9bca36405ae08f18bc9551f69b7e6939f39c91403882dfc916bf03d6ee2d453c59858d95a17b4bac036f63bc399f4 -EBUILD mpd-0.24.2.ebuild 8294 BLAKE2B 4b0ee03d273ae0309fc03a60b3d2119f5316c2a8a376c08fed62acf12ac429c3b9fe6cbfbaa8009429d59d0a0adce1a54565d68c719c0b2a2caa45260294cbe3 SHA512 a82ac95cd6ab7a806b36f6696b9a7d5d4fcd6b7655eae003b47071f6dd96bcaba2464a2013d16775bf5fbf0b9ca39c72c991ac400113e5ea6e13f27856e0a52c +EBUILD mpd-0.24.3.ebuild 8234 BLAKE2B b2ee5d3b45772691a6a32b63c0f9044bcb42d06afe9a8885c8ab689381c5cb94569d7e7ab82bf7db7e86837653a5d9eca0de55d4b29a3fc7fdd90e44bbf5c99a SHA512 390d1ba9c27eb80f7b2b43523c7a85c470886f267065b210618b6a666880f0df8f6b5d9392362e14c90d8100846a4a0cf24c2b4d15deaef0bfcc019a4fea0f4b MISC metadata.xml 3267 BLAKE2B 45d835de95f728e2d38019f066961efd22cbfe91ea9977c405a96b02021656a103ed8526f0ccb6985c63f5f804ccf372e8967584a9fd5301eb9326391f31acc4 SHA512 703195e41836f09c63af133241651c42b0872d54bc8dd36bbfd5c2947d4f8ebc486b7b76cef265a55434747fd1e4653d07f579cf18e525db40f0cb82b0f7e9e4 diff --git a/media-sound/mpd/mpd-0.24.2.ebuild b/media-sound/mpd/mpd-0.24.3.ebuild index 29fc6d7d9630..de94acff2fe3 100644 --- a/media-sound/mpd/mpd-0.24.2.ebuild +++ b/media-sound/mpd/mpd-0.24.3.ebuild @@ -16,7 +16,7 @@ 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 + recorder samba selinux shout sid signalfd snapcast sndfile sndio sqlite systemd test tremor twolame upnp vorbis wavpack webdav wildmidi zeroconf zip zlib" @@ -33,7 +33,6 @@ REQUIRED_USE=" recorder? ( || ( ${ENCODER_PLUGINS} ) ) shout? ( || ( ${ENCODER_PLUGINS} ) ) qobuz? ( curl ) - soundcloud? ( curl ) upnp? ( curl expat ) webdav? ( curl expat ) " @@ -99,7 +98,6 @@ RDEPEND=" pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire:= ) qobuz? ( - dev-libs/yajl:= !ffmpeg? ( dev-libs/libgcrypt:= ) ffmpeg? ( media-video/ffmpeg ) ) @@ -111,13 +109,8 @@ RDEPEND=" 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? ( @@ -137,6 +130,8 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + qobuz? ( >=dev-cpp/nlohmann_json-3.11.3 ) + snapcast? ( >=dev-cpp/nlohmann_json-3.11.3 ) test? ( dev-cpp/gtest ) " BDEPEND="virtual/pkgconfig" @@ -221,7 +216,6 @@ src_configure() { $(meson_feature sid sidplay) $(meson_feature sndfile) $(meson_feature sndio) - $(meson_feature soundcloud) $(meson_feature libsoxr soxr) $(meson_feature sqlite) $(meson_feature systemd) @@ -276,10 +270,10 @@ src_configure() { ) fi - # yajl links only with these plugins enabled - if use qobuz || use snapcast || use soundcloud; then + # nlohmann_json is only required with these plugins enabled + if use qobuz || use snapcast; then emesonargs+=( - -Dyajl=enabled + -Dnlohmann_json=enabled ) fi @@ -290,8 +284,8 @@ 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 + newman "${FILESDIR}"/${PN}.1-0.24.2 ${PN}.1 + newman "${FILESDIR}"/${PN}.conf.5-0.24.2 ${PN}.conf.5 fi meson_src_install @@ -309,8 +303,8 @@ src_install() { # 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":' \ + -e '0,/^#log_file.*$/s::log_file "/var/log/mpd/mpd.log"\n&:' \ + -e '0,/^#pid_file.*$/s::pid_file "/run/mpd/mpd.pid"\n&:' \ "${ED}/etc/mpd.conf" || die fi |