pd-gem/trunk/pd-gem-0.94-error.patch

   1 From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
   2 Date: Mon, 14 Feb 2022 13:43:21 +0100
   3 Subject: error() -> pd_error()
   4
   5 Origin: upstream
   6 Forwarded: not-needed
   7 Last-Update: 2021-12-20
   8
   9 Pd>=0.52 has dropped error() from its public API
  10 Last-Update: 2021-12-20
  11 ---
  12  plugins/modelOBJ/model_loader.cpp | 2 +-
  13  plugins/recordQT/recordQT.cpp     | 2 +-
  14  plugins/videoVNC/videoVNC.cpp     | 2 +-
  15  src/Base/GemWinCreateXWin.cpp     | 2 +-
  16  src/Gem/Event.cpp                 | 2 +-
  17  src/Gem/Exception.cpp             | 2 +-
  18  src/Gem/Image.cpp                 | 2 +-
  19  src/Gem/PixConvertSSE2.cpp        | 2 +-
  20  src/Gem/RTE.h                     | 3 +++
  21  src/Gem/Setup.cpp                 | 2 +-
  22  src/Gem/VertexBuffer.cpp          | 2 +-
  23  src/RTE/RTE.h                     | 4 ++++
  24  src/Utils/GemString.cpp           | 2 +-
  25  13 files changed, 18 insertions(+), 11 deletions(-)
  26
  27 diff --git a/plugins/modelOBJ/model_loader.cpp b/plugins/modelOBJ/model_loader.cpp
  28 index b6bb4cc..8b36b02 100644
  29 --- a/plugins/modelOBJ/model_loader.cpp
  30 +++ b/plugins/modelOBJ/model_loader.cpp
  31 @@ -13,7 +13,7 @@
  32  #define _CRT_SECURE_NO_WARNINGS
  33  #include "model_loader.h"
  34  /* for post(), error(),... */
  35 -#include "m_pd.h"
  36 +#include "Gem/RTE.h"
  37  #include "Gem/GemGL.h"
  38
  39  #include <string>
  40 diff --git a/plugins/recordQT/recordQT.cpp b/plugins/recordQT/recordQT.cpp
  41 index 62b1963..8e33f95 100644
  42 --- a/plugins/recordQT/recordQT.cpp
  43 +++ b/plugins/recordQT/recordQT.cpp
  44 @@ -33,7 +33,7 @@ using namespace gem::plugins;
  45  #include <stdio.h>
  46
  47  /* for post() and error() */
  48 -#include "m_pd.h"
  49 +#include "Gem/RTE.h"
  50
  51  static char* FourCC2Str(int code, char*char5) {
  52    char5[0] = (code >> 24) & 0xFF;
  53 diff --git a/plugins/videoVNC/videoVNC.cpp b/plugins/videoVNC/videoVNC.cpp
  54 index 190886a..1b48d9a 100644
  55 --- a/plugins/videoVNC/videoVNC.cpp
  56 +++ b/plugins/videoVNC/videoVNC.cpp
  57 @@ -1,7 +1,7 @@
  58  #include "videoVNC.h"
  59  #include "plugins/PluginFactory.h"
  60
  61 -#include <m_pd.h>
  62 +#include "Gem/RTE.h"
  63
  64  using namespace gem::plugins;
  65
  66 diff --git a/src/Base/GemWinCreateXWin.cpp b/src/Base/GemWinCreateXWin.cpp
  67 index 6aa2c94..002ae4e 100644
  68 --- a/src/Base/GemWinCreateXWin.cpp
  69 +++ b/src/Base/GemWinCreateXWin.cpp
  70 @@ -23,7 +23,7 @@
  71
  72  #include "GemWinCreate.h"
  73
  74 -#include <m_pd.h>
  75 +#include "Gem/RTE.h"
  76  #include <X11/cursorfont.h>
  77  #include <stdio.h>
  78  #include <stdlib.h>
  79 diff --git a/src/Gem/Event.cpp b/src/Gem/Event.cpp
  80 index 979cd3c..14ad116 100644
  81 --- a/src/Gem/Event.cpp
  82 +++ b/src/Gem/Event.cpp
  83 @@ -18,7 +18,7 @@
  84  #include "Event.h"
  85
  86  #include <stdlib.h>
  87 -#include "m_pd.h"
  88 +#include "Gem/RTE.h"
  89
  90  /////////////////////////////////////////////////////////
  91  // The callbacks
  92 diff --git a/src/Gem/Exception.cpp b/src/Gem/Exception.cpp
  93 index 6bc0346..d9858db 100644
  94 --- a/src/Gem/Exception.cpp
  95 +++ b/src/Gem/Exception.cpp
  96 @@ -17,7 +17,7 @@
  97  #include "Exception.h"
  98
  99  // for error()
 100 -#include "m_pd.h"
 101 +#include "Gem/RTE.h"
 102  #include <string.h>
 103  #include <stdlib.h>
 104
 105 diff --git a/src/Gem/Image.cpp b/src/Gem/Image.cpp
 106 index 4c6d1e0..b2ee1e8 100644
 107 --- a/src/Gem/Image.cpp
 108 +++ b/src/Gem/Image.cpp
 109 @@ -23,7 +23,7 @@
 110  # pragma warning( disable : 4091 )
 111  #endif
 112
 113 -#include "m_pd.h"
 114 +#include "Gem/RTE.h"
 115  #include "Image.h"
 116  #include "GemGL.h"
 117  #include "PixConvert.h"
 118 diff --git a/src/Gem/PixConvertSSE2.cpp b/src/Gem/PixConvertSSE2.cpp
 119 index 50e95ce..e30a840 100644
 120 --- a/src/Gem/PixConvertSSE2.cpp
 121 +++ b/src/Gem/PixConvertSSE2.cpp
 122 @@ -35,7 +35,7 @@
 123
 124
 125  /* for post() */
 126 -#include "m_pd.h"
 127 +#include "Gem/RTE.h"
 128
 129  /* just some debugging stuff ... */
 130
 131 diff --git a/src/Gem/RTE.h b/src/Gem/RTE.h
 132 index a9820b9..e6e89ee 100644
 133 --- a/src/Gem/RTE.h
 134 +++ b/src/Gem/RTE.h
 135 @@ -27,5 +27,8 @@
 136
 137  #define GEMMARK() verbose(2, "%s:%d[%s]", __FILE__, __LINE__, __FUNCTION__)
 138
 139 +#if (defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION >= 52)
 140 +extern "C" { EXTERN void error(const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(1, 2); };
 141 +#endif
 142
 143  #endif /* _INCLUDE__GEM_GEM_RTE_H_ */
 144 diff --git a/src/Gem/Setup.cpp b/src/Gem/Setup.cpp
 145 index 3e28e3c..72bd789 100644
 146 --- a/src/Gem/Setup.cpp
 147 +++ b/src/Gem/Setup.cpp
 148 @@ -68,7 +68,7 @@ static const char *GEM_AUTHORS[] = {
 149  static const char GEM_OTHERAUTHORS[] =
 150    "Guenter Geiger, Daniel Heckenberg, James Tittle, Hans-Christoph Steiner, et al.";
 151
 152 -# include "m_pd.h"
 153 +# include "Gem/RTE.h"
 154  # include "RTE/RTE.h"
 155
 156  #if defined HAVE_M_IMP_H
 157 diff --git a/src/Gem/VertexBuffer.cpp b/src/Gem/VertexBuffer.cpp
 158 index 2fd64da..772c035 100644
 159 --- a/src/Gem/VertexBuffer.cpp
 160 +++ b/src/Gem/VertexBuffer.cpp
 161 @@ -17,7 +17,7 @@
 162  #include "VertexBuffer.h"
 163
 164  /* for post(), error(),... */
 165 -#include "m_pd.h"
 166 +#include "Gem/RTE.h"
 167
 168  gem::VertexBuffer:: VertexBuffer() :
 169    size(0),
 170 diff --git a/src/RTE/RTE.h b/src/RTE/RTE.h
 171 index 1f28c60..86f41d5 100644
 172 --- a/src/RTE/RTE.h
 173 +++ b/src/RTE/RTE.h
 174 @@ -64,4 +64,8 @@ public:
 175  };
 176  };
 177  };
 178 +
 179 +#if (defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION >= 52)
 180 +extern "C" { EXTERN void error(const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(1, 2); };
 181 +#endif
 182  #endif /* _INCLUDE__GEM_RTE_RTE_H_ */
 183 diff --git a/src/Utils/GemString.cpp b/src/Utils/GemString.cpp
 184 index 07b0591..2e08380 100644
 185 --- a/src/Utils/GemString.cpp
 186 +++ b/src/Utils/GemString.cpp
 187 @@ -12,7 +12,7 @@ typedef unsigned __int8 uint8_t;
 188  #ifdef  HAVE_FRIBIDI_H
 189  # include <fribidi.h>
 190
 191 -#include "m_pd.h"
 192 +#include "Gem/RTE.h"
 193
 194  namespace gem
 195  {