/[packages]/cauldron/mplayerplugin/current/SOURCES/mplayerplugin-3.50-32_64bit.patch
ViewVC logotype

Contents of /cauldron/mplayerplugin/current/SOURCES/mplayerplugin-3.50-32_64bit.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 81470 - (show annotations) (download)
Wed Apr 6 17:24:58 2011 UTC (13 years ago) by steletch
File size: 9071 byte(s)
imported package mplayerplugin
1 --- mplayerplug-in/Source/plugin.cpp.32 2007-12-02 00:23:04.000000000 +0100
2 +++ mplayerplug-in/Source/plugin.cpp 2008-01-27 11:35:43.000000000 +0100
3 @@ -344,8 +344,8 @@
4 #ifdef X_ENABLED
5 setlocale(LC_ALL, "");
6 #endif
7 - textdomain("mplayerplug-in");
8 - bind_textdomain_codeset("mplayerplug-in", "utf-8");
9 + textdomain("mplayerplug-in32");
10 + bind_textdomain_codeset("mplayerplug-in32", "utf-8");
11 #endif
12 time(&lastOutput);
13 }
14 @@ -464,7 +464,7 @@
15 }
16
17 if (DEBUG)
18 - printf("mplayer dead\n");
19 + printf("mplayer32 dead\n");
20
21 #ifdef X_ENABLED
22 FreeUI((Display *) display, this);
23 @@ -813,7 +813,7 @@
24 this);
25 #endif
26 gtk_window_set_title(GTK_WINDOW(gtkwidget),
27 - "mplayerplug-in player");
28 + "mplayerplug-in32 player");
29
30 }
31
32 @@ -1800,7 +1800,7 @@
33 NPN_MemFree(filename);
34 } else {
35 snprintf(n->fname, 1024, "%s",
36 - tempnam("/tmp", "mplayerplug-inXXXXXX"));
37 + tempnam("/tmp", "mplayerplug-in32XXXXXX"));
38 if (strstr(mimetype, "midi") != NULL) {
39 strlcat(n->fname, ".mid", 1024);
40 }
41 @@ -1867,7 +1867,7 @@
42 NPN_MemFree(filename);
43 } else {
44 snprintf(n->fname, 1024, "%s",
45 - tempnam("/tmp", "mplayerplug-inXXXXXX"));
46 + tempnam("/tmp", "mplayerplug-in32XXXXXX"));
47 }
48 addToEnd(td->list, n);
49 if (n->totalbytes != (int) stream->end)
50 @@ -2945,7 +2945,7 @@
51 screen = gtk_window_get_screen(GTK_WINDOW(gtkwidget));
52 gtk_window_set_screen(GTK_WINDOW(fs_window), screen);
53 gtk_window_set_title(GTK_WINDOW(fs_window),
54 - "mplayerplug-in fullscreen");
55 + "mplayerplug-in32 fullscreen");
56 gdk_screen_get_monitor_geometry(screen,
57 gdk_screen_get_monitor_at_window
58 (screen,
59 @@ -2973,7 +2973,7 @@
60 } else {
61 screen = gtk_window_get_screen(GTK_WINDOW(gtkwidget));
62 gtk_window_set_title(GTK_WINDOW(gtkwidget),
63 - "mplayerplug-in fullscreen");
64 + "mplayerplug-in32 fullscreen");
65 gdk_screen_get_monitor_geometry(screen,
66 gdk_screen_get_monitor_at_window
67 (screen,
68 --- mplayerplug-in/Source/plugin-setup.cpp.32 2007-12-02 00:23:04.000000000 +0100
69 +++ mplayerplug-in/Source/plugin-setup.cpp 2008-01-27 11:31:02.000000000 +0100
70 @@ -64,13 +64,13 @@
71
72 // load config file
73
74 - snprintf(config_name[0], 1000, "/etc/mplayerplug-in.conf");
75 + snprintf(config_name[0], 1000, "/etc/mplayerplug-in32.conf");
76
77 snprintf(config_name[1], 1000, "%s", getenv("HOME"));
78 - strlcat(config_name[1], "/.mozilla/mplayerplug-in.conf", 1000);
79 + strlcat(config_name[1], "/.mozilla/mplayerplug-in32.conf", 1000);
80
81 snprintf(config_name[2], 1000, "%s", getenv("HOME"));
82 - strlcat(config_name[2], "/.mplayer/mplayerplug-in.conf", 1000);
83 + strlcat(config_name[2], "/.mplayer/mplayerplug-in32.conf", 1000);
84
85 config = NULL;
86
87 @@ -249,18 +249,18 @@
88
89 if (customtypes == NULL) {
90 snprintf(buffer, 1000, "%s", getenv("HOME"));
91 - strlcat(buffer, "/.mplayer/mplayerplug-in.types", 1000);
92 + strlcat(buffer, "/.mplayer/mplayerplug-in32.types", 1000);
93 customtypes = fopen(buffer, "r");
94 }
95
96 if (customtypes == NULL) {
97 snprintf(buffer, 1000, "%s", getenv("HOME"));
98 - strlcat(buffer, "/.mozilla/mplayerplug-in.types", 1000);
99 + strlcat(buffer, "/.mozilla/mplayerplug-in32.types", 1000);
100 config = fopen(buffer, "r");
101 }
102
103 if (customtypes == NULL) {
104 - customtypes = fopen("/etc/mplayerplug-in.types", "r");
105 + customtypes = fopen("/etc/mplayerplug-in32.types", "r");
106 }
107
108 if (customtypes != NULL) {
109 @@ -454,7 +454,7 @@
110
111 if (variable == NPPVpluginNameString) {
112 #ifdef STD
113 - *((const char **) value) = "mplayerplug-in " PACKAGE_VERSION;
114 + *((const char **) value) = "mplayerplug-in32 " PACKAGE_VERSION;
115 #endif
116 #ifdef WMP
117 *((const char **) value) = "Windows Media Player Plugin";
118 @@ -480,19 +480,19 @@
119 if (variable == NPPVpluginDescriptionString) {
120 #ifdef GTK2_ENABLED
121 *((const char **) value) =
122 - "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in</a> "
123 + "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in32</a> "
124 PACKAGE_VERSION
125 "<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK2 Widgets<br>";
126 #endif
127 #ifdef GTK1_ENABLED
128 *((const char **) value) =
129 - "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in</a> "
130 + "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in32</a> "
131 PACKAGE_VERSION
132 "<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK1 Widgets<br>";
133 #endif
134 #ifdef X_ENABLED
135 *((const char **) value) =
136 - "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in</a> "
137 + "<a href=\"http://mplayerplug-in.sourceforge.net/\">mplayerplug-in32</a> "
138 PACKAGE_VERSION
139 "<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using X Widgets<br>";
140 #endif
141 @@ -1280,13 +1280,13 @@
142
143 // load config file
144
145 - snprintf(config_name[0], 1000, "/etc/mplayerplug-in.conf");
146 + snprintf(config_name[0], 1000, "/etc/mplayerplug-in32.conf");
147
148 snprintf(config_name[1], 1000, "%s", getenv("HOME"));
149 - strlcat(config_name[1], "/.mozilla/mplayerplug-in.conf", 1000);
150 + strlcat(config_name[1], "/.mozilla/mplayerplug-in32.conf", 1000);
151
152 snprintf(config_name[2], 1000, "%s", getenv("HOME"));
153 - strlcat(config_name[2], "/.mplayer/mplayerplug-in.conf", 1000);
154 + strlcat(config_name[2], "/.mplayer/mplayerplug-in32.conf", 1000);
155
156 config = NULL;
157
158 --- mplayerplug-in/Source/plugin-ui.cpp.32 2007-12-02 00:23:04.000000000 +0100
159 +++ mplayerplug-in/Source/plugin-ui.cpp 2008-01-27 11:33:48.000000000 +0100
160 @@ -277,7 +277,7 @@
161 #ifdef X_ENABLED
162 GC black_gc, white_gc;
163 XGCValues values;
164 - const char *id = "mplayerplug-in v" PACKAGE_VERSION;
165 + const char *id = "mplayerplug-in32 v" PACKAGE_VERSION;
166 unsigned int id_width;
167 int top, font_height, loops;
168 int term, chop;
169 @@ -2558,10 +2558,10 @@
170 // write the setting to the conf file now
171
172 snprintf(config_name, 1000, "%s", getenv("HOME"));
173 - strlcat(config_name, "/.mplayer/mplayerplug-in.conf", 1000);
174 + strlcat(config_name, "/.mplayer/mplayerplug-in32.conf", 1000);
175
176 snprintf(tmp_name, 1000, "%s", getenv("HOME"));
177 - strlcat(tmp_name, "/.mplayer/mplayerplug-in.conf.tmp", 1000);
178 + strlcat(tmp_name, "/.mplayer/mplayerplug-in32.conf.tmp", 1000);
179
180 if (DEBUG) {
181 printf("config %s\n", config_name);
182 @@ -2732,7 +2732,7 @@
183 gtk_container_add(GTK_CONTAINER(conf_vbox), conf_hbutton_box);
184 gtk_container_add(GTK_CONTAINER(instance->conf_window), conf_vbox);
185 gtk_window_set_title(GTK_WINDOW(instance->conf_window),
186 - _("mplayerplug-in configuration"));
187 + _("mplayerplug-in32 configuration"));
188 gtk_container_set_border_width(GTK_CONTAINER
189 (instance->conf_window), 5);
190 g_signal_connect(GTK_OBJECT(instance->conf_window), "delete_event",
191 @@ -3236,12 +3236,12 @@
192 if (instance->pb_src == NULL) {
193 // setup tmp directory
194 dirname =
195 - g_strdup_printf("%s", tempnam("/tmp", "mplayerplug-inXXXXXX"));
196 + g_strdup_printf("%s", tempnam("/tmp", "mplayerplug-in32XXXXXX"));
197 filename = g_strdup_printf("%s/00000001.jpg", dirname);
198
199 // run mplayer and try to get the first frame and convert it to a jpeg
200 command =
201 - g_strdup_printf("mplayer -vo jpeg:outdir=%s -frames 1 %s",
202 + g_strdup_printf("mplayer32 -vo jpeg:outdir=%s -frames 1 %s",
203 dirname, url);
204 if (!g_spawn_command_line_sync
205 (command, NULL, NULL, &exit_status, &error))
206 --- mplayerplug-in/Source/plugin-threads.cpp.32 2008-01-27 11:28:05.000000000 +0100
207 +++ mplayerplug-in/Source/plugin-threads.cpp 2008-01-27 11:29:17.000000000 +0100
208 @@ -343,7 +343,7 @@
209 && (instance->td->list->bytes > 0)) {
210 if (strlen(instance->td->list->fname) == 0) {
211 snprintf(instance->td->list->fname, 1024, "%s",
212 - tempnam("/tmp", "mplayerplug-inXXXXXX"));
213 + tempnam("/tmp", "mplayerplug-in32XXXXXX"));
214 }
215 } else {
216 // fix up the URL
217 @@ -364,7 +364,7 @@
218 }
219
220 i = 0;
221 - snprintf(buffer, 1024, "mplayer");
222 + snprintf(buffer, 1024, "mplayer32");
223 instance->td->argv[i++] = strdup(buffer);
224 if (instance->novop == 1) {
225 snprintf(buffer, 1024, "-vop");
226 @@ -665,7 +665,7 @@
227 static FILE *error = NULL;
228 char errortmp[64];
229 if (!error)
230 - error = fopen("/tmp/mplayerplugin-smil.log", "a");
231 + error = fopen("/tmp/mplayerplugin32-smil.log", "a");
232 #endif
233
234 /* just to be sure */
235 @@ -1273,7 +1273,7 @@
236
237
238 pthread_testcancel();
239 - if (strstr(buffer, "Example: mplayer -playlist ") != NULL) {
240 + if (strstr(buffer, "Example: mplayer32 -playlist ") != NULL) {
241 if (*maybeplaylist == 0) {
242 result->tryagain = TRYAGAIN_TRUE;
243 *maybeplaylist = 1;

  ViewVC Help
Powered by ViewVC 1.1.30