rpms/915resolution/F-8 965GM.patch, NONE, 1.1 915resolution.spec, 1.11, 1.12

[Chris Weyl (cweyl)]

Author: cweyl

Update of /cvs/extras/rpms/915resolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12067

Modified Files:
	915resolution.spec 
Added Files:
	965GM.patch 
Log Message:
* Tue Nov 13 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-3
- incorporate patch from bz #331411 


965GM.patch:

--- NEW FILE 965GM.patch ---
--- 915resolution-0.5.3/915resolution.c.lr	2007-10-14 19:35:46.000000000 +0200
+++ 915resolution-0.5.3/915resolution.c	2007-10-14 19:38:49.000000000 +0200
@@ -56,12 +56,12 @@
 
 typedef enum {
     CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM,
-    CT_946GZ, CT_G965, CT_Q965
+    CT_946GZ, CT_G965, CT_965GM, CT_Q965
 } chipset_type;
 
 char * chipset_type_names[] = {
     "UNKNOWN", "830",  "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM",
-    "946GZ",   "G965", "Q965"
+    "946GZ",   "G965", "965GM", "Q965"
 };
 
 typedef enum {
@@ -221,6 +221,10 @@
 	type = CT_G965;
 	break;
 
+    case 0x2a008086:
+	type = CT_965GM;
+	break;
+
     case 0x29908086:
         type = CT_Q965;
         break;
@@ -510,6 +514,7 @@
     case CT_945GM:
     case CT_946GZ:
     case CT_G965:
+    case CT_965GM:
     case CT_Q965:
         outl(0x80000090, 0xcf8);
         map->b1 = inb(0xcfd);
@@ -550,6 +555,7 @@
     case CT_945GM:
     case CT_946GZ:
     case CT_G965:
+    case CT_965GM:
     case CT_Q965:
         outl(0x80000090, 0xcf8);
         outb(map->b1, 0xcfd);
@@ -809,6 +815,9 @@
         else if (!strcmp(argv[index], "G965")) {
             *forced_chipset = CT_G965;
         }
+        else if (!strcmp(argv[index], "965GM")) {
+            *forced_chipset = CT_965GM;
+        }
         else if (!strcmp(argv[index], "Q965")) {
             *forced_chipset = CT_Q965;
         }


Index: 915resolution.spec
===================================================================
RCS file: /cvs/extras/rpms/915resolution/F-8/915resolution.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- 915resolution.spec	21 Aug 2007 21:36:41 -0000	1.11
+++ 915resolution.spec	14 Nov 2007 05:13:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           915resolution
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intel video BIOS hack to support certain resolutions 
 
 Group:          User Interface/X Hardware Support 
@@ -10,6 +10,7 @@
 Source1:        %{name}-init
 Source2:        %{name}-config
 Source3:        %{name}-pm-hook
+Patch0:         965GM.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # this doesn't make much sense on ppc.  That, and it fails to build :)
@@ -19,7 +20,7 @@
 Source100:      README.fedora
 
 # for the add/remove/condrestart service stuff.
-Requires(post):   /sbin/chkconfig
+rEQuires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 Requires(preun):  /sbin/service
 
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 # keep rpmlint from complaining....
 chmod -x dump_bios
@@ -98,6 +100,9 @@
 
 
 %changelog
+* Tue Nov 13 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-3
+- incorporate patch from bz #331411 
+
 * Tue Aug 21 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-2
 - bump