diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 09:26:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:23:43 +0000 |
| commit | 88d284254fc6057f58f366cebe82faf7bff23499 (patch) | |
| tree | cbf788ca85e7ae286fc68e27100244833d3c0b2d /main/xf86-video-ast | |
| parent | dc6665106e5c590a30c0c370f8d03836cf7d1e4d (diff) | |
| download | aports-88d284254fc6057f58f366cebe82faf7bff23499.tar.bz2 aports-88d284254fc6057f58f366cebe82faf7bff23499.tar.xz | |
main/xf86-video-ast: rebuild against xorg-server-1.14
Diffstat (limited to 'main/xf86-video-ast')
| -rw-r--r-- | main/xf86-video-ast/APKBUILD | 25 | ||||
| -rw-r--r-- | main/xf86-video-ast/mibstore.patch | 101 |
2 files changed, 121 insertions, 5 deletions
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD index c23031b6a3..d770103958 100644 --- a/main/xf86-video-ast/APKBUILD +++ b/main/xf86-video-ast/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ast pkgver=0.97.0 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for ASpeedTech cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,34 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.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/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="2b630ed7d7864045b324b39cd58da367 xf86-video-ast-0.97.0.tar.bz2" +md5sums="2b630ed7d7864045b324b39cd58da367 xf86-video-ast-0.97.0.tar.bz2 +cf7f0346da96567652f89f367136b1dc mibstore.patch" +sha256sums="28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76 xf86-video-ast-0.97.0.tar.bz2 +f28cb96f3de6089880b7e04572f6fa6d6cfa149718569bfc2389090677af5e7c mibstore.patch" +sha512sums="7eadb06c0159d460977b6e99183e6f1c4673f18b26072d9c28fc38518522fe9adade89531a42d83e277d545a3f157c37c6600b0330bb90327c1a17b5698fa22d xf86-video-ast-0.97.0.tar.bz2 +5d7af51fa6939c062d0e5e21938a9df79c06e79bba7b7940d2dacc56c40c78819390004b704a30e21cd054a2590ae21274645e53ffbc2d0340f0a8e5b7aad5de mibstore.patch" diff --git a/main/xf86-video-ast/mibstore.patch b/main/xf86-video-ast/mibstore.patch new file mode 100644 index 0000000000..006daaa135 --- /dev/null +++ b/main/xf86-video-ast/mibstore.patch @@ -0,0 +1,101 @@ +From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:33 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c +index 6be9a4f..684e400 100644 +--- a/src/ast_2dtool.c ++++ b/src/ast_2dtool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_accel.c b/src/ast_accel.c +index a789b21..0e7e5d3 100644 +--- a/src/ast_accel.c ++++ b/src/ast_accel.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_cursor.c b/src/ast_cursor.c +index 47ea09d..c672564 100644 +--- a/src/ast_cursor.c ++++ b/src/ast_cursor.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_driver.c b/src/ast_driver.c +index 5e6a26e..43fcdbc 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -31,7 +31,6 @@ + #endif + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL) + } + #endif /* end of Accel_2D */ + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/ast_mode.c b/src/ast_mode.c +index 50289f1..2e06062 100644 +--- a/src/ast_mode.c ++++ b/src/ast_mode.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_tool.c b/src/ast_tool.c +index c701c1e..c2bfac6 100644 +--- a/src/ast_tool.c ++++ b/src/ast_tool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c +index 42de52c..513cf7b 100644 +--- a/src/ast_vgatool.c ++++ b/src/ast_vgatool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +-- +cgit v0.9.0.2-2-gbebe |