summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-28 02:18:08 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-28 02:18:08 +0800
commitbab3dd03578a4c37b4a786322912d8939f5d9513 (patch)
treee21c510dd53529209b1cbaf269ea9b41b1293ad4
parent07cc08ca52e9c70af9f517e70d81acf1777aa10f (diff)
downloadxorg-devel-ports-bab3dd03578a4c37b4a786322912d8939f5d9513.tar.gz
xorg-devel-ports-bab3dd03578a4c37b4a786322912d8939f5d9513.tar.zst
xorg-devel-ports-bab3dd03578a4c37b4a786322912d8939f5d9513.zip
Enable AIGLX by default on 1.12.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@996 058c260c-8361-11dd-a0ac-aa2bafec7d09
-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 f4312be..32b0413 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -32,7 +32,7 @@ OPTIONS_EXCLUDE_sparc64= HAL
.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
@@ -45,7 +45,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 59aad37..59aad37 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