summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-02-06 23:26:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:41 -0800
commitddd2fbf722bf2a218f360007d7d463f8349e84ca (patch)
tree871300395fec6e1a3548d8806eb0ee51a3529949 /meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
parent476696030492b09a5985f948e38db8304cadd512 (diff)
downloadpoky-ddd2fbf722bf2a218f360007d7d463f8349e84ca.tar.gz
libepoxy: upgrade to 1.4.0
Drop the two patches that add the ability to disable GLX, this has been added upstream. Drop the Python3 patch as the code generator works with Py3 now. (From OE-Core rev: 8ba197b3ae10a90ca988f0021597dfd20463c2d2) (From OE-Core rev: 0066327d79b2ea942c414208a3daa0ecf4361730) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch')
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
deleted file mode 100644
index 262d6845f5..0000000000
--- a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 24868cbfb9dda5f6929dd277c47d35df016e8754 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 6 May 2015 11:05:48 +0200
4Subject: [PATCH 2/2] add an option to disable glx support
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this option would help us in yocto to get deterministic build results
10
11Upstream-Status: Submitted [1]
12
13[1] https://github.com/anholt/libepoxy/pull/52
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 configure.ac | 9 ++++++++-
18 1 file changed, 8 insertions(+), 1 deletion(-)
19
20diff --git a/configure.ac b/configure.ac
21index bdd70da..6c7153d 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
25 # uintptr_t to a void *") by default. Kill that.
26 XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
27
28-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
29+AC_ARG_ENABLE([glx],
30+ [AS_HELP_STRING([--disable-glx],
31+ [disable if you don't want x11/glx support])],
32+ [],
33+ [enable_glx=yes]
34+ )
35+
36+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
37
38 AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
39
40--
411.9.3
42