rpms/svgalib/devel .cvsignore, 1.3, 1.4 svgalib-1.9.21-cfg.patch, 1.1, 1.2 svgalib.spec, 1.8, 1.9 svgalib-1.9.21-x86_64.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12720

Modified Files:
	.cvsignore svgalib-1.9.21-cfg.patch svgalib.spec 
Removed Files:
	svgalib-1.9.21-x86_64.patch 
Log Message:
* Mon Jul 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-2
- Don't have a different defaultcfg on i386 vs x86_64, having the same
  defaultcfg makes paralel installs possible, add notes about certain settings
  being only valid on i386 to the defaultcfg and patch the config file parser
  to ignore i386 only configfile settings on non i386.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 20:16:05 -0000	1.3
+++ .cvsignore	17 Jul 2006 11:22:59 -0000	1.4
@@ -1 +1 @@
-svgalib-1.9.24.tar.gz
+svgalib-1.9.25.tar.gz

svgalib-1.9.21-cfg.patch:

Index: svgalib-1.9.21-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.21-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svgalib-1.9.21-cfg.patch	5 Aug 2005 09:37:40 -0000	1.1
+++ svgalib-1.9.21-cfg.patch	17 Jul 2006 11:22:59 -0000	1.2
@@ -1,5 +1,17 @@
---- svgalib-1.9.21/src/config/libvga.config.cfg	2005-08-03 14:29:49.000000000 +0200
-+++ svgalib-1.9.21/src/config/libvga.config	2005-08-03 14:32:43.000000000 +0200
+--- svgalib-1.9.25/src/vga.c.defaultcfg	2005-10-25 13:13:56.000000000 +0200
++++ svgalib-1.9.25/src/vga.c	2006-07-17 13:11:20.000000000 +0200
+@@ -3710,7 +3710,9 @@
+         __svgalib_vesatext=1;
+         break;
+ #else
++#ifdef __i386__
+        fprintf(stderr,"svgalib: Warning: VESA support not enabled!\n");
++#endif
+        break;
+ #endif
+     case 57: /* Vesa save bitmap */  
+--- svgalib-1.9.25/src/config/libvga.config.defaultcfg	2005-08-03 15:07:32.000000000 +0200
++++ svgalib-1.9.25/src/config/libvga.config	2006-07-17 13:19:14.000000000 +0200
 @@ -11,7 +11,7 @@
  
  Helper /dev/svga
@@ -34,12 +46,70 @@
  
  # Some multiprotocol mice will need one of the following:
  
