Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/audacious-g15-spectrum/files: audacious-g15-spectrum-2.5.5-audacious-1.5.patch
Date: Sat, 13 Sep 2008 23:07:21
Message-Id: E1KeeCz-0007nm-8k@stork.gentoo.org
1 robbat2 08/09/13 23:07:17
2
3 Added: audacious-g15-spectrum-2.5.5-audacious-1.5.patch
4 Log:
5 Version bump and include patch to support Audacious 1.5.
6 (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64)
7
8 Revision Changes Path
9 1.1 media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch?rev=1.1&content-type=text/plain
13
14 Index: audacious-g15-spectrum-2.5.5-audacious-1.5.patch
15 ===================================================================
16 As of Audacious-1.5, the old bmp_cfg* functions all have new names, leading to
17 undefined symbols or compile failures.
18
19 Signed-off-by: Robin H. Johnson <robbat2@g.o>
20
21 diff -Nuar --exclude '*~' g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c
22 --- g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c 2008-05-24 05:58:01.000000000 -0700
23 +++ g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c 2008-09-13 15:50:50.635729491 -0700
24 @@ -287,28 +287,28 @@
25 {
26 ConfigDb *cfg;
27
28 - cfg = bmp_cfg_db_open();
29 + cfg = aud_cfg_db_open();
30 pthread_mutex_lock (&g15buf_mutex);
31 if (cfg)
32 {
33 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
34 - bmp_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
35 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
36 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
37 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
38 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
39 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
40 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
41 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
42 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
43 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
44 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
45 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
46 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
47 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
48 - bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
49 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
50 + aud_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
51 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
52 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
53 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
54 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
55 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
56 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
57 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
58 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
59 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
60 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
61 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
62 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
63 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
64 + aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
65
66 - bmp_cfg_db_close(cfg);
67 + aud_cfg_db_close(cfg);
68
69 }
70 /* check conf integrity */
71 @@ -351,27 +351,27 @@
72 {
73 ConfigDb *cfg;
74
75 - cfg = bmp_cfg_db_open();
76 + cfg = aud_cfg_db_open();
77
78 if (cfg)
79 {
80 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
81 - bmp_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
82 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
83 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
84 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
85 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
86 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
87 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
88 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
89 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
90 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
91 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
92 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
93 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
94 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
95 - bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
96 - bmp_cfg_db_close(cfg);
97 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
98 + aud_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
99 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
100 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
101 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
102 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
103 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
104 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
105 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
106 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
107 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
108 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
109 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
110 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
111 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
112 + aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
113 + aud_cfg_db_close(cfg);
114 }
115
116 }