[arch-commits] Commit in xf86-video-mga (4 files)

[Jan de Groot]

    Date: Wednesday, May 14, 2008 @ 15:14:33
  Author: jgc
Revision: 1701

Merged revisions 2-1700 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-mga/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r610 | alexander | 2008-04-21 10:52:35 +0000 (Mon, 21 Apr 2008) | 2 lines
  
  * rebuilt against mesa 7.0.3rc3
........
  r685 | alexander | 2008-04-21 15:32:22 +0000 (Mon, 21 Apr 2008) | 2 lines
  
  * rebuilt against mesa 7.0.3
........

Modified:
  xf86-video-mga/repos/extra-x86_64/	(properties)
  xf86-video-mga/repos/extra-x86_64/PKGBUILD
Deleted:
  xf86-video-mga/repos/testing-x86_64/
  xf86-video-mga/trunk/mga-binding.patch

-----------------------------+
 repos/extra-x86_64/PKGBUILD |   12 ++++++------
 trunk/mga-binding.patch     |   19 -------------------
 2 files changed, 6 insertions(+), 25 deletions(-)


Property changes on: xf86-video-mga/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-mga/trunk:1
   + /xf86-video-mga/trunk:1-1700

Modified: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2008-05-14 19:13:38 UTC (rev 1700)
+++ repos/extra-x86_64/PKGBUILD	2008-05-14 19:14:33 UTC (rev 1701)
@@ -3,20 +3,18 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-mga
 pkgver=1.4.8
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org mga video driver"
-mesaver="7.0.3-rc2"
+mesaver="7.0.3"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libdrm' 'expat>=2.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'mesa>=7.0.3rc1' \
+makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'mesa>=7.0.3' \
              'xf86driproto' 'glproto>=1.4.9')
 options=('!libtool' 'force')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	http://www.mesa3d.org/beta/MesaLib-${mesaver}.tar.gz)
-md5sums=('e7783c7609d441237d665b7fc47288c7'
-         '141f5c1c89b090d0f0bd92522ebb8de9')
+        http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${mesaver}.tar.bz2)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -47,3 +45,5 @@
   cd drivers/dri
   make DESTDIR=${startdir}/pkg install || return 1
 }
+md5sums=('e7783c7609d441237d665b7fc47288c7'
+         'e6e6379d7793af40a6bc3ce1bace572e')

Deleted: trunk/mga-binding.patch
===================================================================
--- trunk/mga-binding.patch	2008-05-14 19:13:38 UTC (rev 1700)
+++ trunk/mga-binding.patch	2008-05-14 19:14:33 UTC (rev 1701)
@@ -1,19 +0,0 @@
---- xf86-video-mga-1.4.6.1/src/binding.h	2006-11-08 17:16:44.000000000 +0000
-+++ xf86-video-mga-1.4.6.1/src/binding.h	2004-12-08 21:03:00.000000000 +0000
-@@ -210,6 +210,8 @@
- #define MGAMODEINFO_FORCE_PITCH        (1L << 5) 
- #define MGAMODEINFO_FORCE_DISPLAYORG   (1L << 6) 
- #define MGAMODEINFO_TV                 (1L << 7)
-+#define MGAMODEINFO_FLATPANEL1         (1L << 8)
-+#define MGAMODEINFO_FLATPANEL2         (1L << 9)
- #define MGAMODEINFO_TESTONLY           0x80000000
- 
- /* Cable Type */
-@@ -243,7 +245,6 @@
- ULONG MGAGetBOARDHANDLESize(void);
- ULONG MGASetTVStandard(LPBOARDHANDLE pBoard, ULONG ulTVStandard);
- ULONG MGASetTVCableType(LPBOARDHANDLE pBoard, ULONG ulCableType);
--ULONG HALSetDisplayStart(LPBOARDHANDLE pBoard, ULONG x, ULONG y, ULONG crtc);
- 
- #if defined(__cplusplus)
-     }