summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-02-25 09:03:38 +0100
committerConrad Kostecki <conikost@gentoo.org>2023-03-07 17:43:42 +0100
commit83c8421116f40f827b20806e141a4f8c32540c54 (patch)
tree1daeed95b7548ab10ad6b63a86a2c2ce79e2a252 /media-sound/deadbeef
parentdev-util/Tensile: remove unused patch (diff)
downloadgentoo-83c8421116f40f827b20806e141a4f8c32540c54.tar.gz
gentoo-83c8421116f40f827b20806e141a4f8c32540c54.tar.bz2
gentoo-83c8421116f40f827b20806e141a4f8c32540c54.zip
media-sound/deadbeef: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29784 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-sound/deadbeef')
-rw-r--r--media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch37
-rw-r--r--media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch34
-rw-r--r--media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch13
3 files changed, 0 insertions, 84 deletions
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," \