[arch-commits] Commit in xf86-video-mga/repos (6 files)

2015-02-06 Thread Laurent Carlier 
Date: Friday, February 6, 2015 @ 09:08:35
  Author: lcarlier
Revision: 230900

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-mga/repos/staging-i686/
  xf86-video-mga/repos/staging-i686/PKGBUILD
(from rev 230899, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/staging-i686/git-fixes.patch
(from rev 230899, xf86-video-mga/trunk/git-fixes.patch)
  xf86-video-mga/repos/staging-x86_64/
  xf86-video-mga/repos/staging-x86_64/PKGBUILD
(from rev 230899, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/staging-x86_64/git-fixes.patch
(from rev 230899, xf86-video-mga/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   37 +++
 staging-i686/git-fixes.patch   |  447 +++
 staging-x86_64/PKGBUILD|   37 +++
 staging-x86_64/git-fixes.patch |  447 +++
 4 files changed, 968 insertions(+)

Copied: xf86-video-mga/repos/staging-i686/PKGBUILD (from rev 230899, 
xf86-video-mga/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-02-06 08:08:35 UTC (rev 230900)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.6.3
+pkgrel=4
+pkgdesc=X.org mga 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=('mga-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('7704b1ea35098769787a9c93e903b827be97a99facfb1696aa5236a58ff1c7d7'
+'3a7b12629fd79b06eda845728d0abdef664703f3e599bba2f34d8994ac7d7a75')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
+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-mga/repos/staging-i686/git-fixes.patch (from rev 230899, 
xf86-video-mga/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2015-02-06 08:08:35 UTC (rev 230900)
@@ -0,0 +1,447 @@
+From 62ba63f687d7b99aff7c88ffd2774f15a2471ce0 Mon Sep 17 00:00:00 2001
+From: Mikulas Patocka mpato...@redhat.com
+Date: Fri, 17 Jan 2014 16:04:26 -0500
+Subject: xf86-video-mga: set the pan_ctl register
+
+On my Matrox G550 most videomodes in Xorg didn't work. I found out that it
+works if Xorg pixel clock is similar to the pixel clock set on framebuffer
+console.
+
+Further analysis showed that the Linux framebuffer driver sets the pan_ctl
+register (the register 0xa2) according to the pixel clock, the Xorg driver
+doesn't set it.
+
+I copied the code to set the pan_ctl register from the Linux kernel to the
+Xorg driver, and most videomodes in Xorg work.
+
+The pan_ctl register is required for both analog and digital output.
+
+The pan_ctl register is saved and restored, this is required so that we
+restore text-mode screen or Linux framebuffer correctly.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+diff --git a/src/mga.h b/src/mga.h
+index 988ba93..5f75d37 100644
+--- a/src/mga.h
 b/src/mga.h
+@@ -218,6 +218,7 @@ typedef struct {
+ CARD32Option2;
+ CARD32Option3;
+ longClock;
++unsigned char Pan_Ctl;
+ BoolPIXPLLCSaved;
+ unsigned char   PllM;
+ unsigned char   PllN;
+diff --git a/src/mga_dacG.c b/src/mga_dacG.c
+index 9a80193..f307488 100644
+--- a/src/mga_dacG.c
 b/src/mga_dacG.c
+@@ -849,6 +849,43 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out )
+ 
+   if(MGAISGx50(pMga)) {
+   pReg-Clock = f_out;
++  if (pMga-Chipset == PCI_CHIP_MGAG550) {
++  if (f_out  45000) {
++  pReg-Pan_Ctl = 0x00;
++  } else if (f_out  55000) {
++  pReg-Pan_Ctl = 0x08;
++  } else if (f_out  7) {
++  pReg-Pan_Ctl = 0x10;
++  } else if (f_out  85000) {
++  pReg-Pan_Ctl = 0x18;
++  } else if (f_out  10) {
++  pReg-Pan_Ctl = 0x20;
++  } else if (f_out  115000) {
++  pReg-Pan_Ctl = 0x28;
++  } else if (f_out  125000) {
++  pReg-Pan_Ctl = 0x30;
++  } else {
++  pReg-Pan_Ctl = 0x38;
++  }
++

[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-10-13 Thread andyrtr 
Date: Saturday, October 13, 2012 @ 07:45:11
  Author: andyrtr
Revision: 168578

db-move: moved xf86-video-mga from [testing] to [extra] (i686, x86_64)

Added:
  xf86-video-mga/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-mga/repos/testing-i686/PKGBUILD)
  xf86-video-mga/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-mga/repos/testing-x86_64/PKGBUILD)
Deleted:
  xf86-video-mga/repos/extra-i686/PKGBUILD
  xf86-video-mga/repos/extra-x86_64/PKGBUILD
  xf86-video-mga/repos/testing-i686/
  xf86-video-mga/repos/testing-x86_64/

---+
 extra-i686/PKGBUILD   |   66 
 extra-x86_64/PKGBUILD |   66 
 2 files changed, 68 insertions(+), 64 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:45:07 UTC (rev 168577)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:11 UTC (rev 168578)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-mga
-pkgver=1.6.2
-pkgrel=1
-pkgdesc=X.org mga 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=('mga-dri: DRI1 support from community repo')
-conflicts=('xorg-server1.12.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
-
-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-mga/repos/extra-i686/PKGBUILD (from rev 168549, 
xf86-video-mga/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:11 UTC (rev 168578)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.6.2
+pkgrel=2
+pkgdesc=X.org mga 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')
+#makedepends=('xorg-server-devel=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
+optdepends=('mga-dri: DRI1 support from community repo')
+#conflicts=('xorg-server1.12.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
+
+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}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-13 11:45:07 UTC (rev 168577)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:45:11 UTC (rev 168578)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-mga
-pkgver=1.6.2
-pkgrel=1
-pkgdesc=X.org mga 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=('mga-dri: DRI1 support from community repo')
-conflicts=('xorg-server1.12.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
-
-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-mga/repos/extra-x86_64/PKGBUILD (from rev 168549, 
xf86-video-mga/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:45:11 UTC (rev 168578)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.6.2
+pkgrel=2
+pkgdesc=X.org mga video driver

[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-10-06 Thread andyrtr 
Date: Saturday, October 6, 2012 @ 16:07:39
  Author: andyrtr
Revision: 168230

db-move: moved xf86-video-mga from [staging] to [testing] (i686, x86_64)

Added:
  xf86-video-mga/repos/testing-i686/
  xf86-video-mga/repos/testing-i686/PKGBUILD
(from rev 168199, xf86-video-mga/repos/staging-i686/PKGBUILD)
  xf86-video-mga/repos/testing-x86_64/
  xf86-video-mga/repos/testing-x86_64/PKGBUILD
(from rev 168199, xf86-video-mga/repos/staging-x86_64/PKGBUILD)
Deleted:
  xf86-video-mga/repos/staging-i686/
  xf86-video-mga/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   34 ++
 testing-x86_64/PKGBUILD |   34 ++
 2 files changed, 68 insertions(+)

Copied: xf86-video-mga/repos/testing-i686/PKGBUILD (from rev 168199, 
xf86-video-mga/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-06 20:07:39 UTC (rev 168230)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.6.2
+pkgrel=2
+pkgdesc=X.org mga 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')
+#makedepends=('xorg-server-devel=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
+optdepends=('mga-dri: DRI1 support from community repo')
+#conflicts=('xorg-server1.12.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
+
+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-mga/repos/testing-x86_64/PKGBUILD (from rev 168199, 
xf86-video-mga/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-06 20:07:39 UTC (rev 168230)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.6.2
+pkgrel=2
+pkgdesc=X.org mga 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')
+#makedepends=('xorg-server-devel=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
+optdepends=('mga-dri: DRI1 support from community repo')
+#conflicts=('xorg-server1.12.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
+
+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}/
+}

[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-03-24 Thread Jan de Groot 
Date: Saturday, March 24, 2012 @ 06:28:18
  Author: jgc
Revision: 154215

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-mga/repos/extra-i686/PKGBUILD
(from rev 154214, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/extra-x86_64/PKGBUILD
(from rev 154214, xf86-video-mga/trunk/PKGBUILD)
Deleted:
  xf86-video-mga/repos/extra-i686/PKGBUILD
  xf86-video-mga/repos/extra-i686/git-fixes.patch
  xf86-video-mga/repos/extra-x86_64/PKGBUILD
  xf86-video-mga/repos/extra-x86_64/git-fixes.patch

--+
 extra-i686/PKGBUILD  |   65 
 extra-i686/git-fixes.patch   | 5192 -
 extra-x86_64/PKGBUILD|   65 
 extra-x86_64/git-fixes.patch | 5192 -
 4 files changed, 62 insertions(+), 10452 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 154214:154215 to see the changes.

[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-03-16 Thread andyrtr 
Date: Friday, March 16, 2012 @ 14:24:30
  Author: andyrtr
Revision: 153627

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  xf86-video-mga/repos/testing-i686/
  xf86-video-mga/repos/testing-i686/PKGBUILD
(from rev 153626, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/testing-i686/git-fixes.patch
(from rev 153626, xf86-video-mga/trunk/git-fixes.patch)
  xf86-video-mga/repos/testing-x86_64/
  xf86-video-mga/repos/testing-x86_64/PKGBUILD
(from rev 153626, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/testing-x86_64/git-fixes.patch
(from rev 153626, xf86-video-mga/trunk/git-fixes.patch)

+
 testing-i686/PKGBUILD  |   34 
 testing-i686/git-fixes.patch   | 5192 +++
 testing-x86_64/PKGBUILD|   34 
 testing-x86_64/git-fixes.patch | 5192 +++
 4 files changed, 10452 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 153626:153627 to see the changes.

[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-02-11 Thread andyrtr 
Date: Saturday, February 11, 2012 @ 05:57:51
  Author: andyrtr
Revision: 149860

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-mga/repos/staging-i686/
  xf86-video-mga/repos/staging-i686/PKGBUILD
(from rev 149859, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/staging-i686/git-fixes.patch
(from rev 149859, xf86-video-mga/trunk/git-fixes.patch)
  xf86-video-mga/repos/staging-x86_64/
  xf86-video-mga/repos/staging-x86_64/PKGBUILD
(from rev 149859, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/staging-x86_64/git-fixes.patch
(from rev 149859, xf86-video-mga/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   34 +
 staging-i686/git-fixes.patch   |  800 +++
 staging-x86_64/PKGBUILD|   34 +
 staging-x86_64/git-fixes.patch |  800 +++
 4 files changed, 1668 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 149859:149860 to see the changes.