diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2014-12-20 07:03:54 +0800 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2014-12-20 07:03:54 +0800 |
| commit | a3afe6e889e504242b3654ec235424592614a684 (patch) | |
| tree | e484d37e2856dd43389bc284d3dd6136848e4c6c /x11-drivers | |
| parent | c60e2d34250c4755873d3fa27565fe6e3b194082 (diff) | |
| download | freebsd-ports-gnome-a3afe6e889e504242b3654ec235424592614a684.tar.gz freebsd-ports-gnome-a3afe6e889e504242b3654ec235424592614a684.tar.zst freebsd-ports-gnome-a3afe6e889e504242b3654ec235424592614a684.zip | |
x11-servers/xorg-server: Update to 1.14
The X.Org server has been updated to 1.14. The changes it brings are described
in a post on the Graphics team blog:
http://blogs.freebsdish.org/graphics/2014/11/19/xserver-1-14-update-ready/
The most noticable change is the DEVD input device autodetection backend
which is enabled by default, replacing the HAL backend. The keyboard
layout configuration must be migrated from HAL's .fdi files to X.Org
files. The procedure is explained in the post mentionned above.
Several ports were removed with this update, mainly because they are not
compatible with the X.Org server anymore:
o nvidia-driver-71
o nvidia-driver-96
o xf86-input-egalax
o xf86-video-newport
o xf86-video-tga
PR: 155696, 181660, 183478 (partially fixed), 188640, 191331
Differential Revision: https://reviews.freebsd.org/D1337
Submitted by: ak (most of the work on the DEVD backend), dumbbell, kwm,
zeising
Tested by: Many people on freebsd-x11@ and IRC
Reviewed by: kwm, portmgr (antoine)
Approved by: kwm, portmgr (antoine)
Diffstat (limited to 'x11-drivers')
136 files changed, 755 insertions, 497 deletions
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 3ca41013f430..b4da56f9f34a 100644 --- a/x11-drivers/Makefile +++ b/x11-drivers/Makefile @@ -4,7 +4,6 @@ COMMENT = X11 drivers SUBDIR += xf86-input-acecad - SUBDIR += xf86-input-egalax SUBDIR += xf86-input-elographics SUBDIR += xf86-input-fpit SUBDIR += xf86-input-hyperpen @@ -32,7 +31,6 @@ SUBDIR += xf86-video-mach64 SUBDIR += xf86-video-mga SUBDIR += xf86-video-neomagic - SUBDIR += xf86-video-newport SUBDIR += xf86-video-nv SUBDIR += xf86-video-openchrome SUBDIR += xf86-video-r128 @@ -45,7 +43,6 @@ SUBDIR += xf86-video-sis SUBDIR += xf86-video-sunffb SUBDIR += xf86-video-tdfx - SUBDIR += xf86-video-tga SUBDIR += xf86-video-trident SUBDIR += xf86-video-tseng SUBDIR += xf86-video-vesa diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index d9c30ee9ae68..07901d6d9c54 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist index 1374270cd522..1ea1bfdc363b 100644 --- a/x11-drivers/xf86-input-acecad/pkg-plist +++ b/x11-drivers/xf86-input-acecad/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/acecad_drv.so man/man4/acecad.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile deleted file mode 100644 index c64aaae910c5..000000000000 --- a/x11-drivers/xf86-input-egalax/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Gleb Smirnoff <glebius@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86-input-egalax -PORTVERSION= 0.2 -PORTREVISION= 2 -CATEGORIES= x11-drivers -MASTER_SITES= LOCAL/glebius - -MAINTAINER= glebius@FreeBSD.org -COMMENT= eGalax touch screen input driver for X.Org - -LICENSE= BSD2CLAUSE - -XORG_CAT= driver -INSTALL_CMD= install-strip - -.include <bsd.port.pre.mk> - -.if defined(WITH_NEW_XORG) -IGNORE= does not build with X server 1.12 -.endif - -.include <bsd.port.post.mk> diff --git a/x11-drivers/xf86-input-egalax/distinfo b/x11-drivers/xf86-input-egalax/distinfo deleted file mode 100644 index 44b527ec5677..000000000000 --- a/x11-drivers/xf86-input-egalax/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 4396e74bd6db1f8ce4f6a95deacfd1209f01e78362a7379af970ec0e6023f895 -SIZE (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 189887 diff --git a/x11-drivers/xf86-input-egalax/pkg-descr b/x11-drivers/xf86-input-egalax/pkg-descr deleted file mode 100644 index 731bf6e2e577..000000000000 --- a/x11-drivers/xf86-input-egalax/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-input-egalax driver. See also uep(4). diff --git a/x11-drivers/xf86-input-egalax/pkg-plist b/x11-drivers/xf86-input-egalax/pkg-plist deleted file mode 100644 index 63a9d8d933ed..000000000000 --- a/x11-drivers/xf86-input-egalax/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -lib/xorg/modules/input/egalax_drv.so -man/man4/egalax.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index 2da350f435f6..ae0699dcd33a 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-elographics -PORTVERSION= ${ELO_VERSION} -PORTREVISION= ${ELO_REVISION} +PORTVERSION= 1.4.1 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,14 +10,4 @@ COMMENT= X.Org elographics input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -ELO_VERSION= 1.4.1 -ELO_REVISION= 2 -.else -ELO_VERSION= 1.2.4 -ELO_REVISION= 2 -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo index ab726546abdf..f726f4466410 100644 --- a/x11-drivers/xf86-input-elographics/distinfo +++ b/x11-drivers/xf86-input-elographics/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b -SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101 SHA256 (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4 SIZE (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = 280311 diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist index 743dc1bb411d..3863f8a835cd 100644 --- a/x11-drivers/xf86-input-elographics/pkg-plist +++ b/x11-drivers/xf86-input-elographics/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/elographics_drv.so man/man4/elographics.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index 97f4313d0e32..09a989e52d85 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-fpit PORTVERSION= 1.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,10 +11,4 @@ COMMENT= X.Org fpit input driver XORG_CAT= driver USE_XORG= xrandr -.include <bsd.port.options.mk> - -.if !defined(WITH_NEW_XORG) -IGNORE= does not build with X server 1.7.7 -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist index 2d84806b8210..977039d80a36 100644 --- a/x11-drivers/xf86-input-fpit/pkg-plist +++ b/x11-drivers/xf86-input-fpit/pkg-plist @@ -1,7 +1,3 @@ lib/xorg/modules/input/fpit_drv.so share/X11/xorg.conf.d/50-fpit.conf man/man4/fpit.4x.gz -@dirrmtry share/X11/xorg.conf.d -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 3e329eca89db..0c268764050c 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-hyperpen -PORTVERSION= ${HYPERVER} -PORTREVISION= ${HYPERREVISION} +PORTVERSION= 1.4.1 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,15 +10,4 @@ COMMENT= X.Org hyperpen input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -HYPERVER= 1.4.1 -HYPERREVISION= 2 -.else -HYPERVER= 1.3.0 -HYPERREVISION= 8 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo index 7ccfb9b6d336..37edd2b8b967 100644 --- a/x11-drivers/xf86-input-hyperpen/distinfo +++ b/x11-drivers/xf86-input-hyperpen/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b -SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593 SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816 SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891 diff --git a/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c deleted file mode 100644 index 70713074b041..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c +++ /dev/null @@ -1,75 +0,0 @@ ---- src/xf86HyperPen.c.orig 2009-02-26 16:31:24.000000000 -0600 -+++ src/xf86HyperPen.c 2010-05-03 12:29:11.000000000 -0500 -@@ -719,6 +719,9 @@ - { - LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate; - HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ Atom axis_labels[3] = { 0 }; -+#endif - - if (xf86HypOpen(local) != Success) { - if (local->fd >= 0) { -@@ -730,6 +733,9 @@ - /* Set the real values */ - InitValuatorAxisStruct(pHyp, - 0, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[0], -+#endif - 0, /* min val */ - priv->hypXSize, /* max val */ - LPI2CPM(priv->hypRes), /* resolution */ -@@ -737,6 +743,9 @@ - LPI2CPM(priv->hypRes)); /* max_res */ - InitValuatorAxisStruct(pHyp, - 1, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[1], -+#endif - 0, /* min val */ - priv->hypYSize, /* max val */ - LPI2CPM(priv->hypRes), /* resolution */ -@@ -744,6 +753,9 @@ - LPI2CPM(priv->hypRes)); /* max_res */ - InitValuatorAxisStruct(pHyp, - 2, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[2], -+#endif - 0, /* min val */ - 511, /* max val */ - 512, /* resolution */ -@@ -765,8 +777,10 @@ - int loop; - LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate; - HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); -- -- -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ Atom btn_labels[4] = { 0 }; -+ Atom axis_labels[3] = { 0 }; -+#endif - - switch (what) { - case DEVICE_INIT: -@@ -779,6 +793,9 @@ - - if (InitButtonClassDeviceStruct(pHyp, - nbbuttons, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ btn_labels, -+#endif - map) == FALSE) { - ErrorF("unable to allocate Button class device\n"); - return !Success; -@@ -802,6 +819,9 @@ - - if (InitValuatorClassDeviceStruct(pHyp, - nbaxes, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels, -+#endif - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - xf86GetMotionEvents, - #endif diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist index ac8638a0057b..7633c5494cbc 100644 --- a/x11-drivers/xf86-input-hyperpen/pkg-plist +++ b/x11-drivers/xf86-input-hyperpen/pkg-plist @@ -1,4 +1 @@ lib/xorg/modules/input/hyperpen_drv.so -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index d68cde4a70d0..0514a0ca596d 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-joystick -PORTVERSION= ${JOYVER} -PORTREVISION= ${JOYREVISION} +PORTVERSION= 1.6.2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,16 +10,6 @@ COMMENT= X.Org joystick input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -JOYVER= 1.6.2 -JOYREVISION= 2 -.else -JOYVER= 1.5.0 -JOYREVISION= 3 -.endif - post-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index 821ce73a6c85..e1266a38c531 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9 -SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763 SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539 diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist index f51b6910cd91..b4d8547c8bbc 100644 --- a/x11-drivers/xf86-input-joystick/pkg-plist +++ b/x11-drivers/xf86-input-joystick/pkg-plist @@ -2,6 +2,3 @@ include/xorg/joystick-properties.h lib/xorg/modules/input/joystick_drv.so libdata/pkgconfig/xorg-joystick.pc man/man4/joystick.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 61d59446e48e..23bdd4b874f9 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.8.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist index 26a84c9a47a2..66a716efdf7c 100644 --- a/x11-drivers/xf86-input-keyboard/pkg-plist +++ b/x11-drivers/xf86-input-keyboard/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/kbd_drv.so man/man4/kbd.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 324b18b61ad2..c70cd0e3c4d9 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist index 1df1af7ff66d..0d937b1a5c7f 100644 --- a/x11-drivers/xf86-input-mouse/pkg-plist +++ b/x11-drivers/xf86-input-mouse/pkg-plist @@ -2,7 +2,3 @@ include/xorg/xf86-mouse-properties.h lib/xorg/modules/input/mouse_drv.so libdata/pkgconfig/xorg-mouse.pc man/man4/mousedrv.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg -@dirrmtry include/xorg diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index 7eb63caf1fec..0a54bf44f296 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-mutouch PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,10 +10,4 @@ COMMENT= X.Org mutouch input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if !defined(WITH_NEW_XORG) -IGNORE= does not build with xorg-server 1.7.7 -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist index d4311049f17d..b578946222cb 100644 --- a/x11-drivers/xf86-input-mutouch/pkg-plist +++ b/x11-drivers/xf86-input-mutouch/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/mutouch_drv.so man/man4/mutouch.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index c29c1d501019..e0d77ee5fb00 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-penmount -PORTVERSION= ${PEN_VERSION} -PORTREVISION= ${PEN_REVISION} +PORTVERSION= 1.5.0 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,14 +10,4 @@ COMMENT= X.Org penmount input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -PEN_VERSION= 1.5.0 -PEN_REVISION= 2 -.else -PEN_VERSION= 1.4.1 -PEN_REVISION= 3 -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo index 0b6998d6f44c..d8eaa47bf8ff 100644 --- a/x11-drivers/xf86-input-penmount/distinfo +++ b/x11-drivers/xf86-input-penmount/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182 -SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951 SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7 SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864 diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist index 154995f9ca20..d68df5d7b97c 100644 --- a/x11-drivers/xf86-input-penmount/pkg-plist +++ b/x11-drivers/xf86-input-penmount/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/penmount_drv.so man/man4/penmount.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index cd070ccbee43..064b462ba894 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-synaptics -PORTVERSION= ${SYNAPTICS_VERSION} -PORTREVISION= ${SYNAPTICS_REVISION} +PORTVERSION= 1.7.4 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,17 +14,4 @@ USES= pathfix USE_XORG= x11 xtst XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -SYNAPTICS_VERSION= 1.7.4 -SYNAPTICS_REVISION= 2 -PLIST_SUB+= NEW="" OLD="@comment " -.else -SYNAPTICS_VERSION= 1.6.4 -SYNAPTICS_REVISION= 2 -PLIST_SUB+= NEW="@comment " OLD="" -EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo index a7440fb036c0..47b09f20ac7f 100644 --- a/x11-drivers/xf86-input-synaptics/distinfo +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee -SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004 SHA256 (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7 SIZE (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 451614 diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in deleted file mode 100644 index 957f9fcdbc51..000000000000 --- a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2013-04-04 14:47:16.881259598 +0200 -+++ Makefile.in 2013-04-04 14:47:20.568244417 +0200 -@@ -321,7 +321,7 @@ - --with-sdkdir='$${includedir}/xorg' \ - --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' - --SUBDIRS = include src man tools conf test -+SUBDIRS = include src man tools test - MAINTAINERCLEANFILES = ChangeLog INSTALL - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = xorg-synaptics.pc diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist index 10ce5a3a27a0..bcb4e1ca5a39 100644 --- a/x11-drivers/xf86-input-synaptics/pkg-plist +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -1,15 +1,9 @@ bin/synclient bin/syndaemon include/xorg/synaptics-properties.h -%%OLD%%include/xorg/synaptics.h lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc man/man1/synclient.1.gz man/man1/syndaemon.1.gz man/man4/synaptics.4x.gz -%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -%%NEW%%@dirrmtry share/X11/xorg.conf.d -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg -@dirrmtry include/xorg +share/X11/xorg.conf.d/50-synaptics.conf diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 4d1752f9098d..63ac52501f31 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -18,12 +18,4 @@ CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures. -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -PLIST_SUB+= NEW="" -.else -PLIST_SUB+= NEW="@comment " -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist index b9caa4664669..142e1cfefc50 100644 --- a/x11-drivers/xf86-input-vmmouse/pkg-plist +++ b/x11-drivers/xf86-input-vmmouse/pkg-plist @@ -3,9 +3,5 @@ libexec/hal/scripts/hal-probe-vmmouse lib/xorg/modules/input/vmmouse_drv.so man/man1/vmmouse_detect.1.gz man/man4/vmmouse.4x.gz -%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf +share/X11/xorg.conf.d/50-vmmouse.conf share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi -%%NEW%%@dirrmtry share/X11/xorg.conf.d -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index 233f11427bab..6f6aa9c35cce 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xf86-input-void -PORTVERSION= ${VOID_VERSION} -PORTREVISION= ${VOID_REVISION} +PORTVERSION= 1.4.0 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,14 +10,4 @@ COMMENT= X.Org void input driver XORG_CAT= driver -.include <bsd.port.options.mk> - -.if defined(WITH_NEW_XORG) -VOID_VERSION= 1.4.0 -VOID_REVISION= 2 -.else -VOID_VERSION= 1.3.1 -VOID_REVISION= 2 -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo index a8c34dee5061..5787ac7fde64 100644 --- a/x11-drivers/xf86-input-void/distinfo +++ b/x11-drivers/xf86-input-void/distinfo @@ -1,4 +1,2 @@ -SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674 -SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189 SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505 SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454 diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist index 5ce860fd080d..586d25af13dd 100644 --- a/x11-drivers/xf86-input-void/pkg-plist +++ b/x11-drivers/xf86-input-void/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/input/void_drv.so man/man4/void.4x.gz -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index 340742aaa465..213fd4d8c049 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.27.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MASTER_SITES= SF/linuxwacom/${PORTNAME} diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index c3c73b2ef9cb..628dd5eff346 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-apm/files/patch-src_apm.h b/x11-drivers/xf86-video-apm/files/patch-src_apm.h new file mode 100644 index 000000000000..be96b0cf752c --- /dev/null +++ b/x11-drivers/xf86-video-apm/files/patch-src_apm.h @@ -0,0 +1,12 @@ +--- src/apm.h.orig 2012-07-17 04:52:01 UTC ++++ src/apm.h +@@ -33,9 +33,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* I2C support */ + #include "xf86i2c.h" + diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist index de5ff78e429c..1069d09b9dad 100644 --- a/x11-drivers/xf86-video-apm/pkg-plist +++ b/x11-drivers/xf86-video-apm/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/apm_drv.so man/man4/apm.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index 9e18423dcbde..4c5b279fac6d 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c b/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c new file mode 100644 index 000000000000..d83c651e9f70 --- /dev/null +++ b/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c @@ -0,0 +1,18 @@ +--- src/ark_driver.c.orig 2012-07-17 04:51:36 UTC ++++ src/ark_driver.c +@@ -39,7 +39,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "ark.h" + +@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_AR + + fbPictureInit (pScreen, 0, 0); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + if (!pARK->NoAccel) { diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist index db7f65e4de81..4e7dfa5dde94 100644 --- a/x11-drivers/xf86-video-ark/pkg-plist +++ b/x11-drivers/xf86-video-ark/pkg-plist @@ -1,4 +1 @@ lib/xorg/modules/drivers/ark_drv.so -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-ati-ums/Makefile b/x11-drivers/xf86-video-ati-ums/Makefile index aed4d0489a91..37ecc714a0fa 100644 --- a/x11-drivers/xf86-video-ati-ums/Makefile +++ b/x11-drivers/xf86-video-ati-ums/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 6.14.6 -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= -ums CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c deleted file mode 100644 index 9de83f0dfac5..000000000000 --- a/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200 -+++ src/radeon_kms.c 2013-08-31 19:29:11.369001510 +0200 -@@ -30,6 +30,8 @@ - - #include <errno.h> - #include <sys/ioctl.h> -+#include <sys/param.h> -+#include <sys/linker.h> - /* Driver data structures */ - #include "radeon.h" - #include "radeon_reg.h" -@@ -270,7 +272,7 @@ - radeon_dirty_update(ScreenPtr screen) - { - RegionPtr region; -- PixmapDirtyUpdatePtr ent; -+ PixmapDirtyUpdatePtr ent = NULL; - - if (xorg_list_is_empty(&screen->pixmap_dirty_list)) - return; -@@ -606,6 +608,16 @@ - dev->domain, dev->bus, dev->dev, dev->func); - #endif - -+ err = kldload("radeonkms"); -+ if (err == -1 && errno != EEXIST) { -+ -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "[drm] Failed to load kernel module for %s: %s\n", -+ busid, strerror(errno)); -+ free(busid); -+ return FALSE; -+ } -+ - info->dri2.drm_fd = drmOpen("radeon", busid); - if (info->dri2.drm_fd == -1) { - diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-configure b/x11-drivers/xf86-video-ati-ums/files/patch-configure new file mode 100644 index 000000000000..bfb78a38d7e0 --- /dev/null +++ b/x11-drivers/xf86-video-ati-ums/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2012-06-29 13:47:16 UTC ++++ configure +@@ -17642,10 +17642,6 @@ else + fi + + +- +-$as_echo "#define USE_XAA 1" >>confdefs.h +- +- + # Properly handle EXA. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXA support" >&5 + $as_echo_n "checking whether to enable EXA support... " >&6; } diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac b/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac new file mode 100644 index 000000000000..0f2801886530 --- /dev/null +++ b/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2012-06-29 13:46:11 UTC ++++ configure.ac +@@ -163,8 +163,6 @@ fi + AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes) + AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes) + +-AC_DEFINE(USE_XAA, 1, [Build support for XAA]) +- + # Properly handle EXA. + AC_MSG_CHECKING([whether to enable EXA support]) + if test "x$EXA" = xyes; then diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c b/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c index 3de34a1b60ae..144b7de36261 100644 --- a/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c +++ b/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c @@ -1,6 +1,6 @@ ---- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 -+++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 -@@ -578,7 +578,7 @@ +--- src/radeon_dri2.c.orig 2012-06-25 08:19:41 UTC ++++ src/radeon_dri2.c +@@ -590,7 +590,7 @@ static void radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata) { DRI2ClientEventsPtr pClientEventsPriv; diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c b/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c new file mode 100644 index 000000000000..d00590c13a4a --- /dev/null +++ b/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c @@ -0,0 +1,10 @@ +--- src/radeon_driver.c.orig 2012-06-25 08:19:41 UTC ++++ src/radeon_driver.c +@@ -3756,7 +3756,6 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_D + /* Backing store setup */ + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, + "Initializing backing store\n"); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* DRI finalisation */ diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 241f2688e3db..eee705aa4716 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 7.5.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index a1c4ceed5bc6..defe938e66c0 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-chips PORTVERSION= 1.2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c b/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c new file mode 100644 index 000000000000..2737a0f247d3 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c @@ -0,0 +1,28 @@ +--- src/ct_driver.c.orig 2012-07-16 03:35:59 UTC ++++ src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist index 0a6b95fbc89a..8dd1b07bc53c 100644 --- a/x11-drivers/xf86-video-chips/pkg-plist +++ b/x11-drivers/xf86-video-chips/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/chips_drv.so man/man4/chips.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index c96c2e14eeee..ac2b50e3a3f4 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist index 386a9bbcb73a..b14d2846b593 100644 --- a/x11-drivers/xf86-video-cirrus/pkg-plist +++ b/x11-drivers/xf86-video-cirrus/pkg-plist @@ -2,6 +2,3 @@ lib/xorg/modules/drivers/cirrus_alpine.so lib/xorg/modules/drivers/cirrus_drv.so lib/xorg/modules/drivers/cirrus_laguna.so man/man4/cirrus.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 6d34089a0d23..d0f9426b6c3f 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-dummy PORTVERSION= 0.3.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist index 120c414e7ef0..344b589d21be 100644 --- a/x11-drivers/xf86-video-dummy/pkg-plist +++ b/x11-drivers/xf86-video-dummy/pkg-plist @@ -1,4 +1 @@ lib/xorg/modules/drivers/dummy_drv.so -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index b844ee557e99..5b3ae501c650 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-fbdev PORTVERSION= 0.4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist index 3ea8aa73913b..a9ab14486eee 100644 --- a/x11-drivers/xf86-video-fbdev/pkg-plist +++ b/x11-drivers/xf86-video-fbdev/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/fbdev_drv.so man/man4/fbdev.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 175ce6affbfe..89e7c3adb1b4 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-glint PORTVERSION= 1.2.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c new file mode 100644 index 000000000000..057c03757ab0 --- /dev/null +++ b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c @@ -0,0 +1,19 @@ +--- src/glint_driver.c.orig 2012-07-16 02:50:47 UTC ++++ src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist index 06e0ad980d7a..2c29551cd132 100644 --- a/x11-drivers/xf86-video-glint/pkg-plist +++ b/x11-drivers/xf86-video-glint/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/glint_drv.so man/man4/glint.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index 42e52ae6f1fe..e4d853847c58 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c new file mode 100644 index 000000000000..6ac72488c9f9 --- /dev/null +++ b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c @@ -0,0 +1,19 @@ +--- src/i128_driver.c.orig 2012-07-17 05:21:15 UTC ++++ src/i128_driver.c +@@ -50,8 +50,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "micmap.h" + + #include "xf86DDC.h" +@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) + return FALSE; + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist index bf6f0d1d8360..382d136bdeed 100644 --- a/x11-drivers/xf86-video-i128/pkg-plist +++ b/x11-drivers/xf86-video-i128/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/i128_drv.so man/man4/i128.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 4e403e67bd1d..1fa29f88a72c 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c b/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c new file mode 100644 index 000000000000..b35e670aae0e --- /dev/null +++ b/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c @@ -0,0 +1,21 @@ +--- src/i740_driver.c.orig 2012-07-17 04:52:30 UTC ++++ src/i740_driver.c +@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist index 34ff62b237bd..2c0a0b4965ca 100644 --- a/x11-drivers/xf86-video-i740/pkg-plist +++ b/x11-drivers/xf86-video-i740/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/i740_drv.so man/man4/i740.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 9cf13db5998c..1a52f37a79a4 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-video-intel PORTVERSION= 2.21.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index e1d58598f0d5..18e0fd5dd79e 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-mach64 PORTVERSION= 6.9.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist index 8e47d690180e..2ad9f0ac69d5 100644 --- a/x11-drivers/xf86-video-mach64/pkg-plist +++ b/x11-drivers/xf86-video-mach64/pkg-plist @@ -1,4 +1 @@ lib/xorg/modules/drivers/mach64_drv.so -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index 9a64653777ad..ded2e09bcb2a 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.6.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 3 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist index 341b183eef1a..ab18d1546843 100644 --- a/x11-drivers/xf86-video-mga/pkg-plist +++ b/x11-drivers/xf86-video-mga/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/mga_drv.so man/man4/mga.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 318aa01a8cd6..a095adc70b98 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist index b2949bc6941c..c4f3ad6afe7d 100644 --- a/x11-drivers/xf86-video-neomagic/pkg-plist +++ b/x11-drivers/xf86-video-neomagic/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/neomagic_drv.so man/man4/neomagic.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile deleted file mode 100644 index 40b160313a88..000000000000 --- a/x11-drivers/xf86-video-newport/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-video-newport -PORTVERSION= 0.2.4 -PORTREVISION= 4 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org newport display driver - -XORG_CAT= driver - -post-patch: - ${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \ - -e 's|MAXSHORT|SHRT_MAX|g' \ - ${WRKSRC}/src/newport_accel.c - -.include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo deleted file mode 100644 index bd6af4abcf17..000000000000 --- a/x11-drivers/xf86-video-newport/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9 -SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541 diff --git a/x11-drivers/xf86-video-newport/pkg-descr b/x11-drivers/xf86-video-newport/pkg-descr deleted file mode 100644 index b85c38a4f97f..000000000000 --- a/x11-drivers/xf86-video-newport/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-newport driver. diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist deleted file mode 100644 index 4686d58e930b..000000000000 --- a/x11-drivers/xf86-video-newport/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -lib/xorg/modules/drivers/newport_drv.so -man/man4/newport.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index 6c3468bea56d..4a0cad92f7ed 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.20 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c index 26e3d4a08f08..84eae0672616 100644 --- a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c +++ b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c @@ -1,6 +1,6 @@ ---- src/nv_driver.c.orig 2014-01-19 15:24:45.000000000 -0600 -+++ src/nv_driver.c 2014-01-19 15:24:07.000000000 -0600 -@@ -1543,7 +1543,11 @@ +--- src/nv_driver.c.orig 2012-07-17 06:47:02 UTC ++++ src/nv_driver.c +@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) xf86FreeInt10(pNv->pInt); return FALSE; } @@ -12,3 +12,11 @@ /* We use a programmable clock */ pScrn->progClock = TRUE; +@@ -2550,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pNv->NoAccel) + NVAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c b/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c new file mode 100644 index 000000000000..53efac4b3932 --- /dev/null +++ b/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c @@ -0,0 +1,18 @@ +--- src/g80_driver.c.orig 2012-07-17 06:47:02 UTC ++++ src/g80_driver.c +@@ -34,7 +34,6 @@ + #include <xf86Resources.h> + #endif + #include <mipointer.h> +-#include <mibstore.h> + #include <micmap.h> + #include <xf86cmap.h> + #include <fb.h> +@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h b/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h new file mode 100644 index 000000000000..439017594065 --- /dev/null +++ b/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h @@ -0,0 +1,12 @@ +--- src/nv_include.h.orig 2012-07-17 06:48:19 UTC ++++ src/nv_include.h +@@ -24,9 +24,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "micmap.h" + + #include "xf86DDC.h" diff --git a/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c b/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c new file mode 100644 index 000000000000..74e1ee543e79 --- /dev/null +++ b/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c @@ -0,0 +1,10 @@ +--- src/riva_driver.c.orig 2012-07-17 06:47:02 UTC ++++ src/riva_driver.c +@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pRiva->NoAccel) + RivaAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h b/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h new file mode 100644 index 000000000000..e7c8e2712c4a --- /dev/null +++ b/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h @@ -0,0 +1,12 @@ +--- src/riva_include.h.orig 2012-07-17 06:48:45 UTC ++++ src/riva_include.h +@@ -22,9 +22,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "micmap.h" + + #include "xf86DDC.h" diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist index 780e08346435..23953a9ae5f7 100644 --- a/x11-drivers/xf86-video-nv/pkg-plist +++ b/x11-drivers/xf86-video-nv/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/nv_drv.so man/man4/nv.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index 308ddcfa7a95..e153139b9e07 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-openchrome PORTVERSION= 0.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist index 03b706985538..4e137dcac478 100644 --- a/x11-drivers/xf86-video-openchrome/pkg-plist +++ b/x11-drivers/xf86-video-openchrome/pkg-plist @@ -6,6 +6,3 @@ lib/libchromeXvMCPro.so.1 lib/libchromeXvMCPro.so.1.0.0 lib/xorg/modules/drivers/openchrome_drv.so man/man4/openchrome.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index 9f373a881ec7..95d33649bf1e 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.9.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist index a931d1fe828c..93302a79160f 100644 --- a/x11-drivers/xf86-video-r128/pkg-plist +++ b/x11-drivers/xf86-video-r128/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/r128_drv.so man/man4/r128.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 20c530736a20..9888f66bd602 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c new file mode 100644 index 000000000000..ab994241d18e --- /dev/null +++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c @@ -0,0 +1,10 @@ +--- src/rendition.c.orig 2012-07-17 05:32:12 UTC ++++ src/rendition.c +@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC + fbPictureInit (pScreen, 0, 0); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + + /*********************************************************/ + /* The actual setup of the driver-specific code */ diff --git a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h new file mode 100644 index 000000000000..81b528a854d5 --- /dev/null +++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h @@ -0,0 +1,12 @@ +--- src/rendition.h.orig 2012-07-16 02:42:28 UTC ++++ src/rendition.h +@@ -28,9 +28,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist index 04e6d8aaa4a7..5f875b2d10ff 100644 --- a/x11-drivers/xf86-video-rendition/pkg-plist +++ b/x11-drivers/xf86-video-rendition/pkg-plist @@ -2,6 +2,3 @@ lib/xorg/modules/drivers/rendition_drv.so lib/xorg/modules/v10002d.uc lib/xorg/modules/v20002d.uc man/man4/rendition.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 0bddf6595689..8ccba04b2523 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c b/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c new file mode 100644 index 000000000000..92de84351e73 --- /dev/null +++ b/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c @@ -0,0 +1,18 @@ +--- src/s3_driver.c.orig 2012-07-17 04:50:05 UTC ++++ src/s3_driver.c +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARG + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist index a6aa703ba991..05f8563dfeaa 100644 --- a/x11-drivers/xf86-video-s3/pkg-plist +++ b/x11-drivers/xf86-video-s3/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/s3_drv.so man/man4/s3.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index 463ad6eb8978..40c67152850e 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist index b9b28e42531d..27a08d04e17d 100644 --- a/x11-drivers/xf86-video-s3virge/pkg-plist +++ b/x11-drivers/xf86-video-s3virge/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/s3virge_drv.so man/man4/s3virge.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 06f994675e3b..968d308a30d5 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-savage PORTVERSION= 2.3.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist index 23de1c31fc80..02df398f9596 100644 --- a/x11-drivers/xf86-video-savage/pkg-plist +++ b/x11-drivers/xf86-video-savage/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/savage_drv.so man/man4/savage.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile index 9515dda98983..dc2788c13bed 100644 --- a/x11-drivers/xf86-video-scfb/Makefile +++ b/x11-drivers/xf86-video-scfb/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-video-scfb PORTVERSION= 0.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= ray@FreeBSD.org @@ -15,8 +15,14 @@ GH_PROJECT= ${PORTNAME} GH_TAGNAME= bdeb3bf GH_COMMIT= bdeb3bf -GNU_CONFIGURE= yes USES= libtool pkgconfig -USE_XORG= xorg-server xproto inputproto randrproto renderproto videoproto +GNU_CONFIGURE= yes +DIST_SUBDIR= xorg/driver +USE_XORG= xorg-server xproto randrproto xi renderproto xextproto \ + inputproto kbproto fontsproto videoproto dri2proto \ + xf86driproto glproto xineramaproto resourceproto \ + scrnsaverproto +CONFIGURE_ENV= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' +INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-scfb/distinfo b/x11-drivers/xf86-video-scfb/distinfo index e15d59fff864..fa8257f7283c 100644 --- a/x11-drivers/xf86-video-scfb/distinfo +++ b/x11-drivers/xf86-video-scfb/distinfo @@ -1,2 +1,2 @@ -SHA256 (xf86-video-scfb-0.0.4.tar.gz) = baccb6f2fd0b79198705497c6550e8f2130d2ae359b1288beec9eae50df16616 -SIZE (xf86-video-scfb-0.0.4.tar.gz) = 345302 +SHA256 (xorg/driver/xf86-video-scfb-0.0.4.tar.gz) = baccb6f2fd0b79198705497c6550e8f2130d2ae359b1288beec9eae50df16616 +SIZE (xorg/driver/xf86-video-scfb-0.0.4.tar.gz) = 345302 diff --git a/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h b/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h new file mode 100644 index 000000000000..a4e9815d7200 --- /dev/null +++ b/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h @@ -0,0 +1,102 @@ +--- src/compat-api.h.orig 2014-11-23 09:47:32 UTC ++++ src/compat-api.h +@@ -0,0 +1,99 @@ ++/* ++ * Copyright 2012 Red Hat, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Dave Airlie <airlied@redhat.com> ++ */ ++ ++/* this file provides API compat between server post 1.13 and pre it, ++ it should be reused inside as many drivers as possible */ ++#ifndef COMPAT_API_H ++#define COMPAT_API_H ++ ++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR ++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] ++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p ++#endif ++ ++#ifndef XF86_HAS_SCRN_CONV ++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#endif ++ ++#ifndef XF86_SCRN_INTERFACE ++ ++#define SCRN_ARG_TYPE int ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] ++ ++#define SCREEN_ARG_TYPE int ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] ++ ++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 ++ ++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 ++ ++#define FREE_SCREEN_ARGS_DECL int arg, int flags ++ ++#define VT_FUNC_ARGS_DECL int arg, int flags ++#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) ++ ++#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) ++#else ++#define SCRN_ARG_TYPE ScrnInfoPtr ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) ++ ++#define SCREEN_ARG_TYPE ScreenPtr ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) ++ ++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y ++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y ++ ++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode ++#define SWITCH_MODE_ARGS(arg, m) arg, m ++ ++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg ++ ++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg ++#define VT_FUNC_ARGS(flags) pScrn ++ ++#define XF86_ENABLEDISABLEFB_ARG(x) (x) ++ ++#endif ++ ++#endif diff --git a/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c b/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c new file mode 100644 index 000000000000..eee6e58dc527 --- /dev/null +++ b/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c @@ -0,0 +1,222 @@ +--- src/scfb_driver.c.orig 2014-07-19 22:22:29 UTC ++++ src/scfb_driver.c +@@ -55,7 +55,6 @@ + #include "xf86Priv.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -80,6 +79,8 @@ + #include "xf86xv.h" + #endif + ++#include "compat-api.h" ++ + #undef DEBUG + #define DEBUG 1 + +@@ -101,15 +102,15 @@ static const OptionInfoRec * ScfbAvailab + static void ScfbIdentify(int); + static Bool ScfbProbe(DriverPtr, int); + static Bool ScfbPreInit(ScrnInfoPtr, int); +-static Bool ScfbScreenInit(int, ScreenPtr, int, char **); +-static Bool ScfbCloseScreen(int, ScreenPtr); ++static Bool ScfbScreenInit(SCREEN_INIT_ARGS_DECL); ++static Bool ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL); + static void *ScfbWindowLinear(ScreenPtr, CARD32, CARD32, int, CARD32 *, + void *); +-static void ScfbPointerMoved(int, int, int); +-static Bool ScfbEnterVT(int, int); +-static void ScfbLeaveVT(int, int); +-static Bool ScfbSwitchMode(int, DisplayModePtr, int); +-static int ScfbValidMode(int, DisplayModePtr, Bool, int); ++static void ScfbPointerMoved(SCRN_ARG_TYPE, int, int); ++static Bool ScfbEnterVT(VT_FUNC_ARGS_DECL); ++static void ScfbLeaveVT(VT_FUNC_ARGS_DECL); ++static Bool ScfbSwitchMode(SWITCH_MODE_ARGS_DECL); ++static int ScfbValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int); + static void ScfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr); + static Bool ScfbSaveScreen(ScreenPtr, int); + static void ScfbSave(ScrnInfoPtr); +@@ -231,7 +232,7 @@ typedef struct { + void * shadow; + CloseScreenProcPtr CloseScreen; + CreateScreenResourcesProcPtr CreateScreenResources; +- void (*PointerMoved)(int, int, int); ++ void (*PointerMoved)(SCRN_ARG_TYPE, int, int); + EntityInfoPtr pEnt; + + #ifdef XFreeXDGA +@@ -302,7 +303,7 @@ scfb_mmap(size_t len, off_t off, int fd) + mapaddr = NULL; + } + #if DEBUG +- ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %x\n", mapaddr, mapsize, fd, off); ++ ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %lx\n", mapaddr, mapsize, fd, off); + #endif + return mapaddr; + } +@@ -633,9 +634,9 @@ ScfbShadowInit(ScreenPtr pScreen) + } + + static Bool +-ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ++ScfbScreenInit(SCREEN_INIT_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + ScfbPtr fPtr = SCFBPTR(pScrn); + VisualPtr visual; + int ret, flags, ncolors; +@@ -792,7 +793,7 @@ ScfbScreenInit(int scrnIndex, ScreenPtr + "RENDER extension initialisation failed."); + } + if (fPtr->shadowFB && !ScfbShadowInit(pScreen)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "shadow framebuffer initialization failed\n"); + return FALSE; + } +@@ -801,20 +802,19 @@ ScfbScreenInit(int scrnIndex, ScreenPtr + if (!fPtr->rotate) + ScfbDGAInit(pScrn, pScreen); + else +- xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, " ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotated display, " + "disabling DGA\n"); + #endif + if (fPtr->rotate) { +- xf86DrvMsg(scrnIndex, X_INFO, "Enabling Driver Rotation, " ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enabling Driver Rotation, " + "disabling RandR\n"); + xf86DisableRandR(); + if (pScrn->bitsPerPixel == 24) +- xf86DrvMsg(scrnIndex, X_WARNING, ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Rotation might be broken in 24 bpp\n"); + } + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Software cursor. */ +@@ -858,9 +858,9 @@ ScfbScreenInit(int scrnIndex, ScreenPtr + } + + static Bool +-ScfbCloseScreen(int scrnIndex, ScreenPtr pScreen) ++ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + PixmapPtr pPixmap; + ScfbPtr fPtr = SCFBPTR(pScrn); + +@@ -892,7 +892,7 @@ ScfbCloseScreen(int scrnIndex, ScreenPtr + /* Unwrap CloseScreen. */ + pScreen->CloseScreen = fPtr->CloseScreen; + TRACE_EXIT("ScfbCloseScreen"); +- return (*pScreen->CloseScreen)(scrnIndex, pScreen); ++ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); + } + + static void * +@@ -907,9 +907,9 @@ ScfbWindowLinear(ScreenPtr pScreen, CARD + } + + static void +-ScfbPointerMoved(int index, int x, int y) ++ScfbPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + { +- ScrnInfoPtr pScrn = xf86Screens[index]; ++ SCRN_INFO_PTR(arg); + ScfbPtr fPtr = SCFBPTR(pScrn); + int newX, newY; + +@@ -941,13 +941,13 @@ ScfbPointerMoved(int index, int x, int y + } + + /* Pass adjusted pointer coordinates to wrapped PointerMoved function. */ +- (*fPtr->PointerMoved)(index, newX, newY); ++ (*fPtr->PointerMoved)(arg, newX, newY); + } + + static Bool +-ScfbEnterVT(int scrnIndex, int flags) ++ScfbEnterVT(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + + TRACE_ENTER("EnterVT"); + pScrn->vtSema = TRUE; +@@ -956,20 +956,20 @@ ScfbEnterVT(int scrnIndex, int flags) + } + + static void +-ScfbLeaveVT(int scrnIndex, int flags) ++ScfbLeaveVT(VT_FUNC_ARGS_DECL) + { + #if DEBUG +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + #endif + + TRACE_ENTER("LeaveVT"); + } + + static Bool +-ScfbSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) ++ScfbSwitchMode(SWITCH_MODE_ARGS_DECL) + { + #if DEBUG +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + #endif + + TRACE_ENTER("SwitchMode"); +@@ -978,10 +978,10 @@ ScfbSwitchMode(int scrnIndex, DisplayMod + } + + static int +-ScfbValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) ++ScfbValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) + { + #if DEBUG +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + #endif + + TRACE_ENTER("ValidMode"); +@@ -1067,7 +1067,6 @@ static Bool + ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode) + { + DisplayModePtr pMode; +- int scrnIdx = pScrn->pScreen->myNum; + int frameX0, frameY0; + + if (pDGAMode) { +@@ -1081,9 +1080,9 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod + frameY0 = pScrn->frameY0; + } + +- if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) ++ if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode))) + return FALSE; +- (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0); ++ (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0)); + + return TRUE; + } +@@ -1091,7 +1090,7 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod + static void + ScfbDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) + { +- (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags); ++ (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y)); + } + + static int diff --git a/x11-drivers/xf86-video-scfb/pkg-plist b/x11-drivers/xf86-video-scfb/pkg-plist index 5e68defdeaae..c68e96be7192 100644 --- a/x11-drivers/xf86-video-scfb/pkg-plist +++ b/x11-drivers/xf86-video-scfb/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/scfb_drv.so -man/man4/scfb.4.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg +man/man4/scfb.4x.gz diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index ab8f59b8f31f..c67858b0d120 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-siliconmotion PORTVERSION= 1.7.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c b/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c new file mode 100644 index 000000000000..d74ae969cdf8 --- /dev/null +++ b/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c @@ -0,0 +1,11 @@ +--- src/smi_driver.c.orig 2012-07-17 04:53:21 UTC ++++ src/smi_driver.c +@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL) + "Done writing mode. Register dump:\n"); + SMI_PrintRegs(pScrn); + +- miInitializeBackingStore(pScreen); +- + #ifdef HAVE_XMODES + xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset)); + #endif diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist index 8471fb6e0b09..2f67b61c0733 100644 --- a/x11-drivers/xf86-video-siliconmotion/pkg-plist +++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/siliconmotion_drv.so man/man4/siliconmotion.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 03eff342cc0c..caf13364f693 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sis PORTVERSION= 0.10.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c new file mode 100644 index 000000000000..a42b69bce79f --- /dev/null +++ b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c @@ -0,0 +1,40 @@ +--- 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(); + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 + { + double dx = x, dy = y; +- miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); ++ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL); + 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; + } + } diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist index 4563cbf4223a..5520aefbb0f6 100644 --- a/x11-drivers/xf86-video-sis/pkg-plist +++ b/x11-drivers/xf86-video-sis/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/sis_drv.so man/man4/sis.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 6bc106c46902..ba1abd9bef32 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist index 8aa33693837c..7904580b704b 100644 --- a/x11-drivers/xf86-video-sunffb/pkg-plist +++ b/x11-drivers/xf86-video-sunffb/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/sunffb_drv.so man/man4/sunffb.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index e84021665c08..372e4b9acd7b 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c b/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c new file mode 100644 index 000000000000..b8f9003c3c55 --- /dev/null +++ b/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c @@ -0,0 +1,21 @@ +--- src/tdfx_driver.c.orig 2012-07-17 05:21:16 UTC ++++ src/tdfx_driver.c +@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist index d104d44c3047..620930915691 100644 --- a/x11-drivers/xf86-video-tdfx/pkg-plist +++ b/x11-drivers/xf86-video-tdfx/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/tdfx_drv.so man/man4/tdfx.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile deleted file mode 100644 index 5402c8d61ea0..000000000000 --- a/x11-drivers/xf86-video-tga/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-video-tga -PORTVERSION= 1.2.2 -PORTREVISION= 5 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org tga display driver - -XORG_CAT= driver -USE_XORG= xf86dgaproto - -.include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo deleted file mode 100644 index d0af7877d185..000000000000 --- a/x11-drivers/xf86-video-tga/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 -SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943 diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr deleted file mode 100644 index 4b6648aec77e..000000000000 --- a/x11-drivers/xf86-video-tga/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org xf86-video-tga driver. - -WWW: http://www.x.org diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist deleted file mode 100644 index 41eacf6749f9..000000000000 --- a/x11-drivers/xf86-video-tga/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/xorg/modules/drivers/tga_drv.so -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index ca2c8059b5f5..3a8c405d656b 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c new file mode 100644 index 000000000000..22bdff27d1ca --- /dev/null +++ b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c @@ -0,0 +1,18 @@ +--- src/trident_driver.c.orig 2012-07-16 02:16:00 UTC ++++ src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist index 4f60a8fb760b..a2455c3fede6 100644 --- a/x11-drivers/xf86-video-trident/pkg-plist +++ b/x11-drivers/xf86-video-trident/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/trident_drv.so man/man4/trident.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index 961e91098ee6..ef4a214de065 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c b/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c new file mode 100644 index 000000000000..26bdfb3ed971 --- /dev/null +++ b/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c @@ -0,0 +1,20 @@ +--- src/tseng_driver.c.orig 2012-07-17 05:21:17 UTC ++++ src/tseng_driver.c +@@ -39,9 +39,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "fb.h" + + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + /* Initialise cursor functions */ + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist index 803640d8aedc..54c64fe0a64f 100644 --- a/x11-drivers/xf86-video-tseng/pkg-plist +++ b/x11-drivers/xf86-video-tseng/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/tseng_drv.so man/man4/tseng.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index 49d2031c7fbf..ac29d9e333d5 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist index 641d28f8041f..39e1a0332822 100644 --- a/x11-drivers/xf86-video-vesa/pkg-plist +++ b/x11-drivers/xf86-video-vesa/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/vesa_drv.so man/man4/vesa.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 6a7a7a2bc7f1..1fb5928e816a 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-vmware PORTVERSION= 13.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist index 727f3bae92f9..56d7543a15b1 100644 --- a/x11-drivers/xf86-video-vmware/pkg-plist +++ b/x11-drivers/xf86-video-vmware/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/vmware_drv.so man/man4/vmware.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index dcdea62e52ec..2442ed211214 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist index 12fa28b9abba..120d5a21a90e 100644 --- a/x11-drivers/xf86-video-voodoo/pkg-plist +++ b/x11-drivers/xf86-video-voodoo/pkg-plist @@ -1,5 +1,2 @@ lib/xorg/modules/drivers/voodoo_drv.so man/man4/voodoo.4x.gz -@dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index e47ea7f0a857..6f646100d273 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -46,7 +46,6 @@ VIDEO_DRIVERS= ati \ i740 \ mga \ neomagic \ - newport \ rendition \ s3 \ s3virge \ @@ -54,7 +53,6 @@ VIDEO_DRIVERS= ati \ siliconmotion \ sis \ tdfx \ - tga \ trident \ tseng \ vmware \ diff --git a/x11-drivers/xorg-drivers/pkg-plist b/x11-drivers/xorg-drivers/pkg-plist index d5bf8042ce29..04bdcc5dcda4 100644 --- a/x11-drivers/xorg-drivers/pkg-plist +++ b/x11-drivers/xorg-drivers/pkg-plist @@ -1,2 +1 @@ libdata/xorg/drivers -@dirrmtry libdata/xorg |