From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- media-sound/Manifest.gz | Bin 57718 -> 57715 bytes media-sound/drumstick/Manifest | 4 +- media-sound/drumstick/drumstick-2.3.0.ebuild | 69 ----- media-sound/drumstick/drumstick-2.3.1.ebuild | 2 +- media-sound/mpd/Manifest | 2 + media-sound/mpd/mpd-0.22.11.ebuild | 299 +++++++++++++++++++++ media-sound/picard/Manifest | 5 +- .../picard/files/picard-2.6.3-fix-py3.10.patch | 61 +++++ media-sound/picard/picard-2.6.3.ebuild | 67 +++++ media-sound/picard/picard-9999.ebuild | 24 +- media-sound/snapcast/Manifest | 2 +- media-sound/snapcast/metadata.xml | 10 +- 12 files changed, 446 insertions(+), 99 deletions(-) delete mode 100644 media-sound/drumstick/drumstick-2.3.0.ebuild create mode 100644 media-sound/mpd/mpd-0.22.11.ebuild create mode 100644 media-sound/picard/files/picard-2.6.3-fix-py3.10.patch create mode 100644 media-sound/picard/picard-2.6.3.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index d0898d7e5e27..dc9b11ce722c 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest index b4fd8cb1eee8..4a436ecdf50b 100644 --- a/media-sound/drumstick/Manifest +++ b/media-sound/drumstick/Manifest @@ -1,5 +1,3 @@ -DIST drumstick-2.3.0.tar.gz 1978608 BLAKE2B ab05030d402c03053bfcf315e8c4e54b73975f0059719cf5e58db64ddac394555b898e3e0008b892901d7395c89a160631ae8eeb9d1cd52c3abd0533c5fdafdb SHA512 b12a39153600b37ef61a31255721466bdae5896b562276860688f9e22259ba4747086abeb828dcfef24c8e1fb7bd371dea1c6d51098cf5e1797e212cde70f46a DIST drumstick-2.3.1.tar.gz 1978856 BLAKE2B 47f7c9872964fb267834b23e2d52fc1b10826629fb256dae410161305c3587845ffcaf00f0d30a73df67b4a00849c53f3f1412c0473a52fbf69b106362175b3e SHA512 aaf0080405765878c8d1e164343eff0bb18d4add4a2f67de1ed0e978ae688948b73121f9cb50c52c23fc34b8c57e184d22a5c5aaa29969409071567142685dc7 -EBUILD drumstick-2.3.0.ebuild 1318 BLAKE2B fb184940b7b5bf8bb6054586de8f41cc93f755637199da2692466c427d811d3ba78ac3a255642a335efdd8ba2f47257065178ac301b76f9b0e7816f11fbbb5af SHA512 cedb23d0ca9fed19c41197db463ea1d8c01d78f52e0a1dc00d0d1897979dd57150fd683eaa3a344b3bda6b518f46bc2b218fea553d9d4be1d998f14baabe5cdc -EBUILD drumstick-2.3.1.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38 +EBUILD drumstick-2.3.1.ebuild 1318 BLAKE2B fb184940b7b5bf8bb6054586de8f41cc93f755637199da2692466c427d811d3ba78ac3a255642a335efdd8ba2f47257065178ac301b76f9b0e7816f11fbbb5af SHA512 cedb23d0ca9fed19c41197db463ea1d8c01d78f52e0a1dc00d0d1897979dd57150fd683eaa3a344b3bda6b518f46bc2b218fea553d9d4be1d998f14baabe5cdc MISC metadata.xml 598 BLAKE2B 099351919e92e9d8197fe31f09336761f9d886b67582b6dde4ce5b387a44f496e562de9456482d6651d63429955870b8ef8aadc178417d847da2d2e999a4add1 SHA512 16a287bd1c3039970522c09ab0dae6018924a34577692ccfdcde6d80476338eb4cc6576f155882cf96d44bb87d5523ff8df17f3ee8a86b3d1cf2a28c7543b089 diff --git a/media-sound/drumstick/drumstick-2.3.0.ebuild b/media-sound/drumstick/drumstick-2.3.0.ebuild deleted file mode 100644 index 83eff3ef7dbc..000000000000 --- a/media-sound/drumstick/drumstick-2.3.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Qt/C++ wrapper for ALSA sequencer" -HOMEPAGE="https://drumstick.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc fluidsynth network pulseaudio" - -BDEPEND=" - dev-libs/libxslt - dev-qt/linguist-tools:5 - virtual/pkgconfig - x11-misc/shared-mime-info - doc? ( - app-doc/doxygen[dot] - app-text/docbook-xsl-stylesheets - ) -" -DEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - fluidsynth? ( media-sound/fluidsynth ) - network? ( dev-qt/qtnetwork:5 ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS readme.md TODO ) - -RESTRICT="test" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF - -DUSE_DBUS=ON - -DUSE_FLUIDSYNTH=$(usex fluidsynth) - -DUSE_NETWORK=$(usex network) - -DUSE_PULSEAUDIO=$(usex pulseaudio) - -DBUILD_DOCS=$(usex doc) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doxygen -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install -} diff --git a/media-sound/drumstick/drumstick-2.3.1.ebuild b/media-sound/drumstick/drumstick-2.3.1.ebuild index 8b2d865ce0f9..83eff3ef7dbc 100644 --- a/media-sound/drumstick/drumstick-2.3.1.ebuild +++ b/media-sound/drumstick/drumstick-2.3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc fluidsynth network pulseaudio" BDEPEND=" diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 113d0faa6697..4e6b7b58dce3 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -3,6 +3,7 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897 DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a DIST mpd-0.22.10.tar.xz 736456 BLAKE2B eb95efff44425f7aa261c937d3cf185eec17e3ade212c8b4873f4bb5cb5b775cbab621b851e972bba20fe3a56a3e7465aa0c26cc2fad60f50499925046cfb443 SHA512 e29deec7473a25236d17609ae898d7154e716f29a137c658492952cae162d59fbe9992be2b50971b8dbe03e9b11a894b6c5e9b4767c265d178f6da3ff49e3820 +DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60 DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac7843eeec6ab3e6b39c2e063cfd5413bc7c9738ce6c68c56d3befefd48112c1c93f725a6940ff1889d882e6 SHA512 e169d6656b378d52798e822ffd47f554bd7c076ca8bc5a1119e3b2fad36bee79335dc392aa8d78d854689af62168625698c1777440e08a67075099898ee5fe34 DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b1ca90c8dda2661a5bd6d110ad0ebbefc53e0a38cfa6434ee4d2ad99688982588ee6d8d6895b24e15e3f927 SHA512 589516b7ee5820cbeee99042017b411a46857d39547302bce0bedb9c265da2c8465224a6817a1b7e65105f344398bee5fb2a3674064e42507157cdac01416295 @@ -11,6 +12,7 @@ DIST mpd-0.22.8.tar.xz 737368 BLAKE2B 96866fdbcf124534d99db1bde89039d515c64afd7c DIST mpd-0.22.9.tar.xz 738432 BLAKE2B c0c3a87ea83941e7ab85b4338db40daeff0c7fe665d4e0b27eebdf7cb06302d2b7a7573724d06d06d45a62583304f095ec4f67a21467748de665067e10a2514c SHA512 744e20e9a2b5df0f0c01b33809aa87cb159385b69868df5418302b091e6c5265dd70de13f383efcd71f76ae059c73969667212e55ee96e13d89ca0da5c2d4ae2 EBUILD mpd-0.21.26-r1.ebuild 8071 BLAKE2B 91df71b928168d00d63eabb823621f4e22d5e6d0d81075098607adb594ecf8f13f7842c2af370c19c1fc6b168eac15215d999706094978025653d61ecd80e2b7 SHA512 933751f86d9a7e24717bbd3ded3ddc13c15b5268fc6c6ac287d646704acb0e1a7cf5635a862e7de471a68000129c2f7232ae9956ae22f3b645356d0f512864ef EBUILD mpd-0.22.10-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93 +EBUILD mpd-0.22.11.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93 EBUILD mpd-0.22.3-r1.ebuild 8128 BLAKE2B f30f8d3b609102c7f9b8df1b7ea5eee6e5e1f449c4a8ef0e8e69d1025fd288025715fedaaa2d79a0589f085a1de8bd7ad499a17ecd8acbe27919b7bbf4dcaf9b SHA512 0e591e6e5b4955697a93307814ddb56de27545ceb21b3aea4dbac7b34fba47ee3412d7f8a5505c5877a807b4efc7c5a58e5296774298dd0b9702e372732dc0f9 EBUILD mpd-0.22.4-r2.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f EBUILD mpd-0.22.5-r1.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild new file mode 100644 index 000000000000..7e5eda24cd46 --- /dev/null +++ b/media-sound/mpd/mpd-0.22.11.ebuild @@ -0,0 +1,299 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-info meson systemd xdg-utils + +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 ~ppc ~ppc64 ~x86" +IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus + +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify + +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms + modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz + recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd + test tidal twolame udisks vorbis wavpack webdav wildmidi upnp + zeroconf zip zlib" + +OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder" +DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod + modplug mpg123 musepack flac sid vorbis wavpack wildmidi" +ENCODER_PLUGINS="audiofile flac lame twolame vorbis" + +REQUIRED_USE=" + || ( ${OUTPUT_PLUGINS} ) + || ( ${DECODER_PLUGINS} ) + network? ( || ( ${ENCODER_PLUGINS} ) ) + recorder? ( || ( ${ENCODER_PLUGINS} ) ) + upnp? ( expat ) + webdav? ( curl expat ) + " + +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-user/mpd + sys-libs/liburing:= + alsa? ( + media-libs/alsa-lib + media-sound/alsa-utils + ) + + ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) + audiofile? ( media-libs/audiofile:= ) + + 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:0= ) + flac? ( media-libs/flac ) + 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 ) + mms? ( media-libs/libmms ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( media-sound/musepack-tools ) + network? ( media-libs/libshout ) + nfs? ( net-fs/libnfs ) + openal? ( media-libs/openal ) + opus? ( media-libs/opus ) + pulseaudio? ( media-sound/pulseaudio ) + qobuz? ( dev-libs/libgcrypt:0 ) + samba? ( net-fs/samba ) + selinux? ( sec-policy/selinux-mpd ) + sid? ( || ( + media-libs/libsidplay:2 + media-libs/libsidplayfp + ) ) + sndfile? ( media-libs/libsndfile ) + sndio? ( media-sound/sndio ) + soundcloud? ( >=dev-libs/yajl-2:= ) + sqlite? ( dev-db/sqlite:3 ) + systemd? ( sys-apps/systemd ) + tidal? ( dev-libs/yajl + net-misc/curl ) + 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-1.58:= + test? ( dev-cpp/gtest )" + +BDEPEND=">=dev-util/meson-0.49.2 + 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 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() { + 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=( + -Dbzip2=$(usex bzip2 enabled disabled) + -Dcdio_paranoia=$(usex cdio enabled disabled) + -Dchromaprint=$(usex chromaprint enabled disabled) + -Dcue=$(usex cue true false) + -Dcurl=$(usex curl enabled disabled) + -Ddbus=$(usex dbus enabled disabled) + -Deventfd=$(usex eventfd true false) + -Dexpat=$(usex expat enabled disabled) + -Dicu=$(usex icu enabled disabled) + -Did3tag=$(usex id3tag enabled disabled) + -Dinotify=$(usex inotify true false) + -Dipv6=$(usex ipv6 enabled disabled) + -Diso9660=$(usex cdio enabled disabled) + -Dlibmpdclient=$(usex libmpdclient enabled disabled) + -Dlibsamplerate=$(usex libsamplerate enabled disabled) + -Dmms=$(usex mms enabled disabled) + -Dnfs=$(usex nfs enabled disabled) + -Dsignalfd=$(usex signalfd true false) + -Dsmbclient=$(usex samba enabled disabled) + -Dsoxr=$(usex libsoxr enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsystemd=$(usex systemd enabled disabled) + -Dtest=$(usex test true false) + -Dudisks=$(usex udisks enabled disabled) + -Dupnp=$(usex upnp enabled disabled) + -Dwebdav=$(usex webdav enabled disabled) + -Dzeroconf=$(usex zeroconf avahi disabled) + -Dzlib=$(usex zlib enabled disabled) + -Dzzip=$(usex zip enabled disabled) + ) + + emesonargs+=( + -Dalsa=$(usex alsa enabled disabled) + -Dao=$(usex ao enabled disabled) + -Dfifo=$(usex fifo true false) + -Djack=$(usex jack enabled disabled) + -Dopenal=$(usex openal enabled disabled) + -Doss=$(usex oss enabled disabled) + -Dpipe=$(usex pipe true false) + -Dpulse=$(usex pulseaudio enabled disabled) + -Drecorder=$(usex recorder true false) + -Dsndio=$(usex sndio enabled disabled) + ) + + if use samba || use upnp; then + emesonargs+=( -Dneighbor=true ) + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + if use network; then + + emesonargs+=( + -Dshine=disabled + -Dshout=enabled + -Dvorbisenc=$(usex vorbis enabled disabled) + -Dhttpd=true + -Dlame=$(usex lame enabled disabled) + -Dtwolame=$(usex twolame enabled disabled) + -Dwave_encoder=$(usex audiofile true false) + ) + fi + + emesonargs+=( + # media-libs/adplug is not packaged anymore + -Dadplug=disabled + -Daudiofile=$(usex audiofile enabled disabled) + -Dfaad=$(usex faad enabled disabled) + -Dffmpeg=$(usex ffmpeg enabled disabled) + -Dflac=$(usex flac enabled disabled) + -Dfluidsynth=$(usex fluidsynth enabled disabled) + -Dgme=$(usex gme enabled disabled) + -Dmad=$(usex mad enabled disabled) + -Dmikmod=$(usex mikmod enabled disabled) + -Dmodplug=$(usex modplug enabled disabled) + -Dmpcdec=$(usex musepack enabled disabled) + -Dmpg123=$(usex mpg123 enabled disabled) + -Dopus=$(usex opus enabled disabled) + -Dsidplay=$(usex sid enabled disabled) + -Dsndfile=$(usex sndfile enabled disabled) + -Dvorbis=$(usex vorbis enabled disabled) + -Dwavpack=$(usex wavpack enabled disabled) + -Dwildmidi=$(usex wildmidi enabled disabled) + + ) + + emesonargs+=( + -Dqobuz=$(usex qobuz enabled disabled) + -Dsoundcloud=$(usex soundcloud enabled disabled) + -Dtidal=$(usex tidal enabled disabled) + ) + + emesonargs+=( + --libdir="/usr/$(get_libdir)" + -Ddocumentation=$(usex doc enabled disabled) + -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)" + ) + + if use icu; then + emesonargs+=( -Diconv=enabled ) + else + emesonargs+=( -Diconv=disabled ) + fi + + 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} + + keepdir /var/lib/mpd + keepdir /var/lib/mpd/music + keepdir /var/lib/mpd/playlists + + fowners mpd:audio -R /var/lib/mpd + + rm -r "${ED}"/usr/share/doc/mpd || die + +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest index 3827a879d5d8..b4118c5461b3 100644 --- a/media-sound/picard/Manifest +++ b/media-sound/picard/Manifest @@ -1,4 +1,7 @@ +AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225 +DIST picard-2.6.3.tar.gz 4320046 BLAKE2B ce308440ed4c6297128a5470b7bdced50fb22e62995c26670339ff71c70d610fc0c4ea8433f9dbacb197b710b8100de171817df604d76986596391d029b3c20f SHA512 71bdeb4777a0d996ac0093edefc448a348aa72e657ec639331e67257c47c389993d2715ccebf715458c3b606051154586d63b22b3cebd541d8b2da5e96a833b5 EBUILD picard-2.6.2.ebuild 1652 BLAKE2B 77a92058a85fba2fa76637a7df2caa92937b29d83663212813a670d47045b3b84b363b7f48d2f3f0147bc12965708f451cb7ce3e6167864524cee37a35633d68 SHA512 7868878920aa000779f26bbf97b30123179bda3dec0aa62e998e0b9272009c8f4ac5713414fa78f6c3900a1d99fa9877d5654044d7fee252b7e302702c10e555 -EBUILD picard-9999.ebuild 1613 BLAKE2B 4ff23b9d59442edc13fe54d2ee7458784cde55dbf26c0f6c7d9ecd4112645e012e638a1e01de6228f558a8fa8cdc1241bb7ff23b179d4f3770c719b3a7eee043 SHA512 ecf0a0ddeee0af56497477bfe47fba323e21b07cce0210f84eac335f6b87ff970347af96bebfdbf1ea9de577c15bcdf4d4cb6c8cf2244ca2ff62325102fe8c52 +EBUILD picard-2.6.3.ebuild 1513 BLAKE2B 1d080555f69c40e026f13bd5373f0c7d916f8de725fb42bff41f7beee7c86a402d738c757453c39f24f7d241df662da4acd5f22132fb16687166b9b76027b2ab SHA512 25e7d5eab89bd32e5baf06e6c1a3a8ab893da291e3752316655ba21d2a0a44f0c3497abe6baa16cfffbbec36c58dd1475aa24f81b412e8b33ba689d633d47339 +EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5 diff --git a/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch b/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch new file mode 100644 index 000000000000..772cbda3868d --- /dev/null +++ b/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch @@ -0,0 +1,61 @@ +From 452bba954c30d5a642f03c02411529f511bda786 Mon Sep 17 00:00:00 2001 +From: Louis Sautier +Date: Fri, 27 Aug 2021 00:43:48 +0200 +Subject: [PATCH] Fix TypeErrors with Python 3.10 + +Without these changes, running Picard with Python 3.10 results in errors +such as: + File "./picard/ui/coverartbox.py", line 74, in __init__ + self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) +TypeError: arguments did not match any overloaded call: + scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float' + scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float' +--- + picard/ui/coverartbox.py | 2 +- + picard/ui/itemviews.py | 6 +++--- + picard/util/__init__.py | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py +index c3eb4ddb74..f3a174664b 100644 +--- a/picard/ui/coverartbox.py ++++ b/picard/ui/coverartbox.py +@@ -135,7 +135,7 @@ def dropEvent(self, event): + event.acceptProposedAction() + + def scaled(self, *dimensions): +- return (self.pixel_ratio * dimension for dimension in dimensions) ++ return (round(self.pixel_ratio * dimension) for dimension in dimensions) + + def show(self): + self.set_data(self.data, True) +diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py +index cffab6d70d..d1101b340f 100644 +--- a/picard/ui/itemviews.py ++++ b/picard/ui/itemviews.py +@@ -141,9 +141,9 @@ def get_match_color(similarity, basecolor): + c1 = (basecolor.red(), basecolor.green(), basecolor.blue()) + c2 = (223, 125, 125) + return QtGui.QColor( +- c2[0] + (c1[0] - c2[0]) * similarity, +- c2[1] + (c1[1] - c2[1]) * similarity, +- c2[2] + (c1[2] - c2[2]) * similarity) ++ int(c2[0] + (c1[0] - c2[0]) * similarity), ++ int(c2[1] + (c1[1] - c2[1]) * similarity), ++ int(c2[2] + (c1[2] - c2[2]) * similarity)) + + + class MainPanel(QtWidgets.QSplitter): +diff --git a/picard/util/__init__.py b/picard/util/__init__.py +index 3a4765f7cd..26f7576f56 100644 +--- a/picard/util/__init__.py ++++ b/picard/util/__init__.py +@@ -400,7 +400,7 @@ def throttled_func(*args, **kwargs): + else: + decorator.args = args + decorator.kwargs = kwargs +- QtCore.QTimer.singleShot(r, later) ++ QtCore.QTimer.singleShot(int(r), later) + decorator.is_ticking = True + mutex.unlock() + diff --git a/media-sound/picard/picard-2.6.3.ebuild b/media-sound/picard/picard-2.6.3.ebuild new file mode 100644 index 000000000000..2c7f465e7441 --- /dev/null +++ b/media-sound/picard/picard-2.6.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 xdg + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/metabrainz/picard" + inherit git-r3 +else + SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-release-${PV}" +fi + +DESCRIPTION="Cross-platform music tagger" +HOMEPAGE="https://picard.musicbrainz.org" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="discid fingerprints nls" + +BDEPEND=" + nls? ( dev-qt/linguist-tools:5 ) +" +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/fasteners[${PYTHON_USEDEP}] + dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + discid? ( dev-python/python-discid[${PYTHON_USEDEP}] ) + ') + fingerprints? ( media-libs/chromaprint[tools] ) +" + +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/metabrainz/picard/commit/452bba954c30d5a642f03c02411529f511bda786 + "${FILESDIR}/${P}-fix-py3.10.patch" +) + +python_compile() { + local build_args=( + --disable-autoupdate + ) + if ! use nls; then + build_args+=( --disable-locales ) + fi + distutils-r1_python_compile ${build_args[@]} +} + +python_install() { + local install_args=( + --disable-autoupdate + --skip-build + ) + if ! use nls; then + install_args+=( --disable-locales ) + fi + distutils-r1_python_install ${install_args[@]} +} diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild index 7592c9ab3a2e..3b869df3541b 100644 --- a/media-sound/picard/picard-9999.ebuild +++ b/media-sound/picard/picard-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 -DISABLE_AUTOFORMATTING=true + inherit distutils-r1 xdg if [[ ${PV} = *9999* ]]; then @@ -29,16 +29,16 @@ BDEPEND=" " RDEPEND=" $(python_gen_cond_dep ' + dev-python/fasteners[${PYTHON_USEDEP}] dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + discid? ( dev-python/python-discid[${PYTHON_USEDEP}] ) ') - dev-qt/qtgui:5 - media-libs/mutagen - discid? ( dev-python/python-discid ) fingerprints? ( media-libs/chromaprint[tools] ) " -RESTRICT="test" # doesn't work with ebuilds +distutils_enable_tests pytest python_compile() { local build_args=( @@ -60,13 +60,3 @@ python_install() { fi distutils-r1_python_install ${install_args[@]} } - -python_install_all() { - distutils-r1_python_install_all - - if [[ -n "${REPLACING_VERSIONS}" ]]; then - elog "If you are upgrading Picard and it does not start, try removing" - elog "Picard's settings:" - elog " rm ~/.config/MusicBrainz/Picard.conf" - fi -} diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest index c9b983394a8e..cc406037c833 100644 --- a/media-sound/snapcast/Manifest +++ b/media-sound/snapcast/Manifest @@ -5,4 +5,4 @@ AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472db AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379 DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d EBUILD snapcast-0.25.0.ebuild 1597 BLAKE2B 97b6451e8b2708b5936a8463d71a87c191eb44ab4acff9a9cdd19e0c06ebe473ef7c64a03cdc5885dc411b954208eb1aad0cae49be4911519bc6d007a9712d9b SHA512 0d59b65a21d4ef66fec2f53dc3173bfc79f8e12a6c788c9442a914133b4f6d4c5ec35d2a31f458ec08a5d867146f230b026be4b452a486c992d21ba43b163cbf -MISC metadata.xml 1190 BLAKE2B b5cc3702af67dc6de92adefc2ed47067079df1c4a34190fbe7ffdf1b233c8b5d01ce5823c841614da40abe05a0caabd4de2a31a8448715fc166cfe828d0c3ace SHA512 0195d09d431cffe95365aeb9cfbc3ae5384dbc1c62b1cd8abf26841162df824e7c8cf6bc0087cf0cb7696cc66ed4b71446bcb44783c4b2f13b6aac1e435f3cd5 +MISC metadata.xml 1039 BLAKE2B 2e5676e773e64fe00719188fc9ad839df79cd9f89faf8c5408dc5d200f258101ed20cd05ec83bf73ba9854fda2b2ad4d4775bfa5cd0a7692578e90a776ddc965 SHA512 cf98c772fa1159ff2507b29ad18e78dc840079eed0478b232ebd39473b970682a03c973939e6fbd815e28e152c519c959c7df4a61356e9e21352ffcbd9d22239 diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml index 7300f7cbd092..539288c2a657 100644 --- a/media-sound/snapcast/metadata.xml +++ b/media-sound/snapcast/metadata.xml @@ -1,13 +1,9 @@ - - jakov.smolic@sartura.hr - Jakov Smolic - - - proxy-maint@gentoo.org - Proxy Maintainers + + jsmolic@gentoo.org + Jakov Smolić Build and install Snapcast client component -- cgit v1.2.3