diff options
| author | Tilman Sauerbeck <tilman@crux.nu> | 2009-11-29 19:11:03 +0100 |
|---|---|---|
| committer | Tilman Sauerbeck <tilman@crux.nu> | 2009-11-29 20:24:48 +0100 |
| commit | 651f4eeae5815ed73578e2a6eb55039b226a93ff (patch) | |
| tree | 4a4615b783aa733164f3cbdc9cdb1daeb417d980 /xorg-xf86-video-intel | |
| parent | af5b42a867b6330e4485cf16780728b00b55ff5c (diff) | |
| download | xorg-651f4eeae5815ed73578e2a6eb55039b226a93ff.tar.gz xorg-651f4eeae5815ed73578e2a6eb55039b226a93ff.tar.xz | |
xorg-xf86-video-intel: fixed the build against xserver 1.7.2.
Diffstat (limited to 'xorg-xf86-video-intel')
| -rw-r--r-- | xorg-xf86-video-intel/.md5sum | 1 | ||||
| -rw-r--r-- | xorg-xf86-video-intel/Pkgfile | 8 | ||||
| -rw-r--r-- | xorg-xf86-video-intel/xorg-xf86-video-intel.diff | 12 |
3 files changed, 19 insertions, 2 deletions
diff --git a/xorg-xf86-video-intel/.md5sum b/xorg-xf86-video-intel/.md5sum index 038629a8..34b7a5ee 100644 --- a/xorg-xf86-video-intel/.md5sum +++ b/xorg-xf86-video-intel/.md5sum @@ -1 +1,2 @@ 8951d0366c16991badb7f9050556f4f3 xf86-video-intel-2.9.1.tar.bz2 +41e604315b837c3a7990a26847eed79a xorg-xf86-video-intel.diff diff --git a/xorg-xf86-video-intel/Pkgfile b/xorg-xf86-video-intel/Pkgfile index 755f0f2b..8e0914cf 100644 --- a/xorg-xf86-video-intel/Pkgfile +++ b/xorg-xf86-video-intel/Pkgfile @@ -5,12 +5,16 @@ name=xorg-xf86-video-intel version=2.9.1 -release=1 -source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2) +release=2 +source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2 + $name.diff) build() { cd xf86-video-intel-$version + # Fix the build against xserver 1.7.2. + patch -p1 -i $SRC/$name.diff + ./configure --prefix=/usr --mandir=/usr/man make diff --git a/xorg-xf86-video-intel/xorg-xf86-video-intel.diff b/xorg-xf86-video-intel/xorg-xf86-video-intel.diff new file mode 100644 index 00000000..455f2cab --- /dev/null +++ b/xorg-xf86-video-intel/xorg-xf86-video-intel.diff @@ -0,0 +1,12 @@ +diff -aur xf86-video-intel-2.9.1.orig/uxa/uxa-render.c xf86-video-intel-2.9.1/uxa/uxa-render.c +--- xf86-video-intel-2.9.1.orig/uxa/uxa-render.c 2009-10-26 12:48:05.000000000 +0100 ++++ xf86-video-intel-2.9.1/uxa/uxa-render.c 2009-11-29 19:05:42.944085930 +0100 +@@ -440,6 +440,8 @@ + + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC (1,6,99,1,0) + #define IMAGE_FROM_PICT(P) image_from_pict(P, 0) ++#elif XORG_VERSION_CURRENT == XORG_VERSION_NUMERIC (1,7,2,0,0) ++#define IMAGE_FROM_PICT(P) image_from_pict(P, 0) + #else + #define IMAGE_FROM_PICT(P) image_from_pict(P, 0, 0) + #endif |