Date: Tue, 13 Oct 2015 07:45:09 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399179 - in head: . Mk emulators/virtualbox-ose-additions emulators/virtualbox-ose/files x11-drivers x11-drivers/xf86-input-acecad x11-drivers/xf86-input-egalax x11-drivers/xf86-input-... Message-ID: <201510130745.t9D7j99D028221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Oct 13 07:45:08 2015 New Revision: 399179 URL: https://svnweb.freebsd.org/changeset/ports/399179 Log: Xorg-server update to 1.17.2 with related driver updates and bumps. Update fontproto to 2.1.3. Update libXfont to 1.5.1. Update xf86-input-keyboard 1.8.1. Update xf86-input-vmmouse to 13.1.0. Update xf86-input-void to 1.4.1. Update xf86-video-chips to 1.2.6. Update xf86-video-cirrus to 1.5.3. Update xf86-video-mach64 to 6.9.5. Update xf86-video-neomagic to 1.2.9. Update xf86-video-r128 to 6.10.0. Update xf86-video-s3virge to 1.10.7. Update xf86-video-savage to 2.3.8. Update xf86-video-siliconmotion to 1.7.8. Update xf86-video-sis to 0.10.8. Update xf86-video-trident to 1.3.7. Update xf86-video-vesa to 2.3.4. * All other xf86-* drivers where bump and/or patched to allow them to compile and work with the new xorg-server. * The ATI-ums driver is removed because the API it depends on was removed from the xorg-server. * Add patch to sunffb to make the lack of XAA non-fatal (not build/run tested due to lack of hardware). * Remove the extra patches in xorg-server for arm. The code seems to support it now natively. Please file a bug if this is not the case. * Update the xorg-server support in virtualbox-ose-additions for vboxmouse. [1] Submitted by: jkim@ [1] Obtained from: Graphics devel repo Added: head/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c (contents, props changed) head/x11-drivers/xf86-video-voodoo/files/ head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h (contents, props changed) head/x11-servers/xorg-server/files/patch-configure (contents, props changed) Deleted: head/x11-drivers/xf86-video-ati-ums/ head/x11-drivers/xf86-video-chips/files/ head/x11-drivers/xf86-video-siliconmotion/files/ head/x11-drivers/xf86-video-trident/files/ head/x11-servers/xorg-server/files/extra-arm-patch-hw__xfree86__os-support__bsd__Makefile.in head/x11-servers/xorg-server/files/extra-arm-patch-include__servermd.h head/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4 head/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4 head/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 head/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4 head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5 head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6 head/x11-servers/xorg-server/files/patch-CVE-2014-8094 head/x11-servers/xorg-server/files/patch-CVE-2014-8095 head/x11-servers/xorg-server/files/patch-CVE-2014-8096 head/x11-servers/xorg-server/files/patch-CVE-2014-8097 head/x11-servers/xorg-server/files/patch-CVE-2014-8097-pt2 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-1-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-2-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-3-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-4-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-6-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8098-8-8 head/x11-servers/xorg-server/files/patch-CVE-2014-8099 head/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2 head/x11-servers/xorg-server/files/patch-CVE-2014-8100-2-2 head/x11-servers/xorg-server/files/patch-CVE-2014-8101 head/x11-servers/xorg-server/files/patch-CVE-2014-8102 head/x11-servers/xorg-server/files/patch-CVE-2015-0255 head/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c head/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c Modified: head/MOVED head/Mk/bsd.xorg.mk head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk head/x11-drivers/Makefile head/x11-drivers/xf86-input-acecad/Makefile head/x11-drivers/xf86-input-egalax/Makefile head/x11-drivers/xf86-input-elographics/Makefile head/x11-drivers/xf86-input-evdev/Makefile head/x11-drivers/xf86-input-fpit/Makefile head/x11-drivers/xf86-input-hyperpen/Makefile head/x11-drivers/xf86-input-joystick/Makefile head/x11-drivers/xf86-input-keyboard/Makefile head/x11-drivers/xf86-input-keyboard/distinfo head/x11-drivers/xf86-input-mouse/Makefile head/x11-drivers/xf86-input-mutouch/Makefile head/x11-drivers/xf86-input-penmount/Makefile head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-input-vmmouse/Makefile head/x11-drivers/xf86-input-vmmouse/distinfo head/x11-drivers/xf86-input-vmmouse/pkg-plist head/x11-drivers/xf86-input-void/Makefile head/x11-drivers/xf86-input-void/distinfo head/x11-drivers/xf86-input-wacom/Makefile head/x11-drivers/xf86-video-apm/Makefile head/x11-drivers/xf86-video-ark/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-chips/Makefile head/x11-drivers/xf86-video-chips/distinfo head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-cirrus/distinfo head/x11-drivers/xf86-video-dummy/Makefile head/x11-drivers/xf86-video-fbdev/Makefile head/x11-drivers/xf86-video-glint/Makefile head/x11-drivers/xf86-video-i128/Makefile head/x11-drivers/xf86-video-i740/Makefile head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-mach64/Makefile head/x11-drivers/xf86-video-mach64/distinfo head/x11-drivers/xf86-video-mga/Makefile head/x11-drivers/xf86-video-neomagic/Makefile head/x11-drivers/xf86-video-neomagic/distinfo head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-openchrome/Makefile head/x11-drivers/xf86-video-r128/Makefile head/x11-drivers/xf86-video-r128/distinfo head/x11-drivers/xf86-video-rendition/Makefile head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3virge/Makefile head/x11-drivers/xf86-video-s3virge/distinfo head/x11-drivers/xf86-video-savage/Makefile head/x11-drivers/xf86-video-savage/distinfo head/x11-drivers/xf86-video-scfb/Makefile head/x11-drivers/xf86-video-siliconmotion/Makefile head/x11-drivers/xf86-video-siliconmotion/distinfo head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sis/distinfo head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c head/x11-drivers/xf86-video-sunffb/Makefile head/x11-drivers/xf86-video-tdfx/Makefile head/x11-drivers/xf86-video-trident/Makefile head/x11-drivers/xf86-video-trident/distinfo head/x11-drivers/xf86-video-tseng/Makefile head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vesa/distinfo head/x11-drivers/xf86-video-voodoo/Makefile head/x11-fonts/fontsproto/Makefile head/x11-fonts/fontsproto/distinfo head/x11-fonts/libXfont/Makefile head/x11-fonts/libXfont/distinfo head/x11-servers/xephyr/Makefile head/x11-servers/xorg-dmx/Makefile head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-nestserver/distinfo head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-server/distinfo head/x11-servers/xorg-server/files/extra-arch-i386 head/x11-servers/xorg-server/files/extra-arch-ia64 head/x11-servers/xorg-server/files/extra-arch-powerpc head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in head/x11-servers/xorg-server/files/patch-config_config-backends.h head/x11-servers/xorg-server/files/patch-config_devd.c head/x11-servers/xorg-server/files/patch-xkb_Makefile.in head/x11-servers/xorg-server/pkg-plist head/x11-servers/xorg-vfbserver/Makefile head/x11-servers/xorg-vfbserver/distinfo Modified: head/MOVED ============================================================================== --- head/MOVED Tue Oct 13 07:41:05 2015 (r399178) +++ head/MOVED Tue Oct 13 07:45:08 2015 (r399179) @@ -7892,3 +7892,4 @@ emulators/ppsspp-devel|emulators/ppsspp| ports-mgmt/bpm||2015-10-10|No support for pkg www/moodle27||2015-10-11|Has expired: Please upgrade to moodle28 or moodle29 graphics/epeg|devel/efl|2015-10-11|Has expired: Merged into devel/efl +x11-drivers/xf86-video-ati-ums||2015-10-13|Not supported by xorg-server 1.17 Modified: head/Mk/bsd.xorg.mk ============================================================================== --- head/Mk/bsd.xorg.mk Tue Oct 13 07:41:05 2015 (r399178) +++ head/Mk/bsd.xorg.mk Tue Oct 13 07:45:08 2015 (r399179) @@ -59,8 +59,8 @@ USE_XORG+= xorg-macros . if ${XORG_CAT} == "driver" USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \ - inputproto kbproto fontsproto videoproto dri2proto xf86driproto \ - glproto xineramaproto resourceproto scrnsaverproto + inputproto kbproto fontsproto videoproto dri2proto xf86driproto \ + presentproto glproto xineramaproto resourceproto scrnsaverproto # work around a llvm bug on i386, llvm bug #15806 # reproduced with clang 3.2 (current release) and 3.1 . if ${ARCH} == i386 Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/emulators/virtualbox-ose-additions/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.3.30 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk Tue Oct 13 07:41:05 2015 (r399178) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk Tue Oct 13 07:45:08 2015 (r399179) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2014-11-21 10:16:53.000000000 -0500 -+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2014-12-10 14:10:02.000000000 -0500 -@@ -236,6 +236,50 @@ +--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2015-07-10 16:27:59.000000000 +0200 ++++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2015-10-13 08:40:36.448907000 +0200 +@@ -228,6 +228,61 @@ vboxmouse_drv_112_SOURCES = \ vboxmouse.c @@ -48,15 +48,26 @@ +vboxmouse_drv_116_SOURCES = \ + vboxmouse.c + ++DLLS += vboxmouse_drv_117 ++vboxmouse_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_117_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ++vboxmouse_drv_117_INCS := \ ++ $(vboxmouse_xorg_INCS) \ ++ $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 \ ++ $(PATH_SUB_CURRENT) ++vboxmouse_drv_117_SOURCES = \ ++ vboxmouse.c ++ endif # neq ($(KBUILD_TARGET),linux) -@@ -284,7 +328,7 @@ +@@ -276,7 +331,7 @@ $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test))) ifneq ($(KBUILD_TARGET), linux) - $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test))) -+ $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116, $(eval $(def_vboxmouse_test))) ++ $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117, $(eval $(def_vboxmouse_test))) endif # neq ($(KBUILD_TARGET),linux) Modified: head/x11-drivers/Makefile ============================================================================== --- head/x11-drivers/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -22,7 +22,6 @@ SUBDIR += xf86-video-apm SUBDIR += xf86-video-ark SUBDIR += xf86-video-ati - SUBDIR += xf86-video-ati-ums SUBDIR += xf86-video-chips SUBDIR += xf86-video-cirrus SUBDIR += xf86-video-dummy Modified: head/x11-drivers/xf86-input-acecad/Makefile ============================================================================== --- head/x11-drivers/xf86-input-acecad/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-acecad/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-egalax/Makefile ============================================================================== --- head/x11-drivers/xf86-input-egalax/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-egalax/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -3,6 +3,7 @@ PORTNAME= xf86-input-egalax PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= glebius@FreeBSD.org @@ -18,7 +19,8 @@ LICENSE= BSD2CLAUSE GNU_CONFIGURE= yes USES= autoreconf libtool pkgconfig USE_XORG= xorg-server xproto xi inputproto xf86driproto glproto \ - randrproto renderproto resourceproto scrnsaverproto xorg-macros + randrproto renderproto resourceproto scrnsaverproto \ + xorg-macros presentproto CONFIGURE_ENV= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' INSTALL_TARGET= install-strip Modified: head/x11-drivers/xf86-input-elographics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-elographics/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-elographics/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-elographics PORTVERSION= 1.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-evdev/Makefile ============================================================================== --- head/x11-drivers/xf86-input-evdev/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-evdev/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-fpit/Makefile ============================================================================== --- head/x11-drivers/xf86-input-fpit/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-fpit/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-fpit PORTVERSION= 1.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-hyperpen/Makefile ============================================================================== --- head/x11-drivers/xf86-input-hyperpen/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-hyperpen/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-hyperpen PORTVERSION= 1.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-joystick/Makefile ============================================================================== --- head/x11-drivers/xf86-input-joystick/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-joystick/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-joystick PORTVERSION= 1.6.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-keyboard/Makefile ============================================================================== --- head/x11-drivers/xf86-input-keyboard/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-keyboard/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-keyboard -PORTVERSION= 1.8.0 -PORTREVISION= 7 +PORTVERSION= 1.8.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-keyboard/distinfo ============================================================================== --- head/x11-drivers/xf86-input-keyboard/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-keyboard/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b -SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838 +SHA256 (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211 +SIZE (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 319232 Modified: head/x11-drivers/xf86-input-mouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mouse/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-mouse/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-mutouch/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mutouch/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-mutouch/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-mutouch PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-penmount/Makefile ============================================================================== --- head/x11-drivers/xf86-input-penmount/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-penmount/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-penmount PORTVERSION= 1.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-synaptics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-synaptics/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-synaptics/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-synaptics PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-vmmouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-vmmouse/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-vmmouse/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xf86-input-vmmouse -PORTVERSION= 13.0.0 -PORTREVISION= 5 +PORTVERSION= 13.1.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-vmmouse/distinfo ============================================================================== --- head/x11-drivers/xf86-input-vmmouse/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-vmmouse/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c -SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269 +SHA256 (xorg/driver/xf86-input-vmmouse-13.1.0.tar.bz2) = 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 +SIZE (xorg/driver/xf86-input-vmmouse-13.1.0.tar.bz2) = 319188 Modified: head/x11-drivers/xf86-input-vmmouse/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-vmmouse/pkg-plist Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-vmmouse/pkg-plist Tue Oct 13 07:45:08 2015 (r399179) @@ -1,5 +1,6 @@ bin/vmmouse_detect libexec/hal/scripts/hal-probe-vmmouse +@comment lib/udev/rules.d/69-xorg-vmmouse.rules lib/xorg/modules/input/vmmouse_drv.so man/man1/vmmouse_detect.1.gz man/man4/vmmouse.4x.gz Modified: head/x11-drivers/xf86-input-void/Makefile ============================================================================== --- head/x11-drivers/xf86-input-void/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-void/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-void -PORTVERSION= 1.4.0 -PORTREVISION= 3 +PORTVERSION= 1.4.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-input-void/distinfo ============================================================================== --- head/x11-drivers/xf86-input-void/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-void/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505 -SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454 +SHA256 (xorg/driver/xf86-input-void-1.4.1.tar.bz2) = f96e4f0a622821bf43a74bd419f2a18423343996c9d243c7e1430ba2d142339c +SIZE (xorg/driver/xf86-input-void-1.4.1.tar.bz2) = 271597 Modified: head/x11-drivers/xf86-input-wacom/Makefile ============================================================================== --- head/x11-drivers/xf86-input-wacom/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-input-wacom/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.31.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MASTER_SITES= SF/linuxwacom/${PORTNAME} Modified: head/x11-drivers/xf86-video-apm/Makefile ============================================================================== --- head/x11-drivers/xf86-video-apm/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-apm/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-ark/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ark/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-ark/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-ati/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-ati/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 7.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-chips/Makefile ============================================================================== --- head/x11-drivers/xf86-video-chips/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-chips/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-chips -PORTVERSION= 1.2.5 -PORTREVISION= 5 +PORTVERSION= 1.2.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-chips/distinfo ============================================================================== --- head/x11-drivers/xf86-video-chips/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-chips/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2 -SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804 +SHA256 (xorg/driver/xf86-video-chips-1.2.6.tar.bz2) = 99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c +SIZE (xorg/driver/xf86-video-chips-1.2.6.tar.bz2) = 413528 Modified: head/x11-drivers/xf86-video-cirrus/Makefile ============================================================================== --- head/x11-drivers/xf86-video-cirrus/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-cirrus/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-cirrus -PORTVERSION= 1.5.2 -PORTREVISION= 5 +PORTVERSION= 1.5.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-cirrus/distinfo ============================================================================== --- head/x11-drivers/xf86-video-cirrus/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-cirrus/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7 -SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab +SIZE (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = 338930 Modified: head/x11-drivers/xf86-video-dummy/Makefile ============================================================================== --- head/x11-drivers/xf86-video-dummy/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-dummy/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-dummy PORTVERSION= 0.3.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-fbdev/Makefile ============================================================================== --- head/x11-drivers/xf86-video-fbdev/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-fbdev/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-fbdev PORTVERSION= 0.4.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-glint/Makefile ============================================================================== --- head/x11-drivers/xf86-video-glint/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-glint/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-glint PORTVERSION= 1.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-i128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i128/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-i128/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-i740/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i740/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-i740/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-intel/Makefile ============================================================================== --- head/x11-drivers/xf86-video-intel/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-intel/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -3,7 +3,7 @@ PORTNAME= xf86-video-intel PORTVERSION= 2.21.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-mach64/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mach64/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-mach64/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-mach64 -PORTVERSION= 6.9.4 -PORTREVISION= 5 +PORTVERSION= 6.9.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-mach64/distinfo ============================================================================== --- head/x11-drivers/xf86-video-mach64/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-mach64/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-mach64-6.9.4.tar.bz2) = 97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e -SIZE (xorg/driver/xf86-video-mach64-6.9.4.tar.bz2) = 517239 +SHA256 (xorg/driver/xf86-video-mach64-6.9.5.tar.bz2) = 3e98985b6e044189efd42342862208f472881c25debf22230a1d54a96d71b41f +SIZE (xorg/driver/xf86-video-mach64-6.9.5.tar.bz2) = 520883 Modified: head/x11-drivers/xf86-video-mga/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mga/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-mga/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.6.4 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= x11-drivers Modified: head/x11-drivers/xf86-video-neomagic/Makefile ============================================================================== --- head/x11-drivers/xf86-video-neomagic/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-neomagic/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-neomagic -PORTVERSION= 1.2.8 -PORTREVISION= 6 +PORTVERSION= 1.2.9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-neomagic/distinfo ============================================================================== --- head/x11-drivers/xf86-video-neomagic/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-neomagic/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-neomagic-1.2.8.tar.bz2) = 50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874 -SIZE (xorg/driver/xf86-video-neomagic-1.2.8.tar.bz2) = 334223 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.9.tar.bz2) = 72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2 +SIZE (xorg/driver/xf86-video-neomagic-1.2.9.tar.bz2) = 340789 Modified: head/x11-drivers/xf86-video-nv/Makefile ============================================================================== --- head/x11-drivers/xf86-video-nv/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-nv/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.20 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-openchrome/Makefile ============================================================================== --- head/x11-drivers/xf86-video-openchrome/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-openchrome/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-openchrome PORTVERSION= 0.3.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-r128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-r128/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-r128/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-r128 -PORTVERSION= 6.9.2 -PORTREVISION= 5 +PORTVERSION= 6.10.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-r128/distinfo ============================================================================== --- head/x11-drivers/xf86-video-r128/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-r128/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-r128-6.9.2.tar.bz2) = 8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0 -SIZE (xorg/driver/xf86-video-r128-6.9.2.tar.bz2) = 462266 +SHA256 (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 80d531a07168230a408b88809a5440cfd48f9098666d12702d0012148a0d353d +SIZE (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 494884 Modified: head/x11-drivers/xf86-video-rendition/Makefile ============================================================================== --- head/x11-drivers/xf86-video-rendition/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-rendition/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c ============================================================================== --- head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c Tue Oct 13 07:45:08 2015 (r399179) @@ -1,5 +1,5 @@ ---- src/rendition.c.orig 2012-07-17 05:32:12 UTC -+++ src/rendition.c +--- src/rendition.c.orig 2015-10-11 22:31:51.242126000 +0200 ++++ src/rendition.c 2015-10-11 22:32:20.465605000 +0200 @@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC fbPictureInit (pScreen, 0, 0); @@ -8,3 +8,44 @@ /*********************************************************/ /* The actual setup of the driver-specific code */ +@@ -1372,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo) + /* Override on users request */ + WriteCombine + = xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine); ++#ifdef XSERVER_LIBPCIACCESS ++ mapOption = PCI_DEV_MAP_FLAG_WRITABLE; ++ if (WriteCombine) ++ mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE; ++ ++ err = pci_device_map_range(pRendition->PciInfo, ++ pRendition->PciInfo->regions[0].base_addr, ++ pRendition->PciInfo->regions[0].size, ++ mapOption, (void *)&pRendition->board.vmem_base); ++ ++ return (err == 0); ++#else + if (WriteCombine) { + xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG, + ("Requesting Write-Combined memory access\n")); +@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo) + mapOption = VIDMEM_MMIO; + } + +-#ifdef XSERVER_LIBPCIACCESS +- err = pci_device_map_region(pRendition->PciInfo, 0, TRUE); +- pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory; +- +- return (err == 0); +-#else + pRendition->board.vmem_base= + xf86MapPciMem(pScreenInfo->scrnIndex, mapOption, + pRendition->pcitag, +@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf + #else + pci_device_unmap_range(pRendition->PciInfo, + pRendition->board.vmem_base, +- pScreenInfo->videoRam * 1024); ++ pRendition->PciInfo->regions[0].size); + #endif + return TRUE; + #ifdef DEBUG0 Modified: head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h ============================================================================== --- head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h Tue Oct 13 07:45:08 2015 (r399179) @@ -1,6 +1,16 @@ ---- src/rendition.h.orig 2012-07-16 02:42:28 UTC -+++ src/rendition.h -@@ -28,9 +28,6 @@ +--- src/rendition.h.orig 2015-10-11 22:31:54.085176000 +0200 ++++ src/rendition.h 2015-10-11 22:32:12.657760000 +0200 +@@ -14,9 +14,6 @@ + /* Everything using inb/outb, etc needs "compiler.h" */ + #include "compiler.h" + +-/* Drivers for PCI hardware need this */ +-#include "xf86PciInfo.h" +- + /* Drivers that need to access the PCI config space directly need this */ + #include "xf86Pci.h" + +@@ -28,9 +25,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" @@ -10,3 +20,12 @@ /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" +@@ -69,4 +63,8 @@ + + #include "compat-api.h" + /* end of __RENDITION_H__ */ ++ ++#define PCI_CHIP_V1000 0x0001 ++#define PCI_CHIP_V2x00 0x2000 ++ + #endif Modified: head/x11-drivers/xf86-video-s3/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-s3/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-s3virge/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3virge/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-s3virge/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-s3virge -PORTVERSION= 1.10.6 -PORTREVISION= 5 +PORTVERSION= 1.10.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-s3virge/distinfo ============================================================================== --- head/x11-drivers/xf86-video-s3virge/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-s3virge/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e -SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da +SIZE (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 374129 Modified: head/x11-drivers/xf86-video-savage/Makefile ============================================================================== --- head/x11-drivers/xf86-video-savage/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-savage/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-savage -PORTVERSION= 2.3.7 -PORTREVISION= 5 +PORTVERSION= 2.3.8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-savage/distinfo ============================================================================== --- head/x11-drivers/xf86-video-savage/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-savage/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44 -SIZE (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 395249 +SHA256 (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63 +SIZE (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = 418649 Modified: head/x11-drivers/xf86-video-scfb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-scfb/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-scfb/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -3,7 +3,7 @@ PORTNAME= xf86-video-scfb PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= ray@FreeBSD.org @@ -19,7 +19,7 @@ DIST_SUBDIR= xorg/driver USE_XORG= xorg-server xproto randrproto xi renderproto xextproto \ inputproto kbproto fontsproto videoproto dri2proto \ xf86driproto glproto xineramaproto resourceproto \ - scrnsaverproto + scrnsaverproto presentproto CONFIGURE_ENV= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' INSTALL_TARGET= install-strip Modified: head/x11-drivers/xf86-video-siliconmotion/Makefile ============================================================================== --- head/x11-drivers/xf86-video-siliconmotion/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-siliconmotion/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.7.7 -PORTREVISION= 5 +PORTVERSION= 1.7.8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-siliconmotion/distinfo ============================================================================== --- head/x11-drivers/xf86-video-siliconmotion/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-siliconmotion/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.8.tar.bz2) = e9d449a9fd9e58b4e018447b6c64005f7874cffb1777e513ac9fc41a86071beb +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.8.tar.bz2) = 398928 Modified: head/x11-drivers/xf86-video-sis/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sis/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-sis/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-sis -PORTVERSION= 0.10.7 -PORTREVISION= 5 +PORTVERSION= 0.10.8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-sis/distinfo ============================================================================== --- head/x11-drivers/xf86-video-sis/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-sis/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0 -SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499 +SHA256 (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe +SIZE (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = 734785 Modified: head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c ============================================================================== --- head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c Tue Oct 13 07:45:08 2015 (r399179) @@ -1,27 +1,6 @@ ---- src/sis_driver.c.orig 2012-07-17 05:20:28 UTC -+++ src/sis_driver.c -@@ -57,7 +57,6 @@ - #include "fb.h" - #include "micmap.h" - #include "mipointer.h" --#include "mibstore.h" - #include "edid.h" - - #define SIS_NEED_inSISREG -@@ -8859,7 +8858,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) - } - pSiS->SiSFastVidCopyDone = TRUE; - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -@@ -9351,11 +9349,12 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, - } - } - if(doit) { -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */ - sigstate = xf86BlockSIGIO(); +--- src/sis_driver.c.orig 2015-09-23 09:54:07.196489000 +0200 ++++ src/sis_driver.c 2015-09-23 09:56:45.740035000 +0200 +@@ -9390,7 +9390,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 { double dx = x, dy = y; @@ -30,11 +9,3 @@ x = (int)dx; y = (int)dy; } -@@ -9368,6 +9367,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, - miPointerAbsoluteCursor(x, y, currentTime.milliseconds); - #endif - xf86UnblockSIGIO(sigstate); -+#endif - return; - } - } Modified: head/x11-drivers/xf86-video-sunffb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sunffb/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-sunffb/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Added: head/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c Tue Oct 13 07:45:08 2015 (r399179) @@ -0,0 +1,33 @@ +From 181b60190c1f81fc9b9b5deb07d536b78f2536ab Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Mon, 10 Jun 2013 21:51:08 +0200 +Subject: Unbreak when XAA is not present. + +Turn accel off if loading XAA fails. + +Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> + +diff --git a/src/ffb_driver.c b/src/ffb_driver.c +index af13484..7f17d64 100644 +--- src/ffb_driver.c ++++ src/ffb_driver.c +@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags) + return FALSE; + } + +- if (xf86LoadSubModule(pScrn, "xaa") == NULL) { +- FFBFreeRec(pScrn); +- return FALSE; ++ if (!pFfb->NoAccel) { ++ if (xf86LoadSubModule(pScrn, "xaa") == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, ++ "Loading XAA failed, acceleration disabled\n"); ++ pFfb->NoAccel = TRUE; ++ } + } + + if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) { +-- +cgit v0.10.2 + Modified: head/x11-drivers/xf86-video-tdfx/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tdfx/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-tdfx/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-trident/Makefile ============================================================================== --- head/x11-drivers/xf86-video-trident/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-trident/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-trident -PORTVERSION= 1.3.6 -PORTREVISION= 6 +PORTVERSION= 1.3.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-trident/distinfo ============================================================================== --- head/x11-drivers/xf86-video-trident/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-trident/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104 -SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092 +SHA256 (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae +SIZE (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = 376898 Modified: head/x11-drivers/xf86-video-tseng/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tseng/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-tseng/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-vesa/Makefile ============================================================================== --- head/x11-drivers/xf86-video-vesa/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-vesa/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-vesa -PORTVERSION= 2.3.3 -PORTREVISION= 5 +PORTVERSION= 2.3.4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-vesa/distinfo ============================================================================== --- head/x11-drivers/xf86-video-vesa/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-vesa/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8 -SIZE (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = 300571 +SHA256 (xorg/driver/xf86-video-vesa-2.3.4.tar.bz2) = 7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1 +SIZE (xorg/driver/xf86-video-vesa-2.3.4.tar.bz2) = 285675 Modified: head/x11-drivers/xf86-video-voodoo/Makefile ============================================================================== --- head/x11-drivers/xf86-video-voodoo/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-drivers/xf86-video-voodoo/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Added: head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h Tue Oct 13 07:45:08 2015 (r399179) @@ -0,0 +1,23 @@ +From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 22 Sep 2014 10:56:02 +1000 +Subject: don't use PCITAG in struct anymore + + +diff --git a/src/voodoo.h b/src/voodoo.h +index bfed497..c3eb64e 100644 +--- src/voodoo.h ++++ src/voodoo.h +@@ -23,7 +23,9 @@ typedef struct { + + Bool Voodoo2; /* Set if Voodoo2 */ + pciVideoPtr PciInfo; /* PCI data */ ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + CARD32 PhysBase; + + CARD32 Width; /* Current width */ +-- +cgit v0.10.2 + Modified: head/x11-fonts/fontsproto/Makefile ============================================================================== --- head/x11-fonts/fontsproto/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-fonts/fontsproto/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fontsproto -PORTVERSION= 2.1.2 +PORTVERSION= 2.1.3 PORTEPOCH= 1 CATEGORIES= x11-fonts Modified: head/x11-fonts/fontsproto/distinfo ============================================================================== --- head/x11-fonts/fontsproto/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-fonts/fontsproto/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9 -SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990 +SHA256 (xorg/proto/fontsproto-2.1.3.tar.bz2) = 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8 +SIZE (xorg/proto/fontsproto-2.1.3.tar.bz2) = 154087 Modified: head/x11-fonts/libXfont/Makefile ============================================================================== --- head/x11-fonts/libXfont/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-fonts/libXfont/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libXfont -PORTVERSION= 1.4.9 +PORTVERSION= 1.5.1 PORTEPOCH= 2 CATEGORIES= x11-fonts Modified: head/x11-fonts/libXfont/distinfo ============================================================================== --- head/x11-fonts/libXfont/distinfo Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-fonts/libXfont/distinfo Tue Oct 13 07:45:08 2015 (r399179) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXfont-1.4.9.tar.bz2) = 6c6b061a3aa44f0ac95785f9579f6427080c60ae6948b49bcc8d44f63942ad89 -SIZE (xorg/lib/libXfont-1.4.9.tar.bz2) = 495464 +SHA256 (xorg/lib/libXfont-1.5.1.tar.bz2) = b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098 +SIZE (xorg/lib/libXfont-1.5.1.tar.bz2) = 502903 Modified: head/x11-servers/xephyr/Makefile ============================================================================== --- head/x11-servers/xephyr/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-servers/xephyr/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -12,7 +12,7 @@ USE_XORG= x11 xf86driproto glproto randr resourceproto fontsproto videoproto \ compositeproto trapproto recordproto \ xineramaproto xinerama evieproto xkbfile xfont \ - xau xdmcp xext fontenc xv pixman + xau xdmcp xext fontenc xv pixman presentproto CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ --without-xmlto --disable-docs --disable-devel-docs \ Modified: head/x11-servers/xorg-dmx/Makefile ============================================================================== --- head/x11-servers/xorg-dmx/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-servers/xorg-dmx/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -14,7 +14,7 @@ USE_XORG= x11 xf86driproto glproto randr compositeproto trapproto recordproto resourceproto \ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \ xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ - xau dmx xtst xres pixman xtrans + xau dmx xtst xres pixman xtrans presentproto CONFIGURE_ARGS= --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ Modified: head/x11-servers/xorg-nestserver/Makefile ============================================================================== --- head/x11-servers/xorg-nestserver/Makefile Tue Oct 13 07:41:05 2015 (r399178) +++ head/x11-servers/xorg-nestserver/Makefile Tue Oct 13 07:45:08 2015 (r399179) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xorg-nestserver -PORTVERSION= 1.14.7 -PORTREVISION= 2 +PORTVERSION= 1.17.2 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -13,6 +12,8 @@ DIST_SUBDIR= xorg/xserver MAINTAINER= x11@FreeBSD.org COMMENT= Nesting X server from X.Org +LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms + USES= tar:bzip2 pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dmx \ @@ -31,7 +32,6 @@ CONFIGURE_ARGS= --disable-dmx \ --localstatedir=/var \ --without-dtrace \ --without-doxygen \ - --disable-libpciaccess \ --disable-glx \ --disable-dri \ --disable-config-hal \ @@ -48,7 +48,7 @@ USE_XORG= x11 xf86driproto glproto randr dri2proto resourceproto fontsproto xf86dgaproto videoproto \ compositeproto trapproto recordproto resourceproto \ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \ - xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans + xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans presentproto *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510130745.t9D7j99D028221>