rpms/xorg-x11-drv-vermilion/devel vermilion-1.0.0-no-wfb.patch, NONE, 1.1 vermilion.xinf, NONE, 1.1 xorg-x11-drv-vermilion.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Sat May 26 17:48:50 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-vermilion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4480/devel
Modified Files:
.cvsignore sources
Added Files:
vermilion-1.0.0-no-wfb.patch vermilion.xinf
xorg-x11-drv-vermilion.spec
Log Message:
Initial import.
vermilion-1.0.0-no-wfb.patch:
--- NEW FILE vermilion-1.0.0-no-wfb.patch ---
--- xf86-video-vermilion-1.0.0/src/vermilion.c.jx 2007-03-28 10:08:27.000000000 -0400
+++ xf86-video-vermilion-1.0.0/src/vermilion.c 2007-05-21 16:52:09.000000000 -0400
@@ -171,12 +171,6 @@
NULL
};
-static const char *wfbSymbols[] = {
- "wfbPictureInit",
- "wfbScreenInit",
- NULL
-};
-
static const char *shadowSymbols[] = {
"shadowAdd",
"shadowAlloc",
@@ -234,7 +228,7 @@
if (!Initialised) {
Initialised = TRUE;
xf86AddDriver(&VERMILION, Module, 0);
- LoaderRefSymLists(fbSymbols, wfbSymbols, ddcSymbols, shadowSymbols, xaaSymbols,
+ LoaderRefSymLists(fbSymbols, ddcSymbols, shadowSymbols, xaaSymbols,
NULL);
return (pointer) TRUE;
}
@@ -520,7 +514,7 @@
int mbxCount;
MessageType from;
unsigned ssVendor, ssDevice;
- const char *ssName, *fbmod, **fbsym;
+ const char *ssName;
ClockRangePtr clockRanges;
@@ -593,29 +587,21 @@
return FALSE;
}
- if (!xf86SetDepthBpp(pScrn, 15, 0, 0, Support32bppFb)) {
+ if (!xf86SetDepthBpp(pScrn, 24, 0, 0, Support32bppFb)) {
return (FALSE);
}
- if (pScrn->depth != 15 && pScrn->depth != 24) {
+ if (pScrn->depth != 24) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Invalid depth %d, only 15 and 24 supported\n", pScrn->depth);
+ "Invalid depth %d, only 24 supported\n", pScrn->depth);
return (FALSE);
}
xf86PrintDepthBpp(pScrn);
- if (pScrn->depth == 15) {
- fbmod = "wfb";
- fbsym = wfbSymbols;
- } else {
- fbmod = "fb";
- fbsym = fbSymbols;
- }
-
/* Load (w)fb module */
- if (!xf86LoadSubModule(pScrn, fbmod))
+ if (!xf86LoadSubModule(pScrn, "fb"))
return (FALSE);
- xf86LoaderReqSymLists(fbsym, NULL);
+ xf86LoaderReqSymLists(fbSymbols, NULL);
pScrn->chipset = "vermilion";
pScrn->monitor = pScrn->confScreen->monitor;
@@ -965,36 +951,6 @@
memcpy(dst, &value, size);
}
-static void
-VERMILIONSetupWrap(ReadMemoryProcPtr *pRead, WriteMemoryProcPtr *pWrite,
- DrawablePtr pDraw)
-{
- ScreenPtr pScreen = pDraw->pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pDraw->pScreen->myNum];
- VERMILIONPtr pVermilion = VERMILIONGetRec(pScrn);
- PixmapPtr pPixmap;
-
- if (pDraw->type == DRAWABLE_WINDOW)
- pPixmap = pScreen->GetWindowPixmap((WindowPtr)pDraw);
- else
- pPixmap = (PixmapPtr)pDraw;
-
- if (pScrn->depth == 15 && pPixmap->devPrivate.ptr >= pVermilion->fbMap &&
- (char*)pPixmap->devPrivate.ptr < ((char*)pVermilion->fbMap +
- pVermilion->fbSize)) {
- *pWrite = VERMILIONWriteMemorySetAlpha;
- } else {
- *pWrite = VERMILIONWriteMemoryPassthru;
- }
-
- *pRead = VERMILIONReadMemory;
-}
-
-static void
-VERMILIONFinishWrap(DrawablePtr pDraw)
-{
-}
-
static Bool
VERMILIONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{
@@ -1072,12 +1028,7 @@
fbstart = pVermilion->fbMap;
}
- if (!(pScrn->depth == 15 ?
- wfbScreenInit(pScreen, fbstart, pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
- pScrn->bitsPerPixel, VERMILIONSetupWrap,
- VERMILIONFinishWrap) :
- fbScreenInit(pScreen, fbstart, pScrn->virtualX, pScrn->virtualY,
+ if (!(fbScreenInit(pScreen, fbstart, pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
pScrn->bitsPerPixel)))
return (FALSE);
@@ -1096,10 +1047,7 @@
}
/* must be after RGB ordering fixed */
- if (pScrn->depth == 15)
- wfbPictureInit(pScreen, 0, 0);
- else
- fbPictureInit(pScreen, 0, 0);
+ fbPictureInit(pScreen, 0, 0);
if (pVermilion->shadowFB &&
(!shadowSetup(pScreen) || !shadowAdd(pScreen, NULL,
--- NEW FILE vermilion.xinf ---
alias pcivideo:v00008086d00005009sv*sd*bc*sc*i* vermilion
--- NEW FILE xorg-x11-drv-vermilion.spec ---
%define driverdir %(pkg-config xorg-server --variable=moduledir)/drivers
Name: xorg-x11-drv-vermilion
Version: 1.0.0
Release: 2%{?dist}
Summary: Xorg driver for Intel Vermilion Range chipset
Group: User Interface/X Hardware Support
License: MIT
URL: http://www.x.org/
Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-vermilion-%{version}.tar.bz2
Source1: vermilion.xinf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: %{ix86}
BuildRequires: pkgconfig xorg-x11-server-sdk >= 1.3.0.0
Requires: xorg-x11-server-Xorg >= 1.3.0.0
Requires: hwdata
Patch0: vermilion-1.0.0-no-wfb.patch
%description
Xorg driver for Intel Vermilion Range chipset.
%prep
%setup -q -n xf86-video-vermilion-%{version}
%patch0 -p1 -b .jx
%build
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{driverdir}/vermilion_drv.so
%{_mandir}/man4/vermilion.4*
%{_datadir}/hwdata/videoaliases/vermilion.xinf
%changelog
* Tue May 22 2007 Adam Jackson <ajax at redhat.com> 1.0.0-2
- Review feedback (#240808)
* Fri May 18 2007 Adam Jackson <ajax at redhat.com> 1.0.0-1
- Initial import of xf86-video-vermilion.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vermilion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 May 2007 18:10:41 -0000 1.1
+++ .cvsignore 26 May 2007 17:48:16 -0000 1.2
@@ -0,0 +1 @@
+xf86-video-vermilion-1.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vermilion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 May 2007 18:10:41 -0000 1.1
+++ sources 26 May 2007 17:48:16 -0000 1.2
@@ -0,0 +1 @@
+3a45adbfbcae487cf04dbcd089533c3d xf86-video-vermilion-1.0.0.tar.bz2
More information about the fedora-extras-commits
mailing list