gentoo auto-resync : 07:03:2023 - 17:57:54

5 files changed, 3 insertions, 90 deletions

diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index f35aa8cdb46e..a8b24b6e95f4 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,11 +1,8 @@
-AUX deadbeef-1.9.1-ffmpeg-5.0-fixes.patch 1298 BLAKE2B 5ff65bf6208ad7e75c56db0a47ff6a70e7d014140355dcdce902e3d443752b058f1abc4b4dfb5f99bc0ac28de38401f3ada135404c02ccfe072c106ae6fd1cd7 SHA512 f8617108d2720a033ec072433f076921f5150775c345767a658d474e8d9eccf7dec3d1fbac509f0629e8ac28c3edef1426cef3dc38458dce6df5d11e1b7f2156
-AUX deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch 1122 BLAKE2B 7693cb8fa0c5951eae240ff2d1ea7ca68c151dfcacab27dcb1cb293ae84e8ec11b94d49017f8a942b7443a9d80fcbda3a87eff84bf71d19ea1bb92fc64baf832 SHA512 ae7bddf970898d2e07ade6752b09f26782529186d880bceba93777380b103b2de8c67fbae784841904515e7a8c16e4bc34a6d1f390e1f6633ecff0bd3100dc58
 AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a202e1260cb542b4b65d3cec3ec8d2f3fce097646a6bcbbd2204e39c246500b13096714d99426c4f3d468dbf0115c5907a5f SHA512 101e7316165fc28b2a300245c0fa9d86a5c1fdf2823b638fb8c3698df03a559b4dde07ac2aabd1b08ae498a42a7b298e4fc9330d2da9fec80cce6418bd504b9b
-AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.9.3.tar.bz2 5138392 BLAKE2B 3368c38246aae0ac125326b87c2f18523274564ad273c977620bc6e7af3ca50f111a03c3057ff62c068d8cc1942fb1f8b28639043bf9032e08f7ceb1dbb4b03a SHA512 54ef09b723df062bf35d435c959792247121ce0b0f0eebc568347ef8725bf3cdd7eee7b9c69f6443b0a2731354d96c33e18a9a9e7d4068d4de7733d1f77d4376
 DIST deadbeef-1.9.4.tar.bz2 5150264 BLAKE2B 993d7a89f1d95d7b03938d05b7f4d5a3634b36ab1743834fde20500f79e848d13d92b2933e5df2439f44ae7274235ea8d084fa51ec968b7a231158f09f057a22 SHA512 80b286c0cd80ac71bda83621f48ec51f7d58215f7c1364065a9f7da668eb13c513ec89254993449341c0da6fc6d5f8b546c45965f95b404a01af1d56949ad4f7
 DIST deadbeef-1.9.5.tar.bz2 5204015 BLAKE2B 45b9023807a5652c38f6cafd5ea0fca87e2872db264538f5c9d9ee4815281fe3f4e08eee5d43a083a67b3a9f646de24a90147d76f15622710d8f4adbdabe0c8d SHA512 c7a15f47fd8081a363e5cba732aa4ff4b1c311408728fbc5f7f47cf349bc112274a1d9fe0df8a58f09abf8f7656d914fb1baafa38fdf4dcb38fae7e1f70f682c
 EBUILD deadbeef-1.9.3.ebuild 4008 BLAKE2B 20955715a8328cb668a33c36d2e9572a2dfd8366bf497addff80632fb7cf1566d67bcb7c2563ede3502c51cbec0be23ff51d1f6ff02f89aa09ee0ebff850eb3d SHA512 7b2499bbec78d414533c4a21b1f8a0e8f883ed8f29614a8f6147d383e01e6e7f1528424723091f1bc3c41975bdbbad8db2b39ed18a5a50df7bd39289484131e9
-EBUILD deadbeef-1.9.4.ebuild 4061 BLAKE2B 1b2ad1950f229839ecf939c4d91420d701557078b90e07cade51a82225cd3717779ca180678f85be97ef16373e405803e661dc630cf1219bd67bf9bf9a942e68 SHA512 d99a6599e224c7fbaa9b1eca875078286b07f84cb6b1a848aed4824f206c0e8de5b94fc564da3f748d765489ffdcbcc9728da992279dd083e679aacedec66bc8
+EBUILD deadbeef-1.9.4.ebuild 4060 BLAKE2B 80daa42d32c974d7236534f18cfb43d1276727f6462ace432d07e103dc733981a3e56003aa44d8c8fd93e8a9b474ec39743b696da8ab72bd3a488245af27131c SHA512 14e35fdafb1a7e6f93f170a22812e0b505128ec4d89144d0e7906772b4251cdd9695eabc54f9c595a2f24d9efcc995d1f4565a64aa480d75c1d93362bf8579f5
 EBUILD deadbeef-1.9.5-r1.ebuild 4178 BLAKE2B bd0608e694ce85421b7bf1b888eabd9790d9a2004c411e42159e9945fe043adacccc376040ba745b01bbbcd43c75edba900a1d5d0e7572ff6554d0ed32ea6077 SHA512 43aaca1b132f525ae17b24690be1f3cd96cd02b24e874db444cfb01c10434897fdcde98becbe560b77755f34105f08c0943555a99b8964c3a85269663a1925b4
 MISC metadata.xml 1081 BLAKE2B 7c008d6901514e9e05beef2888b7aad4101598f27a80ceeff57623637b672ac6d48bbdfb00239f0e39cec09e5bdc0ed1145575d0497c0dc95271a34a1a3aefce SHA512 d40cf17bb95a7946a985b07607f139a912290a5419f4b38166cdfd554e38b27360390f3abac038882e1cf9042ff9189ff33cc10732d65d99f77fc947a9b74a7d
