rpms/xorg-x11-drv-mga/FC-6 mga-1.4.5-no-hal-advertising.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-mga.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-mga/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9533/FC-6

Modified Files:
	.cvsignore sources xorg-x11-drv-mga.spec 
Added Files:
	mga-1.4.5-no-hal-advertising.patch 
Log Message:
auto-import xorg-x11-drv-mga-1.4.5-2.fc6 on branch FC-6 from xorg-x11-drv-mga-1.4.5-2.fc6.src.rpm

mga-1.4.5-no-hal-advertising.patch:
 mga_driver.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mga-1.4.5-no-hal-advertising.patch ---
--- xf86-video-mga-1.4.5/src/mga_driver.c.jx	2006-11-08 12:16:44.000000000 -0500
+++ xf86-video-mga-1.4.5/src/mga_driver.c	2006-12-04 16:27:38.000000000 -0500
@@ -1329,8 +1329,7 @@
 	    pMga->DualHeadEnabled = TRUE;
 	} else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-	 "This card requires the \"mga_hal\" module for dual-head operation\n"
-	 "\tIt can be found at the Matrox web site <http://www.matrox.com>\n");
+	    "No open-source support for dualhead on this card, sorry\n");
 	}
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Oct 2006 16:33:06 -0000	1.8
+++ .cvsignore	11 Dec 2006 21:05:06 -0000	1.9
@@ -1 +1 @@
-xf86-video-mga-1.4.2.tar.bz2
+xf86-video-mga-1.4.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Oct 2006 16:24:27 -0000	1.8
+++ sources	11 Dec 2006 21:05:06 -0000	1.9
@@ -1 +1 @@
-4f7ad5fa9b3819bed18ca8f05c3cb69a  xf86-video-mga-1.4.2.tar.bz2
+bfecd6814cfbe2d7a678724aaab81d0d  xf86-video-mga-1.4.5.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/FC-6/xorg-x11-drv-mga.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-mga.spec	17 Oct 2006 16:24:27 -0000	1.16
+++ xorg-x11-drv-mga.spec	11 Dec 2006 21:05:06 -0000	1.17
@@ -10,8 +10,8 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.4.2
-Release:   1%{?dist}
+Version:   1.4.5
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   mga.xinf
 
+Patch0: mga-1.4.5-no-hal-advertising.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -36,6 +38,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch -p1 -b .hal
 
 %build
 %configure --disable-static
@@ -66,6 +69,13 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Mon Dec 4 2006 Adam Jackson <ajax at redhat.com> 1.4.5-2
+- mga-1.4.5-no-hal-advertising.patch: Don't link to the HAL module as it's
+  non-free.
+
+* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.4.5-1
+- Update to 1.4.5.
+
 * Fri Aug 18 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1-5.fc6
 - Add Tilman Sauerbecks patch to fix DRI locking.