[arch-commits] Commit in xf86-video-mach64/repos (8 files)
Date: Wednesday, February 11, 2015 @ 09:50:55
Author: lcarlier
Revision: 231267
db-move: moved xf86-video-mach64 from [staging] to [testing] (i686, x86_64)
Added:
xf86-video-mach64/repos/testing-i686/
xf86-video-mach64/repos/testing-i686/PKGBUILD
(from rev 231256, xf86-video-mach64/repos/staging-i686/PKGBUILD)
xf86-video-mach64/repos/testing-i686/git-fixes.diff
(from rev 231256, xf86-video-mach64/repos/staging-i686/git-fixes.diff)
xf86-video-mach64/repos/testing-x86_64/
xf86-video-mach64/repos/testing-x86_64/PKGBUILD
(from rev 231256, xf86-video-mach64/repos/staging-x86_64/PKGBUILD)
xf86-video-mach64/repos/testing-x86_64/git-fixes.diff
(from rev 231256, xf86-video-mach64/repos/staging-x86_64/git-fixes.diff)
Deleted:
xf86-video-mach64/repos/staging-i686/
xf86-video-mach64/repos/staging-x86_64/
---+
testing-i686/PKGBUILD | 37 ++
testing-i686/git-fixes.diff | 224
testing-x86_64/PKGBUILD | 37 ++
testing-x86_64/git-fixes.diff | 224
4 files changed, 522 insertions(+)
Copied: xf86-video-mach64/repos/testing-i686/PKGBUILD (from rev 231256,
xf86-video-mach64/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-02-11 08:50:55 UTC (rev 231267)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mach64
+pkgver=6.9.4
+pkgrel=5
+pkgdesc=X.org mach64 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19'
'X-ABI-VIDEODRV_VERSION=20')
+optdepends=('mach64-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+options=('!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.diff)
+sha256sums=('97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e'
+'47bc157a518ec9b0ad365a00a326e5aff7e2e2716de6310b51d866354f854a38')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${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-mach64/repos/testing-i686/git-fixes.diff (from rev 231256,
xf86-video-mach64/repos/staging-i686/git-fixes.diff)
===
--- testing-i686/git-fixes.diff (rev 0)
+++ testing-i686/git-fixes.diff 2015-02-11 08:50:55 UTC (rev 231267)
@@ -0,0 +1,224 @@
+From fa18180cc5f6d84168ffca6b7b8e467a5c72da14 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 2 Apr 2013 11:15:47 -0400
+Subject: preinit: Don't bother explicitly loading int10, vbe will do it for us
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+diff --git a/src/atipreinit.c b/src/atipreinit.c
+index 0f5c785..e3048d2 100644
+--- a/src/atipreinit.c
b/src/atipreinit.c
+@@ -531,9 +531,8 @@ ATIPreInit
+
+ #ifndef AVOID_CPIO
+
+-xf86Int10InfoPtr pInt10Info = NULL;
+ vbeInfoPtr pVBE = NULL;
+-pointer pInt10Module, pDDCModule = NULL, pVBEModule = NULL;
++pointer pVBEModule = NULL;
+
+ #endif /* AVOID_CPIO */
+
+@@ -657,42 +656,21 @@ ATIPreInit
+ #endif /* TV_OUT */
+
+ /*
+- * If there is an ix86-style BIOS, ensure its initialisation entry point
+- * has been executed, and retrieve DDC and VBE information from it.
++ * If VBE setup works, grab DDC from it
+ */
+-if (!(pInt10Module = xf86LoadSubModule(pScreenInfo, int10)))
+-{
+-xf86DrvMsg(pScreenInfo-scrnIndex, X_WARNING,
+-Unable to load int10 module.\n);
+-}
+-else if (!(pInt10Info = xf86InitInt10(pATI-iEntity)))
+-{
+-xf86DrvMsg(pScreenInfo-scrnIndex, X_WARNING,
+- Unable to initialise int10 interface.\n);
++if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, vbe))) {
++ xf86DrvMsg(pScreenInfo-scrnIndex, X_WARNING,
++ Unable to load vbe module.\n);
+ }
+ else
+ {
+-if (!(pDDCModule = xf86LoadSubModule(pScreenInfo, ddc)))
+-{
+-xf86DrvMsg(pScreenInfo-scrnIndex, X_WARNING,
+-Unable to load ddc module.\n);
+-}
+-else
+-if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, vbe)))
+-{
+-xf86DrvMsg(pScreenInfo-scrnIndex, X_WARNING,
+-Unable to load vbe module.\n);
+-}
+-else
+-{
+-if ((pVBE = VBEInit(pInt10Info,
[arch-commits] Commit in xf86-video-mach64/repos (8 files)
Date: Saturday, October 13, 2012 @ 07:45:07
Author: andyrtr
Revision: 168577
db-move: moved xf86-video-mach64 from [testing] to [extra] (i686, x86_64)
Added:
xf86-video-mach64/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-mach64/repos/testing-i686/PKGBUILD)
xf86-video-mach64/repos/extra-i686/git_fixes.diff
(from rev 168549, xf86-video-mach64/repos/testing-i686/git_fixes.diff)
xf86-video-mach64/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-mach64/repos/testing-x86_64/PKGBUILD)
xf86-video-mach64/repos/extra-x86_64/git_fixes.diff
(from rev 168549, xf86-video-mach64/repos/testing-x86_64/git_fixes.diff)
Deleted:
xf86-video-mach64/repos/extra-i686/PKGBUILD
xf86-video-mach64/repos/extra-x86_64/PKGBUILD
xf86-video-mach64/repos/testing-i686/
xf86-video-mach64/repos/testing-x86_64/
-+
extra-i686/PKGBUILD | 64 -
extra-i686/git_fixes.diff | 107 ++
extra-x86_64/PKGBUILD | 64 -
extra-x86_64/git_fixes.diff | 107 ++
4 files changed, 280 insertions(+), 62 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:45:01 UTC (rev 168576)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:07 UTC (rev 168577)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-mach64
-pkgver=6.9.3
-pkgrel=1
-pkgdesc=X.org mach64 video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
-optdepends=('mach64-dri: DRI1 support from community repo')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218')
-
-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-mach64/repos/extra-i686/PKGBUILD (from rev 168549,
xf86-video-mach64/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:07 UTC (rev 168577)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mach64
+pkgver=6.9.3
+pkgrel=2
+pkgdesc=X.org mach64 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto' )
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
+optdepends=('mach64-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git_fixes.diff)
+sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218'
+'27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3')
+
+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-mach64/repos/extra-i686/git_fixes.diff (from rev 168549,
xf86-video-mach64/repos/testing-i686/git_fixes.diff)
===
--- extra-i686/git_fixes.diff (rev 0)
+++ extra-i686/git_fixes.diff 2012-10-13 11:45:07 UTC (rev 168577)
@@ -0,0 +1,107 @@
+From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
+From: Dave Airlie airl...@gmail.com
+Date: Wed, 18 Jul 2012 08:46:49 +
+Subject: mach64: fix build on 32-bit.
+
+tvout code only builds on 32-bit, fix build.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+---
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index 2957877..b1fbd3c 100644
+--- a/src/atiscreen.c
b/src/atiscreen.c
+@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ #ifdef TV_OUT
+ /* Fix-up TV out after ImpacTV probe */
+ if (pATI-OptionTvOut pATI-Chip ATI_CHIP_264GTPRO)
+-ATISwitchMode(0, pScreenInfo-currentMode, 0);
++ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo,
pScreenInfo-currentMode));
+ #endif /* TV_OUT */
+
+ #ifdef XF86DRI_DEVEL
+--
+cgit
[arch-commits] Commit in xf86-video-mach64/repos (8 files)
Date: Saturday, October 6, 2012 @ 16:07:36
Author: andyrtr
Revision: 168229
db-move: moved xf86-video-mach64 from [staging] to [testing] (i686, x86_64)
Added:
xf86-video-mach64/repos/testing-i686/
xf86-video-mach64/repos/testing-i686/PKGBUILD
(from rev 168199, xf86-video-mach64/repos/staging-i686/PKGBUILD)
xf86-video-mach64/repos/testing-i686/git_fixes.diff
(from rev 168199, xf86-video-mach64/repos/staging-i686/git_fixes.diff)
xf86-video-mach64/repos/testing-x86_64/
xf86-video-mach64/repos/testing-x86_64/PKGBUILD
(from rev 168199, xf86-video-mach64/repos/staging-x86_64/PKGBUILD)
xf86-video-mach64/repos/testing-x86_64/git_fixes.diff
(from rev 168199, xf86-video-mach64/repos/staging-x86_64/git_fixes.diff)
Deleted:
xf86-video-mach64/repos/staging-i686/
xf86-video-mach64/repos/staging-x86_64/
---+
testing-i686/PKGBUILD | 33
testing-i686/git_fixes.diff | 107
testing-x86_64/PKGBUILD | 33
testing-x86_64/git_fixes.diff | 107
4 files changed, 280 insertions(+)
Copied: xf86-video-mach64/repos/testing-i686/PKGBUILD (from rev 168199,
xf86-video-mach64/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-06 20:07:36 UTC (rev 168229)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mach64
+pkgver=6.9.3
+pkgrel=2
+pkgdesc=X.org mach64 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto' )
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
+optdepends=('mach64-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git_fixes.diff)
+sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218'
+'27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3')
+
+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-mach64/repos/testing-i686/git_fixes.diff (from rev 168199,
xf86-video-mach64/repos/staging-i686/git_fixes.diff)
===
--- testing-i686/git_fixes.diff (rev 0)
+++ testing-i686/git_fixes.diff 2012-10-06 20:07:36 UTC (rev 168229)
@@ -0,0 +1,107 @@
+From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
+From: Dave Airlie airl...@gmail.com
+Date: Wed, 18 Jul 2012 08:46:49 +
+Subject: mach64: fix build on 32-bit.
+
+tvout code only builds on 32-bit, fix build.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+---
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index 2957877..b1fbd3c 100644
+--- a/src/atiscreen.c
b/src/atiscreen.c
+@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ #ifdef TV_OUT
+ /* Fix-up TV out after ImpacTV probe */
+ if (pATI-OptionTvOut pATI-Chip ATI_CHIP_264GTPRO)
+-ATISwitchMode(0, pScreenInfo-currentMode, 0);
++ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo,
pScreenInfo-currentMode));
+ #endif /* TV_OUT */
+
+ #ifdef XF86DRI_DEVEL
+--
+cgit v0.9.0.2-2-gbebe
+From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Wed, 26 Sep 2012 20:21:25 +
+Subject: Don't gratuitously disable Render when ShadowFBing
+
+There's no reason to do this, and I am at a loss to explain why that was
+ever done. The first instance of this logic comes from xfree86 (over 11
+years ago!):
+
+http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15r2=1.16
+
+Now, cfb never had Render support, so that might make some sense if
+there was an intermediate uncommitted state where the driver used fb for
+direct but cfb for shadowed. But that's really the only plausible
+explanation I can think of.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index b1fbd3c..62a4dd9 100644
+--- a/src/atiscreen.c
b/src/atiscreen.c
+@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+
+-/* If applicable, initialise RENDER extension */
++/* initialise RENDER extension */
++if (!fbPictureInit(pScreen, NULL, 0) (serverGeneration == 1))
+ {
+-if
