Date: Saturday, October 20, 2012 @ 13:43:29 Author: andyrtr Revision: 169416
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 169415, xf86-video-trident/trunk/PKGBUILD) xf86-video-trident/repos/extra-i686/git_fixes.diff (from rev 169415, xf86-video-trident/trunk/git_fixes.diff) xf86-video-trident/repos/extra-x86_64/PKGBUILD (from rev 169415, xf86-video-trident/trunk/PKGBUILD) xf86-video-trident/repos/extra-x86_64/git_fixes.diff (from rev 169415, xf86-video-trident/trunk/git_fixes.diff) Deleted: xf86-video-trident/repos/extra-i686/PKGBUILD xf86-video-trident/repos/extra-x86_64/PKGBUILD -----------------------------+ extra-i686/PKGBUILD | 64 +++++++++++++++++++++--------------------- extra-i686/git_fixes.diff | 63 +++++++++++++++++++++++++++++++++++++++++ extra-x86_64/PKGBUILD | 64 +++++++++++++++++++++--------------------- extra-x86_64/git_fixes.diff | 63 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+), 62 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-10-20 17:42:53 UTC (rev 169415) +++ extra-i686/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xf86-video-trident -pkgver=1.3.6 -pkgrel=2 -pkgdesc="X.org Trident video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./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-trident/repos/extra-i686/PKGBUILD (from rev 169415, xf86-video-trident/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-trident +pkgver=1.3.6 +pkgrel=3 +pkgdesc="X.org Trident video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +groups=('xorg-drivers' 'xorg') +options=(!libtool) +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) +sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104' + 'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git_fixes.diff + ./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-trident/repos/extra-i686/git_fixes.diff (from rev 169415, xf86-video-trident/trunk/git_fixes.diff) =================================================================== --- extra-i686/git_fixes.diff (rev 0) +++ extra-i686/git_fixes.diff 2012-10-20 17:43:29 UTC (rev 169416) @@ -0,0 +1,63 @@ +From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Tue, 25 Sep 2012 12:55:01 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/trident_driver.c b/src/trident_driver.c +index dc12b76..408c870 100644 +--- a/src/trident_driver.c ++++ b/src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +-- +cgit v0.9.0.2-2-gbebe +From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001 +From: Timo Aaltonen <tjaal...@ubuntu.com> +Date: Wed, 26 Sep 2012 08:01:26 +0000 +Subject: Fix loading the driver without XAA + +--- +diff --git a/src/trident_dga.c b/src/trident_dga.c +index 0263aa7..c4b5b9a 100644 +--- a/src/trident_dga.c ++++ b/src/trident_dga.c +@@ -37,10 +37,10 @@ + static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); +-static void TRIDENT_Sync(ScrnInfoPtr); + static int TRIDENT_GetViewport(ScrnInfoPtr); + static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void TRIDENT_Sync(ScrnInfoPtr); + static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { + TRIDENT_SetMode, + TRIDENT_SetViewport, + TRIDENT_GetViewport, +- TRIDENT_Sync, + #ifdef HAVE_XAA_H ++ TRIDENT_Sync, + TRIDENT_FillRect, + TRIDENT_BlitRect, + #if 0 +-- +cgit v0.9.0.2-2-gbebe Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-10-20 17:42:53 UTC (rev 169415) +++ extra-x86_64/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xf86-video-trident -pkgver=1.3.6 -pkgrel=2 -pkgdesc="X.org Trident video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./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-trident/repos/extra-x86_64/PKGBUILD (from rev 169415, xf86-video-trident/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-trident +pkgver=1.3.6 +pkgrel=3 +pkgdesc="X.org Trident video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +groups=('xorg-drivers' 'xorg') +options=(!libtool) +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) +sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104' + 'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git_fixes.diff + ./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-trident/repos/extra-x86_64/git_fixes.diff (from rev 169415, xf86-video-trident/trunk/git_fixes.diff) =================================================================== --- extra-x86_64/git_fixes.diff (rev 0) +++ extra-x86_64/git_fixes.diff 2012-10-20 17:43:29 UTC (rev 169416) @@ -0,0 +1,63 @@ +From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Tue, 25 Sep 2012 12:55:01 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/trident_driver.c b/src/trident_driver.c +index dc12b76..408c870 100644 +--- a/src/trident_driver.c ++++ b/src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +-- +cgit v0.9.0.2-2-gbebe +From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001 +From: Timo Aaltonen <tjaal...@ubuntu.com> +Date: Wed, 26 Sep 2012 08:01:26 +0000 +Subject: Fix loading the driver without XAA + +--- +diff --git a/src/trident_dga.c b/src/trident_dga.c +index 0263aa7..c4b5b9a 100644 +--- a/src/trident_dga.c ++++ b/src/trident_dga.c +@@ -37,10 +37,10 @@ + static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); +-static void TRIDENT_Sync(ScrnInfoPtr); + static int TRIDENT_GetViewport(ScrnInfoPtr); + static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void TRIDENT_Sync(ScrnInfoPtr); + static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { + TRIDENT_SetMode, + TRIDENT_SetViewport, + TRIDENT_GetViewport, +- TRIDENT_Sync, + #ifdef HAVE_XAA_H ++ TRIDENT_Sync, + TRIDENT_FillRect, + TRIDENT_BlitRect, + #if 0 +-- +cgit v0.9.0.2-2-gbebe