From ae202eb1bd544d20552ff1a92ed6fb3d3abe2d5a Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mar 19 2010 17:57:29 +0000 Subject: sync with F-13 --- diff --git a/audacious-plugins-2.2-ui_vis.patch b/audacious-plugins-2.2-ui_vis.patch new file mode 100644 index 0000000..88e97ee --- /dev/null +++ b/audacious-plugins-2.2-ui_vis.patch @@ -0,0 +1,113 @@ +diff -Nur audacious-plugins-2.2-orig/src/skins/ui_vis.c audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c +--- audacious-plugins-2.2-orig/src/skins/ui_vis.c 2009-11-22 23:49:53.000000000 +0100 ++++ audacious-plugins-2.2-ui_vis/src/skins/ui_vis.c 2010-03-19 17:47:02.000000000 +0100 +@@ -292,7 +292,7 @@ + else{ + memset(rgb_data, 0, (guint)(76 * config.scale_factor) * 32); + for (y = 1; y < 16; y += 2) { +- ptr = rgb_data + (y * (guint)(76 * 4 * config.scale_factor)); ++ ptr = rgb_data + (y * (guint)(76 * 2 * config.scale_factor)); + for (x = 0; x < 76; x += 2, ptr += 4) { + *ptr = 1; + *(ptr + 1) = 1; +@@ -328,10 +328,10 @@ + } + } + else{ +- ptr = rgb_data + ((16 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); ++ ptr = rgb_data + ((16 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); + switch (config.analyzer_mode) { + case ANALYZER_NORMAL: +- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { ++ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { + *ptr = 18 - h + y; + *(ptr + 1) = 18 - h + y; + *(ptr + (guint)(76 * config.scale_factor)) = 18 - h + y; +@@ -339,7 +339,7 @@ + } + break; + case ANALYZER_FIRE: +- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { ++ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { + *ptr = y + 2; + *(ptr + 1) = y + 2; + *(ptr + (guint)(76 * config.scale_factor)) = y + 2; +@@ -347,7 +347,7 @@ + } + break; + case ANALYZER_VLINES: +- for (y = 0; y < h; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { ++ for (y = 0; y < h; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { + *ptr = 18 - h; + *(ptr + 1) = 18 - h; + *(ptr + (guint)(76 * config.scale_factor)) = 18 - h; +@@ -371,7 +371,7 @@ + rgb_data[(16 - h) * 76 + x] = 23; + } + else{ +- ptr = rgb_data + (16 - h) * (guint)(76 * 4 * config.scale_factor) + (guint)(x * config.scale_factor); ++ ptr = rgb_data + (16 - h) * (guint)(76 * 2 * config.scale_factor) + (guint)(x * config.scale_factor); + *ptr = 23; + *(ptr + 1) = 23; + *(ptr + (guint)(76 * config.scale_factor)) = 23; +@@ -445,13 +445,13 @@ + rgb_data[x * 3 + y * 76*3+n] = voice_c[n]; + } + else{ +- ptr = rgb_data + (guint)(x * 3 * config.scale_factor) + (guint) (y * 76 * 3 * config.scale_factor); +- for(n=0;n<3;n++) +- { +- *(ptr + n) = voice_c[n]; +- *(ptr + n + 3) = voice_c[n]; +- *(ptr + (guint)(n + 76 * config.scale_factor * 3)) = voice_c[n]; +- *(ptr + (guint)(n + 3 + 76 * config.scale_factor * 3)) = voice_c[n]; ++ ptr = rgb_data + x * 3 * (guint)config.scale_factor + y * 76 * 3 * 2 * (guint)config.scale_factor; ++ for(n=0;n<3;n++) ++ { ++ *(ptr + n) = voice_c[n]; ++ *(ptr + n + 3) = voice_c[n]; ++ *(ptr + (n + 76 * 3 * (guint)config.scale_factor)) = voice_c[n]; ++ *(ptr + (n + 3 + 76 * 3 * (guint)config.scale_factor)) = voice_c[n]; + } + } + } +@@ -467,7 +467,7 @@ + ptr = rgb_data + ((14 - h) * 76) + x; + *ptr = vis_scope_colors[h + 1]; + }else{ +- ptr = rgb_data + ((14 - h) * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); ++ ptr = rgb_data + ((14 - h) * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); + *ptr = vis_scope_colors[h + 1]; + *(ptr + 1) = vis_scope_colors[h + 1]; + *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1]; +@@ -489,8 +489,8 @@ + *ptr = vis_scope_colors[y - 2]; + } + else{ +- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); +- for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { ++ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); ++ for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { + *ptr = vis_scope_colors[y - 2]; + *(ptr + 1) = vis_scope_colors[y - 2]; + *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[y - 2]; +@@ -504,7 +504,7 @@ + ptr = rgb_data + (h * 76) + x; + *ptr = vis_scope_colors[h + 1]; + }else{ +- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); ++ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); + *ptr = vis_scope_colors[h + 1]; + *(ptr + 1) = vis_scope_colors[h + 1]; + *(ptr + (guint)(76 * config.scale_factor)) = vis_scope_colors[h + 1]; +@@ -526,8 +526,8 @@ + for (y = h; y <= h2; y++, ptr += 76) + *ptr = c; + }else{ +- ptr = rgb_data + (h * (guint)(76 * 4 * config.scale_factor)) + (guint)(x * config.scale_factor); +- for (y = h; y <= h2; y++, ptr += (guint)(76 * 4 * config.scale_factor)) { ++ ptr = rgb_data + (h * (guint)(76 * 2 * config.scale_factor)) + (guint)(x * config.scale_factor); ++ for (y = h; y <= h2; y++, ptr += (guint)(76 * 2 * config.scale_factor)) { + *ptr = c; + *(ptr + 1) = c; + *(ptr + (guint)(76 * config.scale_factor)) = c; diff --git a/audacious-plugins.spec b/audacious-plugins.spec index f044d95..7b73e64 100644 --- a/audacious-plugins.spec +++ b/audacious-plugins.spec @@ -5,7 +5,7 @@ Name: audacious-plugins Version: 2.2 -Release: 25%{?dist} +Release: 29%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia URL: http://audacious-media-player.org/ @@ -59,8 +59,16 @@ Patch14: audacious-plugins-2.2-tmp-vuln.patch Patch15: audacious-plugins-2.2-streambrowser-url-add.patch # Patch16: audacious-plugins-2.2-scrobbler.patch -# +# merged upstream with additional patch for 2.3: AUDPLUG-170 Patch17: audacious-plugins-2.2-status.patch +# +Patch18: audacious-plugins-2.2-no-adplugdb.patch +# is this even possible? bz 573075 +Patch19: audacious-plugins-2.2-playlist-font-safety.patch +# div-by-zero with almost empty MIDI file, bz 573851 +Patch20: audacious-plugins-2.2-amidi.patch +# scaled mode issues, fixed while looking at bz 575093 +Patch21: audacious-plugins-2.2-ui_vis.patch BuildRequires: audacious-devel >= %{aud_ver} BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel @@ -208,6 +216,10 @@ in Vortex (.vtx) format. %patch15 -p1 -b .streambrowser-url-add %patch16 -p1 -b .scrobbler %patch17 -p1 -b .status +%patch18 -p1 -b .no-adplugdb +%patch19 -p1 -b .playlist-font-safety +%patch20 -p1 -b .amidi +%patch21 -p1 -b .ui_vis for i in src/ladspa/ladspa.c do @@ -308,6 +320,19 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Mar 19 2010 Michael Schwendt - 2.2-29 +- Fix scaled visualization modes. + +* Tue Mar 16 2010 Michael Schwendt - 2.2-28 +- Avoid div-by-zero crash due to almost empty MIDI files, which + don't contain any delta-time events (#573851). + +* Sat Mar 13 2010 Michael Schwendt - 2.2-27 +- Don't accept playlist_font name without space(s) (#573075). + +* Sat Mar 13 2010 Michael Schwendt - 2.2-26 +- Don't warn on stderr about missing adplug.db (#573187). + * Thu Mar 4 2010 Michael Schwendt - 2.2-25 - Update icon popup patch for new playlist API to also fix a double-free (which made the popup crash with streaming audio).