1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
diff -ur src.orig/mas-0.6.2/Imakefile src/mas-0.6.2/Imakefile
--- src.orig/mas-0.6.2/Imakefile 2003-10-16 07:23:02.000000000 -0700
+++ src/mas-0.6.2/Imakefile 2003-12-01 11:41:17.000000000 -0800
@@ -2,7 +2,7 @@
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
# The build order is important.
-SUBDIRS = config share common jrtplib mas devices maslib clients
+SUBDIRS = config share common jrtplib mas devices maslib clients control-apps devtools
#ifndef OSName
#define OSName Unknown Operating System!
diff -ur src.orig/mas-0.6.2/clients/util/mas-launch.sh src/mas-0.6.2/clients/util/mas-launch.sh
--- src.orig/mas-0.6.2/clients/util/mas-launch.sh 2003-10-06 14:08:41.000000000 -0700
+++ src/mas-0.6.2/clients/util/mas-launch.sh 2003-12-01 11:41:34.000000000 -0800
@@ -1,7 +1,7 @@
#!/bin/bash
# kill esound if it's running -- we can't coexist.
-pkill esd
+#pkill esd
if [[ $1 == "-t" ]];
then
Sólo en src/mas-0.6.2/clients/util: mas-launch.sh.orig
Sólo en src/mas-0.6.2/clients/util: mas-launch.sh.rej
diff -ur src.orig/mas-0.6.2/config/linux.cf src/mas-0.6.2/config/linux.cf
--- src.orig/mas-0.6.2/config/linux.cf 2003-03-10 13:45:28.000000000 -0800
+++ src/mas-0.6.2/config/linux.cf 2003-12-01 11:41:17.000000000 -0800
@@ -210,7 +210,7 @@
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Mc68020Architecture */
-#define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
+#define StandardDefines -Dlinux LinuxSourceDefines
#define ConnectionFlags -DUNIXCONN -DTCPCONN
diff -ur src.orig/mas-0.6.2/config/mas.tmpl src/mas-0.6.2/config/mas.tmpl
--- src.orig/mas-0.6.2/config/mas.tmpl 2003-10-16 07:13:01.000000000 -0700
+++ src/mas-0.6.2/config/mas.tmpl 2003-12-01 11:41:17.000000000 -0800
@@ -95,6 +95,10 @@
#endif
+#if !defined(MAS_ENDIANNESS)
+MAS_ENDIANNESS = MAS_UNKNOWN_ENDIAN
+#endif
+
#ifndef IncSubdir
#define IncSubdir mas
#endif
Sólo en src/mas-0.6.2/config: mas.tmpl.orig
diff -ur src.orig/mas-0.6.2/config/site.def src/mas-0.6.2/config/site.def
--- src.orig/mas-0.6.2/config/site.def 2002-03-14 08:17:08.000000000 -0800
+++ src/mas-0.6.2/config/site.def 2003-12-01 11:41:17.000000000 -0800
@@ -67,9 +67,11 @@
#ifdef AfterVendorCF
#ifndef ProjectRoot
-#define ProjectRoot /usr/local/mas
+#define ProjectRoot /usr
#endif
+#define ConfigDir /usr/lib/mas/config
+
/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
/* #define HasXdmAuth YES */
diff -ur src.orig/mas-0.6.2/control-apps/masplayer/player.c src/mas-0.6.2/control-apps/masplayer/player.c
--- src.orig/mas-0.6.2/control-apps/masplayer/player.c 2003-10-06 15:01:22.000000000 -0700
+++ src/mas-0.6.2/control-apps/masplayer/player.c 2003-12-01 11:41:17.000000000 -0800
@@ -147,11 +147,18 @@
static const char* buttons[] =
{
+#if 0
"/usr/local/mas/share/pixmaps/previous_button.png",
"/usr/local/mas/share/pixmaps/stop_button.png",
"/usr/local/mas/share/pixmaps/pause_button.png",
"/usr/local/mas/share/pixmaps/play_button.png",
"/usr/local/mas/share/pixmaps/next_button.png",
+#endif
+ "/usr/share/pixmaps/masplayer/media-prev.png",
+ "/usr/share/pixmaps/masplayer/media-stop.png",
+ "/usr/share/pixmaps/masplayer/media-pause.png",
+ "/usr/share/pixmaps/masplayer/media-play.png",
+ "/usr/share/pixmaps/masplayer/media-next.png",
};
Sólo en src/mas-0.6.2/control-apps/masplayer: player.c.orig
diff -ur src.orig/mas-0.6.2/mas/assembler.c src/mas-0.6.2/mas/assembler.c
--- src.orig/mas-0.6.2/mas/assembler.c 2003-06-29 19:25:09.000000000 -0700
+++ src/mas-0.6.2/mas/assembler.c 2003-12-01 11:41:17.000000000 -0800
@@ -3879,8 +3879,8 @@
}
/* added to help find plug-ins */
- append_to_mas_path("/usr/mas/lib/mas");
- append_to_mas_path("/usr/local/mas/lib/mas");
+ append_to_mas_path("/usr/lib/mas");
+ append_to_mas_path("/usr/local/lib/mas");
for (i=0; _mas_path_list[i][0] != 0; i++)
masc_log_message( MAS_VERBLVL_DEBUG, "asm: searching for devices in %s", _mas_path_list[i] );
Sólo en src/mas-0.6.2/mas: assembler.c.orig
diff -ur src.orig/mas-0.6.2/mas/devload.c src/mas-0.6.2/mas/devload.c
--- src.orig/mas-0.6.2/mas/devload.c 2003-03-10 13:54:26.000000000 -0800
+++ src/mas-0.6.2/mas/devload.c 2003-12-01 11:41:17.000000000 -0800
@@ -120,7 +120,7 @@
masc_log_message(MAS_VERBLVL_INFO, "");
masc_entering_log_level("asm: Troubleshooting tips:");
masc_log_message(MAS_VERBLVL_INFO, "asm: [INFO] 1. Set your MAS_PATH environment variable to the MAS installation directory.");
- masc_log_message(MAS_VERBLVL_INFO, "asm: [INFO] (e.g. /usr/local/mas/lib)");
+ masc_log_message(MAS_VERBLVL_INFO, "asm: [INFO] (e.g. /usr/lib/mas)");
masc_log_message(MAS_VERBLVL_INFO, "asm: [INFO] 2. Make sure the device is installed in that directory.");
masc_log_message(MAS_VERBLVL_INFO, "asm: [INFO] 3. If possible, make sure the device has been compiled correctly.");
masc_log_message(MAS_VERBLVL_INFO, "");
Sólo en src/mas-0.6.2/mas: devload.c.orig
diff -ur src.orig/mas-0.6.2/jrtplib/rtprandom.cpp src/mas-0.6.2/jrtplib/rtprandom.cpp
--- src.orig/mas-0.6.2/jrtplib/rtprandom.cpp 2003-06-30 04:11:02.000000000 +0200
+++ src/mas-0.6.2/jrtplib/rtprandom.cpp 2005-10-27 10:09:00.000000000 +0200
@@ -67,7 +67,7 @@
RTPuint32 RTPRandom::RandomUInt32()
{
- unsigned int seed;
+ unsigned long seed;
unsigned char byte;
struct timeval tv;
RTPuint32 retval;
@@ -79,7 +79,7 @@
gettimeofday( &tv, 0 );
seed = tv.tv_sec*1000000 + tv.tv_usec;
seed += clock();
- seed += (unsigned int)this;
+ seed += (unsigned long)this;
srand(seed);
}
byte = RandomByte();
|
