mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

x11-servers/xorg-server: Update to 1.14

Browse Source 
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)
This commit is contained in:
Jean-Sébastien Pédron 2014-12-19 23:03:54 +00:00
parent 56208c9b57
commit 91293a3505
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374982
183 changed files with 1508 additions and 1904 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MOVED
View File

@ -7322,3 +7322,8 @@ devel/preps-gui||2014-12-15|Has expired: upstream disappeared
devel/prepstools||2014-12-15|Has expired: upstream disappeared
devel/llvm32||2014-12-18|Obsolete and unmaintained upstream
lang/clang32||2014-12-18|Obsolete and unmaintained upstream
x11-drivers/xf86-input-egalax||2014-12-19|Removed: Depends on removed xorg-server 1.7
x11-drivers/xf86-video-newport||2014-12-19|Removed: Depends on removed xorg-server 1.12
x11-drivers/xf86-video-tga||2014-12-19|Removed: Alpha support was removed in FreeBSD 7.0
x11/nvidia-driver-71||2014-12-19|Removed: Not compatible with xserver 1.14
x11/nvidia-driver-96||2014-12-19|Removed: Not compatible with xserver 1.14

4
Mk/bsd.xorg.mk
View File

@ -142,10 +142,6 @@ USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
.endif
.if exists(${LOCALBASE}/bin/X)
XSERVER_VER!= ${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
.endif
.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
Xorg_Post_Include= bsd.xorg.mk

18
UPDATING
View File

@ -5,6 +5,24 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20141219:
AFFECTS: users of x11/xorg and all xorg ports
AUTHOR: dumbbell@FreeBSD.org
The X.Org server (x11-servers/xorg-server) is updated to 1.14. All
ports which provide X.Org drivers must be updated simultaneously, i.e.
x11-drivers/xf86-*, emulators/virtualbox-ose-additions, net/tigervnc,
etc.
The input device autodetection backend is switched from HAL to devd.
If you configure your keyboard layout through HAL .fdi files, you need
to migrate this configuration to plain X.Org configuration files.
Up-to-date instructions and a description of the changes brought by
this update are detailed in a blog post:
http://blogs.freebsdish.org/graphics/2014/11/19/xserver-1-14-update-ready/
20141219:
AFFECTS: users of net-mgmt/xymon-server
AUTHOR: feld@FreeBSD.org

2
emulators/virtualbox-ose-additions/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.20
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

18
net/tigervnc/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= tigervnc
PORTVERSION= 1.3.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= net x11-servers
MASTER_SITES= SF:tigervnc
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
@ -100,7 +100,7 @@ MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC}
CONFIGURE_ARGS+= \
--prefix=${PREFIX} --mandir=${PREFIX}/man/ \
--docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \
--disable-static --disable-dri \
--disable-static --disable-dri --disable-unit-tests \
--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
--disable-config-dbus --disable-config-hal \
@ -109,20 +109,12 @@ CONFIGURE_ARGS+= \
--with-xkb-path=${LOCALBASE}/share/X11/xkb \
--with-xkb-bin-directory=${LOCALBASE}/bin \
--with-serverconfig-path=${LOCALBASE}/lib/X11 \
--disable-selective-werror
.ifdef WITH_NEW_XORG
CONFIGURE_ARGS+= --with-fontrootdir=${LOCALBASE}/share/fonts
.else
CONFIGURE_ARGS+= --with-fontdir=${LOCALBASE}/share/fonts
.endif
--disable-selective-werror \
--with-fontrootdir=${LOCALBASE}/share/fonts
.include <bsd.port.pre.mk>
.ifdef WITH_NEW_XORG
TIGERVNC_XORG_PATCH_VER= 112
.else
TIGERVNC_XORG_PATCH_VER= 17
.endif
TIGERVNC_XORG_PATCH_VER= 114
# import from x11-server/xorg-server/Makefile
.ifdef WITH_OPENSSL_BASE

11
net/tigervnc/files/patch-unix_xserver114.patch Normal file
View File

