diff options
Diffstat (limited to 'media-sound/aqualung')
| -rw-r--r-- | media-sound/aqualung/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/aqualung/aqualung-1.0-r5.ebuild | 108 | ||||
| -rw-r--r-- | media-sound/aqualung/files/aqualung-1.0-ar.patch | 17 | ||||
| -rw-r--r-- | media-sound/aqualung/files/aqualung-1.0-gcc10.patch | 69 |
4 files changed, 197 insertions, 0 deletions
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest index 96772ec558e6..5375ec1e930a 100644 --- a/media-sound/aqualung/Manifest +++ b/media-sound/aqualung/Manifest @@ -1,4 +1,7 @@ +AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985 +AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a EBUILD aqualung-1.0-r3.ebuild 2422 BLAKE2B 8fcce45ccc5062d388cd9c65d544e3baab1ec5a474b4fac3a4655cb0586b60458260c3d43083a0da855e18ea1ea10db39f2eb8533dbe73c4c7ce72d516ae84f4 SHA512 0ddbbefa25223761470a898eca0a08bafa6398ad467e681618d91b0886643d97aa6001596f4dff2942e2182b6dac2020a1e36d9e32b52b60ebb0de225f38059b +EBUILD aqualung-1.0-r5.ebuild 2511 BLAKE2B 470acd081320c361daf5f6739382dc4b9948a9da20984fe5b050c756ed828c67f2545d703c98154b5f2df12f9c333d90b096640dd7e46c5eb5aa099f9be56daa SHA512 c054fa841cccf8fa9f4ca38ae0fca2c016c56fd59fc12c15c8178ac75c0873c045def0b21731bbad244ba30ef22dde2179ee0a6abf33cf21ce867715118dfebb MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566 diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild new file mode 100644 index 000000000000..42fab45987b9 --- /dev/null +++ b/media-sound/aqualung/aqualung-1.0-r5.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop xdg + +MY_PV=${PV/_/-} + +DESCRIPTION="Music player for a wide range of formats designed for gapless playback" +HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung" +SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate + lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray + vorbis wavpack" + +BDEPEND=" + virtual/pkgconfig + sys-devel/gettext +" +RDEPEND=" + app-arch/bzip2 + dev-libs/libxml2 + sys-libs/zlib + x11-libs/gtk+:2 + alsa? ( media-libs/alsa-lib ) + cdda? ( dev-libs/libcdio-paranoia ) + cddb? ( media-libs/libcddb ) + ffmpeg? ( media-video/ffmpeg:0= ) + flac? ( media-libs/flac ) + ifp? ( media-libs/libifp ) + jack? ( virtual/jack ) + ladspa? ( media-libs/liblrdf ) + lame? ( media-sound/lame ) + libsamplerate? ( media-libs/libsamplerate ) + lua? ( dev-lang/lua:0= ) + mac? ( media-sound/mac ) + modplug? ( media-libs/libmodplug ) + mp3? ( media-libs/libmad ) + musepack? ( >=media-sound/musepack-tools-444 ) + pulseaudio? ( media-sound/pulseaudio ) + sndfile? ( media-libs/libsndfile ) + speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) + wavpack? ( media-sound/wavpack ) +" +DEPEND=" + ${RDEPEND} +" + +S=${WORKDIR}/${PN}-${MY_PV} + +PATCHES=( + "${FILESDIR}/${P}-ffmpeg3.patch" + "${FILESDIR}/${P}-gcc10.patch" + "${FILESDIR}/${P}-ar.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + --disable-rpath \ + --enable-loop \ + --enable-nls \ + --enable-transcoding \ + $(use_enable debug) \ + $(use_enable podcast) \ + $(use_enable systray) \ + $(use_enable jack jack-mgmt) \ + $(use_with alsa) \ + $(use_with cdda) \ + $(use_with cddb) \ + $(use_with ffmpeg lavc) \ + $(use_with flac) \ + $(use_with ifp) \ + $(use_with jack) \ + $(use_with ladspa) \ + $(use_with lame) \ + $(use_with libsamplerate src) \ + $(use_with lua) \ + $(use_with mac) \ + $(use_with modplug mod) \ + $(use_with mp3 mpeg) \ + $(use_with musepack mpc) \ + $(use_with oss) \ + $(use_with pulseaudio pulse) \ + $(use_with sndfile) \ + $(use_with speex) \ + $(use_with vorbis vorbis) \ + $(use_with vorbis vorbisenc) \ + $(use_with wavpack) +} + +src_install() { + default + + newicon src/img/icon_64.png aqualung.png + make_desktop_entry aqualung Aqualung +} diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch new file mode 100644 index 000000000000..3df4d75eaf1b --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.0-ar.patch @@ -0,0 +1,17 @@ +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-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch new file mode 100644 index 000000000000..620bcb873d95 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch @@ -0,0 +1,69 @@ +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); + } + } + |