diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:12:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:23:45 +0000 |
| commit | 0a28c3fc0c3538c6014a21ce96ed14ed2a0a981b (patch) | |
| tree | 0423d2297b15073059e217f51746116edb6581bd /main | |
| parent | 12dc764e3a6842aa60a59f29aca17e4dc46e3809 (diff) | |
| download | aports-0a28c3fc0c3538c6014a21ce96ed14ed2a0a981b.tar.bz2 aports-0a28c3fc0c3538c6014a21ce96ed14ed2a0a981b.tar.xz | |
main/xf86-video-tdfx: rebuild against xorg-server-1.14
Diffstat (limited to 'main')
| -rw-r--r-- | main/xf86-video-tdfx/0001-Remove-mibstore.h.patch | 36 | ||||
| -rw-r--r-- | main/xf86-video-tdfx/APKBUILD | 27 |
2 files changed, 58 insertions, 5 deletions
diff --git a/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch b/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch new file mode 100644 index 0000000000..e0d229cc6d --- /dev/null +++ b/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch @@ -0,0 +1,36 @@ +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 c30557656b..8a72dd7680 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=2 +pkgrel=4 pkgdesc="3Dfx video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,19 +12,36 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto " -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + 0001-Remove-mibstore.h.patch" + + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 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" +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" |