aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2018-07-22 07:50:01 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2018-07-29 12:26:44 +0000
commitf5acd74315fe88a308a2c0688fe078f42b6ac3cc (patch)
tree3dcac870bd08d4382082e5584b4251e0bd6fc5a4 /main
parent33af408515a00fc6c3ef7b02e64b93793448b272 (diff)
downloadaports-f5acd74315fe88a308a2c0688fe078f42b6ac3cc.tar.bz2
aports-f5acd74315fe88a308a2c0688fe078f42b6ac3cc.tar.xz
main/xf86-video-sis: rebuild against xorg-video-abi 24.0
Use https
Diffstat (limited to 'main')
-rw-r--r--main/xf86-video-sis/0001-Remove-reference-to-virtualFrom.patch28
-rw-r--r--main/xf86-video-sis/APKBUILD11
2 files changed, 34 insertions, 5 deletions
diff --git a/main/xf86-video-sis/0001-Remove-reference-to-virtualFrom.patch b/main/xf86-video-sis/0001-Remove-reference-to-virtualFrom.patch
new file mode 100644
index 0000000000..78f6905284
--- /dev/null
+++ b/main/xf86-video-sis/0001-Remove-reference-to-virtualFrom.patch
@@ -0,0 +1,28 @@
+From 4b1356a2b7fd06e9a05d134caa4033681c939737 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 16 Feb 2017 11:21:27 -0500
+Subject: [PATCH] Remove reference to ->virtualFrom
+
+The core will print this information as well anyway.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/sis_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 8f06164..513f68b 100644
+--- a/src/sis_driver.c
++++ b/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);
+
+--
+2.18.0
+
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index 258a1eba1f..907f2a9f32 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -1,17 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-sis
pkgver=0.10.9
-pkgrel=2
+pkgrel=3
pkgdesc="X.org SiS video driver"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org"
arch="all"
license="MIT"
subpackages="$pkgname-doc"
depends=
makedepends="xorg-server-dev util-macros mesa-dev libxi-dev 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
+ 0001-Remove-reference-to-virtualFrom.patch
"
-
builddir="$srcdir"/$pkgname-$pkgver
build() {
@@ -35,4 +35,5 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d xf86-video-sis-0.10.9.tar.bz2"
+sha512sums="7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d xf86-video-sis-0.10.9.tar.bz2
+0439a8ad058b348fb285d3f460cebf25f0df29f82c6f1268c8d9bc90646934b89f08bf5e92e7cc7680c141c9d772f82237f0964cb0ced05ea9ef02094c886a21 0001-Remove-reference-to-virtualFrom.patch"