From bdde55afdb2a0a4e824ebaaafe0224c08f8aed50 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:21:58 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for vgabios --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 7f6261e4901a401bb1374a3836b31b4c8bb48ca1 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 19 May 2009 01:15:25 +0000 Subject: [PATCH 2/6] updated to 0.6.c --- .cvsignore | 2 +- sources | 2 +- vgabios.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index a911799..ded333a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vgabios-0.6b.tgz +vgabios-0.6c.tgz diff --git a/sources b/sources index afa4a9d..0720cd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36399621c4d6753e83a3cec3009c7183 vgabios-0.6b.tgz +2b0a5387594bb70cb1dbcc1f79ec824c vgabios-0.6c.tgz diff --git a/vgabios.spec b/vgabios.spec index 7fbbff2..5fb2c56 100644 --- a/vgabios.spec +++ b/vgabios.spec @@ -1,12 +1,12 @@ Name: vgabios Version: 0.6 -Release: 0.5.b%{?dist} +Release: 0.6.c%{?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}c.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dev86 @@ -19,7 +19,7 @@ emulators. It is not intended for use in real cards. %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version}c %build make clean @@ -50,18 +50,21 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Mar 02 2009 Glauber Costa - 0.6.0.5.b +* Mon May 18 2009 Glauber Costa - 0.6.0.6.c +- updated to 0.6.c (#499060) + +* 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 From 95affa2aca3b2172e067ccb0adfefb137f4cff9e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 19 Jun 2009 15:34:49 +0000 Subject: [PATCH 3/6] - applied vgabios-provide-high-res.patch, that should fix #499060 - Changed versioning naming, since the "b" in 0.6b does not stand for beta. --- .cvsignore | 2 +- sources | 2 +- vgabios.spec | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index ded333a..a911799 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vgabios-0.6c.tgz +vgabios-0.6b.tgz diff --git a/sources b/sources index 0720cd1..afa4a9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b0a5387594bb70cb1dbcc1f79ec824c vgabios-0.6c.tgz +36399621c4d6753e83a3cec3009c7183 vgabios-0.6b.tgz diff --git a/vgabios.spec b/vgabios.spec index 5fb2c56..c49b8c7 100644 --- a/vgabios.spec +++ b/vgabios.spec @@ -1,16 +1,17 @@ Name: vgabios -Version: 0.6 -Release: 0.6.c%{?dist} +Version: 0.6b +Release: 1%{?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}c.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}c +%setup -q -n %{name}-%{version} +%patch1 -p1 %build make clean @@ -47,11 +49,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vgabios/VGABIOS-lgpl-latest.debug.bin - - %changelog -* Mon May 18 2009 Glauber Costa - 0.6.0.6.c -- updated to 0.6.c (#499060) +* 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. From eb8ebf04c39eee465b7c80843cb06cd14d66d757 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 19 Jun 2009 15:39:14 +0000 Subject: [PATCH 4/6] forgot the patch... --- vgabios-provide-high-res.patch | 56 ++++++++++++++++++++++++++++++++++ vgabios.spec | 5 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 vgabios-provide-high-res.patch 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 c49b8c7..194f794 100644 --- a/vgabios.spec +++ b/vgabios.spec @@ -1,6 +1,6 @@ Name: vgabios Version: 0.6b -Release: 1%{?dist} +Release: 2%{?dist} Summary: LGPL implementation of a vga video bios Group: Applications/Emulators @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 7beb80e61e6c501f9992c664d054785a990ec02a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:32 +0000 Subject: [PATCH 5/6] 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 0024bc1..401413a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +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 f65192877f338d24fd84bc576097770ff2154ea7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:57:59 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 401413a..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 $$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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 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