subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-sound\/aqualung\/"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-11-02 Thread Miroslav Šulc

commit: 60b859affcb381274320027f292a808dad259600
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov  2 06:49:00 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov  2 06:49:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b859af

media-sound/aqualung: dropped obsolete 1.2-r2

Bug: https://bugs.gentoo.org/916568
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r2.ebuild | 114 
 1 file changed, 114 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.2-r2.ebuild 
b/media-sound/aqualung/aqualung-1.2-r2.ebuild
deleted file mode 100644
index a8a06cac3610..
--- a/media-sound/aqualung/aqualung-1.2-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit autotools desktop lua-single xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless 
playback"
-HOMEPAGE="https://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"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-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:= )
-   flac? ( media-libs/flac:= )
-   ifp? ( media-libs/libifp )
-   jack? ( virtual/jack )
-   ladspa? ( media-libs/liblrdf )
-   lame? ( media-sound/lame )
-   libsamplerate? ( media-libs/libsamplerate )
-   lua? ( ${LUA_DEPS} )
-   mac? ( <=media-sound/mac-4.12 )
-   modplug? ( media-libs/libmodplug )
-   mp3? ( media-libs/libmad )
-   musepack? ( >=media-sound/musepack-tools-444 )
-   pulseaudio? ( media-libs/libpulse )
-   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}/${PN}-1.1-configure-lua-version.patch"
-)
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-11-01 Thread Sam James

commit: 1afda2973bf9acb08efdddfd29516a016088eedf
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  1 15:14:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  1 15:14:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1afda297

media-sound/aqualung: Stabilize 1.2-r3 x86, #916568

Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.2-r3.ebuild 
b/media-sound/aqualung/aqualung-1.2-r3.ebuild
index e7e7874ba8d0..f53ee4c90007 100644
--- a/media-sound/aqualung/aqualung-1.2-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-11-01 Thread Sam James

commit: 8407ddc7049617614fa669a2a29aa7521a826ef6
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  1 15:14:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  1 15:14:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8407ddc7

media-sound/aqualung: Stabilize 1.2-r3 amd64, #916568

Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.2-r3.ebuild 
b/media-sound/aqualung/aqualung-1.2-r3.ebuild
index dc7c665c8929..e7e7874ba8d0 100644
--- a/media-sound/aqualung/aqualung-1.2-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/

2023-09-30 Thread Daniel Pielmeier

commit: 6f9633fa02ef5fcb8f300a098b950addb78d438b
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Sep 30 14:48:28 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Sep 30 14:48:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9633fa

media-sound/aqualung/files: Add missing patches

Signed-off-by: Daniel Pielmeier  gentoo.org>

 .../files/aqualung-1.2-mac-configure.patch |  48 
 .../aqualung/files/aqualung-1.2-mac-dec.patch  | 136 +
 .../files/aqualung-1.2-mac-endianness.patch|  73 +++
 .../aqualung/files/aqualung-1.2-mac-glib.patch |  22 
 4 files changed, 279 insertions(+)

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch 
b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
new file mode 100644
index ..6418228158bf
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
@@ -0,0 +1,48 @@
+diff -Naur aqualung-1.2_orig/configure.ac aqualung-1.2/configure.ac
+--- aqualung-1.2_orig/configure.ac 2023-08-13 18:12:52.281251038 +0200
 aqualung-1.2/configure.ac  2023-08-13 18:13:55.693247259 +0200
