mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 12:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/audacious: merge in memory leak patches for upstream AUD-285 and AUD-286

Browse Source
This commit is contained in:
William Pitcock 2011-02-04 19:14:07 -06:00
parent 1a77b98f28
commit d8bb6d69c0
3 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/audacious/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=audacious
pkgver=2.4.3
pkgrel=0
pkgrel=1
pkgdesc="playlist-oriented media player with multiple interfaces"
url="http://audacious-media-player.org/"
arch="all"
@ -11,7 +11,9 @@ depends=
makedepends="libmowgli-dev libmcs-dev libguess-dev gtk+-dev dbus-glib-dev libxml2-dev"
install=
subpackages="$pkgname-dev"
source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz"
source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz
audacious-2.4.3-playlist-AUD-285.patch
audacious-2.4.3-id3v1-memleak-AUD-286.patch"
_builddir="$srcdir"/$pkgname-$pkgver
@ -51,4 +53,6 @@ package() {
make DESTDIR="$pkgdir" install
}
md5sums="bd5d91900044a1159129c6feeea612c4 audacious-2.4.3.tgz"
md5sums="bd5d91900044a1159129c6feeea612c4 audacious-2.4.3.tgz
6dc34ff8fd74dcba06b6aa20c7cd493e audacious-2.4.3-playlist-AUD-285.patch
3c8a23fd86ee8943ee938ef4cef9fa86 audacious-2.4.3-id3v1-memleak-AUD-286.patch"

29
main/audacious/audacious-2.4.3-id3v1-memleak-AUD-286.patch Normal file
View File

@ -0,0 +1,29 @@
diff -Nur audacious-2.4.3-orig/src/libaudtag/id3/id3v1.c audacious-2.4.3/src/libaudtag/id3/id3v1.c
--- audacious-2.4.3-orig/src/libaudtag/id3/id3v1.c 2011-01-12 12:07:37.000000000 +0100
+++ audacious-2.4.3/src/libaudtag/id3/id3v1.c 2011-01-28 23:31:15.356395589 +0100
@@ -96,8 +96,7 @@
gchar *tmp_artist = g_strconcat(artist, convert_to_utf8(read_char_data(f, 60)), NULL);
gchar *tmp_album = g_strconcat(album, convert_to_utf8(read_char_data(f, 60)), NULL);
vfs_fseek(f, -170, SEEK_END);
- gchar *tmp_genre = g_new0(gchar, 30);
- tmp_genre = convert_to_utf8(read_char_data(f, 30));
+ gchar *tmp_genre = convert_to_utf8(read_char_data(f, 30));
g_free(title);
g_free(artist);
g_free(album);
@@ -105,13 +104,12 @@
artist = tmp_artist;
album = tmp_album;
- if (g_strcmp0(tmp_genre, NULL) == 1)
+ if (tmp_genre != NULL)
{
tuple_associate_string(tuple, FIELD_GENRE, NULL, tmp_genre);
genre_set = TRUE;
+ g_free(tmp_genre);
}
-
- g_free(tmp_genre);
}
tuple_associate_string(tuple, FIELD_TITLE, NULL, title);

22
main/audacious/audacious-2.4.3-playlist-AUD-285.patch Normal file
View File

@ -0,0 +1,22 @@
diff -Nur audacious-2.4.3-orig/src/audacious/playlist-new.c audacious-2.4.3/src/audacious/playlist-new.c
--- audacious-2.4.3-orig/src/audacious/playlist-new.c 2011-01-12 12:07:37.000000000 +0100
+++ audacious-2.4.3/src/audacious/playlist-new.c 2011-01-28 23:28:26.557658545 +0100
@@ -1846,14 +1846,14 @@
if (entries == 0)
return FALSE;
- if (playlist->position != NULL && playlist->position->queued)
+ /* If we have a song in queue, jump to it, _then_ remove it from queue */
+ if (playlist->queued != NULL)
{
+ set_position (playlist, playlist->queued->data);
+
playlist->queued = g_list_remove(playlist->queued, playlist->position);
playlist->position->queued = FALSE;
}
-
- if (playlist->queued != NULL)
- set_position (playlist, playlist->queued->data);
else if (cfg.shuffle)
{
if (! shuffle_next (playlist))