diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-07-14 21:49:31 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-07-15 09:00:34 +0200 |
| commit | 67886560b215367bc14ea70569ba67d9f9551a12 (patch) | |
| tree | ddcf4b0ed9618e4c7a3c9f73ca92ca2cdf4c4ddb /source/x/x11 | |
| parent | e1b360e07d441ab3dac2f0bfb29f09f15069ad31 (diff) | |
| download | current-67886560b215367bc14ea70569ba67d9f9551a12.tar.gz current-67886560b215367bc14ea70569ba67d9f9551a12.tar.xz | |
Sat Jul 14 21:49:31 UTC 201820180714214931
l/pulseaudio-12.1-x86_64-1.txz: Upgraded.
l/utf8proc-2.1.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11')
6 files changed, 58 insertions, 2 deletions
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge index b8626c4cf..7ed6ff82d 100644 --- a/source/x/x11/build/xf86-video-s3virge +++ b/source/x/x11/build/xf86-video-s3virge @@ -1 +1 @@ -4 +5 diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng index f599e28b8..b4de39476 100644 --- a/source/x/x11/build/xf86-video-tseng +++ b/source/x/x11/build/xf86-video-tseng @@ -1 +1 @@ -10 +11 diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch new file mode 100644 index 000000000..5e65d8563 --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3virge.patch @@ -0,0 +1,2 @@ +# Patch for xorg-server-1.20.x: +zcat $CWD/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff new file mode 100644 index 000000000..685282dfa --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff @@ -0,0 +1,19 @@ +diff -aurN xf86-video-s3virge-1.10.7/src/s3v_driver.c xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c +--- xf86-video-s3virge-1.10.7/src/s3v_driver.c 2015-09-26 18:28:11.000000000 +0200 ++++ xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c 2018-07-14 12:43:11.986789561 +0200 +@@ -1203,6 +1203,7 @@ + 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 @@ + /* true for all ViRGE? */ + pScrn->maxHValue = 2048; + pScrn->maxVValue = 2048; ++#endif + + /* Lower depths default to config file */ + pScrn->virtualX = pScrn->display->virtualX; diff --git a/source/x/x11/patch/xf86-video-tseng.patch b/source/x/x11/patch/xf86-video-tseng.patch index 17d7e8297..878d41354 100644 --- a/source/x/x11/patch/xf86-video-tseng.patch +++ b/source/x/x11/patch/xf86-video-tseng.patch @@ -5,3 +5,6 @@ done grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do sed -i "s/miInitializeBackingStore(pScreen);//g" $file done + +# Patch for xorg-server-1.20.x: +zcat $CWD/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff new file mode 100644 index 000000000..43c2f3a20 --- /dev/null +++ b/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff @@ -0,0 +1,32 @@ +diff -aurN xf86-video-tseng-1.2.5/src/tseng_driver.c xf86-video-tseng-1.2.5-mod/src/tseng_driver.c +--- xf86-video-tseng-1.2.5/src/tseng_driver.c 2012-07-17 07:21:17.000000000 +0200 ++++ xf86-video-tseng-1.2.5-mod/src/tseng_driver.c 2018-07-14 13:48:02.634774719 +0200 +@@ -1040,10 +1040,6 @@ + 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. +@@ -1129,15 +1125,14 @@ + /* + * 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 + * 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, |