+@@ -275,11 +275,11 @@
+ [AQUALUNG_FOUND([lavc])],
+ [AQUALUNG_MISSING([lavc], [$lavc_PKG_ERRORS])])])
+ 
+-AQUALUNG_DETECT([mac], [Monkey's Audio Codec],
+-[AC_CHECK_LIB([mac], [CreateIAPEDecompress],
+-[AQUALUNG_FOUND([mac], [-lmac -lstdc++])],
+-[AQUALUNG_MISSING([mac],
+-[Monkey's Audio Codec support requires libmac])],
++AQUALUNG_DETECT([MAC], [Monkey's Audio Codec],
++[AC_CHECK_LIB([MAC], [CreateIAPEDecompress],
++[AQUALUNG_FOUND([MAC], [-lMAC -lstdc++])],
++[AQUALUNG_MISSING([MAC],
++[Monkey's Audio Codec support requires libMAC])],
+ [-lstdc++])])
+ 
+ AQUALUNG_DETECT([mod], [MOD Audio],
+diff -Naur aqualung-1.2_orig/src/decoder/dec_mac.cpp 
aqualung-1.2/src/decoder/dec_mac.cpp
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp  2023-08-13 18:20:40.318223141 
+0200
 aqualung-1.2/src/decoder/dec_mac.cpp   2023-08-13 18:21:33.661219962 
+0200
+@@ -31,9 +31,9 @@
+ #define DLLEXPORT
+ 
+ #include "../undef_ac_pkg.h"
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
+ #include "../undef_ac_pkg.h"
+ #include/* re-establish undefined autoconf macros */
+ 
+diff -Naur aqualung-1.2_orig/src/Makefile.am aqualung-1.2/src/Makefile.am
+--- aqualung-1.2_orig/src/Makefile.am  2023-08-14 00:51:00.972827161 +0200
 aqualung-1.2/src/Makefile.am   2023-08-14 00:51:10.563826590 +0200
+@@ -25,7 +25,7 @@
+ aqualung_LDADD = $(LDADD) $(xml_LIBS) $(gtk_LIBS) $(glib_LIBS) \
+  $(alsa_LIBS) $(jack_LIBS) $(oss_LIBS) $(pulse_LIBS) \
+  $(sndio_LIBS) $(winmm_LIBS) \
+- $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(mac_LIBS) \
++ $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(MAC_LIBS) \
+  $(mad_LIBS) $(mod_LIBS) $(mpc_LIBS) $(sndfile_LIBS) \
+  $(speex_LIBS) $(vorbis_LIBS) $(vorbisenc_LIBS) \
+  $(wavpack_LIBS) \

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch 
b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
new file mode 100644
index ..a7fb369cb1c2
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
@@ -0,0 +1,136 @@
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp  2023-08-13 19:40:59.245935911 
+0200
 aqualung-1.2/src/decoder/dec_mac.cpp   2023-08-13 19:41:33.660933860 
+0200
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ 
+ /* expand this to nothing so there's no error when including MACLib.h */
+@@ -60,16 +61,16 @@
+ 
+   mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+   file_decoder_t * fdec = dec->fdec;
+-  IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress 
*)pd->decompress;
+ 
+-  int act_read = 0;
++  APE::int64 act_read = 0;
+   unsigned long scale = 1 << (pd->bits_per_sample - 1);
+   float fbuf[2 * BLOCKS_PER_READ];
+   int n = 0;
+ 
+   switch (pd->bits_per_sample) {
+   case 8:
+-  char data8[2 * BLOCKS_PER_READ];
++  unsigned char data8[2 * BLOCKS_PER_READ];
+   pdecompress->GetData(data8, BLOCKS_PER_READ, _read);
+   if (!act_read) {
+   return 1;
+@@ -84,7 +85,7 @@
+ 
+   case 16:
+   short data16[2 * BLOCKS_PER_READ];
+-  pdecompress->GetData((char *)data16, BLOCKS_PER_READ, 
_read);
++  pdecompress->GetData((unsigned char *)data16, BLOCKS_PER_READ, 
_read);
+   if (!act_read) {
+   return 1;
+   }
+@@ -100,7 +101,7 @@
+ 
+   case 32:
+   int data32[2 * BLOCKS_PER_READ];
+-  pdecompress->GetData((char *)data32,

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-09-30 Thread Daniel Pielmeier

commit: 9f15f89a49184b18313fb8c16ca13690083a1220
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Sep 30 11:55:05 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Sep 30 11:55:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f15f89a

media-sound/aqualung: Add compatibility with newer verions of media-sound/mac

Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r3.ebuild | 121 
 1 file changed, 121 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.2-r3.ebuild 
b/media-sound/aqualung/aqualung-1.2-r3.ebuild
new file mode 100644
index ..dc7c665c8929
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.2-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools desktop lua-single xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless 
playback"
+HOMEPAGE="https://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"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+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:= )
+   flac? ( media-libs/flac:= )
+   ifp? ( media-libs/libifp )
+   jack? ( virtual/jack )
+   ladspa? ( media-libs/liblrdf )
+   lame? ( media-sound/lame )
+   libsamplerate? ( media-libs/libsamplerate )
+   lua? ( ${LUA_DEPS} )
+   mac? ( >=media-sound/mac-10.24:= )
+   modplug? ( media-libs/libmodplug )
+   mp3? ( media-libs/libmad )
+   musepack? ( >=media-sound/musepack-tools-444 )
+   pulseaudio? ( media-libs/libpulse )
+   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}/${PN}-1.1-configure-lua-version.patch"
+   "${FILESDIR}/${PN}-1.2-mac-configure.patch"
+   "${FILESDIR}/${PN}-1.2-mac-dec.patch"
+   "${FILESDIR}/${PN}-1.2-mac-endianness.patch"
+   "${FILESDIR}/${PN}-1.2-mac-glib.patch"
+)
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   xdg_environment_reset
+
+   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 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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/flacon/, media-sound/dir2ogg/, ...

2023-09-30 Thread Daniel Pielmeier

commit: aaa5c0b0817987165cb156a4c13f9a42546b4bab
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Sep 30 11:30:43 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Sep 30 11:35:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa5c0b0

media-sound/*: Prepare for media-sound/mac bump

Bug: https://bugs.gentoo.org/838715
Signed-off-by: Daniel Pielmeier  gentoo.org>

 .../{abcde-2.9.3-r3.ebuild => abcde-2.9.3-r4.ebuild}  |  4 ++--
 .../{aqualung-1.2-r1.ebuild => aqualung-1.2-r2.ebuild}| 15 ++-
 .../{asunder-2.9.7.ebuild => asunder-2.9.7-r1.ebuild} |  4 ++--
 .../{asunder-3.0.1.ebuild => asunder-3.0.1-r1.ebuild} |  2 +-
 .../{dir2ogg-0.13-r1.ebuild => dir2ogg-0.13-r2.ebuild}|  2 +-
 .../{flacon-10.0.0.ebuild => flacon-10.0.0-r1.ebuild} |  2 +-
 ...{shntool-3.0.10-r2.ebuild => shntool-3.0.10-r3.ebuild} |  4 ++--
 .../xmms2/{xmms2-0.9.3.ebuild => xmms2-0.9.3-r1.ebuild}   |  2 +-
 8 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/media-sound/abcde/abcde-2.9.3-r3.ebuild 
b/media-sound/abcde/abcde-2.9.3-r4.ebuild
similarity index 96%
rename from media-sound/abcde/abcde-2.9.3-r3.ebuild
rename to media-sound/abcde/abcde-2.9.3-r4.ebuild
index ff1093b5c2fb..3e81ffb65f15 100644
--- a/media-sound/abcde/abcde-2.9.3-r3.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ RDEPEND="
lame? ( media-sound/lame )
mac? (
media-sound/apetag
-   media-sound/mac
+   <=media-sound/mac-4.12
)
musepack? ( media-sound/musepack-tools )
musicbrainz? (

diff --git a/media-sound/aqualung/aqualung-1.2-r1.ebuild 
b/media-sound/aqualung/aqualung-1.2-r2.ebuild
similarity index 91%
rename from media-sound/aqualung/aqualung-1.2-r1.ebuild
rename to media-sound/aqualung/aqualung-1.2-r2.ebuild
index 7979234c9fef..a8a06cac3610 100644
--- a/media-sound/aqualung/aqualung-1.2-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r2.ebuild
@@ -24,8 +24,6 @@ BDEPEND="
virtual/pkgconfig
sys-devel/gettext
 "
-# https://github.com/jeremyevans/aqualung/issues/29
 RDEPEND="
app-arch/bzip2
dev-libs/libxml2
@@ -42,14 +40,21 @@ RDEPEND="
lame? ( media-sound/lame )
libsamplerate? ( media-libs/libsamplerate )
lua? ( ${LUA_DEPS} )
-   mac? ( media-sound/mac )
+   mac? ( <=media-sound/mac-4.12 )
modplug? ( media-libs/libmodplug )
mp3? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
pulseaudio? ( media-libs/libpulse )
sndfile? ( media-libs/libsndfile )
-   speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-   vorbis? ( media-libs/libvorbis media-libs/libogg )
+   speex? (
+   media-libs/speex
+   media-libs/liboggz
+   media-libs/libogg
+   )
+   vorbis? (
+   media-libs/libvorbis
+   media-libs/libogg
+   )
wavpack? ( media-sound/wavpack )
 "
 DEPEND="${RDEPEND}"

diff --git a/media-sound/asunder/asunder-2.9.7.ebuild 
b/media-sound/asunder/asunder-2.9.7-r1.ebuild
similarity index 92%
rename from media-sound/asunder/asunder-2.9.7.ebuild
rename to media-sound/asunder/asunder-2.9.7-r1.ebuild
index cde24a12aab4..f55896226042 100644
--- a/media-sound/asunder/asunder-2.9.7.ebuild
+++ b/media-sound/asunder/asunder-2.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="media-libs/libcddb
 # dlopen() deps
 RDEPEND="${DEPEND}
flac? ( media-libs/flac )
-   mac? ( media-sound/mac )
+   mac? ( <=media-sound/mac-4.12 )
mp3? ( media-sound/lame )
musepack? ( media-sound/musepack-tools )
opus? ( media-sound/opus-tools )

diff --git a/media-sound/asunder/asunder-3.0.1.ebuild 
b/media-sound/asunder/asunder-3.0.1-r1.ebuild
similarity index 96%
rename from media-sound/asunder/asunder-3.0.1.ebuild
rename to media-sound/asunder/asunder-3.0.1-r1.ebuild
index 030d989f735d..22ad05fbe08e 100644
--- a/media-sound/asunder/asunder-3.0.1.ebuild
+++ b/media-sound/asunder/asunder-3.0.1-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="media-libs/libcddb
 # dlopen() deps
 RDEPEND="${DEPEND}
flac? ( media-libs/flac )
-   mac? ( media-sound/mac )
+   mac? ( <=media-sound/mac-4.12 )
mp3? ( media-sound/lame )
musepack? ( media-sound/musepack-tools )
opus? ( media-sound/opus-tools )

diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild 
b/media-sound/dir2ogg/dir2ogg-0.13-r2.ebuild
similarity index 97%
rename from media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
rename to

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/

2023-08-13 Thread Daniel Pielmeier

commit: 58d529eec174f6457a6a1b15dec1e3208977d25b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Aug 13 13:39:13 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sun Aug 13 14:02:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d529ee

media-sound/aqualung: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32286
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/files/aqualung-1.1-ifp.patch  | 41 --
 .../files/aqualung-1.1-var-collision.patch | 31 
 2 files changed, 72 deletions(-)

diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch 
b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
deleted file mode 100644
index 490999be9485..
--- a/media-sound/aqualung/files/aqualung-1.1-ifp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
-From: Adam Sampson 
-Date: Tue, 8 Sep 2020 15:55:12 +0100
-Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
-
-directory_chooser needs to know the length of the target.

- src/ifp_device.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ifp_device.c b/src/ifp_device.c
-index 9ef5741..42236cb 100644
 a/src/ifp_device.c
-+++ b/src/ifp_device.c
-@@ -824,7 +824,7 @@ gchar *npath;
- 
- 
- void
--directory_chooser(char * title, GtkWidget * parent, char * directory) {
-+directory_chooser(char * title, GtkWidget * parent, char * directory, size_t 
directory_len) {
- 
- GtkWidget * dialog;
-   const gchar * selected_directory;
-@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * 
directory) {
-   gtk_widget_destroy(dialog);
-   }
- 
--arr_strlcpy(directory, selected_directory);
-+g_strlcpy(directory, selected_directory, directory_len);
-   g_free(utf8);
- }
- 
-@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * 
directory) {
- 
- void
- local_path_selected_cb(GtkButton * button, gpointer data) {
--  directory_chooser(_("Please select a local path."), aifp_window, 
dest_dir);
-+  directory_chooser(_("Please select a local path."), aifp_window, 
dest_dir, sizeof dest_dir);
- gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
- }
- 

diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch 
b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
deleted file mode 100644
index 2606a0bea00c..
--- a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
-From: Adam Sampson 
-Date: Sun, 10 Jan 2021 22:32:04 +
-Subject: [PATCH] Don't call a variable "bool".
-
-If one of the headers happens to #include , 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), 
, path)) {
--  gboolean bool;
-+  gboolean value;
-   int type;
- 
--  gtk_tree_model_get(GTK_TREE_MODEL(gui->list), , 0, , 
1, , -1);
-+  gtk_tree_model_get(GTK_TREE_MODEL(gui->list), , 0, , 
1, , -1);
-   gtk_list_store_set(GTK_LIST_STORE(gui->list), ,
-- 0, !bool && (type != DATA_SRC_CDDB || 
gui->model->cddb_mask), -1);
-+ 0, !value && (type != DATA_SRC_CDDB || 
gui->model->cddb_mask), -1);
-   }
- }
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-08-02 Thread Miroslav Šulc

commit: 1f50fcb40ca5356f1cb6eb6bc262037fc8f1a27d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug  3 05:36:44 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug  3 05:36:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f50fcb4

media-sound/aqualung: dropped obsolete 1.1-r103

Bug: https://bugs.gentoo.org/911238
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/aqualung/Manifest |   1 -
 media-sound/aqualung/aqualung-1.1-r103.ebuild | 111 --
 2 files changed, 112 deletions(-)

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index d9badbacf707..a36bb2cb8cac 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,2 +1 @@
-DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 
2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece
 SHA512 
77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
 DIST aqualung-1.2.tar.gz 1974910 BLAKE2B 
4956865a5897cf92d3ebb65cb30f27164e7717fadbbff8e275b25d5fa9c60382846877f644d3a8393935df82f9b92d282fe41befe27cd86accc3f6885650063f
 SHA512 
0e11f307344c8ada7f3869d953e6fb8b088a8af345d51f3e93af18b4b57ea6f35bbc47eefea40956114d56882e4a0d66c1496a7b9a14dfd82e6a95cfc0ef52c5

diff --git a/media-sound/aqualung/aqualung-1.1-r103.ebuild 
b/media-sound/aqualung/aqualung-1.1-r103.ebuild
deleted file mode 100644
index 2872ec46f129..
--- a/media-sound/aqualung/aqualung-1.1-r103.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit autotools desktop lua-single xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless 
playback"
-HOMEPAGE="https://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"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-   virtual/pkgconfig
-   sys-devel/gettext
-"
-# https://github.com/jeremyevans/aqualung/issues/29
-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-sound/musepack-tools-444 )
-   pulseaudio? ( media-libs/libpulse )
-   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}-configure-lua-version.patch"
-   "${FILESDIR}/${P}-ifp.patch"
-   "${FILESDIR}/${P}-var-collision.patch"
-)
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-08-02 Thread Sam James

commit: dc9fd30d60b61ac6fcb37faee0e801e498f01542
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 17:52:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 17:52:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9fd30d

media-sound/aqualung: Stabilize 1.2-r1 x86, #911238

Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.2-r1.ebuild 
b/media-sound/aqualung/aqualung-1.2-r1.ebuild
index 4bd689c22495..7979234c9fef 100644
--- a/media-sound/aqualung/aqualung-1.2-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-08-02 Thread Sam James

commit: a932b07bef0725059380547f9920774a18ae6ace
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 16:54:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 16:54:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a932b07b

media-sound/aqualung: Stabilize 1.2-r1 amd64, #911238

Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.2-r1.ebuild 
b/media-sound/aqualung/aqualung-1.2-r1.ebuild
index 112b56824332..4bd689c22495 100644
--- a/media-sound/aqualung/aqualung-1.2-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-06-25 Thread Daniel Pielmeier

commit: 2728cd9bdaadb3dc07c4fc6f67670b4a02aa0639
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sun Jun 25 12:58:19 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sun Jun 25 12:58:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2728cd9b

media-sound/aqualung: aqualung-1.2 should compile with all current ffmpeg 
versions

Closes: https://bugs.gentoo.org/834391
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/{aqualung-1.2.ebuild => aqualung-1.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.2.ebuild 
b/media-sound/aqualung/aqualung-1.2-r1.ebuild
similarity index 98%
rename from media-sound/aqualung/aqualung-1.2.ebuild
rename to media-sound/aqualung/aqualung-1.2-r1.ebuild
index 2aa0868884f7..112b56824332 100644
--- a/media-sound/aqualung/aqualung-1.2.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-06-11 Thread Miroslav Šulc

commit: 16f2e324da104c7525cb175138661b1390835ed0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jun 11 07:56:06 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jun 11 07:56:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f2e324

media-sound/aqualung: bump to 1.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/aqualung/Manifest|   1 +
 media-sound/aqualung/aqualung-1.2.ebuild | 109 +++
 2 files changed, 110 insertions(+)

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 6ddcfae8db39..d9badbacf707 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1 +1,2 @@
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 
2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece
 SHA512 
77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
+DIST aqualung-1.2.tar.gz 1974910 BLAKE2B 
4956865a5897cf92d3ebb65cb30f27164e7717fadbbff8e275b25d5fa9c60382846877f644d3a8393935df82f9b92d282fe41befe27cd86accc3f6885650063f
 SHA512 
0e11f307344c8ada7f3869d953e6fb8b088a8af345d51f3e93af18b4b57ea6f35bbc47eefea40956114d56882e4a0d66c1496a7b9a14dfd82e6a95cfc0ef52c5

diff --git a/media-sound/aqualung/aqualung-1.2.ebuild 
b/media-sound/aqualung/aqualung-1.2.ebuild
new file mode 100644
index ..2aa0868884f7
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools desktop lua-single xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless 
playback"
+HOMEPAGE="https://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"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+   virtual/pkgconfig
+   sys-devel/gettext
+"
+# https://github.com/jeremyevans/aqualung/issues/29
+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-sound/musepack-tools-444 )
+   pulseaudio? ( media-libs/libpulse )
+   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}/${PN}-1.1-configure-lua-version.patch"
+)
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-05-29 Thread Andreas Sturmlechner

commit: bc27d7e94b90fa269e3e44766e7cbe1b6f1fbed9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 17:17:40 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 18:29:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc27d7e9

media-sound/aqualung: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../aqualung/{aqualung-1.1-r102.ebuild => aqualung-1.1-r103.ebuild} | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r102.ebuild 
b/media-sound/aqualung/aqualung-1.1-r103.ebuild
similarity index 97%
rename from media-sound/aqualung/aqualung-1.1-r102.ebuild
rename to media-sound/aqualung/aqualung-1.1-r103.ebuild
index fa0cfccfa66a..2872ec46f129 100644
--- a/media-sound/aqualung/aqualung-1.1-r102.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r103.ebuild
@@ -46,15 +46,13 @@ RDEPEND="
modplug? ( media-libs/libmodplug )
mp3? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
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}
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-configure-lua-version.patch"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2023-02-14 Thread Sam James

commit: f7ee900e3104d52c9ce29649540ea273e16ec218
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 15 06:16:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 15 06:16:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ee900e

media-sound/aqualung: depend on https://bugs.gentoo.org/834391
Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r102.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r102.ebuild 
b/media-sound/aqualung/aqualung-1.1-r102.ebuild
index 184efbb00747..fa0cfccfa66a 100644
--- a/media-sound/aqualung/aqualung-1.1-r102.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,8 @@ BDEPEND="
virtual/pkgconfig
sys-devel/gettext
 "
+# https://github.com/jeremyevans/aqualung/issues/29
 RDEPEND="
app-arch/bzip2
dev-libs/libxml2
@@ -32,7 +34,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? ( media-video/ffmpeg:= )
+   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2022-09-10 Thread Sam James

commit: b4052c78f45d961cd9fbe9708b85d96c7cbc8616
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 08:25:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 08:40:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4052c78

media-sound/aqualung: add media-libs/flac subslot dep

media-libs/flac-1.4.0 breaks ABI.

Signed-off-by: Sam James  gentoo.org>

 .../aqualung/{aqualung-1.1-r101.ebuild => aqualung-1.1-r102.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild 
b/media-sound/aqualung/aqualung-1.1-r102.ebuild
similarity index 96%
rename from media-sound/aqualung/aqualung-1.1-r101.ebuild
rename to media-sound/aqualung/aqualung-1.1-r102.ebuild
index 26cd9a923812..184efbb00747 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? ( media-video/ffmpeg:0= )
-   flac? ( media-libs/flac )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac:= )
ifp? ( media-libs/libifp )
jack? ( virtual/jack )
ladspa? ( media-libs/liblrdf )

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

2021-07-12 Thread Marek Szuba

commit: c9b822a38d0e71539ab4fef429027ec11f75e3b6
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 12 11:59:51 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 12 12:26:24 2021 +
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  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 000..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"])

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2021-07-12 Thread Marek Szuba

commit: c2fcfbd233595511a1a0b8571750641653cc30b7
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 12 11:45:09 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 12 12:26:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fcfbd2

media-sound/aqualung: support all currently available Lua targets

Builds and installs fine against all five. For the record, the upstream
configure search logic is 5.2, 5.1, >5.2, >5.1, fail.

Signed-off-by: Marek Szuba  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r101.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild 
b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index af782eb7015..26cd9a92381 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single xdg
 
 DESCRIPTION="Music player for a wide range of formats designed for gapless 
playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ 
https://github.com/jeremyevans/aqualung;
+HOMEPAGE="https://aqualung.jeremyevans.net/ 
https://github.com/jeremyevans/aqualung;
 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz;
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2021-07-12 Thread Marek Szuba

commit: 3d40bbccd972958ceb66e7f32179c477a02a113f
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 12 11:42:42 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 12 12:26:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d40bbcc

media-sound/aqualung: fix REQUIRED_USE for USE=lua

Signed-off-by: Marek Szuba  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r101.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild 
b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 87d3f7995f0..3f49bddce79 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -18,6 +18,8 @@ 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"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
virtual/pkgconfig
sys-devel/gettext

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

2021-03-17 Thread Daniel Pielmeier

commit: d73dc9fb90638a7703b3a1c8c0287e8ce13e2572
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Mar 17 15:43:48 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Mar 17 15:43:48 2021 +
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  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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2021-02-02 Thread Daniel Pielmeier

commit: f90e48894994971835b76ced8e8d54a3919a92e5
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Tue Feb  2 15:28:17 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Tue Feb  2 15:28:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90e4889

media-sound/aqualung: Fix bug #768282.

Thanks to Laszlo Valko for the report and Ionen Wolkens for
the patch.

Closes: https://bugs.gentoo.org/768282
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r101.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild 
b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index f497e1bb19b..87d3f7995f0 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -57,6 +57,10 @@ PATCHES=(
"${FILESDIR}/${P}-var-collision.patch"
 )
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_configure() {
econf \
--disable-rpath \

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

2021-01-13 Thread Daniel Pielmeier

commit: 8dcececc1702ebbd97dc3411bd03a3c423bc1d21
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Jan 13 14:39:12 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Jan 13 14:39:12 2021 +
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  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 000..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 
+Date: Sun, 10 Jan 2021 22:32:04 +
+Subject: [PATCH] Don't call a variable "bool".
+
+If one of the headers happens to #include , 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), 
, path)) {
+-  gboolean bool;
++  gboolean value;
+   int type;
+ 
+-  gtk_tree_model_get(GTK_TREE_MODEL(gui->list), , 0, , 
1, , -1);
++  gtk_tree_model_get(GTK_TREE_MODEL(gui->list), , 0, , 
1, , -1);
+   gtk_list_store_set(GTK_LIST_STORE(gui->list), ,
+- 0, !bool && (type != DATA_SRC_CDDB || 
gui->model->cddb_mask), -1);
++ 0, !value && (type != DATA_SRC_CDDB || 
gui->model->cddb_mask), -1);
+   }
+ }
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-11-19 Thread Thomas Deutschmann

commit: 0127a5e794ce841d3af2ff20b899d8a8bc4fabea
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Nov 20 01:31:15 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Nov 20 01:31:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0127a5e7

media-sound/aqualung: x86 stable (bug #755437)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild 
b/media-sound/aqualung/aqualung-1.1-r1.ebuild
index 2f58dea167d..c2442960c3c 100644
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-11-19 Thread Sam James

commit: c495a550359a67c5eaea55d8f199a37275159ab8
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 19 22:56:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 19 22:56:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c495a550

media-sound/aqualung: Stabilize 1.1-r1 amd64, #755437

Signed-off-by: Sam James  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild 
b/media-sound/aqualung/aqualung-1.1-r1.ebuild
index 33bb7a4e90c..2f58dea167d 100644
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/

2020-11-04 Thread Daniel Pielmeier

commit: 860b716b29a547eb7bbd3a9e123962fa531713a9
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Nov  4 17:49:39 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Nov  4 17:49:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860b716b

media-sound/aqualung: Fix bug #752993.

Thanks to Toralf Förster for the report.

Closes: https://bugs.gentoo.org/752993
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier  gentoo.org>

 ...{aqualung-1.1.ebuild => aqualung-1.1-r1.ebuild} |  4 +++
 ...ng-1.1-r100.ebuild => aqualung-1.1-r101.ebuild} |  4 +++
 media-sound/aqualung/files/aqualung-1.1-ifp.patch  | 41 ++
 3 files changed, 49 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.1.ebuild 
b/media-sound/aqualung/aqualung-1.1-r1.ebuild
similarity index 98%
rename from media-sound/aqualung/aqualung-1.1.ebuild
rename to media-sound/aqualung/aqualung-1.1-r1.ebuild
index ea7f3d62f5a..33bb7a4e90c 100644
--- a/media-sound/aqualung/aqualung-1.1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
${RDEPEND}
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-ifp.patch"
+)
+
 src_configure() {
econf \
--disable-rpath \

diff --git a/media-sound/aqualung/aqualung-1.1-r100.ebuild 
b/media-sound/aqualung/aqualung-1.1-r101.ebuild
similarity index 98%
rename from media-sound/aqualung/aqualung-1.1-r100.ebuild
rename to media-sound/aqualung/aqualung-1.1-r101.ebuild
index 57950edcbf4..fe7a974b3a4 100644
--- a/media-sound/aqualung/aqualung-1.1-r100.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -52,6 +52,10 @@ DEPEND="
${RDEPEND}
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-ifp.patch"
+)
+
 src_configure() {
econf \
--disable-rpath \

diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch 
b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
new file mode 100644
index 000..490999be948
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
@@ -0,0 +1,41 @@
+From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
+From: Adam Sampson 
+Date: Tue, 8 Sep 2020 15:55:12 +0100
+Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
+
+directory_chooser needs to know the length of the target.
+---
+ src/ifp_device.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ifp_device.c b/src/ifp_device.c
+index 9ef5741..42236cb 100644
+--- a/src/ifp_device.c
 b/src/ifp_device.c
+@@ -824,7 +824,7 @@ gchar *npath;
+ 
+ 
+ void
+-directory_chooser(char * title, GtkWidget * parent, char * directory) {
++directory_chooser(char * title, GtkWidget * parent, char * directory, size_t 
directory_len) {
+ 
+ GtkWidget * dialog;
+   const gchar * selected_directory;
+@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * 
directory) {
+   gtk_widget_destroy(dialog);
+   }
+ 
+-arr_strlcpy(directory, selected_directory);
++g_strlcpy(directory, selected_directory, directory_len);
+   g_free(utf8);
+ }
+ 
+@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * 
directory) {
+ 
+ void
+ local_path_selected_cb(GtkButton * button, gpointer data) {
+-  directory_chooser(_("Please select a local path."), aifp_window, 
dest_dir);
++  directory_chooser(_("Please select a local path."), aifp_window, 
dest_dir, sizeof dest_dir);
+ gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
+ }
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-11-04 Thread Daniel Pielmeier

commit: 1b143f34ad873c1ead1028b8ed2bbcbb370dc81b
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Nov  4 17:42:16 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Nov  4 17:42:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b143f34

media-sound/aqualung: Increase revision used for lua migration.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/{aqualung-1.1-r1.ebuild => aqualung-1.1-r100.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild 
b/media-sound/aqualung/aqualung-1.1-r100.ebuild
similarity index 100%
rename from media-sound/aqualung/aqualung-1.1-r1.ebuild
rename to media-sound/aqualung/aqualung-1.1-r100.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-11-03 Thread Daniel Pielmeier

commit: 766b772911b50e08d67aff49cf91ba09eb25523a
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Tue Nov  3 16:21:33 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Tue Nov  3 16:21:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766b7729

media-sound/aqualung: Revision bump to aqualung-1.1-r1.

Support slotted lua.

Closes: https://bugs.gentoo.org/752759
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.1-r1.ebuild | 94 +
 1 file changed, 94 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild 
b/media-sound/aqualung/aqualung-1.1-r1.ebuild
new file mode 100644
index 000..57950edcbf4
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-2 )
+
+inherit autotools desktop lua-single 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? ( ${LUA_DEPS} )
+   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}
+"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-09-25 Thread Daniel Pielmeier

commit: 5b17d5e27e9f5f208238e39e866cafa436603d03
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Fri Sep 25 22:05:14 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Fri Sep 25 22:05:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b17d5e2

media-sound/aqualung: Version bump to aqualung-1.1.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/Manifest|  1 +
 media-sound/aqualung/aqualung-1.1.ebuild | 92 
 2 files changed, 93 insertions(+)

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index f9e22d06195..e2cdd8f4efc 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1 +1,2 @@
 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.1.ebuild 
b/media-sound/aqualung/aqualung-1.1.ebuild
new file mode 100644
index 000..ea7f3d62f5a
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 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}
+"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-09-05 Thread Miroslav Šulc

commit: 409adb08804ee0c4494f73f0c43d20c309789aa9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Sep  5 15:57:09 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Sep  5 15:57:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409adb08

media-sound/aqualung: dropped obsolete 1.0-r3

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r3.ebuild | 100 
 1 file changed, 100 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild 
b/media-sound/aqualung/aqualung-1.0-r3.ebuild
deleted file mode 100644
index 130bb2e40c7..000
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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? ( media-sound/jack-audio-connection-kit )
-   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"
-)
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-08-30 Thread Thomas Deutschmann

commit: 3a5e1e395439dad708d7170fda5bb5f01cbaa256
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug 30 17:08:56 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug 30 17:08:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5e1e39

media-sound/aqualung: x86 stable (bug #736296)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild 
b/media-sound/aqualung/aqualung-1.0-r5.ebuild
index 42fab45987b..442799d70ce 100644
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-08-21 Thread Agostino Sarubbo

commit: a19bc7df7cec217fb7cb7553dfa87b7f332e6097
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Aug 22 05:40:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Aug 22 05:40:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19bc7df

media-sound/aqualung: amd64 stable wrt bug #736296

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild 
b/media-sound/aqualung/aqualung-1.0-r5.ebuild
index 602335f9377..42fab45987b 100644
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-08-21 Thread Daniel Pielmeier

commit: 0c4a1662c10d0f8e8333e1500982c8d99182aa8e
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Fri Aug 21 13:20:32 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Fri Aug 21 13:21:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4a1662

media-sound/aqualung: Remove old aqualung-1.0-r4.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r4.ebuild | 101 
 1 file changed, 101 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r4.ebuild 
b/media-sound/aqualung/aqualung-1.0-r4.ebuild
deleted file mode 100644
index c8a6ee5a672..000
--- a/media-sound/aqualung/aqualung-1.0-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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"
-)
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

2020-08-05 Thread Daniel Pielmeier

commit: f434b4ffd69af0afcb2f372ec73dc48d8a98a328
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Aug  5 18:23:42 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Aug  5 18:23:42 2020 +
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  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 000..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 000..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])

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/

2020-08-04 Thread Daniel Pielmeier

commit: 27926914b1af08c106fec7bb5cf0bda6dec4caad
Author: Jannis Achstetter  kripserver  net>
AuthorDate: Sun Aug  2 19:05:10 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Tue Aug  4 18:39:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27926914

media-sound/aqualung: Fix compile with gcc 10

And make USE=jack depend on `virtual/jack` instead of
`media-sound/jack-audio-connection-kit`. Adding this as new revision so we
have current `-r3` with stable keywords and this with unstable keywords.

Closes: https://bugs.gentoo.org/734928
Closes: https://bugs.gentoo.org/706828
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jannis Achstetter  kripserver.net>
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r4.ebuild| 101 +
 .../aqualung/files/aqualung-1.0-gcc10.patch|  69 ++
 2 files changed, 170 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.0-r4.ebuild 
b/media-sound/aqualung/aqualung-1.0-r4.ebuild
new file mode 100644
index 000..c8a6ee5a672
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+)
+
+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-gcc10.patch 
b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
new file mode 100644
index 000..620bcb873d9
--- /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 
+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

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-06-09 Thread Daniel Pielmeier

commit: 9a7e595d024324ab0a87340a139e2655accac623
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Tue Jun  9 11:47:55 2020 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Tue Jun  9 11:47:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a7e595d

media-sound/aqualung: Remove old aqualung-1.0-r2.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r2.ebuild | 97 -
 1 file changed, 97 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild 
b/media-sound/aqualung/aqualung-1.0-r2.ebuild
deleted file mode 100644
index ce1efdd4867..000
--- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-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"
-
-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? ( media-sound/jack-audio-connection-kit )
-   ladspa? ( media-libs/liblrdf )
-   lame? ( media-sound/lame )
-   libsamplerate? ( media-libs/libsamplerate )
-   lua? ( dev-lang/lua:0= )
-   mac? ( >=media-sound/mac-4.11.4.5.7 )
-   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}
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-   "${FILESDIR}/${P}-ffmpeg3.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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-05-18 Thread Agostino Sarubbo

commit: c2119e7e20aea34f889f8b0f737ebe91099d9e57
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 18 13:02:39 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 18 13:02:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2119e7e

media-sound/aqualung: x86 stable wrt bug #723358

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild 
b/media-sound/aqualung/aqualung-1.0-r3.ebuild
index 8e0f9193fed..130bb2e40c7 100644
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-05-18 Thread Agostino Sarubbo

commit: 65d19f2d73b2edeefff4491690e9151cce526be9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 18 12:55:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 18 12:55:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d19f2d

media-sound/aqualung: amd64 stable wrt bug #723358

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild 
b/media-sound/aqualung/aqualung-1.0-r3.ebuild
index 707083c856a..8e0f9193fed 100644
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2020-04-26 Thread Mikle Kolyada

commit: d657fce1df748c533013697b30600483299ee1d4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 10:23:38 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 10:23:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d657fce1

media-sound/aqualung: mugrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r2.ebuild | 9 +++--
 media-sound/aqualung/aqualung-1.0-r3.ebuild | 9 +++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild 
b/media-sound/aqualung/aqualung-1.0-r2.ebuild
index efd8ec6f801..ce1efdd4867 100644
--- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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 libav libsamplerate
+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"
 
@@ -26,10 +26,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? (
-   libav? ( media-video/libav:0= )
-   !libav? ( media-video/ffmpeg:0= )
-   )
+   ffmpeg? ( media-video/ffmpeg:0= )
flac? ( media-libs/flac )
ifp? ( media-libs/libifp )
jack? ( media-sound/jack-audio-connection-kit )

diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild 
b/media-sound/aqualung/aqualung-1.0-r3.ebuild
index 975f08e2a44..707083c856a 100644
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 libav libsamplerate
+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"
 
@@ -30,10 +30,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? (
-   libav? ( media-video/libav:0= )
-   !libav? ( media-video/ffmpeg:0= )
-   )
+   ffmpeg? ( media-video/ffmpeg:0= )
flac? ( media-libs/flac )
ifp? ( media-libs/libifp )
jack? ( media-sound/jack-audio-connection-kit )

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2019-03-24 Thread Daniel Pielmeier

commit: 218e328963f9fbed6af463083d1c5f5d54269264
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sun Mar 24 09:11:09 2019 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sun Mar 24 09:11:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218e3289

media-sound/aqualung: Revision bump to aqualung-1.0-r3.

Switch to EAPI 7.

Signed-off-by: Daniel Pielmeier  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-sound/aqualung/aqualung-1.0-r3.ebuild | 103 
 1 file changed, 103 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild 
b/media-sound/aqualung/aqualung-1.0-r3.ebuild
new file mode 100644
index 000..975f08e2a44
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 libav 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? (
+   libav? ( media-video/libav:0= )
+   !libav? ( media-video/ffmpeg:0= )
+   )
+   flac? ( media-libs/flac )
+   ifp? ( media-libs/libifp )
+   jack? ( media-sound/jack-audio-connection-kit )
+   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"
+)
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/

2018-01-17 Thread Daniel Pielmeier

commit: 62baa4781b9b7c6ba860d47b095d9b9ad4d40770
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Jan 17 16:43:19 2018 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Jan 17 16:43:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62baa478

media-sound/aqualung: Remove unused patch.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-sound/aqualung/files/aqualung-1.0-mac.patch | 26 ---
 1 file changed, 26 deletions(-)

diff --git a/media-sound/aqualung/files/aqualung-1.0-mac.patch 
b/media-sound/aqualung/files/aqualung-1.0-mac.patch
deleted file mode 100644
index 16689ee0ae7..000
--- a/media-sound/aqualung/files/aqualung-1.0-mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Revert this patch.
-
-From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
-From: Tom Szilagyi 
-Date: Mon, 9 Jun 2014 12:54:54 +
-Subject: [PATCH] Make the APE decoder compile with current libmac-dev
- (4.11-u4-b5-s7-d)
-
-git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 
3cd24cdc-1f22-0410-b8b1-dcf80e670293

- src/decoder/dec_mac.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
-index 024c8b9..2e9bc01 100644
 a/src/decoder/dec_mac.cpp
-+++ b/src/decoder/dec_mac.cpp
-@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
- 
- 
-   int ret = 0;
-+wchar_t * pUTF16 = GetUTF16FromANSI(filename);
--wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
- pdecompress = CreateIAPEDecompress(pUTF16, );
- free(pUTF16);
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2018-01-16 Thread Daniel Pielmeier

commit: d0d1eeb22a3e5c7f3c3c8847be15daf8f7c70ed4
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Tue Jan 16 18:26:29 2018 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Tue Jan 16 18:26:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d1eeb2

media-sound/aqualung: Remove old.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-sound/aqualung/aqualung-1.0-r1.ebuild | 101 
 1 file changed, 101 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild 
b/media-sound/aqualung/aqualung-1.0-r1.ebuild
deleted file mode 100644
index 668e4bd1915..000
--- a/media-sound/aqualung/aqualung-1.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-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 libav libsamplerate
-   lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex 
systray
-   vorbis wavpack"
-
-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? (
-   libav? ( media-video/libav:0= )
-   !libav? ( media-video/ffmpeg:0= )
-   )
-   flac? ( media-libs/flac )
-   ifp? ( media-libs/libifp )
-   jack? ( media-sound/jack-audio-connection-kit )
-   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}
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-   "${FILESDIR}/${P}-ffmpeg3.patch"
-   "${FILESDIR}/${P}-mac.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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2017-11-19 Thread Thomas Deutschmann

commit: 9e6951d6219c608b265767f4c2d668f1882cb400
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 19 18:57:51 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 19 19:14:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6951d6

media-sound/aqualung: x86 stable (bug #638006)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/aqualung/aqualung-1.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild 
b/media-sound/aqualung/aqualung-1.0-r2.ebuild
index 5c6ec6bde40..27608eb446e 100644
--- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex 
systray
vorbis wavpack"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2017-03-04 Thread Daniel Pielmeier

commit: 602ad4ce90808c7a2fd9ee0639e0bfb3ae0bd92a
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Mar  4 18:38:39 2017 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Mar  4 18:39:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602ad4ce

media-sound/aqualung: Revision bump.

This version depends on monkeys audio 4.11.
The patch to make it work with 3.99 is not required anymore.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/aqualung/aqualung-1.0-r2.ebuild | 100 
 1 file changed, 100 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild 
b/media-sound/aqualung/aqualung-1.0-r2.ebuild
new file mode 100644
index 000..5c6ec6bde40
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+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 libav libsamplerate
+   lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex 
systray
+   vorbis wavpack"
+
+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? (
+   libav? ( media-video/libav:0= )
+   !libav? ( media-video/ffmpeg:0= )
+   )
+   flac? ( media-libs/flac )
+   ifp? ( media-libs/libifp )
+   jack? ( media-sound/jack-audio-connection-kit )
+   ladspa? ( media-libs/liblrdf )
+   lame? ( media-sound/lame )
+   libsamplerate? ( media-libs/libsamplerate )
+   lua? ( dev-lang/lua:0= )
+   mac? ( >=media-sound/mac-4.11.4.5.7 )
+   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}
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+   "${FILESDIR}/${P}-ffmpeg3.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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2017-03-04 Thread Daniel Pielmeier

commit: 6e68fd85f65cf02fea74d623ea5ea60ced818b0a
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Mar  4 17:20:39 2017 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Mar  4 17:20:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e68fd85

media-sound/aqualung: Remove old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/aqualung/Manifest|  1 -
 media-sound/aqualung/aqualung-1.0_rc1.ebuild | 92 
 2 files changed, 93 deletions(-)

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index f3a383a136d..7c1fa178dec 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,2 +1 @@
-DIST aqualung-1.0-rc1.tar.gz 1939271 SHA256 
4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b SHA512 
a8b15eb69dab1b2615562fd25aa6081df293783eef6cf7d171c5373855bab1f3e454e90621feb4f296c407c9d74957130fc359a39315cfdbb173a6f119a859e6
 WHIRLPOOL 
7aad3bb2dd3740418fe6b0ec87a62772d9e53673b58bd1c534de31c08bbee48748debcb8f82ab6239d8160f1af6933cc4a13a2d185c84f72ecfb02ababdbe0ea
 DIST aqualung-1.0.tar.gz 2014854 SHA256 
c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347 SHA512 
d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 WHIRLPOOL 
8afefd6463860b2e1c086c27b367be1b9c3ced0ae2500b4650ae46963437145e53c57457d7c28c9ca8a76d645f67289db85da606bcf7ef9a190ea50afe1d3bb1

diff --git a/media-sound/aqualung/aqualung-1.0_rc1.ebuild 
b/media-sound/aqualung/aqualung-1.0_rc1.ebuild
deleted file mode 100644
index dec9f375151..000
--- a/media-sound/aqualung/aqualung-1.0_rc1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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_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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2017-02-19 Thread Agostino Sarubbo

commit: 17ee6905d450259ea0144366b4d3bba5a13d1446
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 19 13:33:02 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 19 13:33:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee6905

media-sound/aqualung: x86 stable wrt bug #575880

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/aqualung/aqualung-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild 
b/media-sound/aqualung/aqualung-1.0-r1.ebuild
index 9cebbcb284..12c0989af6 100644
--- a/media-sound/aqualung/aqualung-1.0-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex 
systray
vorbis wavpack"

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2017-02-18 Thread Andreas Sturmlechner

commit: a0e12d71800adf357aef2783a02f261e7643e4bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 17:03:43 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 17:04:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e12d71

media-sound/aqualung: Add USE=libav

Package-Manager: portage-2.3.3

 media-sound/aqualung/aqualung-1.0-r1.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild 
b/media-sound/aqualung/aqualung-1.0-r1.ebuild
index b7bdd48542..40cd9d6dfb 100644
--- a/media-sound/aqualung/aqualung-1.0-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -15,8 +15,8 @@ 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
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+   lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex 
systray
vorbis wavpack"
 
 RDEPEND="
@@ -27,7 +27,10 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
cdda? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
-   ffmpeg? ( >=virtual/ffmpeg-0.6.90 )
+   ffmpeg? (
+   libav? ( media-video/libav:0= )
+   !libav? ( media-video/ffmpeg:0= )
+   )
flac? ( media-libs/flac )
ifp? ( media-libs/libifp )
jack? ( media-sound/jack-audio-connection-kit )

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

2017-02-18 Thread Andreas Sturmlechner

commit: 88ae1b0a902678a3453b385270b3325e80d4a755
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 16:51:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 16:53:07 2017 +
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..00
--- 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..00
--- 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 */

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/

2017-02-18 Thread Andreas Sturmlechner

commit: cb29aeb2c84fedee88eab0fa4c987f3f85bbeaae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 16:31:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 16:53:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb29aeb2

media-sound/aqualung: EAPI 6, sort deps, fix build w/ USE=mac

Gentoo-bug: 564366, 575880

Package-Manager: portage-2.3.3

 media-sound/aqualung/aqualung-1.0-r1.ebuild| 99 ++
 .../aqualung/files/aqualung-1.0-ffmpeg3.patch  | 29 +++
 media-sound/aqualung/files/aqualung-1.0-mac.patch  | 26 ++
 media-sound/aqualung/metadata.xml  |  2 +-
 4 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild 
b/media-sound/aqualung/aqualung-1.0-r1.ebuild
new file mode 100644
index 00..b7bdd48542
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+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"
+
+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? ( >=virtual/ffmpeg-0.6.90 )
+   flac? ( media-libs/flac )
+   ifp? ( media-libs/libifp )
+   jack? ( media-sound/jack-audio-connection-kit )
+   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}
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+   "${FILESDIR}/${P}-ffmpeg3.patch"
+   "${FILESDIR}/${P}-mac.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-ffmpeg3.patch 
b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
new file mode 100644
index 00..111ee70c87
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
@@ -0,0 +1,29 @@
+From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
+From: Jamie Heilman 
+Date: Sun, 8 May 2016 19:34:36 +
+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

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/

2015-09-16 Thread Alexis Ballier

commit: 936820fcba0b87dde366a7f4f6580100f54591d1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep 16 16:43:29 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep 16 16:45:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936820fc

media-sound/aqualung: fix build with ffmpeg git master.

Package-Manager: portage-2.2.20.1

 media-sound/aqualung/aqualung-1.0.ebuild  |  4 
 media-sound/aqualung/files/ffmpeg29.patch | 13 +
 2 files changed, 17 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.0.ebuild 
b/media-sound/aqualung/aqualung-1.0.ebuild
index b39de6c..c6954be 100644
--- a/media-sound/aqualung/aqualung-1.0.ebuild
+++ b/media-sound/aqualung/aqualung-1.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+src_prepare() {
+   epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
 src_configure() {
econf \
--enable-nls \

diff --git a/media-sound/aqualung/files/ffmpeg29.patch 
b/media-sound/aqualung/files/ffmpeg29.patch
new file mode 100644
index 000..3cd0a01
--- /dev/null
+++ b/media-sound/aqualung/files/ffmpeg29.patch
@@ -0,0 +1,13 @@
+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 */

[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/

2015-09-02 Thread Daniel Pielmeier

commit: 89c1ce5b36f2c03ca14d905085d7d0a7ebcc702a
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Sep  2 18:51:45 2015 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Sep  2 18:51:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c1ce5b

media-sound/aqualung: Version bump

Package-Manager: portage-2.2.20.1

 media-sound/aqualung/Manifest|  1 +
 media-sound/aqualung/aqualung-1.0.ebuild | 93 
 2 files changed, 94 insertions(+)

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index d044956..f3a383a 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1 +1,2 @@
 DIST aqualung-1.0-rc1.tar.gz 1939271 SHA256 
4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b SHA512 
a8b15eb69dab1b2615562fd25aa6081df293783eef6cf7d171c5373855bab1f3e454e90621feb4f296c407c9d74957130fc359a39315cfdbb173a6f119a859e6
 WHIRLPOOL 
7aad3bb2dd3740418fe6b0ec87a62772d9e53673b58bd1c534de31c08bbee48748debcb8f82ab6239d8160f1af6933cc4a13a2d185c84f72ecfb02ababdbe0ea
+DIST aqualung-1.0.tar.gz 2014854 SHA256 
c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347 SHA512 
d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 WHIRLPOOL 
8afefd6463860b2e1c086c27b367be1b9c3ced0ae2500b4650ae46963437145e53c57457d7c28c9ca8a76d645f67289db85da606bcf7ef9a190ea50afe1d3bb1

diff --git a/media-sound/aqualung/aqualung-1.0.ebuild 
b/media-sound/aqualung/aqualung-1.0.ebuild
new file mode 100644
index 000..b39de6c
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0.ebuild
@@ -0,0 +1,93 @@
+# 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_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
+}

49 matches

Mail list logo