diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0024bc1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vgabios -# $Id$ -NAME := vgabios -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/import.log b/import.log deleted file mode 100644 index 4b78f0c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vgabios-0_6-0_5_b_fc11:HEAD:vgabios-0.6-0.5.b.fc11.src.rpm:1236045633 diff --git a/vgabios-provide-high-res.patch b/vgabios-provide-high-res.patch new file mode 100644 index 0000000..054b8f3 --- /dev/null +++ b/vgabios-provide-high-res.patch @@ -0,0 +1,56 @@ +From c3885286784174680811be037a8cef83c43c47c2 Mon Sep 17 00:00:00 2001 +From: Glauber Costa +Date: Thu, 18 Jun 2009 18:26:00 -0400 +Subject: [PATCH] provide high res resolutions to non-cirrus devices. + +Add widescreen modes to vbetables-gen.c , and increase device memory. + +Signed-off-by: Glauber Costa +--- + vbetables-gen.c | 23 ++++++++++++++++++++++- + 1 files changed, 22 insertions(+), 1 deletions(-) + +diff --git a/vbetables-gen.c b/vbetables-gen.c +index 7014a16..96ac85a 100644 +--- a/vbetables-gen.c ++++ b/vbetables-gen.c +@@ -2,7 +2,7 @@ + #include + #include + +-#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8 ++#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 16 + + typedef struct { + int width; +@@ -55,6 +55,27 @@ ModeInfo modes[] = { + { 1152, 864, 16 , 0x14a}, + { 1152, 864, 24 , 0x14b}, + { 1152, 864, 32 , 0x14c}, ++{ 1280, 800, 16 , 0x178}, ++{ 1280, 800, 24 , 0x179}, ++{ 1280, 800, 32 , 0x17a}, ++{ 1280, 960, 16 , 0x17b}, ++{ 1280, 960, 24 , 0x17c}, ++{ 1280, 960, 32 , 0x17d}, ++{ 1440, 900, 16 , 0x17e}, ++{ 1440, 900, 24 , 0x17f}, ++{ 1440, 900, 32 , 0x180}, ++{ 1400, 1050, 16 , 0x181}, ++{ 1400, 1050, 24 , 0x182}, ++{ 1400, 1050, 32 , 0x183}, ++{ 1680, 1050, 16 , 0x184}, ++{ 1680, 1050, 24 , 0x185}, ++{ 1680, 1050, 32 , 0x186}, ++{ 1920, 1200, 16 , 0x187}, ++{ 1920, 1200, 24 , 0x188}, ++{ 1920, 1200, 32 , 0x189}, ++{ 2560, 1600, 16 , 0x18a}, ++{ 2560, 1600, 24 , 0x18b}, ++{ 2560, 1600, 32 , 0x18c}, + { 0, }, + }; + +-- +1.6.2.2 + diff --git a/vgabios.spec b/vgabios.spec index 7fbbff2..194f794 100644 --- a/vgabios.spec +++ b/vgabios.spec @@ -1,16 +1,17 @@ Name: vgabios -Version: 0.6 -Release: 0.5.b%{?dist} +Version: 0.6b +Release: 2%{?dist} Summary: LGPL implementation of a vga video bios Group: Applications/Emulators License: LGPLv2 URL: http://www.nongnu.org/vgabios/ -Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}b.tgz +Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dev86 BuildArch: noarch +Patch1: %{name}-provide-high-res.patch %description vgabios is an LPGL implementation of a bios for a video card. @@ -19,7 +20,8 @@ emulators. It is not intended for use in real cards. %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version} +%patch1 -p1 %build make clean @@ -47,21 +49,26 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vgabios/VGABIOS-lgpl-latest.debug.bin - - %changelog -* Mon Mar 02 2009 Glauber Costa - 0.6.0.5.b +* Fri Jun 19 2009 Glauber Costa - 0.6b-2 +- properly add the patch + +* Fri Jun 19 2009 Glauber Costa - 0.6b-1 +- applied vgabios-provide-high-res.patch, that should fix #499060 +- Changed versioning naming, since the "b" in 0.6b does not stand for beta. + +* Mon Mar 02 2009 Glauber Costa - 0.6-0.5.b - fixed naming to comply with guidelines. -* Tue Feb 17 2009 Glauber Costa - 0.6.0.4beta +* Tue Feb 17 2009 Glauber Costa - 0.6-0.4beta - removed leftovers and fixed rpmlint errors. -* Mon Feb 16 2009 Glauber Costa - 0.6.0.3beta +* Mon Feb 16 2009 Glauber Costa - 0.6-0.3beta - using dev86 to build directly on all arches, made package noarch. No more binaries \o/ -* Fri Feb 13 2009 Glauber Costa - 0.6.0.2beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.2beta - Addressing BZ 485418: added doc section, clean build root before we proceed, own vgabios directory -* Fri Feb 13 2009 Glauber Costa - 0.6.0.1beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.1beta - Created initial package