Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=55c7078d13f6854b05373d03a3722152ae711008
commit 55c7078d13f6854b05373d03a3722152ae711008
Author: Krisztian VASAS <i...@frugalware.org>
Date: Fri Jan 2 22:59:34 2009 +0100
xf86-video-i740-1.2.0-1-i686
- version bump
diff --git a/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1
b/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1
new file mode 100644
index 0000000..a3efb3d
--- /dev/null
+++ b/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1
@@ -0,0 +1,130 @@
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 8d66f22..f6a0688 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -47,10 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * DGA
+ */
+
+-#ifndef USE_DDC2
+-#define USE_DDC2 0
+-#endif
+-
+ /*
+ * These are X and server generic header files.
+ */
+@@ -239,22 +235,6 @@ static const char *vbeSymbols[] = {
+ };
+ #endif
+
+-#if USE_DDC2
+-static const char *ddcSymbols[] = {
+- "xf86PrintEDID",
+- "xf86DoEDID_DDC1",
+- "xf86DoEDID_DDC2",
+- NULL
+-};
+-
+-static const char *i2cSymbols[] = {
+- "xf86CreateI2CBusRec",
+- "xf86I2CBusInit",
+- NULL
+-};
+-#endif
+-
+-
+ #ifdef XFree86LOADER
+
+ static MODULESETUPPROTO(i740Setup);
+@@ -297,9 +277,6 @@ i740Setup(pointer module, pointer opts, int *errmaj, int
*errmin)
+ */
+ LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
+ ramdacSymbols, vbeSymbols,
+-#if USE_DDC2
+- ddcSymbols, i2cSymbols,
+-#endif
+ NULL);
+
+ /*
+@@ -454,6 +431,7 @@ I740Probe(DriverPtr drv, int flags) {
+ return foundScreen;
+ }
+
++/* Ugh. Can we not do this? */
+ static void
+ I740ProbeDDC(ScrnInfoPtr pScrn, int index)
+ {
+@@ -745,6 +723,32 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+ clockRanges->interlaceAllowed = FALSE; /*PL*/
+ clockRanges->doubleScanAllowed = TRUE; /*PL*/
+
++ { /*PL*/
++
++ if (xf86LoadSubModule(pScrn, "ddc")) {
++ if (xf86LoadSubModule(pScrn, "i2c") ) {
++ if (I740MapMem(pScrn)) {
++ if (I740_I2CInit(pScrn))
++ {
++ xf86MonPtr MonInfo;
++ if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)))
{
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
++ MonInfo);
++ xf86PrintEDID( MonInfo );
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
++ "info\n\n");
++ xf86SetDDCproperties(pScrn,MonInfo);
++ }
++ }
++ else
++ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
++
++ I740UnmapMem(pScrn);
++ }
++ }
++ }
++ }
++
+ i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+ pScrn->display->modes, clockRanges,
+ 0, 320, 1600,
+@@ -819,40 +823,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+ pI740->usevgacompat=FALSE;
+
+
+-#if USE_DDC2 /*DDC2*/
+- { /*PL*/
+-
+- if (xf86LoadSubModule(pScrn, "ddc")) {
+- xf86LoaderReqSymLists(ddcSymbols, NULL);
+- if ( xf86LoadSubModule(pScrn, "i2c") ) {
+- xf86LoaderReqSymLists(i2cSymbols,NULL);
+-
+- if (I740MapMem(pScrn))
+- {
+- if (I740_I2CInit(pScrn))
+- {
+- xf86MonPtr MonInfo;
+-
+- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)))
{
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
+- MonInfo);
+- xf86PrintEDID( MonInfo );
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
+- "info\n\n");
+- xf86SetDDCproperties(pScrn,MonInfo);
+- }
+-
+- //xf86SetDDCproperties(pScrn,xf86PrintEDID(
xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)));
+- }
+- else
+- xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
+-
+- I740UnmapMem(pScrn);
+- }
+- }
+- }
+- }
+-#endif /*DDC2*/
+
+ { /* Overlay */
+ pI740->colorKey = (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
diff --git a/source/x11/xf86-video-i740/FrugalBuild
b/source/x11/xf86-video-i740/FrugalBuild
index 7e05919..09a7d72 100644
--- a/source/x11/xf86-video-i740/FrugalBuild
+++ b/source/x11/xf86-video-i740/FrugalBuild
@@ -2,15 +2,18 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
pkgname=xf86-video-i740
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
pkgdesc="X.Org driver for i740 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=('99575052e29236d50db23d093a30ba0047d78e43')
+source=(${sour...@]} \
+ '01-uncomment_ddc2_code.patch1')
+sha1sums=('3c479ccc7bf54be925269a66a7e5742e72dbdf1d' \
+ 'cda1895ce3802e19ff89279cb5b72b5eb3ef5996')
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
