Attachment 24484 Details for Bug 21022 – xf86-video-mga-hal.diff

[patch] xf86-video-mga-hal.diff

xf86-video-mga-hal.diff (text/plain), 3.95 KB, created by Stefan Dirsch on 2009-04-02 19:53:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2009-04-02 19:53:26 UTC

Size: 3.95 KB

patch

obsolete

>--- ../../xf86-video-mga-X11R7.1-1.4.1.orig/src/Makefile.am	2006-04-02 03:03:50.000000000 +0200
>+++ src/Makefile.am	2006-07-27 16:27:21.000000000 +0200
>@@ -23,14 +23,14 @@
> # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
> # _ladir passes a dummy rpath to libtool so the thing will actually link
> # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
>+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DUSEMGAHAL
> mga_drv_la_LTLIBRARIES = mga_drv.la
> mga_drv_la_LDFLAGS = -module -avoid-version
> mga_drv_ladir = @moduledir@/drivers
> mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
> 
> mga_drv_la_SOURCES = \
>-         binding.h \
>+         HALlib/binding.h \
>          client.h \
>          clientlx.c \
>          mga_arc.c \
>--- ../../xf86-video-mga-X11R7.1-1.4.1.orig/src/client.h	2003-11-14 17:48:55.000000000 +0100
>+++ src/client.h	2006-07-27 15:59:49.000000000 +0200
>@@ -1,7 +1,7 @@
> #ifndef _CLIENT
> #define _CLIENT
> 
>-#include "binding.h"
>+#include "HALlib/binding.h"
> 
> #if defined(__cplusplus)
>     extern "C" {
>diff -u -r -p ../xf86-video-mga-1.4.9.orig//man/mga.man ./man/mga.man
>--- ../xf86-video-mga-1.4.9.orig//man/mga.man	2008-10-07 21:49:31.608857646 +0200
>+++ man/mga.man	2008-10-07 21:50:34.455653742 +0200
>@@ -24,7 +24,7 @@ on G200 and newer systems, with either
> .B TexturedVideo
> or video overlay.  The second head of dual\-head cards is supported for the
> G450 and G550.  Support for the second head on G400 cards requires a
>-binary\-only "mga_hal" module that is available from Matrox
>+binary\-only "mgahal" module that is available from Matrox
> <http://www.matrox.com>, and may be on the CD supplied with the card.  That
> module also provides various other enhancements, and may be necessary to
> use the DVI (digital) output on the G550 (and other cards).
>@@ -119,7 +119,7 @@ possibly unstable.  The default is
> .B XAA.
> .TP
> .BI "Option \*qNoHal\*q \*q" boolean \*q
>-Disable or enable loading the "mga_hal" module.  Default: the module is
>+Disable or enable loading the "mgahal" module.  Default: the module is
> loaded when available and when using hardware that it supports.
> .TP
> .BI "Option \*qOverclockMem\*q"
>diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_driver.c ./src/mga_driver.c
>--- ../xf86-video-mga-1.4.9.orig//src/mga_driver.c	2008-10-07 21:49:31.852868503 +0200
>+++ src/mga_driver.c	2008-10-07 21:50:51.524413133 +0200
>@@ -1800,7 +1800,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
> 					"Hal", loadHal);
> 	    from = X_CONFIG;
> 	}
>-        if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
>+        if (loadHal && xf86LoadSubModule(pScrn, "mgahal")) {
> 	  xf86LoaderReqSymLists(halSymbols, NULL);
> 	  xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
> 	  pMga->HALLoaded = TRUE;
>@@ -1822,7 +1822,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
> 	    pMga->DualHeadEnabled = TRUE;
> 	} else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
> 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>-	 "This card requires the \"mga_hal\" module for dual-head operation\n"
>+	 "This card requires the \"mgahal\" module for dual-head operation\n"
> 	 "\tIt can be found at the Matrox web site <http://www.matrox.com>\n");
> 	}
>     }
>diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c ./src/mga_halmod.c
>--- ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c	2008-10-07 21:49:32.324889503 +0200
>+++ src/mga_halmod.c	2008-10-07 21:51:29.818116810 +0200
>@@ -14,7 +14,7 @@ static MODULESETUPPROTO(halSetup);
> 
> static XF86ModuleVersionInfo halVersRec =
> {
>-	"mga_hal",
>+	"mgahal",
> 	MODULEVENDORSTRING,
> 	MODINFOSTRING1,
> 	MODINFOSTRING2,
>@@ -30,7 +30,7 @@ static XF86ModuleVersionInfo halVersRec
>  * This is the module init data.
>  * Its name has to be the driver name followed by ModuleData.
>  */
>-_X_EXPORT XF86ModuleData mga_halModuleData = { &halVersRec, halSetup, NULL };
>+_X_EXPORT XF86ModuleData mgahalModuleData = { &halVersRec, halSetup, NULL };
> 
> static pointer
> halSetup(pointer module, pointer opts, int *errmaj, int *errmin)

Actions: View | Splinter Review

Attachments on bug 21022: 24484 | 24485

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.