diff --git a/915resolution.spec b/915resolution.spec index 24c21b0..3945c56 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -1,6 +1,6 @@ Name: 915resolution Version: 0.5.3 -Release: 3%{?dist} +Release: 2%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support @@ -10,7 +10,6 @@ Source0: http://www.geocities.com/stomljen/%{name}-%{version}.tar.gz 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 :) @@ -42,7 +41,6 @@ differs substantially. 915resolution's code base is much simpler. %prep %setup -q -%patch0 -p1 # keep rpmlint from complaining.... chmod -x dump_bios @@ -100,9 +98,6 @@ fi %changelog -* Tue Nov 13 2007 Chris Weyl 0.5.3-3 -- incorporate patch from bz #331411 - * Tue Aug 21 2007 Chris Weyl 0.5.3-2 - bump diff --git a/965GM.patch b/965GM.patch deleted file mode 100644 index 908ef25..0000000 --- a/965GM.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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; - } diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e2aa3ff --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: 915resolution +# $Id: Makefile,v 1.1 2006/08/02 04:19:54 cweyl Exp $ +NAME := 915resolution +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package deleted file mode 100644 index bdf33bb..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -i810 driver not present in devel/f9+ :)