r2729 - in trunk: BOOK/general/graphlib BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Sep 9 09:10:13 PDT 2004


Author: randy
Date: 2004-09-09 10:10:10 -0600 (Thu, 09 Sep 2004)
New Revision: 2729

Added:
   trunk/patches/svgalib-1.4.3-gcc34-2.patch
Removed:
   trunk/patches/svgalib-1.4.3-gcc3-1.patch
Modified:
   trunk/BOOK/general/graphlib/svgalib.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/introduction/welcome/credits.xml
Log:
Updated GCC patch in SVGAlib instructions

Modified: trunk/BOOK/general/graphlib/svgalib.xml
===================================================================
--- trunk/BOOK/general/graphlib/svgalib.xml	2004-09-09 04:46:46 UTC (rev 2728)
+++ trunk/BOOK/general/graphlib/svgalib.xml	2004-09-09 16:10:10 UTC (rev 2729)
@@ -5,11 +5,10 @@
   %general-entities;
 
 <!ENTITY SVGAlib-download-http "http://www.svgalib.org/svgalib-&SVGAlib-version;.tar.gz">
-<!ENTITY SVGAlib-download-ftp " ">
-<!ENTITY SVGAlib-size "827 KB">
-<!ENTITY SVGAlib-buildsize "9.7 MB">
-<!ENTITY SVGAlib-time "0.20 SBU">
-
+<!ENTITY SVGAlib-download-ftp  " ">
+<!ENTITY SVGAlib-size          "827 KB">
+<!ENTITY SVGAlib-buildsize     "9.7 MB">
+<!ENTITY SVGAlib-time          "0.20 SBU">
 ]>
 
 <sect1 id="SVGAlib" xreflabel="SVGAlib-&SVGAlib-version;">
@@ -40,7 +39,7 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
-url="&patch-root;/svgalib-&SVGAlib-version;-gcc3-1.patch"/></para></listitem>
+url="&patch-root;/svgalib-&SVGAlib-version;-gcc34-2.patch"/></para></listitem>
 </itemizedlist></sect3>
 
 </sect2>
@@ -57,7 +56,7 @@
 <para>Install <application>SVGAlib</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../svgalib-&SVGAlib-version;-gcc3-1.patch &&
