From c61a442d68e5a12ea7f46a3e464dced01dc49e1c Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Thu, 7 Dec 2006 02:52:13 +0000 Subject: [PATCH 01/10] resurrect, per RH#218339 --- 915resolution.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 21 +++++++++++++ README.fedora | 18 +++++++++++ dead.package | 5 ---- sources | 1 + 5 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 915resolution.spec create mode 100644 Makefile create mode 100644 README.fedora delete mode 100644 dead.package create mode 100644 sources diff --git a/915resolution.spec b/915resolution.spec new file mode 100644 index 0000000..645c13f --- /dev/null +++ b/915resolution.spec @@ -0,0 +1,74 @@ +Name: 915resolution +Version: 0.5.2 +Release: 3%{?dist} +Summary: Intel video BIOS hack to support certain resolutions + +Group: User Interface/X Hardware Support +License: Public Domain +URL: http://www.geocities.com/stomljen/ +Source0: http://www.geocities.com/stomljen/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# this doesn't make much sense on ppc. That, and it fails in build... +ExcludeArch: ppc + +# simple "get it going" instructions +Source100: README.fedora + +%description +915resolution is a tool to modify the video BIOS of the 800 and 900 series +Intel graphics chipsets. This includes the 845G, 855G, and 865G chipsets, as +well as 915G, 915GM, and 945G chipsets. This modification is necessary to +allow the display of certain graphics resolutions for an Xorg or XFree86 +graphics server. + +915resolution's modifications of the BIOS are transient. There is no risk of +permanent modification of the BIOS. This also means that 915resolution must be +run every time the computer boots inorder for it's changes to take effect. + +915resolution is derived from the tool 855resolution. However, the code +differs substantially. 915resolution's code base is much simpler. +915resolution also allows the modification of bits per pixel. + +%prep +%setup -q + +# keep rpmlint from complaining.... +chmod -x dump_bios + +cp %{SOURCE100} . + +%build +make clean +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_sbindir} +cp %{name} %{buildroot}%{_sbindir} + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt README* changes.log chipset_info.txt dump_bios +%{_sbindir}/* + + +%changelog +* Tue Aug 01 2006 Chris Weyl 0.5.2-3 +- excludearch ppc + +* Tue Aug 01 2006 Chris Weyl 0.5.2-2 +- bump for build & release + +* Thu Jul 27 2006 Chris Weyl 0.5.2-1 +- bump release +- add README.fedora + +* Tue Jun 13 2006 Chris Weyl 0.5.2-0 +- Initial spec file for F-E diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d2cd9d7 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: 915resolution +# $Id$ +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/README.fedora b/README.fedora new file mode 100644 index 0000000..058d4ad --- /dev/null +++ b/README.fedora @@ -0,0 +1,18 @@ +Some simple instructions on getting this going under Fedora Core. + +It's important to note that the invocation of this program needs to be done +at least once, at boot, to install the correct values in the video BIOS's RAM +copy. Executing 915resolution requires root privs. + +Note that the intel xorg drivers are supposed to deal with displaying to +non-bios modes "real soon now"; hence this setup technique. + +1. Read README.txt, in this directory... Figure out the proper invocation of + the binary for your hardware. +2. Edit /etc/rc.local. Include as a line in that file a call to + 915resolution; a la: + + /usr/sbin/915resolution .... + + Where .... is the proper parameters to pass 915resolution. + diff --git a/dead.package b/dead.package deleted file mode 100644 index 9efd50a..0000000 --- a/dead.package +++ /dev/null @@ -1,5 +0,0 @@ -This package is obsolete past FC5, as the intel xorg driver now deals with -exactly the circumstances this package was designed to work around. - -Chris Weyl -Wed Aug 2 14:20:47 PDT 2006 diff --git a/sources b/sources new file mode 100644 index 0000000..7c038cb --- /dev/null +++ b/sources @@ -0,0 +1 @@ +a3441e5662c5ff1e00dc97de4487e8f8 915resolution-0.5.2.tar.gz From 38b5ca4defd3e6c948b844c98290596c0defc26c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 7 Dec 2006 20:53:18 +0000 Subject: [PATCH 02/10] Initialize branch FC-6 for 915resolution --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From df0331f824b9eaa5587e8e98293a7096f1cb128c Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Thu, 7 Dec 2006 23:27:17 +0000 Subject: [PATCH 03/10] release bump --- 915resolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/915resolution.spec b/915resolution.spec index 645c13f..63bd64d 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -1,6 +1,6 @@ Name: 915resolution Version: 0.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Thu Dec 07 2006 Chris Weyl 0.5.2-4 +- bump + * Tue Aug 01 2006 Chris Weyl 0.5.2-3 - excludearch ppc From 541ed4ef0da3f547eada2407c685732cfd6aaf4c Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 2 Mar 2007 04:11:57 +0000 Subject: [PATCH 04/10] resync branches; apply changes for BZ#219236 to all current branches --- 915resolution.spec | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/915resolution.spec b/915resolution.spec index 63bd64d..461264e 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -1,20 +1,29 @@ Name: 915resolution Version: 0.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support License: Public Domain URL: http://www.geocities.com/stomljen/ Source0: http://www.geocities.com/stomljen/%{name}-%{version}.tar.gz +Source1: %{name}-init +Source2: %{name}-config +Source3: %{name}-pm-hook BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# this doesn't make much sense on ppc. That, and it fails in build... +# this doesn't make much sense on ppc. That, and it fails to build :) ExcludeArch: ppc # simple "get it going" instructions Source100: README.fedora +# for the add/remove/condrestart service stuff. +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + + %description 915resolution is a tool to modify the video BIOS of the 800 and 900 series Intel graphics chipsets. This includes the 845G, 855G, and 865G chipsets, as @@ -48,18 +57,51 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} cp %{name} %{buildroot}%{_sbindir} +# ...and the associated support bits +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +install -m 0755 -T %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/915resolution +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +install -m 0644 -T %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/sysconfig/915resolution +mkdir -p %{buildroot}%{_sysconfdir}/pm/hooks +install -m 0755 -T %{SOURCE3} \ + %{buildroot}%{_sysconfdir}/pm/hooks/99resolution + %clean rm -rf %{buildroot} +%post +# This adds the proper /etc/rc*.d links for the script +/sbin/chkconfig --add 915resolution + + +%preun +if [ $1 = 0 ]; then + /sbin/service 915resolution stop >/dev/null 2>&1 || : + /sbin/chkconfig --del 915resolution +fi + +# no postun scriptlet is provided to "restart" the service on upgrade as this +# doesn't seem entirely appropriate. explanations as to why this is wrong are +# welcome :) + %files %defattr(-,root,root,-) %doc LICENSE.txt README* changes.log chipset_info.txt dump_bios %{_sbindir}/* +%{_sysconfdir}/rc.d/init.d/* +%{_sysconfdir}/pm/hooks/* +%config(noreplace) %{_sysconfdir}/sysconfig/* %changelog +* Mon Feb 19 2007 Chris Weyl 0.5.2-5 +- add initscript infrastructure from Bojan Smojver, who kindly did most of the + work to implement it. Thanks Bojan! :) + * Thu Dec 07 2006 Chris Weyl 0.5.2-4 - bump From 9c0a5f505ba80849ac59e83c26fb29344a66e790 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 2 Mar 2007 05:01:24 +0000 Subject: [PATCH 05/10] Helps to check in all the files :) --- 915resolution-config | 2 ++ 915resolution-init | 65 +++++++++++++++++++++++++++++++++++++++++++ 915resolution-pm-hook | 11 ++++++++ README.fedora | 12 ++++---- 4 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 915resolution-config create mode 100644 915resolution-init create mode 100644 915resolution-pm-hook diff --git a/915resolution-config b/915resolution-config new file mode 100644 index 0000000..6f6efd6 --- /dev/null +++ b/915resolution-config @@ -0,0 +1,2 @@ +# Mode to overwrite +# RESOLUTION="58 1680 1050" diff --git a/915resolution-init b/915resolution-init new file mode 100644 index 0000000..d292866 --- /dev/null +++ b/915resolution-init @@ -0,0 +1,65 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/915resolution +# +# Starts the 915resulution helper +# +# chkconfig: - 65 35 +# description: 915resolution tool +# processname: 915resolution +# Source function library. +. /etc/init.d/functions + +test -x /usr/sbin/915resolution || exit 0 + +RETVAL=0 +prog="915resolution" + +start() { + if [ -r /etc/sysconfig/915resolution ]; then + . /etc/sysconfig/915resolution + fi + if [ -n "$RESOLUTION" ]; then + echo -n $"Starting $prog: " + /usr/sbin/915resolution $RESOLUTION >/dev/null 2>&1 + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/915resolution + echo + fi +} + +stop() { + rm -f /var/lock/subsys/915resolution +} + +# +# See how we were called. +# +case "$1" in + start) + start + ;; + stop) + stop + ;; + reload|restart) + stop + start + RETVAL=$? + ;; + condrestart) + if [ -f /var/lock/subsys/915resolution ]; then + stop + start + fi + ;; + status) + [ -f /var/lock/subsys/915resolution ] + RETVAL=$? + ;; + *) + echo $"Usage: $0 {condrestart|start|stop|restart|reload|status}" + exit 1 +esac + +exit $RETVAL diff --git a/915resolution-pm-hook b/915resolution-pm-hook new file mode 100644 index 0000000..c6d3fe2 --- /dev/null +++ b/915resolution-pm-hook @@ -0,0 +1,11 @@ +#!/bin/sh + +case "$1" in + thaw|resume) + { /sbin/service 915resolution start ; } 2>/dev/null + ;; + *) + ;; +esac + +exit $? diff --git a/README.fedora b/README.fedora index 058d4ad..94aaba7 100644 --- a/README.fedora +++ b/README.fedora @@ -7,12 +7,12 @@ copy. Executing 915resolution requires root privs. Note that the intel xorg drivers are supposed to deal with displaying to non-bios modes "real soon now"; hence this setup technique. +Note also the prior method used has changed (but should still work), thanks to +an actual initscript framework :) + 1. Read README.txt, in this directory... Figure out the proper invocation of the binary for your hardware. -2. Edit /etc/rc.local. Include as a line in that file a call to - 915resolution; a la: - - /usr/sbin/915resolution .... - - Where .... is the proper parameters to pass 915resolution. +2. Edit /etc/sysconfig/915resolution. Modify "RESOLUTION" to be the proper + modestring to pass 915resolution for your hardware. +3. Enjoy widescreen :) From 4b3fe880afa9f6adcdeb74ee2d1b934413267bde Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 2 Mar 2007 05:04:59 +0000 Subject: [PATCH 06/10] bump, commit additional files --- 915resolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/915resolution.spec b/915resolution.spec index 461264e..5ec6efb 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -1,6 +1,6 @@ Name: 915resolution Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support @@ -98,6 +98,9 @@ fi %changelog +* Thu Mar 01 2007 Chris Weyl 0.5.2-6 +- bump + * Mon Feb 19 2007 Chris Weyl 0.5.2-5 - add initscript infrastructure from Bojan Smojver, who kindly did most of the work to implement it. Thanks Bojan! :) From 61c81956bd89eaa528545a07f42317853f517933 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Mon, 30 Apr 2007 21:27:13 +0000 Subject: [PATCH 07/10] update to 0.5.3 --- 915resolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/915resolution.spec b/915resolution.spec index 5ec6efb..a7010de 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -1,6 +1,6 @@ Name: 915resolution -Version: 0.5.2 -Release: 6%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support @@ -98,6 +98,9 @@ fi %changelog +* Mon Apr 30 2007 Chris Weyl 0.5.3-1 +- update to 0.5.3 + * Thu Mar 01 2007 Chris Weyl 0.5.2-6 - bump diff --git a/sources b/sources index 7c038cb..5ca2d60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3441e5662c5ff1e00dc97de4487e8f8 915resolution-0.5.2.tar.gz +ed287778a53d02c31a7a6a52bc146291 915resolution-0.5.3.tar.gz From d4615a1e547b3179c163fee58134fdebd2a4bc42 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 18 May 2007 17:22:27 +0000 Subject: [PATCH 08/10] - add 'ppc64' to list of arches excluded from builds; no rebuild at this time --- 915resolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/915resolution.spec b/915resolution.spec index a7010de..663be72 100644 --- a/915resolution.spec +++ b/915resolution.spec @@ -13,7 +13,7 @@ Source3: %{name}-pm-hook BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # this doesn't make much sense on ppc. That, and it fails to build :) -ExcludeArch: ppc +ExcludeArch: ppc ppc64 # simple "get it going" instructions Source100: README.fedora @@ -98,6 +98,9 @@ fi %changelog +* Fri May 18 2007 Chris Weyl +- add 'ppc64' to list of arches excluded from builds; no rebuild at this time + * Mon Apr 30 2007 Chris Weyl 0.5.3-1 - update to 0.5.3 From c48185d0313849a533625c4319825c8617d0c466 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:52 +0000 Subject: [PATCH 09/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d2cd9d7..1579189 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 b3c8c0f7f0ffb5b6516d13869b0608273e2419b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:23 +0000 Subject: [PATCH 10/10] dist-git conversion --- Makefile | 21 --------------------- branch | 1 - 2 files changed, 22 deletions(-) delete mode 100644 Makefile delete mode 100644 branch diff --git a/Makefile b/Makefile deleted file mode 100644 index 1579189..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 915resolution -# $Id$ -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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6