diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 09:46:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:23:44 +0000 |
| commit | ec4c1531a0dc150044cdd99ee944cdd5881c90bb (patch) | |
| tree | 6988f5a8af88e24364ea5e735daa4f5987a6d466 /main/xf86-video-glint | |
| parent | d1c5e6789c1d4e25bffbaed9ace6b2d03a853951 (diff) | |
| download | aports-ec4c1531a0dc150044cdd99ee944cdd5881c90bb.tar.bz2 aports-ec4c1531a0dc150044cdd99ee944cdd5881c90bb.tar.xz | |
main/xf86-video-glint: rebuild against xorg-server-1.14
Diffstat (limited to 'main/xf86-video-glint')
| -rw-r--r-- | main/xf86-video-glint/APKBUILD | 26 | ||||
| -rw-r--r-- | main/xf86-video-glint/mibstore.patch | 30 |
2 files changed, 51 insertions, 5 deletions
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD index d008007067..079bd2c7c9 100644 --- a/main/xf86-video-glint/APKBUILD +++ b/main/xf86-video-glint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-glint pkgver=1.2.8 -pkgrel=2 +pkgrel=4 pkgdesc="GLINT/Permedia video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,19 +12,35 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto xf86dgaproto glproto libdrm-dev xf86driproto mesa-dev" -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="775579c67dc55ff4909de3638bafd19f xf86-video-glint-1.2.8.tar.bz2" +md5sums="775579c67dc55ff4909de3638bafd19f xf86-video-glint-1.2.8.tar.bz2 +9afce8beedb2335e297c58471a4184fa mibstore.patch" +sha256sums="657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 xf86-video-glint-1.2.8.tar.bz2 +8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231 mibstore.patch" +sha512sums="ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468 xf86-video-glint-1.2.8.tar.bz2 +f482f2ee1ccf089250be3c1f9b80cde90253a482891e177595a3331acd0cac9f0faf1e58382dc3d03c4c02638096fae8d767d46a9b51c35b5adce40c6e6ce767 mibstore.patch" diff --git a/main/xf86-video-glint/mibstore.patch b/main/xf86-video-glint/mibstore.patch new file mode 100644 index 0000000000..6bc5738c80 --- /dev/null +++ b/main/xf86-video-glint/mibstore.patch @@ -0,0 +1,30 @@ +From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:38 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/glint_driver.c b/src/glint_driver.c +index b6d20a9..aa78516 100644 +--- a/src/glint_driver.c ++++ b/src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe |