rpms/xorg-x11-drv-cirrus/devel abi.patch, NONE, 1.1 xorg-x11-drv-cirrus.spec, 1.28, 1.29
Adam Jackson
ajax at fedoraproject.org
Mon Jun 22 21:56:32 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30753
Modified Files:
xorg-x11-drv-cirrus.spec
Added Files:
abi.patch
Log Message:
* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 1.3.0-2
- Fix ABI for new server
abi.patch:
--- NEW FILE abi.patch ---
diff -up xf86-video-cirrus-1.3.0/src/alp_driver.c.jx xf86-video-cirrus-1.3.0/src/alp_driver.c
--- xf86-video-cirrus-1.3.0/src/alp_driver.c.jx 2009-05-18 10:33:18.000000000 -0400
+++ xf86-video-cirrus-1.3.0/src/alp_driver.c 2009-06-22 17:55:11.000000000 -0400
@@ -270,9 +270,6 @@ alpSetup(pointer module, pointer opts, i
static Bool setupDone = FALSE;
if (!setupDone) {
setupDone = TRUE;
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- miscfbSymbols, ramdacSymbols,int10Symbols,
- ddcSymbols, i2cSymbols, shadowSymbols, NULL);
}
return (pointer)1;
}
@@ -549,7 +546,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
/*
* Allocate a vgaHWRec
@@ -582,7 +578,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_FUNC(pCir->PciInfo));
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols,NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pCir->pEnt->index);
xf86FreeInt10(pInt);
@@ -803,13 +798,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(i2cSymbols,NULL);
if (!xf86LoadSubModule(pScrn, "ddc")) {
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if(!AlpI2CInit(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1116,7 +1109,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf1bppScreenInit",NULL);
break;
#endif
#ifdef HAVE_XF4BPP
@@ -1125,7 +1117,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf4bppScreenInit",NULL);
break;
#endif
case 8:
@@ -1136,7 +1127,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -1146,7 +1136,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -1155,7 +1144,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pCir->shadowFB) {
@@ -1163,7 +1151,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;
diff -up xf86-video-cirrus-1.3.0/src/cir_driver.c.jx xf86-video-cirrus-1.3.0/src/cir_driver.c
--- xf86-video-cirrus-1.3.0/src/cir_driver.c.jx 2008-08-01 22:10:12.000000000 -0400
+++ xf86-video-cirrus-1.3.0/src/cir_driver.c 2009-06-22 17:55:11.000000000 -0400
@@ -171,7 +171,6 @@ cirSetup(pointer module, pointer opts, i
setupDone = TRUE;
xf86AddDriver(&CIRRUS, module, 0);
- LoaderRefSymLists(alpSymbols, lgSymbols, vbeSymbols, NULL);
return (pointer)1;
}
if (errmaj) *errmaj = LDR_ONCEONLY;
@@ -236,13 +235,11 @@ CIRProbe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT) {
if (!lg_loaded) {
if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) {
- xf86LoaderReqSymLists(lgSymbols, NULL);
lg_loaded = TRUE;
}
}
if (!alp_loaded) {
if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) {
- xf86LoaderReqSymLists(alpSymbols, NULL);
alp_loaded = TRUE;
}
}
@@ -288,7 +285,6 @@ CIRProbe(DriverPtr drv, int flags)
if (!lg_loaded) {
if (!xf86LoadDrvSubModule(drv, "cirrus_laguna"))
continue;
- xf86LoaderReqSymLists(lgSymbols, NULL);
lg_loaded = TRUE;
}
pScrn = LgProbe(usedChips[i]);
@@ -296,7 +292,6 @@ CIRProbe(DriverPtr drv, int flags)
if (!alp_loaded) {
if (!xf86LoadDrvSubModule(drv, "cirrus_alpine"))
continue;
- xf86LoaderReqSymLists(alpSymbols, NULL);
alp_loaded = TRUE;
}
pScrn = AlpProbe(usedChips[i]);
@@ -444,7 +439,6 @@ cirProbeDDC(ScrnInfoPtr pScrn, int index
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols,NULL);
pVbe = VBEInit(NULL,index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
diff -up xf86-video-cirrus-1.3.0/src/lg_driver.c.jx xf86-video-cirrus-1.3.0/src/lg_driver.c
--- xf86-video-cirrus-1.3.0/src/lg_driver.c.jx 2008-08-01 22:10:12.000000000 -0400
+++ xf86-video-cirrus-1.3.0/src/lg_driver.c 2009-06-22 17:55:11.000000000 -0400
@@ -274,9 +274,6 @@ lgSetup(pointer module, pointer opts, in
if (!setupDone) {
setupDone = TRUE;
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, ddcSymbols, i2cSymbols,
- int10Symbols, NULL);
}
return (pointer)1;
}
@@ -430,7 +427,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
/*
* Allocate a vgaHWRec
@@ -463,7 +459,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
- xf86LoaderReqSymLists(int10Symbols, NULL);
int10InfoPtr = xf86InitInt10(pCir->pEnt->index);
@@ -666,14 +661,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
#if LGuseI2C
if (!xf86LoadSubModule(pScrn, "i2c")) {
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(i2cSymbols, NULL);
#endif
/* Read and print the monitor DDC information */
@@ -866,7 +859,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -876,7 +868,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -885,7 +876,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pCir->shadowFB) {
@@ -893,7 +883,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;
Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-cirrus.spec 18 May 2009 14:34:27 -0000 1.28
+++ xorg-x11-drv-cirrus.spec 22 Jun 2009 21:56:02 -0000 1.29
@@ -5,7 +5,7 @@
Summary: Xorg X11 cirrus video driver
Name: xorg-x11-drv-cirrus
Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@ Source0: ftp://ftp.x.org/pub/individua
Source1: cirrus.xinf
Patch0: cirrus-1.2.0-qemu.patch
+Patch1: abi.patch
BuildRequires: xorg-x11-server-sdk >= 1.5.99.902
BuildRequires: xorg-x11-util-macros >= 1.1.5
@@ -30,6 +31,7 @@ X.Org X11 cirrus video driver.
%prep
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .qemu
+%patch1 -p1 -b .abi
%build
%configure --disable-static
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/cirrus.4*
%changelog
+* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 1.3.0-2
+- Fix ABI for new server
+
* Mon May 18 2009 Adam Jackson <ajax at redhat.com> 1.3.0-1
- cirrus 1.3.0
More information about the fedora-extras-commits
mailing list