Commit 0217c80d authored by Phil's avatar Phil
Browse files

* pixman: bump to 0.22.2

* xorg-server: fix kvm and virtualbox crashes
* xf86-video-ati: rebuild against pixman
parent 52d0d0ce
......@@ -4,7 +4,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=pixman
pkgver=0.21.8
pkgver=0.22.2
pkgrel=1
pkgdesc="Pixman library"
arch=(i686 x86_64)
......@@ -13,12 +13,21 @@ license=('custom')
depends=('glibc')
options=('!libtool')
source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
md5sums=('1a46b77586fbfd517cccf8ced3a835a1')
sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --disable-static
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
make check
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
......
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=xf86-video-ati
pkgver=6.14.2
pkgrel=1
pkgrel=2
pkgdesc="X.org ati video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
......
......@@ -6,7 +6,7 @@
pkgname=xorg-server
pkgver=1.10.3
pkgrel=1
pkgrel=2
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
......@@ -25,6 +25,7 @@ source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
#git-fixes.patch
bg-none-revert.patch
xserver-1.10-pointer-barriers.patch
xorg-server-1.10-fb-crash-1.patch
xorg-redhat-die-ugly-pattern-die-die-die.patch
autoconfig-nvidia.patch
xvfb-run
......@@ -35,11 +36,13 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
# '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
'629c6d8d52126eab81ee1b72a9e4209535f8cb81'
'1b95e91384a57d966428c7db98ed06f4cc562f91'
'4a47d71e0c5caa6d7699162e5303b7746d51de51'
'0efcdf61bde3c0cd813072b94e2b30ab922775b9'
'f9328fd7bc931bb02c8909ecfcef35403de33782'
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
'6838fc00ef4618c924a77e0fb03c05346080908a'
'993798f3d22ad672d769dae5f48d1fa068d5578f')
'993798f3d22ad672d769dae5f48d1fa068d5578f'
'56224adfce729782d3a0351abd07928911aa17c5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......@@ -49,6 +52,9 @@ build() {
# Add pointer barrier support, patch from Fedora
patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
# pixman_image_create_bits()
patch -Np1 -i "${srcdir}/xorg-server-1.10-fb-crash-1.patch"
# Patches from ~ajax/xserver xserver-next branch
patch -Np1 -i "${srcdir}/bg-none-revert.patch"
......
From patchwork Fri Feb 4 07:52:10 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Check for NULL pointer from pixman_image_create_bits()
Date: Fri, 04 Feb 2011 15:52:10 -0000
From: Bryce Harrington <bryce@canonical.com>
X-Patchwork-Id: 3989
Message-Id: <20110204075209.GA3112@bryceharrington.org>
To: xorg-devel@lists.freedesktop.org
pixman_image_create_bits() can return NULL under a variety of
circumstances. If this happens, it will segfault when dereferenced in
pixman_image_set_accessors().
http://bugs.freedesktop.org/show_bug.cgi?id=28882
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596155
https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/705078
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Soren Sandmann <ssp@redhat.com<
---
fb/fbpict.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 7636040..79b462b 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -163,7 +163,8 @@ create_bits_picture (PicturePtr pict,
pict->format,
pixmap->drawable.width, pixmap->drawable.height,
(uint32_t *)bits, stride * sizeof (FbStride));
-
+ if (!image)
+ return NULL;
#ifdef FB_ACCESS_WRAPPER
#if FB_SHIFT==5
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment