diff options
author | Wadim Egorov <w.egorov@phytec.de> | 2021-07-13 14:29:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-20 19:05:45 +0100 |
commit | bbaf7ae626028c42fe1939a79c2b17fbc8d3263c (patch) | |
tree | 2240756a3a65e467ee9f7e8f8d5bd93bdaba6da9 | |
parent | d1df18c68deca3fb7c37e0a83e50f79cc5fab856 (diff) | |
download | poky-bbaf7ae626028c42fe1939a79c2b17fbc8d3263c.tar.gz |
xserver-xorg: Fix builds without glx
(From OE-Core rev: e458c15627e7b27392d158cbb9417f66424aa7d5)
Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch | 46 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch new file mode 100644 index 0000000000..4c9cb0ebb2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 836f93de99b35050d78d61d3654f7c5655184144 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
3 | Date: Fri, 19 Apr 2019 10:19:50 +0200 | ||
4 | Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx | ||
5 | |||
6 | Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to | ||
7 | Xwayland_LDFLAGS but GLX can be disabled through --disable-glx. | ||
8 | In this case, build fails on: | ||
9 | |||
10 | make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop. | ||
11 | make[3]: *** Waiting for unfinished jobs.... | ||
12 | |||
13 | Fixes: | ||
14 | - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef | ||
15 | |||
16 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
17 | |||
18 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/836f93de99b35050d78d61d3654f7c5655184144] | ||
19 | Signed-off-by: Wadim Egorov <w.egorov@phytec.de> | ||
20 | --- | ||
21 | hw/xwayland/Makefile.am | 6 +++++- | ||
22 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am | ||
25 | index bc1cb8506..502879e2a 100644 | ||
26 | --- a/hw/xwayland/Makefile.am | ||
27 | +++ b/hw/xwayland/Makefile.am | ||
28 | @@ -21,10 +21,14 @@ Xwayland_SOURCES = \ | ||
29 | $(top_srcdir)/Xi/stubs.c \ | ||
30 | $(top_srcdir)/mi/miinitext.c | ||
31 | |||
32 | +if GLX | ||
33 | +GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la | ||
34 | +endif | ||
35 | + | ||
36 | Xwayland_LDADD = \ | ||
37 | $(glamor_lib) \ | ||
38 | $(XWAYLAND_LIBS) \ | ||
39 | - $(top_builddir)/glx/libglxvnd.la \ | ||
40 | + $(GLXVND_LIB) \ | ||
41 | $(XWAYLAND_SYS_LIBS) \ | ||
42 | $(top_builddir)/Xext/libXvidmode.la \ | ||
43 | $(XSERVER_SYS_LIBS) | ||
44 | -- | ||
45 | 2.25.1 | ||
46 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index 755a762a73..e0551fa999 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb | |||
@@ -8,6 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat | |||
8 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ | 8 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ |
9 | file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ | 9 | file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ |
10 | file://CVE-2021-3472.patch \ | 10 | file://CVE-2021-3472.patch \ |
11 | file://0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch \ | ||
11 | " | 12 | " |
12 | SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" | 13 | SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" |
13 | 14 | ||