From e892789ccde55c4d9cb0c094a01787f5d9ac1af9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 7 Mar 2013 09:50:00 +0000 Subject: main/xf86-video-i128: rebuild against xorg-server-1.14 --- main/xf86-video-i128/APKBUILD | 26 +++++++++++++++++++++----- main/xf86-video-i128/mibstore.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 main/xf86-video-i128/mibstore.patch diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD index e29d8809f..263a0a49e 100644 --- a/main/xf86-video-i128/APKBUILD +++ b/main/xf86-video-i128/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=xf86-video-i128 pkgver=1.3.6 -pkgrel=1 +pkgrel=3 pkgdesc="Number 9 I128 video driver" 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="0b0d365dce2c567b807562a32f7fe66e xf86-video-i128-1.3.6.tar.bz2" +md5sums="0b0d365dce2c567b807562a32f7fe66e xf86-video-i128-1.3.6.tar.bz2 +01ba59049028fd4c65d620fb898a23e8 mibstore.patch" +sha256sums="f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c xf86-video-i128-1.3.6.tar.bz2 +a33da9fb125697fa9c3178bfa11f40f88f69947cd0934ac37139ba1c1a950d52 mibstore.patch" +sha512sums="688956107fe473941da9d22914dc1aa1889b8a1bb75678692d40630396eca5426a4506bb0a536c48b6ed7a2b580a80af5b8b5d3199e2b04d8f24c404f60d3c34 xf86-video-i128-1.3.6.tar.bz2 +3cfe390f1f812250ed3abde0dc8bd699419bf71d6642328d69163012b813906b995acf942c31febe6fc6909109181436e1c7dfcb74d08feae6c9b7434ea63df9 mibstore.patch" diff --git a/main/xf86-video-i128/mibstore.patch b/main/xf86-video-i128/mibstore.patch new file mode 100644 index 000000000..b42a6c8f1 --- /dev/null +++ b/main/xf86-video-i128/mibstore.patch @@ -0,0 +1,30 @@ +From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 12:54:40 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson +--- +diff --git a/src/i128_driver.c b/src/i128_driver.c +index a0f08c0..51a4135 100644 +--- a/src/i128_driver.c ++++ b/src/i128_driver.c +@@ -50,8 +50,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "micmap.h" + + #include "xf86DDC.h" +@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) + return FALSE; + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe -- cgit v1.2.3