diff --git a/media-sound/deadbeef/deadbeef-1.9.4.ebuild b/media-sound/deadbeef/deadbeef-1.9.4.ebuild
index 76295ee70196..78ab5ea0aa55 100644
--- a/media-sound/deadbeef/deadbeef-1.9.4.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
 
 REQUIRED_USE="
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch b/media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch
deleted file mode 100644
index 14f6b8e70556..000000000000
--- a/media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7b52bac5a69abeab6d8b6601fd9e36803842d9c1 Mon Sep 17 00:00:00 2001
-From: xuzhen <xuzhen@users.noreply.github.com>
-Date: Sun, 2 Oct 2022 12:23:02 +0800
-Subject: [PATCH] Fix build with ffmpeg 5.0+
-
-av_iformat_next was replaced with av_demuxer_iterate. https://trac.ffmpeg.org/wiki/Bump59
----
- plugins/ffmpeg/ffmpeg.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 5409cc482..bfc9b6f6f 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -802,7 +802,12 @@ ffmpeg_init_exts (void) {
-          * encoding purpose, because ffmpeg will guess the output format from
-          * the file name specified by users.
-          */
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+        void *iter = NULL;
-+        while ((ifmt = av_demuxer_iterate(&iter))) {
-+#else
-         while ((ifmt = av_iformat_next(ifmt))) {
-+#endif
- #ifdef AV_IS_INPUT_DEVICE
-             if (ifmt->priv_class && AV_IS_INPUT_DEVICE(ifmt->priv_class->category))
-                 continue; // Skip all input devices
-@@ -849,7 +854,9 @@ ffmpeg_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- static int
- ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-+#if LIBAVFORMAT_VERSION_MAJOR < 58
-     av_register_all ();
-+#endif
-     return 0;
- }
- 
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch b/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch
deleted file mode 100644
index cef941162b93..000000000000
--- a/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 779066a54aa8a1a92b92ebdabc8a93d6ef3fb3ba Mon Sep 17 00:00:00 2001
-From: Oleksiy Yakovenko <wakeroid@gmail.com>
-Date: Wed, 26 Oct 2022 11:50:02 +0200
-Subject: [PATCH] cdda: enum cast fix (fixes #2879)
-
----
- plugins/cdda/cdda.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c
-index 7229d9592..2fe3b5fda 100644
---- a/plugins/cdda/cdda.c
-+++ b/plugins/cdda/cdda.c
-@@ -846,7 +846,7 @@ get_param (const char *key, char *value, int len, const char *def)
- "property \"CD drive to load\" select[%u] cdda.drive_device 0"
- 
- static int
--cda_action_add_cd (DB_plugin_action_t *act, int ctx)
-+cda_action_add_cd (DB_plugin_action_t *act, ddb_action_context_t ctx)
- {
-     /* Get all devices containg CD audio media */
-     cdio_close_tray(NULL, NULL);
-@@ -982,7 +982,7 @@ load_cddb_data (ddb_playlist_t *plt, cddb_disc_t *disc, const size_t disc_num)
- }
- 
- static int
--action_disc_n (DB_plugin_action_t *act, int ctx)
-+action_disc_n (DB_plugin_action_t *act, ddb_action_context_t ctx)
- {
-     const int disc_num = atoi(act->name+11);
-     int res = -1;
--- 
-2.38.1
-
diff --git a/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch b/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
deleted file mode 100644
index 82a979a5c179..000000000000
--- a/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index da137069a..43cdcb301 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -75,7 +75,7 @@
- static DB_decoder_t plugin;
- static DB_functions_t *deadbeef;
- 
--#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a"
-+#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a;ape"
- #define UNPOPULATED_EXTS_BY_FFMPEG \
-     "aif,aiff,afc,aifc,amr,asf," \
-     "wmv,wma,au,caf,webm," \