rpms/915resolution/F-8 E7221.patch, NONE, 1.1 915resolution.spec, 1.13, 1.14
Chris Weyl (cweyl)
fedora-extras-commits at redhat.com
Sun Dec 16 01:02:58 UTC 2007
Author: cweyl
Update of /cvs/extras/rpms/915resolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20453
Modified Files:
915resolution.spec
Added Files:
E7221.patch
Log Message:
* Sat Dec 15 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-4
- add support for the E7221 chipset (BZ#425789)
- fix suspend/resume hook placement (BZ#253453)
E7221.patch:
--- NEW FILE E7221.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
@@ -55,12 +55,12 @@ typedef unsigned char boolean;
typedef unsigned int cardinal;
typedef enum {
- CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM,
+ CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_E7221, CT_915GM, CT_945G, CT_945GM,
CT_946GZ, CT_G965, CT_965GM, CT_Q965
} chipset_type;
char * chipset_type_names[] = {
- "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM",
+ "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "E7221 (i915)", "915GM", "945G", "945GM",
"946GZ", "G965", "965GM", "Q965"
};
@@ -201,6 +201,10 @@ chipset_type get_chipset(cardinal id) {
type = CT_915G;
break;
+ case 0x25888086:
+ type = CT_E7221;
+ break;
+
case 0x25908086:
type = CT_915GM;
break;
@@ -509,6 +513,7 @@ void unlock_vbios(vbios_map * map) {
case CT_845G:
case CT_865G:
case CT_915G:
+ case CT_E7221:
case CT_915GM:
case CT_945G:
case CT_945GM:
@@ -550,6 +555,7 @@ void relock_vbios(vbios_map * map) {
case CT_845G:
case CT_865G:
case CT_915G:
+ case CT_E7221:
case CT_915GM:
case CT_945G:
case CT_945GM:
@@ -800,6 +806,9 @@ int parse_args(int argc, char *argv[], c
else if (!strcmp(argv[index], "915G")) {
*forced_chipset = CT_915G;
}
+ else if (!strcmp(argv[index], "E7221")) {
+ *forced_chipset = CT_E7221;
+ }
else if (!strcmp(argv[index], "915GM")) {
*forced_chipset = CT_915GM;
}
Index: 915resolution.spec
===================================================================
RCS file: /cvs/extras/rpms/915resolution/F-8/915resolution.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- 915resolution.spec 14 Nov 2007 16:57:55 -0000 1.13
+++ 915resolution.spec 16 Dec 2007 01:02:20 -0000 1.14
@@ -1,6 +1,6 @@
Name: 915resolution
Version: 0.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Intel video BIOS hack to support certain resolutions
Group: User Interface/X Hardware Support
@@ -10,7 +10,11 @@
Source1: %{name}-init
Source2: %{name}-config
Source3: %{name}-pm-hook
+
+# support for additional chipsets
Patch0: 965GM.patch
+Patch1: E7221.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# this doesn't make much sense on ppc. That, and it fails to build :)
@@ -43,6 +47,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# keep rpmlint from complaining....
chmod -x dump_bios
@@ -66,9 +71,9 @@
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
install -m 0644 -T %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/915resolution
-mkdir -p %{buildroot}%{_sysconfdir}/pm/hooks
+mkdir -p %{buildroot}%{_sysconfdir}/pm/sleep.d
install -m 0755 -T %{SOURCE3} \
- %{buildroot}%{_sysconfdir}/pm/hooks/99resolution
+ %{buildroot}%{_sysconfdir}/pm/sleep.d/99resolution
%clean
@@ -95,11 +100,15 @@
%doc LICENSE.txt README* changes.log chipset_info.txt dump_bios
%{_sbindir}/*
%{_sysconfdir}/rc.d/init.d/*
-%{_sysconfdir}/pm/hooks/*
+%{_sysconfdir}/pm/sleep.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/*
%changelog
+* Sat Dec 15 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-4
+- add support for the E7221 chipset (BZ#425789)
+- fix suspend/resume hook placement (BZ#253453)
+
* Tue Nov 13 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.5.3-3
- incorporate patch from bz #331411
More information about the fedora-extras-commits
mailing list