[arch-commits] Commit in pd-gem/trunk (PKGBUILD pd-gem-0.94-error.patch)
David Runge
dvzrv at gemini.archlinux.org
Sat Feb 19 12:20:47 UTC 2022
Date: Saturday, February 19, 2022 @ 12:20:47
Author: dvzrv
Revision: 1134857
upgpkg: pd-gem 0.94-10: Rebuild to add patch.
The upstream patch was not provided from a unique location:
https://bugs.archlinux.org/task/73883
Added:
pd-gem/trunk/pd-gem-0.94-error.patch
Modified:
pd-gem/trunk/PKGBUILD
-------------------------+
PKGBUILD | 8 -
pd-gem-0.94-error.patch | 195 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 199 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-19 11:38:42 UTC (rev 1134856)
+++ PKGBUILD 2022-02-19 12:20:47 UTC (rev 1134857)
@@ -3,7 +3,7 @@
_name=Gem
pkgname=pd-gem
pkgver=0.94
-pkgrel=9
+pkgrel=10
pkgdesc="Graphics Environment for Multimedia"
arch=(x86_64)
url="https://github.com/umlaeute/Gem"
@@ -17,12 +17,12 @@
'imagemagick: image processing support')
source=(
"$pkgname-$pkgver.tar.gz::https://github.com/umlaeute/${_name}/archive/v${pkgver}.tar.gz"
- "$pkgname-0.94-error.patch::https://salsa.debian.org/multimedia-team/pd/gem/-/raw/master/debian/patches/pd_error.patch"
+ "$pkgname-0.94-error.patch"
)
sha512sums=('356e4f2a27131f927cd5d20ba9010088cc22930f313f61f54dd107db041b6cb2042ab5d530bae069e3ccdccd0a8fed1152631c6f187f4f4602f37d763356d316'
- '7a5cb47fdf33cdfb0a9879b1bfc56861c7c3f802b2b8c50226bedda101e46bb7c998054e9c80a84747712ed0222062208f1568076fe8d839902d3a792c8c6c08')
+ '314fab766e93edfb41b3a97dce4d570dacb04390caf7e7f8aac86a2ad927029cad529d58302d65fb3453a2f9c6a03d361521a28db1933a6973087ea5f6f0320a')
b2sums=('1ca45c5a71e094aef04778538e6d0c83f4b13f233e6038507d5510ca904476f19ed1e70c011796e66e3688f8a8b40b13f823678b6b1baba877ac0b67eb9c6698'
- 'd3f07dc907f381480e1e0309883b658fe1a6647bd52b0146b3849c76cf0274c3878d1b5ba134956c31b9b15543ac7508a1985ae056571f649c18c7ed37ee3e4c')
+ '2fab38f8ecaf99dc092017fef9a137943a66a9e5d8700455689f52a5ec485c997283abe81c892769671daf580820894ad78b62b9615ca92e6901919f55a33250')
prepare() {
cd "${_name}-${pkgver}"
Added: pd-gem-0.94-error.patch
===================================================================
--- pd-gem-0.94-error.patch (rev 0)
+++ pd-gem-0.94-error.patch 2022-02-19 12:20:47 UTC (rev 1134857)
@@ -0,0 +1,195 @@
+From: Debian Multimedia Maintainers <debian-multimedia at 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
+ {
More information about the arch-commits
mailing list