Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
Date: Mon, 30 Sep 2019 21:34:19
Message-Id: 1569879226.cb16966c9885f4a3f8a9f257dc890853bd1e46de.chewi@gentoo
commit:     cb16966c9885f4a3f8a9f257dc890853bd1e46de
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 21:00:18 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 21:33:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb16966c

media-libs/allegro: Patch around GLX_RGBA_FLOAT_BIT issue in 4.4.2

Thanks to Pablo Yanez Trujillo for the patch.

Closes: https://bugs.gentoo.org/672858
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/allegro/allegro-4.4.2-r2.ebuild           |  1 +
 .../files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 5797f5829b3..dba29ec2a94 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-rpath.patch
 	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
 	"${FILESDIR}"/${P}-glibc228.patch               # bug 670781
+	"${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch     # bug 672858
 )
 
 src_prepare() {

diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
new file mode 100644
index 00000000000..54ff4f97fbb
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
@@ -0,0 +1,20 @@
+--- a/addons/allegrogl/src/x.c	2019-01-27 20:35:26.209055856 +0100
++++ b/addons/allegrogl/src/x.c	2019-01-27 20:38:54.135570782 +0100
+@@ -650,7 +650,7 @@
+ 		return -1;
+ 	}
+ 
+-	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
++	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
+ 		TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
+ 		return -1;
+ 	}
+@@ -674,7 +674,7 @@
+ 	/* Floating-point depth is not supported as glx extension (yet). */
+ 	i->float_depth = 0;
+ 
+-	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
++	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
+ 
+ 	v = glXGetVisualFromFBConfig(_xwin.display, fbc);
+ 	if (!v) {