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
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Mon, 14 Feb 2022 13:43:21 +0100
Subject: error() -> pd_error()
Origin: upstream
Forwarded: not-needed
Last-Update: 2021-12-20
Pd>=0.52 has dropped error() from its public API
Last-Update: 2021-12-20
---
plugins/modelOBJ/model_loader.cpp | 2 +-
plugins/recordQT/recordQT.cpp | 2 +-
plugins/videoVNC/videoVNC.cpp | 2 +-
src/Base/GemWinCreateXWin.cpp | 2 +-
src/Gem/Event.cpp | 2 +-
src/Gem/Exception.cpp | 2 +-
src/Gem/Image.cpp | 2 +-
src/Gem/PixConvertSSE2.cpp | 2 +-
src/Gem/RTE.h | 3 +++
src/Gem/Setup.cpp | 2 +-
src/Gem/VertexBuffer.cpp | 2 +-
src/RTE/RTE.h | 4 ++++
src/Utils/GemString.cpp | 2 +-
13 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/plugins/modelOBJ/model_loader.cpp b/plugins/modelOBJ/model_loader.cpp
index b6bb4cc..8b36b02 100644
--- a/plugins/modelOBJ/model_loader.cpp
+++ b/plugins/modelOBJ/model_loader.cpp
@@ -13,7 +13,7 @@
#define _CRT_SECURE_NO_WARNINGS
#include "model_loader.h"
/* for post(), error(),... */
-#include "m_pd.h"
+#include "Gem/RTE.h"
#include "Gem/GemGL.h"
#include <string>
diff --git a/plugins/recordQT/recordQT.cpp b/plugins/recordQT/recordQT.cpp
index 62b1963..8e33f95 100644
--- a/plugins/recordQT/recordQT.cpp
+++ b/plugins/recordQT/recordQT.cpp
@@ -33,7 +33,7 @@ using namespace gem::plugins;
#include <stdio.h>
/* for post() and error() */
-#include "m_pd.h"
+#include "Gem/RTE.h"
static char* FourCC2Str(int code, char*char5) {
char5[0] = (code >> 24) & 0xFF;
diff --git a/plugins/videoVNC/videoVNC.cpp b/plugins/videoVNC/videoVNC.cpp
index 190886a..1b48d9a 100644
--- a/plugins/videoVNC/videoVNC.cpp
+++ b/plugins/videoVNC/videoVNC.cpp
@@ -1,7 +1,7 @@
#include "videoVNC.h"
#include "plugins/PluginFactory.h"
-#include <m_pd.h>
+#include "Gem/RTE.h"
using namespace gem::plugins;
diff --git a/src/Base/GemWinCreateXWin.cpp b/src/Base/GemWinCreateXWin.cpp
index 6aa2c94..002ae4e 100644
--- a/src/Base/GemWinCreateXWin.cpp
+++ b/src/Base/GemWinCreateXWin.cpp
@@ -23,7 +23,7 @@
#include "GemWinCreate.h"
-#include <m_pd.h>
+#include "Gem/RTE.h"
#include <X11/cursorfont.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/Gem/Event.cpp b/src/Gem/Event.cpp
index 979cd3c..14ad116 100644
--- a/src/Gem/Event.cpp
+++ b/src/Gem/Event.cpp
@@ -18,7 +18,7 @@
#include "Event.h"
#include <stdlib.h>
-#include "m_pd.h"
+#include "Gem/RTE.h"
/////////////////////////////////////////////////////////
// The callbacks
diff --git a/src/Gem/Exception.cpp b/src/Gem/Exception.cpp
index 6bc0346..d9858db 100644
--- a/src/Gem/Exception.cpp
+++ b/src/Gem/Exception.cpp
@@ -17,7 +17,7 @@
#include "Exception.h"
// for error()
-#include "m_pd.h"
+#include "Gem/RTE.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/Gem/Image.cpp b/src/Gem/Image.cpp
index 4c6d1e0..b2ee1e8 100644
--- a/src/Gem/Image.cpp
+++ b/src/Gem/Image.cpp
@@ -23,7 +23,7 @@
# pragma warning( disable : 4091 )
#endif
-#include "m_pd.h"
+#include "Gem/RTE.h"
#include "Image.h"
#include "GemGL.h"
#include "PixConvert.h"
diff --git a/src/Gem/PixConvertSSE2.cpp b/src/Gem/PixConvertSSE2.cpp
index 50e95ce..e30a840 100644
--- a/src/Gem/PixConvertSSE2.cpp
+++ b/src/Gem/PixConvertSSE2.cpp
@@ -35,7 +35,7 @@
/* for post() */
-#include "m_pd.h"
+#include "Gem/RTE.h"
/* just some debugging stuff ... */
diff --git a/src/Gem/RTE.h b/src/Gem/RTE.h
index a9820b9..e6e89ee 100644
--- a/src/Gem/RTE.h
+++ b/src/Gem/RTE.h
@@ -27,5 +27,8 @@
#define GEMMARK() verbose(2, "%s:%d[%s]", __FILE__, __LINE__, __FUNCTION__)
+#if (defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION >= 52)
+extern "C" { EXTERN void error(const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(1, 2); };
+#endif
#endif /* _INCLUDE__GEM_GEM_RTE_H_ */
diff --git a/src/Gem/Setup.cpp b/src/Gem/Setup.cpp
index 3e28e3c..72bd789 100644
--- a/src/Gem/Setup.cpp
+++ b/src/Gem/Setup.cpp
@@ -68,7 +68,7 @@ static const char *GEM_AUTHORS[] = {
static const char GEM_OTHERAUTHORS[] =
"Guenter Geiger, Daniel Heckenberg, James Tittle, Hans-Christoph Steiner, et al.";
-# include "m_pd.h"
+# include "Gem/RTE.h"
# include "RTE/RTE.h"
#if defined HAVE_M_IMP_H
diff --git a/src/Gem/VertexBuffer.cpp b/src/Gem/VertexBuffer.cpp
index 2fd64da..772c035 100644
--- a/src/Gem/VertexBuffer.cpp
+++ b/src/Gem/VertexBuffer.cpp
@@ -17,7 +17,7 @@
#include "VertexBuffer.h"
/* for post(), error(),... */
-#include "m_pd.h"
+#include "Gem/RTE.h"
gem::VertexBuffer:: VertexBuffer() :
size(0),
diff --git a/src/RTE/RTE.h b/src/RTE/RTE.h
index 1f28c60..86f41d5 100644
--- a/src/RTE/RTE.h
+++ b/src/RTE/RTE.h
@@ -64,4 +64,8 @@ public:
};
};
};
+
+#if (defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION >= 52)
+extern "C" { EXTERN void error(const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(1, 2); };
+#endif
#endif /* _INCLUDE__GEM_RTE_RTE_H_ */
diff --git a/src/Utils/GemString.cpp b/src/Utils/GemString.cpp
index 07b0591..2e08380 100644
--- a/src/Utils/GemString.cpp
+++ b/src/Utils/GemString.cpp
@@ -12,7 +12,7 @@ typedef unsigned __int8 uint8_t;
#ifdef HAVE_FRIBIDI_H
# include <fribidi.h>
-#include "m_pd.h"
+#include "Gem/RTE.h"
namespace gem
{
|
