aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile5
-rw-r--r--x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c (renamed from x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c)0
2 files changed, 3 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 6315d00f6da4..692d1d3cbca2 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -22,7 +22,7 @@ SLAVE_PORT?= no
.if defined(WITH_NEW_XORG)
XORG_VERSION= 1.12.4
-XORG_REVISION= 0
+XORG_REVISION= 1
PLIST_SUB+= OLD="@comment " NEW=""
EXTRA_PATCHES+= ${FILESDIR}/extra-clang
.else
@@ -35,7 +35,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \
${FILESDIR}/extra-include_eventstr.h \
${FILESDIR}/extra-os-utils.c \
${FILESDIR}/extra-servermd.h \
- ${FILESDIR}/extra-dix_events.c
+ ${FILESDIR}/extra-dix_events.c \
+ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c
.endif
USE_BZIP2= yes
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c
index 59aad379ae11..59aad379ae11 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
+++ b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c