summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch50
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch30
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb)9
4 files changed, 4 insertions, 86 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index f4c5469b56..30307bc86d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -131,6 +131,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
131# DRI3 requires xshmfence to also be enabled 131# DRI3 requires xshmfence to also be enabled
132PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" 132PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
133PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" 133PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
134PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy,libegl"
134PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 135PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
135PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" 136PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
136PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 137PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
deleted file mode 100644
index cd30999520..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 16 Nov 2015 16:18:40 +0200
4Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check
5
6REQUIRED_LIBS needs to be set to the correct systemd library,
7otherwise the later check will either fail or use the wrong
8pc file.
9
10Upstream-Status: Submitted [xorg-devel@lists.x.org]
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12---
13 configure.ac | 13 ++++++++++---
14 1 file changed, 10 insertions(+), 3 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 96c0242..f63eca1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon],
21 [support systemd socket activation (default: auto)]),
22 [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
23 PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
24- [HAVE_SYSTEMD_DAEMON=yes],
25+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon],
26 [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
27- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
28+ [REQUIRED_SYSTEMD_DAEMON=libsystemd],
29+ [REQUIRED_SYSTEMD_DAEMON=])])
30+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then
31+ HAVE_SYSTEMD_DAEMON=no
32+else
33+ HAVE_SYSTEMD_DAEMON=yes
34+fi
35+
36 if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
37 WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
38 fi
39@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then
40 AC_MSG_ERROR([systemd support requested but no library has been found])
41 fi
42 AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
43- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
44+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON"
45 fi
46 AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
47
48--
492.1.4
50
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
deleted file mode 100644
index 5f186cb843..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001
2From: Adam Jackson <ajax@redhat.com>
3Date: Wed, 27 Jan 2016 11:50:13 -0500
4Subject: modesetting: Require sufficiently new libdrm
5
6Bugzilla: https://bugs.freedesktop.org/93883
7Signed-off-by: Adam Jackson <ajax@redhat.com>
8Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
9Reviewed-by: Julien Cristau <jcristau@debian.org>
10
11Upstream-Status: Backport
12Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com>
13
14diff --git a/configure.ac b/configure.ac
15index ac3bb64..312fc69 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
19
20 if test "x$DRM" = xyes; then
21 dnl 2.4.46 is required for cursor hotspot support.
22- PKG_CHECK_EXISTS(libdrm >= 2.4.46)
23- XORG_DRIVER_MODESETTING=yes
24+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no)
25 fi
26
27 AC_SUBST([XORG_LIBS])
28--
29cgit v0.10.2
30
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb
index eb79b40465..27098f105a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb
@@ -1,11 +1,8 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch"
4 file://musl-arm-inb-outb.patch \ 4SRC_URI[md5sum] = "043d720bf2472a65bb8f0daa97f83dfa"
5 file://modesetting_libdrm_requirements.patch \ 5SRC_URI[sha256sum] = "ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd"
6 "
7SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
8SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
9 6
10# These extensions are now integrated into the server, so declare the migration 7# These extensions are now integrated into the server, so declare the migration
11# path for in-place upgrades. 8# path for in-place upgrades.