diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-09-30 16:21:13 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-09-30 16:21:13 +0800 |
| commit | 320ee5c194892656241eef152771607770e25742 (patch) | |
| tree | 4cd4aaf6021b4dafb41ecfeaf4c83ea284d8ba5d | |
| parent | 82f249cd74102f26cbeb6457b4b658ee07b41828 (diff) | |
| download | xorg-devel-ports-320ee5c194892656241eef152771607770e25742.tar.gz xorg-devel-ports-320ee5c194892656241eef152771607770e25742.tar.zst xorg-devel-ports-320ee5c194892656241eef152771607770e25742.zip | |
Update to 1.6.1.
Disable dri3.
Remove Mesa check.
Sync with ports, grab the arm fix.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/experimental@1524 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 15 | ||||
| -rw-r--r-- | x11-servers/xorg-server/distinfo | 4 | ||||
| -rw-r--r-- | x11-servers/xorg-server/pkg-plist | 1 |
3 files changed, 10 insertions, 10 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 22fec50..e24f580 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= xorg-server -PORTVERSION= 1.16.0 +PORTVERSION= 1.16.1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG @@ -37,7 +37,7 @@ USE_PERL5= build USE_GL= gl USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ - dri2proto dri3proto xcmiscproto xextproto xproto xtrans \ + dri2proto xcmiscproto xextproto xproto xtrans \ xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto \ bigreqsproto resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto presentproto recordproto \ @@ -48,7 +48,7 @@ USE_OPENSSL= yes CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=/var --without-dtrace --disable-xephyr \ - --enable-record=yes + --enable-record=yes --disable-dri3 INSTALL_TARGET= install-strip .if ${SLAVE_PORT} == "no" @@ -59,10 +59,6 @@ SUB_FILES= pkg-install pkg-deinstall PLIST= ${.CURDIR}/pkg-plist .endif -.if !defined(WITH_NEW_MESA) -BROKEN= Needs Mesa version 10+, please set by WITH_NEW_MESA -.endif - .include <bsd.port.pre.mk> .if defined(WITH_OPENSSL_BASE) @@ -98,6 +94,11 @@ PLIST_SUB+= SUID="" PLIST_SUB+= SUID="@comment " .endif +.if ${ARCH} == armv6 +EXTRA_PATCHES+= ${FILESDIR}/extra-arm-patch-hw__xfree86__os-support__bsd__Makefile.in +EXTRA_PATCHES+= ${FILESDIR}/extra-arm-patch-include__servermd.h +.endif + .if ${ARCH} == i386 EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386 .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 727b584..b82dd97 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/xserver/xorg-server-1.16.0.tar.bz2) = 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b -SIZE (xorg/xserver/xorg-server-1.16.0.tar.bz2) = 5832944 +SHA256 (xorg/xserver/xorg-server-1.16.1.tar.bz2) = f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060 +SIZE (xorg/xserver/xorg-server-1.16.1.tar.bz2) = 5802984 diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 935e9f5..49c79ee 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -37,7 +37,6 @@ include/xorg/dixgrabs.h include/xorg/dixstruct.h include/xorg/dri.h include/xorg/dri2.h -include/xorg/dri3.h include/xorg/dristruct.h include/xorg/edid.h include/xorg/exa.h |