[ANNOUNCE] xorg-server 1.20.0
Thomas Klausner
wiz at NetBSD.org
Sun May 20 07:38:50 UTC 2018
On Fri, May 11, 2018 at 11:28:23PM +0200, Thomas Klausner wrote:
> I've updated the pkgsrc package, but now lots of drivers don't build.
>
> xf86-video-tseng-1.2.5:
> xf86-video-sis-0.10.9:
> xf86-video-s3virge-1.10.7:
> xf86-video-r128-6.10.2:
> xf86-video-ati-18.0.1:
> xf86-video-amdgpu-18.0.1:
> xf86-input-mouse-1.9.2:
I've attached the patches we're using in pkgsrc for these now, perhaps
it helps someone else.
I'm not sure about the s3virge, savage, and tseng ones.
Cheers,
Thomas
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-amdgpu/distinfo
diff -u pkgsrc/x11/xf86-video-amdgpu/distinfo:1.11 pkgsrc/x11/xf86-video-amdgpu/distinfo:1.12
--- pkgsrc/x11/xf86-video-amdgpu/distinfo:1.11 Thu Mar 15 23:43:17 2018
+++ pkgsrc/x11/xf86-video-amdgpu/distinfo Sun May 20 07:15:21 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2018/03/15 23:43:17 wiz Exp $
+$NetBSD: distinfo,v 1.12 2018/05/20 07:15:21 wiz Exp $
SHA1 (xf86-video-amdgpu-18.0.1.tar.bz2) = a9c7125eae9870f26afa5167d5683f8d5e1b43c0
RMD160 (xf86-video-amdgpu-18.0.1.tar.bz2) = b8ddf051c0a2e9a8f86eb27cc1aba3f529aeedf0
SHA512 (xf86-video-amdgpu-18.0.1.tar.bz2) = eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4
Size (xf86-video-amdgpu-18.0.1.tar.bz2) = 414683 bytes
+SHA1 (patch-configure) = 0434336e8b6fd83ebaa7b0a69f1fc5fbd2b89bf7
Added files:
Index: pkgsrc/x11/xf86-video-amdgpu/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xf86-video-amdgpu/patches/patch-configure:1.1
--- /dev/null Sun May 20 07:15:21 2018
+++ pkgsrc/x11/xf86-video-amdgpu/patches/patch-configure Sun May 20 07:15:21 2018
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1 2018/05/20 07:15:21 wiz Exp $
+
+Avoid redefinition of bswap macros.
+
+--- configure.orig 2018-03-15 15:40:33.000000000 +0000
++++ configure
+@@ -20049,20 +20049,6 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
+ $as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_16 ${BSWAP}16
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_32 ${BSWAP}32
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_64 ${BSWAP}64
+-_ACEOF
+-
+ fi
+ fi
+
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-ati/distinfo
diff -u pkgsrc/x11/xf86-video-ati/distinfo:1.33 pkgsrc/x11/xf86-video-ati/distinfo:1.34
--- pkgsrc/x11/xf86-video-ati/distinfo:1.33 Thu Mar 15 23:45:25 2018
+++ pkgsrc/x11/xf86-video-ati/distinfo Sun May 20 07:11:10 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.33 2018/03/15 23:45:25 wiz Exp $
+$NetBSD: distinfo,v 1.34 2018/05/20 07:11:10 wiz Exp $
SHA1 (xf86-video-ati-18.0.1.tar.bz2) = b5a0b6a2fa839d668a3fb90280fede95f0bc130d
RMD160 (xf86-video-ati-18.0.1.tar.bz2) = 5a60d8a4c06a7d57f4c3f9e7e7ee29a1f0fe3ea7
SHA512 (xf86-video-ati-18.0.1.tar.bz2) = b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
Size (xf86-video-ati-18.0.1.tar.bz2) = 881457 bytes
+SHA1 (patch-configure) = bdd1014b215af69c2bb837d36829e12e86eb5764
Added files:
Index: pkgsrc/x11/xf86-video-ati/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xf86-video-ati/patches/patch-configure:1.1
--- /dev/null Sun May 20 07:11:10 2018
+++ pkgsrc/x11/xf86-video-ati/patches/patch-configure Sun May 20 07:11:10 2018
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1 2018/05/20 07:11:10 wiz Exp $
+
+Remove duplicate definitions - src/radeon.h defines these as well.
+
+--- configure.orig 2018-03-15 16:21:20.000000000 +0000
++++ configure
+@@ -19933,20 +19933,6 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
+ $as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_16 ${BSWAP}16
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_32 ${BSWAP}32
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_64 ${BSWAP}64
+-_ACEOF
+-
+ fi
+ fi
+
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-input-mouse/distinfo
diff -u pkgsrc/x11/xf86-input-mouse/distinfo:1.19 pkgsrc/x11/xf86-input-mouse/distinfo:1.20
--- pkgsrc/x11/xf86-input-mouse/distinfo:1.19 Thu Nov 17 08:06:52 2016
+++ pkgsrc/x11/xf86-input-mouse/distinfo Sat May 12 12:16:00 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2016/11/17 08:06:52 wiz Exp $
+$NetBSD: distinfo,v 1.20 2018/05/12 12:16:00 ryoon Exp $
SHA1 (xf86-input-mouse-1.9.2.tar.bz2) = d3a0839ad5a33665bb261a4fba33e3a6271817dc
RMD160 (xf86-input-mouse-1.9.2.tar.bz2) = c7d68c0de19787ceda4e4307b113b6d74e0cb62d
SHA512 (xf86-input-mouse-1.9.2.tar.bz2) = 30fdc4f699d434e2fb4a9f8d2f4f980538d646a6e4d2d572737fc5498c0bce0fb1ba080173ea0aa3480f574dde3f58d5a7ac837afdb29640ccb092b3f18ff209
Size (xf86-input-mouse-1.9.2.tar.bz2) = 377685 bytes
+SHA1 (patch-src_mouse.c) = 0e593e5c805af8d0be04925a8e0af97961fa4dd3
SHA1 (patch-src_sun__mouse.c) = e23157bc9bdb5840ac008648d1c9a894e7a900cc
Added files:
Index: pkgsrc/x11/xf86-input-mouse/patches/patch-src_mouse.c
diff -u /dev/null pkgsrc/x11/xf86-input-mouse/patches/patch-src_mouse.c:1.3
--- /dev/null Sat May 12 12:16:00 2018
+++ pkgsrc/x11/xf86-input-mouse/patches/patch-src_mouse.c Sat May 12 12:16:00 2018
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_mouse.c,v 1.3 2018/05/12 12:16:00 ryoon Exp $
+
+From: https://cgit.freedesktop.org/xorg/driver/xf86-input-mouse/commit/?id=3c8f243b750a92d5837a449d344ff884dbd02b57
+Adapt to removal of xf86GetOS
+
+--- src/mouse.c.orig 2016-09-06 03:53:31.000000000 +0000
++++ src/mouse.c
+@@ -794,7 +794,6 @@ InitProtocols(void)
+ {
+ int classes;
+ int i;
+- const char *osname = NULL;
+
+ if (osInfo)
+ return TRUE;
+@@ -821,11 +820,11 @@ InitProtocols(void)
+ mouseProtocols[i].id = PROT_UNSUP;
+
+ /* NetBSD uses PROT_BM for "PS/2". */
+- xf86GetOS(&osname, NULL, NULL, NULL);
+- if (osname && xf86NameCmp(osname, "netbsd") == 0)
+- for (i = 0; mouseProtocols[i].name; i++)
+- if (mouseProtocols[i].id == PROT_PS2)
+- mouseProtocols[i].id = PROT_BM;
++#if defined(__NetBSD__)
++ for (i = 0; mouseProtocols[i].name; i++)
++ if (mouseProtocols[i].id == PROT_PS2)
++ mouseProtocols[i].id = PROT_BM;
++#endif
+
+ return TRUE;
+ }
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-r128/distinfo
diff -u pkgsrc/x11/xf86-video-r128/distinfo:1.10 pkgsrc/x11/xf86-video-r128/distinfo:1.11
--- pkgsrc/x11/xf86-video-r128/distinfo:1.10 Wed Jan 18 20:22:39 2017
+++ pkgsrc/x11/xf86-video-r128/distinfo Sun May 20 07:19:18 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/01/18 20:22:39 wiz Exp $
+$NetBSD: distinfo,v 1.11 2018/05/20 07:19:18 wiz Exp $
SHA1 (xf86-video-r128-6.10.2.tar.bz2) = ea3c739efda6ce785b057ac9c39f9247ae9ede8e
RMD160 (xf86-video-r128-6.10.2.tar.bz2) = 1a277f08a3ab63a07b35a9fda239cce70109973c
SHA512 (xf86-video-r128-6.10.2.tar.bz2) = 564b65454ee538c1b9dc5d22a52a57bdff0c1f94e1832719a8310699cee7167c1ca8fcd26243dfc4089832b1fcbab9efafb69c9061b328532f689d02a0acac23
Size (xf86-video-r128-6.10.2.tar.bz2) = 504031 bytes
+SHA1 (patch-configure) = b8aec279d402f4bd31693f34e0ccab4155159cd4
+SHA1 (patch-src_r128__probe.c) = 3a0e00262f8b996392b2a9c1a5b887a1016f6203
Added files:
Index: pkgsrc/x11/xf86-video-r128/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xf86-video-r128/patches/patch-configure:1.1
--- /dev/null Sun May 20 07:19:18 2018
+++ pkgsrc/x11/xf86-video-r128/patches/patch-configure Sun May 20 07:19:18 2018
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1 2018/05/20 07:19:18 wiz Exp $
+
+Avoid redefinition of bswap macros.
+
+--- configure.orig 2017-01-17 22:43:33.000000000 +0000
++++ configure
+@@ -19447,20 +19447,6 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
+ $as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_16 ${BSWAP}16
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_32 ${BSWAP}32
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_64 ${BSWAP}64
+-_ACEOF
+-
+ fi
+ fi
+
Index: pkgsrc/x11/xf86-video-r128/patches/patch-src_r128__probe.c
diff -u /dev/null pkgsrc/x11/xf86-video-r128/patches/patch-src_r128__probe.c:1.3
--- /dev/null Sun May 20 07:19:18 2018
+++ pkgsrc/x11/xf86-video-r128/patches/patch-src_r128__probe.c Sun May 20 07:19:18 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_r128__probe.c,v 1.3 2018/05/20 07:19:18 wiz Exp $
+
+Provide uint32_t.
+
+--- src/r128_probe.c.orig 2017-01-17 22:42:44.000000000 +0000
++++ src/r128_probe.c
+@@ -32,6 +32,7 @@
+ #endif
+
+ #include <string.h>
++#include <sys/types.h>
+
+ /*
+ * Authors:
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-s3virge/distinfo
diff -u pkgsrc/x11/xf86-video-s3virge/distinfo:1.9 pkgsrc/x11/xf86-video-s3virge/distinfo:1.10
--- pkgsrc/x11/xf86-video-s3virge/distinfo:1.9 Wed Nov 4 03:29:03 2015
+++ pkgsrc/x11/xf86-video-s3virge/distinfo Sun May 20 07:32:50 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/05/20 07:32:50 wiz Exp $
SHA1 (xf86-video-s3virge-1.10.7.tar.bz2) = d670f02ec4372e4a4ed299d7f29b5bd6e2fa9e83
RMD160 (xf86-video-s3virge-1.10.7.tar.bz2) = c2adf8f566d61724a57b7b807cfa9602c2a221eb
SHA512 (xf86-video-s3virge-1.10.7.tar.bz2) = bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57
Size (xf86-video-s3virge-1.10.7.tar.bz2) = 374129 bytes
+SHA1 (patch-src_s3v__driver.c) = be708042982dd9630e935cce0670266f9d482c8a
Added files:
Index: pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c
diff -u /dev/null pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c:1.3
--- /dev/null Sun May 20 07:32:50 2018
+++ pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c Sun May 20 07:32:50 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_s3v__driver.c,v 1.3 2018/05/20 07:32:50 wiz Exp $
+
+Fix build with modular-xorg-server-1.20.
+
+--- src/s3v_driver.c.orig 2015-09-26 16:28:11.000000000 +0000
++++ src/s3v_driver.c
+@@ -1203,6 +1203,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
+ vga256InfoRec.directMode = XF86DGADirectPresent;
+ #endif
+
++#if 0
+ /*
+ * xf86ValidateModes will check that the mode HTotal and VTotal values
+ * don't exceed the chipset's limit if pScrn->maxHValue and
+@@ -1214,6 +1215,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
+ /* true for all ViRGE? */
+ pScrn->maxHValue = 2048;
+ pScrn->maxVValue = 2048;
++#endif
+
+ /* Lower depths default to config file */
+ pScrn->virtualX = pScrn->display->virtualX;
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-savage/distinfo
diff -u pkgsrc/x11/xf86-video-savage/distinfo:1.12 pkgsrc/x11/xf86-video-savage/distinfo:1.13
--- pkgsrc/x11/xf86-video-savage/distinfo:1.12 Wed Jan 18 20:19:57 2017
+++ pkgsrc/x11/xf86-video-savage/distinfo Sun May 20 07:30:09 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/01/18 20:19:57 wiz Exp $
+$NetBSD: distinfo,v 1.13 2018/05/20 07:30:09 wiz Exp $
SHA1 (xf86-video-savage-2.3.9.tar.bz2) = 5896fc5560c4b7242a5d3df2e6840f09f4995a4c
RMD160 (xf86-video-savage-2.3.9.tar.bz2) = 03c5d5476195dd5a32ff70c8886400d7941cbd1b
SHA512 (xf86-video-savage-2.3.9.tar.bz2) = 35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a
Size (xf86-video-savage-2.3.9.tar.bz2) = 433686 bytes
+SHA1 (patch-src_savage__driver.c) = 4e0013b11daceffd00e545a3006922d4fb9ad4c0
Added files:
Index: pkgsrc/x11/xf86-video-savage/patches/patch-src_savage__driver.c
diff -u /dev/null pkgsrc/x11/xf86-video-savage/patches/patch-src_savage__driver.c:1.3
--- /dev/null Sun May 20 07:30:09 2018
+++ pkgsrc/x11/xf86-video-savage/patches/patch-src_savage__driver.c Sun May 20 07:30:09 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_savage__driver.c,v 1.3 2018/05/20 07:30:09 wiz Exp $
+
+Fix build with modular-xorg-server-1.20
+
+--- src/savage_driver.c.orig 2017-01-17 22:43:40.000000000 +0000
++++ src/savage_driver.c
+@@ -2034,8 +2034,10 @@ static Bool SavagePreInit(ScrnInfoPtr pS
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
+ mclk / 1000.0);
+
++#if 0
+ pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */
+ pScrn->maxVValue = 2048; /* 11 bits of v_total */
++#endif
+ pScrn->virtualX = pScrn->display->virtualX;
+ pScrn->virtualY = pScrn->display->virtualY;
+
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-sis/distinfo
diff -u pkgsrc/x11/xf86-video-sis/distinfo:1.12 pkgsrc/x11/xf86-video-sis/distinfo:1.13
--- pkgsrc/x11/xf86-video-sis/distinfo:1.12 Wed Jan 18 18:25:18 2017
+++ pkgsrc/x11/xf86-video-sis/distinfo Sun May 20 06:33:40 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/01/18 18:25:18 wiz Exp $
+$NetBSD: distinfo,v 1.13 2018/05/20 06:33:40 wiz Exp $
SHA1 (xf86-video-sis-0.10.9.tar.bz2) = c0009118307b8cf110d43dbd0a174de2f90dfbcc
RMD160 (xf86-video-sis-0.10.9.tar.bz2) = 940cae3e90c5dd6dc15e7b4df8047f6260969846
SHA512 (xf86-video-sis-0.10.9.tar.bz2) = 7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d
Size (xf86-video-sis-0.10.9.tar.bz2) = 736272 bytes
+SHA1 (patch-src_sis__driver.c) = 89d5db8b258305c3c02921db57dffb04ae2c7ae2
Added files:
Index: pkgsrc/x11/xf86-video-sis/patches/patch-src_sis__driver.c
diff -u /dev/null pkgsrc/x11/xf86-video-sis/patches/patch-src_sis__driver.c:1.3
--- /dev/null Sun May 20 06:33:41 2018
+++ pkgsrc/x11/xf86-video-sis/patches/patch-src_sis__driver.c Sun May 20 06:33:40 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_sis__driver.c,v 1.3 2018/05/20 06:33:40 wiz Exp $
+
+commit 4b1356a2b7fd06e9a05d134caa4033681c939737
+Author: Adam Jackson <ajax at redhat.com>
+Date: Thu Feb 16 11:21:27 2017 -0500
+
+ Remove reference to ->virtualFrom
+
+ The core will print this information as well anyway.
+
+ Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+--- src/sis_driver.c.orig 2017-01-17 22:45:12.000000000 +0000
++++ src/sis_driver.c
+@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
+ float hsync, refresh = 0.0;
+ char *desc, *desc2, *prefix, *uprefix, *output;
+
+- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d "
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
+ "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
+ pScrn->displayWidth);
+
-------------- next part --------------
Modified files:
Index: pkgsrc/x11/xf86-video-tseng/distinfo
diff -u pkgsrc/x11/xf86-video-tseng/distinfo:1.7 pkgsrc/x11/xf86-video-tseng/distinfo:1.8
--- pkgsrc/x11/xf86-video-tseng/distinfo:1.7 Wed Nov 4 03:29:04 2015
+++ pkgsrc/x11/xf86-video-tseng/distinfo Sun May 20 07:27:31 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/05/20 07:27:31 wiz Exp $
SHA1 (xf86-video-tseng-1.2.5.tar.bz2) = 95c35b28a19ab486f0bb7482df944d5b0076bdd5
RMD160 (xf86-video-tseng-1.2.5.tar.bz2) = cefe7f92087debc308ab1a2a9530de036aaae782
SHA512 (xf86-video-tseng-1.2.5.tar.bz2) = 6e0010b24d5b97ade00ef80fda5ea91bce3a9ce07881551e84ac552ba49336905b62f062c656c72ea3097a0bec1517ec5038aa5766f8424e5f81d67dc777480c
Size (xf86-video-tseng-1.2.5.tar.bz2) = 330575 bytes
-SHA1 (patch-src_tseng__driver.c) = b4f6eabf1413efc09ac3d48098680aa50e99fb71
+SHA1 (patch-src_tseng__driver.c) = 1f1cf76a0208ddadc4e0f7da92d3cf79f409f31c
Index: pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c
diff -u pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.1 pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.2
--- pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.1 Thu Apr 2 22:16:48 2015
+++ pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c Sun May 20 07:27:31 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tseng__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
+$NetBSD: patch-src_tseng__driver.c,v 1.2 2018/05/20 07:27:31 wiz Exp $
From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
@@ -7,9 +7,11 @@ Subject: Remove mibstore.h
Signed-off-by: Adam Jackson <ajax at redhat.com>
+Other chunks: avoid using removed max.Value fields
+
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index ffafb19..0db62e5 100644
---- src/tseng_driver.c
+--- src/tseng_driver.c.orig 2012-07-17 05:21:17.000000000 +0000
+++ src/tseng_driver.c
@@ -39,9 +39,6 @@
/* All drivers initialising the SW cursor need this */
@@ -21,7 +23,38 @@ index ffafb19..0db62e5 100644
#include "fb.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
+@@ -1040,10 +1037,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
+ else
+ pTseng->Bytesperpixel = 1; /* this is fake for < 8bpp, but simplifies other code */
+
+- /* hardware limits */
+- pScrn->maxHValue = Tseng_HMAX;
+- pScrn->maxVValue = Tseng_VMAX;
+-
+ /*
+ * This must happen after pScrn->display has been set because
+ * xf86SetWeight references it.
+@@ -1128,16 +1121,15 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
+
+ /*
+ * xf86ValidateModes will check that the mode HTotal and VTotal values
+- * don't exceed the chipset's limit if pScrn->maxHValue and
+- * pScrn->maxVValue are set. Since our TsengValidMode() already takes
++ * don't exceed the chipset's limit. Since our TsengValidMode() already takes
+ * care of this, we don't worry about setting them here.
+ */
+
+ /* Select valid modes from those available */
+ i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+ pScrn->display->modes, &pTseng->clockRange,
+- NULL, 32, pScrn->maxHValue, 8*pTseng->Bytesperpixel, /* H limits */
+- 0, pScrn->maxVValue, /* V limits */
++ NULL, 32, Tseng_HMAX, 8*pTseng->Bytesperpixel, /* H limits */
++ 0, Tseng_VMAX, /* V limits */
+ pScrn->display->virtualX,
+ pScrn->display->virtualY,
+ pTseng->FbMapSize,
+@@ -1453,7 +1445,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
}
}
More information about the xorg-devel
mailing list