summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
commita978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree8c764c1cc0576389ce22abd317bceba71ea5732d /media-sound
parent40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
gentoo resync : 04.05.2021
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/Manifest.gzbin58679 -> 58662 bytes
-rw-r--r--media-sound/cmus/Manifest7
-rw-r--r--media-sound/cmus/cmus-2.8.0.ebuild151
-rw-r--r--media-sound/cmus/cmus-2.9.1.ebuild2
-rw-r--r--media-sound/cmus/files/cmus-2.8.0-elogind.patch22
-rw-r--r--media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch124
-rw-r--r--media-sound/cmus/files/cmus-2.8.0-opus.patch22
-rw-r--r--media-sound/din/Manifest4
-rw-r--r--media-sound/din/din-50.1.ebuild2
-rw-r--r--media-sound/din/din-50.ebuild57
-rw-r--r--media-sound/jack_capture/Manifest2
-rw-r--r--media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild (renamed from media-sound/jack_capture/jack_capture-0.9.73.ebuild)2
-rw-r--r--media-sound/linuxsampler/Manifest2
-rw-r--r--media-sound/linuxsampler/linuxsampler-2.1.1.ebuild6
-rw-r--r--media-sound/mumble/Manifest4
-rw-r--r--media-sound/mumble/mumble-1.3.4.ebuild5
-rw-r--r--media-sound/mumble/mumble-9999.ebuild5
-rw-r--r--media-sound/ogmtools/Manifest3
-rw-r--r--media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch374
-rw-r--r--media-sound/ogmtools/ogmtools-1.5-r2.ebuild3
-rw-r--r--media-sound/patchage/Manifest2
-rw-r--r--media-sound/patchage/patchage-1.0.4.ebuild2
-rw-r--r--media-sound/picard/Manifest4
-rw-r--r--media-sound/picard/picard-2.4.2.ebuild10
-rw-r--r--media-sound/picard/picard-9999.ebuild10
-rw-r--r--media-sound/pulseaudio/Manifest4
-rw-r--r--media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild7
-rw-r--r--media-sound/pulseaudio/pulseaudio-13.0.ebuild7
-rw-r--r--media-sound/rhythmbox/Manifest2
-rw-r--r--media-sound/rhythmbox/rhythmbox-3.4.4.ebuild2
-rw-r--r--media-sound/schismtracker/Manifest2
-rw-r--r--media-sound/schismtracker/schismtracker-20190805.ebuild52
-rw-r--r--media-sound/snapcast/Manifest3
-rw-r--r--media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch11
-rw-r--r--media-sound/snapcast/snapcast-0.20.0.ebuild4
-rw-r--r--media-sound/spotify/Manifest6
-rw-r--r--media-sound/spotify/spotify-1.1.26-r1.ebuild7
-rw-r--r--media-sound/spotify/spotify-1.1.26-r2.ebuild7
-rw-r--r--media-sound/spotify/spotify-1.1.55.ebuild5
-rw-r--r--media-sound/umurmur/Manifest8
-rw-r--r--media-sound/umurmur/umurmur-0.2.17-r4.ebuild14
-rw-r--r--media-sound/umurmur/umurmur-0.2.19.ebuild7
-rw-r--r--media-sound/umurmur/umurmur-0.2.20.ebuild2
-rw-r--r--media-sound/umurmur/umurmur-9999.ebuild2
-rw-r--r--media-sound/wavpack/Manifest3
-rw-r--r--media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch52
-rw-r--r--media-sound/wavpack/wavpack-5.3.2-r1.ebuild49
47 files changed, 512 insertions, 569 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c553dca87d8a..0edc248f7fb3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 65fea4bf7e12..507bfdb4a5ac 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,10 +1,5 @@
-AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e734750c1b8a6591459bbebe582fa5a6e632c17d45a6d05e0f58a18ed20432efcceb36e9c3f057e79770eb5db0 SHA512 6333c5d5700985f4a9b0996848409a4f149a70d2e32ce0b0132ac4044e46ca763c037c26e2a886f30c1a439b60619a21a398583d184f513dbca581a878bd0754
-AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
-AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
-DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-EBUILD cmus-2.8.0.ebuild 3784 BLAKE2B edbbfe140b7c6adce8ae96a5e6d53db118ca7492f37388201fff09cfe0fd0acd56ec6e8adc90b3455a722c731dd0e7b301a4f975be60168928fbd427fb7f0620 SHA512 2357fdfe2a83b2f70bbfcb1debdd3ded1de6e4d0bafd28f414e241a54ff9dda3661c2c775c11bf76b05b129cb2b3d3cc72a6d17e1777dffcd22b6a47c59a5202
-EBUILD cmus-2.9.1.ebuild 3707 BLAKE2B 9869337af55de189c81ab7feac24a85b7cd26490f4001cf0c85252c273daa1892ba2430eba8575222e2557d6ef1393fd6f3b7ac534566df24af489eb910961ea SHA512 d300b346f2a1cfe78cf1e4d620b11542fdfe80214005b78b06a3805cafe4ac38e2b0d6820c01af1323422ad0267a3d6fa97c740627fdd1e381927f078f9aa431
+EBUILD cmus-2.9.1.ebuild 3706 BLAKE2B 87b99a5d1fa95c12204dfd1e550b622543fa40272633fcf6ffdb08bd3d7faaf72c624b59812c90c4ba8af3f779f80dc916c584d5e2c416d62e10f2de40ee6431 SHA512 47638d4588881af8e245810dc23ea2f15326f4356bde80e582127c80f557dea07640e1281bcf4b860b63c12476e5328e14cccad051256a032a4748c0174bd5a9
EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade
MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
deleted file mode 100644
index 1cc9fb01d880..000000000000
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/cmus/cmus.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
-HOMEPAGE="https://cmus.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
- +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
- +vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- sys-libs/ncurses:0=[unicode?]
- aac? ( media-libs/faad2 )
- alsa? ( >=media-libs/alsa-lib-1.0.11 )
- ao? ( media-libs/libao )
- cddb? ( media-libs/libcddb )
- cdio? ( dev-libs/libcdio-paranoia )
- discid? ( media-libs/libdiscid )
- elogind? ( sys-auth/elogind )
- ffmpeg? ( media-video/ffmpeg:= )
- flac? ( media-libs/flac )
- jack? ( virtual/jack )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( >=media-libs/libmad-0.14 )
- mikmod? ( media-libs/libmikmod:0 )
- modplug? ( >=media-libs/libmodplug-0.7 )
- mp4? ( >=media-libs/libmp4v2-1.9:0 )
- musepack? ( >=media-sound/musepack-tools-444 )
- opus? ( media-libs/opusfile )
- pulseaudio? ( media-sound/pulseaudio )
- systemd? ( sys-apps/systemd )
- tremor? ( media-libs/tremor )
- !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
- wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
- pidgin? (
- dev-python/dbus-python
- net-im/pidgin
- )
-"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
- mp4? ( aac )" # enabling mp4 adds -lfaad
-
-DOCS=( AUTHORS README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-elogind.patch"
- "${FILESDIR}/${P}-ffmpeg-deprecations.patch"
- "${FILESDIR}/${P}-opus.patch"
-)
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
- my_config() {
- local value
- use ${1} && value=a || value=n
- myconf+=( ${2}=${value} )
- }
-
- local debuglevel=1
- use debug && debuglevel=2
- local myconf=(
- CONFIG_CUE=y
- CONFIG_ARTS=n
- CONFIG_SUN=n
- CONFIG_SNDIO=n
- CONFIG_WAVEOUT=n
- CONFIG_VTX=n
- CONFIG_ROAR=n
- )
-
- my_config cddb CONFIG_CDDB
- my_config cdio CONFIG_CDIO
- my_config discid CONFIG_DISCID
- my_config flac CONFIG_FLAC
- my_config mad CONFIG_MAD
- my_config modplug CONFIG_MODPLUG
- my_config mikmod CONFIG_MIKMOD
- my_config musepack CONFIG_MPC
- my_config vorbis CONFIG_VORBIS
- my_config tremor CONFIG_TREMOR
- my_config opus CONFIG_OPUS
- my_config wavpack CONFIG_WAVPACK
- my_config mp4 CONFIG_MP4
- my_config aac CONFIG_AAC
- my_config ffmpeg CONFIG_FFMPEG
- my_config pulseaudio CONFIG_PULSE
- my_config alsa CONFIG_ALSA
- my_config jack CONFIG_JACK
- my_config libsamplerate CONFIG_SAMPLERATE
- my_config ao CONFIG_AO
- my_config oss CONFIG_OSS
-
- if use elogind || use systemd; then
- myconf+=( CONFIG_MPRIS=a )
- else
- myconf+=( CONFIG_MPRIS=n )
- fi
-
- ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
- libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_compile() {
- tc-export_build_env BUILD_CC
- emake V=2 \
- CC="$(tc-getCC)" LD="$(tc-getCC)" \
- HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
- HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
-}
-
-src_install() {
- default
-
- if ! use examples; then
- rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
- fi
-
- insinto /usr/share/zsh/site-functions
- doins contrib/_cmus
-
- newbashcomp contrib/${PN}.bash-completion ${PN}
-
- if use pidgin; then
- newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
- fi
-}
diff --git a/media-sound/cmus/cmus-2.9.1.ebuild b/media-sound/cmus/cmus-2.9.1.ebuild
index 92687b137803..8b85f4342e55 100644
--- a/media-sound/cmus/cmus-2.9.1.ebuild
+++ b/media-sound/cmus/cmus-2.9.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch
deleted file mode 100644
index e1309c78911d..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-elogind.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001
-From: Shiba <3816409+shibotto@users.noreply.github.com>
-Date: Tue, 12 Feb 2019 15:29:43 +0100
-Subject: [PATCH] Add support for elogind (#846)
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 1f46c30a..4627126e 100755
---- a/configure
-+++ b/configure
-@@ -289,7 +289,7 @@ check_vorbis()
-
- check_libsystemd()
- {
-- pkg_config LIBSYSTEMD "libsystemd"
-+ pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3"
- return $?
- }
-
diff --git a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
deleted file mode 100644
index 941f47e3d499..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 9877eb02381fd4c57059f9c77be03127c28d8f88 Mon Sep 17 00:00:00 2001
-From: Niko E <nefthy@users.noreply.github.com>
-Date: Mon, 11 Feb 2019 09:09:21 +0100
-Subject: [PATCH] Fixes ffmpeg deprecations (#861)
-
-- av_register_all is no longer needed since 4.0
-- AVStream::codec is deprecated since 3.1
-- avcodec_decode_audio4 is deprecated since 3.1
----
- ip/ffmpeg.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index eaad5c4f..418a37f8 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -128,9 +128,11 @@ static void ffmpeg_init(void)
-
- av_log_set_level(AV_LOG_QUIET);
-
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100)
- /* We could register decoders explicitly to save memory, but we have to
- * be careful about compatibility. */
- av_register_all();
-+#endif
- }
-
- static int ffmpeg_open(struct input_plugin_data *ip_data)
-@@ -143,6 +145,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- AVCodec *codec;
- AVCodecContext *cc = NULL;
- AVFormatContext *ic = NULL;
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ AVCodecParameters *cp = NULL;
-+#endif
- SwrContext *swr = NULL;
-
- ffmpeg_init();
-@@ -162,11 +167,20 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- }
-
- for (i = 0; i < ic->nb_streams; i++) {
-+
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ cp = ic->streams[i]->codecpar;
-+ if (cp->codec_type == AVMEDIA_TYPE_AUDIO) {
-+ stream_index = i;
-+ break;
-+ }
-+#else
- cc = ic->streams[i]->codec;
- if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
- stream_index = i;
- break;
- }
-+#endif
- }
-
- if (stream_index == -1) {
-@@ -175,7 +189,13 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- break;
- }
-
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ codec = avcodec_find_decoder(cp->codec_id);
-+ cc = avcodec_alloc_context3(codec);
-+ avcodec_parameters_to_context(cc, cp);
-+#else
- codec = avcodec_find_decoder(cc->codec_id);
-+#endif
- if (!codec) {
- d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
- err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
-@@ -196,6 +216,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
-
- if (err < 0) {
- /* Clean up. cc is never opened at this point. (See above assumption.) */
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ avcodec_free_context(&cc);
-+#endif
- avformat_close_input(&ic);
- return err;
- }
-@@ -207,6 +230,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- priv->input = ffmpeg_input_create();
- if (priv->input == NULL) {
- avcodec_close(cc);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ avcodec_free_context(&cc);
-+#endif
- avformat_close_input(&ic);
- free(priv);
- return -IP_ERROR_INTERNAL;
-@@ -252,6 +278,9 @@ static int ffmpeg_close(struct input_plugin_data *ip_data)
- struct ffmpeg_private *priv = ip_data->private;
-
- avcodec_close(priv->codec_context);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ avcodec_free_context(&priv->codec_context);
-+#endif
- avformat_close_input(&priv->input_context);
- swr_free(&priv->swr);
- ffmpeg_input_free(priv->input);
-@@ -305,7 +334,20 @@ static int ffmpeg_fill_buffer(AVFormatContext *ic, AVCodecContext *cc, struct ff
- AVPacket avpkt;
- av_new_packet(&avpkt, input->curr_pkt_size);
- memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+ if (avcodec_send_packet(cc, &avpkt) == 0) {
-+ got_frame = !avcodec_receive_frame(cc, frame);
-+ if (got_frame)
-+ len = input->curr_pkt_size;
-+ else
-+ len = 0;
-+ } else {
-+ got_frame = 0;
-+ len = 0;
-+ }
-+#else
- len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt);
-+#endif
- #if LIBAVCODEC_VERSION_MAJOR >= 56
- av_packet_unref(&avpkt);
- #else
diff --git a/media-sound/cmus/files/cmus-2.8.0-opus.patch b/media-sound/cmus/files/cmus-2.8.0-opus.patch
deleted file mode 100644
index ea95fa8536ce..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-opus.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0be981476e019e9fddb5529a73aadf004e94656b Mon Sep 17 00:00:00 2001
-From: tomty89 <tom.ty89@gmail.com>
-Date: Tue, 12 Feb 2019 18:55:09 +0800
-Subject: [PATCH] ip/ffmpeg: enable opus support (#865)
-
----
- ip/ffmpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index 04b916cc..427257c7 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -519,7 +519,7 @@ const int ip_priority = 30;
- const char *const ip_extensions[] = {
- "aa", "aac", "ac3", "aif", "aifc", "aiff", "ape", "au", "fla", "flac",
- "m4a", "m4b", "mka", "mkv", "mp+", "mp2", "mp3", "mp4", "mpc", "mpp",
-- "ogg", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
-+ "ogg", "opus", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
- #ifdef USE_FALLBACK_IP
- "*",
- #endif
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index a82d277a5586..0508f1ba3aa5 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -2,8 +2,6 @@ AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d8
AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
DIST din-50.1.tar.gz 3684686 BLAKE2B 3d73f31f91a57188b63f1f5fc9a68923c4fb6d9a14cbfd602510d0006ff4079ab60865e49118a02e46381aebd4cc4ee9415172bac724f8491655326147b6466b SHA512 c860c70bb9f3c3db66e05dd9f9048daecab1b0c9d0588fde901ce26723e291b56d23086f792180fb5fc688165e4ed7efdc302d0d3d02efa913be5f2d4a90f5eb
DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
-DIST din-50.tar.gz 3684789 BLAKE2B 31efae8f031e41b04d0e1cb9dea011572b9516ed9962687d863b5cd2f77ec409a9dc6b449a299869a89abc554e673aa05bae1350a06cc850b898b878c02e8daa SHA512 58796353df9180dc6b12bfe71579fb3dd2d7ab029dc5f8d09b4f8a3cb6938db054702dc4c7344b8d8852926e052f9bdf304b9a71e3d8faa9c6a209ef0b94ff4d
-EBUILD din-50.1.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
+EBUILD din-50.1.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
EBUILD din-50.2.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
-EBUILD din-50.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-50.1.ebuild b/media-sound/din/din-50.1.ebuild
index 4d68ab765afb..f2a1cb085d4b 100644
--- a/media-sound/din/din-50.1.ebuild
+++ b/media-sound/din/din-50.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+alsa jack"
RDEPEND="
diff --git a/media-sound/din/din-50.ebuild b/media-sound/din/din-50.ebuild
deleted file mode 100644
index f2a1cb085d4b..000000000000
--- a/media-sound/din/din-50.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
- dev-lang/tcl:0=
- media-libs/libsdl:=
- virtual/glu
- virtual/opengl
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/boost
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-49.1-makefile.patch"
- "${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
- default
-
- edos2unix pixmaps/${PN}.desktop
-
- use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
- eautoreconf
-}
-
-src_configure() {
- # Jack takes over alsa.
- local sound_engine
-
- use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
- econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/jack_capture/Manifest b/media-sound/jack_capture/Manifest
index c59fb28641f8..52a274a981c8 100644
--- a/media-sound/jack_capture/Manifest
+++ b/media-sound/jack_capture/Manifest
@@ -1,6 +1,6 @@
AUX jack_capture-0.9.73-Makefile.patch 1046 BLAKE2B 5a87ea22918f46c625b23715b3bccabec6380e68374d877f6b1c3b9bb838fc3b5805c84c8a3acce3eb0cc2b7de6374a9a0124fad040c31ed8ac776972c43b7ec SHA512 8cfd1322299d314021ce58b7500ae538a43073fcc1df6514fd879d3b47db53069870846f450fb097a5a738f92dcac14e052821aa07ee1364cca648d94a47c754
AUX jack_capture-0.9.73-r1-Makefile.patch 1193 BLAKE2B be2301633901dc63853292c014adf76e0999184bf331983036116a4591e83233f05a1ff6299691c2a3409bff7223acfacffe36aca643e26e2c689ffbb4b2ec67 SHA512 b7ac7d9c040358309c3652b9c620b805b303852d6c978042790200555013077455caaa63a0c877c863b968500396ec2d3cac08b6b7cb4d7694e0344926b6a9c5
DIST jack_capture-0.9.73.tar.gz 63676 BLAKE2B 0ea944dc544f237501485c5d89299c2d1e202da2d1e3c4ef7922f4d2d49af7f0c871f077613da63ee3cb1a457a2a4edf4c1ab4b6b0625b4cb455db56d880e6f5 SHA512 eecab2e26d5e83b65adf386d6fb38f2d9169cf1574e462ec455367f7d98f4f4d5a9d0766b9c572cfdcb43c55ae914bb8a2222267842c9912e2afe13c1f7b0038
-EBUILD jack_capture-0.9.73.ebuild 1104 BLAKE2B 279ec392329e04c58fe6fdc0177b1874458be89a7cfa65aca511fcc76a005cb9306663c6d11c2a967326e5c8ca3e9af6c9674d3682999ae91717caf4d563537f SHA512 b0c070ec3964ba1386a5719f5b60c7c4842492cc0326e9c030d528f8d11b48b22518ecc6171f4a68a4535450c475beef73f67bef8b2cc7ab8fb4630e65ecd780
+EBUILD jack_capture-0.9.73-r1.ebuild 1105 BLAKE2B 5a1d6c2cf6240d779cfcf654e46a4e9c48665d97307fa0e28bc33738690cd0583206b688d8fc9c0cd3f89469ea6625ec2728136945ad1822058a337c2c3158d7 SHA512 1f9f09867157bb520dcb599b85e2312ff1af759b63c43977b4303c85726c759a44378aa8394d5e47acb4a0a3ac33ce523ec6b218d650b0252b8ee9235fb9fe64
EBUILD jack_capture-9999.ebuild 1087 BLAKE2B ceb60e4476202319d11924b209c7858973e584590eade242d1508979335c9cd6723135f6d1a6da4cb70699c998cdf9429bcdee39aac7a390876e01fa5a4186e1 SHA512 39102ee68e3cff459954b469e4d38dce3382b39dd73d9b7eda0d152eaa2a46add6c28c22518f2ec8cd24540b4ffd52547e105a5fbd95fb0d25e6813d76d4b5b0
MISC metadata.xml 361 BLAKE2B 87172f0c67cc6e071e287d233f2fcb91be1d7207fb7c321b002145cf0812a3b44cf317c0797aa281d199639d1a57670e5a1eb16d50160997882beece3e2539af SHA512 b410a8813b1a48dfc920e97401bd31f38349ef588e9fa770da53ed541b87a7da895465712d679bca09c4e27b2caf9ed84a553c330e48f6307fa91471de514513
diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
index d44b0de8f15d..17e85197eb3d 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
ogg? ( media-libs/libogg )
osc? ( media-libs/liblo )
"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index ff877b1e2948..4e7b8757ed83 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -2,6 +2,6 @@ AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9
AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
-EBUILD linuxsampler-2.1.1.ebuild 1729 BLAKE2B 704266c7d7f19307a091b6231f523d661cc892cffcf610aafc7492dd7223a1596e00236b0574be8d358071cc8da0343fd12272fd54226ce6debabfd0e9537416 SHA512 517bd715d58359dfe7ec1edc3fff60f392dcbe67cfe34a64a7b0d62e1c24998883cb7ed74e001f0a4cf06179495e21c80b1ff2aa1f53b937ed63b2df8820f3cc
+EBUILD linuxsampler-2.1.1.ebuild 1771 BLAKE2B cc80a074fe0207af14bf0ff376ca725905489182eb7b66303548e9bc6aa84cde640777c20e69ef1032305693a39da3efb7f0e21977d5b48d77edbcfdde37f8a1 SHA512 5f94e326e83d9c9adf20d70d893262c44aeb2c0f9b178027348f053bcd6f7ddcbbce613db48e35d3b53582b81e1f5bbe410167746ccdeef817e5cc96411d7843
EBUILD linuxsampler-9999.ebuild 1577 BLAKE2B e79cae44e8560f0e4790e595d77e34adf9d9c74f2ad99ac20c681a632adc5bb0ee38faf5d2af8c4893322548fb0d2ea4a1b3a25bce439ca766f679b493ff53c0 SHA512 016ac964bfb4eac8d3f32596d684e1e7432eabf53f4f8968ee33eec7a311fdbc71311c4040f1597ecee0a1a3487ec36cc313939c38a22938358fbfa3003cd8da
MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
index d12a254629bd..7236b6df4f29 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="Software audio sampler engine with professional grade features"
HOMEPAGE="https://www.linuxsampler.org/"
@@ -49,6 +49,8 @@ src_prepare() {
}
src_configure() {
+ append-cxxflags -std=c++14
+
local myeconfargs=(
--disable-arts-driver
--disable-static
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 11bb663320fc..b36b59b9503d 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,4 @@
DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-EBUILD mumble-1.3.4.ebuild 3814 BLAKE2B 56c5fc62d9117dd41d82de5b027f1e5250ff117813dbb745f84e4f4d4327d9ee4c6d1bc0f377f16e9939750de877c3ab11ec19b3f55797efa025e04da8a12ca8 SHA512 2019d8ccaa70a7d9a3979d52b794e7ab6b8a9dc14a8efc88e4a79b1bd1fb14e0458efd3a7dcf5a8d1b6c13b2e5770304c70d120c5e413f0782612b234c127c61
-EBUILD mumble-9999.ebuild 3058 BLAKE2B 3c342709bca6b9251c06b74f584de50e9b030944f2f25b3ee09b76812fe9fa3fd7c780faca8ccf7bc48d00f1866069409d5df4db0a9479c8aab73f12aef8d986 SHA512 2f10be66c24aa4577c41ed06bab6d408b80f5ad442517029d5c79a28101cdcc066662d74a8612e8616b7db6e247712afd8ad5b619547d6dffc665caa9a20c7e9
+EBUILD mumble-1.3.4.ebuild 3757 BLAKE2B 38b1bd1778be0290bf1a887fb615a7b8b247e324cfc4df02a816923962e3fe4bc58b7e298d7a4b50ee41b304a5c1f8d3574c675a33adc9af1331bb76028dd957 SHA512 0a450d16a7102a5b6b7c337999fa649d585cecd6ebf9bcddd7352a1806aa3e6ff580fc5b1687a4bd40ac1b1726cb461861a2f24ef84b7e403afcea6078ca197a
+EBUILD mumble-9999.ebuild 3001 BLAKE2B 3aec4e582c1ddd342d72ce457dbd2f8693ac5209eaeb3cc8a3b8d6301f1aa306bb9b0c18d09a056ddf1f14633c7422abc219cdf4012e9ff7185398ddc1c7b3d1 SHA512 924aa3db870ea5a8447e41e664be154bc97fedb0fe885e888a41d9cae9404018b374522a07be38b5fdef4074a05c7f8aa03b1134769f6221559b064175fe1cfc
MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.4.ebuild b/media-sound/mumble/mumble-1.3.4.ebuild
index f7d3f495222f..aacdc0c4ab45 100644
--- a/media-sound/mumble/mumble-1.3.4.ebuild
+++ b/media-sound/mumble/mumble-1.3.4.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+IUSE="+alsa +dbus debug g15 jack +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
RDEPEND="
dev-qt/qtcore:5
@@ -47,8 +47,7 @@ RDEPEND="
dbus? ( dev-qt/qtdbus:5 )
g15? ( app-misc/g15daemon )
jack? ( virtual/jack )
- !libressl? ( >=dev-libs/openssl-1.0.0b:0= )
- libressl? ( dev-libs/libressl )
+ >=dev-libs/openssl-1.0.0b:0=
opus? ( >=media-libs/opus-1.0.1 )
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index f5a5c2e3edd1..88978a8aed86 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl portaudio pulseaudio nls +rnnoise speech test zeroconf"
+IUSE="+alsa +dbus debug g15 jack portaudio pulseaudio nls +rnnoise speech test zeroconf"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -50,8 +50,7 @@ RDEPEND="
dbus? ( dev-qt/qtdbus:5 )
g15? ( app-misc/g15daemon )
jack? ( virtual/jack )
- !libressl? ( >=dev-libs/openssl-1.0.0b:0= )
- libressl? ( dev-libs/libressl )
+ >=dev-libs/openssl-1.0.0b:0=
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-sound/pulseaudio )
speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index 1d25b67a3246..07fcadefd7b7 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,8 +1,9 @@
AUX ogmtools-1.5-comments.patch 977 BLAKE2B d12a056f8e6773737e612076bbda53b8c50912f99c7d1649d762c6d8c3c81a8f7fc9230b46e74724a03046a7367ad2331d755e1a2db19d665f2055d33d29d2df SHA512 345ca99a0685df2c9904e182c6046a367541d07f0eff8a7667650557d1729059dcd995320c7ffd40e5c52bdd7fa0ab648a53e85fb0f8a7628753dd5a2c4d027a
AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af234986e4d52573f6d9ed060fd8f6d2aaa96d7a6868a10caf2e1c895db38f6deadb4bd605a5d5920f0e052b4f781d5959 SHA512 a2de28d2063227c6f9d4e8ca2d5d10210f5bd72c1cf02087cd4d437fe211095ff8035320c75f23221cbfb11ade6bdfaa20e27fc09fbaeee26dcd2dc0d1239221
AUX ogmtools-1.5-fix-autotools.patch 1169 BLAKE2B 4e5f2472fa1f17132452a0960f79aa8bc08d4cffb541d304f32cdeb15895545b0676045a0659cd5c443dfe2de912abefa1d8bfc37196ad983d2ce7f759f8e567 SHA512 bac193ecea6f76c0c4ac8303fabcf36329c5d090dbb4bb862762d62e12fd8398e715084f4cdfced3c48ca49e2cad93defca5974a5c0e948b65d37168bfbb909a
+AUX ogmtools-1.5-gcc11.patch 13000 BLAKE2B f71051cb5f0481928eac57e10b3f415b583d52d4542e0904493b251398212d98b60f3fe29ab4211398583d446c02e76b28103699b320b158537dbdf6f732e52e SHA512 4e0194240a5dc2d6653a1608da7fa11744ff9fb96bb9f82ac2abd81930664b9c44985b2810a46b75246c49c03302edb5e450d816c44b3c14405ad6a479ad6525
AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae
AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e
DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee
-EBUILD ogmtools-1.5-r2.ebuild 939 BLAKE2B fd812192c34c58da038eb6ea8694ca4294b52990adb01899d117e4f5023f308ddf370a6bacd1a5694a8898176798fc7637b7be562a130b0565e417dc7819b72d SHA512 fdc04f81ae84216cc11ae60edf3c9596dc706caa289f937bf25ce8e5511b14f4c5aa8397331a75c6c5d2ecfd5f2d23d4514ee0c591b8f7b3942fe4d6331f2018
+EBUILD ogmtools-1.5-r2.ebuild 971 BLAKE2B b5a1b903c54b6a1884966dc419e038cf6693584cb7d2742b73f09e0e03030ea3a2f02fac1b4f564f7b465a47f141325487d96801f189119e6a618fb79f1271f8 SHA512 d0785c25022bad16483ed101149ab3c00dfbd8864732a1b23784522a399614e292ff638aa6ba0e7015ebc996ae683ddefa1439dc7d692012400ad91bed884e1f
MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
new file mode 100644
index 000000000000..2e117687a443
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
@@ -0,0 +1,374 @@
+--- a/p_ac3.cpp
++++ b/p_ac3.cpp
+@@ -30,7 +30,7 @@
+ ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec,
+ int nchannels, int nbitrate,
+ audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_ac3.h
++++ b/p_ac3.h
+@@ -40,7 +40,7 @@
+ public:
+ ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nbitrate, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~ac3_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_index.cpp
++++ b/p_index.cpp
+@@ -28,7 +28,7 @@
+ #include "p_index.h"
+ #include "vorbis_header_utils.h"
+
+-index_packetizer_c::index_packetizer_c(int nserial) throw (error_c) : q_c() {
++index_packetizer_c::index_packetizer_c(int nserial) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ granulepos = 0;
+--- a/p_index.h
++++ b/p_index.h
+@@ -33,7 +33,7 @@
+ ogg_int64_t granulepos, packetno;
+ int serial;
+ public:
+- index_packetizer_c(int nserial) throw (error_c);
++ index_packetizer_c(int nserial);
+ virtual ~index_packetizer_c();
+
+ virtual int process(idx_entry *entries, int num);
+--- a/p_mp3.cpp
++++ b/p_mp3.cpp
+@@ -30,7 +30,7 @@
+ mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec,
+ int nchannels, int nmp3rate,
+ audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_mp3.h
++++ b/p_mp3.h
+@@ -40,7 +40,7 @@
+ public:
+ mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nmp3rate, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~mp3_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_pcm.cpp
++++ b/p_pcm.cpp
+@@ -29,7 +29,7 @@
+ pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec,
+ int nchannels, int nbits_per_sample,
+ audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_pcm.h
++++ b/p_pcm.h
+@@ -37,7 +37,7 @@
+ public:
+ pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nbits_per_sample, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~pcm_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_textsubs.cpp
++++ b/p_textsubs.cpp
+@@ -29,7 +29,7 @@
+
+ textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync,
+ range_t *nrange, char **ncomments)
+- throw (error_c) : q_c() {
++ : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_textsubs.h
++++ b/p_textsubs.h
+@@ -30,7 +30,7 @@
+
+ public:
+ textsubs_packetizer_c(audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~textsubs_packetizer_c();
+
+ virtual int process(ogg_int64_t start, ogg_int64_t end, char *_subs,
+--- a/p_video.cpp
++++ b/p_video.cpp
+@@ -31,7 +31,7 @@
+ int nheight, int nbpp,
+ int nmax_frame_size, audio_sync_t *as,
+ range_t *nrange, char **ncomments)
+- throw (error_c) : q_c() {
++ : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_video.h
++++ b/p_video.h
+@@ -35,7 +35,7 @@
+ range_t range;
+ public:
+ video_packetizer_c(char *, double, int, int, int, int, audio_sync_t *,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~video_packetizer_c();
+
+ virtual int process(char *buf, int size, int num_frames, int key,
+--- a/p_vobsub.cpp
++++ b/p_vobsub.cpp
+@@ -34,7 +34,7 @@
+ char *nid, int nindex,
+ audio_sync_t *nasync,
+ range_t *nrange, char **ncomments)
+- throw (error_c) : q_c() {
++ : q_c() {
+ char buffer[50];
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+--- a/p_vobsub.h
++++ b/p_vobsub.h
+@@ -43,7 +43,7 @@
+ vobsub_packetizer_c(int nwidth, int nheight, char *npalette,
+ int nlangidx, char *nid, int nindex,
+ audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~vobsub_packetizer_c();
+
+ virtual int process(ogg_int64_t start, ogg_int64_t end, char *subs,
+--- a/p_vorbis.cpp
++++ b/p_vorbis.cpp
+@@ -30,7 +30,7 @@
+ #include "vorbis_header_utils.h"
+
+ vorbis_packetizer_c::vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c)
++ char **ncomments)
+ : q_c() {
+ packetno = 0;
+ old_granulepos = 0;
+--- a/p_vorbis.h
++++ b/p_vorbis.h
+@@ -37,7 +37,7 @@
+
+ public:
+ vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange, char **ncomments)
+- throw (error_c);
++ ;
+ virtual ~vorbis_packetizer_c();
+
+ virtual int process(ogg_packet *op, ogg_int64_t gran);
+--- a/queue.cpp
++++ b/queue.cpp
+@@ -21,7 +21,7 @@
+ #include "ogmmerge.h"
+ #include "queue.h"
+
+-q_c::q_c() throw (error_c) : generic_packetizer_c() {
++q_c::q_c() : generic_packetizer_c() {
+ first = NULL;
+ current = NULL;
+ next_is_key = -1;
+--- a/queue.h
++++ b/queue.h
+@@ -36,7 +36,7 @@
+ ogg_stream_state os;
+
+ public:
+- q_c() throw (error_c);
++ q_c();
+ virtual ~q_c();
+
+ virtual int add_ogg_page(ogg_page *, int header_page,
+--- a/r_ac3.cpp
++++ b/r_ac3.cpp
+@@ -55,7 +55,7 @@
+ }
+
+ ac3_reader_c::ac3_reader_c(char *fname, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c) {
++ range_t *nrange, char **ncomments) {
+ int pos;
+ ac3_header_t ac3header;
+
+--- a/r_ac3.h
++++ b/r_ac3.h
+@@ -36,7 +36,7 @@
+
+ public:
+ ac3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~ac3_reader_c();
+
+ virtual int read();
+--- a/r_avi.cpp
++++ b/r_avi.cpp
+@@ -55,7 +55,7 @@
+ avi_reader_c::avi_reader_c(char *fname, unsigned char *astreams,
+ unsigned char *vstreams, audio_sync_t *nasync,
+ range_t *nrange, char **ncomments, char *nfourcc,
+- char* nav_seek) throw (error_c) {
++ char* nav_seek) {
+ int fsize, i;
+ off_t size;
+ FILE *f;
+--- a/r_avi.h
++++ b/r_avi.h
+@@ -67,7 +67,7 @@
+ avi_reader_c(char *fname, unsigned char *astreams,
+ unsigned char *vstreams, audio_sync_t *nasync,
+ range_t *nrange, char **ncomments, char *nfourcc,
+- char* nav_seek) throw (error_c);
++ char* nav_seek);
+ virtual ~avi_reader_c();
+
+ virtual int read();
+--- a/r_microdvd.cpp
++++ b/r_microdvd.cpp
+@@ -56,7 +56,7 @@
+
+ microdvd_reader_c::microdvd_reader_c(char *fname, audio_sync_t *nasync,
+ range_t *nrange, char **ncomments)
+- throw (error_c) {
++ {
+ if ((file = fopen(fname, "r")) == NULL)
+ throw error_c("microdvd_reader: Could not open source file.");
+ if (!microdvd_reader_c::probe_file(file, 0))
+--- a/r_microdvd.h
++++ b/r_microdvd.h
+@@ -35,7 +35,7 @@
+
+ public:
+ microdvd_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~microdvd_reader_c();
+
+ virtual int read();
+--- a/r_mp3.cpp
++++ b/r_mp3.cpp
+@@ -60,7 +60,7 @@
+ }
+
+ mp3_reader_c::mp3_reader_c(char *fname, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c) {
++ range_t *nrange, char **ncomments) {
+ int pos;
+ unsigned long header;
+ mp3_header_t mp3header;
+--- a/r_mp3.h
++++ b/r_mp3.h
+@@ -40,7 +40,7 @@
+
+ public:
+ mp3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~mp3_reader_c();
+
+ virtual int read();
+--- a/r_ogm.cpp
++++ b/r_ogm.cpp
+@@ -60,7 +60,7 @@
+ ogm_reader_c::ogm_reader_c(char *fname, unsigned char *astreams,
+ unsigned char *vstreams, unsigned char *tstreams,
+ audio_sync_t *nasync, range_t *nrange,
+- char **ncomments, char *nfourcc) throw (error_c) {
++ char **ncomments, char *nfourcc) {
+ off_t size;
+
+ if ((file = fopen(fname, "r")) == NULL)
+--- a/r_ogm.h
++++ b/r_ogm.h
+@@ -62,7 +62,7 @@
+ ogm_reader_c(char *fname, unsigned char *astreams,
+ unsigned char *vstreams, unsigned char *tstreams,
+ audio_sync_t *nasync, range_t *nrange, char **ncomments,
+- char *nfourcc) throw (error_c);
++ char *nfourcc);
+ virtual ~ogm_reader_c();
+
+ virtual int read();
+--- a/r_srt.cpp
++++ b/r_srt.cpp
+@@ -62,7 +62,7 @@
+ }
+
+ srt_reader_c::srt_reader_c(char *fname, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c) {
++ range_t *nrange, char **ncomments) {
+ if ((file = fopen(fname, "r")) == NULL)
+ throw error_c("srt_reader: Could not open source file.");
+ if (!srt_reader_c::probe_file(file, 0))
+--- a/r_srt.h
++++ b/r_srt.h
+@@ -35,7 +35,7 @@
+
+ public:
+ srt_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~srt_reader_c();
+
+ virtual int read();
+--- a/r_vobsub.cpp
++++ b/r_vobsub.cpp
+@@ -72,7 +72,7 @@
+
+ vobsub_reader_c::vobsub_reader_c(char *fname, audio_sync_t *nasync,
+ range_t *nrange, char **ncomments)
+- throw (error_c) {
++ {
+ char *name;
+
+ if ((file = fopen(fname, "r")) == NULL)
+--- a/r_vobsub.h
++++ b/r_vobsub.h
+@@ -42,7 +42,7 @@
+
+ public:
+ vobsub_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~vobsub_reader_c();
+
+ virtual int read();
+--- a/r_wav.cpp
++++ b/r_wav.cpp
+@@ -50,7 +50,7 @@
+ }
+
+ wav_reader_c::wav_reader_c(char *fname, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c) {
++ range_t *nrange, char **ncomments) {
+ uint64_t size;
+ uint32_t samplerate;
+ uint16_t channels, bitdepth;
+--- a/r_wav.h
++++ b/r_wav.h
+@@ -41,7 +41,7 @@
+
+ public:
+ wav_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c);
++ char **ncomments);
+ virtual ~wav_reader_c();
+
+ virtual int read();
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 28fb209d7f3c..31e8539b757f 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-vorbis_verbosity.patch
"${FILESDIR}"/${P}-summary_length.patch
"${FILESDIR}"/${P}-fix-autotools.patch
+ "${FILESDIR}"/${P}-gcc11.patch
)
src_prepare() {
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 0095ff79af6c..76efeacf1c3a 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,4 +1,4 @@
AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
-EBUILD patchage-1.0.4.ebuild 1005 BLAKE2B 620a5712144aed5bfe0c647498489e5297c0b80d7043298bf16d3f5d65fb5b609f241b30c7b48696003d916af2247b568b4bb759ceef1811a45d3220a1a9d989 SHA512 12458b0af96e2acaba6244d90f16359c2c9a76aac0b65b1fcb9dc72b110b42bd6ba134833d3d63fdb07e9026469a831aa17c0b074f2d9bea95f2975babec6ef5
+EBUILD patchage-1.0.4.ebuild 951 BLAKE2B a224d38a2bad4119fb798bb823537d82410a8ecbe76a047d26d4d24ee6f10555db9be4359426a58cea963e9a54791aafd3d78c7ff7a3f033932d5f490159c746 SHA512 1770a22ccb29e87f00c9b2f6ffc1b08d76ea5067a27793bf56bc8bf0ad8dc30526295754a426e184a2d53ef5f53a45f2c6d1cb1a1cd4365dc4134f763ab22363
MISC metadata.xml 354 BLAKE2B a030981876913f6a9313b801978cdb3ebd4c5144c886055865879093cd33258c00c2fa3e188f9d7bcb4fe39f94ece223673fa66824a823a8a77a1ecc319bfaaf SHA512 77594550a95399ed6997e08e3fd7a90feafd36751fcf4be464f54712ac8461c7acbcc261e81471b7317857cb75ba4af59ed6d807a80a40d2f67818c1773f020c
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.4.ebuild
index a231618a5018..b9a415d93c20 100644
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ b/media-sound/patchage/patchage-1.0.4.ebuild
@@ -22,8 +22,6 @@ BDEPEND="
"
RDEPEND="dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
- dev-cpp/libglademm:2.4
- dev-cpp/libgnomecanvasmm:2.6
media-libs/ganv
virtual/jack
alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 8e0157328031..e0cf9703b7ac 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
-EBUILD picard-2.4.2.ebuild 1575 BLAKE2B 8800306017fcb9d675bc1d8ee67bc844e9bfb8541fef28fe5053a72a3c963a47efa3adac4444ccb4a3bd870bd21954e16287b0f635da3436b8614da8f5e4a844 SHA512 d994e8ce751f06dca006dd6442b31029909a40457831870c35df7649c1e0da428445f2fa6cd951d74b6891a495908ea5b13f9b18a9981200d7b98e069e8da187
-EBUILD picard-9999.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
+EBUILD picard-2.4.2.ebuild 1625 BLAKE2B 9afd5a400e7d21531feef4e19408a499a56d5c886878dc8ca1df5c84ebde5e71b5e4102395d480696668bfd7924db39484fe7560258b92c392d9d419f2f59345 SHA512 aa8faa116dbf15efed632e8b568201e8393bbed55b5e80d0a8f23d79ca1f7c2b31a04fe871b8111fbcc5c39ab3655e99969c3e033d5b77cb53a757b99099f946
+EBUILD picard-9999.ebuild 1627 BLAKE2B 4472b2464100cc9493cb7e2abaef8d679d114d25be7ccd6beb6ca5e1a0f59c1e5ee908ba879e3bb71456a96db4e670a48eb1362a85b07d7d5ed531fc2e0119b4 SHA512 7e5e7198a0a4364e9d475f614be644718c5fef09213eb14131f6e544186b4aeda8f4c0156659ddd3962c3fd4ed24052d35e83228f43c98e8f44df8a60ed6392d
MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 18c76e92214a..d866635fefb1 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,7 +64,9 @@ python_install() {
python_install_all() {
distutils-r1_python_install_all
- elog "If you are upgrading Picard and it does not start, try removing"
- elog "Picard's settings:"
- elog " rm ~/.config/MusicBrainz/Picard.conf"
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "If you are upgrading Picard and it does not start, try removing"
+ elog "Picard's settings:"
+ elog " rm ~/.config/MusicBrainz/Picard.conf"
+ fi
}
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 511feea537f9..d95b1702956b 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,7 +64,9 @@ python_install() {
python_install_all() {
distutils-r1_python_install_all
- elog "If you are upgrading Picard and it does not start, try removing"
- elog "Picard's settings:"
- elog " rm ~/.config/MusicBrainz/Picard.conf"
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "If you are upgrading Picard and it does not start, try removing"
+ elog "Picard's settings:"
+ elog " rm ~/.config/MusicBrainz/Picard.conf"
+ fi
}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 7b9f6c40d735..c7c189aae00e 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11449 BLAKE2B 96dabfdf47e90309ca9e52f3d80f7938603288b0b4f9904462d1cebb88d2057003f4a4d14686321945bb00e118e27031ef445de5966f098a6f12cd7db17ad8a4 SHA512 340f07b118a82872ae0774b5d5665813bddcd4a8a01535684c41efb528df0552369c2fc0ac9f29fdae864f3df25128ac0549771e846ddee44be44e6b5e688464
-EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B ac733b5f99c2895692df59cf66c6835b4b586193470086652ff77952ac7292f9118e51df7e1ed1ffb10802033687184b34a15c3ce28fc5441b44372b2a9059dc SHA512 94497da344670a0d77109b6a85072ef3d379fdf52d9b6d08115bd44d041b6c807ddd36176369db49ea144e1ada5a2686b8599cd0b5afd0dd20f4386621268c04
+EBUILD pulseaudio-13.0-r1.ebuild 11386 BLAKE2B 31453bb6059a4efdd9d0c618534ee478407ffebda0cbad0d2b2e6d20735f5c24cac46fa92411c1a22a6d3261b798a3510e6cf426c456ca9c2b8c46a753b8653b SHA512 7be9fdc6e354bef9d039a43192a2626fea1887fc3067d973c2328237e288f2fc103ca7c8f914d495827401ec6f9f2b8bb69ee9306626f083b906c0118b949823
+EBUILD pulseaudio-13.0.ebuild 11509 BLAKE2B 5468e027a01586d5e765377513d6d521978a8683e7cbdf5c3b3d15dc56fefc874a94ba8be4bbcdc81a43b49b292170a0176eb777084940da5b35f71d46c250cd SHA512 fc72ebbc54614cb935134a7a03d9c05414f46f5aa41cc59756ab0567187fd6955a8e6780758b7d7dad85114f32e16b47fbb280271424e2a4c809bfc88caf2e78
MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 6dc8380381bf..0b4d1139a5b8 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon
++gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon
ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
+udev +webrtc-aec +X zeroconf"
@@ -71,10 +71,7 @@ RDEPEND="
ofono-headset? ( >=net-misc/ofono-1.13 )
orc? ( >=dev-lang/orc-0.4.15 )
sox? ( >=media-libs/soxr-0.1.1 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:0= )
media-libs/speexdsp
gdbm? ( sys-libs/gdbm:= )
webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 7a2d34759f0e..e2dbe303918d 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon
++gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon
ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
+udev +webrtc-aec +X zeroconf"
@@ -71,10 +71,7 @@ CDEPEND="
ofono-headset? ( >=net-misc/ofono-1.13 )
orc? ( >=dev-lang/orc-0.4.15 )
sox? ( >=media-libs/soxr-0.1.1 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:0= )
media-libs/speexdsp
gdbm? ( sys-libs/gdbm:= )
webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 8829f812a9e7..f496c2f2a7d6 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3327 BLAKE2B 6207bb34869d278d59434842bf3f85894565b7623476b88094a420e5543da230b5c853efcc30aed75e89eb2328c6e2b23b578d9f2f03dde6f611f190de2998c5 SHA512 619d2a931a7684eaab49de35fd83d030940e7e6a2f6e2cbafd3c45488430e7c7c69b6f1e94c26fbe90044412e50d01ce1287ee8f024ea9e5102c07b46fb7f069
+EBUILD rhythmbox-3.4.4.ebuild 3328 BLAKE2B beb9f8c12afd9435bb73288146c13e4044cff9a93dd7061dbbbb73567c150b3c047c14e0aeed00f803543de87c35bab582d511244b724cb4ad98538f4d0821ac SHA512 fde8d2f9ff81c606e06dade8af2b00abc0f7f8207c80eeb96fa3ed24b760f1abc80df362f9f95501a28b47e05a229b9964cb348489e9f133e2d83703d638b40c
MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 4739e55d0540..7f44193b8aea 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="xml"
inherit gnome2 python-single-r1 multilib virtualx
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 4575f81dc12f..e7efa7c45cd3 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,5 @@
DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
+DIST schismtracker-20190805.tar.gz 1307914 BLAKE2B 97158f05b55063173fb3a8198d21d4c3f33a1c9d2882170b8dbce91dec75863ae1f282297c66fea376fc94559b9492477dadbc3e2516cfb2dda8772793f59124 SHA512 6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d
EBUILD schismtracker-20180810-r1.ebuild 1538 BLAKE2B 45094033db089d5f2b3927596a1c45fa9df319134eb1a7f33daf531d320eeb98431e6732b353985339f543c1c49231131c44739a2d9b2defdef2124e1bdeda26 SHA512 35b7d9ced817c661d9fa3f226f9a35ebab418221af4af7dfb393ea92801e36b2a63c23e3761ff005a0fa5e5e75a271b09b6c45c16f5d7fd73c04d6daaa05341e
+EBUILD schismtracker-20190805.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20190805.ebuild b/media-sound/schismtracker/schismtracker-20190805.ebuild
new file mode 100644
index 000000000000..68df087a73c5
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20190805.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/alsa-lib
+ media-libs/libsdl[X]
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+ virtual/os-headers
+ x11-base/xorg-proto
+"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
+
+ # workaround for temporary files (missing directory). Fixes:
+ # sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+ # /bin/sh: auto/default-font.c: No such file or directory
+ mkdir auto
+
+ # sys-devel/binutils[multitarget] provides ${CHOST}-windres
+ # wine provides /usr/bin/windres
+ # and schismtracker fails to use it properly:
+ # sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+ [[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+ default
+
+ domenu sys/fd.org/*.desktop
+ doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index b233f20283d3..b6df15745e53 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,8 +1,9 @@
+AUX snapcast-0.20.0-gcc-11.patch 261 BLAKE2B d41a0a47549e2f40bef887b5672a4ab1903c540503149055a0bdc25f4f4bd94a6bf323981dc1d6401e0882e7b41fadfec98833b30288af9f54177870c6f0d8dd SHA512 0917f69616376ec0c3c44a1cf4f6fdf2dff8f9e74e77e8ec1fa1c2f931139949757490fe49452b979bcb9bcb46fcdaac4dc04b148ba0ee88bcb5c0271f1c7e95
AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
-EBUILD snapcast-0.20.0.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+EBUILD snapcast-0.20.0.ebuild 1702 BLAKE2B b128cfcf8229d777d6876e43d9c98d9d13d8a4844d866c579aadafb22ee0983c5be9c15768d02556cac35a889a00a04f3e826824f93363705e57ba09af434e35 SHA512 66b48503ebc593f1a1dcf34a679ef1977163071ed9c7c3e401609a4b234b388ca41489cf17e0dac3865c40be992ddc882e4686eb52402d6ff3cca1d39903db48
EBUILD snapcast-9999.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
MISC metadata.xml 1190 BLAKE2B b5cc3702af67dc6de92adefc2ed47067079df1c4a34190fbe7ffdf1b233c8b5d01ce5823c841614da40abe05a0caabd4de2a31a8448715fc166cfe828d0c3ace SHA512 0195d09d431cffe95365aeb9cfbc3ae5384dbc1c62b1cd8abf26841162df824e7c8cf6bc0087cf0cb7696cc66ed4b71446bcb44783c4b2f13b6aac1e435f3cd5
diff --git a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch b/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
new file mode 100644
index 000000000000..7ae562aaef05
--- /dev/null
+++ b/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/786303
+--- a/common/message/message.hpp
++++ b/common/message/message.hpp
+@@ -29,6 +29,7 @@
+ #include <sys/time.h>
+ #endif
+ #include <vector>
++#include <memory>
+
+ /*
+ template<typename CharT, typename TraitsT = std::char_traits<CharT> >
diff --git a/media-sound/snapcast/snapcast-0.20.0.ebuild b/media-sound/snapcast/snapcast-0.20.0.ebuild
index 6228cd7ec667..8a3f6d75f941 100644
--- a/media-sound/snapcast/snapcast-0.20.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
>=dev-cpp/asio-1.12.1
>=dev-cpp/popl-1.2.0"
+PATCHES=( "${FILESDIR}"/${P}-gcc-11.patch )
+
src_configure() {
local mycmakeargs=(
-DBUILD_CLIENT=$(usex client)
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index e05ece8bfec1..cdd6c5da9ea5 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -2,7 +2,7 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b
DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
-EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
-EBUILD spotify-1.1.26-r2.ebuild 3449 BLAKE2B 28e9a400ad3bf321efb845b7ad396bc399bda2aeb1c1a3acfdc0dbd1b747c971eb8b59c2c073b8126a0ae056e937cea6c32b4ebd648f0e753cc0a98db0e84618 SHA512 f9e16593cf0c5d8ea6c7f35f984e1a23cda928ec2ea7f2140c6635ee1e46aa80e7f1b0e6bcbd031416f92e8e60504dc07df0a8fd85b85552303086e1ed2f56b1
-EBUILD spotify-1.1.55.ebuild 3512 BLAKE2B 0dfe4606a03e8e91885f5e110e9735a455007a7722853829eac7aacdaea2cccd2030a35abe0bd5aadc2e66264f679bcbaff63f56b61a8fc034f70f6c3b533213 SHA512 3f1e1c6a2df70e8ed29f48f702c9bc663e695284f7f1c2bdc985c0a18b98ae492f7061537806735c4b9651e214609a140e1763db40a873b6d7b796106b1dcd12
+EBUILD spotify-1.1.26-r1.ebuild 3133 BLAKE2B 0cb705233a3c73afb3199e47d96a97e53eacf2c6cb190c421a3412d6783f6c966de1089b147cb086a3e0228862d392ded5ac4ec1117eda21c4bf1a84617bc91d SHA512 8f0ed03641ffa16d447925f24e9f53c01507cea74b860d3c8f5dff2b3df1895cdbd47c2484fb8c316b9e3fe2723d00cafe1934d57eff17f217d28a6bc06aca53
+EBUILD spotify-1.1.26-r2.ebuild 3389 BLAKE2B a54b9a095c1e17dd5f20f1c3c4c44a687551c06553724d795527c1399cc4a4456676a856d27da6dcb01fef36fbf611f3bf1cd4c794c032322dac6b368b367262 SHA512 5fc0016a01a26641c56155ca516fb4f42b6c9a2d88143c335da7f8bea28d8ab36abd11c411867ec9e7bcca794a4d360e18b92a929d4d0aa57435008a4c7369b5
+EBUILD spotify-1.1.55.ebuild 3452 BLAKE2B deb0bcd9286a1f9c1021f4d3d8277568da170cd7a48250f21a48354158125d9a187038b4366260d4765d3730957cb185dc62060a615dce7ba11bc530a4cc06fc SHA512 8a7b3d41dc2f3be099aa9ba3fab6b84dee0a95f06776995ae11c7ca52f058eba83d7afa769dcab70ce8490f57f25bcc957d6e28075d87e3069f15275800736d3
MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
index 2310f6ff5afb..797be7b82c17 100644
--- a/media-sound/spotify/spotify-1.1.26-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
LICENSE="Spotify"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax_kernel pulseaudio"
RESTRICT="mirror strip"
BDEPEND=">=dev-util/patchelf-0.10"
@@ -21,8 +21,7 @@ RDEPEND="
dev-python/dbus-python
dev-python/pygobject:3
libnotify? ( x11-libs/libnotify )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
media-libs/alsa-lib
media-libs/fontconfig
media-libs/harfbuzz
diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
index fdf168b74773..f15f00faf70f 100644
--- a/media-sound/spotify/spotify-1.1.26-r2.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
LICENSE="Spotify"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax_kernel pulseaudio"
RESTRICT="mirror strip"
BDEPEND=">=dev-util/patchelf-0.10"
@@ -21,8 +21,7 @@ RDEPEND="
dev-python/dbus-python
dev-python/pygobject:3
libnotify? ( x11-libs/libnotify )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
media-libs/alsa-lib
media-libs/fontconfig
media-libs/harfbuzz
diff --git a/media-sound/spotify/spotify-1.1.55.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
index 544835629b0a..22aa11bb8591 100644
--- a/media-sound/spotify/spotify-1.1.55.ebuild
+++ b/media-sound/spotify/spotify-1.1.55.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
LICENSE="Spotify"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="libnotify libressl local-playback pax_kernel pulseaudio systray"
+IUSE="libnotify local-playback pax_kernel pulseaudio systray"
RESTRICT="mirror strip"
BDEPEND=">=dev-util/patchelf-0.10"
@@ -21,8 +21,7 @@ RDEPEND="
dev-python/dbus-python
dev-python/pygobject:3
libnotify? ( x11-libs/libnotify )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
media-libs/alsa-lib
media-libs/fontconfig
media-libs/harfbuzz
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index e8e72cb9e170..40c7f2296d63 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -5,8 +5,8 @@ AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682ef
DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb SHA512 4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
-EBUILD umurmur-0.2.17-r4.ebuild 2631 BLAKE2B d5ee8f085fcdc6721821fd8cdcc09170d4643779543e3b19645fe0b350ee351a2890bfc15e95518442d600ccf4c8426d5daa841ce55cf95993cab6f8d59759c7 SHA512 a4fd25d49c4d53d58d9ef17db266d428648d9cd77f9c5aeca1f4c857f90c5c975895401bf0b77eb6addc18cdb1073f994bce4ee816b5b2646c9279580d22c123
-EBUILD umurmur-0.2.19.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
-EBUILD umurmur-0.2.20.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
-EBUILD umurmur-9999.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
+EBUILD umurmur-0.2.17-r4.ebuild 2458 BLAKE2B f1d911fc058436e206787a66db17628553a189a5d481821f503f7eb1bf24948f3fe4c21cb903583326c94ff61a12d04dd490be8396488c732d1fd95a9b9ec46a SHA512 6f41066f29204504cbd530bac321f7cbc263e9ac15d7abc33a5145026807300db11a852902bf3a6b039a4c9950df3bf7a1606085ebbca4197cdffeff63e7b30f
+EBUILD umurmur-0.2.19.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
+EBUILD umurmur-0.2.20.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
+EBUILD umurmur-9999.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 5f27975b77c8..a840c65de765 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -16,9 +16,9 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
-# ssl-provider precendence: gnutls, mbedtls, libressl
+# ssl-provider precendence: gnutls, mbedtls
# and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
@@ -28,10 +28,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
- !mbedtls? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
+ !mbedtls? ( dev-libs/openssl:0= )
)
"
@@ -52,9 +49,8 @@ get_ssl_impl() {
use gnutls && ssl_provider+=( gnutls )
use mbedtls && ssl_provider+=( mbedtls )
- use libressl && ssl_provider+=( libressl )
- if ! use gnutls && ! use mbedtls && ! use libressl ; then
+ if ! use gnutls && ! use mbedtls; then
ssl_provider+=( openssl )
fi
echo ${ssl_provider[@]}
@@ -75,7 +71,7 @@ src_prepare() {
}
src_configure() {
- local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+ local ssl_provider=( $(get_ssl_impl) )
local myeconfargs=(
--with-ssl="${ssl_provider[@]}"
diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild b/media-sound/umurmur/umurmur-0.2.19.ebuild
index 5bc252e176bb..ca21485b1db5 100644
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
- !mbedtls? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
+ !mbedtls? ( dev-libs/openssl:0= )
)
"
diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild
index 7b9bed7d2694..ca21485b1db5 100644
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 7b9bed7d2694..ca21485b1db5 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 3fb6d50b4d5b..82f3813ebb8a 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,6 +1,3 @@
-AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c7bcb6173332ed0742a3336decc8d9a7f1c6636d36411087c477c5d33fc36947e0bf3dc278811e3ca2f6d980567bc70acd63 SHA512 d0310d6cd85250a1111d49defae800f99ba8eefadfb3b28c700a968d7f483b645ab86864200da616f85320a7ef113e19ec4633e96c7a3839fc53414aa6fbca47
-DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
-EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
EBUILD wavpack-5.4.0.ebuild 849 BLAKE2B 0ac7d602bf2093cd0f685bed438624d12d63d9bebd77640e7f82e7a6d5ed68bb3d0179efd48b9038e882ae28d2fa1d6e88611c9cc2dfad9c57347f000ac98941 SHA512 a0ddff1a9b696df7d2a9dd718d8092ee2599a1939a1f8a73a78f9bccc1113d3cebd2cfff54c8499dbfd114fc57db25fcd7eac552f91bbf5058779e35298e1913
MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
deleted file mode 100644
index fbbd40ba8bd9..000000000000
--- a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
-From: David Bryant <david@wavpack.com>
-Date: Tue, 29 Dec 2020 20:47:19 -0800
-Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
- and sanitize a few more encoding parameters for clarity
-
----
- src/pack_utils.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/pack_utils.c b/src/pack_utils.c
-index 17d9381..480ab90 100644
---- a/src/pack_utils.c
-+++ b/src/pack_utils.c
-@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
- return FALSE;
- }
-
-- if (!num_chans) {
-- strcpy (wpc->error_message, "channel count cannot be zero!");
-+ if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
-+ strcpy (wpc->error_message, "invalid channel count!");
-+ return FALSE;
-+ }
-+
-+ if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
-+ strcpy (wpc->error_message, "invalid custom block samples!");
- return FALSE;
- }
-
-@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
- if (wpc->config.num_channels == 1)
- wpc->block_samples *= 2;
-
-- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
-+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
- wpc->block_samples /= 2;
- }
- else {
-@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
-
- wpc->block_samples = wpc->config.sample_rate / divisor;
-
-- while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
-+ while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
- wpc->block_samples /= 2;
-
-- while (wpc->block_samples * wpc->config.num_channels < 20000)
-+ while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
- wpc->block_samples *= 2;
- }
-
diff --git a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
deleted file mode 100644
index c34faa9eee4a..000000000000
--- a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-# Need to fetch a commit because upstream didn't tag the minor release
-COMMIT="e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="https://www.wavpack.com/"
-SRC_URI="https://github.com/dbry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WavPack-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-overflows.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} econf \
- --disable-static \
- $(use_enable test tests) \
- $(multilib_native_enable apps)
-}
-
-multilib_src_test() {
- cli/wvtest --default
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}