diff options
| -rw-r--r-- | pcr/xf86-video-qxl/PKGBUILD | 32 | ||||
| -rw-r--r-- | pcr/xf86-video-qxl/fix-cast.patch | 19 |
2 files changed, 25 insertions, 26 deletions
diff --git a/pcr/xf86-video-qxl/PKGBUILD b/pcr/xf86-video-qxl/PKGBUILD index 2ad0842ca..8c827e6fc 100644 --- a/pcr/xf86-video-qxl/PKGBUILD +++ b/pcr/xf86-video-qxl/PKGBUILD @@ -1,31 +1,45 @@ -# Contributor (Arch): Christian Hesse <mail@eworm.de> +# Maintainer (Arch): Christian Hesse <mail@eworm.de> # Contributor (Arch): Yonathan Dossow # Contributor (Arch): Ansgar Taflinski <ataflinski@uni-koblenz.de> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=xf86-video-qxl pkgver=0.1.4 -pkgrel=1 +pkgrel=3 pkgdesc='Xorg X11 qxl video driver' arch=('x86_64' 'i686') url='http://www.x.org' license=('MIT') groups=('xorg-drivers') -depends=('xf86dgaproto' 'xproto' 'fontsproto' 'randrproto' 'renderproto' 'videoproto' 'resourceproto' 'scrnsaverproto' 'spice') +depends=('spice') optdepends=('python2: for Xspice') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'spice-protocol') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'spice-protocol' + 'xf86dgaproto' 'xproto' 'fontsproto' 'randrproto' 'renderproto' + 'videoproto' 'resourceproto' 'scrnsaverproto') conflicts=('xf86-video-qxl-git' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') -source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" +#validpgpkeys=('94A9F75661F77A6168649B23A9D8C21429AC6C82') +source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" #{,.sig} 'fix-cast.patch') +sha256sums=('e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105' + #'SKIP' + '30b09971562d82b5bc9dc26e43514ff38e5eaa680c15471194f07c9129e1e0ed') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}/" + # fix cast from pointer to integer of different size patch -Np1 < "${srcdir}/fix-cast.patch" + + # this is python 2.x sed -i '1c #!/usr/bin/python2' scripts/Xspice +} - ./configure --enable-xspice \ +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + ./configure \ --prefix=/usr + #--enable-xspice \ make } @@ -35,5 +49,3 @@ package() { make DESTDIR="${pkgdir}/" install } -sha256sums=('e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105' - '575243334f763c21282eccd7bd4eb713b90e96fdd46a882370925fa20d4acb70') diff --git a/pcr/xf86-video-qxl/fix-cast.patch b/pcr/xf86-video-qxl/fix-cast.patch index e51beec29..55f281f14 100644 --- a/pcr/xf86-video-qxl/fix-cast.patch +++ b/pcr/xf86-video-qxl/fix-cast.patch @@ -1,14 +1,5 @@ -From d17fd8b7b503fd5d247fe75432ad192414fa2bdd Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Tue, 7 Jan 2014 08:16:48 +0100 -Subject: [PATCH 1/1] fix cast - ---- - src/spiceqxl_display.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c -index a3a8978..7646efc 100644 +index a3a8978..748c2db 100644 --- a/src/spiceqxl_display.c +++ b/src/spiceqxl_display.c @@ -350,6 +350,6 @@ void qxl_add_spice_display_interface(qxl_screen_t *qxl) @@ -16,10 +7,6 @@ index a3a8978..7646efc 100644 void spiceqxl_display_monitors_config(qxl_screen_t *qxl) { - spice_qxl_monitors_config_async(&qxl->display_sin, (QXLPHYSICAL)qxl->monitors_config, -- MEMSLOT_GROUP, 0); -+ spice_qxl_monitors_config_async(&qxl->display_sin, -+ (QXLPHYSICAL)(uintptr_t)qxl->monitors_config, MEMSLOT_GROUP, 0); ++ spice_qxl_monitors_config_async(&qxl->display_sin, qxl->monitors_config, + MEMSLOT_GROUP, 0); } --- -1.8.5.2 - |