+<screen><userinput><command>patch -Np1 -i ../svgalib-&SVGAlib-version;-gcc34-2.patch &&
 make prefix=/usr install &&
 cd doc &&
 for dir in man?; do for file in $dir/*; do \
@@ -70,8 +69,8 @@
 
 <para><command>cd doc && for dir in man?; do for file in $dir/*; do
 gunzip /usr/share/man/$file; done; done</command>:
-<application>SVGAlib</application> installs its man pages in compressed format
-so we uncompress them.</para>
+<application>SVGAlib</application> installs its man pages in compressed format. 
+This command uncompresses them.</para>
 
 </sect2>
 
@@ -86,8 +85,9 @@
 
 <sect3><title>Configuration information</title>
 
-<para>You must edit the config file to set the monitor and mouse type.
-Depending on your hardware, other setup might be required.</para>
+<para>You must ensure the monitor and mouse type are set properly in one of 
+the configuration files. Edit if necessary. Depending on your hardware, other 
+setup might be required.</para>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
 
@@ -98,12 +98,13 @@
 <sect2>
 <title>Contents</title>
 
-<para>The SVGAlib package contains <filename class="libraryfile">libvga</filename>
+<para>The SVGAlib package contains 
+<filename class="libraryfile">libvga</filename> 
 and <filename class="libraryfile">libvgagl</filename> libraries,
-<command>dumpreg</command>, <command>mode3</command>, <command>restorefont</command>,
-<command>restorepalette</command>, <command>restoretextmode</command>,
-<command>savetextmode</command>, <command>textmode</command> and
-<command>svgakeymap</command>.</para>
+<command>dumpreg</command>, <command>mode3</command>, 
+<command>restorefont</command>, <command>restorepalette</command>, 
+<command>restoretextmode</command>, <command>savetextmode</command>, 
+<command>textmode</command> and <command>svgakeymap</command>.</para>
 
 </sect2>
 
@@ -122,7 +123,8 @@
 svgalib chipset driver sees it.</para></sect3>
 
 <sect3><title>mode3</title>
-<para><command>mode3</command> sets a <acronym>VESA</acronym> mode.</para></sect3>
+<para><command>mode3</command> sets a 
+<acronym>VESA</acronym> mode.</para></sect3>
 
 <sect3><title>restorefont</title>
 <para><command>restorefont</command> saves or restores the
@@ -141,7 +143,8 @@
 restore the complete <acronym>SVGA</acronym> status for textmode.</para></sect3>
 
 <sect3><title>svgakeymap</title>
-<para><command>svgakeymap</command> generates keymaps for svgalib.</para></sect3>
+<para><command>svgakeymap</command> generates keymaps for 
+svgalib.</para></sect3>
 
 </sect2>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-09 04:46:46 UTC (rev 2728)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-09 16:10:10 UTC (rev 2729)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>September 9th, 2004 [randy]: Updated gcc patch 
+in SVGAlib instructions.</para></listitem>
+
 <listitem><para>September 8th, 2004 [randy]: Updated to
 SLIB-3a1; cleaned up G-Wrap dependencies; changed install to
 cp -d in UnZip instructions as suggested by David Jensen.</para></listitem>

Modified: trunk/BOOK/introduction/welcome/credits.xml
===================================================================
--- trunk/BOOK/introduction/welcome/credits.xml	2004-09-09 04:46:46 UTC (rev 2728)
+++ trunk/BOOK/introduction/welcome/credits.xml	2004-09-09 16:10:10 UTC (rev 2729)
@@ -139,7 +139,7 @@
 db-3.3.11, db-3.1.17, emacs, evolution, exim, expat, gal, gnome-print, GnuCash,
 gtkhtml, guppi, guile, guppi, g-wrap, leafnode, lesstif, libcapplet,
 libesmtp, libfam, libghttp, libglade, pine, portmap, PostgreSQL,
-pspell, qpopper, readline, reiserfs, Samba, sendmail, slib,
+pspell, qpopper, readline, reiserfs, Samba, sendmail, 
 slrn, soup, tex, tcp-wrappers, and xinetd: <emphasis>Billy O'Connor</emphasis>
 </para></listitem>  
 
@@ -150,7 +150,7 @@
 </listitem>
 
 <listitem><para>DocBook-utils, Cyrus-SASL, DejaGnu, Expect, Heimdal, JadeTeX, 
-SGMLSpm Perl module and Sysstat: <emphasis>Randy McMurchy</emphasis></para>
+SGMLSpm Perl module, SLIB and Sysstat: <emphasis>Randy McMurchy</emphasis></para>
 </listitem>
 
 <listitem><para>Screen: <emphasis>Andreas Pedersen</emphasis></para></listitem>

Deleted: trunk/patches/svgalib-1.4.3-gcc3-1.patch
===================================================================
--- trunk/patches/svgalib-1.4.3-gcc3-1.patch	2004-09-09 04:46:46 UTC (rev 2728)
+++ trunk/patches/svgalib-1.4.3-gcc3-1.patch	2004-09-09 16:10:10 UTC (rev 2729)
@@ -1,21 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2003-06-03
-Initial Package Version: 1.4.3
-Origin: Jim Gifford
-Description: Fixes GCC 3.3 Compile Errors
-
-$LastChangedBy$
-$Date$
-
-diff -Naur svgalib-1.4.3.orig/src/vga.c svgalib-1.4.3/src/vga.c
---- svgalib-1.4.3.orig/src/vga.c	2001-05-29 07:37:55.000000000 -0000
-+++ svgalib-1.4.3/src/vga.c	2003-06-03 22:31:55.000000000 -0000
-@@ -3914,7 +3914,7 @@
- 
- #define ML_GETINT(x) \
- 	ptr = strtok(NULL, " "); if(!ptr) break; \
--	mmt.##x = atoi(ptr);
-+	mmt.x = atoi(ptr);
- 
- 	    ML_GETINT(HDisplay);
- 	    ML_GETINT(HSyncStart);

Added: trunk/patches/svgalib-1.4.3-gcc34-2.patch
===================================================================
--- trunk/patches/svgalib-1.4.3-gcc34-2.patch	2004-09-09 04:46:46 UTC (rev 2728)
+++ trunk/patches/svgalib-1.4.3-gcc34-2.patch	2004-09-09 16:10:10 UTC (rev 2729)
@@ -0,0 +1,47 @@
+Submitted By: Pierre Cyr <pierre.cyr at mail.mcgill.ca>
+Date: 2004-05-18
+Initial Package Version: 1.4.3
+Upstream Status: Submitted to LFS and SVGAlib developers 
+Origin: http://patches.linuxfromscratch.org (includes svgalib-1.4.3-gcc3-1.patch)
+        and myself
+Description: This patch allows to compile svgalib-1.3.4 using gcc-3.4 and its
+             more strict syntax.
+
+$LastChangedBy$
+$Date$
+
+diff -Naur svgalib-1.4.3.orig/src/mach32.c svgalib-1.4.3/src/mach32.c
+--- svgalib-1.4.3.orig/src/mach32.c	1999-09-29 16:52:14.000000000 +0000
++++ svgalib-1.4.3/src/mach32.c	2004-05-19 02:11:16.148248344 +0000
+@@ -1544,7 +1544,7 @@
+ 		goto writerr;
+ 	    printf("mach32: Notice: new EEPROM file >%s< succesful created.\n",
+ 		   eeprom_fname);
+-	  finish_w_eeprom:
++	  finish_w_eeprom: fd == NULL; //Useless line to compile
+ 	}
+ 	/* Change eeprom contents if requested: */
+ 	if (!(eeprom_option & EEPROM_USE_MEMCFG))
+diff -Naur svgalib-1.4.3.orig/src/s3.c svgalib-1.4.3/src/s3.c
+--- svgalib-1.4.3.orig/src/s3.c	2000-05-03 12:23:57.000000000 +0000
++++ svgalib-1.4.3/src/s3.c	2004-05-19 02:11:41.643372496 +0000
+@@ -474,7 +474,6 @@
+ 	    dac_used->restoreState(regs);
+ 	    return old_values;
+ 	}
+-    default:
+     }
+     return 0;
+ }
+diff -Naur svgalib-1.4.3.orig/src/vga.c svgalib-1.4.3/src/vga.c
+--- svgalib-1.4.3.orig/src/vga.c	2001-05-29 14:37:55.000000000 +0000
++++ svgalib-1.4.3/src/vga.c	2004-05-19 02:09:10.637328904 +0000
+@@ -3914,7 +3914,7 @@
+ 
+ #define ML_GETINT(x) \
+ 	ptr = strtok(NULL, " "); if(!ptr) break; \
+-	mmt.##x = atoi(ptr);
++	mmt.x = atoi(ptr);
+ 
+ 	    ML_GETINT(HDisplay);
+ 	    ML_GETINT(HSyncStart);


Property changes on: trunk/patches/svgalib-1.4.3-gcc34-2.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list