summaryrefslogtreecommitdiff
path: root/media-sound/aqualung/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
commit5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree66e860a5099bcad013f1cf667255dc372a7c11b3 /media-sound/aqualung/files
parent7218e1b46bceac05841e90472501742d905fb3fc (diff)
gentoo resync : 20.03.2021
Diffstat (limited to 'media-sound/aqualung/files')
-rw-r--r--media-sound/aqualung/files/aqualung-1.0-ar.patch17
-rw-r--r--media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch29
-rw-r--r--media-sound/aqualung/files/aqualung-1.0-gcc10.patch69
3 files changed, 0 insertions, 115 deletions
diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch
deleted file mode 100644
index 3df4d75eaf1b..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac
---- aqualung-1.0_orig/configure.ac 2020-08-05 20:00:50.758797358 +0200
-+++ aqualung-1.0/configure.ac 2020-08-05 20:01:33.198796503 +0200
-@@ -25,11 +25,12 @@
-
-
- # Checks for programs.
-+AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_PROG_CXX
- AM_PROG_CC_C_O
--AC_USE_SYSTEM_EXTENSIONS
-+AM_PROG_AR
- m4_ifndef([AM_GNU_GETTEXT],
- [m4_fatal([GNU gettext is required to prepare the Aqualung build])])
- AM_GNU_GETTEXT([external])
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
deleted file mode 100644
index 111ee70c8774..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman <jamie@audible.transient.net>
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
----
- src/decoder/dec_lavc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
-index e2c81c6..5268a64 100644
---- a/src/decoder/dec_lavc.c
-+++ b/src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
- return DECODER_OPEN_BADLIB;
-
- pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
-
- pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
-
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
deleted file mode 100644
index 620bcb873d95..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:02:32 +0100
-Subject: [PATCH 1/2] Remove unused variable.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), but it's not used anyway.
----
- src/playlist.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/playlist.c b/src/playlist.c
-index 35483d1..96fac75 100644
---- a/src/playlist.c
-+++ b/src/playlist.c
-@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
- GtkWidget * plist__export;
- #endif /* HAVE_TRANSCODING */
-
--gchar command[RB_CONTROL_SIZE];
--
- GtkTreeIter * fileinfo_iter = NULL;
-
- int playlist_dirty;
-
-From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:06:41 +0100
-Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), because there's also a global timeout_tag in main.c.
-
-Also correct the type to guint rather than gint.
----
- src/ports.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ports.c b/src/ports.c
-index f17a5ab..f4de59d 100644
---- a/src/ports.c
-+++ b/src/ports.c
-@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
- int n_clients;
- GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
-
--gint timeout_tag;
-+guint ports_timeout_tag;
-
- int out_selector = 0;
-
-@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
- fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- }
- g_free(str);
-- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
- }
- }
-
-@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
- fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- }
- g_free(str);
-- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
- }
- }
-