-@@ -421,7 +422,7 @@
+@@ -346,35 +347,35 @@
+ # chipset VGA		# Standard VGA
+ # chipset EGA		# EGA
+ # chipset ET3000	# Tseng ET3000
+-# chipset ET4000	# Tseng ET4000
++# chipset ET4000	# Tseng ET4000 (only available on i386)
+ # chipset Cirrus	# Cirrus Logic GD542x/543x/544x
+-# chipset TVGA		# Trident TVGA8900/9000
++# chipset TVGA		# Trident TVGA8900/9000 (only available on i386)
+ # chipset Oak		# Oak Technologies 037/067/077
+ # chipset S3		# S3 chipsets
+ # chipset GVGA6400	# Genoa 6400
+ # chipset ARK		# ARK Logic
+ # chipset ATI		# old ATI VGA
+-# chipset Mach32	# ATI Mach32
++# chipset Mach32	# ATI Mach32 (only available on i386)
+ # chipset ALI		# ALI2301
+ # chipset Mach64	# ATI Mach64 - deprecated, use RAGE driver
+ # chipset ET6000        # Tseng ET6000
+ # chipset APM	 	# Alliance Technology AT 24/25/3D
+ # chipset NV3		# nVidia Riva 128
+-# chipset VESA          # nicely behaved Vesa Bioses
++# chipset VESA          # nicely behaved Vesa Bioses (only available on i386)
+ # chipset MX		# MX86251 (some Voodoo Rush boards)
+ # chipset PARADISE 	# WD90C31
+ # chipset RAGE		# RagePro (and might work with some older mach64)
+ # chipset BANSHEE	# Banshee/V3.
+ # chipset SIS		# SiS 5597/6326/620/530 cards / integrated vga.
+ # chipset I740		# Intel i740 based cards.
+-# chipset NEOMAGIC
++# chipset NEOMAGIC	# (only available on i386)
+ # chipset LAGUNA	# Cirrus Logic Laguna series (546X)
+ # chipset FBDEV		# Use kernel fbdev, instead of direct hardware.
+ # chipset G400		# Matrox Mystique/G100/G200/G400/G450
+ # chipset R128		# Ati Rage128 and Radeon
+ # chipset SAVAGE	# S3 chipsets Savage, Virge, and some Trio64
+ # chipset MILLENNIUM	# Matrox Millennium and Millennium II
+-# chipset I810		# Intel i810/815 integrated video
++# chipset I810		# Intel i810/815 integrated video (i386 only)
+ # chipset TRIDENT	# Trident PCI and AGP chipsets
+ # chipset RENDITION	# Rendition V2100/V2200
+ # chipset G450C2
+@@ -421,11 +422,11 @@
  # Clockchip ICD2061A  # The only one supported right now
  
  
 -# VesaText	      # Helps the VESA driver with text mode restoration
+-		      # problems.
 +VesaText	      # Helps the VESA driver with text mode restoration
- 		      # problems.
++		      # problems (i386 only).
  
- # VesaSave 14	      # changing value might help text mode restoring
+-# VesaSave 14	      # changing value might help text mode restoring
+-		      # problems with VESA driver. Legal values: 0-15
++# VesaSave 14	      # changing value might help text mode restoring problems
++		      # with VESA driver (i386 only). Legal values: 0-15
+ 
+ # NoVCControl	      # Disables svgalib's finding a new VC if run
+ 		      # from X, also disables svgalib restoring textmode when
+@@ -439,7 +440,7 @@
+                       # me (matan at svgalib.org)
+ 
+ # NeoMagicLibretto100 # Enable if you have a NeoMagic card on a Toshiba
+-                      # Libretto 100, 110, etc
++                      # Libretto 100, 110, etc (i386 only).
+ 
+ # FbdevNoVga          # When this is set the FBDEV chipset drivers doesn't
+ 		      # (try to) use standardvga modes through the vga driver.


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- svgalib.spec	15 Jul 2006 15:01:27 -0000	1.8
+++ svgalib.spec	17 Jul 2006 11:22:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.25
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Low-level fullscreen SVGA graphics library
 Group:		System Environment/Libraries
 License:	Public Domain
@@ -11,7 +11,6 @@
 Patch1:		svgalib-1.4.3-fhs.patch
 Patch2:		svgalib-1.9.21-demos.patch
 Patch3:		svgalib-1.9.21-cfg.patch
-Patch4:		svgalib-1.9.21-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Exclusivearch:	%{ix86} x86_64
 
@@ -41,9 +40,6 @@
 %patch1 -p1 -b .fhs
 %patch2 -p1
 %patch3 -p1 -b .defaultcfg
-%ifnarch %{ix86}
-%patch4 -p1 -b .x86_64
-%endif
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
 #demo dir
@@ -134,6 +130,12 @@
 
 
 %changelog
+* Mon Jul 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-2
+- Don't have a different defaultcfg on i386 vs x86_64, having the same
+  defaultcfg makes paralel installs possible, add notes about certain settings
+  being only valid on i386 to the defaultcfg and patch the config file parser
+  to ignore i386 only configfile settings on non i386.
+
 * Sat Jul 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-1
 - New upstream release 1.9.25
 - Drop ancient Provides: libvga


--- svgalib-1.9.21-x86_64.patch DELETED ---