rpms/xorg-x11-drv-mga/devel mga-1.4.7-alloca.patch, NONE, 1.1 mga-1.4.7-death-to-cfb.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xorg-x11-drv-mga.spec, 1.23, 1.24
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Wed Jan 2 16:22:49 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-mga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21604/devel
Modified Files:
.cvsignore sources xorg-x11-drv-mga.spec
Added Files:
mga-1.4.7-alloca.patch mga-1.4.7-death-to-cfb.patch
Log Message:
today's git snapshot
mga-1.4.7-alloca.patch:
--- NEW FILE mga-1.4.7-alloca.patch ---
diff -up xf86-video-mga-20071210/src/mga_dri.c.jx xf86-video-mga-20071210/src/mga_dri.c
--- xf86-video-mga-20071210/src/mga_dri.c.jx 2008-01-02 11:08:27.000000000 -0500
+++ xf86-video-mga-20071210/src/mga_dri.c 2008-01-02 11:17:21.000000000 -0500
@@ -976,11 +976,11 @@ static void MGADRIMoveBuffersXAA(WindowP
if (nbox>1) {
/* Keep ordering in each band, reverse order of bands */
- pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
+ pboxNew1 = xalloc(sizeof(BoxRec)*nbox);
if (!pboxNew1) return;
- pptNew1 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+ pptNew1 = xalloc(sizeof(DDXPointRec)*nbox);
if (!pptNew1) {
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pboxNew1);
return;
}
pboxBase = pboxNext = pbox+nbox-1;
@@ -1011,14 +1011,14 @@ static void MGADRIMoveBuffersXAA(WindowP
if (nbox > 1) {
/*reverse orderof rects in each band */
- pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
- pptNew2 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+ pboxNew2 = xalloc(sizeof(BoxRec)*nbox);
+ pptNew2 = xalloc(sizeof(DDXPointRec)*nbox);
if (!pboxNew2 || !pptNew2) {
- if (pptNew2) DEALLOCATE_LOCAL(pptNew2);
- if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
+ if (pptNew2) xfree(pptNew2);
+ if (pboxNew2) xfree(pboxNew2);
if (pboxNew1) {
- DEALLOCATE_LOCAL(pptNew1);
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pptNew1);
+ xfree(pboxNew1);
}
return;
}
@@ -1069,12 +1069,12 @@ static void MGADRIMoveBuffersXAA(WindowP
MGASelectBuffer(pScrn, MGA_FRONT);
if (pboxNew2) {
- DEALLOCATE_LOCAL(pptNew2);
- DEALLOCATE_LOCAL(pboxNew2);
+ xfree(pptNew2);
+ xfree(pboxNew2);
}
if (pboxNew1) {
- DEALLOCATE_LOCAL(pptNew1);
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pptNew1);
+ xfree(pboxNew1);
}
pMga->AccelInfoRec->NeedToSync = TRUE;
mga-1.4.7-death-to-cfb.patch:
--- NEW FILE mga-1.4.7-death-to-cfb.patch ---
diff -up xf86-video-mga-20071210/src/mga_dri.c.jx xf86-video-mga-20071210/src/mga_dri.c
--- xf86-video-mga-20071210/src/mga_dri.c.jx 2007-12-10 14:30:30.000000000 -0500
+++ xf86-video-mga-20071210/src/mga_dri.c 2008-01-02 11:04:02.000000000 -0500
@@ -38,11 +38,6 @@
#include "xf86PciInfo.h"
#include "xf86Pci.h"
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-#include "cfb16.h"
-#include "cfb32.h"
#include "miline.h"
diff -up xf86-video-mga-20071210/src/mga_storm.c.jx xf86-video-mga-20071210/src/mga_storm.c
--- xf86-video-mga-20071210/src/mga_storm.c.jx 2007-12-10 14:30:30.000000000 -0500
+++ xf86-video-mga-20071210/src/mga_storm.c 2008-01-02 11:04:43.000000000 -0500
@@ -1,7 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.99tsi Exp $ */
-
-#define PSZ 8
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -27,7 +23,6 @@
#include "servermd.h"
#ifdef XF86DRI
-#include "cfb.h"
#include "GL/glxtokens.h"
#endif
diff -up xf86-video-mga-20071210/src/mga_driver.c.jx xf86-video-mga-20071210/src/mga_driver.c
--- xf86-video-mga-20071210/src/mga_driver.c.jx 2008-01-02 11:04:02.000000000 -0500
+++ xf86-video-mga-20071210/src/mga_driver.c 2008-01-02 11:04:02.000000000 -0500
@@ -96,8 +96,6 @@
#include "shadowfb.h"
#include "fbdevhw.h"
-#include "cfb8_32.h"
-
#ifdef XF86DRI
#include "dri.h"
#endif
@@ -357,12 +355,6 @@ static const char *fbSymbols[] = {
NULL
};
-static const char *xf8_32bppSymbols[] = {
- "cfb8_32ScreenInit",
- "xf86Overlay8Plus32Init",
- NULL
-};
-
#ifdef USE_EXA
static const char *exaSymbols[] = {
"exaDriverInit",
@@ -559,7 +551,7 @@ mgaSetup(pointer module, pointer opts, i
#ifdef USE_EXA
exaSymbols,
#endif
- xf8_32bppSymbols, ramdacSymbols,
+ ramdacSymbols,
ddcSymbols, i2cSymbols, shadowSymbols,
fbdevHWSymbols, vbeSymbols,
fbSymbols, int10Symbols,
@@ -2641,11 +2633,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
/* Load the required framebuffer */
if (pMga->Overlay8Plus24) {
- if (!xf86LoadSubModule(pScrn, "xf8_32bpp")) {
- MGAFreeRec(pScrn);
- return FALSE;
- }
- xf86LoaderReqSymLists(xf8_32bppSymbols, NULL);
+ return FALSE;
} else {
if (!xf86LoadSubModule(pScrn, "fb")) {
MGAFreeRec(pScrn);
@@ -3680,16 +3668,9 @@ MGAScreenInit(int scrnIndex, ScreenPtr p
#endif
- if (pMga->Overlay8Plus24) {
- ret = cfb8_32ScreenInit(pScreen, FBStart,
- width, height,
- pScrn->xDpi, pScrn->yDpi,
- displayWidth);
- } else {
ret = fbScreenInit(pScreen, FBStart, width, height,
pScrn->xDpi, pScrn->yDpi,
displayWidth, pScrn->bitsPerPixel);
- }
if (!ret)
return FALSE;
@@ -3773,11 +3754,6 @@ MGAScreenInit(int scrnIndex, ScreenPtr p
NULL, f))
return FALSE;
- if(pMga->Overlay8Plus24) { /* Must come after colormap initialization */
- if(!xf86Overlay8Plus32Init(pScreen))
- return FALSE;
- }
-
if(pMga->ShadowFB) {
RefreshAreaFuncPtr refreshArea = MGARefreshArea;
diff -up xf86-video-mga-20071210/src/mga_esc.c.jx xf86-video-mga-20071210/src/mga_esc.c
--- xf86-video-mga-20071210/src/mga_esc.c.jx 2007-12-10 14:30:30.000000000 -0500
+++ xf86-video-mga-20071210/src/mga_esc.c 2008-01-02 11:04:02.000000000 -0500
@@ -41,7 +41,6 @@
#include "vbe.h"
#include "fb.h"
-#include "cfb8_32.h"
#include "dixstruct.h"
#include "mga_reg.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 6 Jan 2007 04:48:54 -0000 1.9
+++ .cvsignore 2 Jan 2008 16:21:56 -0000 1.10
@@ -1 +1 @@
-xf86-video-mga-1.4.6.1.tar.bz2
+xf86-video-mga-20080102.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 6 Jan 2007 04:48:54 -0000 1.9
+++ sources 2 Jan 2008 16:21:56 -0000 1.10
@@ -1 +1 @@
-a678b429a35648f96d3ebf328300de46 xf86-video-mga-1.4.6.1.tar.bz2
+f7620c22631712c33d159268922ebd28 xf86-video-mga-20080102.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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-mga.spec 22 Aug 2007 19:46:59 -0000 1.23
+++ xorg-x11-drv-mga.spec 2 Jan 2008 16:21:56 -0000 1.24
@@ -2,39 +2,48 @@
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
+%define gitdate 20080102
+
Summary: Xorg X11 mga video driver
Name: xorg-x11-drv-mga
-Version: 1.4.6.1
-Release: 6%{?dist}
+Version: 1.4.7
+Release: 0.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1: mga.xinf
+#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0: %{tarball}-%{gitdate}.tar.bz2
+Source1: mga.xinf
Patch0: mga-1.4.5-no-hal-advertising.patch
Patch1: mga-1.4.6.1-get-client-pointer.patch
+Patch2: mga-1.4.7-death-to-cfb.patch
+Patch3: mga-1.4.7-alloca.patch
ExcludeArch: s390 s390x
-BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: autoconf automake libtool
+BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
BuildRequires: mesa-libGL-devel >= 6.4-4
BuildRequires: libdrm-devel >= 2.0-1
Requires: hwdata
-Requires: xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires: xorg-x11-server-Xorg >= 1.4.99.1
%description
X.Org X11 mga video driver.
%prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{gitdate}
%patch0 -p1 -b .hal
%patch1 -p1 -b .gcp
+%patch2 -p1 -b .cfb
+%patch3 -p1 -b .alloca
%build
+autoreconf -v --install || exit 1
%configure --disable-static
make %{?_smp_mflags}
@@ -60,6 +69,11 @@
%{_mandir}/man4/mga.4*
%changelog
+* Wed Jan 02 2008 Adam Jackson <ajax at redhat.com> 1.4.7-0.20080102
+- Today's git snapshot for pciaccess goodness.
+- mga-1.4.7-death-to-cfb.patch: Remove what little cfb support there was.
+- mga-1.4.7-alloca.patch: Fix ALLOCATE_LOCAL references.
+
* Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.4.6.1-6
- Rebuild for PPC toolchain bug
More information about the fedora-extras-commits
mailing list