Date: Saturday, February 11, 2012 @ 07:24:18 Author: andyrtr Revision: 149902
archrelease: copy trunk to staging-i686, staging-x86_64 Added: xf86-video-xgixp/repos/staging-i686/ xf86-video-xgixp/repos/staging-i686/PKGBUILD (from rev 149901, xf86-video-xgixp/trunk/PKGBUILD) xf86-video-xgixp/repos/staging-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch (from rev 149901, xf86-video-xgixp/trunk/api-compat-fix-for-DRAWABLE_BUFFER.patch) xf86-video-xgixp/repos/staging-x86_64/ xf86-video-xgixp/repos/staging-x86_64/PKGBUILD (from rev 149901, xf86-video-xgixp/trunk/PKGBUILD) xf86-video-xgixp/repos/staging-x86_64/api-compat-fix-for-DRAWABLE_BUFFER.patch (from rev 149901, xf86-video-xgixp/trunk/api-compat-fix-for-DRAWABLE_BUFFER.patch) ---------------------------------------------------------+ staging-i686/PKGBUILD | 33 ++++++++++++++ staging-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch | 23 +++++++++ staging-x86_64/PKGBUILD | 33 ++++++++++++++ staging-x86_64/api-compat-fix-for-DRAWABLE_BUFFER.patch | 23 +++++++++ 4 files changed, 112 insertions(+) Copied: xf86-video-xgixp/repos/staging-i686/PKGBUILD (from rev 149901, xf86-video-xgixp/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-02-11 12:24:18 UTC (rev 149902) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-xgixp +pkgver=1.8.0 +pkgrel=5 +pkgdesc="X.org XGIXP video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto') +conflicts=('xorg-server<1.11.99.903') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + api-compat-fix-for-DRAWABLE_BUFFER.patch) +sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' + 'ea140a13963bbf33cdff1ad75789d765867ec53b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" + ./configure --prefix=/usr + make +} + +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}/" +} Copied: xf86-video-xgixp/repos/staging-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch (from rev 149901, xf86-video-xgixp/trunk/api-compat-fix-for-DRAWABLE_BUFFER.patch) =================================================================== --- staging-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch (rev 0) +++ staging-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch 2012-02-11 12:24:18 UTC (rev 149902) @@ -0,0 +1,23 @@ +From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Fri, 25 Mar 2011 22:46:55 +0000 +Subject: API compat fix for DRAWABLE_BUFFER + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index e54d8c7..189b84a 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, + { + switch (pDraw->type) { + case DRAWABLE_WINDOW: ++#ifdef DRAWABLE_BUFFER + case DRAWABLE_BUFFER: ++#endif + *read_ptr = xg47_read_memory_swap_func; + *write_ptr = xg47_write_memory_swap_func; + break; +-- +cgit v0.8.3-6-g21f6 Copied: xf86-video-xgixp/repos/staging-x86_64/PKGBUILD (from rev 149901, xf86-video-xgixp/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-02-11 12:24:18 UTC (rev 149902) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-xgixp +pkgver=1.8.0 +pkgrel=5 +pkgdesc="X.org XGIXP video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto') +conflicts=('xorg-server<1.11.99.903') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + api-compat-fix-for-DRAWABLE_BUFFER.patch) +sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' + 'ea140a13963bbf33cdff1ad75789d765867ec53b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" + ./configure --prefix=/usr + make +} + +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}/" +} Copied: xf86-video-xgixp/repos/staging-x86_64/api-compat-fix-for-DRAWABLE_BUFFER.patch (from rev 149901, xf86-video-xgixp/trunk/api-compat-fix-for-DRAWABLE_BUFFER.patch) =================================================================== --- staging-x86_64/api-compat-fix-for-DRAWABLE_BUFFER.patch (rev 0) +++ staging-x86_64/api-compat-fix-for-DRAWABLE_BUFFER.patch 2012-02-11 12:24:18 UTC (rev 149902) @@ -0,0 +1,23 @@ +From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Fri, 25 Mar 2011 22:46:55 +0000 +Subject: API compat fix for DRAWABLE_BUFFER + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index e54d8c7..189b84a 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, + { + switch (pDraw->type) { + case DRAWABLE_WINDOW: ++#ifdef DRAWABLE_BUFFER + case DRAWABLE_BUFFER: ++#endif + *read_ptr = xg47_read_memory_swap_func; + *write_ptr = xg47_write_memory_swap_func; + break; +-- +cgit v0.8.3-6-g21f6