@ -0,0 +1,11 @@
--- unix/xserver114.patch.orig 2013-05-08 11:23:13 UTC
+++ unix/xserver114.patch
@@ -66,7 +66,7 @@ diff -up xserver/mi/miinitext.c.vnc xser
#include "globals.h"
+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
++extern void vncExtensionInit(void);
+#endif
+
/* The following is only a small first step towards run-time

3
x11-drivers/Makefile
View File

@ -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

2
x11-drivers/xf86-input-acecad/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-input-acecad/pkg-plist
View File

@ -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

24
x11-drivers/xf86-input-egalax/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-egalax/distinfo
View File

@ -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

1
x11-drivers/xf86-input-egalax/pkg-descr
View File

@ -1 +0,0 @@
This package contains the X.Org xf86-input-egalax driver. See also uep(4).

5
x11-drivers/xf86-input-egalax/pkg-plist
View File

@ -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

14
x11-drivers/xf86-input-elographics/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-elographics/distinfo
View File

@ -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

3
x11-drivers/xf86-input-elographics/pkg-plist
View File

@ -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

8
x11-drivers/xf86-input-fpit/Makefile
View File

@ -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>

4
x11-drivers/xf86-input-fpit/pkg-plist
View File

@ -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

15
x11-drivers/xf86-input-hyperpen/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-hyperpen/distinfo
View File

@ -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

75
x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
View File

@ -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

3
x11-drivers/xf86-input-hyperpen/pkg-plist
View File

@ -1,4 +1 @@
lib/xorg/modules/input/hyperpen_drv.so
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

14
x11-drivers/xf86-input-joystick/Makefile
View File

@ -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

2
x11-drivers/xf86-input-joystick/distinfo
View File

@ -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

3
x11-drivers/xf86-input-joystick/pkg-plist
View File

@ -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

2
x11-drivers/xf86-input-keyboard/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-input-keyboard
PORTVERSION= 1.8.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-input-keyboard/pkg-plist
View File

@ -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

2
x11-drivers/xf86-input-mouse/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-input-mouse
PORTVERSION= 1.9.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

4
x11-drivers/xf86-input-mouse/pkg-plist
View File

@ -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

8
x11-drivers/xf86-input-mutouch/Makefile
View File

@ -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>

3
x11-drivers/xf86-input-mutouch/pkg-plist
View File

@ -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

14
x11-drivers/xf86-input-penmount/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-penmount/distinfo
View File

@ -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

3
x11-drivers/xf86-input-penmount/pkg-plist
View File

@ -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

17
x11-drivers/xf86-input-synaptics/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-synaptics/distinfo
View File

@ -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

11
x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
View File

@ -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

8
x11-drivers/xf86-input-synaptics/pkg-plist
View File

@ -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

10
x11-drivers/xf86-input-vmmouse/Makefile
View File

@ -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>

6
x11-drivers/xf86-input-vmmouse/pkg-plist
View File

@ -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

14
x11-drivers/xf86-input-void/Makefile
View File

@ -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>

2
x11-drivers/xf86-input-void/distinfo
View File

@ -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

3
x11-drivers/xf86-input-void/pkg-plist
View File

@ -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

1
x11-drivers/xf86-input-wacom/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= xf86-input-wacom
PORTVERSION= 0.27.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= SF/linuxwacom/${PORTNAME}

2
x11-drivers/xf86-video-apm/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-apm
PORTVERSION= 1.2.5
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

12
x11-drivers/xf86-video-apm/files/patch-src_apm.h Normal file
View File

@ -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"

3
x11-drivers/xf86-video-apm/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-ark/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-ark
PORTVERSION= 0.7.5
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

18
x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c Normal file
View File

@ -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) {

3
x11-drivers/xf86-video-ark/pkg-plist
View File

@ -1,4 +1 @@
lib/xorg/modules/drivers/ark_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-ati-ums/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-ati
PORTVERSION= 6.14.6
PORTREVISION= 4
PORTREVISION= 5
PKGNAMESUFFIX= -ums
CATEGORIES= x11-drivers

37
x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c
View File

@ -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) {

13
x11-drivers/xf86-video-ati-ums/files/patch-configure Normal file
View File

@ -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; }

11
x11-drivers/xf86-video-ati-ums/files/patch-configure.ac Normal file
View File

@ -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

6
x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c
View File

@ -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;

10
x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c Normal file
View File

@ -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 */

1
x11-drivers/xf86-video-ati/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= xf86-video-ati
PORTVERSION= 7.5.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

2
x11-drivers/xf86-video-chips/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-chips
PORTVERSION= 1.2.5
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

28
x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c Normal file
View File

@ -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);

3
x11-drivers/xf86-video-chips/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-cirrus/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-cirrus/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-dummy/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.7
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-dummy/pkg-plist
View File

@ -1,4 +1 @@
lib/xorg/modules/drivers/dummy_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-fbdev/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-fbdev
PORTVERSION= 0.4.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-fbdev/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-glint/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-glint
PORTVERSION= 1.2.8
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

19
x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c Normal file
View File

@ -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);

3
x11-drivers/xf86-video-glint/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-i128/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-i128
PORTVERSION= 1.3.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

19
x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c Normal file
View File

@ -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);

3
x11-drivers/xf86-video-i128/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-i740/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

21
x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c Normal file
View File

@ -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);

3
x11-drivers/xf86-video-i740/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-intel/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= xf86-video-intel
PORTVERSION= 2.21.15
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

2
x11-drivers/xf86-video-mach64/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-mach64/pkg-plist
View File

@ -1,4 +1 @@
lib/xorg/modules/drivers/mach64_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-mga/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-mga
PORTVERSION= 1.6.3
PORTREVISION= 4
PORTREVISION= 5
PORTEPOCH= 3
CATEGORIES= x11-drivers

3
x11-drivers/xf86-video-mga/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-neomagic/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-neomagic/pkg-plist
View File

@ -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

18
x11-drivers/xf86-video-newport/Makefile
View File

@ -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>

2
x11-drivers/xf86-video-newport/distinfo
View File

@ -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

1
x11-drivers/xf86-video-newport/pkg-descr
View File

@ -1 +0,0 @@
This package contains the X.Org xf86-video-newport driver.

5
x11-drivers/xf86-video-newport/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-nv/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

14
x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
View File

@ -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);

18
x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c Normal file
View File

@ -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);

12
x11-drivers/xf86-video-nv/files/patch-src_nv__include.h Normal file
View File

@ -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"

10
x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c Normal file
View File

@ -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);

12
x11-drivers/xf86-video-nv/files/patch-src_riva__include.h Normal file
View File

@ -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"

3
x11-drivers/xf86-video-nv/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-openchrome/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.3.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-openchrome/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-r128/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.9.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-r128/pkg-plist
View File

@ -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

2
x11-drivers/xf86-video-rendition/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.5
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

10
x11-drivers/xf86-video-rendition/files/patch-src_rendition.c Normal file
View File

@ -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 */

12
x11-drivers/xf86-video-rendition/files/patch-src_rendition.h Normal file
View File

@ -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"

Some files were not shown because too many files have changed in this diff Show More