mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
xserver_xorg-server: move existing patch, and add to 1.17.4
As reported by Manuel in bug #9161, the commit 19b503b0d26fa16fffc980c287ca844077f3f675 that bumped the X.org server from 1.18.3 to 1.18.4 forgot to also rename the patch directory, making the existing patch orphan, while it is still needed. This commit therefore renames the 1.18.3 directory to 1.18.4. Moreover, this patch is also needed for the 1.17.x X.org server series which has been added recently, so this commit also adds the patch to a new 1.17.4 directory. Fixes bug #9161. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
9ca80d92e0
commit
3686101a2a
@ -0,0 +1,19 @@
|
||||
Kernel modesettings support also depends on dri2, see
|
||||
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
|
||||
|
||||
Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
|
||||
--- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200
|
||||
+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200
|
||||
@@ -2036,7 +2036,7 @@
|
||||
XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
|
||||
fi
|
||||
|
||||
- if test "x$DRM" = xyes; then
|
||||
+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
|
||||
dnl 2.4.46 is required for cursor hotspot support.
|
||||
PKG_CHECK_EXISTS(libdrm >= 2.4.46)
|
||||
XORG_DRIVER_MODESETTING=yes
|
Loading…
x
Reference in New Issue
Block a user