[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

[Ionen Wolkens]

commit:     cbc343591d3efc77a714e71275d7c72181720cb5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 01:37:32 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 02:20:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc34359

dev-games/clanlib: fix :2.3 build on x86 with USE=opengl

This likely been broken in stable for a long time, perhaps since
the switch to libglvnd (assuming it was tested and ever worked).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r2.ebuild             |  1 +
 .../clanlib/files/clanlib-2.3.7-32bit-opengl.patch    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
index b27100b9778..5a2389c1c05 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-doc.patch
        "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
        "${FILESDIR}"/${P}-glibc2.34.patch
+       "${FILESDIR}"/${P}-32bit-opengl.patch
 )
 
 DOCS=( CODING_STYLE CREDITS PATCHES README )

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
new file mode 100644
index 00000000000..73d5287c5dd
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
@@ -0,0 +1,19 @@
+Patch taken from Fedora, removes redefinitions that conflicts on x86.
+--- a/Sources/API/GL/opengl_defines.h
++++ b/Sources/API/GL/opengl_defines.h
+@@ -69,6 +69,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ typedef struct __CLsync *CLsync;
+ 
+--- a/Sources/API/GL1/opengl1_defines.h
++++ b/Sources/API/GL1/opengl1_defines.h
+@@ -65,6 +65,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ 
+ #else