pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Update to modular-xorg-server-...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7ea56a549a5a
branches: trunk
changeset: 650650:7ea56a549a5a
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Apr 25 11:47:03 2015 +0000
description:
Update to modular-xorg-server-1.17.1.
Please note that the previous version is still available in
x11/modular-xorg-server112 in case this version does not work for you.
This is relevant for users who need DRI1 and/or XAA as those features have
been deprecated and removed by upstream since xorg-server-1.13.
Note also that this update breaks the driver ABI and that drivers will be need
to be rebuilt.
Summary of the important changes since 1.12:
xorg-server-1.17 (4 February 2015)
- Generic DRM/KMS driver xf86-video-modesetting
xorg-server-1.16 (17 July 2014)
- XWayland DDX
- GLAMOR acceleration
- non-PCI devices support
- systemd-logind support (rootless X)
xorg-server1.15 (27 December 2013)
- DRI3
- "present" extension
xorg-server-1.14 (5 March 2013)
- XInput 2.3
xorg-server1.13 (5 September 2012)
- New DDX driver API
- DRI2
- RandR 1.4
- OpenGL 3.x+ contexts
- XAA support removed
diffstat:
x11/modular-xorg-server/Makefile | 28 +-
x11/modular-xorg-server/PLIST | 43 +-
x11/modular-xorg-server/buildlink3.mk | 5 +-
x11/modular-xorg-server/distinfo | 83 +-
x11/modular-xorg-server/options.mk | 22 +-
x11/modular-xorg-server/patches/patch-Xext_xcmisc.c | 15 -
x11/modular-xorg-server/patches/patch-Xext_xvdisp.c | 167 -
x11/modular-xorg-server/patches/patch-Xi_chgdctl.c | 36 -
x11/modular-xorg-server/patches/patch-Xi_chgfctl.c | 16 -
x11/modular-xorg-server/patches/patch-Xi_sendexev.c | 17 -
x11/modular-xorg-server/patches/patch-Xi_xiallowev.c | 23 -
x11/modular-xorg-server/patches/patch-Xi_xichangecursor.c | 20 -
x11/modular-xorg-server/patches/patch-Xi_xichangehierarchy.c | 97 -
x11/modular-xorg-server/patches/patch-Xi_xigetclientpointer.c | 15 -
x11/modular-xorg-server/patches/patch-Xi_xigrabdev.c | 44 -
x11/modular-xorg-server/patches/patch-Xi_xipassivegrab.c | 61 -
x11/modular-xorg-server/patches/patch-Xi_xiproperty.c | 88 -
x11/modular-xorg-server/patches/patch-Xi_xiquerydevice.c | 15 -
x11/modular-xorg-server/patches/patch-Xi_xiquerypointer.c | 16 -
x11/modular-xorg-server/patches/patch-Xi_xiselectev.c | 33 -
x11/modular-xorg-server/patches/patch-Xi_xisetclientpointer.c | 20 -
x11/modular-xorg-server/patches/patch-Xi_xisetdevfocus.c | 25 -
x11/modular-xorg-server/patches/patch-Xi_xiwarppointer.c | 16 -
x11/modular-xorg-server/patches/patch-configure | 18 +-
x11/modular-xorg-server/patches/patch-configure.ac | 15 -
x11/modular-xorg-server/patches/patch-dbe_dbe.c | 48 -
x11/modular-xorg-server/patches/patch-dix_dispatch.c | 17 -
x11/modular-xorg-server/patches/patch-dix_dixfonts.c | 74 -
x11/modular-xorg-server/patches/patch-dix_region.c | 78 -
x11/modular-xorg-server/patches/patch-exa_exa__render.c | 7 +-
x11/modular-xorg-server/patches/patch-glx_glxcmds.c | 62 -
x11/modular-xorg-server/patches/patch-glx_glxcmdsswap.c | 35 -
x11/modular-xorg-server/patches/patch-glx_glxserver.h | 64 -
x11/modular-xorg-server/patches/patch-glx_indirect__program.c | 16 -
x11/modular-xorg-server/patches/patch-glx_indirect__reqsize.c | 568 -----
x11/modular-xorg-server/patches/patch-glx_indirect__reqsize.h | 210 --
x11/modular-xorg-server/patches/patch-glx_indirect__texture__compression.c | 25 -
x11/modular-xorg-server/patches/patch-glx_indirect__util.c | 16 -
x11/modular-xorg-server/patches/patch-glx_rensize.c | 96 -
x11/modular-xorg-server/patches/patch-glx_single2.c | 115 -
x11/modular-xorg-server/patches/patch-glx_single2swap.c | 105 -
x11/modular-xorg-server/patches/patch-glx_singlepix.c | 170 -
x11/modular-xorg-server/patches/patch-glx_singlepixswap.c | 152 -
x11/modular-xorg-server/patches/patch-glx_swap__interval.c | 16 -
x11/modular-xorg-server/patches/patch-glx_unpack.h | 17 -
x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h | 10 +-
x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86sbusBus.h | 24 +
x11/modular-xorg-server/patches/patch-hw_xfree86_dri2_dri2.c | 12 +-
x11/modular-xorg-server/patches/patch-hw_xfree86_dri2_dri2ext.c | 17 -
x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c | 24 +
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c | 14 +
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_sparc64__video.c | 23 +
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c | 1020 ++++++++++
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c | 24 +
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_xf86__OSlib.h | 15 -
x11/modular-xorg-server/patches/patch-hw_xfree86_os_support_bus_xf86Sbus.h | 15 +
x11/modular-xorg-server/patches/patch-include_dix.h | 21 -
x11/modular-xorg-server/patches/patch-include_regionstr.h | 32 -
x11/modular-xorg-server/patches/patch-include_servermd.h | 27 +
x11/modular-xorg-server/patches/patch-os_access.c | 27 -
x11/modular-xorg-server/patches/patch-os_rpcauth.c | 18 -
x11/modular-xorg-server/patches/patch-randr_randr.c | 21 -
x11/modular-xorg-server/patches/patch-randr_randrstr.h | 16 -
x11/modular-xorg-server/patches/patch-randr_rrsdispatch.c | 39 -
x11/modular-xorg-server/patches/patch-render_picture.h | 16 -
x11/modular-xorg-server/patches/patch-render_render.c | 141 -
x11/modular-xorg-server/patches/patch-test_Makefile.am | 16 -
x11/modular-xorg-server/patches/patch-test_misc.c | 63 -
x11/modular-xorg-server/patches/patch-test_xi1_Makefile.am | 42 -
x11/modular-xorg-server/patches/patch-test_xi1_protocol-xchangedevicecontrol.c | 130 -
x11/modular-xorg-server/patches/patch-test_xi2_protocol-xigetclientpointer.c | 19 -
x11/modular-xorg-server/patches/patch-test_xi2_protocol-xipassivegrabdevice.c | 29 -
x11/modular-xorg-server/patches/patch-test_xi2_protocol-xiquerypointer.c | 18 -
x11/modular-xorg-server/patches/patch-test_xi2_protocol-xiwarppointer.c | 17 -
x11/modular-xorg-server/patches/patch-xfixes_select.c | 15 -
x11/modular-xorg-server/patches/patch-xkb_xkb.c | 140 -
76 files changed, 1269 insertions(+), 3605 deletions(-)
diffs (truncated from 5444 to 300 lines):
diff -r 0a4eaaadbfbc -r 7ea56a549a5a x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile Sat Apr 25 11:42:27 2015 +0000
+++ b/x11/modular-xorg-server/Makefile Sat Apr 25 11:47:03 2015 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2015/04/03 09:44:13 tnn Exp $
+# $NetBSD: Makefile,v 1.93 2015/04/25 11:47:03 tnn Exp $
-DISTNAME= xorg-server-1.12.4
+DISTNAME= xorg-server-1.17.1
PKGNAME= modular-${DISTNAME}
-PKGREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
@@ -10,6 +9,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular X11 server from modular X.org
+LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
@@ -93,6 +93,11 @@
. endif
.endif
+PLIST_VARS+= sparc
+.if !empty(MACHINE_ARCH:Msparc*)
+PLIST.sparc= yes
+.endif
+
# Workaround for PR#41556.
# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
.if ${OPSYS} == "NetBSD"
@@ -101,7 +106,7 @@
INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
-BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0<10
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
@@ -129,22 +134,25 @@
.include "options.mk"
+.if !empty(OPSYS:M*BSD)
+CONFIGURE_ARGS+= --with-sha1=libc
+.else
+.include "../../security/nettle/buildlink3.mk"
+CONFIGURE_ARGS+= --with-sha1=libnettle
+.endif
+
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/fixesproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
@@ -157,10 +165,10 @@
.include "../../x11/libXxf86misc/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/presentproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/recordproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
@@ -171,9 +179,9 @@
.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../x11/xf86bigfontproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
.include "../../x11/xf86miscproto/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
diff -r 0a4eaaadbfbc -r 7ea56a549a5a x11/modular-xorg-server/PLIST
--- a/x11/modular-xorg-server/PLIST Sat Apr 25 11:42:27 2015 +0000
+++ b/x11/modular-xorg-server/PLIST Sat Apr 25 11:47:03 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/05/16 05:38:31 richard Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/04/25 11:47:03 tnn Exp $
bin/X
bin/Xnest
bin/Xorg
@@ -10,7 +10,6 @@
include/xorg/TI.h
include/xorg/XIstubs.h
include/xorg/Xprintf.h
-include/xorg/bt829.h
include/xorg/callback.h
include/xorg/client.h
include/xorg/closestr.h
@@ -33,7 +32,7 @@
include/xorg/dixgrabs.h
include/xorg/dixstruct.h
${PLIST.dri}include/xorg/dri.h
-include/xorg/dri2.h
+${PLIST.dri}include/xorg/dri2.h
${PLIST.dri}include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/events.h
@@ -47,13 +46,13 @@
include/xorg/fboverlay.h
include/xorg/fbpict.h
include/xorg/fbrop.h
-include/xorg/fi1236.h
include/xorg/fourcc.h
include/xorg/gc.h
include/xorg/gcstruct.h
include/xorg/geext.h
include/xorg/geint.h
include/xorg/globals.h
+include/xorg/glx_extinit.h
include/xorg/glyphstr.h
include/xorg/hotplug.h
include/xorg/i2c_def.h
@@ -61,11 +60,8 @@
include/xorg/inputstr.h
include/xorg/list.h
include/xorg/mi.h
-include/xorg/mibstore.h
include/xorg/micmap.h
include/xorg/micoord.h
-include/xorg/mifillarc.h
-include/xorg/mifpoly.h
include/xorg/migc.h
include/xorg/miline.h
include/xorg/mioverlay.h
@@ -74,13 +70,12 @@
include/xorg/mipointrst.h
include/xorg/misc.h
include/xorg/miscstruct.h
-include/xorg/mispans.h
include/xorg/mistruct.h
include/xorg/misync.h
+include/xorg/misyncfd.h
+include/xorg/misyncshm.h
include/xorg/misyncstr.h
-include/xorg/miwideline.h
include/xorg/mizerarc.h
-include/xorg/msp3430.h
include/xorg/opaque.h
include/xorg/optionstr.h
include/xorg/os.h
@@ -90,6 +85,8 @@
include/xorg/picturestr.h
include/xorg/pixmap.h
include/xorg/pixmapstr.h
+include/xorg/present.h
+include/xorg/presentext.h
include/xorg/privates.h
include/xorg/property.h
include/xorg/propertyst.h
@@ -114,10 +111,6 @@
include/xorg/swaprep.h
include/xorg/swapreq.h
include/xorg/syncsdk.h
-include/xorg/tda8425.h
-include/xorg/tda9850.h
-include/xorg/tda9885.h
-include/xorg/uda1380.h
include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
@@ -127,8 +120,6 @@
include/xorg/window.h
include/xorg/windowstr.h
include/xorg/xaarop.h
-include/xorg/xaa.h
-include/xorg/xaalocal.h
include/xorg/xace.h
include/xorg/xacestr.h
include/xorg/xf86.h
@@ -147,7 +138,7 @@
include/xorg/xf86Privstr.h
include/xorg/xf86RamDac.h
include/xorg/xf86RandR12.h
-include/xorg/xf86Rename.h
+${PLIST.sparc}include/xorg/xf86Sbus.h
include/xorg/xf86VGAarbiter.h
include/xorg/xf86Xinput.h
include/xorg/xf86_OSlib.h
@@ -156,6 +147,7 @@
include/xorg/xf86fbman.h
include/xorg/xf86i2c.h
include/xorg/xf86int10.h
+include/xorg/xf86platformBus.h
include/xorg/xf86sbusBus.h
include/xorg/xf86str.h
include/xorg/xf86xv.h
@@ -173,12 +165,8 @@
include/xorg/xvdix.h
include/xorg/xvmcext.h
lib/pkgconfig/xorg-server.pc
-${PLIST.dri}lib/xorg/modules/extensions/libdbe.la
-${PLIST.dri}lib/xorg/modules/extensions/libdri.la
-${PLIST.dri}lib/xorg/modules/extensions/libdri2.la
-${PLIST.dri}lib/xorg/modules/extensions/libextmod.la
+${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
${PLIST.dri}lib/xorg/modules/extensions/libglx.la
-${PLIST.dri}lib/xorg/modules/extensions/librecord.la
lib/xorg/modules/libexa.la
lib/xorg/modules/libfb.la
lib/xorg/modules/libfbdevhw.la
@@ -188,14 +176,6 @@
lib/xorg/modules/libvbe.la
lib/xorg/modules/libvgahw.la
lib/xorg/modules/libwfb.la
-lib/xorg/modules/libxaa.la
-lib/xorg/modules/multimedia/bt829_drv.la
-lib/xorg/modules/multimedia/fi1236_drv.la
-lib/xorg/modules/multimedia/msp3430_drv.la
-lib/xorg/modules/multimedia/tda8425_drv.la
-lib/xorg/modules/multimedia/tda9850_drv.la
-lib/xorg/modules/multimedia/tda9885_drv.la
-lib/xorg/modules/multimedia/uda1380_drv.la
lib/xorg/protocol.txt
man/man1/Xnest.1
man/man1/Xorg.1
@@ -205,9 +185,8 @@
man/man1/gtf.1
man/man4/exa.4
man/man4/fbdevhw.4
+${PLIST.dri}man/man4/modesetting.4
man/man5/xorg.conf.5
man/man5/xorg.conf.d.5
share/aclocal/xorg-server.m4
-${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml
@pkgdir lib/xorg/modules/input
-@pkgdir lib/xorg/modules/drivers
diff -r 0a4eaaadbfbc -r 7ea56a549a5a x11/modular-xorg-server/buildlink3.mk
--- a/x11/modular-xorg-server/buildlink3.mk Sat Apr 25 11:42:27 2015 +0000
+++ b/x11/modular-xorg-server/buildlink3.mk Sat Apr 25 11:47:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2015/04/05 19:46:07 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2015/04/25 11:47:03 tnn Exp $
BUILDLINK_TREE+= modular-xorg-server
@@ -7,8 +7,7 @@
.include "../../mk/bsd.fast.prefs.mk"
-# default to yes until the dust settles
-USE_OLD_MODULAR_XORG_SERVER?= yes
+USE_OLD_MODULAR_XORG_SERVER?= no
.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17
diff -r 0a4eaaadbfbc -r 7ea56a549a5a x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo Sat Apr 25 11:42:27 2015 +0000
+++ b/x11/modular-xorg-server/distinfo Sat Apr 25 11:47:03 2015 +0000
@@ -1,68 +1,17 @@
-$NetBSD: distinfo,v 1.58 2015/03/03 00:55:58 khorben Exp $
+$NetBSD: distinfo,v 1.59 2015/04/25 11:47:03 tnn Exp $
-SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
-RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
-Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
-SHA1 (patch-Xext_xcmisc.c) = 8bf7ff8c928b14f6e98d2f1240ea5736bcf43021
-SHA1 (patch-Xext_xvdisp.c) = 5c85a221d11f9893bc68d223cf75e63c00586a9f
-SHA1 (patch-Xi_chgdctl.c) = 0bba99d4fe90832d9f364aa4d2eef4ba7f18ff24
-SHA1 (patch-Xi_chgfctl.c) = 1fb0fb890fc28e5374a00cc29aeee8ae1401f41c
-SHA1 (patch-Xi_sendexev.c) = 387d7382ad31b85530cdfb068831b29cf2f15755
-SHA1 (patch-Xi_xiallowev.c) = 4d10addbd669bd3b867b6e209e876806c402f3e2
-SHA1 (patch-Xi_xichangecursor.c) = f123415ca0b481bca7f43731992d8ce3ef842aac
-SHA1 (patch-Xi_xichangehierarchy.c) = 35ac279d2f7c4ed57bc583df2067a13c1dbee1bf
-SHA1 (patch-Xi_xigetclientpointer.c) = 7bac39459d98cf13fcd33582a594f67c53936881
-SHA1 (patch-Xi_xigrabdev.c) = 882474440142ffd1874b018d2cb3bceeff3c12ce
-SHA1 (patch-Xi_xipassivegrab.c) = 2a8c97b5e963ae48711db4e9e6c1e7fc6d49d645
-SHA1 (patch-Xi_xiproperty.c) = ba3fd9f9305f95ecf616cea5b221aa2a5de03096
-SHA1 (patch-Xi_xiquerydevice.c) = 33d70ace5b969521e573eb4ce416185b910374db
-SHA1 (patch-Xi_xiquerypointer.c) = e9dc180b4697d7a519d470e4f879a61dd64be2f2
-SHA1 (patch-Xi_xiselectev.c) = a17d893af3855f8676f4747defcb2b6866db0ec6
-SHA1 (patch-Xi_xisetclientpointer.c) = 3e1c4c7087383474f39362f9b53bc449d35b28ee
-SHA1 (patch-Xi_xisetdevfocus.c) = add3a8f096fa90c9966128f8641e447c570a8a11
-SHA1 (patch-Xi_xiwarppointer.c) = 0567dcc1ff2f8de4fa5caf865edd084611ff8c5c
-SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784
-SHA1 (patch-configure.ac) = c7dc061377e3bb25425ad3f418c40a45a0e55440
Home |
Main Index |
Thread Index |
Old Index