cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Matrox G550 cursor in the non-WITH_MATROX_GXX_DRIVER case.

Browse Source 
PR:		37542
Submitted by:	Peter Johnson <freebsd@bilogic.org>
This commit is contained in:
Eric Anholt 2002-09-19 07:55:42 +00:00
parent a6fd0ce91b
commit 23bd3ea704
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=66687
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-servers/XFree86-4-Server-snap/Makefile
View File

@ -167,7 +167,7 @@ pre-everything::
@${ECHO_MSG} "4.2.0! ENABLE AT YOUR OWN RISK!"
@${ECHO_MSG} "********************************************************"
.if ${BuildXF86DRI} == YES
.if ${ARCH} == i386
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
@ -180,7 +180,7 @@ pre-fetch::
@${ECHO_MSG} "This has been tested on a G400 AGP card."
@${ECHO_MSG} "********************************************************"
.else
NO_PACKAGE= "Matrox drivers may not be distributed."
NO_PACKAGE= "Matrox drivers may not be distributed"
RESTRICTED= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
MGA_DRIVER_VERSION= 2.0
@ -202,6 +202,10 @@ HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
.endif
.if ${HaveMatroxHal} == NO
EXTRA_PATCHES+= ${.CURDIR}/files/patch-mga_driver.c
.endif
post-extract::
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c

10
x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c Normal file
View File

@ -0,0 +1,10 @@
--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002
@@ -2745,6 +2745,7 @@
case PCI_CHIP_MGAG200:
case PCI_CHIP_MGAG200_PCI:
case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW,
pMga->FbCursorOffset >> 10);

8
x11-servers/XFree86-4-Server/Makefile
View File

@ -167,7 +167,7 @@ pre-everything::
@${ECHO_MSG} "4.2.0! ENABLE AT YOUR OWN RISK!"
@${ECHO_MSG} "********************************************************"
.if ${BuildXF86DRI} == YES
.if ${ARCH} == i386
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
@ -180,7 +180,7 @@ pre-fetch::
@${ECHO_MSG} "This has been tested on a G400 AGP card."
@${ECHO_MSG} "********************************************************"
.else
NO_PACKAGE= "Matrox drivers may not be distributed."
NO_PACKAGE= "Matrox drivers may not be distributed"
RESTRICTED= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
MGA_DRIVER_VERSION= 2.0
@ -202,6 +202,10 @@ HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
.endif
.if ${HaveMatroxHal} == NO
EXTRA_PATCHES+= ${.CURDIR}/files/patch-mga_driver.c
.endif
post-extract::
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c

10
x11-servers/XFree86-4-Server/files/patch-mga_driver.c Normal file
View File

@ -0,0 +1,10 @@
--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002
@@ -2745,6 +2745,7 @@
case PCI_CHIP_MGAG200:
case PCI_CHIP_MGAG200_PCI:
case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW,
pMga->FbCursorOffset >> 10);