diff --git a/general.ent b/general.ent index f46c38d5f0..012e3fde02 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - - + + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 975b822cab..ba5a616cb7 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,17 @@ --> + + March 1st, 2015 + + + [pierre] - Apply a patch to the modesetting driver + code in Xorg-server, to allow running on 32 bit machine, and + on cards which do not support hardware cursor. + + + + February 28th, 2015 diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml index 7c816e089b..59de82393d 100644 --- a/x/installing/xorg-server.xml +++ b/x/installing/xorg-server.xml @@ -78,6 +78,12 @@ + + + Optional patch: + + + Xorg Server Dependencies @@ -120,23 +126,21 @@ Installation of Xorg Server - If you have downloaded the optional patch, apply it by running + If you have downloaded the first optional patch, apply it by running the following command: patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch - The modesetting driver is now included in - the tarball (since version 1.17). It needs to be fixed for 32-bit - machines (first command below), and for cards which do not support - the mouse pointer in hardware (second command below): + The modesetting video driver is now included + in the tarball (since version 1.17). It needs to be fixed for 32-bit + machines and for cards which do not support an hardware mouse pointer. + If you plan to use the modesetting video driver, run the + following command: -sed -e '/\*\//a #define _FILE_OFFSET_BITS 64' \ - -i hw/xfree86/drivers/modesetting/dumb_bo.c -sed -e 's/ == -EINVAL//' \ - -i hw/xfree86/drivers/modesetting/drmmode_display.c +patch -Np1 -i ../xorg-server-&xorg-server-version;-fix_modesetting-1.patch Install the server by running the following commands: @@ -180,8 +184,8 @@ EOF - --enable-install-setuid: The Xorg binary must run as - the root user. This switch ensures that the binary is installed + --enable-install-setuid: The Xorg binary must run + as the root user. This switch ensures that the binary is installed setuid when make is run by an unprivileged user.