diff options
Diffstat (limited to 'media-sound')
144 files changed, 3309 insertions, 1514 deletions
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild index 800ea4ac7faf..1046768052a0 100644 --- a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild @@ -22,7 +22,7 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" DEPEND=" >=media-libs/alsa-lib-${PV} >=dev-python/pyalsa-1.0.26 - fltk? ( >=x11-libs/fltk-1.3.0:1 ) + fltk? ( x11-libs/fltk:1= ) gtk? ( dev-libs/gobject-introspection x11-libs/gtk+:2 diff --git a/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild new file mode 100644 index 000000000000..58f1ef8f2bbe --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd udev + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="https://alsa-project.org/wiki/Main_Page" +SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux" + +DEPEND=" + >=media-libs/alsa-lib-${PV} + libsamplerate? ( media-libs/libsamplerate ) + ieee1394? ( media-libs/libffado ) + ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) + bat? ( sci-libs/fftw:= ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-alsa ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/xmlto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.8-missing_header.patch + "${FILESDIR}"/${P}-udev-restore.patch + "${FILESDIR}"/${P}-amdgpu-restore.patch +) + +src_configure() { + export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394) + + local myeconfargs=( + # --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #456214 + --disable-alsaconf + --disable-maintainer-mode + --with-asound-state-dir="${EPREFIX}"/var/lib/alsa + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d + $(use_enable bat) + $(use_enable libsamplerate alsaloop) + $(use_enable ncurses alsamixer) + $(use_enable nls) + $(usev !doc '--disable-xmlto') + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + dodoc seq/*/README.* + + newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound + newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound + + keepdir /var/lib/alsa + + # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not + # scan directory /usr/share/alsa/ucm: No such file or directory + # alsaucm: unable to obtain card list: No such file or directory + keepdir /usr/share/alsa/ucm + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload + + if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then + elog + elog "To take advantage of the init script, and automate the process of" + elog "saving and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog "# rc-update add alsasound boot" + ewarn + ewarn "The ALSA core should be built into the kernel or loaded through other" + ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch new file mode 100644 index 000000000000..da5576267195 --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch @@ -0,0 +1,32 @@ +https://github.com/alsa-project/alsa-utils/commit/6f7ce73159c02b726a6f0fe0acff961c95e337a8 + +From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001 +From: Aaron Ma <aaron.ma@canonical.com> +Date: Wed, 20 Nov 2024 15:55:02 +0800 +Subject: [PATCH] alsactl: 90-alsa-restore.rules - fix AMD acp-pdm-mach link + +The link name of AMD ACP digital microphones driver acp-pdm-mach +is acp-dmic-codec. Fix it to make UCM initialize it again. + +Closes: https://github.com/alsa-project/alsa-utils/pull/281 +Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone") +Signed-off-by: Aaron Ma <aaron.ma@canonical.com> +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + alsactl/90-alsa-restore.rules.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +index dae2ed8c..5db6080b 100644 +--- a/alsactl/90-alsa-restore.rules.in ++++ b/alsactl/90-alsa-restore.rules.in +@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b + TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog" + TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog" + TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog" +-TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog" ++TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog" + GOTO="alsa_restore_std" + + LABEL="alsa_hda_analog" + diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch new file mode 100644 index 000000000000..ba306bb8d702 --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch @@ -0,0 +1,40 @@ +https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8 + +From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela <perex@perex.cz> +Date: Thu, 14 Nov 2024 09:38:49 +0100 +Subject: [PATCH] alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std + +Fix the label mismatch which was introduced in the transition from the +temporary test rules. + +Closes: https://github.com/alsa-project/alsa-utils/issues/280 +Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone") +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + alsactl/90-alsa-restore.rules.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +index 85f0b15f..dae2ed8c 100644 +--- a/alsactl/90-alsa-restore.rules.in ++++ b/alsactl/90-alsa-restore.rules.in +@@ -3,6 +3,8 @@ + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go" + GOTO="alsa_restore_end" + ++LABEL="alsa_restore_go" ++ + ENV{ALSA_CARD_NUMBER}="$attr{device/number}" + + # mark HDA analog card; HDMI/DP card does not have capture devices +@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std" + IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card" + ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}" + +-LABEL="alsa_restore_go" ++LABEL="alsa_restore_std" + TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}" + TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}" + + diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild index aed21c078e94..77b3fbda7a70 100644 --- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild +++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 arm ppc ppc64 sparc x86" RDEPEND=" media-libs/alsa-lib:= media-sound/alsa-utils - x11-libs/fltk:1" + x11-libs/fltk:1=" DEPEND="${RDEPEND}" PATCHES=( diff --git a/media-sound/ardour/ardour-8.10-r3.ebuild b/media-sound/ardour/ardour-8.10-r4.ebuild index 40c4702cd588..b6e3201bbb13 100644 --- a/media-sound/ardour/ardour-8.10-r3.ebuild +++ b/media-sound/ardour/ardour-8.10-r4.ebuild @@ -15,9 +15,9 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" inherit git-r3 else - KEYWORDS="amd64 ~loong ~x86" SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" S="${WORKDIR}/Ardour-${PV}.0" + KEYWORDS="amd64 ~loong ~x86" fi LICENSE="GPL-2" @@ -43,7 +43,7 @@ RDEPEND=" media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband - media-libs/taglib + media-libs/taglib:= media-libs/vamp-plugin-sdk net-libs/libwebsockets net-misc/curl @@ -62,12 +62,12 @@ RDEPEND=" # !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... DEPEND="${RDEPEND} - ${PYTHON_DEPS} + jack? ( virtual/jack )" +BDEPEND="${PYTHON_DEPS} dev-util/itstool sys-devel/gettext virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) - jack? ( virtual/jack )" + doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}/${PN}-6.8-metadata.patch" diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 86fc01e0c354..bbfe10e43adb 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -15,9 +15,9 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" inherit git-r3 else - KEYWORDS="~amd64 ~loong ~x86" SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" S="${WORKDIR}/Ardour-${PV}.0" + KEYWORDS="~amd64 ~loong ~x86" fi LICENSE="GPL-2" @@ -43,7 +43,7 @@ RDEPEND=" media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband - media-libs/taglib + media-libs/taglib:= media-libs/vamp-plugin-sdk net-libs/libwebsockets net-misc/curl @@ -62,12 +62,12 @@ RDEPEND=" # !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... DEPEND="${RDEPEND} - ${PYTHON_DEPS} + jack? ( virtual/jack )" +BDEPEND="${PYTHON_DEPS} dev-util/itstool sys-devel/gettext virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) - jack? ( virtual/jack )" + doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}/${PN}-6.8-metadata.patch" diff --git a/media-sound/ario/ario-1.6-r1.ebuild b/media-sound/ario/ario-1.6-r1.ebuild new file mode 100644 index 000000000000..be5056026f4c --- /dev/null +++ b/media-sound/ario/ario-1.6-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg-utils + +DESCRIPTION="GTK client for MPD inspired by Rhythmbox but much lighter and faster" +HOMEPAGE="https://ario-player.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}-player/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus debug +idle nls taglib zeroconf" + +RDEPEND="dev-libs/glib:2 + dev-libs/libxml2:2 + media-libs/libmpdclient + net-misc/curl + x11-libs/gtk+:3 + dbus? ( dev-libs/dbus-glib ) + taglib? ( media-libs/taglib:= ) + zeroconf? ( net-dns/avahi )" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +DOCS=( AUTHORS ) + +src_configure() { + local myconf=( + --disable-static + --disable-xmms2 + --enable-libmpdclient2 + --enable-search + --enable-playlists + --disable-deprecations + $(use_enable dbus) + $(use_enable debug) + $(use_enable idle mpdidle) + $(use_enable nls) + $(use_enable taglib) + $(use_enable zeroconf avahi) + ) + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/audacity/audacity-3.7.1.ebuild b/media-sound/audacity/audacity-3.7.1.ebuild index 40b53ca471bf..a91df7c11b12 100644 --- a/media-sound/audacity/audacity-3.7.1.ebuild +++ b/media-sound/audacity/audacity-3.7.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit cmake wxwidgets xdg virtualx +inherit cmake flag-o-matic wxwidgets xdg virtualx DESCRIPTION="Free crossplatform audio editor" HOMEPAGE="https://www.audacityteam.org/" @@ -162,6 +162,9 @@ src_prepare() { src_configure() { setup-wxwidgets + # bug #944212 + append-cflags -std=gnu17 + # * always use system libraries if possible # * USE_VST was omitted, it appears to no longer have dependencies # (this is different from VST3) diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml index 74f5a6715d2d..dd53dd22184e 100644 --- a/media-sound/audacity/metadata.xml +++ b/media-sound/audacity/metadata.xml @@ -15,18 +15,23 @@ <name>Matthew White</name> </maintainer> <upstream> + <bugs-to>https://github.com/audacity/audacity/issues</bugs-to> + <!-- There also is the changelog file and the website but only this is up to date --> + <changelog>https://github.com/audacity/audacity/releases</changelog> + <doc>https://manual.audacityteam.org/</doc> <remote-id type="github">audacity/audacity</remote-id> </upstream> <use> <flag name="audiocom">Enable integrated uploading to audio.com</flag> - <flag name="id3tag">Enables ID3 tagging with id3tag library</flag> + <flag name="id3tag">Enable ID3 tagging via <pkg>media-libs/libid3tag</pkg></flag> <flag name="lv2">Add support for Ladspa V2</flag> <flag name="mpg123">Use <pkg>media-sound/mpg123-base</pkg> instead of <pkg>media-libs/libmad</pkg> for MPEG decoding</flag> <flag name="portmixer">Enable the internal portmixer feature</flag> - <flag name="sbsms">Enables sbsms library support for slower, more - accurate pitch and tempo changing</flag> - <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag> - <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag> + <flag name="sbsms">Enable slower, more accurate pitch and tempo changing + via <pkg>media-libs/libsbsms</pkg></flag> + <flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder) + via <pkg>media-sound/twolame</pkg></flag> + <flag name="vamp">Enable vamp plugins support (Audio analysing plugins)</flag> </use> </pkgmetadata> diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r2.ebuild index 529bd2033449..603560c53402 100644 --- a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r1.ebuild +++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,14 +24,17 @@ RDEPEND=" media-libs/libmad media-libs/libvorbis media-libs/portaudio - media-libs/taglib + media-libs/taglib:= " DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${P}-gcc-11.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gcc-11.patch + "${FILESDIR}"/${P}-fix-build-taglib2.patch +) src_install() { einstalldocs diff --git a/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-fix-build-taglib2.patch b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-fix-build-taglib2.patch new file mode 100644 index 000000000000..fb40c7b2a938 --- /dev/null +++ b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-fix-build-taglib2.patch @@ -0,0 +1,23 @@ +https://github.com/Tatsh/bpmdetect/pull/4.patch +--- a/src/trackoggvorbis.cpp ++++ b/src/trackoggvorbis.cpp +@@ -223,7 +223,7 @@ + if (tag == NULL) { + return; + } +- tag->removeField("TBPM"); ++ tag->removeFields("TBPM"); + f.save(); + //open(); + #endif +--- a/src/trackflac.cpp ++++ b/src/trackflac.cpp +@@ -239,7 +239,7 @@ + TagLib::FLAC::File f ( fname.c_str(), false ); + TagLib::Ogg::XiphComment* xiph = f.xiphComment (true); + if (xiph != NULL) { +- xiph->removeField ("TBPM"); ++ xiph->removeFields ("TBPM"); + } + + TagLib::ID3v2::Tag* tag = f.ID3v2Tag (true); diff --git a/media-sound/cantata/cantata-2.5.0-r3.ebuild b/media-sound/cantata/cantata-2.5.0-r3.ebuild new file mode 100644 index 000000000000..139eb5c102bd --- /dev/null +++ b/media-sound/cantata/cantata-2.5.0-r3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN" +inherit cmake plocale xdg + +DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" +HOMEPAGE="https://github.com/CDrummond/cantata" +SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf" +REQUIRED_USE=" + ?? ( cdda cdio ) + cdda? ( udisks || ( cddb musicbrainz ) ) + cddb? ( || ( cdio cdda ) taglib ) + cdio? ( udisks || ( cddb musicbrainz ) ) + mtp? ( taglib udisks ) + musicbrainz? ( || ( cdio cdda ) taglib ) + replaygain? ( taglib ) +" +# cantata has no tests +RESTRICT="test" + +COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-libs/zlib + virtual/libudev:= + cdda? ( media-sound/cdparanoia ) + cddb? ( media-libs/libcddb ) + cdio? ( dev-libs/libcdio-paranoia:= ) + mtp? ( media-libs/libmtp:= ) + musicbrainz? ( media-libs/musicbrainz:5= ) + replaygain? ( + media-libs/libebur128:= + media-sound/mpg123 + media-video/ffmpeg:0= + ) + streaming? ( dev-qt/qtmultimedia:5 ) + taglib? ( + media-libs/taglib:=[asf(+),mp4(+)] + udisks? ( sys-fs/udisks:2 ) + ) + zeroconf? ( net-dns/avahi ) +" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl[perl_features_ithreads] + || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtconcurrent:5 +" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-headers.patch" + "${FILESDIR}/${PN}-2.5.0-fix-build-taglib2.patch" +) + +src_prepare() { + remove_locale() { + rm "translations/${PN}_${1}".ts || die + } + + cmake_src_prepare + + # Unbundle 3rd party libs + rm -r 3rdparty/{ebur128,qtsingleapplication} || die + + plocale_find_changes "translations" "${PN}_" ".ts" + plocale_for_each_disabled_locale remove_locale +} + +src_configure() { + local mycmakeargs=( + -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" + -DENABLE_CDPARANOIA=$(usex cdda) + -DENABLE_CDDB=$(usex cddb) + -DENABLE_CDIOPARANOIA=$(usex cdio) + -DENABLE_HTTP_SERVER=$(usex http-server) + -DENABLE_MTP=$(usex mtp) + -DENABLE_MUSICBRAINZ=$(usex musicbrainz) + -DENABLE_FFMPEG=$(usex replaygain) + -DENABLE_MPG123=$(usex replaygain) + -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) + -DENABLE_TAGLIB=$(usex taglib) + -DENABLE_DEVICES_SUPPORT=$(usex udisks) + -DENABLE_AVAHI=$(usex zeroconf) + -DENABLE_REMOTE_DEVICES=OFF + -DENABLE_UDISKS2=ON + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + has_version media-sound/mpd || \ + elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." + + if ! has_version app-misc/media-player-info; then + elog "Install app-misc/media-player-info to enable identification" + elog "and querying of portable media players" + fi +} diff --git a/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch b/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch new file mode 100644 index 000000000000..c0cc7490b18d --- /dev/null +++ b/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch @@ -0,0 +1,42 @@ +patch from fork as official is archived +https://github.com/nullobsi/cantata/commit/45bac9eb3e99ed75b6539f92418556dac1c0193d.patch +diff --git a/tags/tags.cpp b/tags/tags.cpp +index ce86a1e8..5817dc1b 100644 +--- a/tags/tags.cpp ++++ b/tags/tags.cpp +@@ -619,7 +619,7 @@ static void readAPETags(TagLib::APE::Tag *tag, Song *song, ReplayGain *rg, QImag + if (map.contains("COVER ART (FRONT)")) { + const TagLib::ByteVector nullStringTerminator(1, 0); + +- TagLib::ByteVector item = map["COVER ART (FRONT)"].value(); ++ TagLib::ByteVector item = map["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // Skip the filename + + if (++pos > 0) { +@@ -1301,7 +1301,7 @@ static void readTags(const TagLib::FileRef fileref, Song *song, ReplayGain *rg, + } + } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) { + if (file->tag()) { +- readID3v2Tags(file->tag(), song, rg, img, lyrics, rating); ++ readID3v2Tags(file->ID3v2Tag(), song, rg, img, lyrics, rating); + } + #ifdef TAGLIB_ASF_FOUND + } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) { +@@ -1419,7 +1419,7 @@ static bool writeTags(const TagLib::FileRef fileref, const Song &from, const Son + } + } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) { + if (file->tag()) { +- changed=writeID3v2Tags(file->tag(), from, to, rg, img, rating) || changed; ++ changed=writeID3v2Tags(file->ID3v2Tag(), from, to, rg, img, rating) || changed; + } + #ifdef TAGLIB_ASF_FOUND + } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) { +@@ -1455,7 +1455,7 @@ Song read(const QString &fileName) + + readTags(fileref, &song, nullptr, nullptr, nullptr, nullptr); + song.file=fileName; +- song.time=fileref.audioProperties() ? fileref.audioProperties()->length() : 0; ++ song.time=fileref.audioProperties() ? fileref.audioProperties()->lengthInSeconds() : 0; + return song; + } + diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest index 5fdb8d6d975c..60cd0d93202c 100644 --- a/media-sound/chuck/Manifest +++ b/media-sound/chuck/Manifest @@ -1,3 +1,3 @@ -DIST chuck-1.5.4.1.tgz 22311510 BLAKE2B adfc00bf7b5e828d5b5668b703919d4a4b9e7890a9a59c6d5d1caf2600c9638e14366d4d1fbd417d4fbffbc31003386212d30e1e22f47349c62c36a3b6c8dea4 SHA512 8d372a20c7c98273ac0941a0a59f8e91dbafc9ac290d2454aa23411b4eb515bc7ac12f9635d2f25e2cbf8faca52c67a6ea874bbae52ad24fd44544bd977693aa DIST chuck-1.5.4.2.tgz 22311827 BLAKE2B 1215211c837fa55c132742a9a4edef97446304fffb6a6e9f4de0d1da66c634c81398870fbd30ba864939f7e3a54bd0f2125bd6c4c9634edb51da43fa25fd05a9 SHA512 c4ce1e3e04d33fbd516f41eebfbc3b71399c587c0ea7b5d16b4d8a8fe5efb3e244ea0e8860f7331aa740f68f96f6b8f92d37104e6b71f0b6e0cb704acc14715b DIST chuck-1.5.4.3.tgz 22318954 BLAKE2B 83fffaa811fb9ba73f2000ea7a6d5e133c42964571340877a4080e2a6360ac3a7df8bda01a7c0a4acbdbe2f64d97310dbcff237d935b5598ba5ca0e1a312cd2f SHA512 a8324c7dcd5d031cc256d0a5e87d69ae728d008735c81d977911695ec9e93ff6e647cbc4ef36f7fabf84674c468fcaf7df3350f4898436267344f44f8e4089c7 +DIST chuck-1.5.4.4.tgz 22334080 BLAKE2B 84d3a9e11205c95695fc2b1e9af9fccb31d9a7f2dd6f4184c8bd3b9425cbdb05dac36d477cb6aeb6e757299dc972e2daff5b18d7f5fd748d3c31e04974dd70b9 SHA512 725bea6ee81443e0d65eac80746d2600bf5ab0db2495e8eb376851f46da413ad954106fb9da15b440250da335f0ae63f624945e338a9b2136c110ea876464a05 diff --git a/media-sound/chuck/chuck-1.5.4.2.ebuild b/media-sound/chuck/chuck-1.5.4.2.ebuild index 70115f4d5785..a9df37bf63c1 100644 --- a/media-sound/chuck/chuck-1.5.4.2.ebuild +++ b/media-sound/chuck/chuck-1.5.4.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+alsa jack examples" REQUIRED_USE="|| ( alsa jack )" diff --git a/media-sound/chuck/chuck-1.5.4.3.ebuild b/media-sound/chuck/chuck-1.5.4.3.ebuild index 70115f4d5785..2d23f14d98bc 100644 --- a/media-sound/chuck/chuck-1.5.4.3.ebuild +++ b/media-sound/chuck/chuck-1.5.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+alsa jack examples" REQUIRED_USE="|| ( alsa jack )" diff --git a/media-sound/chuck/chuck-1.5.4.1.ebuild b/media-sound/chuck/chuck-1.5.4.4.ebuild index a9df37bf63c1..cf941b17862c 100644 --- a/media-sound/chuck/chuck-1.5.4.1.ebuild +++ b/media-sound/chuck/chuck-1.5.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+alsa jack examples" REQUIRED_USE="|| ( alsa jack )" diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild new file mode 100644 index 000000000000..cdaced76e890 --- /dev/null +++ b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" +HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" + +PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" + +inherit cmake flag-o-matic plocale virtualx xdg + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" + inherit git-r3 +else + SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Clementine-${PV/_}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + udisks? ( dbus ) + wiimote? ( dbus ) +" + +COMMON_DEPEND=" + dev-cpp/abseil-cpp:= + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/protobuf:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-libs/chromaprint:= + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=media-libs/libmygpo-qt-1.0.9[qt5(+)] + media-libs/taglib:= + sys-libs/zlib + x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) + cdda? ( dev-libs/libcdio:= ) + dbus? ( dev-qt/qtdbus:5 ) + ipod? ( >=media-libs/libgpod-0.8.0 ) + lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) + moodbar? ( sci-libs/fftw:3.0= ) + mtp? ( >=media-libs/libmtp-1.0.0:= ) + projectm? ( + media-libs/glew:= + >=media-libs/libprojectm-3.1.12:0= + virtual/opengl + ) + pulseaudio? ( media-libs/libpulse ) +" +RDEPEND="${COMMON_DEPEND} + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-soup:1.0 + media-plugins/gst-plugins-taglib:1.0 + mtp? ( gnome-base/gvfs[mtp] ) + udisks? ( sys-fs/udisks:2 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + dev-libs/libxml2 + dev-qt/qtopengl:5 + dev-qt/qtxml:5 + virtual/glu + box? ( dev-cpp/sparsehash ) + dropbox? ( dev-cpp/sparsehash ) + googledrive? ( dev-cpp/sparsehash ) + seafile? ( dev-cpp/sparsehash ) + skydrive? ( dev-cpp/sparsehash ) +" +BDEPEND=" + >=dev-cpp/gtest-1.8.0 + dev-qt/linguist-tools:5 + sys-devel/gettext + virtual/pkgconfig + test? ( + dev-qt/qttest:5 + gnome-base/gsettings-desktop-schemas + ) +" + +PATCHES=( + "${FILESDIR}/clementine-1.4.0_rc2-lz.patch" + "${FILESDIR}/clementine-1.4.0_rc2-c17.patch" + "${FILESDIR}/clementine-1.4.0_rc2-absl.patch" + "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" + "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch" +) + +DOCS=( Changelog README.md ) + +src_prepare() { + plocale_find_changes "src/translations" "" ".po" + + cmake_src_prepare + # some tests fail or hang + sed -i \ + -e '/add_test_file(translations_test.cpp/d' \ + tests/CMakeLists.txt || die + + if ! use test; then + sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die + cmake_comment_add_subdirectory tests + fi + + rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die +} + +src_configure() { + # spotify is not in portage + local mycmakeargs=( + -DBUILD_WERROR=OFF + # avoid automagically enabling of ccache (bug #611010) + -DCCACHE_EXECUTABLE=OFF + -DENABLE_BREAKPAD=OFF #< disable crash reporting + -DENABLE_GIO=ON + -DENABLE_SPOTIFY=OFF + -DENABLE_SPOTIFY_BLOB=OFF + -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF + -DLINGUAS="$(plocale_get_locales)" + -DENABLE_BOX="$(usex box)" + -DENABLE_AUDIOCD="$(usex cdda)" + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) + -DENABLE_DROPBOX="$(usex dropbox)" + -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBGPOD="$(usex ipod)" + -DENABLE_LIBLASTFM="$(usex lastfm)" + -DENABLE_MOODBAR="$(usex moodbar)" + -DENABLE_LIBMTP="$(usex mtp)" + -DENABLE_VISUALISATIONS="$(usex projectm)" + -DENABLE_SEAFILE="$(usex seafile)" + -DENABLE_SKYDRIVE="$(usex skydrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_UDISKS2="$(usex udisks)" + -DENABLE_WIIMOTEDEV="$(usex wiimote)" + "$(cmake_use_find_package alsa ALSA)" + -DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)" + ) + + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + + cmake_src_configure +} + +src_test() { + cd "${CMAKE_BUILD_DIR}" || die + virtx cmake_build clementine_test +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " + elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "depending on your preferences" +} diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index 0636103d29fd..a09833cc5cc0 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] - >=media-libs/taglib-1.11.1_p20181028 + media-libs/taglib:= sys-libs/zlib x11-libs/libX11 alsa? ( media-libs/alsa-lib ) @@ -96,6 +96,7 @@ PATCHES=( "${FILESDIR}/clementine-1.4.0_rc2-c17.patch" "${FILESDIR}/clementine-1.4.0_rc2-absl.patch" "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" + "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch" ) DOCS=( Changelog README.md ) diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch new file mode 100644 index 000000000000..0c26343c7bf0 --- /dev/null +++ b/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch @@ -0,0 +1,188 @@ +https://github.com/clementine-player/Clementine/commit/e9c09b1c4054925fa6366233cb44d4d0a543258f.patch +compatibility added with taglib1 +--- a/ext/libclementine-tagreader/cloudstream.cpp ++++ b/ext/libclementine-tagreader/cloudstream.cpp +@@ -91,7 +91,11 @@ + clear(); + } + ++#if (TAGLIB_MAJOR_VERSION == 2) ++TagLib::ByteVector CloudStream::readBlock(size_t length) { ++#else + TagLib::ByteVector CloudStream::readBlock(ulong length) { ++#endif + const uint start = cursor_; + const uint end = qMin(cursor_ + length - 1, length_ - 1); + +@@ -144,11 +148,19 @@ + qLog(Debug) << Q_FUNC_INFO << "not implemented"; + } + ++#if (TAGLIB_MAJOR_VERSION == 2) ++void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) { ++#else + void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) { ++#endif + qLog(Debug) << Q_FUNC_INFO << "not implemented"; + } + ++#if (TAGLIB_MAJOR_VERSION == 2) ++void CloudStream::removeBlock(TagLib::offset_t, size_t) { ++#else + void CloudStream::removeBlock(ulong, ulong) { ++#endif + qLog(Debug) << Q_FUNC_INFO << "not implemented"; + } + +@@ -159,7 +171,11 @@ + + bool CloudStream::isOpen() const { return true; } + ++#if (TAGLIB_MAJOR_VERSION == 2) ++void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) { ++#else + void CloudStream::seek(long offset, TagLib::IOStream::Position p) { ++#endif + switch (p) { + case TagLib::IOStream::Beginning: + cursor_ = offset; +@@ -178,11 +194,19 @@ + + void CloudStream::clear() { cursor_ = 0; } + ++#if (TAGLIB_MAJOR_VERSION == 2) ++TagLib::offset_t CloudStream::tell() const { return cursor_; } ++ ++TagLib::offset_t CloudStream::length() { return length_; } ++ ++void CloudStream::truncate(TagLib::offset_t) { ++#else + long CloudStream::tell() const { return cursor_; } + + long CloudStream::length() { return length_; } + + void CloudStream::truncate(long) { ++#endif + qLog(Debug) << Q_FUNC_INFO << "not implemented"; + } + +--- a/ext/libclementine-tagreader/cloudstream.h ++++ b/ext/libclementine-tagreader/cloudstream.h +@@ -35,6 +35,19 @@ + + // Taglib::IOStream + virtual TagLib::FileName name() const; ++#if (TAGLIB_MAJOR_VERSION == 2) ++ virtual TagLib::ByteVector readBlock(size_t length); ++ virtual void writeBlock(const TagLib::ByteVector&); ++ virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t); ++ virtual void removeBlock(TagLib::offset_t, size_t); ++ virtual bool readOnly() const; ++ virtual bool isOpen() const; ++ virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p); ++ virtual void clear(); ++ virtual TagLib::offset_t tell() const; ++ virtual TagLib::offset_t length(); ++ virtual void truncate(TagLib::offset_t); ++#else + virtual TagLib::ByteVector readBlock(ulong length); + virtual void writeBlock(const TagLib::ByteVector&); + virtual void insert(const TagLib::ByteVector&, ulong, ulong); +@@ -46,6 +59,7 @@ + virtual long tell() const; + virtual long length(); + virtual void truncate(long); ++#endif + + google::sparsetable<char>::size_type cached_bytes() const { + return cache_.num_nonempty(); +--- a/ext/libclementine-tagreader/tagreader.cpp ++++ b/ext/libclementine-tagreader/tagreader.cpp +@@ -198,7 +198,7 @@ + // Find album artists + TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST"); + if (it != items.end()) { +- TagLib::StringList album_artists = it->second.toStringList(); ++ TagLib::StringList album_artists = it->second.values(); + if (!album_artists.isEmpty()) { + Decode(album_artists.front(), nullptr, song->mutable_albumartist()); + } +@@ -243,22 +243,22 @@ + } + + if (items.contains("BPM")) { +- Decode(items["BPM"].toStringList().toString(", "), nullptr, ++ Decode(items["BPM"].values().toString(", "), nullptr, + song->mutable_performer()); + } + + if (items.contains("PERFORMER")) { +- Decode(items["PERFORMER"].toStringList().toString(", "), nullptr, ++ Decode(items["PERFORMER"].values().toString(", "), nullptr, + song->mutable_performer()); + } + + if (items.contains("COMPOSER")) { +- Decode(items["COMPOSER"].toStringList().toString(", "), nullptr, ++ Decode(items["COMPOSER"].values().toString(", "), nullptr, + song->mutable_composer()); + } + + if (items.contains("GROUPING")) { +- Decode(items["GROUPING"].toStringList().toString(" "), nullptr, ++ Decode(items["GROUPING"].values().toString(" "), nullptr, + song->mutable_grouping()); + } + +@@ -565,8 +565,8 @@ + if (fileref->audioProperties()) { + song->set_bitrate(fileref->audioProperties()->bitrate()); + song->set_samplerate(fileref->audioProperties()->sampleRate()); +- song->set_length_nanosec(fileref->audioProperties()->length() * +- kNsecPerSec); ++ song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() * ++ kNsecPerMsec); + } + + // Get the filetype if we can +@@ -1376,9 +1376,15 @@ + std::unique_ptr<TagLib::File> tag; + if (mime_type == "audio/mpeg" && + title.endsWith(".mp3", Qt::CaseInsensitive)) { ++#if (TAGLIB_MAJOR_VERSION == 2) ++ tag.reset(new TagLib::MPEG::File(stream.get(), true, ++ TagLib::AudioProperties::Accurate, ++ TagLib::ID3v2::FrameFactory::instance())); ++#else + tag.reset(new TagLib::MPEG::File(stream.get(), + TagLib::ID3v2::FrameFactory::instance(), + TagLib::AudioProperties::Accurate)); ++#endif + } else if (mime_type == "audio/mp4" || + (mime_type == "audio/mpeg" && + title.endsWith(".m4a", Qt::CaseInsensitive))) { +@@ -1398,9 +1398,15 @@ + TagLib::AudioProperties::Accurate)); + } else if (mime_type == "application/x-flac" || mime_type == "audio/flac" || + mime_type == "audio/x-flac") { ++#if (TAGLIB_MAJOR_VERSION == 2) ++ tag.reset(new TagLib::FLAC::File(stream.get(), true, ++ TagLib::AudioProperties::Accurate, ++ TagLib::ID3v2::FrameFactory::instance())); ++#else + tag.reset(new TagLib::FLAC::File(stream.get(), + TagLib::ID3v2::FrameFactory::instance(), + true, TagLib::AudioProperties::Accurate)); ++#endif + } else if (mime_type == "audio/x-ms-wma") { + tag.reset(new TagLib::ASF::File(stream.get(), true, + TagLib::AudioProperties::Accurate)); +@@ -1431,7 +1431,7 @@ + song->set_type(cpb::tagreader::SongMetadata_Type_STREAM); + + if (tag->audioProperties()) { +- song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec); ++ song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec); + } + return true; + } diff --git a/media-sound/coquillo/coquillo-2.0.1.ebuild b/media-sound/coquillo/coquillo-2.0.1-r1.ebuild index 58e806189020..d638dd4c1613 100644 --- a/media-sound/coquillo/coquillo-2.0.1.ebuild +++ b/media-sound/coquillo/coquillo-2.0.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop qmake-utils @@ -21,10 +21,12 @@ DEPEND=" dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/musicbrainz:5= - media-libs/taglib + media-libs/taglib:= " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${PN}-2.0.1-fix-build-taglib2.patch ) + src_configure() { eqmake5 } diff --git a/media-sound/coquillo/files/coquillo-2.0.1-fix-build-taglib2.patch b/media-sound/coquillo/files/coquillo-2.0.1-fix-build-taglib2.patch new file mode 100644 index 000000000000..62303e0919b8 --- /dev/null +++ b/media-sound/coquillo/files/coquillo-2.0.1-fix-build-taglib2.patch @@ -0,0 +1,9 @@ +https://github.com/sjuvonen/coquillo/pull/12.patch +--- a/src/crawler/tag/xiphcomment.cpp ++++ b/src/crawler/tag/xiphcomment.cpp +@@ -1,4 +1,5 @@ + ++#include <taglib/taglib.h> + #include <taglib/xiphcomment.h> + #include <QImage> + #include "xiphcomment.hpp" diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest index 921f8f580471..c4bf1f86f7c4 100644 --- a/media-sound/deadbeef/Manifest +++ b/media-sound/deadbeef/Manifest @@ -1,2 +1,2 @@ -DIST deadbeef-1.10.0_beta1.tar.bz2 5223491 BLAKE2B b8c550c84ae8cdccce89b382fa0ed6d4a6fd2681394fd70c304cfd3c0ae393fd25d7bb11aa5b5fd4ee069ef87d7202333e0f3cd7aa60f4cc036da17d4d92f10f SHA512 34dd6c48c342e687fbd4948b9dd6744a833683403de1cda2021e3f3475a3c4f099d5cea3c047e3dc8de7c6fc8966d810845c855188c29c6a8b0c5887d56ddfe0 +DIST deadbeef-1.10.0_beta2.tar.bz2 5314170 BLAKE2B 7d4a3db4ddb9596297d9b55c0d897361c8c1d62ef8d78a2e91fbe586392cdf76bd4954bcf76200963392e051f7b83a9f1342e9f27bdbe10489bf8ade6f45c8b0 SHA512 de1ebbe53eedacd5a64dbed7573150e3441d6707aede6a351b32b4b7044a408f14fe43bd1b79aa98fa3c66b9b8241f12ede8ce481ff7bd79eefa0aec1194cdc4 DIST deadbeef-1.9.6.tar.bz2 5182123 BLAKE2B 2cf515dbc3175e04319075462e88d18ee2fae06e8b317d1cc0c958ac23498217bb0a02e0201f47a39dfd4c0092ba568b8aebe4c37c99b439d2dcc18a7848ba2e SHA512 6e507399f7452a66c5591e09d4309f2aab676992d048625c9b4d801ea40af6ce79862fb497e8c94efdf3a13572c964dca717b42f1c946f5ec4695dc38c1db572 diff --git a/media-sound/deadbeef/deadbeef-1.10.0_beta1.ebuild b/media-sound/deadbeef/deadbeef-1.10.0_beta2.ebuild index cb8e818fd626..cb8e818fd626 100644 --- a/media-sound/deadbeef/deadbeef-1.10.0_beta1.ebuild +++ b/media-sound/deadbeef/deadbeef-1.10.0_beta2.ebuild diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest index 8d157b5e26cd..8aedd972f108 100644 --- a/media-sound/drumstick/Manifest +++ b/media-sound/drumstick/Manifest @@ -1 +1,2 @@ +DIST drumstick-2.10.0.tar.gz 571622 BLAKE2B b6b7380dbd731fcfa1e894cdb188c0f300181af138ca2161df66599db716e632b34c3a464bbdb0cead080cdd8959a410da063a90b0587efb51909f32ea328703 SHA512 af265f2646739552c3d94538e0716453de3210308c0af4658e734a4815fe61f9667d09d069aea3e26b24d600be49088afc0cf3cd961463edca684466c7761805 DIST drumstick-2.9.1.tar.gz 571028 BLAKE2B 6ec7459f77763fae354e4c64f4b2b208d28fb8e24bfe939b46456e20bf01ad1b6a7e57e7d8e847b6f594b7431792128cffde517b5d8714e951ec232bc07ef50f SHA512 72ab6062e94aa4e995e9f9c563dfb2cb7dd5fe47bb129ca9f58b8877e980e81611cb59c9964fe72847fccec4f7de3f4b884eaa8dc7b5384ce0cada2e721bebc3 diff --git a/media-sound/drumstick/drumstick-2.10.0.ebuild b/media-sound/drumstick/drumstick-2.10.0.ebuild new file mode 100644 index 000000000000..255774dc750b --- /dev/null +++ b/media-sound/drumstick/drumstick-2.10.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.7.2 +inherit cmake xdg + +DESCRIPTION="Qt/C++ wrapper for ALSA sequencer" +HOMEPAGE="https://drumstick.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa doc fluidsynth test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-libs/libxslt + >=dev-qt/qttools-${QTMIN}:6[linguist] + virtual/pkgconfig + x11-misc/shared-mime-info + doc? ( + app-text/doxygen[dot] + app-text/docbook-xsl-stylesheets + ) +" +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[designer] + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS readme.md TODO ) + +src_configure() { + local mycmakeargs=( + -DBUILD_RT=ON + -DUSE_NETWORK=ON # just to satisfy BUILD_RT w/o REQUIRED_USE + -DUSE_PIPEWIRE=OFF # only affects fluidsynth RT backend + -DUSE_DBUS=ON + -DUSE_QT5=OFF # bug 919682 + -DUSE_SONIVOX=OFF # not packaged, bug #865259 + -DUSE_PULSEAUDIO=OFF # requires Sonivox + -DBUILD_ALSA=$(usex alsa) + -DBUILD_DOCS=$(usex doc) + -DUSE_FLUIDSYNTH=$(usex fluidsynth) + -DBUILD_TESTING=$(usex test) + ) + 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/easytag/easytag-2.4.3-r7.ebuild b/media-sound/easytag/easytag-2.4.3-r7.ebuild new file mode 100644 index 000000000000..594ad5101f03 --- /dev/null +++ b/media-sound/easytag/easytag-2.4.3-r7.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 + +DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags" +HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG" + +LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="flac mp3 mp4 opus speex test vorbis wavpack" +# Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78 +# is solved +RESTRICT="!test? ( test )" +REQUIRED_USE=" + opus? ( vorbis ) + speex? ( vorbis )" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) + >=x11-libs/gtk+-3.10:3 + flac? ( >=media-libs/flac-1.3:= ) + mp3? ( + >=media-libs/id3lib-3.8.3-r8 + >=media-libs/libid3tag-0.15.1b-r4:= + ) + mp4? ( media-libs/taglib:=[mp4(+)] ) + opus? ( + >=media-libs/opus-1.1 + >=media-libs/opusfile-0.4 + ) + speex? ( >=media-libs/speex-1.2_rc1 ) + vorbis? ( + >=media-libs/libogg-1.3.1 + >=media-libs/libvorbis-1.3.4 + ) + wavpack? ( >=media-sound/wavpack-4.70 )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/docbook-xml-dtd:4.4 + app-text/yelp-tools + dev-util/glib-utils + dev-libs/libxml2 + dev-libs/libxslt + >=dev-util/intltool-0.50 + >=sys-devel/gettext-0.18.3.2 + virtual/pkgconfig + test? ( + dev-libs/appstream-glib + >=dev-util/desktop-file-utils-0.22 + )" + +PATCHES=( + "${FILESDIR}"/${P}-ogg-corruption.patch + "${FILESDIR}"/${P}-fix-build-taglib2.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-Werror \ + --disable-nautilus-actions \ + $(use_enable test appdata-validate) \ + $(use_enable test tests) \ + $(use_enable mp3) \ + $(use_enable mp3 id3v23) \ + $(use_enable vorbis ogg) \ + $(use_enable opus) \ + $(use_enable speex) \ + $(use_enable flac) \ + $(use_enable mp4) \ + $(use_enable wavpack) +} + +src_install() { + gnome2_src_install + # https://gitlab.gnome.org/GNOME/easytag/-/issues/82 + mv "${ED}"/usr/share/{appdata,metainfo} || die +} diff --git a/media-sound/easytag/files/easytag-2.4.3-fix-build-taglib2.patch b/media-sound/easytag/files/easytag-2.4.3-fix-build-taglib2.patch new file mode 100644 index 000000000000..d27e5cdc9fe7 --- /dev/null +++ b/media-sound/easytag/files/easytag-2.4.3-fix-build-taglib2.patch @@ -0,0 +1,202 @@ +from https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16.patch +compatibility added with taglib1 + +diff '--color=auto' -uNr a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc +--- a/src/tags/gio_wrapper.cc ++++ b/src/tags/gio_wrapper.cc +@@ -47,11 +47,15 @@ + } + + TagLib::ByteVector ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_InputStream::readBlock (ulong len) ++#else + GIO_InputStream::readBlock (TagLib::ulong len) ++#endif + { + if (error) + { +- return TagLib::ByteVector::null; ++ return TagLib::ByteVector(); + } + + TagLib::ByteVector rv (len, 0); +@@ -69,15 +73,25 @@ + } + + void ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_InputStream::insert (TagLib::ByteVector const &data, ++ TagLib::offset_t start, ++ size_t replace) ++#else + GIO_InputStream::insert (TagLib::ByteVector const &data, + TagLib::ulong start, + TagLib::ulong replace) ++#endif + { + g_warning ("%s", "Trying to write to read-only file!"); + } + + void ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len) ++#else + GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len) ++#endif + { + g_warning ("%s", "Trying to write to read-only file!"); + } +@@ -200,11 +214,15 @@ + } + + TagLib::ByteVector ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_IOStream::readBlock (ulong len) ++#else + GIO_IOStream::readBlock (TagLib::ulong len) ++#endif + { + if (error) + { +- return TagLib::ByteVector::null; ++ return TagLib::ByteVector(); + } + + gsize bytes = 0; +@@ -238,9 +256,15 @@ + } + + void ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_IOStream::insert (TagLib::ByteVector const &data, ++ TagLib::offset_t start, ++ size_t replace) ++#else + GIO_IOStream::insert (TagLib::ByteVector const &data, + TagLib::ulong start, + TagLib::ulong replace) ++#endif + { + if (error) + { +@@ -351,9 +375,15 @@ + } + + void ++#if (TAGLIB_MAJOR_VERSION == 2) ++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len) ++{ ++ if (start + len >= (ulong)length ()) ++#else + GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len) + { + if (start + len >= (TagLib::ulong)length ()) ++#endif + { + truncate (start); + return; +diff '--color=auto' -uNr a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h +--- a/src/tags/gio_wrapper.h ++++ b/src/tags/gio_wrapper.h +@@ -33,10 +33,17 @@ + GIO_InputStream (GFile *file_); + virtual ~GIO_InputStream (); + virtual TagLib::FileName name () const; ++#if (TAGLIB_MAJOR_VERSION == 2) ++ virtual TagLib::ByteVector readBlock (ulong length); ++ virtual void writeBlock (TagLib::ByteVector const &data); ++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0); ++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0); ++#else + virtual TagLib::ByteVector readBlock (TagLib::ulong length); + virtual void writeBlock (TagLib::ByteVector const &data); + virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0); + virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0); ++#endif + virtual bool readOnly () const; + virtual bool isOpen () const; + virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning); +@@ -61,10 +68,17 @@ + GIO_IOStream (GFile *file_); + virtual ~GIO_IOStream (); + virtual TagLib::FileName name () const; ++#if (TAGLIB_MAJOR_VERSION == 2) ++ virtual TagLib::ByteVector readBlock (ulong length); ++ virtual void writeBlock (TagLib::ByteVector const &data); ++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0); ++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0); ++#else + virtual TagLib::ByteVector readBlock (TagLib::ulong length); + virtual void writeBlock (TagLib::ByteVector const &data); + virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0); + virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0); ++#endif + virtual bool readOnly () const; + virtual bool isOpen () const; + virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning); +diff '--color=auto' -uNr a/src/tags/mp4_header.cc b/src/tags/mp4_header.cc +--- a/src/tags/mp4_header.cc ++++ b/src/tags/mp4_header.cc +@@ -105,7 +105,7 @@ + ETFileInfo->bitrate = properties->bitrate (); + ETFileInfo->samplerate = properties->sampleRate (); + ETFileInfo->mode = properties->channels (); +- ETFileInfo->duration = properties->length (); ++ ETFileInfo->duration = properties->lengthInSeconds (); + + return TRUE; + } +diff '--color=auto' -uNr a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc +--- a/src/tags/mp4_tag.cc ++++ b/src/tags/mp4_tag.cc +@@ -222,7 +222,7 @@ + FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true)); + } + +- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap (); ++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap (); + + /* Album Artist */ + #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10) +@@ -437,25 +437,12 @@ + fields.insert ("ENCODEDBY", string); + } + +- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap (); +- + /* Album artist. */ + if (!et_str_empty (FileTag->album_artist)) + { + TagLib::String string (FileTag->album_artist, TagLib::String::UTF8); +-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10) +- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */ +- extra_items.insert ("aART", TagLib::MP4::Item (string)); +-#else + fields.insert ("ALBUMARTIST", string); +-#endif + } +-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10) +- else +- { +- extra_items.erase ("aART"); +- } +-#endif + + /*********** + * Picture * +@@ -491,12 +478,12 @@ + TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data, + data_size)); + +- extra_items.insert ("covr", ++ tag->setItem("covr", + TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art))); + } + else + { +- extra_items.erase ("covr"); ++ tag->removeItem("covr"); + } + + tag->setProperties (fields); diff --git a/media-sound/ezstream/ezstream-0.6.0-r2.ebuild b/media-sound/ezstream/ezstream-0.6.0-r3.ebuild index d9cb6fb09888..deeabd1c31dd 100644 --- a/media-sound/ezstream/ezstream-0.6.0-r2.ebuild +++ b/media-sound/ezstream/ezstream-0.6.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ DEPEND=" dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) - taglib? ( media-libs/taglib )" + taglib? ( media-libs/taglib:= )" RDEPEND=" ${DEPEND} net-misc/icecast" diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest index 5483d64259d7..a55359d66d39 100644 --- a/media-sound/flacon/Manifest +++ b/media-sound/flacon/Manifest @@ -1,3 +1 @@ -DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a -DIST flacon-11.3.0.tar.gz 4081613 BLAKE2B 791628fe40f49548d65b2a49f259d4ffaf42ba97f9674649669ceded7073fb805f277fefca1d3fffaae86438f9d7cff443dccbb6c8bef5e40f0eb60554c11db9 SHA512 e4b4f3876f4f647dafa21118c13482678c2766dce94b650142d7b2b21897d6e8f1f85601877b388c7f8554d5e57778de9a6db82ae38c1f089e7c2f88b1c497b8 DIST flacon-11.4.0.tar.gz 4095740 BLAKE2B 078bded28f114939ee2a003885e85a6259122ae0de95265a52de525202645d872550a773b49b7d37e3b479912bc6b31245532f71bd2020a954b227082c856589 SHA512 321f80c40b61e60e91b32d19a1f14dbdc9738aacd54e7ea8bf0a969daeeec3f663b119fd3973a2722b14b836bc8d6c16cd3f4b831c003a906f1d110db5caaeee diff --git a/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch b/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch deleted file mode 100644 index 6ceff9bda276..000000000000 --- a/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt.oirg b/CMakeLists.txt -index f143d91..fd16a9b 100644 ---- a/CMakeLists.txt.oirg -+++ b/CMakeLists.txt -@@ -302,14 +302,14 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") - install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) - install(FILES ${QM_FILES} DESTINATION Flacon.app/Contents/translations) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION Flacon.app/Contents/Resources) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION Flacon.app/Contents) - install(FILES images/mainicon/Flacon.icns DESTINATION Flacon.app/Contents/Resources) - - else() - install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metainfo.xml DESTINATION "share/metainfo") diff --git a/media-sound/flacon/flacon-10.0.0-r1.ebuild b/media-sound/flacon/flacon-10.0.0-r1.ebuild deleted file mode 100644 index 654d494065c9..000000000000 --- a/media-sound/flacon/flacon-10.0.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Tests require lots of disk space -CHECKREQS_DISK_BUILD=10G -inherit check-reqs cmake optfeature virtualx xdg-utils - -DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks" -HOMEPAGE="https://flacon.github.io/" -SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - app-i18n/uchardet - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-libs/taglib -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - test? ( - dev-qt/qttest:5 - media-libs/flac - <=media-sound/mac-4.12 - media-sound/shntool - media-sound/ttaenc - media-sound/wavpack - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch -) - -RESTRICT="!test? ( test )" - -pkg_pretend() { - use test && check-reqs_pkg_pretend -} - -pkg_setup() { - use test && check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - # All tests fail with enabled sandbox - # TODO: Get all tests to pass - # See bug: #831592 - local -x SANDBOX_ON=0 - - virtx "${BUILD_DIR}/tests/${PN}_test" || die -} - -pkg_postinst() { - optfeature_header "${PN} optionally supports formats listed below." - optfeature 'FLAC input and output support' media-libs/flac - optfeature 'WavPack input and output support' media-sound/wavpack - optfeature 'APE input support' media-sound/mac - optfeature 'ALAC output support' media-sound/alac_decoder - optfeature 'TTA input support' media-sound/ttaenc - optfeature 'AAC output support' media-libs/faac - optfeature 'MP3 output support' media-sound/lame - optfeature 'Vorbis output support' media-sound/vorbis-tools - - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-sound/flacon/flacon-11.3.0.ebuild b/media-sound/flacon/flacon-11.3.0.ebuild deleted file mode 100644 index 9edb7111612a..000000000000 --- a/media-sound/flacon/flacon-11.3.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Tests require lots of disk space -CHECKREQS_DISK_BUILD=10G -inherit check-reqs cmake optfeature virtualx xdg-utils - -DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks" -HOMEPAGE="https://flacon.github.io/" -SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - app-i18n/uchardet - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-libs/taglib - media-sound/sox[flac,wavpack] - media-video/mediainfo -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - test? ( - dev-cpp/yaml-cpp - dev-qt/qttest:5 - media-libs/faac - media-libs/flac - media-sound/alacenc - media-sound/alac_decoder - media-sound/lame - <=media-sound/mac-4.12 - media-sound/opus-tools - media-sound/shntool - media-sound/ttaenc - media-sound/vorbis-tools - media-sound/wavpack - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-no-man-compress.patch -) - -RESTRICT="!test? ( test )" - -pkg_pretend() { - use test && check-reqs_pkg_pretend -} - -pkg_setup() { - use test && check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - # All tests fail with enabled sandbox - # TODO: Get all tests to pass - # See bug: #831592 - local -x SANDBOX_ON=0 - - virtx "${BUILD_DIR}/tests/${PN}_test" || die -} - -pkg_postinst() { - optfeature_header "${PN} optionally supports formats listed below." - optfeature 'FLAC input and output support' media-libs/flac - optfeature 'WavPack input and output support' media-sound/wavpack - optfeature 'APE input support' media-sound/mac - optfeature 'ALAC input support' media-sound/alacenc - optfeature 'ALAC output support' media-sound/alac_decoder - optfeature 'TTA input support' media-sound/ttaenc - optfeature 'AAC output support' media-libs/faac - optfeature 'MP3 output support' media-sound/lame - optfeature 'Vorbis output support' media-sound/vorbis-tools - optfeature 'Opus input/output support' media-sound/opus-tools - - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-sound/flacon/flacon-11.4.0.ebuild b/media-sound/flacon/flacon-11.4.0.ebuild index 5b4577ad633f..2bac0621ee7d 100644 --- a/media-sound/flacon/flacon-11.4.0.ebuild +++ b/media-sound/flacon/flacon-11.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" BDEPEND=" diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest index 0242272cd9ee..7c32857451e9 100644 --- a/media-sound/fluidsynth/Manifest +++ b/media-sound/fluidsynth/Manifest @@ -1,3 +1,2 @@ -DIST fluidsynth-2.3.7.tar.gz 1777056 BLAKE2B b6a4fcf430f5e89a66d80faf61af3e005057f6254912a0a8af4eabd92d8b46ff9bc5a072e09eac3782f99ea26900150f5eda5eefe514a2c95f9229558ce560bb SHA512 f5fd5ddbc4d30ded258ae3d04ba5981ce8da1132c5d93faf1e8745a9d9f89c9fb3365f0447b94e0fe0e9b032c789fcbd6e647a65a50d1f76179b53a76683d004 -DIST fluidsynth-2.4.0.tar.gz 1780676 BLAKE2B 9814d8ac133ab18650b7f3b6ef0cdec6da76a59ef2dd2af9471311e7e7850604376d3d135e13c5b6e01a93d70bd5f266ad9df2a270cd9f3482738bb3d8f81747 SHA512 57770597e26140011324cac14dd81aa1f5fc52ec0c256a4e16f629b81b8d477279ad714cc9d1e375d74aabb348e1436eafd06746cdf10fa29196468645bf7600 DIST fluidsynth-2.4.1.tar.gz 3298564 BLAKE2B 15ed3a808d0c0123226a087520564c2833d43c20fd8b6aa273a7467a74d92b8a67159fc960ad2f3a5d764b8e95ec25c1ec045c203058ceb83bfc276408d96b58 SHA512 d01d18c42ce98d0daa4e137118fc41f0a59047013870c09bacd9014baadf747e8e73571046781e34bc03eef454f2ef12ee59cf9b2c7f9517c586c08041ebe081 +DIST fluidsynth-2.4.2.tar.gz 1785003 BLAKE2B d514e595b6e902dc54ef94575701c8aa0b6b1d84d92f57874b163319076cb85c38b7c97bce70f66f55f3ef8e791608e7e29add6cb92c768e4f6ba2a4a89a1481 SHA512 8c43e4e86f364f42115a51311231d9926325d7e519c2ddd087a9ed421c9a94cc0dfc5cfbfdfffe9401c634cce14c6e442523550114ac887096dde22ab0c63d98 diff --git a/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild deleted file mode 100644 index fb0215dc13a8..000000000000 --- a/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib systemd toolchain-funcs - -DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications" -HOMEPAGE="https://www.fluidsynth.org" -SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" -IUSE="alsa dbus debug doc ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - dev-libs/libxslt - ) -" -DEPEND=" - dev-libs/glib:2[${MULTILIB_USEDEP}] - alsa? ( - media-libs/alsa-lib[${MULTILIB_USEDEP}] - lash? ( media-sound/lash[${MULTILIB_USEDEP}] ) - ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - ladspa? ( - media-libs/ladspa-sdk[${MULTILIB_USEDEP}] - media-plugins/cmt-plugins[${MULTILIB_USEDEP}] - ) - pipewire? ( - media-video/pipewire:0=[${MULTILIB_USEDEP}] - ) - portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt ) - -src_prepare() { - # https://bugs.gentoo.org/833979#c17 - sed -i "/CONFIGURE_COMMAND/{n;s/$/ -DCMAKE_C_COMPILER=$(tc-getBUILD_CC)/}" \ - src/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Denable-alsa=$(usex alsa) - -Denable-aufile=ON - -Denable-dbus=$(usex dbus) - -Denable-dsound=OFF # Windows - -Denable-floats=OFF # loat instead of double for DSP samples - -Denable-fpe-check=$(usex debug) - -Denable-ipv6=$(usex ipv6) - -Denable-jack=$(usex jack) - -Denable-ladspa=$(usex ladspa) - -Denable-libinstpatch=OFF # https://github.com/swami/libinstpatch - -Denable-midishare=OFF # http://midishare.sourceforge.net/ - -Denable-network=$(usex network) - -Denable-opensles=OFF - -Denable-oboe=OFF # requires OpenSLES and/or AAudio - -Denable-oss=$(usex oss) - -Denable-libsndfile=$(usex sndfile) - -Denable-portaudio=$(usex portaudio) - -Denable-profiling=$(usex debug) - -Denable-pulseaudio=$(usex pulseaudio) - -Denable-pipewire=$(usex pipewire) - -Denable-readline=$(usex readline) - -Denable-sdl2=$(usex sdl) - -Denable-systemd=$(usex systemd) - -Denable-threads=$(usex threads) - -Denable-trap-on-fpe=$(usex debug) - -Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals) - -Denable-waveout=OFF # Windows - -Denable-winmidi=OFF # Windows - $(cmake_use_find_package doc Doxygen) - ) - - if use alsa; then - mycmakeargs+=( -Denable-lash=$(usex lash) ) - else - mycmakeargs+=( -Denable-lash=OFF ) - fi - - if use systemd; then - mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" ) - fi - - cmake-multilib_src_configure -} - -compile_doxygen_doc() { - multilib_is_native_abi && cmake_build doxygen -} - -src_compile() { - cmake-multilib_src_compile - use doc && multilib_foreach_abi compile_doxygen_doc -} - -install_doxygen_doc() { - if multilib_is_native_abi; then - docinto . - dodoc -r "${BUILD_DIR}/doc/api/html" - fi -} - -install_systemd_files() { - if multilib_is_native_abi; then - systemd_dounit "${BUILD_DIR}/fluidsynth.service" - insinto /etc - doins "${BUILD_DIR}/fluidsynth.conf" - fi -} - -multilib_src_test() { - eninja check -} - -src_install() { - cmake-multilib_src_install - - docinto pdf - dodoc doc/*.pdf - - docinto examples - dodoc doc/examples/*.c - - if use doc; then - multilib_foreach_abi install_doxygen_doc - fi - if use systemd; then - multilib_foreach_abi install_systemd_files - - elog "When using fluidsynth as a systemd service, make sure" - elog "to configure your fluidsynth settings globally in " - elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth" - fi -} diff --git a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild index e1cbe51ff8bc..0673aa8f45c4 100644 --- a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1+" SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads" BDEPEND=" diff --git a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.2.ebuild index f49a307d340b..e1cbe51ff8bc 100644 --- a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.4.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1+" SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads" BDEPEND=" diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild index c89a4bf0972a..56367ad31493 100644 --- a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild +++ b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild @@ -16,7 +16,7 @@ IUSE="nls" RDEPEND=" media-libs/alsa-lib - x11-libs/fltk:1" + x11-libs/fltk:1=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" diff --git a/media-sound/gnomad/gnomad-2.9.6-r2.ebuild b/media-sound/gnomad/gnomad-2.9.6-r3.ebuild index 5c7490e2adeb..e1777ee9b71d 100644 --- a/media-sound/gnomad/gnomad-2.9.6-r2.ebuild +++ b/media-sound/gnomad/gnomad-2.9.6-r3.ebuild @@ -23,7 +23,7 @@ RDEPEND=" media-libs/libid3tag:= media-libs/libmtp:= media-libs/libnjb - media-libs/taglib + media-libs/taglib:= >=x11-libs/gtk+-2.24:2 " DEPEND="${RDEPEND}" diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch new file mode 100644 index 000000000000..fd53ea74c4f1 --- /dev/null +++ b/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch @@ -0,0 +1,357 @@ +https://github.com/gogglesmm/gogglesmm/commit/abd6ec6b8270feb1841a97f9be5364541f4a939c.patch +https://github.com/gogglesmm/gogglesmm/commit/9f7110b0950a2862016e18163b9c2737a2a935d6.patch + +diff --git a/src/GMAbout.cpp b/src/GMAbout.cpp +index eb2c565..0b625cb 100644 +--- a/src/GMAbout.cpp ++++ b/src/GMAbout.cpp +@@ -27,7 +27,6 @@ + #endif + #include <FXPNGIcon.h> + #include <sqlite3.h> +-#include <tag.h> + + #define UTF8_COPYRIGHT_SIGN "\xc2\xa9" + +diff --git a/src/GMTag.cpp b/src/GMTag.cpp +index 2add466..a32ce46 100644 +--- a/src/GMTag.cpp ++++ b/src/GMTag.cpp +@@ -26,9 +26,9 @@ + #include "GMTag.h" + #include "GMAudioPlayer.h" + +-/// TagLib +- + ++// taglib Variant enum Type { Bool } conflicts with Xlib ++#undef Bool + #include <fileref.h> + #include <tstring.h> + #include <id3v1tag.h> +@@ -339,6 +339,7 @@ static void gm_strip_tags(TagLib::File * file,FXuint opts) { + /******************************************************************************/ + + GMFileTag::GMFileTag() : ++ fileref(nullptr), + file(nullptr), + tag(nullptr), + mp4(nullptr), +@@ -349,20 +350,35 @@ GMFileTag::GMFileTag() : + } + + GMFileTag::~GMFileTag() { ++#if TAGLIB_VERSION >= TAGVERSION(2,0,0) ++ if (fileref) delete fileref; ++#else + if (file) delete file; ++#endif + } + + + FXbool GMFileTag::open(const FXString & filename,FXuint opts) { +- +- file = TagLib::FileRef::create(filename.text(),(opts&FILETAG_AUDIOPROPERTIES)); +- if (file==nullptr || !file->isValid() || file->tag()==nullptr) { +- if (file) { +- delete file; +- file=nullptr; ++#if TAGLIB_VERSION >= TAGVERSION(2,0,0) ++ fileref = new TagLib::FileRef(filename.text(),(opts&FILETAG_AUDIOPROPERTIES)); ++ file = fileref->file(); ++ if (file==nullptr || !file->isValid() || file->tag()==nullptr) { ++ if (fileref) { ++ delete fileref; ++ fileref=nullptr; ++ } ++ return false; + } +- return false; +- } ++#else ++ file = TagLib::FileRef::create(filename.text(),(opts&FILETAG_AUDIOPROPERTIES)); ++ if (file==nullptr || !file->isValid() || file->tag()==nullptr) { ++ if (file) { ++ delete file; ++ file=nullptr; ++ } ++ return false; ++ } ++#endif + + TagLib::MPEG::File * mpgfile = nullptr; + TagLib::Ogg::Vorbis::File * oggfile = nullptr; +@@ -521,7 +537,11 @@ FXbool GMFileTag::ape_get_field(const FXchar * field,FXStringList & list) const + FXASSERT(field); + FXASSERT(ape); + if (ape->itemListMap().contains(field)) { ++#if TAGLIB_VERSION >= TAGVERSION(2,0,0) ++ const TagLib::StringList fieldlist = ape->itemListMap()[field].values(); ++#else + const TagLib::StringList fieldlist = ape->itemListMap()[field].toStringList(); ++#endif + list.no(fieldlist.size()); + FXint item=0; + for(TagLib::StringList::ConstIterator it = fieldlist.begin(); it != fieldlist.end(); it++) { +@@ -635,16 +655,35 @@ FXbool GMFileTag::id3v2_get_field(const FXchar * field,FXStringList & list) con + void GMFileTag::mp4_update_field(const FXchar * field,const FXString & value) { + FXASSERT(field); + FXASSERT(mp4); ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (!value.empty()) ++ mp4->setItem(field,TagLib::StringList(TagLib::String(value.text(),TagLib::String::UTF8))); ++ else ++ mp4->removeItem(field); ++#else + if (!value.empty()) + mp4->itemListMap().insert(field,TagLib::StringList(TagLib::String(value.text(),TagLib::String::UTF8))); + else + mp4->itemListMap().erase(field); ++#endif + } + + + void GMFileTag::mp4_update_field(const FXchar * field,const FXStringList & list) { + FXASSERT(field); + FXASSERT(mp4); ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (list.no()==0) { ++ mp4->removeItem(field); ++ } ++ else { ++ TagLib::StringList values; ++ for (FXint i=0;i<list.no();i++) { ++ values.append(TagLib::String(list[i].text(),TagLib::String::UTF8)); ++ } ++ mp4->setItem(field,values); ++ } ++#else + if (list.no()==0) { + mp4->itemListMap().erase(field); + } +@@ -655,12 +694,24 @@ void GMFileTag::mp4_update_field(const FXchar * field,const FXStringList & list) + } + mp4->itemListMap().insert(field,values); + } ++#endif + } + + + FXbool GMFileTag::mp4_get_field(const FXchar * field,FXString & value) const { + FXASSERT(field); + FXASSERT(mp4); ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (mp4->contains(field)) { ++ value=mp4->item(field).toStringList().toString(", ").toCString(true); ++ value.trim(); ++ return !value.empty(); ++ } ++ else { ++ value.clear(); ++ return false; ++ } ++#else + if (mp4->itemListMap().contains(field)) { + value=mp4->itemListMap()[field].toStringList().toString(", ").toCString(true); + value.trim(); +@@ -670,14 +721,20 @@ FXbool GMFileTag::mp4_get_field(const FXchar * field,FXString & value) const { + value.clear(); + return false; + } ++#endif + } + + + FXbool GMFileTag::mp4_get_field(const FXchar * field,FXStringList & list) const{ + FXASSERT(field); + FXASSERT(mp4); ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (mp4->contains(field)) { ++ const TagLib::StringList fieldlist = mp4->item(field).toStringList(); ++#else + if (mp4->itemListMap().contains(field)) { + const TagLib::StringList fieldlist = mp4->itemListMap()[field].toStringList(); ++#endif + list.no(fieldlist.size()); + FXint item=0; + for(TagLib::StringList::ConstIterator it = fieldlist.begin(); it != fieldlist.end(); it++) { +@@ -936,12 +993,21 @@ void GMFileTag::setDiscNumber(FXushort disc) { + else + id3v2_update_field("TPOS",FXString::null); + } ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (mp4) { ++ if (disc>0) ++ mp4->setItem("disk",TagLib::MP4::Item(disc,0)); ++ else ++ mp4->removeItem("disk"); ++ } ++#else + if (mp4) { + if (disc>0) + mp4->itemListMap().insert("disk",TagLib::MP4::Item(disc,0)); + else + mp4->itemListMap().erase("disk"); + } ++#endif + } + + +@@ -959,9 +1025,15 @@ FXushort GMFileTag::getDiscNumber() const{ + else if (id3v2 && id3v2_get_field("TPOS",disc)) { + return string_to_disc_number(disc); + } ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ else if (mp4 && mp4->contains("disk")) { ++ return FXMIN(mp4->item("disk").toIntPair().first,0xFFFF); ++ } ++#else + else if (mp4 && mp4->itemListMap().contains("disk")) { + return FXMIN(mp4->itemListMap()["disk"].toIntPair().first,0xFFFF); + } ++#endif + return 0; + } + +@@ -969,7 +1041,11 @@ FXint GMFileTag::getTime() const{ + FXASSERT(file); + TagLib::AudioProperties * properties = file->audioProperties(); + if (properties) ++#if TAGLIB_VERSION >= TAGVERSION(2,0,0) ++ return properties->lengthInSeconds(); ++#else + return properties->length(); ++#endif + else + return 0; + } +@@ -1007,7 +1083,11 @@ FXint GMFileTag::getSampleSize() const{ + FXASSERT(file); + TagLib::FLAC::File * flacfile = dynamic_cast<TagLib::FLAC::File*>(file); + if (flacfile && flacfile->audioProperties()) { ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ return flacfile->audioProperties()->bitsPerSample(); ++#else + return flacfile->audioProperties()->sampleWidth(); ++#endif + } + else + return 0; +@@ -1081,6 +1161,16 @@ GMCover * GMFileTag::getFrontCover() const { + #endif + } + else if (mp4) { /// MP4 ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (mp4->contains("covr")) { ++ TagLib::MP4::CoverArtList coverlist = mp4->item("covr").toCoverArtList(); ++ for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) { ++ if (it->data().size()) ++ return new GMCover(it->data().data(),it->data().size()); ++ } ++ } ++ } ++#else + if (mp4->itemListMap().contains("covr")) { + TagLib::MP4::CoverArtList coverlist = mp4->itemListMap()["covr"].toCoverArtList(); + for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) { +@@ -1089,6 +1179,7 @@ GMCover * GMFileTag::getFrontCover() const { + } + } + } ++#endif + return nullptr; + } + +@@ -1134,6 +1225,15 @@ FXint GMFileTag::getCovers(GMCoverList & covers) const { + } + } + else if (mp4) { ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (mp4->contains("covr")) { ++ TagLib::MP4::CoverArtList coverlist = mp4->item("covr").toCoverArtList(); ++ for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) { ++ if (it->data().size()) ++ covers.append(new GMCover(it->data().data(),it->data().size(),0)); ++ } ++ } ++#else + if (mp4->itemListMap().contains("covr")) { + TagLib::MP4::CoverArtList coverlist = mp4->itemListMap()["covr"].toCoverArtList(); + for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) { +@@ -1141,6 +1241,7 @@ FXint GMFileTag::getCovers(GMCoverList & covers) const { + covers.append(new GMCover(it->data().data(),it->data().size(),0)); + } + } ++#endif + } + return covers.no(); + } +@@ -1191,7 +1292,7 @@ void GMFileTag::replaceCover(GMCover*cover,FXuint mode){ + } + else if (mp4) { + // mp4 has no type information so we erase all +- mp4->itemListMap().erase("covr"); ++ clearCovers(); + } + } + else { // COVER_REPLACE_ALL +@@ -1216,7 +1317,11 @@ void GMFileTag::clearCovers() { + #endif + } + else if (mp4) { +- mp4->itemListMap().erase("covr"); ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ mp4->removeItem("covr"); ++#else ++ mp4->itemListMap().erase("covr"); ++#endif + } + } + +@@ -1303,6 +1408,18 @@ void GMFileTag::appendCover(GMCover* cover){ + case FILETYPE_GIF: format = TagLib::MP4::CoverArt::GIF; break; + default: return; break; + } ++#if TAGLIB_VERSION >= TAGVERSION(1,12,0) ++ if (!mp4->contains("covr")) { ++ TagLib::MP4::CoverArtList list; ++ list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size))); ++ mp4->setItem("covr",list); ++ } ++ else { ++ TagLib::MP4::CoverArtList list = mp4->item("covr").toCoverArtList(); ++ list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size))); ++ mp4->setItem("covr",list); ++ } ++#else + if (!mp4->itemListMap().contains("covr")) { + TagLib::MP4::CoverArtList list; + list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size))); +@@ -1313,6 +1430,7 @@ void GMFileTag::appendCover(GMCover* cover){ + list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size))); + mp4->itemListMap().insert("covr",list); + } ++#endif + } + } + +diff --git a/src/GMTag.h b/src/GMTag.h +index 26b76f2..1c5fd77 100644 +--- a/src/GMTag.h ++++ b/src/GMTag.h +@@ -21,6 +21,7 @@ + + + namespace TagLib { ++ class FileRef; + class File; + class Tag; + namespace MP4 { +@@ -54,6 +55,7 @@ typedef FXArray<GMCover*> GMCoverList; + + class GMFileTag { + protected: ++ TagLib::FileRef * fileref; + TagLib::File * file; + TagLib::Tag * tag; + TagLib::MP4::Tag * mp4; diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild new file mode 100644 index 000000000000..37c4e7576662 --- /dev/null +++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Fast and light music player" +HOMEPAGE="https://gogglesmm.github.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+aac +dbus +flac +mad nls +ogg +opengl +opus +pulseaudio +vorbis" + +RDEPEND=" + dev-db/sqlite + dev-libs/expat + dev-libs/libgcrypt:= + media-libs/taglib:= + x11-libs/fox:1.7 + x11-libs/libICE + x11-libs/libSM + aac? ( media-libs/faad2 ) + dbus? ( sys-apps/dbus ) + flac? ( media-libs/flac:= ) + mad? ( media-libs/libmad ) + ogg? ( media-libs/libogg ) + opengl? ( + media-libs/libepoxy + virtual/glu + ) + opus? ( media-libs/opus ) + pulseaudio? ( media-libs/libpulse ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch + "${FILESDIR}"/"${P}"-fix-build-taglib2.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_DBUS="$(usex dbus)" + -DWITH_NLS="$(usex nls)" + -DWITH_OPENGL="$(usex opengl)" + -DWITH_CFOX=OFF + ) + cmake_src_configure +} diff --git a/media-sound/helvum/helvum-0.5.1-r4.ebuild b/media-sound/helvum/helvum-0.5.1-r4.ebuild index f077c8c2cf6c..58fdd40f1a5b 100644 --- a/media-sound/helvum/helvum-0.5.1-r4.ebuild +++ b/media-sound/helvum/helvum-0.5.1-r4.ebuild @@ -127,7 +127,7 @@ LICENSE+=" Unicode-DFS-2016 " SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" # Clang needed for bindgen BDEPEND=" diff --git a/media-sound/horgand/files/horgand-1.14-fltk1.4.patch b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch new file mode 100644 index 000000000000..df106161e1fb --- /dev/null +++ b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/src/organ.C ++++ b/src/organ.C +@@ -31 +31 @@ +-#include <Fl/Fl_Preferences.H> ++#include <FL/Fl_Preferences.H> diff --git a/media-sound/horgand/horgand-1.14-r2.ebuild b/media-sound/horgand/horgand-1.14-r3.ebuild index 6506e49d4be4..b4bd54ce0304 100644 --- a/media-sound/horgand/horgand-1.14-r2.ebuild +++ b/media-sound/horgand/horgand-1.14-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,13 +18,16 @@ RDEPEND=" media-libs/libsndfile media-sound/alsa-utils virtual/jack - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/libXpm " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) +PATCHES=( + "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) src_compile() { emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \ diff --git a/media-sound/id3ted/files/id3ted-1.0-fix-build-taglib2.patch b/media-sound/id3ted/files/id3ted-1.0-fix-build-taglib2.patch new file mode 100644 index 000000000000..46437c6d10e5 --- /dev/null +++ b/media-sound/id3ted/files/id3ted-1.0-fix-build-taglib2.patch @@ -0,0 +1,47 @@ +no upstream PR as repo is archive +--- a/fileio.cpp ++++ b/fileio.cpp +@@ -60,11 +60,11 @@ bool FileIO::isRegular(const char *path) { + + + bool FileIO::isReadable(const char *path) { +- return TagLib::File::isReadable(path); ++ return !access(path, R_OK); + } + + bool FileIO::isWritable(const char *path) { +- return TagLib::File::isWritable(path); ++ return !access(path, W_OK); + } + + string FileIO::sizeHumanReadable(unsigned long size) { +--- a/id3ted.h ++++ b/id3ted.h +@@ -30,7 +30,6 @@ + + using namespace std; + using namespace TagLib; +-using TagLib::uint; + + void warn(const char* fmt, ...); + +--- a/mp3file.cpp ++++ b/mp3file.cpp +@@ -343,7 +343,7 @@ bool MP3File::save() { + if (tags & 2 && id3v2Tag != NULL && id3v2Tag->isEmpty()) + strip(2); + +- return file.save(tags, false); ++ return file.save(); + } + + bool MP3File::strip(int tags) { +@@ -391,7 +391,7 @@ void MP3File::showInfo() const { + break; + } + +- int length = properties->length(); ++ int length = properties->lengthInSeconds(); + printf("MPEG %s Layer %d %s\n", version, properties->layer(), channelMode); + printf("bitrate: %d kBit/s, sample rate: %d Hz, length: %02d:%02d:%02d\n", + properties->bitrate(), properties->sampleRate(), diff --git a/media-sound/id3ted/id3ted-1.0-r1.ebuild b/media-sound/id3ted/id3ted-1.0-r1.ebuild new file mode 100644 index 000000000000..6c16c266036b --- /dev/null +++ b/media-sound/id3ted/id3ted-1.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A Command-line ID3 Tag Editor" +HOMEPAGE="https://github.com/xyb3rt/id3ted" +SRC_URI="https://github.com/xyb3rt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/taglib:= + sys-apps/file" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-outofbounds.patch" + "${FILESDIR}/${P}-fix-build-taglib2.patch" +) + +pkg_setup() { + export PREFIX="/usr" + tc-export CXX +} diff --git a/media-sound/lmms/lmms-1.2.2-r2.ebuild b/media-sound/lmms/lmms-1.2.2-r3.ebuild index 775db25c1d67..3623cf5241fc 100644 --- a/media-sound/lmms/lmms-1.2.2-r2.ebuild +++ b/media-sound/lmms/lmms-1.2.2-r3.ebuild @@ -38,7 +38,7 @@ COMMON_DEPEND=" >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 + x11-libs/fltk:1= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild index f003402e4f33..8e4208f20432 100644 --- a/media-sound/lmms/lmms-9999.ebuild +++ b/media-sound/lmms/lmms-9999.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=" >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 + x11-libs/fltk:1= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest index 150f92d1a1e0..3fefeffc19bf 100644 --- a/media-sound/mac/Manifest +++ b/media-sound/mac/Manifest @@ -1,3 +1,3 @@ -DIST mac-10.76.zip 1674982 BLAKE2B 8e32b6804df1c7f551100a5e05458cf0e88c48cf5d81875cd585780102b600738b7599a0400dc4a5387089e543d0a2cc66999f64274232f45e42addde5870a48 SHA512 1bcd6c41856166f4e0d2b7305aad66255a75f42fbbac902706dd236a619725abb9ffc6634274142c7969f9b344d2ebcf3bb963ca7d6943f4ede6151d77518e55 DIST mac-10.82.zip 1675437 BLAKE2B 1915a8154873d972998f11b0f6b233150ede890bbe82b124f9e5c90caad716971c63069724fe5b38fd410c1f2e6a8e96156ed608b3a00839b6741a94c59a95b8 SHA512 9d29b52112a6511dda04bd49d365bd564cba63923abe4bfa72d5af292e01ce3fe330ad71833113692e7e675d44a4bc8edd43e8eab4aeb4c3178debbdb2750a88 +DIST mac-10.87.zip 1673921 BLAKE2B 4a4d1946bcb33f742b75f1ad1d21170309ff82016eaa82104035d544c6916b5a0fb8ceff827bafb782aaea07d77c83b94c080426e5ed458e3e9d53f46a584354 SHA512 2e0ef696302d8a066e57a47df9578a922fa07f0b8a916d0bb041b4f558e4824e0cc4d2c3fa5bda2ecf22c5380780301f03af1cb4b01ba5b525b6c2616f9a0197 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0 diff --git a/media-sound/mac/mac-10.82.ebuild b/media-sound/mac/mac-10.82.ebuild index 5ac419cab724..5752c0372ccc 100644 --- a/media-sound/mac/mac-10.82.ebuild +++ b/media-sound/mac/mac-10.82.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip" LICENSE="BSD" SLOT="0/11" -KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86" BDEPEND="app-arch/unzip" diff --git a/media-sound/mac/mac-10.76.ebuild b/media-sound/mac/mac-10.87.ebuild index abc593097c30..5f6629969376 100644 --- a/media-sound/mac/mac-10.76.ebuild +++ b/media-sound/mac/mac-10.87.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ HOMEPAGE="https://www.monkeysaudio.com" SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip" LICENSE="BSD" -SLOT="0/10" -KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86" +SLOT="0/11" +KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" BDEPEND="app-arch/unzip" diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest index dc9b8dfa718b..7f53179737b4 100644 --- a/media-sound/mikmod/Manifest +++ b/media-sound/mikmod/Manifest @@ -1 +1,2 @@ DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620 +DIST mikmod-3.2.9.tar.gz 277032 BLAKE2B df903946538891622208b41e8ae6287a33eb79c740912c7e046113e1fd053bf6a5025b3b7d8b8a5494e477cf822dc3ccfde9a93b73cc8dbc9db52f4dff45e655 SHA512 0740f0dcc05f9d8ce9697e5a141c1525fd5c6baa7102bfb3b9fcb16f1257f0829e06ee4e8638af82230e34035e87bb24ebc05728d5cb0ae33ddb7695df242c32 diff --git a/media-sound/mikmod/mikmod-3.2.9.ebuild b/media-sound/mikmod/mikmod-3.2.9.ebuild new file mode 100644 index 000000000000..dc51cc05200a --- /dev/null +++ b/media-sound/mikmod/mikmod-3.2.9.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Console MOD-Player based on libmikmod" +HOMEPAGE="https://mikmod.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/mikmod/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=" + >=media-libs/libmikmod-3.3 + >=sys-libs/ncurses-5.7-r7:= +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS NEWS README ) diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest index 2ddaf572863b..3e4d7950740a 100644 --- a/media-sound/milkytracker/Manifest +++ b/media-sound/milkytracker/Manifest @@ -1,2 +1 @@ -DIST milkytracker-1.04.00.tar.gz 3756275 BLAKE2B da4885592ae4aae87080c8979f92a77b05cb3cc4594fe328346deef949375ad3abb1910f5cc834f41b6d7278312deff45550300b96e3afbd89eedebe1fadd854 SHA512 5a41fa07d51880e220f15ff3f50e73b999931c875d31e627233669f5a07dfd38621478b8ec27b2242aa4ae6143a0d2ad51627a366fd366256331b71c47ad25da DIST milkytracker-1.05.01.tar.gz 3787738 BLAKE2B 447d0fd939d6def41223f4d65afedbf4f98e49dde77d0f94e959d0444f3c133a376613c8dfcc0b8b76184fa1db4a1317c04078512bbc9984149fd6267ef8641f SHA512 a5782c0cade594089c98987d2673988a62985e68b8727459f2f799ad5a76d7706cb2e9d55c21cea800587a19c7b84d3bbb4b2f99cd04bf22ff27e58a8ca16663 diff --git a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch deleted file mode 100644 index 977264a8f37b..000000000000 --- a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/910283 -https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d -https://github.com/milkytracker/MilkyTracker/issues/316 -https://github.com/milkytracker/MilkyTracker/issues/318 - -From 7e9171488fc47ad2de646a4536794fda21e7303d Mon Sep 17 00:00:00 2001 -From: Leon van Kammen <leonvankammen@gmail.com> -Date: Thu, 6 Jul 2023 14:38:20 +0200 -Subject: [PATCH] possible bugfix: return nPorts - ---- a/src/midi/posix/MidiReceiver_pthread.cpp -+++ b/src/midi/posix/MidiReceiver_pthread.cpp -@@ -145,4 +145,5 @@ unsigned int MidiReceiver::countPorts() - } - delete midiin; - midiin = NULL; --} -\ No newline at end of file -+ return nPorts; -+} diff --git a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild deleted file mode 100644 index 78160baf76fe..000000000000 --- a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop flag-o-matic xdg - -DESCRIPTION="FastTracker 2 inspired music tracker" -HOMEPAGE="https://milkytracker.titandemo.org/" -SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/MilkyTracker-${PV}" - -LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="alsa jack" - -RDEPEND=" - dev-libs/zziplib - media-libs/libsdl2[X] - sys-libs/zlib - alsa? ( - media-libs/alsa-lib - media-libs/rtmidi - ) - jack? ( virtual/jack )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-wreturn-type.patch - "${FILESDIR}"/${PN}-1.04.00-cxx-std.patch -) - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/860870 - # https://github.com/milkytracker/MilkyTracker/issues/340 - filter-lto - - local mycmakeargs=( - $(cmake_use_find_package alsa ALSA) - $(cmake_use_find_package jack JACK) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - newicon resources/pictures/carton.png ${PN}.png - make_desktop_entry ${PN} MilkyTracker ${PN} \ - "AudioVideo;Audio;Sequencer" -} diff --git a/media-sound/milkytracker/milkytracker-1.05.01.ebuild b/media-sound/milkytracker/milkytracker-1.05.01.ebuild index bb25b1831691..db35ec056cf6 100644 --- a/media-sound/milkytracker/milkytracker-1.05.01.ebuild +++ b/media-sound/milkytracker/milkytracker-1.05.01.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/MilkyTracker-${PV}" LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="alsa jack" RDEPEND=" diff --git a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch new file mode 100644 index 000000000000..1a00a455e6ea --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch @@ -0,0 +1,14 @@ +https://github.com/mixxxdj/mixxx/commit/1dd2ae25e065401371800ad76cb813021702a9e1.patch +diff --git a/src/track/taglib/trackmetadata_ape.cpp b/src/track/taglib/trackmetadata_ape.cpp +index c370c6a7f93..b4af3b5afbc 100644 +--- a/src/track/taglib/trackmetadata_ape.cpp ++++ b/src/track/taglib/trackmetadata_ape.cpp +@@ -59,7 +59,7 @@ bool importCoverImageFromTag(QImage* pCoverArt, const TagLib::APE::Tag& tag) { + if (tag.itemListMap().contains("COVER ART (FRONT)")) { + const TagLib::ByteVector nullStringTerminator(1, 0); + TagLib::ByteVector item = +- tag.itemListMap()["COVER ART (FRONT)"].value(); ++ tag.itemListMap()["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // skip the filename + if (++pos > 0) { + const TagLib::ByteVector data(item.mid(pos)); diff --git a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild b/media-sound/mixxx/mixxx-2.3.6-r1.ebuild new file mode 100644 index 000000000000..d1cbb797177d --- /dev/null +++ b/media-sound/mixxx/mixxx-2.3.6-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg udev + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="Advanced Digital DJ tool based on Qt" +HOMEPAGE="https://mixxx.org/" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + if [[ ${PV} == ?.?.9999 ]] ; then + EGIT_BRANCH=${PV%.9999} + fi + EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git" +else + SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-release-${PV}" + KEYWORDS="~amd64 ~arm64 ~x86" +fi +LICENSE="GPL-2" +SLOT="0" +IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack" + +RDEPEND=" + dev-db/sqlite + dev-libs/glib:2 + dev-libs/protobuf:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtscript:5[scripttools] + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/chromaprint + media-libs/flac:= + media-libs/libebur128 + media-libs/libid3tag:= + media-libs/libogg + media-libs/libsndfile + media-libs/libsoundtouch + media-libs/libvorbis + media-libs/portaudio[alsa] + media-libs/portmidi + media-libs/rubberband + media-libs/taglib:= + media-libs/vamp-plugin-sdk + media-sound/lame + sci-libs/fftw:3.0= + sys-power/upower + virtual/glu + virtual/libusb:1 + virtual/opengl + virtual/udev + x11-libs/libX11 + aac? ( + media-libs/faad2 + media-libs/libmp4v2 + ) + ffmpeg? ( media-video/ffmpeg:= ) + hid? ( dev-libs/hidapi ) + keyfinder? ( media-libs/libkeyfinder ) + lv2? ( media-libs/lilv ) + modplug? ( media-libs/libmodplug ) + mp3? ( media-libs/libmad ) + mp4? ( media-libs/libmp4v2:= ) + opus? ( media-libs/opusfile ) + qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) + wavpack? ( media-sound/wavpack ) +" + # libshout-idjc-2.4.6 is required. Please check and re-add once it's + # available in ::gentoo + # Meanwhile we're using the bundled libshout-idjc. See bug #775443 + #shout? ( >=media-libs/libshout-idjc-2.4.6 ) + +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 +" +BDEPEND=" + dev-qt/qttest:5 + dev-qt/qtxmlpatterns:5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.0-docs.patch + "${FILESDIR}"/${PN}-2.3.0-cmake.patch + "${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch + "${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch +) + +PLOCALES=" + ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW +" + +mixxx_set_globals() { + local lang + local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV}" + for lang in ${PLOCALES} ; do + SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )" + IUSE+=" l10n_${lang/ en/ +en}" + done + SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf" +} +mixxx_set_globals + +src_configure() { + local mycmakeargs=( + # Not available on Linux yet and requires additional deps + -DBATTERY="off" + -DBROADCAST="$(usex shout on off)" + -DCCACHE_SUPPORT="off" + -DFAAD="$(usex aac on off)" + -DFFMPEG="$(usex ffmpeg on off)" + -DHID="$(usex hid on off)" + -DINSTALL_USER_UDEV_RULES=OFF + -DKEYFINDER="$(usex keyfinder on off)" + -DLILV="$(usex lv2 on off)" + -DMAD="$(usex mp3 on off)" + -DMODPLUG="$(usex modplug on off)" + -DOPTIMIZE="off" + -DOPUS="$(usex opus on off)" + -DQTKEYCHAIN="$(usex qtkeychain on off)" + -DVINYLCONTROL="on" + -DWAVPACK="$(usex wavpack on off)" + ) + + if [[ ${PV} == 9999 ]] ; then + mycmakeargs+=( + -DENGINEPRIME="OFF" + ) + fi + cmake_src_configure +} + +src_install() { + cmake_src_install + udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules + dodoc README.md CHANGELOG.md + local locale + for locale in ${PLOCALES} ; do + if use l10n_${locale} ; then + dodoc "${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf + fi + done +} + +pkg_postinst() { + xdg_pkg_postinst + udev_reload +} + +pkg_postrm() { + xdg_pkg_postrm + udev_reload +} diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild index 55d859df3021..442ba0752f5f 100644 --- a/media-sound/mixxx/mixxx-2.3.9999.ebuild +++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -49,7 +49,7 @@ RDEPEND=" media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband - media-libs/taglib + media-libs/taglib:= media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= @@ -90,6 +90,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9999-docs.patch + "${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch ) PLOCALES=" diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index 0447de377599..7f200f135d0b 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,7 +50,7 @@ RDEPEND=" media-libs/portaudio media-libs/portmidi media-libs/rubberband - media-libs/taglib + media-libs/taglib:= media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower diff --git a/media-sound/moc/moc-2.6_alpha3-r6.ebuild b/media-sound/moc/moc-2.6_alpha3-r7.ebuild index 0a24feba0780..e92cc4eb96e2 100644 --- a/media-sound/moc/moc-2.6_alpha3-r6.ebuild +++ b/media-sound/moc/moc-2.6_alpha3-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,7 +39,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.7 ) musepack? ( media-sound/musepack-tools - >=media-libs/taglib-1.5 + media-libs/taglib:= ) sid? ( >=media-libs/libsidplay-2.1.1 ) sndfile? ( >=media-libs/libsndfile-1.0.0 ) diff --git a/media-sound/mp3c/files/mp3c-c23.patch b/media-sound/mp3c/files/mp3c-c23.patch new file mode 100644 index 000000000000..14c2de0f16b0 --- /dev/null +++ b/media-sound/mp3c/files/mp3c-c23.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/899854 +also, feature-macro'd glibc functions +--- a/configure.ac 2025-01-05 00:30:25.475280699 +0400 ++++ b/configure.ac 2025-01-05 00:30:38.800207692 +0400 +@@ -6,7 +6,8 @@ + + AM_INIT_AUTOMAKE ++AC_USE_SYSTEM_EXTENSIONS + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION ++AM_GNU_GETTEXT_VERSION(0.21) + AM_ICONV + + AC_PROG_CC +Bad definition, fails with C23 +https://bugs.gentoo.org/945206 +--- a/src/keys.c 2025-01-05 00:39:12.053395586 +0400 ++++ b/src/keys.c 2025-01-05 00:39:42.420229207 +0400 +@@ -76,7 +76,7 @@ + extern int build_data_tree(char *cddb_server, char *local_cddb_db, + song_typ **ret_tree, BOOL force_sampler); + extern int cddb_internet_lookup (char *addr, char *cddb_path, BOOL force); +-extern void option_menu(); ++extern void option_menu(WINDOW *win); + extern int output_batch(song_typ *anchor, char *filenm, BOOL ask_overwrite); + extern void calc_tot_frm(); + extern int add_to_m3u(song_typ *song); diff --git a/media-sound/mp3c/mp3c-0.31-r2.ebuild b/media-sound/mp3c/mp3c-0.31-r2.ebuild new file mode 100644 index 000000000000..8de1f7276435 --- /dev/null +++ b/media-sound/mp3c/mp3c-0.31-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs autotools + +DESCRIPTION="console based mp3 ripper, with cddb support" +HOMEPAGE="http://wspse.de/WSPse/Linux-MP3c.php3" +SRC_URI="ftp://ftp.wspse.de/pub/linux/wspse/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="mp3 vorbis" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND=" + ${DEPEND} + app-cdr/cdrtools + mp3? ( + media-sound/lame + media-sound/mp3info + ) + vorbis? ( media-sound/vorbis-tools )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-buffer.patch + "${FILESDIR}"/${PN}-c23.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + append-libs $($(tc-getPKG_CONFIG) --libs ncurses) + econf $(use_enable vorbis oggdefaults) +} + +src_install() { + default + dodoc BATCH.README CDDB_HOWTO OTHERS +} diff --git a/media-sound/mp3unicode/files/mp3unicode-1.2.1-fix-build-taglib2.patch b/media-sound/mp3unicode/files/mp3unicode-1.2.1-fix-build-taglib2.patch new file mode 100644 index 000000000000..7223ca4fcc47 --- /dev/null +++ b/media-sound/mp3unicode/files/mp3unicode-1.2.1-fix-build-taglib2.patch @@ -0,0 +1,14 @@ +https://github.com/alonbl/mp3unicode/pull/5.patch +diff --git a/mp3unicode.cpp b/mp3unicode.cpp +index ca25941..7fe6411 100644 +--- a/mp3unicode.cpp ++++ b/mp3unicode.cpp +@@ -192,7 +192,7 @@ protected: + bool + heuristicIsUnicode (TagLib::String string) { + unsigned u0080 = 0; +- for(TagLib::uint i = 0; i < string.size(); i++) { ++ for(unsigned int i = 0; i < string.size(); i++) { + if(string[i] > 255) { + return true; + } diff --git a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild b/media-sound/mp3unicode/mp3unicode-1.2.1-r1.ebuild index 96f8b3a03f3f..799e04108d60 100644 --- a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild +++ b/media-sound/mp3unicode/mp3unicode-1.2.1-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Commandline utility to convert ID3 tags in mp3 files between different encodings" -HOMEPAGE="https://mp3unicode.sourceforge.net - https://github.com/alonbl/mp3unicode" +HOMEPAGE="https://mp3unicode.sourceforge.net" +HOMEPAGE+=" https://github.com/alonbl/mp3unicode" SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=media-libs/taglib-1.4" +RDEPEND="media-libs/taglib:=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fix-build-taglib2.patch ) diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml index 7cf09c18a6d8..8253dae1fb75 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -20,7 +20,6 @@ <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="id3tag">Support for ID3 tags</flag> - <flag name="io-uring">Enable support for io_uring</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="libmpdclient">Enable support for remote mpd databases</flag> diff --git a/media-sound/mup/files/mup-6.9-fltk1.4.patch b/media-sound/mup/files/mup-6.9-fltk1.4.patch new file mode 100644 index 000000000000..f01ebc012e5b --- /dev/null +++ b/media-sound/mup/files/mup-6.9-fltk1.4.patch @@ -0,0 +1,11 @@ +Main.C:751:9: error: 'fl_register_images' was not declared ... +--- a/src/mupmate/Main.C ++++ b/src/mupmate/Main.C +@@ -68,6 +68,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_ask.H> ++#include <FL/Fl_Shared_Image.H> + #include <FL/Fl_Tooltip.H> + + #include "globals.H" diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9-r1.ebuild index 64e1202d55d3..2f88bd35ad21 100644 --- a/media-sound/mup/mup-6.9.ebuild +++ b/media-sound/mup/mup-6.9-r1.ebuild @@ -19,7 +19,7 @@ RDEPEND=" media-libs/libpng:= x11-libs/libX11 x11-libs/libXext - >=x11-libs/fltk-1.3:1 + x11-libs/fltk:1= x11-libs/libXpm " DEPEND=" @@ -35,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.9-build-system.patch + "${FILESDIR}"/${PN}-6.9-fltk1.4.patch ) src_prepare() { diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.3-r1.ebuild index e06a380cc914..a039e65ba556 100644 --- a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild +++ b/media-sound/music-file-organizer/music-file-organizer-1.0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Organizes audio files into directories based on metadata tags" HOMEPAGE="https://git.zx2c4.com/music-file-organizer/about/" @@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" dev-libs/icu:= - media-libs/taglib + media-libs/taglib:= " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch b/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch new file mode 100644 index 000000000000..039f06c925e0 --- /dev/null +++ b/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch @@ -0,0 +1,40 @@ +https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44.patch + +- replace MP4::ItemListMap by TagLib::MP4::ItemMap +- replace MP4::Tag::itemListMap() by MP4::Tag::itemMap() + +diff --git a/src/coverutils.cpp b/src/coverutils.cpp +index ae89330..4ba717e 100644 +--- a/src/coverutils.cpp ++++ b/src/coverutils.cpp +@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, Album *album) { + TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(f.tag()); + if (!tag) return false; + +- TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap(); ++ TagLib::MP4::ItemMap itemsListMap = tag->itemMap(); + TagLib::MP4::Item coverItem = itemsListMap["covr"]; + TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList(); + TagLib::MP4::CoverArt coverArt = coverArtList.front(); +diff --git a/src/tags/mp4utils.h b/src/tags/mp4utils.h +index 138c5b5..6b4bcef 100644 +--- a/src/tags/mp4utils.h ++++ b/src/tags/mp4utils.h +@@ -9,7 +9,7 @@ + namespace Mp4Utils { + + void load(TagLib::MP4::Tag *tag, Tags *tags) { +- const TagLib::MP4::ItemListMap &map = tag->itemListMap(); ++ const TagLib::MP4::ItemMap &map = tag->itemMap(); + + if (map.contains("trkn")) { + TagLib::MP4::Item::IntPair intPair = map["trkn"].toIntPair(); +@@ -31,7 +31,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) { + tags->setComposerSort(v); + } + +- TagLib::MP4::ItemListMap::ConstIterator it = map.find("aART"); ++ TagLib::MP4::ItemMap::ConstIterator it = map.find("aART"); + if (it != map.end()) { + TagLib::StringList sl = it->second.toStringList(); + if (!sl.isEmpty()) diff --git a/media-sound/musique/musique-1.5-r2.ebuild b/media-sound/musique/musique-1.5-r2.ebuild new file mode 100644 index 000000000000..820d66e665bf --- /dev/null +++ b/media-sound/musique/musique-1.5-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg-utils + +DESCRIPTION="Qt music player" +HOMEPAGE="https://flavio.tordini.org/musique" +SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsingleapplication[qt5(+),X] + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + >=media-libs/phonon-4.12.0[qt5(-)] + media-libs/taglib:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( CHANGES TODO ) + +PATCHES=( + "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" + "${FILESDIR}/${P}-fix-build-taglib2.patch" +) + +src_prepare() { + rm -r src/qtsingleapplication || die + default +} + +src_configure() { + eqmake5 ${PN}.pro PREFIX="/usr" +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest index 5d8471f9bfd1..25fe0bca7526 100644 --- a/media-sound/ncmpcpp/Manifest +++ b/media-sound/ncmpcpp/Manifest @@ -1,4 +1,2 @@ DIST ncmpcpp-0.10.1.gh.tar.gz 231032 BLAKE2B 15187d54141803f2db95c807e7ac4a243fd45c436cb75067af7a23a940aa1b244d6fd77246e98c1942f357a5e6018ded3b22af24818722c250492eb3f628bbe6 SHA512 f726f46dfca7dd843144babb6efae534b95d3862bdfba522b5a2dee9eb6605eb22bb93521147d42c9df22316fb4512dd33e33831fe23b1202a302110cf27f54c DIST ncmpcpp-0.10_p20240912.gh.tar.gz 231708 BLAKE2B e695975524b890c04cf05c5648e4805a1e6ae31a4c6402c7c925f56ce08fe8a2eb68e7db9f5a5736859b2d2683e2f3e01b29587b97409280c8ed86cde40bcc9f SHA512 40aa37e10203173b1254150f60f2210c8bcb07ffe1174d0a1bb2d6281dfabae86144523021d70cb911e8e03e572f73c62e8e026dc0a57ae9831849deb146dbe5 -DIST ncmpcpp-0.9.2_p20221231.gh.tar.gz 229678 BLAKE2B edb03554a14b90fbb5a4c99cb46ed73ffd702ff2fa417765d4e4bdaddd6bc40554f18aae10db81af87bbc8c91a4f966785fefdf43cfc97b18fc950c1aa59a370 SHA512 8affb5115c7531ee005544f002068b0b13b6aa41c5e11213ba8c979373a5328f298612903e531b6d384749469d6fa0ddb0d06ac4dac5ab2ca5485c7814db32a3 -DIST ncmpcpp-0.9.2_p20240724.gh.tar.gz 230318 BLAKE2B dd1d464ab8a3e0d10b1a16c6737657190f57710c0e6d6da65270c8f10d1b8abe3877f9bc8b962df1ed82c5246576999f8f6e19523951657699b6b6670cc0e55d SHA512 9d7a52c6dde1459eb2a3606a43826007f43fcdcb01ddd9a1261ed427308dc909d5c73f1f01ffbaebc001b4b99c99ff0746aa869c6c31ae1fcabb70c3abc7f0ed diff --git a/media-sound/ncmpcpp/ncmpcpp-0.10.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.ebuild index a3592dc0fdd5..f0a00dec5740 100644 --- a/media-sound/ncmpcpp/ncmpcpp-0.10.1.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${PV}.tar.gz -> ${ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" IUSE="clock outputs taglib visualizer" RDEPEND=" @@ -24,7 +24,7 @@ RDEPEND=" net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= - taglib? ( media-libs/taglib ) + taglib? ( media-libs/taglib:= ) visualizer? ( sci-libs/fftw:3.0= ) " DEPEND="${RDEPEND}" diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild deleted file mode 100644 index de3e7bbcf1d2..000000000000 --- a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -NCMPCPP_COMMIT="9f44edf0b1d74da7cefbd498341d59bc52f6043f" - -DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc" -HOMEPAGE=" - https://rybczak.net/ncmpcpp/ - https://github.com/ncmpcpp/ncmpcpp/ -" -SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/${NCMPCPP_COMMIT}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" -IUSE="clock outputs taglib visualizer" - -RDEPEND=" - >=media-libs/libmpdclient-2.1 - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - net-misc/curl - sys-libs/ncurses:=[unicode(+)] - sys-libs/readline:= - taglib? ( media-libs/taglib ) - visualizer? ( sci-libs/fftw:3.0= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf - - sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die - sed -i -e 's|COPYING||g' Makefile{.am,.in} || die -} - -src_configure() { - # --with-lto only appends -flto - econf \ - $(use_enable clock) \ - $(use_enable outputs) \ - $(use_enable visualizer) \ - --without-lto \ - $(use_with taglib) \ - $(use_with visualizer fftw) -} - -src_install() { - default - - dodoc doc/{bindings,config} -} - -pkg_postinst() { - echo - elog "Example configuration files have been installed at" - elog "${EROOT}/usr/share/doc/${PF}" - elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings" - elog "as user configuration files." - echo - if use visualizer; then - elog "If you want to use the visualizer, you need mpd with fifo enabled." - echo - fi -} diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20240724.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20240724.ebuild deleted file mode 100644 index 7857b3212b84..000000000000 --- a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20240724.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -NCMPCPP_COMMIT="68daf44032784a5b5b74781a9bf3826053eff4a2" - -DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc" -HOMEPAGE=" - https://rybczak.net/ncmpcpp/ - https://github.com/ncmpcpp/ncmpcpp/ -" -SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/${NCMPCPP_COMMIT}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="clock outputs taglib visualizer" - -RDEPEND=" - >=media-libs/libmpdclient-2.1 - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - net-misc/curl - sys-libs/ncurses:=[unicode(+)] - sys-libs/readline:= - taglib? ( media-libs/taglib ) - visualizer? ( sci-libs/fftw:3.0= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf - - sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die - sed -i -e 's|COPYING||g' Makefile{.am,.in} || die -} - -src_configure() { - local myeconfargs=( - --without-lto # --with-lto only appends -flto. We need more for a dedicated USE flag - $(use_enable clock) - $(use_enable outputs) - $(use_enable visualizer) - $(use_with taglib) - $(use_with visualizer fftw) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc doc/{bindings,config} -} - -pkg_postinst() { - echo - elog "Example configuration files have been installed at" - elog "${EROOT}/usr/share/doc/${PF}" - elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings" - elog "as user configuration files." - echo - if use visualizer; then - elog "If you want to use the visualizer, mpd needs to be built with fifo USE flag." - echo - fi -} diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild index 72c948365b60..6d079cda4c94 100644 --- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild @@ -23,7 +23,7 @@ RDEPEND=" net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= - taglib? ( media-libs/taglib ) + taglib? ( media-libs/taglib:= ) visualizer? ( sci-libs/fftw:3.0= ) " DEPEND="${RDEPEND}" diff --git a/media-sound/nickvision-tagger/Manifest b/media-sound/nickvision-tagger/Manifest index 3ca5a1a8f793..1d90b79bcc3b 100644 --- a/media-sound/nickvision-tagger/Manifest +++ b/media-sound/nickvision-tagger/Manifest @@ -1 +1,46 @@ +DIST ace4896.dbus.services.secrets.1.2.0.nupkg 81196 BLAKE2B ce8edfafb5caa4f55eb2b1b55615ebadd044d7feeae28277cd6b81f1f64901092dcb280d7c1ab9f21ad23ac1378b664a9af45f18ae1f4dae40cfaa3cff7e15d9 SHA512 09f977614489970e543c9fa09c3eda8e120f076f889145c67185d8fff2a42909d944c90970f6be505fcd1c6060ff5e5b4ed80aafbbe8b91f70ef80feed15a8b0 +DIST acoustid.net.1.3.3.nupkg 86076 BLAKE2B 3842e3aab76ba3a61ffa94b055ef945797d5644eccba03a79164db5ef9e5b50eac1c172f93d0d373c75d7e401e74c3fd8c346ed17a5f07c0b1014e9e4e09e6aa SHA512 12edcec94de06918b3f8782c0262963843f2fbdc3678f74e923d01d33f510fa8a9b1e24dbcc5361dee93c3b6d67975cef0e3a91de1afc8772c911b1f3833145b +DIST fuzzysharp.2.0.2.nupkg 153760 BLAKE2B dd6ac1342db3ef80db1604cc5146788f34cff974c349e77cf1f125474f3c058307fcb2f1a9d809061fefd31abf2f4f9f07eb385f8f3830ecbe8d5e067a5b891f SHA512 fc87869a485d5d1dbf63aeac7a96ef783b15667afb106b8a68afcb7ff8df9e1e4b1dcf7a3dbacec4fb01588ec6c551281a2bf833a8b07d373fc5189c5262c49a +DIST gettext.net.1.9.14.nupkg 43260 BLAKE2B 4ff8a0cc003aceed39252eaf09c9bd16d8f291d8baee363b85804bb1d0d6a50f39923dbfb667feab8e7b9c64450fbc1f9a76f31e278dfa70139894a20bb341ce SHA512 41a61edfe82c11c029150748b641e80b59cfc447eb91f0f030ae9e345e54f46fc901946e12684476fa43d024f4145a3a2377861a619587643cb5fa5d5145cb4a +DIST gircore.adw-1.0.5.0.nupkg 490937 BLAKE2B 091998d05bf412ef722e639632cd36a4f1a2df12ee7ff212672975288642094c718b12b30256f362d333f6470f8ae9bb35fd14572a827a3c6d061c90dc8b926c SHA512 b31daba7d7a1c0bfc3911486aad13636e231e98dbc9059cd103b8ab88e89dcb06502df4bd10614187cfdf8d5b0baefa289559d416ea25549d2614b4e39e42dd5 +DIST gircore.cairo-1.0.0.5.0.nupkg 90990 BLAKE2B ab066ae5068c6d0f45c0d8ac9f3da9384ea98559e67a0ef366144ee22dc495d4397ea31fc2a7415120767a83f8bb400b722e9cee402489c43ab35e16f989fe66 SHA512 1142c6ed0a7c5828cb71eb193a7f8ba64bff995ec073d11c5f118371ebce4426f00391788523a042326d598307e14d0e1ef4fe99f9ff1a7d76ba67cc865db0d6 +DIST gircore.freetype2-2.0.0.5.0.nupkg 41222 BLAKE2B 4c1d9aaf59a6b3e5a6322fd3d8a31bf73eaf0d0e17eba956e54c77ee4ae14ffaac303b4a9876b3181622c25c18992e8c76b1fff990689b45b410904fd671ac43 SHA512 fb48da551b2faef1d1ef0de5b70514f1d1a0df16a3e84c6dafb136b8b4a17cb80459d7e6ab2f8da2224d3f01ae7912eac59f67d1c72256a8deb898fb3cf8cd2b +DIST gircore.gdk-4.0.0.5.0.nupkg 331633 BLAKE2B 3696c24a59d216616c7373d3ecc04575a1b6921074054c75ac72642e6154489c753b455e0fdd9c17b57c5d4a2c2528ad1777ee20a22d5110eda8a2a76c3e8145 SHA512 fd41be92a8acb68e2312f3cf446391f7c0abaa73317b4e0da39a688a53bb3704dd07ac6ad8b8dc73710cd742becb2165ebb6b413f457f534f6ccfac4b2f28205 +DIST gircore.gdkpixbuf-2.0.0.5.0.nupkg 114549 BLAKE2B f3e059033cb5524832f2c8df26ba2e127a6b71748d66db239b54f145162cab3be954b3b8aa16e551d4f2b179849ba79d40052fb94b93b24ab7193efe61961016 SHA512 48cba729d3261018fb614c9912ccceb803480e74230cb8e46e5e86cdd01b4d91cab7742656b903ebf78fff88bfa5a87c51c0078ffc85f30569967398a8643866 +DIST gircore.gio-2.0.0.5.0.nupkg 1134424 BLAKE2B 3afe4133758b44e84d048fe9561b831c27f441c30622651f980c4cc414adc9cd04291bd94899115669220c965fed55fa3dd873d675ca731426e4655ccfdf1eb6 SHA512 c44454cc292d4820b011ba099c3308ab09bc4f5e0b7727b37958393e2307e8eaecee16f1ab50d6cc0eb7174015bf3b821787c94a8cba295cf48954e2359e3cfe +DIST gircore.glib-2.0.0.5.0.nupkg 646384 BLAKE2B 987afdb27f567b75806952d69d4543d9f6e38c972869db7873c9d114021d9d25b17471cf3783f5433f9bff0216c570202f6ee358aa8ceb9f10274266c9c28090 SHA512 29c5034207685b7e0992ab17ce1ab58f59d331d5f3722bf5ff6a66ee722102486bf90a4259a97a68a7da762261f5349700b8e286449804d74292d75364efa781 +DIST gircore.gobject-2.0.0.5.0.nupkg 263206 BLAKE2B b5144e9d33f2832892405dd7c3604b5c0b2ff5d55c34e01707b2862832a8c7ef88c0e1a00eac288585cd41cfa4bdf8cfba9a0f1bf5a692caddfb41b7db9cf470 SHA512 1d2a548d4ba9e1d3c8d725a2f190563ad80b9c91139e90c338bd4b58276027f37a82612a3aa86c9f9d4a489b2f5e3fc9a11d9fbcf04584bf4a3a74dfe7ebaeab +DIST gircore.graphene-1.0.0.5.0.nupkg 124251 BLAKE2B 045b9640524197d40eb3738e547b8edb95da485f443b04afbd1e9c62f2bbc3cf259c9b55e75e3a177cdf54855d17d656a393908785ae51e6a069368be6dfc262 SHA512 f9d28144b418c13b2ced89f2652e798962f046c8818da02e4256618178b12712f123a0df81408d23e61ab037ed013e50134a3624f6be967a8591232029b96995 +DIST gircore.gsk-4.0.0.5.0.nupkg 126270 BLAKE2B a74de05c124317c5399701370926c43e75c6d0a31c08dca19f8fda716182486c342580a95edae49a1f8229d62603640738aea4e38911ebfd8fbf40e12049f5e2 SHA512 a68d52282dfda23d92a580ca24437c56182e7146c1aa18bbb841f3b80e46e91b74c6251d55f35b7168853013b46d03d0e80987479774e15e82a25aa55103b8c3 +DIST gircore.gtk-4.0.0.5.0.nupkg 1778773 BLAKE2B fb268820a5864fb7814916274aaa5f37e5023b2a2eaf386df8f792f6f1e286191d244681ec07e389ffe6f6c46d13a95a4f7c706bf30c50473134ce5e54f25d53 SHA512 848e081befca4a2cf82a9df5202a345aa30f7a5cf80fd1ea996f843ff8181a6b6f69544e03d99a8896db0b41772e5a19e558b298a209aee2d40c454f1da44771 +DIST gircore.harfbuzz-0.0.0.5.0.nupkg 272515 BLAKE2B 40e7e34975e6cd3aabc1cd2ae639a7d7ec3befc6ea088db6de3a0632f37ecdb11c962f69181c0127412d8422894318b7a4469ec71ca735dde97c3f51ff5804f6 SHA512 c502ada6ec5ccb8a0310c718d4b97c0f97a798a0316b6960ff45f8987628736acd40970275b1b79e2b0155e060adcbb4929c0bbfa388181dfe3c0f27800f8ae6 +DIST gircore.pango-1.0.0.5.0.nupkg 247927 BLAKE2B d96ae4cf986df4f24132abfcd8b961849ed042b0132c2948cd183dc0374a7501a8df8d19481fa6eda97dbf26df8d568276f688922d16a9eceb35110821e22271 SHA512 d37f91acc545c08972401077fc1663566529e80b310a54408582de80c1f00594d1a3e34ddb3c2d86a39511cda26952143f6ccf8889a18df95fad8abea29bd537 +DIST gircore.pangocairo-1.0.0.5.0.nupkg 43696 BLAKE2B 1f891aac1acac73306bd5dea1c021b69de8cdac80b937ee589b74549d8feca5014541dd26021bc24d6195afb7d0d979796e60b6458c5d5556093b3fe41cdc03d SHA512 6e856b68694fe0f0039e46069add53cd195cb8893215016885382ef9c63ec47c1b3ac710c93429c32f7c970f6ee7b2c715632f87b5c5a6433d7611d17cc623f1 +DIST htmlagilitypack.1.11.61.nupkg 1504445 BLAKE2B de7ddaa83e19d1a9a0023937e92fed19df0eaba0c3f1a6c3f06137da9e662904844b7fd2e06243fa4a90a7f5bc631d5d38d756dd7e7d3f433dbe2af385ead835 SHA512 88a88336be25e396de9ca38ee395cf1db3adb2be785336aba06c8c05270a71b0b8ea3a1b39f937e4385fa7716b215b73ad2812f93d9011916719182b4d0c2a97 +DIST markdig.0.33.0.nupkg 889068 BLAKE2B 287ccbbb443f55d19aeb511a1caabf3d93316ea8aec16d66ab7e848b0f5a1e1ee23909df737fcf9cf8785165b919d5099dba94bff4325a30639de50b2e1e9d05 SHA512 7c25e58bc7b35730ca5cacef6a8068cdd5c1f313053f6482d2d3d80f9bf15387a6a14ae317d308d26dc493be57f82df284f4d588a414f6c0ea0c8bd5bec371a6 +DIST metabrainz.common.3.0.0.nupkg 54538 BLAKE2B 326c88b88cb792c8265bb9271762dcbdd5f7d1ed607efa598b100cdb9a1390b3b1fcb377946d701fd70c78619a1778e7dc8772932209439212785440355bd84c SHA512 01350da82a7dc0ada18e726e15dff30e499491c0807a3fcb4cea5247c38a3c24d0afa34751e12b605cbd86143372e86e2f5b997cb08d1f42bb6dbfbcf67ddea3 +DIST metabrainz.common.json.6.0.2.nupkg 64837 BLAKE2B 6bdc60c53835f575001a74dc6fbe0a4e744035a800a5153b0f9960d412910bea891ee69877ad7c9ee0ccb7158363e77684651ecad0080fe5ab971cd375a8c36e SHA512 fa333a0227d1afe406960695b3c8ff8492112dd3a5e58027db63f84dfbd7122756e74af821f506c5137c08e3fa9c363177c3246375ce85acf358d35f961feb94 +DIST metabrainz.musicbrainz.6.1.0.nupkg 306706 BLAKE2B ab2b16ef6c8756f137dd3a27e4af45d20362e809bc1de33818d6bf851d8ddbf0d0f711c37c4404335f17123fe8576a5d200018d9010f55a888fc3f68ac848668 SHA512 b36824dcbe668234e0974464122140717586b6d4ad881bc3e90d3bddca624f7982de3684e65f1571dd6cd3632e3c7edf6ac9de82a9c82b33a95df223541982e3 +DIST metabrainz.musicbrainz.coverart.6.0.0.nupkg 75078 BLAKE2B 840b740d123ce38c2d73e840845e2cc54fac632bad555085690d66691ccb30e13776e515618f81be99ef284dc37330e291d0961d17a2911074b95cc3b0678e64 SHA512 03c80a6479696d93c00f4118de1a72e1e78a6ce1c4061e9c0676601751b4245afc8d15b5f2b7a6394acb14def377b2a3257a38d3d6fccfbd3c0b1058d580792b +DIST meziantou.framework.win32.credentialmanager.1.4.5.nupkg 1079779 BLAKE2B 996677bc17cf4cba75af6b88a5011d544fe946ac8c769c49630aeca99be734b0f3fe31c00823b391db9a8ce52cdfa2b3877bd54115fc6dc69a55e78d264da5e5 SHA512 4eba895ba3ff77d54c805c409188b914ba1b88690aaef2d87f99a4a5407cfc93a6564517b6655b23cae8e542d1eac0a445bbf15decb2499b6cb7a191ea8550cc +DIST microsoft.data.sqlite.core.8.0.0.nupkg 292698 BLAKE2B 94206c69eeb86f61b7e4fdfc109f4ccd6369c808db74ff45a81ed87273146093d533aa5ff7e808c049a9af13d58d983159d507065730b49c283ec348625ae209 SHA512 0d014ed863345a3e2093293e1ab21ecda817cc64ceb0aa531b444494966d7f30161c7cd1f872c3b3f07b401b4f866a941810569f06b4e3296f169fe673cceb1b +DIST microsoft.netcore.targets.5.0.0.nupkg 35893 BLAKE2B 35374033d2637ceedfa9ec41bb48ee777d29ccf5c9ad5a0c85d082f757422a3d3fd3252830e0c817eb01e0299f3b0a9f77b85ee81b968a8000d145992cbb94b2 SHA512 8581e6dc902340efe7c92c5c9751296616045bed8fdc7d5e2d936bf90c603b94e72d2ea1aad7e2e567218d0ce389de393189a1cb65fb20e99c5ad0cfe1fa4c1b +DIST microsoft.win32.systemevents.8.0.0.nupkg 233719 BLAKE2B 7d8cad3d5cad9646167ac7b6c9784e080bbc3033fa010d6ebf795d8c38aa1e8e6c75a612c769137a19dfcbc14c88b4d00e3ce50eff4070ee011ef7f2a9c8ffb4 SHA512 25016c508653fbf463c52d8fc3d2773b7c211c2402c4ea7b4aa987fb29c851d3f80c5e7abbcace2d4d5e061ae290524e8029afbc49a37d7e5186fe06aa4609b2 DIST nickvision-tagger-2022.11.2.tar.gz 2829711 BLAKE2B 308a7f66f4b79d8c01d546760d290b419e1ed901a3c8fff06827577215b363fc41fa5cfa60ef6abb2c04148624f9c63553d3e805b128694153fc11f366f8f103 SHA512 49420109d228c65fb7ff9b65cd1dbb60466840d439b9ca47ee45e3778159f953ffa32b7516146e6ae7b2df7ee8dd87458f780e83379e31978a0d7919fb109fcf +DIST nickvision-tagger-2024.6.0-1.tar.gz 5048019 BLAKE2B 8b580eff40f1ec41615ab4a30ab18fe9cdce492e7a076926283d3d205852361878ef4c0b2b80e0a3f89529e87b129b096c352352ffe5ce0ad862b0a5847723d0 SHA512 97964c8c6a136538340b2245eb03b948c6904e25884d4c8da38dd2f946a2ab68949c71f6bacd51ba5bcb8630f180efc308abef05cc02657743e0fcfdf6584dd3 +DIST nickvision.aura.2023.11.4.nupkg 64979 BLAKE2B 6a8aa02e45ab484ffccfbd6920fabf7e4aa5747d1b8cab2be521d14d9c4f9732be55db8d8ab269a89d4d174aecc7f1b34ac2bcc2eec3c8e5660f186e7f3c351c SHA512 ddf2502d83d4957ef4acecfb472f697360daa487d4c721969e94741bed24087f107478618b717209bd4c35186f0666cffbcf64dc240785dae7b21180dc2b0bcb +DIST octokit.9.0.0.nupkg 683260 BLAKE2B 6326ad613949baa8d79488969dc64921a5168b9667b0044e7935cf64e9b7850a2cb858c38e460a612bdb01187bc5d56c44add96ef580cd9d8b4c7c24c55b2619 SHA512 fc12c80130652c89c4789ff30fe9a0649288aac65ab17b85dd0c7bca6f75d30ff3aca97e933d6aaf062e467ca9774d739a00688d23e832add3c7da048c790ea7 +DIST sixlabors.imagesharp.3.1.4.nupkg 1040025 BLAKE2B 366d203d89cfee8d477d3a05db4109846b87caa7aa9bd58f6175a44b0f1065e14eb6ec70ddaa5f69a9b4bc12b443fedefdb926029481140251eaeb721b04773c SHA512 2a113eb7dbfe18023d054c5b8fbd793499cd512d58aad0e35c5977e795aa8b7cec7a3f164410e23858ccf75b96b7706a2cf0d302955873a2635cc3de4144f93f +DIST sqlitepclraw.bundle_e_sqlcipher.2.1.6.nupkg 35189 BLAKE2B c982242106709361e411df3012efb0f03ca7deab829f32497cf5dc864a7c954500495bedc257baf4c50eda79f1f6f3a711116d3e06d39c41fe53c9713dd6624c SHA512 e048023e511f00823c680a441696e003feeb76a1f673bb28124b999ce437051a1ae472673b89b22d89cbd5dc687fb51472b8bc643e97d2edd86fd33cd36cda19 +DIST sqlitepclraw.core.2.1.6.nupkg 34519 BLAKE2B 8b72e1e2147e11887dad341a643b91304404c391d908a4d0e330b05c2f516c2c95be2d43ff3c99705c0bde59b3670f60729ba178fc767c1775c4ac743e7601e1 SHA512 16bc39cd5325dea37e1564fc328a35966d6d820878290d945dc57496b716d4935b534285989af32fa7bd25ef9a8ac795b63e6a19044d3f84a104d643319473be +DIST sqlitepclraw.lib.e_sqlcipher.2.1.6.nupkg 17929010 BLAKE2B e51b5862ff7ac3920f4ac589d9da03b50efed6782112e5157e92ba0fd252db1b457b3ce5adc9163a7f4b6f77a7f5401acec45403c55088a14c1fc2d9039a10fa SHA512 0772e6626ab9b6c911eb86f4b54e2b5114a47650e40b7198094fa517dafa6dc2d17f15698e9df27311379162c880fa1ede53e62161ee1e9f6ea99b63df987449 +DIST sqlitepclraw.provider.e_sqlcipher.2.1.6.nupkg 59200 BLAKE2B 152f8fe2373a37046333be2ab92252b5efb3de8bbc75f38cfdbd3172c8ac774c3d47de2e2d8b5d0516d04373b46f2ee45df06a519d7384754f1865bac9a6699b SHA512 b8eba767cc1376d2db0997d78a47f93108be4dc9305cfed5abc8819ce27ad5da80ea538e06056540c7c3303e54ee1fcccfa9763981b7da20787fe0d621e9e4d3 +DIST system.drawing.common.8.0.0.nupkg 1566453 BLAKE2B 1d1274beeb95cf93fa3103b3e03bdd6cb5efa81a76740b6e25f29bdcf0e8e01e978dcf0a0289ae4d362b0744623cd09dd0fd272bada304f4aa3aa93995507c79 SHA512 40a16c9c5dd59148051bd55a2355339343186ec188bcb8e9ea5abe0dc6035106e7d745323cc4d492750e791c41397c53616b553d79b8d5e5fc56dff3345ed533 +DIST system.io.pipelines.6.0.0.nupkg 221298 BLAKE2B 344160cc3e08c0a9004eac9672b89d8aa9fc726a0dbcb2aecd677f995157f90354d3c704862422bdf8a0195918a7411b6ad9315c2f68b01c0c24ca666f4dee53 SHA512 c5983b4510bc8ae4116133ffb9b280fe61d99d47ef52dd78e5bfd03e090901896d5d5fd738dae57006b971840a4d9422bded33ddefa5e927d75d309ef1f70dea +DIST system.memory.4.5.3.nupkg 154054 BLAKE2B 0f75d5365d96b42949e53ae9498affce97ba074d6f404d30bec043e5def8cc39af05ccedffc7e9b13af4200336a9737cf44c85aa2d58069a64b1dc80537a6eac SHA512 70fce15a52cc76aacbae05c8e89e2e398d1d32903f63f640a7dd4a3e5747f2c7a887d4bfd22f2a2e40274906cf91648dfd169734fb7c74eb9b4f72614084e1db +DIST system.memory.4.5.5.nupkg 208978 BLAKE2B 487049b1ffd622868d4aa84cc14f13127641c56937826c11d83851b7032ea248ccf8555f48aca93acc4891ac99ce2178ede50bf13ccbd70ba6004226fb583275 SHA512 e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc +DIST system.text.encoding.codepages.8.0.0.nupkg 4260927 BLAKE2B a31aecd7246d821bec0b0f793c7076210132c2f9433265ec2059b8059d574a89e6167dc1154c645559ab0115e4abc43305518e0d62868640d8651009c84fec24 SHA512 77dadf6b1a73eeefb50507a6d76f5e3a20e0ae7d3f550c349265ae4e0d55f0ae4f0ef1b41be08dd810798a8e01dbba74e2caac746b5158b8e23d722523d473ed +DIST tmds.dbus.0.15.0.nupkg 192025 BLAKE2B f3aeac9fe9d6ebc84f31d5c35ac226d1eb790cee3c16a4946ea4f29026a4a472d18b1f93bfdf7796922f359d2aab8b25fceb808a00d6ac0ede46620af8dd6863 SHA512 6384602b2691a1ded0cad96f38b2a9bab09d5993fffa28c5904ac355643732ba71bf5a11f07102390dcd2936044e7b8187d81fecbc85504dbd31cfe5191e065a +DIST tmds.dbus.protocol.0.15.0.nupkg 215793 BLAKE2B 18608e7a9998e2ea89e6d725404c51fffaf1044ea03706396d58799c27839bf419f535b531c4f4342d14e71557c4628e5e1ed0c96088ab28188e732e391cc663 SHA512 45958a88536d1daa769934986b3ac514cdc1104a936bc404dbdec550c958847e7408af621350c09fa51bc4b837fb88471ec6e6056c4aaa2cebf30f044cd834e9 +DIST ude.netstandard.1.2.0.nupkg 389990 BLAKE2B 49f010bfea3fa3ff6a02b12dc9c7d40806324915a8ad2617233332b703ef6fa695ba0e5ddab22995ba7a935a5cfefe8499fc3651890804d86f4972ba3173dda3 SHA512 29c5e5a43cd2a0a9dc770ac3ec9976c5ef922622d114bb12cfde950f58d45fbd385e013d170df6fa2d45f9c56d29738bb4240b4f1c3a0e3908d9f99ff938c3c0 +DIST z440.atl.core.5.25.0.nupkg 746658 BLAKE2B 70d322e7800267e376e75fe9bf90c179faa7ff66a61cfb2143272a33b0d0ff5eeec7ae4c9f34c30718012a157c1459b150b563d2f25e9ba2343651fb65431e99 SHA512 98395272ddabd79c26fe45ec5c90519ebe00eba7d5fd0d9d206325b6d4f461e22259eed2cb8f5806779c43085662372396a324c83de15ebf0023030192363bfb diff --git a/media-sound/nickvision-tagger/files/nickvision-tagger-2024.6.0-csproj-net9.patch b/media-sound/nickvision-tagger/files/nickvision-tagger-2024.6.0-csproj-net9.patch new file mode 100644 index 000000000000..6c262b89e944 --- /dev/null +++ b/media-sound/nickvision-tagger/files/nickvision-tagger-2024.6.0-csproj-net9.patch @@ -0,0 +1,22 @@ +--- a/NickvisionTagger.GNOME/NickvisionTagger.GNOME.csproj ++++ b/NickvisionTagger.GNOME/NickvisionTagger.GNOME.csproj +@@ -2,7 +2,7 @@ +
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+- <TargetFramework>net8.0</TargetFramework>
++ <TargetFramework>net9.0</TargetFramework>
+ <Nullable>enable</Nullable>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+--- a/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj ++++ b/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj +@@ -1,7 +1,7 @@ + <Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+- <TargetFramework>net8.0</TargetFramework>
++ <TargetFramework>net9.0</TargetFramework>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
diff --git a/media-sound/nickvision-tagger/metadata.xml b/media-sound/nickvision-tagger/metadata.xml index 0f6860fd9fe6..84a2895907b7 100644 --- a/media-sound/nickvision-tagger/metadata.xml +++ b/media-sound/nickvision-tagger/metadata.xml @@ -12,7 +12,7 @@ Convert filenames to tags and tags to filenames with ease. </longdescription> <upstream> - <bugs-to>https://github.com/nlogozzo/NickvisionTagger/issues/</bugs-to> - <remote-id type="github">nlogozzo/NickvisionTagger</remote-id> + <bugs-to>https://github.com/NickvisionApps/Tagger/issues</bugs-to> + <remote-id type="github">NickvisionApps/Tagger</remote-id> </upstream> </pkgmetadata> diff --git a/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2-r1.ebuild index a52cef4d5091..7684a033537f 100644 --- a/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild +++ b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ DEPEND=" dev-libs/jsoncpp:= gui-libs/gtk:4 gui-libs/libadwaita:= - media-libs/taglib:= + <media-libs/taglib-2 " RDEPEND=" ${DEPEND} diff --git a/media-sound/nickvision-tagger/nickvision-tagger-2024.6.0.ebuild b/media-sound/nickvision-tagger/nickvision-tagger-2024.6.0.ebuild new file mode 100644 index 000000000000..590e62c997cf --- /dev/null +++ b/media-sound/nickvision-tagger/nickvision-tagger-2024.6.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOTNET_PKG_COMPAT=9.0 +NUGETS=" +ace4896.dbus.services.secrets@1.2.0 +acoustid.net@1.3.3 +fuzzysharp@2.0.2 +gettext.net@1.9.14 +gircore.adw-1@0.5.0 +gircore.cairo-1.0@0.5.0 +gircore.freetype2-2.0@0.5.0 +gircore.gdk-4.0@0.5.0 +gircore.gdkpixbuf-2.0@0.5.0 +gircore.gio-2.0@0.5.0 +gircore.glib-2.0@0.5.0 +gircore.gobject-2.0@0.5.0 +gircore.graphene-1.0@0.5.0 +gircore.gsk-4.0@0.5.0 +gircore.gtk-4.0@0.5.0 +gircore.harfbuzz-0.0@0.5.0 +gircore.pango-1.0@0.5.0 +gircore.pangocairo-1.0@0.5.0 +htmlagilitypack@1.11.61 +markdig@0.33.0 +metabrainz.common.json@6.0.2 +metabrainz.common@3.0.0 +metabrainz.musicbrainz.coverart@6.0.0 +metabrainz.musicbrainz@6.1.0 +meziantou.framework.win32.credentialmanager@1.4.5 +microsoft.data.sqlite.core@8.0.0 +microsoft.netcore.targets@5.0.0 +microsoft.win32.systemevents@8.0.0 +nickvision.aura@2023.11.4 +octokit@9.0.0 +sixlabors.imagesharp@3.1.4 +sqlitepclraw.bundle_e_sqlcipher@2.1.6 +sqlitepclraw.core@2.1.6 +sqlitepclraw.lib.e_sqlcipher@2.1.6 +sqlitepclraw.provider.e_sqlcipher@2.1.6 +system.drawing.common@8.0.0 +system.io.pipelines@6.0.0 +system.memory@4.5.3 +system.memory@4.5.5 +system.text.encoding.codepages@8.0.0 +tmds.dbus.protocol@0.15.0 +tmds.dbus@0.15.0 +ude.netstandard@1.2.0 +z440.atl.core@5.25.0 +" + +REAL_PN=Tagger +REAL_PV="${PV}-1" +REAL_P=${REAL_PN}-${REAL_PV} + +inherit desktop dotnet-pkg xdg + +DESCRIPTION="An easy-to-use music tag (metadata) editor" +HOMEPAGE="https://github.com/NickvisionApps/Tagger" +SRC_URI="https://github.com/NickvisionApps/${REAL_PN}/archive/${REAL_PV}.tar.gz + -> ${PN}-${REAL_PV}.tar.gz +" +SRC_URI+=" ${NUGET_URIS} " + +S="${WORKDIR}"/${REAL_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-libs/glib + gui-libs/gdk-pixbuf-loader-webp + gui-libs/gtk:4 + gui-libs/libadwaita:= +" +RDEPEND=" + ${DEPEND} + media-libs/chromaprint[tools] + x11-themes/adwaita-icon-theme +" +BDEPEND="dev-util/blueprint-compiler" + +PATCHES=( "${FILESDIR}"/${PN}-2024.6.0-csproj-net9.patch ) + +DOTNET_PKG_BAD_PROJECTS=( NickvisionTagger.WinUI/NickvisionTagger.WinUI.csproj ) +DOTNET_PKG_PROJECTS=( NickvisionTagger.GNOME/NickvisionTagger.GNOME.csproj ) + +src_compile() { + ebegin "Compiling gresources" + glib-compile-resources --sourcedir NickvisionTagger.GNOME/Resources \ + NickvisionTagger.GNOME/Resources/org.nickvision.tagger.gresource.xml + eend ${?} || die "failed to compile gresources" + + dotnet-pkg_src_compile +} + +src_install() { + dotnet-pkg-base_install "/usr/share/org.nickvision.tagger" + dotnet-pkg-base_dolauncher \ + "/usr/share/org.nickvision.tagger/NickvisionTagger.GNOME" \ + org.nickvision.tagger + dosym org.nickvision.tagger /usr/bin/tagger + + sed -e "s:@EXEC@:/usr/bin/org.nickvision.tagger:" \ + -i NickvisionTagger.Shared/Linux/org.nickvision.tagger.desktop.in \ + || die + newmenu "NickvisionTagger.Shared/Linux/org.nickvision.tagger.desktop.in" \ + org.nickvision.tagger.desktop + + insinto /usr/share/icons/hicolor/scalable/apps + doins NickvisionTagger.Shared/Resources/org.nickvision.tagger{,-devel}.svg + + insinto /usr/share/icons/hicolor/symbolic/apps + doins NickvisionTagger.Shared/Resources/org.nickvision.tagger-symbolic.svg + + local DOCS=( CONTRIBUTING.md README.md NickvisionTagger.Shared/Docs/yelp ) + local HTML_DOCS=( NickvisionTagger.Shared/Docs/html/* ) + einstalldocs +} diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest index ff306062fe94..4ec486eca0f2 100644 --- a/media-sound/pavucontrol-qt/Manifest +++ b/media-sound/pavucontrol-qt/Manifest @@ -1,4 +1,2 @@ -DIST pavucontrol-qt-1.3.0.tar.xz 107612 BLAKE2B 1b3453d3622247adfbc69cc76cc267567bd7d6d8779a7b46b116d204cd29852acf06359f5a258e3d964bc4564ce8b490a527ae61fa6357793410887ac3616403 SHA512 64f954b103b6ffbb97a81a23489799a1fff71810f15f755b92e814a03d8bbe6351ba2a1c8179d60777cbbe60e5ee40cf0e04167cf1467a5b27c9b02142f7cb8c -DIST pavucontrol-qt-1.4.0.tar.xz 111712 BLAKE2B c3329a621dda082c63e7ba9d289476932170b6bb569e7b508d9158bbe31f20933a70047eb69e69d768ff48ea5ed27a8ddfdcae2c4bedee6b0b73484488f1d2f6 SHA512 cfa878bddd0b0299319c31a4e97aa8b6dc799f040fedf5ca0210d8eeb526f59258aab57ae050987633826c7a94fbbd0e1a1b1fc184fc8693541c799b6118a157 DIST pavucontrol-qt-2.0.0.tar.xz 114044 BLAKE2B ccfe5de71e516a05ccf151d59832d8e7e7e44000a34f352945092129766b80d39ceead7b33f2caf9ad6f5becf32e0df82fe5f7379cf98355c0d3f303f7ef88cb SHA512 e2c08c9413cfade402fc84d06b5f631a7c25b4b47d20da28099fdbe6cd6cc485ae5c855c6da0d5077bdac404b08ac90e4ef0ec907c1ae49ffb3a758f329bd63f DIST pavucontrol-qt-2.1.0.tar.xz 115596 BLAKE2B c926743ecdd87b5888144876ff4a5cc4294cd7f63e16f3e7719e6675b989ade64ab5d0d27cde1a2983552ae1955ebca2b42f121f58d7d7ee7fd1525b8772325b SHA512 a5aff774ddad06b8af2a4424836e7cb48a47efcca882225ba06474292b7845575d220eda34353d408e54e6466dd4738a0160925a251fbe8a332b88c8f2c8c534 diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-1.3.0-r1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.3.0-r1.ebuild deleted file mode 100644 index 72e257cc7d5d..000000000000 --- a/media-sound/pavucontrol-qt/pavucontrol-qt-1.3.0-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt GUI Pulseaudio Mixer" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.13.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - media-libs/libpulse[glib] -" -RDEPEND="${DEPEND}" diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-1.4.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.4.0.ebuild deleted file mode 100644 index 6a15ab9e24ae..000000000000 --- a/media-sound/pavucontrol-qt/pavucontrol-qt-1.4.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt GUI Pulseaudio Mixer" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.13.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - media-libs/libpulse[glib] -" -RDEPEND="${DEPEND}" diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest index f119fae0ae05..8da207f3072a 100644 --- a/media-sound/qmmp/Manifest +++ b/media-sound/qmmp/Manifest @@ -1 +1,2 @@ DIST qmmp-1.6.4.tar.bz2 1379335 BLAKE2B e17ec8f84f94cfbc6a0a1d30d6d954f3e6b3448909c0e3344614340b41974d69aa5bd3dbb149fcc88c6ede289ec7900050eb0de81307dfeb8ebfc360255d1ea6 SHA512 da8eae4ca4e10cca8a177064a422fdc196e76bb5e3e06c3029040e1120da0d2e5666824a8effd51f82c94b999e1243ae3bc6c71c8c05e334276bf40a5767c17f +DIST qmmp-2.1.9.tar.bz2 1373111 BLAKE2B a7420c50b4a3e9d41d6e483dce3a0446a202823f673aab2def308b5473563d5ea77730aec771a96a63ef860284bdcaa378dafe9d03c20919cba70b046681bc4c SHA512 87370dfdb856953ff9f89c1308c21133eaef880c3ace1e57ea1e0fde6deea4988c491836139a8d89c41670730838c0b8786fd4208429c709bab3b976efac53a8 diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch deleted file mode 100644 index 45512099ffeb..000000000000 --- a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qmmp-1.6.0/src/plugins/General/CMakeLists.txt -+++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt -@@ -51,7 +51,7 @@ - ENDIF(USE_HAL AND Qt5DBus_FOUND) - - IF(USE_UDISKS2 AND Qt5DBus_FOUND) --add_subdirectory(udisks2) -+add_subdirectory(udisks) - ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND) - - IF(USE_HOTKEY AND Qt5X11Extras_FOUND) diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml index f3b32f35bd28..a6bb8b917981 100644 --- a/media-sound/qmmp/metadata.xml +++ b/media-sound/qmmp/metadata.xml @@ -15,7 +15,8 @@ <flag name="dbus">Enable DBus notifiications and MPRIS support</flag> <flag name="enca">Detects the character encoding automatically</flag> <flag name="game">Enable Game music support</flag> - <flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag> + <flag name="gnome">Enable Gnome hotkey support (requires QtDBus)</flag> + <flag name="libxmp">Enable module files renderer (modplug replacement) via <pkg>media-libs/libxmp</pkg></flag> <flag name="lyrics">Fetch track lyrics from the web</flag> <flag name="midi">Enable midi support using wildmidi library</flag> <flag name="notifier">Enable qmmps' notifier system</flag> @@ -31,4 +32,10 @@ <flag name="tray">Build tray icon</flag> <flag name="xmp">Enable module files renderer (modplug replacement)</flag> </use> + <upstream> + <bugs-to>https://sourceforge.net/p/qmmp-dev/tickets/</bugs-to> + <changelog>https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/qmmp/ChangeLog</changelog> + <doc>https://sourceforge.net/p/qmmp-dev/wiki/browse_pages/</doc> + <remote-id type="sourceforge">qmmp-dev</remote-id> + </upstream> </pkgmetadata> diff --git a/media-sound/qmmp/qmmp-1.6.4.ebuild b/media-sound/qmmp/qmmp-1.6.4-r1.ebuild index d51786af6c2d..4c0244fe4e2f 100644 --- a/media-sound/qmmp/qmmp-1.6.4.ebuild +++ b/media-sound/qmmp/qmmp-1.6.4-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - media-libs/taglib + media-libs/taglib:= x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) diff --git a/media-sound/qmmp/qmmp-2.1.9.ebuild b/media-sound/qmmp/qmmp-2.1.9.ebuild new file mode 100644 index 000000000000..4628e3c5aa07 --- /dev/null +++ b/media-sound/qmmp/qmmp-2.1.9.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Qt-based audio player with winamp/xmms skins support" +HOMEPAGE="https://qmmp.ylsoftware.com" +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2 + https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +else + inherit subversion + QMMP_DEV_BRANCH="1.3" + ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}" +fi + +LICENSE="GPL-2" +SLOT="0" +# KEYWORDS further up +IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca +ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack +notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid +sndfile soxr stereo tray udisks +vorbis wavpack" + +REQUIRED_USE=" + gnome? ( dbus ) + shout? ( soxr vorbis ) + udisks? ( dbus ) +" + +RDEPEND=" + dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets] + media-libs/taglib:= + x11-libs/libX11 + aac? ( media-libs/faad2 ) + alsa? ( media-libs/alsa-lib ) + archive? ( app-arch/libarchive ) + bs2b? ( media-libs/libbs2b ) + cdda? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + ) + curl? ( net-misc/curl ) + dbus? ( dev-qt/qtbase:6[dbus] ) + enca? ( app-i18n/enca ) + ffmpeg? ( media-video/ffmpeg:= ) + flac? ( media-libs/flac:= ) + game? ( media-libs/game-music-emu ) + jack? ( + media-libs/libsamplerate + virtual/jack + ) + ladspa? ( media-plugins/cmt-plugins ) + libxmp? ( media-libs/libxmp ) + mad? ( + media-libs/libmad:= + media-sound/mpg123:= + ) + midi? ( media-sound/wildmidi ) + mms? ( media-libs/libmms ) + mplayer? ( media-video/mplayer ) + musepack? ( >=media-sound/musepack-tools-444 ) + opus? ( media-libs/opusfile ) + pipewire? ( media-video/pipewire ) + projectm? ( + dev-qt/qtbase:6[-gles2-only,opengl] + media-libs/libprojectm:= + ) + pulseaudio? ( media-libs/libpulse ) + qtmedia? ( dev-qt/qtmultimedia:6 ) + scrobbler? ( net-misc/curl ) + shout? ( media-libs/libshout ) + sid? ( >=media-libs/libsidplayfp-1.1.0 ) + sndfile? ( media-libs/libsndfile ) + soxr? ( media-libs/soxr ) + udisks? ( sys-fs/udisks:2 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + wavpack? ( media-sound/wavpack ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" + +DOCS=( AUTHORS ChangeLog README ) + +src_prepare() { + if has_version dev-libs/libcdio-paranoia ; then + sed -i \ + -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ + src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_AAC="$(usex aac)" + -DUSE_ALSA="$(usex alsa)" + -DUSE_ANALYZER="$(usex analyzer)" + -DUSE_ARCHIVE="$(usex archive)" + -DUSE_BS2B="$(usex bs2b)" + -DUSE_CDA="$(usex cdda)" + -DUSE_COVER="$(usex cover)" + -DUSE_CROSSFADE="$(usex crossfade)" + -DUSE_CUE="$(usex cue)" + -DUSE_CURL="$(usex curl)" + -DUSE_KDENOTIFY="$(usex dbus)" + -DUSE_MPRIS="$(usex dbus)" + -DUSE_ENCA="$(usex enca)" + -DUSE_FFMPEG="$(usex ffmpeg)" + -DUSE_FILEWRITER="$(usex vorbis)" + -DUSE_FLAC="$(usex flac)" + -DUSE_GME="$(usex game)" + -DUSE_GNOMEHOTKEY="$(usex gnome)" + -DUSE_JACK="$(usex jack)" + -DUSE_LADSPA="$(usex ladspa)" + -DUSE_LYRICS="$(usex lyrics)" + -DUSE_MAD="$(usex mad)" + -DUSE_MIDI="$(usex midi)" + -DUSE_MMS="$(usex mms)" + -DUSE_MPLAYER="$(usex mplayer)" + -DUSE_MPC="$(usex musepack)" + -DUSE_NOTIFIER="$(usex notifier)" + -DUSE_OPUS="$(usex opus)" + -DUSE_OSS="$(usex oss)" + -DUSE_PIPEWIRE="$(usex pipewire)" + -DUSE_PROJECTM="$(usex projectm)" + -DUSE_PULSE="$(usex pulseaudio)" + -DUSE_QSUI="$(usex qsui)" + -DUSE_QTMULTIMEDIA="$(usex qtmedia)" + -DUSE_SCROBBLER="$(usex scrobbler)" + -DUSE_SHOUT="$(usex shout)" + -DUSE_SID="$(usex sid)" + -DUSE_SNDFILE="$(usex sndfile)" + -DUSE_SOXR="$(usex soxr)" + -DUSE_STEREO="$(usex stereo)" + -DUSE_STATICON="$(usex tray)" + -DUSE_UDISKS="$(usex udisks)" + -DUSE_VORBIS="$(usex vorbis)" + -DUSE_WAVPACK="$(usex wavpack)" + -DUSE_XMP="$(usex libxmp)" + ) + + cmake_src_configure +} diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild index e69b0aa74275..4628e3c5aa07 100644 --- a/media-sound/qmmp/qmmp-9999.ebuild +++ b/media-sound/qmmp/qmmp-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake xdg -DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" +DESCRIPTION="Qt-based audio player with winamp/xmms skins support" HOMEPAGE="https://qmmp.ylsoftware.com" if [[ ${PV} != *9999* ]]; then - SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2 + SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2 https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" else @@ -21,9 +21,9 @@ LICENSE="GPL-2" SLOT="0" # KEYWORDS further up IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca -ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack +ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid -sndfile soxr stereo tray udisks +vorbis wavpack xmp" +sndfile soxr stereo tray udisks +vorbis wavpack" REQUIRED_USE=" gnome? ( dbus ) @@ -32,13 +32,8 @@ REQUIRED_USE=" " RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-libs/taglib + dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets] + media-libs/taglib:= x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) @@ -49,7 +44,7 @@ RDEPEND=" dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) - dbus? ( dev-qt/qtdbus:5 ) + dbus? ( dev-qt/qtbase:6[dbus] ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) @@ -59,6 +54,7 @@ RDEPEND=" virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) + libxmp? ( media-libs/libxmp ) mad? ( media-libs/libmad:= media-sound/mpg123:= @@ -70,12 +66,11 @@ RDEPEND=" opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtopengl:5 + dev-qt/qtbase:6[-gles2-only,opengl] media-libs/libprojectm:= ) pulseaudio? ( media-libs/libpulse ) - qtmedia? ( dev-qt/qtmultimedia:5 ) + qtmedia? ( dev-qt/qtmultimedia:6 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) @@ -87,17 +82,12 @@ RDEPEND=" media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) - xmp? ( media-libs/libxmp ) " DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" +BDEPEND="dev-qt/qttools:6[linguist]" DOCS=( AUTHORS ChangeLog README ) -PATCHES=( - "${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch" -) - src_prepare() { if has_version dev-libs/libcdio-paranoia ; then sed -i \ @@ -154,7 +144,7 @@ src_configure() { -DUSE_UDISKS="$(usex udisks)" -DUSE_VORBIS="$(usex vorbis)" -DUSE_WAVPACK="$(usex wavpack)" - -DUSE_XMP="$(usex xmp)" + -DUSE_XMP="$(usex libxmp)" ) cmake_src_configure diff --git a/media-sound/qsampler/qsampler-1.0.0.ebuild b/media-sound/qsampler/qsampler-1.0.0-r1.ebuild index d07c734a28c1..4b341cc7ed61 100644 --- a/media-sound/qsampler/qsampler-1.0.0.ebuild +++ b/media-sound/qsampler/qsampler-1.0.0-r1.ebuild @@ -18,32 +18,20 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" LICENSE="GPL-2" SLOT="0" -IUSE="debug +libgig qt6" +IUSE="debug +libgig" DEPEND=" + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) " RDEPEND="${DEPEND} media-sound/linuxsampler " -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" +BDEPEND="dev-qt/qttools:6[linguist]" DOCS=( ChangeLog README TRANSLATORS ) @@ -51,7 +39,7 @@ src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild index f0a0b110d46b..2e0afc0face5 100644 --- a/media-sound/qsampler/qsampler-9999.ebuild +++ b/media-sound/qsampler/qsampler-9999.ebuild @@ -18,32 +18,20 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" LICENSE="GPL-2" SLOT="0" -IUSE="debug +libgig qt6" +IUSE="debug +libgig" DEPEND=" + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) " RDEPEND="${DEPEND} media-sound/linuxsampler " -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" +BDEPEND="dev-qt/qttools:6[linguist]" DOCS=( ChangeLog README TRANSLATORS ) @@ -51,7 +39,7 @@ src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qsynth/qsynth-1.0.2.ebuild b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild index e030f127d687..e10bee8f4374 100644 --- a/media-sound/qsynth/qsynth-1.0.2.ebuild +++ b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild @@ -18,34 +18,22 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio qt6" +IUSE="+alsa debug jack pulseaudio" REQUIRED_USE="|| ( alsa jack pulseaudio )" -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" DEPEND=" - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild index 496e8129a1ca..1a8dd2a8ac2b 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-9999.ebuild @@ -18,34 +18,22 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio qt6" +IUSE="+alsa debug jack pulseaudio" REQUIRED_USE="|| ( alsa jack pulseaudio )" -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" DEPEND=" - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild b/media-sound/qtagger/qtagger-1.0.1_p20150402-r1.ebuild index d03fe2b1e684..0c84b86524e1 100644 --- a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild +++ b/media-sound/qtagger/qtagger-1.0.1_p20150402-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_MAKEFILE_GENERATOR="emake" COMMIT=0e74fe022ddbb689f7bae0460a21be303114029b @@ -21,7 +21,7 @@ DEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - media-libs/taglib + media-libs/taglib:= " RDEPEND="${DEPEND}" diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest index b51150664a04..112d1b13db48 100644 --- a/media-sound/qtractor/Manifest +++ b/media-sound/qtractor/Manifest @@ -1,2 +1,2 @@ DIST qtractor-1.4.0.tar.gz 2662656 BLAKE2B 52a40439e498a3316964ad181c95b0f18ebf89b246553af30f490ce229fedbea8195b0e88518216622833e1dd8d5ad253179cb9d3d86065f10ff5f6e24377adf SHA512 23fc7922f63a31f7e8483c4d90f08e6852778edfe365e40086d3a9aa350ba75fed93d25f153e261a522615fd43515926abac913b8ee106efa5680c51100a992a -DIST qtractor-1.5.0.tar.gz 2661608 BLAKE2B 33daaba7fcf38805850332c2db390686961cec7e5b265432efe338366d8c572715dbd0fcf099553fc356d527e37b81b9ee43cbf64d97988369c9034305f3adf3 SHA512 beafe4f0f7cc4956a23e97fa1a31f9fd1ff7a95c92cd6235f1bae688dd96a84bab7fbf7b2b6009184b3307fee7979ca72297dc76828876c30158c4092dd24a2b +DIST qtractor-1.5.1.tar.gz 2662704 BLAKE2B 258eb392299b0fcec0c8d9d4f6cb17b3a934a6b266dc538ccb34fbaac810f58d4c20ad1fa093f5417f0f04f4511415773d46f697a20c7c1c57eb126a8ee702f4 SHA512 05807b4371ac6355e401f7153578c00736a51ebff96ea351a55ed0e9d4383d4ed05b20f6e65cca3ceaf3df883156d0a49e1a5a3c110daf8d85133cc7100659af diff --git a/media-sound/qtractor/qtractor-1.5.0.ebuild b/media-sound/qtractor/qtractor-1.5.1-r1.ebuild index eb8b13d4e22f..9eaef0bd86ed 100644 --- a/media-sound/qtractor/qtractor-1.5.0.ebuild +++ b/media-sound/qtractor/qtractor-1.5.1-r1.ebuild @@ -12,16 +12,12 @@ SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" - -IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc qt5 rubberband vorbis zlib" +IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib" REQUIRED_USE="dssi? ( ladspa )" -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) - !qt5? ( dev-qt/qttools:6[linguist] ) -" DEPEND=" + dev-qt/qtbase:6[gui,widgets,xml] + dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv @@ -35,18 +31,6 @@ DEPEND=" libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtx11extras:5 - ) - !qt5? ( - dev-qt/qtbase:6[gui,widgets,xml] - dev-qt/qtsvg:6 - ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg @@ -55,10 +39,10 @@ DEPEND=" zlib? ( sys-libs/zlib ) " RDEPEND="${DEPEND}" - -src_prepare() { - cmake_src_prepare -} +BDEPEND=" + virtual/pkgconfig + dev-qt/qttools:6[linguist] +" src_configure() { local mycmakeargs=( @@ -79,7 +63,7 @@ src_configure() { -DCONFIG_LV2=1 -DCONFIG_LV2_UI_GTK2=0 -DCONFIG_NSM=0 - -DCONFIG_QT6=$(usex qt5 0 1) + -DCONFIG_QT6=1 -DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0) -DCONFIG_STACKTRACE=$(usex debug 1 0) -DCONFIG_VESTIGE=1 diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest index 8d9ef1e44251..404ef69b8cab 100644 --- a/media-sound/quimup/Manifest +++ b/media-sound/quimup/Manifest @@ -1 +1,3 @@ +DIST Quimup-2.1.0.source.tar.gz 697565 BLAKE2B 78b950d0134041becac0d2eb6786db90797127882279bd078da332df5cc3d1bfea8da256cfc49f6a83eefb8b25a3beb60af0d7bf3e1e8394b46956ba72fd6dc8 SHA512 c7d86deaa6483ea9467e2bc8dd7e413f67ebf271713cab939cda8c9689a52651b45724d99cdec7d72350273fb59e2542acf82ebc9da1cea8e0210f575351e686 +DIST Quimup-2.1.1.source.tar.gz 2423998 BLAKE2B 342e7bf6682fcba5f6c5c2ebaabb8b475d2ec8d37f32cbdd2c3deebe32cd3bea022bf33176fe523869c0562f7256aea687e5056649684033019f67297ecd4ba3 SHA512 4adec84bcd6e9825a1610fb74be5768d1d3eeeb641fdb57b64db6904a0b8cfad48fc9cb53732f169710528085d9433e35f936a519a8128b822a89fa971b5533b DIST Quimup_1.4.4_source.tar.gz 240902 BLAKE2B a411653b1c5ced5dc7f4b9ebe6244380d23cd165eaf2b14760a3f87946094f7ffad3df73afe500c0f8ea8f6d77e690391e78a0403b9436485b4c670de3c3b0da SHA512 4fac921df6e7157952536e1cdda0e468b72f70f8f938ccfd5d1a7d286f4b7d7ac063ca2c6111f38fb76b2a6235a323858f2f898165c80702b2c0aaeaff8869c9 diff --git a/media-sound/quimup/files/quimup-1.4.4-fix-build-taglib2.patch b/media-sound/quimup/files/quimup-1.4.4-fix-build-taglib2.patch new file mode 100644 index 000000000000..e3c56b090021 --- /dev/null +++ b/media-sound/quimup/files/quimup-1.4.4-fix-build-taglib2.patch @@ -0,0 +1,50 @@ +no upstream PR. It doesn't use anymore taglib for his 2.X +--- a/src/qm_player.cpp ++++ b/src/qm_player.cpp +@@ -2021,7 +2021,7 @@ + { + const TagLib::ByteVector nullStringTerminator(1, 0); + +- TagLib::ByteVector item = listMap["COVER ART (FRONT)"].value(); ++ TagLib::ByteVector item = listMap["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // Skip the filename + + if (++pos > 0) +@@ -2166,8 +2166,8 @@ + if (mp4file.tag()) // has MP4 tag + { + TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(mp4file.tag()); +- TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap(); +- if (tag->itemListMap().contains("covr")) ++ TagLib::MP4::ItemMap itemsListMap = tag->itemMap(); ++ if (tag->itemMap().contains("covr")) + { + TagLib::MP4::Item coverItem = itemsListMap["covr"]; + TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList(); +@@ -2197,7 +2197,7 @@ + { + const TagLib::ByteVector nullStringTerminator(1, 0); + +- TagLib::ByteVector item = listMap["COVER ART (FRONT)"].value(); ++ TagLib::ByteVector item = listMap["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // Skip the filename + + if (++pos > 0) +@@ -2230,7 +2230,7 @@ + printf ("APE tag COVER ART found\n"); + const TagLib::ByteVector nullStringTerminator(1, 0); + +- TagLib::ByteVector item = listMap["COVER ART (FRONT)"].value(); ++ TagLib::ByteVector item = listMap["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // Skip the filename + + if (++pos > 0) +@@ -2270,7 +2270,7 @@ + { + const TagLib::ByteVector nullStringTerminator(1, 0); + +- TagLib::ByteVector item = listMap["COVER ART (FRONT)"].value(); ++ TagLib::ByteVector item = listMap["COVER ART (FRONT)"].binaryData(); + int pos = item.find(nullStringTerminator); // Skip the filename + + if (++pos > 0) diff --git a/media-sound/quimup/quimup-1.4.4-r1.ebuild b/media-sound/quimup/quimup-1.4.4-r1.ebuild new file mode 100644 index 000000000000..82130b3eed95 --- /dev/null +++ b/media-sound/quimup/quimup-1.4.4-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils + +DESCRIPTION="Qt5 client for the music player daemon (MPD)" +HOMEPAGE="https://sourceforge.net/projects/quimup/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN^}_${PV}_source.tar.gz" +S="${WORKDIR}/${PN^}_${PV}_source" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-libs/libmpdclient + media-libs/taglib:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fix-build-taglib2.patch ) + +DOCS=( changelog FAQ.txt README ) + +src_configure() { + eqmake5 +} + +src_install() { + default + dobin ${PN} + + newicon src/resources/mn_icon.png ${PN}.png + make_desktop_entry ${PN} Quimup +} diff --git a/media-sound/quimup/quimup-2.1.0.ebuild b/media-sound/quimup/quimup-2.1.0.ebuild new file mode 100644 index 000000000000..c697b0f774e2 --- /dev/null +++ b/media-sound/quimup/quimup-2.1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils xdg + +DESCRIPTION="Qt client for the music player daemon (MPD)" +HOMEPAGE="https://quimup.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P^}.source.tar.gz" +S="${WORKDIR}/${P^}.source" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtbase:6[gui,network,widgets] + media-libs/libmpdclient +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( changelog faq readme ) + +src_configure() { + eqmake6 +} + +src_install() { + default + dobin ${PN} + + for x in 32 64 128 scalable; do + doicon -s ${x} RPM_DEB_build/share/icons/hicolor/${x}*/* + done + + domenu RPM_DEB_build/share/applications/${PN^}.desktop +} diff --git a/media-sound/quimup/quimup-2.1.1.ebuild b/media-sound/quimup/quimup-2.1.1.ebuild new file mode 100644 index 000000000000..23b0f08e7cb6 --- /dev/null +++ b/media-sound/quimup/quimup-2.1.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils xdg + +DESCRIPTION="Qt client for the music player daemon (MPD)" +HOMEPAGE="https://quimup.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P^}.source.tar.gz" +S="${WORKDIR}/${P^}.source" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtbase:6[gui,network,widgets] + media-libs/libmpdclient +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( changelog faq readme ) + +src_configure() { + eqmake6 +} + +src_install() { + default + dobin ${PN} + + for x in 32 64 128 scalable; do + doicon -s ${x} RPM_DEB_build/share/icons/hicolor/${x}*/* + done + + domenu RPM_DEB_build/share/applications/${PN^}.desktop +} diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest index 1bef0dbe5e2d..7b35dcc61d57 100644 --- a/media-sound/sidplayfp/Manifest +++ b/media-sound/sidplayfp/Manifest @@ -1,2 +1 @@ -DIST sidplayfp-2.11.0.tar.gz 252126 BLAKE2B 0ef141ca32c3f91dad67a54bf253da806242fb30294be97b44ded23490bb30d05dfc63593bb3c5b05a1bae48228d0ce3c31c35dba15dea1db70ed36692ef060d SHA512 455e8a81e7540f7fa5b97a11c5ab45cb87d77210569dd62ea3bfee8149d56b884eafb23ae404e806b92bf62f40bbf560ecfda76073477caf3fa960a1f52933be DIST sidplayfp-2.12.0.tar.gz 251994 BLAKE2B 9b3416504d7488e05c127a2b9c112118bf1283f0a022cc82e353c8f16f61a4d87779712d7faa591dca1a145c060d8a8afada1050a1766c654df7d9055e04d95f SHA512 1e511d2847d774bb8b64757b0c83ae1c5d3e794d05998600ba6f68b79eb29f6f970854d00be84572b5622495099211af7fc2e166d135b6447dc0eba163b68ec3 diff --git a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild deleted file mode 100644 index 451012e6ce4e..000000000000 --- a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Sidplay2 fork with resid-fp" -HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" -SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+alsa oss pulseaudio" - -BDEPEND="virtual/pkgconfig" -CDEPEND=" - media-libs/libsidplayfp - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-libs/libpulse ) -" -RDEPEND=" - ${CDEPEND} - media-plugins/mpg123-output-plugins -" -DEPEND="${CDEPEND} - oss? ( virtual/os-headers ) -" - -DOCS=( AUTHORS README TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.4-musl-limits.patch -) - -src_prepare() { - default - - if ! use alsa; then - sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die - fi - - if ! use pulseaudio; then - sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die - fi -} - -src_configure() { - export ac_cv_header_linux_soundcard_h=$(usex oss) - - econf -} diff --git a/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild index 2d76084b9af7..a1f1fbb95d1b 100644 --- a/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild +++ b/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="+alsa oss pulseaudio" BDEPEND="virtual/pkgconfig" diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest index d45a494a4445..743fc6bffc9f 100644 --- a/media-sound/snapcast/Manifest +++ b/media-sound/snapcast/Manifest @@ -1 +1,2 @@ DIST snapcast-0.27.0.tar.gz 1566337 BLAKE2B 77183cd2496beaf6808f8c1ff030cdb1e483c86ebafd57d0c75daa2dfe31030f0dd9704db40e2c0780b85c2b346e121ccd16c1cb75dea1f80e9834d3ae100fb8 SHA512 fd86f5b0d38bf308eb9cc1f3024676471176355a8cc91ee8c8d2dfe1aa0cde99fc7636133071b50304fe66ea42dee996e0088e013be7fa703f21c5bc2a35cfdd +DIST snapcast-0.29.0.tar.gz 1202943 BLAKE2B 0fb3c4b54dfd5fb16f7a17134a03288390c6d1b06c2c93bd7b495f0ff2f650d6caffab8b369703f38ca5764038470c3066794955259d419ea7ac4eff41e177d5 SHA512 4c88c20514e81f0ec861716a81047cb441669c0c23821acd959938cf00d85c37eec28a689a3c192f78fcb21accdbd6ef4520ef3f9995ff48ff07cb33e00b6904 diff --git a/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0-make_address.patch b/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0-make_address.patch new file mode 100644 index 000000000000..03190a4e20e3 --- /dev/null +++ b/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0-make_address.patch @@ -0,0 +1,96 @@ +https://github.com/badaix/snapcast/commit/b2fd2bf9ef835104a813c40c190d71e3644125d7 + +From b2fd2bf9ef835104a813c40c190d71e3644125d7 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Thu, 19 Dec 2024 02:23:11 +1100 +Subject: [PATCH] use make_address from boost as from_string is deprecated + (#1308) + +Since boost 1.87.0 boost::asio::ip::address::from_string is no longer available + +ref: https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae + +fixes: + ../server/control_server.cpp: In member function 'void ControlServer::start()': + ../server/control_server.cpp:164:111: error: 'from_string' is not a member of 'boost::asio::ip::address' + 164 | tcp::endpoint(boost::asio::ip::address::from_string(address), tcp_settings_.port))); + | ^~~~~~~~~~~ + ../server/control_server.cpp:180:112: error: 'from_string' is not a member of 'boost::asio::ip::address' + 180 | tcp::endpoint(boost::asio::ip::address::from_string(address), http_settings_.port))); + | ^~~~~~~~~~~ + ../server/streamreader/tcp_stream.cpp: In constructor 'streamreader::TcpStream::TcpStream(streamreader::PcmStream::Listener*, boost::asio::io_context&, const ServerSettings&, const streamreader::StreamUri&)': + ../server/streamreader/tcp_stream.cpp:67:97: error: 'from_string' is not a member of 'boost::asio::ip::address' + 67 | acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_)); + | ^~~~~~~~~~~ + ../server/streamreader/tcp_stream.cpp: In member function 'virtual void streamreader::TcpStream::connect()': + ../server/streamreader/tcp_stream.cpp:96:75: error: 'from_string' is not a member of 'boost::asio::ip::address' + 96 | boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_); + | ^~~~~~~~~~~ + ../server/stream_server.cpp: In member function 'void StreamServer::start()': + ../server/stream_server.cpp:234:103: error: 'from_string' is not a member of 'boost::asio::ip::address' + 234 | tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port))); + | +--- + server/control_server.cpp | 4 ++-- + server/stream_server.cpp | 2 +- + server/streamreader/tcp_stream.cpp | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/server/control_server.cpp b/server/control_server.cpp +index 03b2db76..7945855b 100644 +--- a/server/control_server.cpp ++++ b/server/control_server.cpp +@@ -161,7 +161,7 @@ void ControlServer::start() + { + LOG(INFO, LOG_TAG) << "Creating TCP acceptor for address: " << address << ", port: " << tcp_settings_.port << "\n"; + acceptor_tcp_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()), +- tcp::endpoint(boost::asio::ip::address::from_string(address), tcp_settings_.port))); ++ tcp::endpoint(boost::asio::ip::make_address(address), tcp_settings_.port))); + } + catch (const boost::system::system_error& e) + { +@@ -177,7 +177,7 @@ void ControlServer::start() + { + LOG(INFO, LOG_TAG) << "Creating HTTP acceptor for address: " << address << ", port: " << http_settings_.port << "\n"; + acceptor_http_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()), +- tcp::endpoint(boost::asio::ip::address::from_string(address), http_settings_.port))); ++ tcp::endpoint(boost::asio::ip::make_address(address), http_settings_.port))); + } + catch (const boost::system::system_error& e) + { +diff --git a/server/stream_server.cpp b/server/stream_server.cpp +index 718e744f..ad2fec2c 100644 +--- a/server/stream_server.cpp ++++ b/server/stream_server.cpp +@@ -231,7 +231,7 @@ void StreamServer::start() + { + LOG(INFO, LOG_TAG) << "Creating stream acceptor for address: " << address << ", port: " << settings_.stream.port << "\n"; + acceptor_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()), +- tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port))); ++ tcp::endpoint(boost::asio::ip::make_address(address), settings_.stream.port))); + } + catch (const boost::system::system_error& e) + { +diff --git a/server/streamreader/tcp_stream.cpp b/server/streamreader/tcp_stream.cpp +index 1ec68d6b..ed3fd75e 100644 +--- a/server/streamreader/tcp_stream.cpp ++++ b/server/streamreader/tcp_stream.cpp +@@ -64,7 +64,7 @@ TcpStream::TcpStream(PcmStream::Listener* pcmListener, boost::asio::io_context& + + LOG(INFO, LOG_TAG) << "TcpStream host: " << host_ << ", port: " << port_ << ", is server: " << is_server_ << "\n"; + if (is_server_) +- acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_)); ++ acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::make_address(host_), port_)); + } + + +@@ -93,7 +93,7 @@ void TcpStream::connect() + else + { + stream_ = make_unique<tcp::socket>(strand_); +- boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_); ++ boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::make_address(host_), port_); + stream_->async_connect(endpoint, + [this](const boost::system::error_code& ec) + { + diff --git a/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0.patch b/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0.patch new file mode 100644 index 000000000000..d1be4b4072db --- /dev/null +++ b/media-sound/snapcast/files/snapcast-0.29.0-boost-1.87.0.patch @@ -0,0 +1,51 @@ +https://github.com/badaix/snapcast/commit/6190041e863968d76b6d16140bba90be6dff848f + +From 6190041e863968d76b6d16140bba90be6dff848f Mon Sep 17 00:00:00 2001 +From: badaix <johannes.pohl@badaix.de> +Date: Thu, 19 Dec 2024 21:36:08 +0100 +Subject: [PATCH] Fix compilation with boost v1.87.0 + +--- + client/client_connection.cpp | 5 ++--- + server/stream_session_ws.cpp | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/client/client_connection.cpp b/client/client_connection.cpp +index 53825864..6f34a018 100644 +--- a/client/client_connection.cpp ++++ b/client/client_connection.cpp +@@ -124,10 +124,9 @@ std::string ClientConnection::getMacAddress() + + void ClientConnection::connect(const ResultHandler& handler) + { +- tcp::resolver::query query(server_.host, cpt::to_string(server_.port), boost::asio::ip::resolver_query_base::numeric_service); + boost::system::error_code ec; + LOG(INFO, LOG_TAG) << "Resolving host IP for: " << server_.host << "\n"; +- auto iterator = resolver_.resolve(query, ec); ++ auto iterator = resolver_.resolve(server_.host, cpt::to_string(server_.port), boost::asio::ip::resolver_query_base::numeric_service, ec); + if (ec) + { + LOG(ERROR, LOG_TAG) << "Failed to resolve host '" << server_.host << "', error: " << ec.message() << "\n"; +@@ -141,7 +140,7 @@ void ClientConnection::connect(const ResultHandler& handler) + for (const auto& iter : iterator) + { + LOG(INFO, LOG_TAG) << "Connecting to " << iter.endpoint() << "\n"; +- socket_.connect(*iterator, ec); ++ socket_.connect(iter, ec); + if (!ec || (ec == boost::system::errc::interrupted)) + { + // We were successful or interrupted, e.g. by sig int +diff --git a/server/stream_session_ws.cpp b/server/stream_session_ws.cpp +index 5f666618..117603f6 100644 +--- a/server/stream_session_ws.cpp ++++ b/server/stream_session_ws.cpp +@@ -114,7 +114,7 @@ void StreamSessionWebsocket::on_read_ws(beast::error_code ec, std::size_t bytes_ + return; + } + +- auto* data = boost::asio::buffer_cast<char*>(buffer_.data()); ++ auto* data = static_cast<char*>(buffer_.data().data()); + baseMessage_.deserialize(data); + LOG(DEBUG, LOG_TAG) << "getNextMessage: " << baseMessage_.type << ", size: " << baseMessage_.size << ", id: " << baseMessage_.id + << ", refers: " << baseMessage_.refersTo << "\n"; + diff --git a/media-sound/snapcast/files/snapcast-0.29.0-resampler-include.patch b/media-sound/snapcast/files/snapcast-0.29.0-resampler-include.patch new file mode 100644 index 000000000000..296a5d61db86 --- /dev/null +++ b/media-sound/snapcast/files/snapcast-0.29.0-resampler-include.patch @@ -0,0 +1,25 @@ +https://github.com/badaix/snapcast/commit/f6ce4f3fbb3c797f5d92578d7bc8df547ad4cd64 + +From f6ce4f3fbb3c797f5d92578d7bc8df547ad4cd64 Mon Sep 17 00:00:00 2001 +From: Johannes Pohl <johannes.pohl@badaix.de> +Date: Wed, 11 Dec 2024 15:50:11 +0100 +Subject: [PATCH] Add missing include in resampler.cpp + +This fixes issue #1295 +--- + common/resampler.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/common/resampler.cpp b/common/resampler.cpp +index 1d5d698a..9548c957 100644 +--- a/common/resampler.cpp ++++ b/common/resampler.cpp +@@ -21,6 +21,7 @@ + + // local headers + #include "common/aixlog.hpp" ++#include "common/snap_exception.hpp" + + // standard headers + #include <cmath> + diff --git a/media-sound/snapcast/snapcast-0.29.0.ebuild b/media-sound/snapcast/snapcast-0.29.0.ebuild new file mode 100644 index 000000000000..cb0c73fe0d29 --- /dev/null +++ b/media-sound/snapcast/snapcast-0.29.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Synchronous multi-room audio player" +HOMEPAGE="https://github.com/badaix/snapcast" +SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86" +IUSE="+client +expat +flac jack +opus +server tremor +vorbis +zeroconf" +REQUIRED_USE="|| ( server client )" + +RDEPEND=" + dev-libs/boost:= + media-libs/alsa-lib + client? ( acct-user/snapclient ) + expat? ( dev-libs/expat ) + flac? ( media-libs/flac:= ) + jack? ( virtual/jack ) + opus? ( media-libs/opus ) + server? ( + acct-group/snapserver + acct-user/snapserver + ) + tremor? ( media-libs/tremor ) + vorbis? ( media-libs/libvorbis ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND=" + ${RDEPEND} + >=dev-cpp/aixlog-1.2.1 + >=dev-cpp/asio-1.12.1 + >=dev-cpp/popl-1.2.0 +" + +PATCHES=( + "${FILESDIR}"/${P}-resampler-include.patch + "${FILESDIR}"/${P}-boost-1.87.0-make_address.patch + "${FILESDIR}"/${P}-boost-1.87.0.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_CLIENT=$(usex client) + -DBUILD_WITH_EXPAT=$(usex expat) + -DBUILD_WITH_FLAC=$(usex flac) + -DBUILD_WITH_JACK=$(usex jack) + -DBUILD_WITH_OPUS=$(usex opus) + -DBUILD_SERVER=$(usex server) + -DBUILD_STATIC_LIBS=no + -DBUILD_TESTS=no + -DBUILD_WITH_TREMOR=$(usex tremor) + -DBUILD_WITH_VORBIS=$(usex vorbis) + -DBUILD_WITH_AVAHI=$(usex zeroconf) + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + for bin in server client ; do + if use ${bin} ; then + doman "${bin}/snap${bin}.1" + + newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}" + newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}" + fi + done +} diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest index 5263e442d929..cb0b1d7fb07a 100644 --- a/media-sound/sonic-visualiser/Manifest +++ b/media-sound/sonic-visualiser/Manifest @@ -1,2 +1 @@ -DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d DIST sonic-visualiser-5.0.1.tar.gz 6583441 BLAKE2B 8c3b87aaae14d2ec3284c75b7a4c7a977bd54ede14a6c8c6d8a4f1bd679d051c6abc12045003940537d2ce86f20c33103fee6a90b56947b17f917e7deff7faad SHA512 eb58403b3d680bbe9b6b30a2ee1899db71f245d6b7b153caa04953268bff1bb52da069d63d2e062ebb14e01a4474214de6770e389b6d611990db7fab8fd6ecc6 diff --git a/media-sound/sonic-visualiser/files/serd.patch b/media-sound/sonic-visualiser/files/serd.patch deleted file mode 100644 index d2b20b409da3..000000000000 --- a/media-sound/sonic-visualiser/files/serd.patch +++ /dev/null @@ -1,15 +0,0 @@ -From 865fbe253cde8e966709bb11dc8c441ceb3891ed Mon Sep 17 00:00:00 2001 -From: Chris Cannam <cannam@all-day-breakfast.com> -Date: Fri, 29 Jul 2022 13:31:37 +0100 -Subject: [PATCH] Fix build failure - ---- a/meson.build -+++ b/meson.build -@@ -138,6 +138,7 @@ if system == 'linux' - server_dependencies = [ - capnp_dep, - sord_dep, -+ serd_dep, - dl_dep, - ] - diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch deleted file mode 100644 index 1abea0fdadce..000000000000 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -90,17 +90,7 @@ if system == 'linux' - serd_dep = dependency('serd-0', version: '>= 0.5') - capnp_dep = dependency('capnp', version: '>= 0.6') - lrdf_dep = dependency('lrdf', version: '>= 0.2') -- oggz_dep = dependency('oggz', version: '>= 1.0.0') -- fishsound_dep = dependency('fishsound', version: '>= 1.0.0') -- mad_dep = dependency('mad', version: '>= 0.15.0') -- id3tag_dep = dependency('id3tag', version: '>= 0.15.0') -- opus_dep = dependency('opusfile') -- lo_dep = dependency('liblo') -- jack_dep = dependency('jack', version: '>= 0.100') -- libpulse_dep = dependency('libpulse', version: '>= 0.9') - alsa_dep = dependency('alsa') -- -- portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) - - feature_dependencies = [ - bzip2_dep, -@@ -113,23 +103,8 @@ if system == 'linux' - serd_dep, - capnp_dep, - lrdf_dep, -- oggz_dep, -- fishsound_dep, -- mad_dep, -- id3tag_dep, -- opus_dep, -- lo_dep, -- portaudio_dep, -- jack_dep, -- libpulse_dep, - alsa_dep, - ] -- -- server_dependencies = [ -- capnp_dep, -- sord_dep, -- dl_dep, -- ] - - feature_defines = [ - '-DHAVE_BZ2', -@@ -142,26 +117,110 @@ if system == 'linux' - '-DHAVE_SERD', - '-DHAVE_CAPNP', - '-DHAVE_LRDF', -- '-DHAVE_OGGZ', -- '-DHAVE_FISHSOUND', -- '-DHAVE_MAD', -- '-DHAVE_ID3TAG', -- '-DHAVE_OPUS', -- '-DHAVE_LIBLO', -- '-DHAVE_JACK', '-DDYNAMIC_JACK', -- '-DHAVE_LIBPULSE', - '-D__LINUX_ALSASEQ__', - '-D__LINUX_ALSA__' # for RtMidi - ] - -- if portaudio_dep.found() -+ enable_id3tag = get_option('id3tag') -+ if enable_id3tag -+ id3tag_dep = dependency('id3tag', version: '>= 0.15.0') -+ feature_dependencies += [ -+ id3tag_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_ID3TAG', -+ ] -+ endif -+ -+ enable_jack = get_option('jack') -+ if enable_jack -+ jack_dep = dependency('jack', version: '>= 0.100') -+ feature_dependencies += [ -+ jack_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_JACK', -+ '-DDYNAMIC_JACK', -+ ] -+ endif -+ -+ enable_mad = get_option('mad') -+ if enable_mad -+ mad_dep = dependency('mad', version: '>= 0.15.0') -+ feature_dependencies += [ -+ mad_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_MAD', -+ ] -+ -+ svcore_moc_args = [ -+ '-DHAVE_MAD' -+ ] -+ endif -+ -+ enable_ogg = get_option('ogg') -+ if enable_ogg -+ oggz_dep = dependency('oggz', version: '>= 1.0.0') -+ fishsound_dep = dependency('fishsound', version: '>= 1.0.0') -+ feature_dependencies += [ -+ oggz_dep, -+ fishsound_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_OGGZ', -+ '-DHAVE_FISHSOUND', -+ ] -+ endif -+ -+ enable_opus = get_option('opus') -+ if enable_opus -+ opus_dep = dependency('opusfile') -+ feature_dependencies += [ -+ opus_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_OPUS', -+ ] -+ endif -+ -+ enable_osc = get_option('osc') -+ if enable_osc -+ lo_dep = dependency('liblo') -+ feature_dependencies += [ -+ lo_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_LIBLO', -+ ] -+ endif -+ -+ enable_portaudio = get_option('portaudio') -+ if enable_portaudio -+ portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) -+ feature_dependencies += [ -+ portaudio_dep, -+ ] - feature_defines += [ - '-DHAVE_PORTAUDIO', - ] - endif - -- svcore_moc_args = [ -- '-DHAVE_MAD' -+ enable_pulseaudio = get_option('pulseaudio') -+ if enable_pulseaudio -+ libpulse_dep = dependency('libpulse', version: '>= 0.9') -+ feature_dependencies += [ -+ libpulse_dep, -+ ] -+ feature_defines += [ -+ '-DHAVE_LIBPULSE', -+ ] -+ endif -+ -+ server_dependencies = [ -+ capnp_dep, -+ sord_dep, -+ dl_dep, - ] - - elif system == 'darwin' ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,8 @@ -+option('id3tag', type: 'boolean', value: false) -+option('jack', type: 'boolean', value: false) -+option('mad', type: 'boolean', value: false) -+option('ogg', type: 'boolean', value: false) -+option('opus', type: 'boolean', value: false) -+option('osc', type: 'boolean', value: false) -+option('portaudio', type: 'boolean', value: false) -+option('pulseaudio', type: 'boolean', value: false) diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild deleted file mode 100644 index a8d5a288ec4f..000000000000 --- a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -DESCRIPTION="Music audio files viewer and analiser" -HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser" -SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2820/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" - -BDEPEND=" - dev-qt/qttest:5 - virtual/pkgconfig -" -RDEPEND=" - app-arch/bzip2 - dev-libs/capnproto:= - dev-libs/serd - dev-libs/sord - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/alsa-lib - media-libs/dssi - media-libs/ladspa-sdk - media-libs/liblrdf - media-libs/libsamplerate - media-libs/libsndfile - media-libs/rubberband - media-libs/speex - media-libs/vamp-plugin-sdk - sci-libs/fftw:3.0= - id3tag? ( media-libs/libid3tag:= ) - jack? ( virtual/jack ) - mad? ( media-libs/libmad ) - ogg? ( - media-libs/libfishsound - media-libs/liboggz - ) - opus? ( media-libs/opusfile ) - osc? ( media-libs/liblo ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) -" -DEPEND="${RDEPEND}" - -# tests fail without mp3 support -RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( jack pulseaudio portaudio ) - test? ( id3tag mad ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.3-meson.build.patch" - "${FILESDIR}/serd.patch" -) - -src_configure() { - local emesonargs=( - $(meson_use id3tag) - $(meson_use jack) - $(meson_use mad) - $(meson_use ogg) - $(meson_use opus) - $(meson_use osc) - $(meson_use portaudio) - $(meson_use pulseaudio) - ) - meson_src_configure -} diff --git a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild index 9c2965ea5308..778e5ec721e8 100644 --- a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild +++ b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2866/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" BDEPEND=" diff --git a/media-sound/soundconverter/soundconverter-4.0.5.ebuild b/media-sound/soundconverter/soundconverter-4.0.5.ebuild index b4704cea2c49..22eaf4ec4de6 100644 --- a/media-sound/soundconverter/soundconverter-4.0.5.ebuild +++ b/media-sound/soundconverter/soundconverter-4.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/kassoulet/${PN}/archive/${MY_PV}.tar.gz -> ${P}.gh.t LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="aac flac mp3 ogg opus vorbis" # gst-plugins-meta for any decoders, USE flags for specific encoders used by code diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 5bc9ceada926..9cdc30238c63 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1 +1,2 @@ DIST spotify-client_1.2.50.335.g5e2860a8_amd64.deb 143617148 BLAKE2B be1e3f3ee9265b7c378e5b8ba0d73407918efdaf799d44cb79063c8b71ee8da248537fae063f8c18913b89a82bbc83f979c30cd6d984fcb4d059ae0488689bfe SHA512 d7b7e0bdc845ecda4e99657de0a2eaf32850053e86163a5bf93e9727330838f7997d2afe297a908b380467d78860f69bce0040fca4411274a23cb2a4981cb014 +DIST spotify-client_1.2.52.442.g01893f92_amd64.deb 143523470 BLAKE2B 907358fb2cc55c0bc67485a64a56c8a636d091787667b57da0d893bcd0b629d70f97d8ec54e93f150cd06ac73172fdb165ab880aa309c56ceb6625bd93f7046c SHA512 694e0b274bf56eb1ca199b060632de8bd1d49ef3977cbb8cd04839c6677d0d26a8065781433fd7e63ae46490087beff356078abf9fd0ce0bf463bb05dc91a55a diff --git a/media-sound/spotify/spotify-1.2.52.ebuild b/media-sound/spotify/spotify-1.2.52.ebuild new file mode 100644 index 000000000000..71ea3f2cb2bf --- /dev/null +++ b/media-sound/spotify/spotify-1.2.52.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils unpacker xdg + +DESCRIPTION="Spotify is a social music platform" +HOMEPAGE="https://www.spotify.com/download/linux/" +SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" +BUILD_ID_AMD64="442.g01893f92" +SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" + +LICENSE="Spotify" +SLOT="0" +KEYWORDS="amd64" +IUSE="libnotify local-playback pax-kernel pulseaudio" +RESTRICT="mirror strip" + +BDEPEND=" + >=dev-util/patchelf-0.10 + sys-devel/gettext +" +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + dev-libs/openssl:0= + dev-python/dbus-python + media-libs/alsa-lib + media-libs/fontconfig + media-libs/harfbuzz + media-libs/mesa[X(+)] + net-misc/curl[ssl] + net-print/cups[ssl(+)] + sys-apps/dbus + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/pango + !gnome-extra/gnome-integration-spotify + libnotify? ( x11-libs/libnotify ) + dev-libs/libayatana-appindicator + local-playback? ( media-video/ffmpeg:0/56.58.58 ) + pulseaudio? ( media-libs/libpulse ) + !pulseaudio? ( media-sound/apulse ) +" + #gnome-integration-spotify causes spotify to fail to launch + #sys-libs/glibc + +S="${WORKDIR}/" + +QA_PREBUILT=" + opt/spotify/spotify-client/spotify + opt/spotify/spotify-client/libEGL.so + opt/spotify/spotify-client/libGLESv2.so + opt/spotify/spotify-client/libcef.so + opt/spotify/spotify-client/libvk_swiftshader.so + opt/spotify/spotify-client/libvulkan.so.1 + opt/spotify/spotify-client/swiftshader/libEGL.so + opt/spotify/spotify-client/swiftshader/libGLESv2.so +" + +src_prepare() { + default + # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. + patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ + || die "failed to patch libcurl library dependency" +} + +src_install() { + SPOTIFY_PKG_HOME=usr/share/spotify + insinto /usr/share/pixmaps + doins ${SPOTIFY_PKG_HOME}/icons/*.png + + # install in /opt/spotify + SPOTIFY_HOME=/opt/spotify/spotify-client + insinto ${SPOTIFY_HOME} + doins -r ${SPOTIFY_PKG_HOME}/* + fperms +x ${SPOTIFY_HOME}/spotify + + dodir /usr/bin + SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \ + envsubst '$SPOTIFY_HOME $LIBDIR' \ + < "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die + fperms +x /usr/bin/spotify + + local size + for size in 16 22 24 32 48 64 128 256 512; do + newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ + "spotify-client.png" + done + domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" + if use pax-kernel; then + #create the headers, reset them to default, then paxmark -m them + pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die + eqawarn "You have set USE=pax-kernel meaning that you intend to run" + eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" + eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is being broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + ewarn "If Spotify crashes after an upgrade its cache may be corrupt." + ewarn "To remove the cache:" + ewarn "rm -rf ~/.cache/spotify" +} diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest index 8c0b899235f4..20dd2fa73715 100644 --- a/media-sound/strawberry/Manifest +++ b/media-sound/strawberry/Manifest @@ -1,3 +1,2 @@ -DIST strawberry-1.1.3.tar.xz 11347368 BLAKE2B 38e6de5e2723f14973ca922d2bcf593cc445b711e3c437fa425959555b1f942657e32ba62259383720becb945664a60f06fee7468fc03ef4492209e1b0cb6e78 SHA512 666c52f5b912aebc09d86465ee9ac464b8c87e1d20d1650204e305a5d5d1c5b34f97bcbd60ef9bd8c50ed927fe55595ade56c1c5202665931f1a1c58fb7118d3 DIST strawberry-1.2.2.tar.xz 11460012 BLAKE2B bf0edcec29b85cd33b8f2ee883979e6056f776b039e265f63e9b1f7c04cd5193531477f4a52d1eb6f520e380078eee13d3b8d9823f78806527712c09b7a445aa SHA512 f61029de969c47c10c4353d2613a111e0103d1fa0f2e968e3b3c0ce8679f4eaeb302ff24e4bbe28af4513b88b73ca8d02e8e0418fc1150a3144316d5441e996c DIST strawberry-1.2.3.tar.xz 11460484 BLAKE2B 7fc1313a496a4f19ca2853b3cc21ba0ceab8dfa2a4916271fd073e7171e4705f232c244598df550574c57bd73cf1446e384d0d563cf9281be32f2d01ef996d65 SHA512 3efe5c8245376731a0558493f6153d312badad21553502d9a876c0d00c74c157aa3b7549815d9925457cedf87f1c94dca25588ae4ece1cf442b9a29f056dc447 diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml index 0f4c08885dfa..466d6bb678cb 100644 --- a/media-sound/strawberry/metadata.xml +++ b/media-sound/strawberry/metadata.xml @@ -9,9 +9,7 @@ <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg></flag> <flag name="loudness">Enable loudness normalisation according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg></flag> <flag name="moodbar">Enable moodbar support</flag> - <flag name="soup">Allow streaming with <pkg>media-plugins/gst-plugins-soup</pkg></flag> <flag name="streaming">Enable Online Streaming Support</flag> - <flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag> </use> <upstream> <remote-id type="github">strawberrymusicplayer/strawberry</remote-id> diff --git a/media-sound/strawberry/strawberry-1.1.3.ebuild b/media-sound/strawberry/strawberry-1.1.3.ebuild deleted file mode 100644 index 6785fe0dffa3..000000000000 --- a/media-sound/strawberry/strawberry-1.1.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic plocale xdg - -PLOCALES="ca_ES cs_CZ de_DE es_AR es_ES es_MX et_EE fi_FI fr_FR hu_HU id_ID it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_BR ru_RU sv_SE tr_CY tr_TR uk_UA zh_CN zh_TW" - -DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" -HOMEPAGE="https://www.strawberrymusicplayer.org/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry" - inherit git-r3 -else - SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - !qt6? ( dev-qt/linguist-tools:5 ) -" -COMMON_DEPEND=" - dev-db/sqlite:= - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/protobuf:= - media-libs/alsa-lib - media-libs/taglib - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - qt6? ( - dev-libs/kdsingleapplication[qt6(+)] - dev-qt/qtbase:6[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets] - ) - cdda? ( dev-libs/libcdio:= ) - gstreamer? ( - media-libs/chromaprint:= - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - ipod? ( media-libs/libgpod ) - moodbar? ( sci-libs/fftw:3.0 ) - mtp? ( media-libs/libmtp ) - pulseaudio? ( media-libs/libpulse ) - vlc? ( media-video/vlc ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -RDEPEND="${COMMON_DEPEND} - gstreamer? ( - media-plugins/gst-plugins-meta:1.0 - soup? ( media-plugins/gst-plugins-soup:1.0 ) - media-plugins/gst-plugins-taglib:1.0 - ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/gtest - dev-libs/boost - !qt6? ( dev-qt/qttest:5 ) -" - -DOCS=( Changelog README.md ) - -REQUIRED_USE=" - cdda? ( gstreamer ) - || ( gstreamer vlc ) -" - -src_prepare() { - plocale_find_changes "src/translations" "" ".po" - - cmake_src_prepare -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_GIO=ON - -DLINGUAS="$(plocale_get_locales)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_GSTREAMER="$(usex gstreamer)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_MUSICBRAINZ="$(usex gstreamer)" - -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)" - -DENABLE_SPOTIFY="$(usex gstreamer)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_VLC="$(usex vlc)" - -DBUILD_WITH_QT6="$(usex qt6)" - -DBUILD_WITH_QT5="$(usex !qt6)" - -DQT_VERSION_MAJOR="$(usex qt6 6 5)" - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - if use gstreamer ; then - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" - fi -} diff --git a/media-sound/strawberry/strawberry-1.2.3.ebuild b/media-sound/strawberry/strawberry-1.2.2-r1.ebuild index 50b3d4f3a933..62a157052f29 100644 --- a/media-sound/strawberry/strawberry-1.2.3.ebuild +++ b/media-sound/strawberry/strawberry-1.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" fi LICENSE="GPL-3" @@ -48,7 +48,8 @@ COMMON_DEPEND=" " # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0[taglib] + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-taglib udisks? ( sys-fs/udisks:2 ) kde? ( kde-frameworks/kglobalaccel ) " diff --git a/media-sound/strawberry/strawberry-1.2.2.ebuild b/media-sound/strawberry/strawberry-1.2.3-r2.ebuild index 50b3d4f3a933..c2b53b601542 100644 --- a/media-sound/strawberry/strawberry-1.2.2.ebuild +++ b/media-sound/strawberry/strawberry-1.2.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ COMMON_DEPEND=" dev-libs/glib:2 dev-libs/icu:= media-libs/alsa-lib - media-libs/taglib + media-libs/taglib:= dev-libs/kdsingleapplication[qt6(+)] dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?] media-libs/gstreamer:1.0 @@ -48,7 +48,8 @@ COMMON_DEPEND=" " # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0[taglib] + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-taglib udisks? ( sys-fs/udisks:2 ) kde? ( kde-frameworks/kglobalaccel ) " diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild index 50b3d4f3a933..c2b53b601542 100644 --- a/media-sound/strawberry/strawberry-9999.ebuild +++ b/media-sound/strawberry/strawberry-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ COMMON_DEPEND=" dev-libs/glib:2 dev-libs/icu:= media-libs/alsa-lib - media-libs/taglib + media-libs/taglib:= dev-libs/kdsingleapplication[qt6(+)] dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?] media-libs/gstreamer:1.0 @@ -48,7 +48,8 @@ COMMON_DEPEND=" " # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0[taglib] + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-taglib udisks? ( sys-fs/udisks:2 ) kde? ( kde-frameworks/kglobalaccel ) " diff --git a/media-sound/supercollider/supercollider-3.13.0.ebuild b/media-sound/supercollider/supercollider-3.13.0.ebuild deleted file mode 100644 index a240f4f6df33..000000000000 --- a/media-sound/supercollider/supercollider-3.13.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Environment and programming language for real time audio synthesis" -HOMEPAGE="https://supercollider.github.io/" -SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2" -S="${WORKDIR}/SuperCollider-${PV}-Source" - -LICENSE="GPL-2 gpl3? ( GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ableton-link cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X +zeroconf" - -REQUIRED_USE=" - qt5? ( X ) - webengine? ( qt5 ) -" - -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-cpp/yaml-cpp:= - dev-libs/boost:= - media-libs/alsa-lib - sys-libs/readline:0= - virtual/libudev:= - fftw? ( sci-libs/fftw:3.0= ) - jack? ( virtual/jack ) - !jack? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - sndfile? ( media-libs/libsndfile ) - webengine? ( - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwebsockets:5 - ) - X? ( - x11-libs/libX11 - x11-libs/libXt - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND="${RDEPEND} - dev-libs/icu - emacs? ( >=app-editors/emacs-23.1:* ) - gedit? ( app-editors/gedit ) - qt5? ( dev-qt/qtconcurrent:5 ) - vim? ( app-editors/vim ) -" - -PATCHES=( - "${FILESDIR}/${P}-boost-1.84.patch" # bug 921595 - "${FILESDIR}/${P}-gcc-13.patch" # bug 905127 - "${FILESDIR}/${P}-no-ccache.patch" # bug 922095 -) - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/927071 - # https://github.com/supercollider/supercollider/issues/6245 - append-flags -fno-strict-aliasing - filter-lto - - local mycmakeargs=( - -DSC_CLANG_USES_LIBSTDCPP=ON - -DINSTALL_HELP=ON - -DSYSTEM_BOOST=ON - -DSYSTEM_YAMLCPP=ON - -DUSE_CCACHE=OFF - -DSC_ABLETON_LINK=$(usex ableton-link) - -DSSE=$(usex cpu_flags_x86_sse) - -DSSE2=$(usex cpu_flags_x86_sse2) - -DSC_EL=$(usex emacs) - -DFFT_GREEN=$(usex !fftw) - -DSC_ED=$(usex gedit) - -DNO_GPL3=$(usex !gpl3) - -DAUDIOAPI=$(usex jack jack portaudio) - -DSC_IDE=$(usex qt5) - -DSC_QT=$(usex qt5) - -DSCLANG_SERVER=$(usex server) - -DSUPERNOVA=$(usex server) - -DNO_LIBSNDFILE=$(usex !sndfile) - -DLIBSCSYNTH=$(usex !static-libs) - -DSC_VIM=$(usex vim) - -DNO_X11=$(usex !X) - -DNO_AVAHI=$(usex !zeroconf) - ) - - use qt5 && mycmakeargs+=( - -DSC_USE_QTWEBENGINE=$(usex webengine) - ) - - use debug && mycmakeargs+=( - -DSC_MEMORY_DEBUGGING=ON - -DSN_MEMORY_DEBUGGING=ON - -DGC_SANITYCHECK=ON - ) - - append-flags $(usex debug '' -DNDEBUG) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - use emacs && newdoc editors/sc-el/README.md README.emacs - use gedit && newdoc editors/sced/README.md README.gedit - use vim && newdoc editors/scvim/README.md README.vim -} - -src_test() { - export QT_QPA_PLATFORM=offscreen - cmake_src_test -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - einfo "Notice: SuperCollider is not very intuitive to get up and running." - einfo "The best course of action to make sure that the installation was" - einfo "successful and get you started with using SuperCollider is to take" - einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2" - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/taginfo/taginfo-1.2-r3.ebuild b/media-sound/taginfo/taginfo-1.2-r3.ebuild new file mode 100644 index 000000000000..ad70c339a467 --- /dev/null +++ b/media-sound/taginfo/taginfo-1.2-r3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A simple ID3 tag reader for use in shell scripts" +HOMEPAGE="http://freshmeat.net/projects/taginfo" +SRC_URI="http://grecni.com/software/taginfo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="media-libs/taglib:=" +DEPEND="${RDEPEND}" + +src_compile() { + emake CC="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS}" +} + +src_install() { + dobin taginfo + dodoc ChangeLog contrib/mp3-resample.sh README +} diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild index 86ee3a0715bc..99847f852414 100644 --- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77.ebuild +++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,38 +12,35 @@ S="${WORKDIR}" LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )" SLOT="5" - -IUSE="+alsa pulseaudio" -REQUIRED_USE="|| ( alsa pulseaudio )" +KEYWORDS="-* ~amd64" RDEPEND=" - app-accessibility/at-spi2-core + app-accessibility/at-spi2-core:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss + dev-libs/olm media-libs/alsa-lib - media-libs/fontconfig:1.0 + media-libs/harfbuzz + media-libs/mesa net-print/cups - sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite - x11-libs/libXcursor x11-libs/libXdamage + x11-libs/libdrm x11-libs/libXext x11-libs/libXfixes - x11-libs/libXi + x11-libs/libnotify + x11-libs/libxcb + x11-libs/libxkbcommon x11-libs/libXrandr - x11-libs/libXrender x11-libs/libXScrnSaver - x11-libs/libXtst x11-libs/pango - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-libs/libpulse ) " RESTRICT="bindist mirror" @@ -61,10 +58,6 @@ QA_PREBUILT=" src_prepare() { default - - if ! use alsa; then - rm soundbackends/libalsa_linux_*.so || die - fi } src_install() { @@ -78,17 +71,25 @@ src_install() { dodir /opt/bin dosym ../teamspeak5-client/TeamSpeak /opt/bin/ts5client + for iconsize in 48 128 256; do + newicon -s ${iconsize} logo-${iconsize}.png teamspeak5.png + done + make_desktop_entry \ /opt/bin/ts5client "Teamspeak 5 Client" \ - /opt/teamspeak5-client/html/client_ui/images/icons/teamspeak_logo.svg "Audio;AudioVideo;Network" + "teamspeak5" "Audio;AudioVideo;Network" + + dodoc docs/* } pkg_postinst() { xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update } pkg_postrm() { xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update } diff --git a/media-sound/vimpc/vimpc-0.09.2-r2.ebuild b/media-sound/vimpc/vimpc-0.09.2-r3.ebuild index 42d1fa28e1f5..49bf0e3b156e 100644 --- a/media-sound/vimpc/vimpc-0.09.2-r2.ebuild +++ b/media-sound/vimpc/vimpc-0.09.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ RDEPEND=" dev-libs/libpcre media-libs/libmpdclient boost? ( dev-libs/boost:= ) - taglib? ( media-libs/taglib ) + taglib? ( media-libs/taglib:= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild index 517aa42ede27..5152dea6f616 100644 --- a/media-sound/vimpc/vimpc-9999.ebuild +++ b/media-sound/vimpc/vimpc-9999.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-libs/libpcre media-libs/libmpdclient boost? ( dev-libs/boost:= ) - taglib? ( media-libs/taglib ) + taglib? ( media-libs/taglib:= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest index 88fd8ecb1b65..b51f5cb7febf 100644 --- a/media-sound/vmpk/Manifest +++ b/media-sound/vmpk/Manifest @@ -1 +1,2 @@ DIST vmpk-0.9.0.tar.bz2 449608 BLAKE2B 80827907ac32788c687ff71170afec2de32a02cc9f1096b5af5e1cc6a43c513efbbd5f9dc443cf2d56a536c158b343a362fccb57814c99d9891a5a5b7c83d5ff SHA512 7e84daa0664bc9d403df6c7bd5a226ea37c4804c49e4bcfb2e4f141e257e0081b752e9c2bddc29a9d2eda8bcb06b8ed1c79d129e55d601dfb58951449ebf454f +DIST vmpk-0.9.1.tar.bz2 451586 BLAKE2B 752f395193509f829e5c259e833a0e41de7cd98f773a7c8c67df6e55d66e25c532530234104a50fffcce632473eeea7fbed1128a2a8417db8eada2759bab6016 SHA512 fddeb5c87c442eb5aff85a871e0daa05ce2d56f006c8b710bad35152e3696f5f2f7eac5fc713afec461940d45d4a4156e81773aad1ea454494d65e47aac93016 diff --git a/media-sound/vmpk/vmpk-0.9.1.ebuild b/media-sound/vmpk/vmpk-0.9.1.ebuild new file mode 100644 index 000000000000..ffc295090c49 --- /dev/null +++ b/media-sound/vmpk/vmpk-0.9.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Virtual MIDI Piano Keyboard" +HOMEPAGE="https://vmpk.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/vmpk/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus" + +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" + dev-qt/qtbase:6[gui,network,widgets] + >=media-sound/drumstick-2.10.0 + x11-libs/libxcb + dbus? ( dev-qt/qtbase:6[dbus] ) +" +RDEPEND="${DEPEND} + dev-qt/qtsvg:5 +" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DBUS=$(usex dbus) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + dodir /usr/share/doc/${PF}/html + mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die +} diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest index 9804cd51d34d..92b625ee751d 100644 --- a/media-sound/xfmpc/Manifest +++ b/media-sound/xfmpc/Manifest @@ -1 +1,2 @@ DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0 +DIST xfmpc-0.3.2.tar.bz2 566036 BLAKE2B 5fe6affcf5c96b5fc0e6050b6fe3ab7f81013296133b49d44a807e2cc644b156e34c97d61cb9a980470e6e14f0d71ad76b132986d9e1252f0e7d2fff18284687 SHA512 340997f581e2821979d8501d3dcf010b50dbb0a9755465dbdcdd61de25fda299f0f0853128d7181deadea49faa182a823c33e30db30a56e0adc24dbe85b1252f diff --git a/media-sound/xfmpc/xfmpc-0.3.2.ebuild b/media-sound/xfmpc/xfmpc-0.3.2.ebuild new file mode 100644 index 000000000000..98aa79097655 --- /dev/null +++ b/media-sound/xfmpc/xfmpc-0.3.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg-utils + +DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment" +HOMEPAGE=" + https://docs.xfce.org/apps/xfmpc/start + https://gitlab.xfce.org/apps/xfmpc/ +" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-libs/glib-2.38.0:2= + >=media-libs/libmpd-0.15.0:= + >=x11-libs/gtk+-3.22.0:3= + >=xfce-base/libxfce4ui-4.12.0:= + >=xfce-base/libxfce4util-4.12.0:= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch new file mode 100644 index 000000000000..d234866ea26d --- /dev/null +++ b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch @@ -0,0 +1,44 @@ +https://github.com/sebaro/Yarock/commit/3cdc8910a6dec9054913dcdd8e804bb79b53b861.patch +--- a/src/core/mediaitem/tag.cpp ++++ b/src/core/mediaitem/tag.cpp +@@ -28,6 +28,7 @@ + + #include <taglib/mpegfile.h> + #include <taglib/asffile.h> ++#include <taglib/attachedpictureframe.h> + #include <taglib/vorbisfile.h> + #include <taglib/oggfile.h> + #include <taglib/oggflacfile.h> +@@ -289,10 +290,10 @@ + /*----------------------------------------------------------------------------*/ + static void readMP4Tags(TagLib::MP4::Tag *tag, MEDIA::TrackPtr track, QString& s_disc ) + { +- const TagLib::MP4::ItemListMap& items = tag->itemListMap(); ++ const TagLib::MP4::ItemMap& items = tag->itemMap(); + + /* album artists tags */ +- TagLib::MP4::ItemListMap::ConstIterator it = items.find("aART"); ++ TagLib::MP4::ItemMap::ConstIterator it = items.find("aART"); + if ( it != items.end() ) + { + TagLib::StringList album_artists = it->second.toStringList(); +@@ -665,7 +666,7 @@ + else if (TagLib::MP4::File* file = dynamic_cast<TagLib::MP4::File*>(fileref.file())) + { + TagLib::MP4::Tag* tag = file->tag(); +- tag->itemListMap()[kMP4_FMPS_Rating_ID] = TagLib::StringList(QStringToTaglibString(QString::number( rating ))); ++ tag->setItem(kMP4_FMPS_Rating_ID, TagLib::StringList(QStringToTaglibString(QString::number( rating )))); + } + else + { +@@ -772,8 +773,8 @@ + if (aac_file) + { + TagLib::MP4::Tag* tag = aac_file->tag(); +- const TagLib::MP4::ItemListMap& items = tag->itemListMap(); +- TagLib::MP4::ItemListMap::ConstIterator it = items.find("covr"); ++ const TagLib::MP4::ItemMap& items = tag->itemMap(); ++ TagLib::MP4::ItemMap::ConstIterator it = items.find("covr"); + if (it != items.end()) + { + const TagLib::MP4::CoverArtList& art_list = it->second.toCoverArtList(); diff --git a/media-sound/yarock/yarock-1.4.0-r3.ebuild b/media-sound/yarock/yarock-1.4.0-r4.ebuild index 2d7d556e68e6..e12b562a93b8 100644 --- a/media-sound/yarock/yarock-1.4.0-r3.ebuild +++ b/media-sound/yarock/yarock-1.4.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,10 +25,10 @@ RDEPEND=" dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 - media-libs/taglib + media-libs/taglib:= x11-libs/libX11 mpv? ( media-video/mpv:=[libmpv] ) - phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) + phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] ) vlc? ( media-video/vlc:= ) " DEPEND="${RDEPEND} @@ -39,6 +39,8 @@ BDEPEND=" dev-qt/linguist-tools:5 " +PATCHES=( "${FILESDIR}"/${PN}-1.4.0-fix-build-taglib2.patch ) + DOCS=( CHANGES.md README.md ) src_prepare() { diff --git a/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch new file mode 100644 index 000000000000..e3266ce7af7a --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch @@ -0,0 +1,15 @@ +MiscGui.cpp:1434:18: error: 'fl_display' was not declared ... + +Other files are using x.H, but that header is deprecated and +the correct one is platform.H. fl_display is X-specific, so +this likely cannot work without fltk[X] at the moment. +--- a/UI/MiscGui.cpp ++++ b/UI/MiscGui.cpp +@@ -28,6 +28,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_draw.H> ++#include <FL/platform.H> + + #include <cairo.h> + #include <cairo-xlib.h> diff --git a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild index d52b5bb9ab3d..d25e3732e7d9 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild index 42acb9b39317..67ffcae93119 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch new file mode 100644 index 000000000000..db1bd93ece30 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch @@ -0,0 +1,20 @@ +MasterUI.cxx:2377:3: error: 'fl_open_display' was not declared ... + +Other files are using x.H, but that header is deprecated and the +correct one is platform.H. fl_display that it alse needs platform.H +for is X-specific, so this likely cannot work without fltk[X] at +the moment. + +(next revision of the ebuild removes fltk, so it won't matter much) +--- a/src/UI/MasterUI.fl ++++ b/src/UI/MasterUI.fl +@@ -76,6 +76,9 @@ + decl {\#include "common.H"} {public local + } + ++decl {\#include "FL/platform.H"} {public local ++} ++ + decl {\#if USE_NSM + \#include "NSM.H" + extern NSM_Client *nsm; diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild index da2c1db9b0e1..5a6403763d41 100644 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild @@ -24,7 +24,7 @@ DEPEND=" doc? ( dev-texlive/texlive-fontutils ) dssi? ( media-libs/dssi ) fltk? ( - x11-libs/fltk:1 + x11-libs/fltk:1=[X(+)] x11-libs/libX11 x11-libs/libXpm ) @@ -42,6 +42,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-docs.patch "${FILESDIR}"/${P}-stdint.patch + "${FILESDIR}"/${P}-fltk1.4.patch ) DOCS=( AUTHORS.txt NEWS.txt README.adoc ) diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild index 0f9fbe9e9d5c..0f9fbe9e9d5c 100644 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild |