diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 15:12:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 15:29:04 +0000 |
| commit | ddd11952eadcab077df4a2bfd69bef85e6c23acf (patch) | |
| tree | c988492354edf77a04c93c4617e36c13dc72fed4 /main/xf86-video-intel | |
| parent | 497895f56024e66e933d5f170792cf8b625587bd (diff) | |
| download | aports-ddd11952eadcab077df4a2bfd69bef85e6c23acf.tar.bz2 aports-ddd11952eadcab077df4a2bfd69bef85e6c23acf.tar.xz | |
main/xf86-video-intel: rebuild against xorg-server-1.18
Diffstat (limited to 'main/xf86-video-intel')
| -rw-r--r-- | main/xf86-video-intel/APKBUILD | 15 | ||||
| -rw-r--r-- | main/xf86-video-intel/xorg-1.18.patch | 24 |
2 files changed, 34 insertions, 5 deletions
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD index 66ed4310a6..183bc3a433 100644 --- a/main/xf86-video-intel/APKBUILD +++ b/main/xf86-video-intel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-intel pkgver=2.99.917 -pkgrel=3 +pkgrel=4 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" arch="x86 x86_64" @@ -15,7 +15,9 @@ makedepends="xorg-server-dev libxi-dev fontsproto randrproto source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 gcc5-workaround.patch xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch - O_CLOEXEC.patch" + O_CLOEXEC.patch + xorg-1.18.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -51,12 +53,15 @@ package() { md5sums="fa196a66e52c0c624fe5d350af7a5e7b xf86-video-intel-2.99.917.tar.bz2 2e9c5ee749f0a255d2b10ce18b3512fa gcc5-workaround.patch 2fa815b66eb6896b3962074731b0b4bb xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch -d5c410d504c58aa641658a19e4950ea5 O_CLOEXEC.patch" +d5c410d504c58aa641658a19e4950ea5 O_CLOEXEC.patch +d64095af23cf26c3559bba6f739e371e xorg-1.18.patch" sha256sums="00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 xf86-video-intel-2.99.917.tar.bz2 55367cd8dbe58d1097e2cf6cee11895acadc1a5ef527b8d39361e3975a6943e5 gcc5-workaround.patch 54298cb4a59016be0451e3ea72b2c2c6b2a97cb9ec2c8f45d62c12447d14b361 xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch -79f6c0bf8eb56d631857a0064e6c4ba1582acfb12c467f29c211e4fc4e628b98 O_CLOEXEC.patch" +79f6c0bf8eb56d631857a0064e6c4ba1582acfb12c467f29c211e4fc4e628b98 O_CLOEXEC.patch +f45ad7f6d8a78f282faf283057cc7fa82d2b1c99979dba563c1a734a25e4fb7a xorg-1.18.patch" sha512sums="cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f xf86-video-intel-2.99.917.tar.bz2 b208508d229f53f18cf3aa8de2c3637964d8b22f8a615fc4759a2bb58cbe9db4dca7a79129a7b59fd138980c90bdcaf1aec142e1f13954c4cf25a817a2125998 gcc5-workaround.patch 003fc22a9446cdfcb8d51cbface096187f93a0c54b024ee34b160ca41a491c35e8b387caabc3c3f6411b93663c5119f48dc2adae0d76878723c02483306972ac xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch -1054d8e4f314b061209d74d05037abefec64ab0c4a1efcf82e512ea8db9022c56cf7891ca4ed08af88f560e986ea0e726144f5bde11212e938cc741c40da5348 O_CLOEXEC.patch" +1054d8e4f314b061209d74d05037abefec64ab0c4a1efcf82e512ea8db9022c56cf7891ca4ed08af88f560e986ea0e726144f5bde11212e938cc741c40da5348 O_CLOEXEC.patch +f9c22684d50e4bd567efcb38f93b40b3bad2d56d8c7ae96bf768064dffbff1f9147e40ae415a7bbef61d8f3140ef6746a372059cea11861bc61b4b94acfa91a4 xorg-1.18.patch" diff --git a/main/xf86-video-intel/xorg-1.18.patch b/main/xf86-video-intel/xorg-1.18.patch new file mode 100644 index 0000000000..ab3fb399a1 --- /dev/null +++ b/main/xf86-video-intel/xorg-1.18.patch @@ -0,0 +1,24 @@ +From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Thu, 9 Jul 2015 11:26:38 +0300 +Subject: uxa: fix the call to PixmapSyncDirtyHelper, broken by xserver's + 90db5ed + +[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> + +diff --git a/src/compat-api.h b/src/compat-api.h +index aa93bee..293e9d7 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) + #endif + + #endif ++ ++#if HAS_DIRTYTRACKING_ROTATION ++#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) ++#endif +-- +cgit v0.10.2 + |