diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2012-04-21 17:03:32 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2012-04-21 17:03:32 +0000 |
| commit | 29e347e19709b94e2a25b8f749afaa22b4613213 (patch) | |
| tree | 7fb1ab5c9603709eeba2da5c25166d99dc1147d6 /x11-drivers | |
| parent | 551496002207129285b709a89863af8a414819a9 (diff) | |
| download | ports-29e347e19709b94e2a25b8f749afaa22b4613213.tar.gz ports-29e347e19709b94e2a25b8f749afaa22b4613213.zip | |
Notes
Diffstat (limited to 'x11-drivers')
103 files changed, 382 insertions, 190 deletions
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile index ae156ceeb271..c03aedee0703 100644 --- a/x11-drivers/input-wacom/Makefile +++ b/x11-drivers/input-wacom/Makefile @@ -7,6 +7,7 @@ PORTNAME= input-wacom PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g} +PORTREVISION= 1 CATEGORIES= x11-drivers kld MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \ SF/linuxwacom/xf86-input-wacom/:linuxwacom diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index 6282853bd8e8..e73f065440a9 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -6,14 +6,14 @@ # PORTNAME= xf86-input-acecad -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org acecad input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= acecad.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo index f8024f3e80ad..4382553e2927 100644 --- a/x11-drivers/xf86-input-acecad/distinfo +++ b/x11-drivers/xf86-input-acecad/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556 -SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888 +SHA256 (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448 +SIZE (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = 262818 diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile index b58b18315b81..b0198f84acf3 100644 --- a/x11-drivers/xf86-input-egalax/Makefile +++ b/x11-drivers/xf86-input-egalax/Makefile @@ -24,4 +24,8 @@ MAN4= egalax.4x IGNORE= is useless without uep(4) kernel driver .endif +.if defined(WITH_NEW_XORG) +IGNORE= does not build with X server 1.10 +.endif + .include <bsd.port.post.mk> diff --git a/x11-drivers/xf86-input-egalax/pkg-descr b/x11-drivers/xf86-input-egalax/pkg-descr index 2401073177fb..731bf6e2e577 100644 --- a/x11-drivers/xf86-input-egalax/pkg-descr +++ b/x11-drivers/xf86-input-egalax/pkg-descr @@ -1,3 +1 @@ This package contains the X.Org xf86-input-egalax driver. See also uep(4). - -WWW: http://home.eeti.com.tw/web20/eGalaxTouchDriver/linuxDriver.htm diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index 48901c312f8c..fe1cdddfaf12 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -6,13 +6,23 @@ # PORTNAME= xf86-input-elographics -PORTVERSION= 1.2.4 +PORTVERSION= ${ELO_VERSION} +PORTREVISION= ${ELO_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org elographics input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= elographics.4x +.if defined(WITH_NEW_XORG) +ELO_VERSION= 1.3.0 +ELO_REVISION= 0 +.else +ELO_VERSION= 1.2.4 +ELO_REVISION= 0 +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo index 8de17ce8f444..a609c5a2c28f 100644 --- a/x11-drivers/xf86-input-elographics/distinfo +++ b/x11-drivers/xf86-input-elographics/distinfo @@ -1,2 +1,4 @@ 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.3.0.tar.bz2) = 8c0bb3864a8fbc696c8f3d5442b2f20db1249a6ca23f5d020639f2cbcfe4ab9e +SIZE (xorg/driver/xf86-input-elographics-1.3.0.tar.bz2) = 276070 diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 5a13b5284dc8..2f7b5c74d867 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -6,13 +6,25 @@ # PORTNAME= xf86-input-hyperpen -PORTVERSION= 1.3.0 -PORTREVISION= 5 +PORTVERSION= ${HYPERVER} +PORTREVISION= ${HYPERREVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org hyperpen input driver XORG_CAT= driver +USE_XORG= xextproto videoproto + +.if defined(WITH_NEW_XORG) +HYPERVER= 1.4.1 +HYPERREVISION= 0 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c + +.else +HYPERVER= 1.3.0 +HYPERREVISION= 6 +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 bc159f51fc8b..7ccfb9b6d336 100644 --- a/x11-drivers/xf86-input-hyperpen/distinfo +++ b/x11-drivers/xf86-input-hyperpen/distinfo @@ -1,2 +1,4 @@ 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/patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c index 70713074b041..70713074b041 100644 --- a/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c +++ b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index d533a872b1f9..94f2872da90b 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -6,16 +6,25 @@ # PORTNAME= xf86-input-joystick -PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTVERSION= ${JOYVER} +PORTREVISION= ${JOYREVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org joystick input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= joystick.4x +.if defined(WITH_NEW_XORG) +JOYVER= 1.6.0 +JOYREVISION= 0 +.else +JOYVER= 1.5.0 +JOYREVISION= 1 +.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 e76004102557..db447f9e87de 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,2 +1,4 @@ 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.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1 +SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552 diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 1989427a0e9d..86be55c73da4 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -6,14 +6,14 @@ # PORTNAME= xf86-input-keyboard -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org keyboard input driver XORG_CAT= driver -USE_XORG= kbproto +USE_XORG= kbproto xextproto videoproto MAN4= kbd.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index b484e1cdc0d7..f093391f0b88 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0 -SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181 +SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3 +SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166 diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index 29727d1ab69d..38eb7613b939 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-input-magictouch PORTVERSION= 1.0.0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 319e96c8dd86..8e1512a1d49e 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -6,13 +6,16 @@ # PORTNAME= xf86-input-mouse -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mouse input driver +CONFIGURE_ARGS+=--disable-silent-rules + XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= mousedrv.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index d4f66bab3026..890cfcb50773 100644 --- a/x11-drivers/xf86-input-mouse/distinfo +++ b/x11-drivers/xf86-input-mouse/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb -SIZE (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = 316953 +SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12 +SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429 diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index de568328ec74..adb94e60aaf8 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -6,14 +6,20 @@ # PORTNAME= xf86-input-mutouch -PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTVERSION= 1.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mutouch input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= mutouch.4x +.if !defined(WITH_NEW_XORG) +IGNORE= does not build with xorg-server 1.7.7 +.else + +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo index a1371bcf7c6c..1dceb72d17a2 100644 --- a/x11-drivers/xf86-input-mutouch/distinfo +++ b/x11-drivers/xf86-input-mutouch/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b -SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240 +SHA256 (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c +SIZE (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = 268865 diff --git a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c b/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c deleted file mode 100644 index 3ed8660d2323..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c +++ /dev/null @@ -1,70 +0,0 @@ ---- src/xf86MuTouch.c.orig 2010-05-03 13:16:26.000000000 -0500 -+++ src/xf86MuTouch.c 2010-05-03 13:16:34.000000000 -0500 -@@ -426,9 +426,9 @@ - * or we will feed X with quite bogus event positions. - */ - if (priv->x_inverted) -- cur_x = priv->max_x - cur_x; -+ cur_x = priv->max_x - cur_x + priv->min_x; - if (priv->y_inverted) -- cur_y = priv->max_y - cur_y; -+ cur_y = priv->max_y - cur_y + priv->min_y; - xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y); - - /* -@@ -749,6 +749,10 @@ - unsigned char req[MuT_PACKET_SIZE]; - unsigned char reply[MuT_BUFFER_SIZE]; - char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus"; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ Atom btn_label; -+ Atom axis_labels[2] = { 0, 0 }; -+#endif - - switch(mode) { - -@@ -766,7 +770,11 @@ - /* - * Device reports button press for up to 1 button. - */ -- if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) { -+ if (InitButtonClassDeviceStruct(dev, 1, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ &btn_label, -+#endif -+ map) == FALSE) { - ErrorF("Unable to allocate ButtonClassDeviceStruct\n"); - return !Success; - } -@@ -779,6 +787,9 @@ - * screen to fit one meter. - */ - if (InitValuatorClassDeviceStruct(dev, 2, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels, -+#endif - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - xf86GetMotionEvents, - #endif -@@ -787,11 +798,19 @@ - return !Success; - } - else { -- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -+ InitValuatorAxisStruct(dev, 0, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[0], -+#endif -+ priv->min_x, priv->max_x, - 9500, - 0 /* min_res */, - 9500 /* max_res */); -- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y, -+ InitValuatorAxisStruct(dev, 1, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[1], -+#endif -+ priv->min_y, priv->max_y, - 10500, - 0 /* min_res */, - 10500 /* max_res */); diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 90520a205175..5fdd36055de5 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -6,14 +6,23 @@ # PORTNAME= xf86-input-penmount -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= ${PEN_VERSION} +PORTREVISION= ${PEN_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org penmount input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= penmount.4x +.if defined(WITH_NEW_XORG) +PEN_VERSION= 1.5.0 +PEN_REVISION= 0 +.else +PEN_VERSION= 1.4.1 +PEN_REVISION= 1 +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo index 4a606598c2e5..0b6998d6f44c 100644 --- a/x11-drivers/xf86-input-penmount/distinfo +++ b/x11-drivers/xf86-input-penmount/distinfo @@ -1,2 +1,4 @@ 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-descr b/x11-drivers/xf86-input-penmount/pkg-descr index 34eefd3b1b2b..ea15a1e1b21f 100644 --- a/x11-drivers/xf86-input-penmount/pkg-descr +++ b/x11-drivers/xf86-input-penmount/pkg-descr @@ -1 +1,4 @@ This package contains the X.Org xf86-input-penmount driver. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index b251bd51b857..170f54620b7e 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-synaptics -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -15,8 +14,10 @@ COMMENT= X.Org synaptics input driver CONFLICTS= synaptics-[0-9]* +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal + USE_GNOME= gnomehack -USE_XORG= x11 +USE_XORG= x11 xextproto videoproto XORG_CAT= driver MAN1= syndaemon.1 \ @@ -25,7 +26,13 @@ MAN4= synaptics.4x post-install: ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \ + ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ ${PREFIX}/share/hal/fdi/policy/10osvendor/ +.if defined(WITH_NEW_XORG) +PLIST_SUB+= NEW="" OLD="@comment " +.else +PLIST_SUB+= NEW="@comment " OLD="" +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo index 1024acd5d444..21ece95f394e 100644 --- a/x11-drivers/xf86-input-synaptics/distinfo +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6 -SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524 +SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e +SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123 diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist index 7fa22678b658..4d1aec8680a1 100644 --- a/x11-drivers/xf86-input-synaptics/pkg-plist +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -5,7 +5,9 @@ include/xorg/synaptics.h lib/xorg/modules/input/synaptics_drv.la lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc +%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi +%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 78cc5c02c74e..7bfac60c4a10 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 12.6.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index 530f563a8515..deea0dfbea7d 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -6,13 +6,24 @@ # PORTNAME= xf86-input-void -PORTVERSION= 1.3.1 +PORTVERSION= ${VOID_VERSION} +PORTREVISION= ${VOID_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org void input driver XORG_CAT= driver +USE_XORG= xextproto videoproto MAN4= void.4x +.if defined(WITH_NEW_XORG) +VOID_VERSION= 1.4.0 +VOID_REVISION= 0 +.else +VOID_VERSION= 1.3.1 +VOID_REVISION= 0 +.endif + + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo index 7b1b4c5b2f91..a8c34dee5061 100644 --- a/x11-drivers/xf86-input-void/distinfo +++ b/x11-drivers/xf86-input-void/distinfo @@ -1,2 +1,4 @@ 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-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 5eaddccbec44..96546c4eae21 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index b3e381ae2169..de559d88acf2 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -7,12 +7,13 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ark display driver XORG_CAT= driver -USE_XORG= xextproto +USE_XORG= xextproto videoproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 4d3b485278b3..5ac3cd07c8b3 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 6.14.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c new file mode 100644 index 000000000000..84a992a3bfd9 --- /dev/null +++ b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c @@ -0,0 +1,17 @@ +--- src/radeon_accel.c.orig 2012-04-15 19:36:08.000000000 +0200 ++++ src/radeon_accel.c 2012-04-15 19:36:15.000000000 +0200 +@@ -982,10 +982,9 @@ + + for (; nwords > 0; --nwords, ++d, ++s) + #ifdef __powerpc__ +- asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d)); ++ asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d)); + #else +- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00) +- | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24); ++ *d = (*s >> 8) | (*s << 8); + #endif + return; + } + + diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile index 78c6c7c63a77..e09523780269 100644 --- a/x11-drivers/xf86-video-ati613/Makefile +++ b/x11-drivers/xf86-video-ati613/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-ati613 PORTVERSION= 6.13.2 +PORTREVISION= 1 CATEGORIES= x11-drivers DISTNAME= xf86-video-ati-${PORTVERSION} @@ -19,4 +20,8 @@ XORG_CAT= driver USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto MAN4= ati.4x radeon.4x +.if defined(WITH_NEW_XORG) +IGNORE= Please use x11-drivers/xf86-video-ati +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index 2de3dc72e873..15e327e912fb 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-chips -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo index 8a19b72546b8..f03b7195566c 100644 --- a/x11-drivers/xf86-video-chips/distinfo +++ b/x11-drivers/xf86-video-chips/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d -SIZE (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 338968 +SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25 +SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618 diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index 1def9f85551a..0df0cf1aa519 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile index 39057d8ce40a..fd32fe39cf6f 100644 --- a/x11-drivers/xf86-video-cyrix/Makefile +++ b/x11-drivers/xf86-video-cyrix/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-cyrix PORTVERSION= 1.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 9b0f1474aed2..2154b3a4e2a0 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-dummy -PORTVERSION= 0.3.4 +PORTVERSION= 0.3.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo index b8a7debbe393..899bec938884 100644 --- a/x11-drivers/xf86-video-dummy/distinfo +++ b/x11-drivers/xf86-video-dummy/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc -SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658 +SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f +SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761 diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index 5573b32c332f..09b6a6a53f7c 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-fbdev PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index fe6678ebc269..320b6b13e677 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-glint -PORTVERSION= 1.2.5 +PORTVERSION= 1.2.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo index 91b9ad94aeb9..1e7a988615d2 100644 --- a/x11-drivers/xf86-video-glint/distinfo +++ b/x11-drivers/xf86-video-glint/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b -SIZE (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 394136 +SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7 +SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872 diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index 3c61786b42b2..8a570b8db161 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 7320b92768e3..b9f11c574d69 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile index 54147b76e1b9..cf048f3abe43 100644 --- a/x11-drivers/xf86-video-imstt/Makefile +++ b/x11-drivers/xf86-video-imstt/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-imstt PORTVERSION= 1.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index fbabd24c2808..8620b644eeeb 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -6,20 +6,59 @@ # PORTNAME= xf86-video-intel -PORTVERSION= 2.7.1 -PORTREVISION= 4 +PORTVERSION= ${INTEL_VERSION} +PORTREVISION= ${INTEL_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= Driver for Intel integrated graphics chipsets -CONFLICTS= xf86-video-i810-[0-9]* - ONLY_FOR_ARCHS= amd64 i386 USE_GL= gl +USE_LDCONFIG= yes XORG_CAT= driver USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto MAN4= intel.4x -.include <bsd.port.mk> +.if defined(WITH_NEW_XORG) +INTEL_VERSION= 2.17.0 +INTEL_REVISION= 0 +MAKE_JOBS_UNSAFE=yes +PLIST_SUB+= OLD="@comment " +.else +INTEL_VERSION= 2.7.1 +INTEL_REVISION= 4 +PLIST_SUB+= OLD="" + +EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \ + ${PATCHDIR}/extra-src_i830_render.c \ + ${PATCHDIR}/extra-src_ch7xxx_ch7xxx.c \ + ${PATCHDIR}/extra-src_i830_video.c \ + ${PATCHDIR}/extra-src_i810_driver.c \ + ${PATCHDIR}/extra-src_i915_hwmc.c \ + ${PATCHDIR}/extra-src_i810_hwmc.c \ + ${PATCHDIR}/extra-src_i915_render.c \ + ${PATCHDIR}/extra-src_i810_video.c \ + ${PATCHDIR}/extra-src_i965_render.c \ + ${PATCHDIR}/extra-src_i830_dri.c \ + ${PATCHDIR}/extra-src_ivch_ivch.c \ + ${PATCHDIR}/extra-src_i830_driver.c \ + ${PATCHDIR}/extra-src_sil164_sil164.c \ + ${PATCHDIR}/extra-src_i830_dvo.c \ + ${PATCHDIR}/extra-src_tfp410_tfp410.c \ + ${PATCHDIR}/extra-src_i830_i2c.c \ + ${PATCHDIR}/extra-uxa_uxa-priv.h +.endif + +.include <bsd.port.pre.mk> + +.if defined(WITH_NEW_XORG) +pre-configure: +.if !exists(${LOCALBASE}/lib/libkms.so) + @${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option." + @${FALSE} +.endif +.endif + +.include <bsd.port.post.mk> diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index 3b7390eacef9..fa854ebe1516 100644 --- a/x11-drivers/xf86-video-intel/distinfo +++ b/x11-drivers/xf86-video-intel/distinfo @@ -1,2 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625 +SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387 +SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717 diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c index 278354a4b266..278354a4b266 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c index 6dbc0a7c36a4..6dbc0a7c36a4 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c index 5ccb55a33daf..5ccb55a33daf 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c index ffb2ac39cadf..ffb2ac39cadf 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c index c10b5e668836..c10b5e668836 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c index 05bdb931e945..05bdb931e945 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c index 776b67f915d1..776b67f915d1 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dvo.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c index d392942ef66f..d392942ef66f 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_dvo.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c index 1f4461cd9fe1..1f4461cd9fe1 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c index e292a7dedbf7..e292a7dedbf7 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c index b93a98e24932..b93a98e24932 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c index ab7f679fb4ac..ab7f679fb4ac 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c index 53b1a0e1e850..53b1a0e1e850 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c index 99b7d787267b..99b7d787267b 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c index b54885d9b0d8..b54885d9b0d8 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c index f9d717794304..f9d717794304 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c diff --git a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c index 89927b3311b2..89927b3311b2 100644 --- a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c diff --git a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h index 46eb72ea63c4..46eb72ea63c4 100644 --- a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h +++ b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist index 900e0a99785a..0c16ed39e56b 100644 --- a/x11-drivers/xf86-video-intel/pkg-plist +++ b/x11-drivers/xf86-video-intel/pkg-plist @@ -4,18 +4,18 @@ lib/libI810XvMC.so.1 lib/libIntelXvMC.la lib/libIntelXvMC.so.1 lib/libIntelXvMC.so -lib/xorg/modules/drivers/ch7017.la -lib/xorg/modules/drivers/ch7017.so -lib/xorg/modules/drivers/ch7xxx.la -lib/xorg/modules/drivers/ch7xxx.so +%%OLD%%lib/xorg/modules/drivers/ch7017.la +%%OLD%%lib/xorg/modules/drivers/ch7017.so +%%OLD%%lib/xorg/modules/drivers/ch7xxx.la +%%OLD%%lib/xorg/modules/drivers/ch7xxx.so lib/xorg/modules/drivers/intel_drv.la lib/xorg/modules/drivers/intel_drv.so -lib/xorg/modules/drivers/ivch.la -lib/xorg/modules/drivers/ivch.so -lib/xorg/modules/drivers/sil164.la -lib/xorg/modules/drivers/sil164.so -lib/xorg/modules/drivers/tfp410.la -lib/xorg/modules/drivers/tfp410.so +%%OLD%%lib/xorg/modules/drivers/ivch.la +%%OLD%%lib/xorg/modules/drivers/ivch.so +%%OLD%%lib/xorg/modules/drivers/sil164.la +%%OLD%%lib/xorg/modules/drivers/sil164.so +%%OLD%%lib/xorg/modules/drivers/tfp410.la +%%OLD%%lib/xorg/modules/drivers/tfp410.so @dirrmtry lib/xorg/modules/drivers @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile index 1adf954b1ae0..b2b5bc35f23f 100644 --- a/x11-drivers/xf86-video-intel29/Makefile +++ b/x11-drivers/xf86-video-intel29/Makefile @@ -13,7 +13,8 @@ DISTNAME= xf86-video-intel-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= Driver for Intel integrated graphics chipsets -CONFLICTS= xf86-video-i810-[0-9]* xf86-video-intel-[0-9]* +IGNORE= Not supported. +CONFLICTS= xf86-video-intel-2.7.[0-9]* xf86-video-intel-2.15.[0-9]* ONLY_FOR_ARCHS= amd64 i386 USE_GL= gl diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index 2d6ae32d81bb..fbd0fdd276c4 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -6,15 +6,15 @@ # PORTNAME= xf86-video-mach64 -PORTVERSION= 6.8.2 -PORTREVISION= 1 +PORTVERSION= 6.9.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mach64 display driver USE_GL= gl + XORG_CAT= driver -USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto +USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo index 7741305a57cb..356c86900bf3 100644 --- a/x11-drivers/xf86-video-mach64/distinfo +++ b/x11-drivers/xf86-video-mach64/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d -SIZE (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 486282 +SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a +SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200 diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index 8ffe2ccff5f6..b343fb26f9f1 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-mga -PORTVERSION= 1.4.11 +PORTVERSION= 1.4.13 PORTEPOCH= 2 CATEGORIES= x11-drivers @@ -20,9 +20,9 @@ USE_XORG= xf86driproto videoproto xextproto glproto MAN4= mga.4x pre-patch: - ${REINPLACE_CMD} \ - -e 's|values.h|sys/limits.h|g' \ - -e 's|MAXSHORT|SHRT_MAX|g' \ - ${WRKSRC}/src/mga_arc.c +# ${REINPLACE_CMD} \ +# -e 's|values.h|sys/limits.h|g' \ +# -e 's|MAXSHORT|SHRT_MAX|g' \ +# ${WRKSRC}/src/mga_arc.c .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo index ed459526e824..7a6ef1a5a4f6 100644 --- a/x11-drivers/xf86-video-mga/distinfo +++ b/x11-drivers/xf86-video-mga/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6 -SIZE (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 415829 +SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6 +SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134 diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 17a2a42b3b79..533e26b8cec1 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile index 7d8e3627dfd5..14f6c9645814 100644 --- a/x11-drivers/xf86-video-newport/Makefile +++ b/x11-drivers/xf86-video-newport/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-newport PORTVERSION= 0.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile index 0b4dac78c3d6..64afb7ac6bb7 100644 --- a/x11-drivers/xf86-video-nouveau/Makefile +++ b/x11-drivers/xf86-video-nouveau/Makefile @@ -21,9 +21,8 @@ MAN4= nouveau.4x MAKE_JOBS_SAFE= yes -.if defined(WITHOUT_NOUVEAU) -BROKEN= Please disable WITHOUT_NOUVEAU global macro. -.endif +# also doesn't work with mesa (libGL) version higher then 7.4.x +IGNORE= Not supported, missing kernel support. use the nvidia driver. post-configure: ${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index 7a3dd9c60c3d..db48fb65ee64 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.18 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c new file mode 100644 index 000000000000..ad794cba31fd --- /dev/null +++ b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c @@ -0,0 +1,32 @@ +--- src/via_vgahw.c.orig 2009-10-03 22:48:55.000000000 +0200 ++++ src/via_vgahw.c 2012-02-08 10:43:08.000000000 +0100 +@@ -36,6 +36,11 @@ + #include "via_driver.h" /* for HAVE_DEBUG */ + #include "via_vgahw.h" + ++#if ABI_VIDEODRV_VERSION < 12 ++#define PIOOFFSET hwp->PIOOffset ++#else ++#define PIOOFFSET 0 ++#endif + + static CARD8 + ViaVgahwIn(vgaHWPtr hwp, int address) +@@ -43,7 +48,7 @@ + if (hwp->MMIOBase) + return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address); + else +- return inb(hwp->PIOOffset + address); ++ return inb(PIOOFFSET + address); + } + + static void +@@ -52,7 +57,7 @@ + if (hwp->MMIOBase) + MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value); + else +- outb(hwp->PIOOffset + address, value); ++ outb(PIOOFFSET + address, value); + } + + /* diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c new file mode 100644 index 000000000000..6eb3f18c11f2 --- /dev/null +++ b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c @@ -0,0 +1,83 @@ +Fix Xvideo crash in X.org server 1.10 + +http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82 + +--- src/via_video.c.orig 2012-02-08 10:13:54.000000000 +0100 ++++ src/via_video.c 2012-02-08 10:14:33.000000000 +0100 +@@ -763,67 +763,6 @@ + return 0; + } + +- +-/* +- * This one gets called, for example, on panning. +- */ +- +-static int +-viaReputImage(ScrnInfoPtr pScrn, +- short drw_x, short drw_y, RegionPtr clipBoxes, pointer data, +- DrawablePtr pDraw) +-{ +- +- DDUPDATEOVERLAY UpdateOverlay_Video; +- LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video; +- viaPortPrivPtr pPriv = (viaPortPrivPtr) data; +- VIAPtr pVia = VIAPTR(pScrn); +- +- if (!RegionsEqual(&pPriv->clip, clipBoxes)) { +- REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes); +- if (pPriv->autoPaint) { +- if (pDraw->type == DRAWABLE_WINDOW) { +- viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw); +- } else { +- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, +- clipBoxes); +- } +- } +- } +- +- if (drw_x == pPriv->old_drw_x && +- drw_y == pPriv->old_drw_y && +- pVia->swov.oldPanningX == pVia->swov.panning_x && +- pVia->swov.oldPanningY == pVia->swov.panning_y) { +- viaXvError(pScrn, pPriv, xve_none); +- return Success; +- } +- +- lpUpdateOverlay->SrcLeft = pPriv->old_src_x; +- lpUpdateOverlay->SrcTop = pPriv->old_src_y; +- lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w; +- lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h; +- +- lpUpdateOverlay->DstLeft = drw_x; +- lpUpdateOverlay->DstTop = drw_y; +- lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w; +- lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h; +- pPriv->old_drw_x = drw_x; +- pPriv->old_drw_y = drw_y; +- +- lpUpdateOverlay->dwFlags = DDOVER_KEYDEST; +- +- if (pScrn->bitsPerPixel == 8) +- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff; +- else +- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey; +- +- VIAVidUpdateOverlay(pScrn, lpUpdateOverlay); +- +- viaXvError(pScrn, pPriv, xve_none); +- return Success; +-} +- + static unsigned + viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors) + { +@@ -884,7 +823,7 @@ + viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute; + viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute; + viaAdaptPtr[i]->PutImage = viaPutImage; +- viaAdaptPtr[i]->ReputImage = viaReputImage; ++ viaAdaptPtr[i]->ReputImage = NULL; + viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes; + for (j = 0; j < numPorts; ++j) { + viaPortPriv[j].dmaBounceBuffer = NULL; diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index e5aa4aa2014f..14a78b324e82 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile index 296a5dfa3a15..806d776c679d 100644 --- a/x11-drivers/xf86-video-radeonhd-devel/Makefile +++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-radeonhd PORTVERSION= 1.3.0.20091101 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nork diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile index ab8364509771..80b4a8aa1660 100644 --- a/x11-drivers/xf86-video-radeonhd/Makefile +++ b/x11-drivers/xf86-video-radeonhd/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-radeonhd PORTVERSION= 1.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 8fc96d2825b2..72fdd37a67d3 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -7,13 +7,14 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org rendition display driver XORG_CAT= driver -USE_XORG= xextproto +USE_XORG= xextproto videoproto MAN4= rendition.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 5397647eaeb4..e8cd85092e85 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index bd879ee46402..22581ca02e63 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 2cad8e1b3344..75102292a37e 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-savage -PORTVERSION= 2.3.2 +PORTVERSION= 2.3.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,6 +14,7 @@ COMMENT= X.Org savage display driver USE_GL= gl +WITH_FBSD10_FIX=yes XORG_CAT= driver USE_XORG= xf86driproto videoproto xextproto glproto MAN4= savage.4x diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index 5c16f9c4c1ec..6b5437235cc2 100644 --- a/x11-drivers/xf86-video-savage/distinfo +++ b/x11-drivers/xf86-video-savage/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 54bde0077a2369fbdd42b0b25803f3c7147a58792997b14e45ee0b856199ddf1 -SIZE (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 366731 +SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2 +SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252 diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index cfa486f576bd..681fdd40640e 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo index 5d477f0de57e..5707cf9c7d92 100644 --- a/x11-drivers/xf86-video-siliconmotion/distinfo +++ b/x11-drivers/xf86-video-siliconmotion/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610 diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile index 1ceee027e66d..b53662053fbc 100644 --- a/x11-drivers/xf86-video-sis-intel/Makefile +++ b/x11-drivers/xf86-video-sis-intel/Makefile @@ -8,7 +8,7 @@ PORTNAME= xf86-video-sis-intel PORTVERSION= 300407 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MASTER_SITES= http://downloadmirror.intel.com/15443/eng/ DISTNAME= sis_drv_src_300407 diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 8140572d303b..2641c7ceb699 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-sis -PORTVERSION= 0.10.2 -PORTREVISION= 2 +PORTVERSION= 0.10.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo index fe89fa4580c1..0b66a0d4d700 100644 --- a/x11-drivers/xf86-video-sis/distinfo +++ b/x11-drivers/xf86-video-sis/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2 -SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160 +SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737 +SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750 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 deleted file mode 100644 index 7570ee2d6047..000000000000 --- a/x11-drivers/xf86-video-sis/files/patch-src-sis_driver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sis_driver.c.orig 2010-05-10 09:36:17.000000000 -0500 -+++ src/sis_driver.c 2010-05-10 09:36:23.000000000 -0500 -@@ -4099,6 +4099,8 @@ - case SIS_315H: - case SIS_330: - case SIS_340: -+ case SIS_650: -+ case SIS_760: - case XGI_40: readpci = TRUE; - break; - case XGI_20: readpci = TRUE; diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 6cc72846aba3..0f5db118c02c 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index 9e80c3b636ab..b8fd2e108784 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile index 5acd2d113ab1..a78f578af9f3 100644 --- a/x11-drivers/xf86-video-tga/Makefile +++ b/x11-drivers/xf86-video-tga/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-tga PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index f768d3c8b92d..76b0570e00c3 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index 06ee4272b1ce..521fc6f9406e 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index a2fccafde091..5fdfb038d857 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -7,14 +7,14 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vesa display driver XORG_CAT= driver -USE_XORG= xextproto +USE_XORG= xextproto videoproto MAN4= vesa.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile index c769d950997e..8b6d3c97ceaa 100644 --- a/x11-drivers/xf86-video-via/Makefile +++ b/x11-drivers/xf86-video-via/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-video-via PORTVERSION= 0.2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index f3376257ef01..1d8718a1faef 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-vmware -PORTVERSION= 11.0.3 -PORTREVISION= 1 +PORTVERSION= 12.0.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index 3e9409989c89..03af6aa5dcf8 100644 --- a/x11-drivers/xf86-video-vmware/distinfo +++ b/x11-drivers/xf86-video-vmware/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = b24a7cb2d87e416561e25122eab2cd48fc64a2ba105238456eefef16f29f38a3 -SIZE (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = 313656 +SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147 +SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468 diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index 86eef10a10d1..5cc2a7d0d85d 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -7,13 +7,14 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org voodoo display driver XORG_CAT= driver -USE_XORG= xf86dgaproto xextproto +USE_XORG= xf86dgaproto xextproto videoproto MAN4= voodoo.4x .include <bsd.port.mk> diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 62c017ac7edb..2ece9ff22162 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-drivers -PORTVERSION= 7.5.1 +PORTVERSION= 7.5.2 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none @@ -37,7 +37,7 @@ VIDEO_ON+= sunffb VIDEO_ON+= openchrome .endif -.if ${ARCH} == "amd64" || ${ARCH} == "i386" +.if (${ARCH} == "amd64" || ${ARCH} == "i386") && !defined(WITH_NEW_XORG) VIDEO_ON+= intel .endif |