Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=9b8ffcb1b0aaf83dbdf9548be2e49f90fa7bc561
commit 9b8ffcb1b0aaf83dbdf9548be2e49f90fa7bc561 Author: Krisztian VASAS <[email protected]> Date: Fri Jan 2 10:58:04 2009 +0100 xf86-video-cirrus-1.2.1-1-i686 - version bump - added some patches diff --git a/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 b/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 new file mode 100644 index 0000000..f627749 --- /dev/null +++ b/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 @@ -0,0 +1,124 @@ +diff --git a/src/CirrusClk.c b/src/CirrusClk.c +index f23fde8..a3590c9 100644 +--- a/src/CirrusClk.c ++++ b/src/CirrusClk.c +@@ -88,7 +88,7 @@ static cirrusClockRec cirrusClockTab[] = { + * use the tested clock since others can be unstable. + */ + +-Bool ++_X_EXPORT Bool + CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out) + { + int n, i; +diff --git a/src/cir_dga.c b/src/cir_dga.c +index bedb796..bc98df6 100644 +--- a/src/cir_dga.c ++++ b/src/cir_dga.c +@@ -67,7 +67,7 @@ DGAFunctionRec CirDGAFuncs = { + + + +-Bool ++_X_EXPORT Bool + CirDGAInit(ScreenPtr pScreen) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; +diff --git a/src/cir_driver.c b/src/cir_driver.c +index 1942b15..0ce058d 100644 +--- a/src/cir_driver.c ++++ b/src/cir_driver.c +@@ -93,7 +93,7 @@ SymTabRec CIRChipsets[] = { + }; + + /* List of PCI chipset names */ +-PciChipsets CIRPciChipsets[] = { ++_X_EXPORT PciChipsets CIRPciChipsets[] = { + { PCI_CHIP_GD5430, PCI_CHIP_GD5430, RES_SHARED_VGA }, + { PCI_CHIP_GD5434_4,PCI_CHIP_GD5434_4, RES_SHARED_VGA }, + { PCI_CHIP_GD5434_8,PCI_CHIP_GD5434_8, RES_SHARED_VGA }, +@@ -320,7 +320,7 @@ CIRProbe(DriverPtr drv, int flags) + * Map the framebuffer and MMIO memory. + */ + +-Bool ++_X_EXPORT Bool + CirMapMem(CirPtr pCir, int scrnIndex) + { + int mmioFlags; +@@ -410,7 +410,7 @@ CirMapMem(CirPtr pCir, int scrnIndex) + * Unmap the framebuffer and MMIO memory. + */ + +-Bool ++_X_EXPORT Bool + CirUnmapMem(CirPtr pCir, int scrnIndex) + { + #ifdef CIR_DEBUG +@@ -438,7 +438,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex) + return TRUE; + } + +-void ++_X_EXPORT void + cirProbeDDC(ScrnInfoPtr pScrn, int index) + { + vbeInfoPtr pVbe; +diff --git a/src/cir_shadow.c b/src/cir_shadow.c +index a7964cd..e8b8d35 100644 +--- a/src/cir_shadow.c ++++ b/src/cir_shadow.c +@@ -19,7 +19,7 @@ + #include "cir.h" + #include "alp.h" + +-void ++_X_EXPORT void + cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -46,7 +46,7 @@ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + } + +-void ++_X_EXPORT void + cirPointerMoved(int index, int x, int y) + { + ScrnInfoPtr pScrn = xf86Screens[index]; +@@ -64,7 +64,7 @@ cirPointerMoved(int index, int x, int y) + (*pCir->PointerMoved)(index, newX, newY); + } + +-void ++_X_EXPORT void + cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -110,7 +110,7 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + + +-void ++_X_EXPORT void + cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -157,7 +157,7 @@ cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + + + /* this one could be faster */ +-void ++_X_EXPORT void + cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -208,7 +208,7 @@ cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + } + +-void ++_X_EXPORT void + cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); diff --git a/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 b/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 new file mode 100644 index 0000000..04063af --- /dev/null +++ b/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/lg_driver.c b/src/lg_driver.c +index c731f61..ff5a477 100644 +--- a/src/lg_driver.c ++++ b/src/lg_driver.c +@@ -1547,7 +1547,7 @@ LgAdjustFrame(int scrnIndex, int x, int y, int flags) + (PCI_CHIP_GD5465 == pCir->Chipset) ? 1 : (24==pScrn->bitsPerPixel?3:1); + + /* Where's the pointer? */ +- miPointerPosition(&cursorX, &cursorY); ++ miPointerGetPosition(inputInfo.pointer, &cursorX, &cursorY); + + /* Where's the middle of the screen? We want to eventually know + which side of the screen the pointer is on. */ diff --git a/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 b/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 new file mode 100644 index 0000000..769efad --- /dev/null +++ b/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/alp_driver.c b/src/alp_driver.c +index c5d2426..b7be5b2 100644 +--- a/src/alp_driver.c ++++ b/src/alp_driver.c +@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) + * BIOSes tend to mess them up + */ + +- PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM)); +- PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM)); ++ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10); ++ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14); + + } + diff --git a/source/x11/xf86-video-cirrus/FrugalBuild b/source/x11/xf86-video-cirrus/FrugalBuild index 1132ff7..eb6b5b0 100644 --- a/source/x11/xf86-video-cirrus/FrugalBuild +++ b/source/x11/xf86-video-cirrus/FrugalBuild @@ -2,15 +2,22 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-video-cirrus -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X.Org driver for Cirrus Logic cards" url="http://xorg.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('1832fc03ea9d60a96bfd96c156cb439818bfc579') +source=(${sour...@]} \ + '01-export_symbols_used_by_different_cirrus_driver_modules.patch1' \ + '02-update_to_use_miPointerGetPosition.patch1' \ + '03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1') +sha1sums=('cd5219897a0f3dfd7b3b9e79a3c977802707dc9c' \ + '250439b85cce46f12f3bbe59c6c9c9874d84cd89' \ + 'aa3708dc9bf7a901a1b851feafd19411d7b15112' \ + 'fd51e20e6e3b552618c698c2729f0fe0c728f02a') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
