diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 09:34:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-07 18:23:43 +0000 |
| commit | 9a2a2187ff6f59960990503b11c4f290b074935c (patch) | |
| tree | 4c926be76c6707bf6170838c0f40a34a398b2712 /main | |
| parent | a1867e9ce5124f13a0d9babc0815fc9349e24ac3 (diff) | |
| download | aports-9a2a2187ff6f59960990503b11c4f290b074935c.tar.bz2 aports-9a2a2187ff6f59960990503b11c4f290b074935c.tar.xz | |
main/xf86-video-fbdev: rebuild against xorg-server-1.14
Diffstat (limited to 'main')
| -rw-r--r-- | main/xf86-video-fbdev/APKBUILD | 26 | ||||
| -rw-r--r-- | main/xf86-video-fbdev/mibstore.patch | 29 |
2 files changed, 50 insertions, 5 deletions
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD index 1ac6d8265c..b20df67bed 100644 --- a/main/xf86-video-fbdev/APKBUILD +++ b/main/xf86-video-fbdev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-fbdev pkgver=0.4.3 -pkgrel=1 +pkgrel=3 pkgdesc="video driver for framebuffer device" 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="1d99f1dfb3f0fea077b6b61caa3dc85a xf86-video-fbdev-0.4.3.tar.bz2" +md5sums="1d99f1dfb3f0fea077b6b61caa3dc85a xf86-video-fbdev-0.4.3.tar.bz2 +9defb13a8fcb51a2ffcec786b36766b3 mibstore.patch" +sha256sums="ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831 xf86-video-fbdev-0.4.3.tar.bz2 +4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321 mibstore.patch" +sha512sums="0e29c3aab44246f53cdd74cc3236ebc705f0aedd496803f91e83c12dc2e31c52aac9bd86061667fb827b822a70262dd340153bafce706669b49fb1bf00d2e844 xf86-video-fbdev-0.4.3.tar.bz2 +5e26f59cdf4b1d2fbd807a5f3612f303b87f01dc220a5c7963bf906eae833e4d88c2787f2e01ed9fd1a355a4cdd38a5aee79e3923508d2558f6ff64255c51fcb mibstore.patch" diff --git a/main/xf86-video-fbdev/mibstore.patch b/main/xf86-video-fbdev/mibstore.patch new file mode 100644 index 0000000000..138d5bc2a1 --- /dev/null +++ b/main/xf86-video-fbdev/mibstore.patch @@ -0,0 +1,29 @@ +From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:37 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/fbdev.c b/src/fbdev.c +index cd7ebc5..f5a7378 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -14,7 +14,6 @@ + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) + } + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +cgit v0.9.0.2-2-gbebe |