From 91c16a76f13d706b241b0605f0e4f5a44b80d89d Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 14 Nov 2007 05:11:17 +0000 Subject: [PATCH 1/5] - incorporate patch from bz #331411 --- 915resolution.spec | 9 ++++++-- 965GM.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 965GM.patch diff --git a/915resolution.spec b/915resolution.spec index 3945c56..459dc06 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -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 @@ 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 :) @@ -19,7 +20,7 @@ ExcludeArch: ppc ppc64 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 @@ differs substantially. 915resolution's code base is much simpler. %prep %setup -q +%patch0 -p1 # keep rpmlint from complaining.... chmod -x dump_bios @@ -98,6 +100,9 @@ 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 new file mode 100644 index 0000000..908ef25 --- /dev/null +++ b/965GM.patch @@ -0,0 +1,54 @@ +--- 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; + } From e27e1b05e0af02d2653506cab371416a28e1484e Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 14 Nov 2007 16:58:00 +0000 Subject: [PATCH 2/5] details, details... :) --- 915resolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/915resolution.spec b/915resolution.spec index 459dc06..24c21b0 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc ppc64 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 From 4be41866a453c1bf17b7734b873ebed9ec6c07c7 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Sun, 18 Nov 2007 19:52:34 +0000 Subject: [PATCH 3/5] die die die --- dead.package | 1 + 1 file changed, 1 insertion(+) create mode 100644 dead.package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bdf33bb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +i810 driver not present in devel/f9+ :) From e057ef936e3173f10e3232df23bcd4e2fa251e44 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:37:57 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e2aa3ff..50fcd70 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: 915resolution -# $Id: Makefile,v 1.1 2006/08/02 04:19:54 cweyl Exp $ +# $Id: Makefile,v 1.3 2006/12/07 02:52:13 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b43165416eef6ac10824d2c735dc4b826c4b7a4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:20 +0000 Subject: [PATCH 5/5] dist-git conversion --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 50fcd70..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 915resolution -# $Id: Makefile,v 1.3 2006/12/07 02:52:13 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 $$d/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)