r2714 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/libdriv patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Sep 4 23:11:52 PDT 2004


Author: randy
Date: 2004-09-05 00:11:51 -0600 (Sun, 05 Sep 2004)
New Revision: 2714

Added:
   trunk/patches/libfame-0.9.1-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/libfame.xml
Log:
Added gcc34 patch to libFAME instructions to fix broken library if compiled with GCC-3.4.x

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-04 23:58:13 UTC (rev 2713)
+++ trunk/BOOK/general.ent	2004-09-05 06:11:51 UTC (rev 2714)
@@ -1,4 +1,4 @@
-<!ENTITY day          "04">
+<!ENTITY day          "05">
 <!ENTITY month        "09">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-04 23:58:13 UTC (rev 2713)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-05 06:11:51 UTC (rev 2714)
@@ -22,6 +22,10 @@
 
 <itemizedlist>
 
+<listitem><para>September 5th, 2004 [randy]: Added gcc34 patch to 
+libFAME instructions to fix broken library if compiled with 
+GCC-3.4.x.</para></listitem>
+
 <listitem><para>September 4th, 2004 [randy]: Updated to 
 Whois-4.6.21 as suggested by Jeremy Utley; Updated to 
 MPlayer-1.0pre5.</para></listitem>

Modified: trunk/BOOK/multimedia/libdriv/libfame.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libfame.xml	2004-09-04 23:58:13 UTC (rev 2713)
+++ trunk/BOOK/multimedia/libdriv/libfame.xml	2004-09-05 06:11:51 UTC (rev 2714)
@@ -2,7 +2,7 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY libfame-download-http "http://prdownloads.sourceforge.net/fame/libfame-&libfame-version;.tar.gz">
   <!ENTITY libfame-download-ftp  " ">
   <!ENTITY libfame-size          "290 KB">
@@ -19,11 +19,12 @@
 <title>libFAME-&libfame-version;</title>
 
 <sect2>
-<title>Introduction to <application>lib<acronym>FAME</acronym></application></title>
+<title>Introduction to <application>lib<acronym>FAME</acronym></application>
+</title>
 
 <para><application>lib<acronym>FAME</acronym></application> is a 
-fast (real-time) MPEG-1 as well as MPEG-4 rectangular and arbitrary shaped
-video encoding library.</para>
+fast (real-time) <acronym>MPEG</acronym>-1 as well as <acronym>MPEG</acronym>-4 
+rectangular and arbitrary shaped video encoding library.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -34,15 +35,25 @@
 <listitem><para>Estimated build time: &libfame-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch (if compiled with 
+<application><acronym>GCC</acronym></application>-3.4.x): <ulink 
+url="&patch-root;/libfame-&libfame-version;-gcc34-1.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 </sect2>
 
 <sect2>
-<title>Installation of <application>lib<acronym>FAME</acronym></application></title>
+<title>Installation of <application>lib<acronym>FAME</acronym></application>
+</title>
 
 <para>Install <application>lib<acronym>FAME</acronym></application> by running 
 the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &&
+<screen><userinput><command>patch -Np1 -i ../libfame-&libfame-version;-gcc34-1.patch &&
+./configure --prefix=/usr &&
 make &&
 make install</command></userinput></screen>
 
@@ -61,7 +72,8 @@
 
 <sect3><title>libfame-config</title>
 <para><command>libfame-config</command>
-provides configuration information for <filename class="libraryfile">libfame</filename>.
+provides configuration information for 
+<filename class="libraryfile">libfame</filename>.
 </para></sect3>
 
 <sect3><title>libfame</title>

Added: trunk/patches/libfame-0.9.1-gcc34-1.patch
===================================================================
--- trunk/patches/libfame-0.9.1-gcc34-1.patch	2004-09-04 23:58:13 UTC (rev 2713)
+++ trunk/patches/libfame-0.9.1-gcc34-1.patch	2004-09-05 06:11:51 UTC (rev 2714)
@@ -0,0 +1,35 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-09-04
+Initial Package Version: 0.9.1
+Upstream Status:         Not submitted 
+Origin:                  Randy McMurchy
+Description:             Fixes libfame library when compiled with GCC-3.4.x
+
+$LastChangedBy$
+$Date$
+
+diff -Naur libfame-0.9.1-orig/src/half_mmx.h libfame-0.9.1/src/half_mmx.h
+--- libfame-0.9.1-orig/src/half_mmx.h	2002-04-30 18:04:02.000000000 +0000
++++ libfame-0.9.1/src/half_mmx.h	2004-09-05 03:49:09.666845896 +0000
+@@ -18,7 +18,7 @@
+ */
+ /**************************** half-pixel interpolation ***********************/
+ 
+-static short const _mmx_one[] = { 1, 1, 1, 1 };
++const _mmx_one[] = { 1, 1, 1, 1 };
+ 
+ static void inline mmx_interpolate(unsigned char **ref,
+ 				   int pitch,
+
+diff -Naur libfame-0.9.1-orig/src/half_sse.h libfame-0.9.1/src/half_sse.h
+--- libfame-0.9.1-orig/src/half_sse.h	2002-01-27 02:24:56.000000000 +0000
++++ libfame-0.9.1/src/half_sse.h	2004-09-05 03:49:39.894250632 +0000
+@@ -19,7 +19,7 @@
+ */
+ /**************************** half-pixel interpolation ***********************/
+ 
+-static short const _mmx_one[] = { 1, 1, 1, 1 };
++const _mmx_one[] = { 1, 1, 1, 1 };
+ static unsigned char const _mmx_one_byte[] = {1,1,1,1,1,1,1,1};
+ 
+ 


Property changes on: trunk/patches/libfame-0.9.1-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list