Added package aqualung-1.1-r101 to include fix for unneeded lua check.
This commit is contained in:
parent
1cbcd7e4a1
commit
3b5b2c0e4b
8
media-sound/aqualung/Manifest
Normal file
8
media-sound/aqualung/Manifest
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6
|
||||
AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
|
||||
AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
|
||||
AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
|
||||
AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
|
||||
DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
|
||||
EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
|
||||
MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
|
||||
103
media-sound/aqualung/aqualung-1.1-r101.ebuild
Normal file
103
media-sound/aqualung/aqualung-1.1-r101.ebuild
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
# Copyright 1999-2021 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}
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-ifp.patch"
|
||||
"${FILESDIR}/${P}-var-collision.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use lua && lua-single_pkg_setup
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
17
media-sound/aqualung/files/aqualung-1.0-ar.patch
Normal file
17
media-sound/aqualung/files/aqualung-1.0-ar.patch
Normal file
|
|
@ -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])
|
||||
29
media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
Normal file
29
media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
|
||||
From: Jamie Heilman <jamie@audible.transient.net>
|
||||
Date: Sun, 8 May 2016 19:34:36 +0000
|
||||
Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
|
||||
|
||||
With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
|
||||
were deprecated; the new default AVCodecContext.get_buffer2()
|
||||
implementation works fine for us.
|
||||
---
|
||||
src/decoder/dec_lavc.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
|
||||
index e2c81c6..5268a64 100644
|
||||
--- a/src/decoder/dec_lavc.c
|
||||
+++ b/src/decoder/dec_lavc.c
|
||||
@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
|
||||
return DECODER_OPEN_BADLIB;
|
||||
|
||||
pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 55
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 53
|
||||
pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
|
||||
pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
|
||||
#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
|
||||
+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
|
||||
|
||||
pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
|
||||
|
||||
69
media-sound/aqualung/files/aqualung-1.0-gcc10.patch
Normal file
69
media-sound/aqualung/files/aqualung-1.0-gcc10.patch
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
|
||||
From: Adam Sampson <ats@offog.org>
|
||||
Date: Sat, 18 Jul 2020 17:02:32 +0100
|
||||
Subject: [PATCH 1/2] Remove unused variable.
|
||||
|
||||
This causes a duplicate symbol error with GCC 10 (-fno-common by
|
||||
default), but it's not used anyway.
|
||||
---
|
||||
src/playlist.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/playlist.c b/src/playlist.c
|
||||
index 35483d1..96fac75 100644
|
||||
--- a/src/playlist.c
|
||||
+++ b/src/playlist.c
|
||||
@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
|
||||
GtkWidget * plist__export;
|
||||
#endif /* HAVE_TRANSCODING */
|
||||
|
||||
-gchar command[RB_CONTROL_SIZE];
|
||||
-
|
||||
GtkTreeIter * fileinfo_iter = NULL;
|
||||
|
||||
int playlist_dirty;
|
||||
|
||||
From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Sampson <ats@offog.org>
|
||||
Date: Sat, 18 Jul 2020 17:06:41 +0100
|
||||
Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
|
||||
|
||||
This causes a duplicate symbol error with GCC 10 (-fno-common by
|
||||
default), because there's also a global timeout_tag in main.c.
|
||||
|
||||
Also correct the type to guint rather than gint.
|
||||
---
|
||||
src/ports.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/ports.c b/src/ports.c
|
||||
index f17a5ab..f4de59d 100644
|
||||
--- a/src/ports.c
|
||||
+++ b/src/ports.c
|
||||
@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
|
||||
int n_clients;
|
||||
GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
|
||||
|
||||
-gint timeout_tag;
|
||||
+guint ports_timeout_tag;
|
||||
|
||||
int out_selector = 0;
|
||||
|
||||
@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
|
||||
fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
|
||||
}
|
||||
g_free(str);
|
||||
- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
|
||||
+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
|
||||
fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
|
||||
}
|
||||
g_free(str);
|
||||
- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
|
||||
+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
|
||||
}
|
||||
}
|
||||
|
||||
41
media-sound/aqualung/files/aqualung-1.1-ifp.patch
Normal file
41
media-sound/aqualung/files/aqualung-1.1-ifp.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
|
||||
From: Adam Sampson <ats@offog.org>
|
||||
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);
|
||||
}
|
||||
|
||||
31
media-sound/aqualung/files/aqualung-1.1-var-collision.patch
Normal file
31
media-sound/aqualung/files/aqualung-1.1-var-collision.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Sampson <ats@offog.org>
|
||||
Date: Sun, 10 Jan 2021 22:32:04 +0000
|
||||
Subject: [PATCH] Don't call a variable "bool".
|
||||
|
||||
If one of the headers happens to #include <stdbool.h>, this'll clash
|
||||
with the C99 type definition.
|
||||
---
|
||||
src/build_store.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/build_store.c b/src/build_store.c
|
||||
index 56b0eaf..ed4bfca 100644
|
||||
--- a/src/build_store.c
|
||||
+++ b/src/build_store.c
|
||||
@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
|
||||
data_src_gui_t * gui = (data_src_gui_t *)data;
|
||||
|
||||
if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) {
|
||||
- gboolean bool;
|
||||
+ gboolean value;
|
||||
int type;
|
||||
|
||||
- gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1);
|
||||
+ gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1);
|
||||
gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter,
|
||||
- 0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
|
||||
+ 0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
|
||||
}
|
||||
}
|
||||
|
||||
24
media-sound/aqualung/metadata.xml
Normal file
24
media-sound/aqualung/metadata.xml
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>billie@gentoo.org</email>
|
||||
<name>Daniel Pielmeier</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>sound@gentoo.org</email>
|
||||
<name>Gentoo Sound project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="ifp">Enable support for iRiver iFP portable audio players</flag>
|
||||
<flag name="lua">Enable support for programmable title formatting with
|
||||
<pkg>dev-lang/lua</pkg></flag>
|
||||
<flag name="mac">Enable support for decoding Monkey's Audio files</flag>
|
||||
<flag name="podcast">Enable podcast support</flag>
|
||||
<flag name="systray">Enable system tray support</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">jeremyevans/aqualung</remote-id>
|
||||
<remote-id type="sourceforge">aqualung</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in a new issue