xserver-xorg: update 1.18.3 and add PACKAGECONFIG for glamor
* drm-version patch was applied mainline * libsystemd was solved similar to patch upstream * glamor was enhanced twice by Eric Anholt and makes vc4 work on Raspberry Pi * glamor does not link against libegl but won't work without libegl (From OE-Core rev: 7fc6e5e816434fb6e35c137d5440b92a1cc4d9c2) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Müller
Richard Purdie
parent
b86f8a0a66
commit
1e88c74650
|
|
@ -131,6 +131,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
|
|||
# DRI3 requires xshmfence to also be enabled
|
||||
PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
|
||||
PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
|
||||
PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy,libegl"
|
||||
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
|
||||
PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
|
||||
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 16 Nov 2015 16:18:40 +0200
|
||||
Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check
|
||||
|
||||
REQUIRED_LIBS needs to be set to the correct systemd library,
|
||||
otherwise the later check will either fail or use the wrong
|
||||
pc file.
|
||||
|
||||
Upstream-Status: Submitted [xorg-devel@lists.x.org]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
configure.ac | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 96c0242..f63eca1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon],
|
||||
[support systemd socket activation (default: auto)]),
|
||||
[WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
|
||||
PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
|
||||
- [HAVE_SYSTEMD_DAEMON=yes],
|
||||
+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon],
|
||||
[PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
|
||||
- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
|
||||
+ [REQUIRED_SYSTEMD_DAEMON=libsystemd],
|
||||
+ [REQUIRED_SYSTEMD_DAEMON=])])
|
||||
+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then
|
||||
+ HAVE_SYSTEMD_DAEMON=no
|
||||
+else
|
||||
+ HAVE_SYSTEMD_DAEMON=yes
|
||||
+fi
|
||||
+
|
||||
if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
|
||||
WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
|
||||
fi
|
||||
@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then
|
||||
AC_MSG_ERROR([systemd support requested but no library has been found])
|
||||
fi
|
||||
AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
|
||||
- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
|
||||
+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON"
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed, 27 Jan 2016 11:50:13 -0500
|
||||
Subject: modesetting: Require sufficiently new libdrm
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/93883
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ac3bb64..312fc69 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
|
||||
|
||||
if test "x$DRM" = xyes; then
|
||||
dnl 2.4.46 is required for cursor hotspot support.
|
||||
- PKG_CHECK_EXISTS(libdrm >= 2.4.46)
|
||||
- XORG_DRIVER_MODESETTING=yes
|
||||
+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no)
|
||||
fi
|
||||
|
||||
AC_SUBST([XORG_LIBS])
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
|
@ -1,11 +1,8 @@
|
|||
require xserver-xorg.inc
|
||||
|
||||
SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \
|
||||
file://musl-arm-inb-outb.patch \
|
||||
file://modesetting_libdrm_requirements.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
|
||||
SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
|
||||
SRC_URI += "file://musl-arm-inb-outb.patch"
|
||||
SRC_URI[md5sum] = "043d720bf2472a65bb8f0daa97f83dfa"
|
||||
SRC_URI[sha256sum] = "ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd"
|
||||
|
||||
# These extensions are now integrated into the server, so declare the migration
|
||||
# path for in-place upgrades.
|
||||
Loading…
Reference in New Issue