Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=af52f82f094bcb04201f32fc15caa91adff94263
commit af52f82f094bcb04201f32fc15caa91adff94263
Author: Krisztian VASAS <i...@frugalware.org>
Date: Sat Jan 3 18:41:48 2009 +0100
xf86-video-voodoo-1.2.0-1-i686
- version bump
- added some build fixes
diff --git
a/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch
b/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch
new file mode 100644
index 0000000..f22ba27
--- /dev/null
+++
b/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch
@@ -0,0 +1,22 @@
+diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
+index f2f6c3a..28a6654 100644
+--- a/src/voodoo_driver.c
++++ b/src/voodoo_driver.c
+@@ -50,7 +50,7 @@
+ #include "mipointer.h"
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Version.h"
++#include "xorgVersion.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86cmap.h"
+@@ -163,7 +163,7 @@ static XF86ModuleVersionInfo voodooVersRec =
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+- XF86_VERSION_CURRENT,
++ XORG_VERSION_CURRENT,
+ VOODOO_MAJOR_VERSION, VOODOO_MINOR_VERSION, VOODOO_PATCHLEVEL,
+ ABI_CLASS_VIDEODRV, /* This is a video driver */
+ ABI_VIDEODRV_VERSION,
diff --git a/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch
b/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch
new file mode 100644
index 0000000..faba754
--- /dev/null
+++ b/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch
@@ -0,0 +1,24 @@
+diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
+index 6f1f925..a8cb708 100644
+--- a/src/voodoo_dga.c
++++ b/src/voodoo_dga.c
+@@ -42,7 +42,6 @@
+ #include "micmap.h"
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Version.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86cmap.h"
+diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
+index 1469939..852a5b2 100644
+--- a/src/voodoo_hardware.c
++++ b/src/voodoo_hardware.c
+@@ -43,7 +43,6 @@
+ #include "micmap.h"
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Version.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86cmap.h"
diff --git a/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch
b/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch
new file mode 100644
index 0000000..d543697
--- /dev/null
+++ b/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch
@@ -0,0 +1,36 @@
+diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
+index a8cb708..9d088a7 100644
+--- a/src/voodoo_dga.c
++++ b/src/voodoo_dga.c
+@@ -47,7 +47,6 @@
+ #include "xf86cmap.h"
+ #include "shadowfb.h"
+ #include "vgaHW.h"
+-#include "xf86DDC.h"
+ #include "xf86RAC.h"
+ #include "xf86Resources.h"
+ #include "compiler.h"
+diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
+index 28a6654..dc2176a 100644
+--- a/src/voodoo_driver.c
++++ b/src/voodoo_driver.c
+@@ -56,7 +56,6 @@
+ #include "xf86cmap.h"
+ #include "shadowfb.h"
+ #include "vgaHW.h"
+-#include "xf86DDC.h"
+ #include "xf86RAC.h"
+ #include "xf86Resources.h"
+ #include "compiler.h"
+diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
+index 852a5b2..35e656f 100644
+--- a/src/voodoo_hardware.c
++++ b/src/voodoo_hardware.c
+@@ -48,7 +48,6 @@
+ #include "xf86cmap.h"
+ #include "shadowfb.h"
+ #include "vgaHW.h"
+-#include "xf86DDC.h"
+ #include "xf86RAC.h"
+ #include "xf86Resources.h"
+ #include "xaa.h"
diff --git
a/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch
b/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch
new file mode 100644
index 0000000..626dcd5
--- /dev/null
+++
b/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch
@@ -0,0 +1,105 @@
+diff --git a/src/voodoo.h b/src/voodoo.h
+index 750c42b..4f97a8a 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -13,7 +13,7 @@ typedef struct {
+ CloseScreenProcPtr CloseScreen; /* Wrapped Close */
+ XAAInfoRecPtr AccelInfoRec; /* Cached Accel rec for close */
+ Bool Blanked;
+- Bool OnAtExit;
++ Bool PassThrough; /* Set to restore pass through on exit
*/
+ EntityInfoPtr pEnt;
+ OptionInfoPtr Options;
+
+diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
+index dc2176a..2822543 100644
+--- a/src/voodoo_driver.c
++++ b/src/voodoo_driver.c
+@@ -110,12 +110,14 @@ _X_EXPORT DriverRec VOODOO = {
+
+ typedef enum {
+ OPTION_NOACCEL,
+- OPTION_SHADOW_FB
++ OPTION_SHADOW_FB,
++ OPTION_PASS_THROUGH,
+ } VoodooOpts;
+
+ static const OptionInfoRec VoodooOptions[] = {
+ { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
++ { OPTION_PASS_THROUGH,"PassThrough", OPTV_BOOLEAN, {0}, FALSE },
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
+ };
+
+@@ -436,6 +438,9 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags)
+ pVoo->Accel = 0;
+ }
+
++ if (xf86ReturnOptValBool(pVoo->Options, OPTION_PASS_THROUGH, FALSE))
++ pVoo->PassThrough = 1;
++
+ if (xf86ReturnOptValBool(pVoo->Options, OPTION_NOACCEL, FALSE)) {
+ pVoo->ShadowFB = 1;
+ pVoo->Accel = 0;
+@@ -544,6 +549,7 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags)
+ }
+
+ /* Set the current mode to the first in the list */
++ xf86SetCrtcForModes(pScrn, 0);
+ pScrn->currentMode = pScrn->modes;
+
+ /* Do some checking, we will not support a virtual framebuffer larger than
+@@ -914,8 +920,10 @@ VoodooRestore(ScrnInfoPtr pScrn, Bool Closing)
+
+ pVoo = VoodooPTR(pScrn);
+ pVoo->Blanked = TRUE;
+- if (!Closing || !(pVoo->OnAtExit))
+- VoodooBlank(pVoo);
++ if (!Closing)
++ VoodooBlank(pVoo);
++ if (Closing && pVoo->PassThrough)
++ VoodooRestorePassThrough(pVoo);
+ }
+
+ static void
+diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
+index 35e656f..d988b33 100644
+--- a/src/voodoo_hardware.c
++++ b/src/voodoo_hardware.c
+@@ -685,6 +685,17 @@ int VoodooHardwareInit(VoodooPtr pVoo)
+ }
+
+ /*
++ * Voodoo exit logic
++ */
++
++void VoodooRestorePassThrough(VoodooPtr pVoo)
++{
++ pci_enable(pVoo, 1, 0, 0);
++ mmio32_w(pVoo, 0x210, 0);
++ pci_enable(pVoo, 0, 0, 1);
++}
++
++/*
+ * Copiers for Voodoo1
+ *
+ * Voodoo1 has no CPU to screen blit, and also lacks SGRAM fill
+@@ -969,6 +980,9 @@ static void Voodoo2SetupForSolidFill(ScrnInfoPtr pScrn,
int color,
+ int rop, unsigned int planemask)
+ {
+ VoodooPtr pVoo = VoodooPTR(pScrn);
++ if (debug)
++ ErrorF("Setup for solid fill colour %04X, rop %d, Mask %04X.\n",
++ color, rop, planemask);
+ Voodoo2Setup2D(pVoo);
+ mmio32_w_chuck(pVoo, 0x2EC, ropxlate[rop]); /* rop */
+ mmio32_w_chuck(pVoo, 0x2F0, color); /* fg color */
+@@ -979,6 +993,8 @@ static void Voodoo2SubsequentSolidFillRect(ScrnInfoPtr
pScrn, int x, int y,
+ int w, int h)
+ {
+ VoodooPtr pVoo = VoodooPTR(pScrn);
++ if (debug)
++ ErrorF("Fill (%d, %d) for (%d, %d)\n", x, y, w, h);
+ wait_idle(pVoo);
+ mmio32_w_chuck(pVoo, 0x2E4, (y<<16) | x); /* Dst x,y */
+ /* Set size and fire */
diff --git a/source/x11/xf86-video-voodoo/FrugalBuild
b/source/x11/xf86-video-voodoo/FrugalBuild
index a47043e..d60a121 100644
--- a/source/x11/xf86-video-voodoo/FrugalBuild
+++ b/source/x11/xf86-video-voodoo/FrugalBuild
@@ -2,15 +2,24 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
pkgname=xf86-video-voodoo
-pkgver=1.1.1
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
pkgdesc="X.Org video driver for Voodoo 1/2 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' 'xf86dgaproto')
Finclude xorg
-sha1sums=('201dd422cf1e7876d0f377f8e6b1dad1d205e493')
+source=(${sour...@]} \
+ '01-change_from_xf86version_to_xorgversion.patch' \
+ '02-uninclude_xf86version.patch' \
+ '03-uninclude_xf86ddc.patch' \
+
'04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch')
+sha1sums=('d8434fb024265dfe3497182cafa35481f55dda87' \
+ 'c5bc50334aee52d61945ac67734cad128f63c7ac' \
+ '7ba98c07ef0368c734832fc004445c3494b5e49a' \
+ '492726133a112405fa193705615f3268cec3ec93' \
+ '335ff939c7e411a9d9c812312a014fd745b1fda5')
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
