move to pisi-2.0 main

not builded.
This commit is contained in:
Ertuğrul Erata
2015-07-15 19:28:56 +03:00
parent 533ddafe6c
commit cbf6a0eb6c
178 changed files with 22104 additions and 0 deletions
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.configure("\
--disable-static \
--disable-dri \
")
def build():
autotools.make()
def install():
autotools.install()
pisitools.dodoc("COPYING", "ChangeLog", "README*")
@@ -0,0 +1,93 @@
This is pretty lame, sticking INREG into the blit path is probably going
to hurt performance. Which, whatever, G-series are old cards, but still.
Redo me to put the needed bits in the pMga at init time instead. - ajax
diff -up xf86-video-mga-1.4.12/src/mga_dri.c.jx xf86-video-mga-1.4.12/src/mga_dri.c
--- xf86-video-mga-1.4.12/src/mga_dri.c.jx 2008-08-15 13:55:06.000000000 -0400
+++ xf86-video-mga-1.4.12/src/mga_dri.c 2011-06-20 12:04:43.047560274 -0400
@@ -374,7 +374,8 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn
pMga->SrcOrg = 0;
OUTREG( MGAREG_DSTORG, pMga->DstOrg );
- OUTREG( MGAREG_OPMODE, MGAOPM_DMA_BLIT );
+ OUTREG( MGAREG_OPMODE,
+ (INREG(MGAREG_OPMODE) & ~MGAOPM_DMA_MASK) | MGAOPM_DMA_BLIT );
OUTREG( MGAREG_CXBNDRY, 0xFFFF0000 ); /* (maxX << 16) | minX */
OUTREG( MGAREG_YTOP, 0x00000000 ); /* minPixelPointer */
OUTREG( MGAREG_YBOT, 0x007FFFFF ); /* maxPixelPointer */
diff -up xf86-video-mga-1.4.12/src/mga_exa.c.jx xf86-video-mga-1.4.12/src/mga_exa.c
--- xf86-video-mga-1.4.12/src/mga_exa.c.jx 2009-04-27 11:47:42.000000000 -0400
+++ xf86-video-mga-1.4.12/src/mga_exa.c 2011-06-20 12:08:14.368304719 -0400
@@ -701,7 +701,8 @@ mgaUploadToScreen(PixmapPtr pDst, int x,
mgaSetup(pMga, pDst, NULL, 10);
- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT);
+ OUTREG(MGAREG_OPMODE,
+ (INREG(MGAREG_OPMODE) & ~MGAOPM_DMA_MASK) | MGAOPM_DMA_BLIT);
OUTREG(MGAREG_DSTORG, exaGetPixmapOffset(pDst));
OUTREG(MGAREG_PITCH, mgaGetPixmapPitch(pDst));
OUTREG(MGAREG_PLNWT, 0xffffffff);
diff -up xf86-video-mga-1.4.12/src/mga_reg.h.jx xf86-video-mga-1.4.12/src/mga_reg.h
--- xf86-video-mga-1.4.12/src/mga_reg.h.jx 2011-06-20 11:57:31.000000000 -0400
+++ xf86-video-mga-1.4.12/src/mga_reg.h 2011-06-20 12:01:22.891854925 -0400
@@ -124,6 +124,7 @@
#define MGAOPM_DMA_GENERAL (0x00 << 2)
#define MGAOPM_DMA_BLIT (0x01 << 2)
#define MGAOPM_DMA_VECTOR (0x10 << 2)
+#define MGAOPM_DMA_MASK (0x11 << 2)
/* MACCESS register additives */
#define MGAMAC_PW8 0x00
diff -up xf86-video-mga-1.4.12/src/mga_storm.c.jx xf86-video-mga-1.4.12/src/mga_storm.c
--- xf86-video-mga-1.4.12/src/mga_storm.c.jx 2011-06-20 11:57:31.000000000 -0400
+++ xf86-video-mga-1.4.12/src/mga_storm.c 2011-06-20 12:11:51.721070061 -0400
@@ -2192,6 +2192,7 @@ MGAFillSolidRectsDMA(
MGAPtr pMga = MGAPTR(pScrn);
XAAInfoRecPtr infoRec = pMga->AccelInfoRec;
CARD32 *base = (CARD32*)pMga->ILOADBase;
+ CARD32 opmode;
CHECK_DMA_QUIESCENT(pMga, pScrn);
@@ -2207,7 +2208,8 @@ MGAFillSolidRectsDMA(
if(!nBox) return;
- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_GENERAL);
+ opmode = INREG(MGAREG_OPMODE) & ~MGAOPM_DMA_MASK;
+ OUTREG(MGAREG_OPMODE, opmode | MGAOPM_DMA_GENERAL);
while(nBox) {
base[0] = DMAINDICES(MGAREG_FXBNDRY, MGAREG_YDSTLEN + MGAREG_EXEC,
MGAREG_FXBNDRY, MGAREG_YDSTLEN + MGAREG_EXEC);
@@ -2219,7 +2221,7 @@ MGAFillSolidRectsDMA(
pBox++;
base += 5; nBox -= 2;
}
- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT);
+ OUTREG(MGAREG_OPMODE, opmode | MGAOPM_DMA_BLIT);
}
static void
@@ -2256,9 +2258,11 @@ MGAFillSolidSpansDMA(
}
if(n) {
+ CARD32 opmode;
if(n > 838860) n = 838860; /* maximum number we have room for */
- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_GENERAL);
+ opmode = INREG(MGAREG_OPMODE) | MGAOPM_DMA_MASK;
+ OUTREG(MGAREG_OPMODE, opmode | MGAOPM_DMA_GENERAL);
while(n) {
base[0] = DMAINDICES(MGAREG_FXBNDRY, MGAREG_YDSTLEN + MGAREG_EXEC,
MGAREG_FXBNDRY, MGAREG_YDSTLEN + MGAREG_EXEC);
@@ -2270,7 +2274,7 @@ MGAFillSolidSpansDMA(
ppt++;
base += 5; n -= 2;
}
- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT);
+ OUTREG(MGAREG_OPMODE, opmode | MGAOPM_DMA_BLIT);
}
if(infoRec->ClipBox) {
@@ -0,0 +1,12 @@
--- xf86-video-mga-1.4.5/src/mga_driver.c.jx 2006-11-08 12:16:44.000000000 -0500
+++ xf86-video-mga-1.4.5/src/mga_driver.c 2006-12-04 16:27:38.000000000 -0500
@@ -1329,8 +1329,7 @@
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"
- "\tIt can be found at the Matrox web site <http://www.matrox.com>\n");
+ "No open-source support for dualhead on this card, sorry\n");
}
}
@@ -0,0 +1,30 @@
diff -up xf86-video-mga-1.6.2/src/mga_driver.c.jx xf86-video-mga-1.6.2/src/mga_driver.c
--- xf86-video-mga-1.6.2/src/mga_driver.c.jx 2013-05-20 16:14:10.000000000 -0400
+++ xf86-video-mga-1.6.2/src/mga_driver.c 2013-05-20 16:14:48.381607479 -0400
@@ -2004,7 +2004,12 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
pMga->HWCursor ? "HW" : "SW");
- if (xf86ReturnOptValBool(pMga->Options, OPTION_NOACCEL, FALSE)) {
+ if (xf86ReturnOptValBool(pMga->Options, OPTION_SHADOW_FB, TRUE)) {
+ pMga->ShadowFB = TRUE;
+ pMga->NoAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Using \"Shadow Framebuffer\" - acceleration disabled\n");
+ } else if (xf86ReturnOptValBool(pMga->Options, OPTION_NOACCEL, FALSE)) {
pMga->NoAccel = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
} else {
@@ -2051,12 +2056,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
(1 << pScrn->offset.green) |
(((pScrn->mask.blue >> pScrn->offset.blue) - 1) << pScrn->offset.blue);
}
- if (xf86ReturnOptValBool(pMga->Options, OPTION_SHADOW_FB, FALSE)) {
- pMga->ShadowFB = TRUE;
- pMga->NoAccel = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Using \"Shadow Framebuffer\" - acceleration disabled\n");
- }
if (xf86ReturnOptValBool(pMga->Options, OPTION_OVERCLOCK_MEM, FALSE)) {
pMga->OverclockMem = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Overclocking memory\n");
+112
View File
@@ -0,0 +1,112 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xorg-video-mga</Name>
<Homepage>http://www.x.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>driver</IsA>
<Summary>X.Org mga video driver</Summary>
<Description>xorg-video-mga contains the X.Org driver for Matrox cards.</Description>
<Archive sha1sum="6ac9f61ece9d9449f914137b3eef685b2eebf66c" type="tarbz2">mirrors://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2</Archive>
<Patches>
<Patch level="1">mga-1.4.5-no-hal-advertising.patch</Patch>
<Patch level="1">mga-1.4.12-bigendian.patch</Patch>
<Patch level="1">mga-1.6.2-shadowfb.patch</Patch>
</Patches>
<BuildDependencies>
<Dependency>libdrm-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>xorg-server-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xorg-video-mga</Name>
<RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="10">
<Date>2015-05-08</Date>
<Version>1.6.3</Version>
<Comment>Release bump.</Comment>
<Name>Burak Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2014-01-23</Date>
<Version>1.6.3</Version>
<Comment>Rebuild for xorg-server-1.16.3</Comment>
<Name>Ergün Salman</Name>
<Email>Poyraz76@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2014-09-01</Date>
<Version>1.6.3</Version>
<Comment>Rebuild for xorg-server-1.16.0</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2014-05-16</Date>
<Version>1.6.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-03-09</Date>
<Version>1.6.3</Version>
<Comment>Version bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-08-25</Date>
<Version>1.6.2</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-06-21</Date>
<Version>1.6.2</Version>
<Comment>Rebuild.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-05-29</Date>
<Version>1.6.2</Version>
<Comment>build for xorg 1.14</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-05-03</Date>
<Version>1.6.2</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-10-11</Date>
<Version>1.6.1</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xorg-video-mga</Name>
<Summary xml:lang="tr">X.Org mga ekran kartı sürücüsü</Summary>
<Description xml:lang="tr">xorg-video-mga, Matrox ekran kartları için X.Org sürücüsünü içerir.</Description>
</Source>
</PISI>