* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/
@ 2017-02-18 16:53 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 88ae1b0a902678a3453b385270b3325e80d4a755
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 16:51:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 16:53:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ae1b0a
media-sound/aqualung: Drop old
Package-Manager: portage-2.3.3
media-sound/aqualung/aqualung-1.0.ebuild | 97 -------------------------------
media-sound/aqualung/files/ffmpeg29.patch | 13 -----
2 files changed, 110 deletions(-)
diff --git a/media-sound/aqualung/aqualung-1.0.ebuild b/media-sound/aqualung/aqualung-1.0.ebuild
deleted file mode 100644
index c6954bef5a..0000000000
--- a/media-sound/aqualung/aqualung-1.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.factorial.hu/"
-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"
-
-RDEPEND="sys-libs/zlib
- app-arch/bzip2
- dev-libs/libxml2
- x11-libs/gtk+:2
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- pulseaudio? ( media-sound/pulseaudio )
- flac? ( media-libs/flac )
- lame? ( media-sound/lame )
- ffmpeg? ( >=virtual/ffmpeg-0.6.90 )
- mac? ( media-sound/mac )
- modplug? ( media-libs/libmodplug )
- musepack? ( >=media-sound/musepack-tools-444 )
- mp3? ( media-libs/libmad )
- 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 )
- ladspa? ( media-libs/liblrdf )
- libsamplerate? ( media-libs/libsamplerate )
- ifp? ( media-libs/libifp )
- cdda? ( dev-libs/libcdio-paranoia )
- cddb? ( media-libs/libcddb )
- lua? ( dev-lang/lua:0= )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- epatch "${FILESDIR}/ffmpeg29.patch"
-}
-
-src_configure() {
- econf \
- --enable-nls \
- --disable-rpath \
- $(use_enable debug) \
- $(use_enable podcast) \
- $(use_enable systray) \
- --enable-transcoding \
- $(use_enable jack jack-mgmt) \
- --enable-loop \
- $(use_with alsa) \
- $(use_with jack) \
- $(use_with oss) \
- $(use_with pulseaudio pulse) \
- $(use_with flac) \
- $(use_with lame) \
- $(use_with ffmpeg lavc) \
- $(use_with mac) \
- $(use_with modplug mod) \
- $(use_with musepack mpc) \
- $(use_with mp3 mpeg) \
- $(use_with sndfile) \
- $(use_with speex) \
- $(use_with vorbis vorbis) \
- $(use_with vorbis vorbisenc) \
- $(use_with wavpack) \
- $(use_with ladspa) \
- $(use_with libsamplerate src) \
- $(use_with cdda) \
- $(use_with ifp) \
- $(use_with cddb) \
- $(use_with lua) \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- default
-
- newicon src/img/icon_64.png aqualung.png
- make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/files/ffmpeg29.patch b/media-sound/aqualung/files/ffmpeg29.patch
deleted file mode 100644
index 3cd0a0125b..0000000000
--- a/media-sound/aqualung/files/ffmpeg29.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: aqualung-1.0/src/decoder/dec_lavc.c
-===================================================================
---- aqualung-1.0.orig/src/decoder/dec_lavc.c
-+++ aqualung-1.0/src/decoder/dec_lavc.c
-@@ -280,7 +280,7 @@ lavc_decoder_open(decoder_t * dec, char
- return DECODER_OPEN_BADLIB;
-
- pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
--#if LIBAVCODEC_VERSION_MAJOR >= 53
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR < 57
- pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/
@ 2020-08-05 18:24 Daniel Pielmeier
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Pielmeier @ 2020-08-05 18:24 UTC (permalink / raw
To: gentoo-commits
commit: f434b4ffd69af0afcb2f372ec73dc48d8a98a328
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 18:23:42 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 18:23:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f434b4ff
media-sound/aqualung: Revision bump to aqualung-1.0-r5.
Fixes bug #735984. Thanks to Agostino Sarubbo for the report.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
media-sound/aqualung/aqualung-1.0-r5.ebuild | 108 +++++++++++++++++++++++
media-sound/aqualung/files/aqualung-1.0-ar.patch | 17 ++++
2 files changed, 125 insertions(+)
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 00000000000..602335f9377
--- /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 00000000000..3df4d75eaf1
--- /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])
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/
@ 2021-01-13 14:39 Daniel Pielmeier
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Pielmeier @ 2021-01-13 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 8dcececc1702ebbd97dc3411bd03a3c423bc1d21
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 14:39:12 2021 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 14:39:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcececc
media-sound/aqualung: Fix bug #759385.
Thanks to Toralf Förster for the report.
Closes: https://bugs.gentoo.org/759385
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
media-sound/aqualung/aqualung-1.1-r1.ebuild | 3 ++-
media-sound/aqualung/aqualung-1.1-r101.ebuild | 3 ++-
.../files/aqualung-1.1-var-collision.patch | 31 ++++++++++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
index c2442960c3c..0e4f24b9cf5 100644
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-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
@@ -52,6 +52,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${P}-ifp.patch"
+ "${FILESDIR}/${P}-var-collision.patch"
)
src_configure() {
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index fe7a974b3a4..2390bf4b118 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.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
@@ -54,6 +54,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${P}-ifp.patch"
+ "${FILESDIR}/${P}-var-collision.patch"
)
src_configure() {
diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
new file mode 100644
index 00000000000..2606a0bea00
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
@@ -0,0 +1,31 @@
+From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Sun, 10 Jan 2021 22:32:04 +0000
+Subject: [PATCH] Don't call a variable "bool".
+
+If one of the headers happens to #include <stdbool.h>, this'll clash
+with the C99 type definition.
+---
+ src/build_store.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/build_store.c b/src/build_store.c
+index 56b0eaf..ed4bfca 100644
+--- a/src/build_store.c
++++ b/src/build_store.c
+@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
+ data_src_gui_t * gui = (data_src_gui_t *)data;
+
+ if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) {
+- gboolean bool;
++ gboolean value;
+ int type;
+
+- gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1);
++ gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1);
+ gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter,
+- 0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
++ 0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
+ }
+ }
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/
@ 2021-03-17 15:44 Daniel Pielmeier
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Pielmeier @ 2021-03-17 15:44 UTC (permalink / raw
To: gentoo-commits
commit: d73dc9fb90638a7703b3a1c8c0287e8ce13e2572
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 15:43:48 2021 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 15:43:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73dc9fb
media-sound/aqualung: Remove old.
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
media-sound/aqualung/Manifest | 1 -
media-sound/aqualung/aqualung-1.0-r5.ebuild | 108 ---------------------
media-sound/aqualung/aqualung-1.1-r1.ebuild | 97 ------------------
media-sound/aqualung/files/aqualung-1.0-ar.patch | 17 ----
.../aqualung/files/aqualung-1.0-ffmpeg3.patch | 29 ------
.../aqualung/files/aqualung-1.0-gcc10.patch | 69 -------------
6 files changed, 321 deletions(-)
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index e2cdd8f4efc..6ddcfae8db3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,2 +1 @@
-DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild
deleted file mode 100644
index 442799d70ce..00000000000
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
deleted file mode 100644
index 0e4f24b9cf5..00000000000
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-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="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.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}
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-ifp.patch"
- "${FILESDIR}/${P}-var-collision.patch"
-)
-
-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
deleted file mode 100644
index 3df4d75eaf1..00000000000
--- 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 111ee70c877..00000000000
--- 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 620bcb873d9..00000000000
--- 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);
- }
- }
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/
@ 2021-07-12 12:26 Marek Szuba
0 siblings, 0 replies; 5+ messages in thread
From: Marek Szuba @ 2021-07-12 12:26 UTC (permalink / raw
To: gentoo-commits
commit: c9b822a38d0e71539ab4fef429027ec11f75e3b6
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 11:59:51 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 12:26:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b822a3
media-sound/aqualung: respect LUA_SINGLE_TARGET value
Default upstream behaviour is to prefer 5.2 over all others if
present, and if neither 5.2 nor 5.1 can be found try the newest version
available.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-sound/aqualung/aqualung-1.1-r101.ebuild | 6 +++++
.../files/aqualung-1.1-configure-lua-version.patch | 31 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 3f49bddce79..af782eb7015 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -55,6 +55,7 @@ DEPEND="
"
PATCHES=(
+ "${FILESDIR}/${P}-configure-lua-version.patch"
"${FILESDIR}/${P}-ifp.patch"
"${FILESDIR}/${P}-var-collision.patch"
)
@@ -63,6 +64,11 @@ pkg_setup() {
use lua && lua-single_pkg_setup
}
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-rpath \
diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
new file mode 100644
index 00000000000..a88839728c5
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,24 +401,11 @@
+ ])
+
+ AQUALUNG_DETECT([lua], [Lua Extension],
+- [PKG_CHECK_MODULES([lua], [lua5.2],
++ [PKG_CHECK_MODULES([lua], [lua],
+ [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua-5.2],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua52],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua5.1],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua-5.1],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua51],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+- [AQUALUNG_FOUND([lua])],
+- [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+- [AQUALUNG_FOUND([lua])],
+- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])])
+-
++ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])]
++ )]
++)
+
+ # Compiler and linker variables.
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-12 12:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-12 12:26 [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2021-03-17 15:44 Daniel Pielmeier
2021-01-13 14:39 Daniel Pielmeier
2020-08-05 18:24 Daniel Pielmeier
2017-02-18 16:53 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox