diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 10:14:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:23:45 +0000 |
| commit | 3fe7f19b5a981416cd775a5704ab4a7457c640ea (patch) | |
| tree | 46988a0930258501e578a9ba53c28a7c967a8fec /main/xf86-video-s3 | |
| parent | 36f423d8c9ba57bab678980ef26af9ffde755485 (diff) | |
| download | aports-3fe7f19b5a981416cd775a5704ab4a7457c640ea.tar.bz2 aports-3fe7f19b5a981416cd775a5704ab4a7457c640ea.tar.xz | |
main/xf86-video-s3: rebuild against xorg-server-1.14
Diffstat (limited to 'main/xf86-video-s3')
| -rw-r--r-- | main/xf86-video-s3/APKBUILD | 26 | ||||
| -rw-r--r-- | main/xf86-video-s3/mibstore.patch | 18 |
2 files changed, 39 insertions, 5 deletions
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD index 379c30aee3..162c8b529a 100644 --- a/main/xf86-video-s3/APKBUILD +++ b/main/xf86-video-s3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3 pkgver=0.6.5 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for s3 cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ 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/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="37248d5c5a04d7f91c6f634cc592b304 xf86-video-s3-0.6.5.tar.bz2" +md5sums="37248d5c5a04d7f91c6f634cc592b304 xf86-video-s3-0.6.5.tar.bz2 +39197ff01d61fd5e536a04c275568cd3 mibstore.patch" +sha256sums="4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39 xf86-video-s3-0.6.5.tar.bz2 +7cdf5381c9ad1a9f654e803f767a2b2b07346088501cc6293fcce1992a78fe66 mibstore.patch" +sha512sums="bd7d93008dae33b0b7943b2c81de5f39b1d8224ccebd0cdb9e8d22e7ea7fb0981adf6afd44e24162fa8a076d3e250f93316fd3a25cada2d65166a6bc4d13c267 xf86-video-s3-0.6.5.tar.bz2 +72a4176d178f968e769b8cd61e2f2eed6524c75f8f0c9d2f51acece24e0b7ad1953c9c4d271c9af02b4ee68ad75dd06d9cce71b3bce6fdf5965e1e9b40d6eb49 mibstore.patch" diff --git a/main/xf86-video-s3/mibstore.patch b/main/xf86-video-s3/mibstore.patch new file mode 100644 index 0000000000..fbec7122dc --- /dev/null +++ b/main/xf86-video-s3/mibstore.patch @@ -0,0 +1,18 @@ +--- ./src/s3_driver.c.orig 2013-03-07 10:10:59.468190736 +0000 ++++ ./src/s3_driver.c 2013-03-07 10:11:57.695325050 +0000 +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ |