x11-misc/picom: fix compilation with USE=-opengl

Closes: https://bugs.gentoo.org/702376
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
new file mode 100644 (file)
index 0000000..ca9f715
--- /dev/null
+++ b/x11-misc/picom/files/picom-7.5-no_opengl.patch
@@ -0,0 +1,27 @@
+From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 12 Oct 2019 13:29:10 +0000
+Subject: [PATCH] Unbreak -Dopengl=false clean build
+
+In file included from ../src/x.c:17:
+../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
+ #include <GL/glx.h>
+         ^~~~~~~~~~
+---
+ src/x.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/x.c b/src/x.c
+index ed6668a8..2f802f1e 100644
+--- a/src/x.c
++++ b/src/x.c
+@@ -14,7 +14,9 @@
+ #include <xcb/xfixes.h>
+ 
+ #include "atom.h"
++#ifdef CONFIG_OPENGL
+ #include "backend/gl/glx.h"
++#endif
+ #include "common.h"
+ #include "compiler.h"
+ #include "kernel.h"

diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5.ebuild
index bec768b6fec846404fd9cec74ee60bacea8d220e..5c07720ed5f70fdee8baceb52b95ff7134282a31 100644 (file)
--- a/x11-misc/picom/picom-7.5.ebuild
+++ b/x11-misc/picom/picom-7.5.ebuild
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig
        doc? ( app-text/asciidoc )"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-no_opengl.patch
+       )
+
 src_configure() {
        local emesonargs=(
                $(meson_use config-file config_file)