diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 12:06:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 13:23:05 +0000 |
| commit | 18700016cb653f41dc151e1ceeb5b8639947be07 (patch) | |
| tree | 93ecaa3ef88dd5166638238ac97c38f3b3969cb4 | |
| parent | 267805ecf80723fd71734d3fff459deccf65131e (diff) | |
| download | aports-18700016cb653f41dc151e1ceeb5b8639947be07.tar.bz2 aports-18700016cb653f41dc151e1ceeb5b8639947be07.tar.xz | |
main/xf86-video-xgixp: rebuild against xorg-server 1.19
| -rw-r--r-- | main/xf86-video-xgixp/APKBUILD | 22 | ||||
| -rw-r--r-- | main/xf86-video-xgixp/git-fixes.patch | 34 |
2 files changed, 41 insertions, 15 deletions
diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD index e2a9c90b99..d6a2674e2b 100644 --- a/main/xf86-video-xgixp/APKBUILD +++ b/main/xf86-video-xgixp/APKBUILD @@ -5,26 +5,22 @@ pkgrel=7 pkgdesc="X.org XGIXP video driver" url="http://xorg.freedesktop.org/" arch="all" -license="custom" +license="MIT" subpackages="$pkgname-doc" depends= makedepends="xorg-server-dev libdrm-dev xf86driproto glproto mesa-dev" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 git-fixes.patch" -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" + cd "$builddir" update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + default_prepare } build() { - cd "$_builddir" + cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ @@ -36,13 +32,9 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="590ec61b6368fee3805623958eb843cb xf86-video-xgixp-1.8.1.tar.bz2 -0cdb35b7969a8278dae73b3ffa9d0672 git-fixes.patch" -sha256sums="e1c6cbbc5756c8bac92334b77863ef406ad8e5ddf07c8af89204299ca0c41d55 xf86-video-xgixp-1.8.1.tar.bz2 -7e7255b1152197633828f424954340fc7e400d2e79674ac9ad944ffd1f058847 git-fixes.patch" sha512sums="ab45909e4b48cc9dfa3daf5d2cb50dff6ad7d841fe1dc75ea699a7c555d70a6f565d97b7c68f4c58da16ad022b973892e229f8d0f4059c8712cf513c1ec10f84 xf86-video-xgixp-1.8.1.tar.bz2 -5a954417f860d87b7aaee92fd698f1ccdff440180a74909843266f1a8aec626e130faf71cf2a8429b90dae31460e4a8d56fc2dd8868d1914c1a7053fa97fad39 git-fixes.patch" +c3a5f629655dba04af14db2006fdc82eb4ba406082eb830903e79bc4ac8f269ed096b11a0b91d0a789bff3bdda0ac4789ad76e4a8f568ef24a01d9cbc5c34745 git-fixes.patch" diff --git a/main/xf86-video-xgixp/git-fixes.patch b/main/xf86-video-xgixp/git-fixes.patch index 665739aad0..ba54f01a61 100644 --- a/main/xf86-video-xgixp/git-fixes.patch +++ b/main/xf86-video-xgixp/git-fixes.patch @@ -326,3 +326,37 @@ index 80f3645..c146ce4 100644 -- cgit v0.10.2 +From 81c1cc40820a3e24efc0565b68f44eb6748a2db9 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@redhat.com> + +diff --git a/src/compat-api.h b/src/compat-api.h +index 98ba435..44daea4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -78,11 +78,19 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + |