summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2006-09-13 11:58:29 +0000
committerTony Vroon <chainsaw@gentoo.org>2006-09-13 11:58:29 +0000
commit87dfa0424f27e277162b1673b992b8fbdef8b592 (patch)
tree698ee198e674e3b462a7e1e1d3d21a9f406101b4 /media-sound/audacious/files
parentStable on sparc. (diff)
downloadhistorical-87dfa0424f27e277162b1673b992b8fbdef8b592.tar.gz
historical-87dfa0424f27e277162b1673b992b8fbdef8b592.tar.bz2
historical-87dfa0424f27e277162b1673b992b8fbdef8b592.zip
Backported playlist transparency fix from upstream (by nhjm449), closes bug #146276 by Peter Volkov Alexandrovich <pva@gentoo.org>. Also backported my resume robustness patch from upstream.
Package-Manager: portage-2.1.1
Diffstat (limited to 'media-sound/audacious/files')
-rw-r--r--media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch24
-rw-r--r--media-sound/audacious/files/1.1.2-robust-resume.patch21
-rw-r--r--media-sound/audacious/files/digest-audacious-1.1.2-r16
3 files changed, 51 insertions, 0 deletions
diff --git a/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch b/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch
new file mode 100644
index 000000000000..8389bee82cd4
--- /dev/null
+++ b/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch
@@ -0,0 +1,24 @@
+Index: trunk/audacious/widgets/playlist_list.c
+===================================================================
+--- audacious/playlist_list.c (revision 2158)
++++ audacious/playlist_list.c (revision 2159)
+@@ -108,10 +108,16 @@
+
+ gdk_error_trap_pop();
+
+- shade_gdkimage_generic(gdk_drawable_get_visual(GDK_WINDOW(playlistwin->window)),
+- ximg, ximg->bpl, w, h, 60, 60, 60, shade_color->pixel);
++ if (GDK_IS_IMAGE(ximg))
++ {
++ shade_gdkimage_generic(gdk_drawable_get_visual(GDK_WINDOW(playlistwin->window)),
++ ximg, ximg->bpl, w, h, 60, 60, 60, shade_color->pixel);
+
+- gdk_draw_image(p, gc, ximg, 0, 0, x, y, w, h);
++ gdk_draw_image(p, gc, ximg, 0, 0, x, y, w, h);
++ }
++ else {
++ cfg.playlist_transparent = FALSE;
++ }
+
+ g_object_unref(gc);
+
diff --git a/media-sound/audacious/files/1.1.2-robust-resume.patch b/media-sound/audacious/files/1.1.2-robust-resume.patch
new file mode 100644
index 000000000000..53e9f9b1af56
--- /dev/null
+++ b/media-sound/audacious/files/1.1.2-robust-resume.patch
@@ -0,0 +1,21 @@
+--- trunk/audacious/main.c 2006/09/08 05:26:54 2239
++++ trunk/audacious/main.c 2006/09/10 01:04:36 2255
+@@ -1127,12 +1127,15 @@
+ has_x11_connection = TRUE;
+
+ if (cfg.resume_playback_on_startup) {
+- if (cfg.resume_playback_on_startup_time != -1) {
++ if (cfg.resume_playback_on_startup_time != -1 && playlist_get_length() > 0) {
++ int i;
+ while (gtk_events_pending()) gtk_main_iteration();
+ bmp_playback_initiate();
+- g_usleep(10000); /* XXX: musepack and others need this! */
+- while (!ip_data.playing)
++ for (i = 0; i < 8; i++) {
+ g_usleep(10000);
++ if (!ip_data.playing)
++ break;
++ }
+ bmp_playback_seek(cfg.resume_playback_on_startup_time /
+ 1000);
+ }
diff --git a/media-sound/audacious/files/digest-audacious-1.1.2-r1 b/media-sound/audacious/files/digest-audacious-1.1.2-r1
new file mode 100644
index 000000000000..f5a998a9027a
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-1.1.2-r1
@@ -0,0 +1,6 @@
+MD5 14aba1f9c42a48afeeb6ce5dcaf180c6 audacious-1.1.2.tgz 3394364
+RMD160 920cb247dc1e583364cfac9cc8f1f0c39c37550e audacious-1.1.2.tgz 3394364
+SHA256 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81 audacious-1.1.2.tgz 3394364
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839