aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-03-17 08:43:32 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-17 11:01:23 +0000
commit63d7522e8dbbd09668272d83383e7355810b558f (patch)
tree44e9e0063147d1a9a2d10befd200e3eead059b50 /main
parent65cdd9a632733235ffe903ae342b44faffa8359b (diff)
downloadaports-63d7522e8dbbd09668272d83383e7355810b558f.tar.bz2
aports-63d7522e8dbbd09668272d83383e7355810b558f.tar.xz
main/xf86-video-tdfx: upgrade to 1.4.6
Diffstat (limited to 'main')
-rw-r--r--main/xf86-video-tdfx/0001-Remove-mibstore.h.patch36
-rw-r--r--main/xf86-video-tdfx/APKBUILD16
2 files changed, 6 insertions, 46 deletions
diff --git a/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch b/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch
deleted file mode 100644
index e0d229cc6d..0000000000
--- a/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:59 -0400
-Subject: [PATCH] Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/tdfx_driver.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
-index ddd5431..412da07 100644
---- a/src/tdfx_driver.c
-+++ b/src/tdfx_driver.c
-@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- #include "compiler.h"
-
--/* Drivers using the mi implementation of backing store need: */
--
--#include "mibstore.h"
--
- /* All drivers using the vgahw module need this */
- /* This driver needs to be modified to not use vgaHW for multihead operation */
- #include "vgaHW.h"
-@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
---
-1.8.0.2
-
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
index 1bc863c693..c339202e4a 100644
--- a/main/xf86-video-tdfx/APKBUILD
+++ b/main/xf86-video-tdfx/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-tdfx
-pkgver=1.4.5
-pkgrel=6
+pkgver=1.4.6
+pkgrel=0
pkgdesc="3Dfx video driver"
url="http://xorg.freedesktop.org/"
arch="all"
@@ -13,13 +13,12 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
"
source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
- 0001-Remove-mibstore.h.patch"
+ "
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- update_config_sub || return 1
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -44,9 +43,6 @@ package() {
rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="1b4a7815a604b3764900b520336a75ea xf86-video-tdfx-1.4.5.tar.bz2
-11d1ec9437791cc8851124c19e9129da 0001-Remove-mibstore.h.patch"
-sha256sums="70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859 xf86-video-tdfx-1.4.5.tar.bz2
-986b4c032003a27f91941ae71bc4734b6e606850bf0bd3f835c703acfedecd30 0001-Remove-mibstore.h.patch"
-sha512sums="721f487fe2f08c51fe4622bbbbdbf5c2b8f078f811e18d03e707fd2ab121a8e0a95165934e1567f4280e2613e94fdf5dd35c6c6ddd1ff935a07cfbb485670555 xf86-video-tdfx-1.4.5.tar.bz2
-9fbe484ab0eb34513a7dc4418a8e5725db35b37fb83f6ae5120f88db8471589e667c310ebad4c98ab3fa00e27ab06725c67d3486dce641575223537c14b06b73 0001-Remove-mibstore.h.patch"
+md5sums="3ad54183fa339ef2ab10e2704ba95060 xf86-video-tdfx-1.4.6.tar.bz2"
+sha256sums="3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37 xf86-video-tdfx-1.4.6.tar.bz2"
+sha512sums="d47421000f7aaeabcd13700c39a0a869c2967e6e1d02526cc348155415ac62064f61bbc5416c75b7e44a55fa9124a9feabbe6008d43c41a2305c1a0c842f384c xf86-video-tdfx-1.4.6.tar.bz2"