rpms/xorg-x11-drv-mga/devel abi.patch, NONE, 1.1 sources, 1.12, 1.13 xorg-x11-drv-mga.spec, 1.30, 1.31 mga-1.4.7-alloca.patch, 1.1, NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE
Dave Airlie
airlied at fedoraproject.org
Tue Jun 23 00:28:03 UTC 2009
- Previous message (by thread): rpms/gstreamer-plugins-farsight/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE gstreamer-plugins-farsight.spec, 1.21, NONE sources, 1.12, NONE
- Next message (by thread): rpms/xorg-x11-drv-nv/devel abi.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.85, 1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-mga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16407
Modified Files:
sources xorg-x11-drv-mga.spec
Added Files:
abi.patch
Removed Files:
mga-1.4.7-alloca.patch mga-1.4.7-death-to-cfb.patch
Log Message:
* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 1.4.10-2
- fixup ABI for rawhide
abi.patch:
--- NEW FILE abi.patch ---
diff -up xf86-video-mga-1.4.10/src/mga_driver.c.hal xf86-video-mga-1.4.10/src/mga_driver.c
--- xf86-video-mga-1.4.10/src/mga_driver.c.hal 2009-04-28 03:37:38.000000000 +1000
+++ xf86-video-mga-1.4.10/src/mga_driver.c 2009-06-23 10:19:53.000000000 +1000
@@ -526,190 +526,8 @@ static const OptionInfoRec MGAOptions[]
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-#ifdef USE_EXA
-static const char *exaSymbols[] = {
- "exaDriverInit",
- "exaDriverFini",
- "exaGetPixmapOffset",
- "exaGetVersion",
- NULL
-};
-#endif
-
-#ifdef USE_XAA
-static const char *xaaSymbols[] = {
- "XAACachePlanarMonoStipple",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- "XAAMoveDWORDS",
- "XAA_888_plus_PICT_a8_to_8888",
- NULL
-};
-#endif
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBind",
- "drmAgpDeviceId",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmAgpVendorId",
- "drmCommandNone",
- "drmCommandWrite",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetDeviceInfo",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-#endif
-
#define MGAuseI2C 1
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
-#if MGAuseI2C
- "xf86DoEDID_DDC2",
-#endif
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-#endif
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWGetVidmem",
- "fbdevHWInit",
- "fbdevHWLeaveVTWeak",
- "fbdevHWLoadPaletteWeak",
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSwitchModeWeak",
- "fbdevHWUnmapMMIO",
- "fbdevHWUnmapVidmem",
- "fbdevHWUseBuildinMode",
- "fbdevHWValidModeWeak",
- NULL
-};
-
-#ifdef USEMGAHAL
-static const char *halSymbols[] = {
- "MGACloseLibrary",
- "MGAGetBOARDHANDLESize",
- "MGAGetHardwareInfo",
- "MGAOpenLibrary",
- "MGARestoreVgaState",
- "MGASaveVgaState",
- "MGASetMode",
- "MGASetVgaMode",
- "MGAValidateMode",
- "MGAValidateVideoParameters",
- "HALSetDisplayStart",
- NULL
-};
-#endif
#ifdef XFree86LOADER
static MODULESETUPPROTO(mgaSetup);
@@ -747,28 +565,6 @@ mgaSetup(pointer module, pointer opts, i
*/
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols,
-#ifdef USE_XAA
- xaaSymbols,
-#endif
-#ifdef USE_EXA
- exaSymbols,
-#endif
- ramdacSymbols, ddcSymbols, i2cSymbols,
- shadowSymbols, fbdevHWSymbols, vbeSymbols,
- fbSymbols, int10Symbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols,
-#endif
-#ifdef USEMGAHAL
- halSymbols,
-#endif
- NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -1416,9 +1212,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
/* Load DDC if we have the code to use it */
/* This gives us DDC1 */
if (pMga->ddc1Read || pMga->i2cInit) {
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "ddc")) {
/* ddc module not found, we can do without it */
pMga->ddc1Read = NULL;
pMga->DDC_Bus1 = NULL;
@@ -1432,9 +1226,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
/* - DDC can use I2C bus */
/* Load I2C if we have the code to use it */
if (pMga->i2cInit) {
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "i2c") ) {
/* i2c module not found, we can do without it */
pMga->i2cInit = NULL;
pMga->DDC_Bus1 = NULL;
@@ -1723,8 +1515,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -1831,7 +1621,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
}
if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
- xf86LoaderReqSymLists(halSymbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
pMga->HALLoaded = TRUE;
} else {
@@ -2026,7 +1815,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
/* check for linux framebuffer device */
if (!xf86LoadSubModule(pScrn, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, pMga->PciInfo, NULL))
return FALSE;
}
@@ -2127,7 +1915,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pMga->pEnt->index);
if (pInt) pMga->softbooted = TRUE;
@@ -2897,8 +2684,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA if needed */
if (!pMga->NoAccel) {
@@ -2907,14 +2692,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "exa")) {
MGAFreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(exaSymbols, NULL);
+ }
} else {
#endif
#ifdef USE_XAA
if (!xf86LoadSubModule(pScrn, "xaa")) {
MGAFreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(xaaSymbols, NULL);
+ }
#endif
#ifdef USE_EXA
}
@@ -2927,7 +2712,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -2936,15 +2720,12 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
#ifdef XF86DRI
/* Load the dri module if requested. */
if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) {
- if (xf86LoadSubModule(pScrn, "dri")) {
- xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
- }
+ xf86LoadSubModule(pScrn, "dri");
}
#endif
pMga->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 8 Feb 2009 07:59:42 -0000 1.12
+++ sources 23 Jun 2009 00:27:32 -0000 1.13
@@ -1 +1 @@
-11066b84b949cd04300ec819c9c51532 xf86-video-mga-1.4.9.tar.bz2
+e2515e7476185a2d0482a3004a84cfd9 xf86-video-mga-1.4.10.tar.bz2
Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xorg-x11-drv-mga.spec 24 Feb 2009 15:09:48 -0000 1.30
+++ xorg-x11-drv-mga.spec 23 Jun 2009 00:27:32 -0000 1.31
@@ -6,7 +6,7 @@
Summary: Xorg X11 mga video driver
Name: xorg-x11-drv-mga
-Version: 1.4.9
+Version: 1.4.10
Release: 2%{?dist}
URL: http://www.x.org
License: MIT
@@ -19,6 +19,7 @@ Source1: mga.xinf
Patch0: mga-1.4.5-no-hal-advertising.patch
Patch1: mga-1.4.6.1-get-client-pointer.patch
+Patch2: abi.patch
ExcludeArch: s390 s390x
@@ -37,6 +38,7 @@ X.Org X11 mga video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .hal
%patch1 -p1 -b .gcp
+%patch2 -p1 -b .abi
%build
autoreconf -v --install || exit 1
@@ -63,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/mga.4*
%changelog
+* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 1.4.10-2
+- fixup ABI for rawhide
+
+* Mon Apr 27 2009 Adam Jackson <ajax at redhat.com> 1.4.10-1
+- mga 1.4.10
+
* Tue Feb 24 2009 Adam Jackson <ajax at redhat.com> 1.4.9-2
- Fix ftbfs
--- mga-1.4.7-alloca.patch DELETED ---
--- mga-1.4.7-death-to-cfb.patch DELETED ---
- Previous message (by thread): rpms/gstreamer-plugins-farsight/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE gstreamer-plugins-farsight.spec, 1.21, NONE sources, 1.12, NONE
- Next message (by thread): rpms/xorg-x11-drv-nv/devel abi.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.85, 1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list