diff options
| author | prspkt <prspkt@protonmail.com> | 2018-07-22 07:47:19 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-29 12:26:44 +0000 |
| commit | 46aa3dde52b7f362100e5e5a613a1e78c2f59584 (patch) | |
| tree | 8d4791c034398a84bbbaa43186eef4a0b36520a4 | |
| parent | 5a241e80981a23a4de6ed0d4791533531613778c (diff) | |
| download | aports-46aa3dde52b7f362100e5e5a613a1e78c2f59584.tar.bz2 aports-46aa3dde52b7f362100e5e5a613a1e78c2f59584.tar.xz | |
main/xf86-video-s3virge: rebuild against xorg-video-abi 24.0
Use https
| -rw-r--r-- | main/xf86-video-s3virge/APKBUILD | 12 | ||||
| -rw-r--r-- | main/xf86-video-s3virge/check-max-value.patch | 24 |
2 files changed, 31 insertions, 5 deletions
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD index 0004a7edf0..9fa5784e73 100644 --- a/main/xf86-video-s3virge/APKBUILD +++ b/main/xf86-video-s3virge/APKBUILD @@ -1,17 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3virge pkgver=1.10.7 -pkgrel=3 +pkgrel=4 pkgdesc="S3 ViRGE video driver" -url="http://xorg.freedesktop.org/" +url="https://xorg.freedesktop.org/" arch="all" license="MIT" subpackages="$pkgname-doc" depends= makedepends="xorg-server-dev libxi-dev util-macros xorgproto" -source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 +source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + check-max-value.patch " - builddir="$srcdir"/$pkgname-$pkgver build() { cd "$builddir" @@ -33,4 +33,6 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57 xf86-video-s3virge-1.10.7.tar.bz2" + +sha512sums="bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57 xf86-video-s3virge-1.10.7.tar.bz2 +af7fdc0f850103fb9e8631c1b26b1eb6117eac83b76a9d575b33affeb55985ffe9f61c1c7dcb4c7b00656edfc5df4c2d4c75e56f2dd4c2112dedf654564ff259 check-max-value.patch" diff --git a/main/xf86-video-s3virge/check-max-value.patch b/main/xf86-video-s3virge/check-max-value.patch new file mode 100644 index 0000000000..0573a05c9c --- /dev/null +++ b/main/xf86-video-s3virge/check-max-value.patch @@ -0,0 +1,24 @@ +--- a/src/s3v_driver.c ++++ b/src/s3v_driver.c +@@ -1212,8 +1212,6 @@ + /* todo - The virge limit is 2048 vertical & horizontal */ + /* pixels, not clock register settings. */ + /* true for all ViRGE? */ +- pScrn->maxHValue = 2048; +- pScrn->maxVValue = 2048; + + /* Lower depths default to config file */ + pScrn->virtualX = pScrn->display->virtualX; +@@ -2566,6 +2564,12 @@ + if ((pScrn->bitsPerPixel + 7)/8 * mode->HDisplay > 4095) + return MODE_VIRTUAL_X; + ++ if (mode->HTotal > 2048) ++ return MODE_BAD_HVALUE; ++ ++ if (mode->VTotal > 2048) ++ return MODE_BAD_VVALUE; ++ + return MODE_OK; + } + |