r3122 - in trunk: BOOK BOOK/gnome/add BOOK/introduction/welcome BOOK/kde/add BOOK/multimedia/libdriv BOOK/multimedia/videoutils patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Mon Dec 20 07:01:42 PST 2004


Author: igor
Date: 2004-12-20 08:01:39 -0700 (Mon, 20 Dec 2004)
New Revision: 3122

Removed:
   trunk/patches/SDL-1.2.7-gcc34-2.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/gnomemeeting.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/add/kdeaddons.xml
   trunk/BOOK/kde/add/kdemultimedia.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins.xml
   trunk/BOOK/multimedia/libdriv/libdv.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
   trunk/BOOK/multimedia/videoutils/avifile.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
Log:
Updated to SDL-1.2.8.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/general.ent	2004-12-20 15:01:39 UTC (rev 3122)
@@ -403,7 +403,7 @@
 
 <!ENTITY audiofile-version            "0.2.6"> 
 <!ENTITY esound-version               "0.2.35">   
-<!ENTITY SDL-version                  "1.2.7">      
+<!ENTITY sdl-version                  "1.2.8">      
 <!ENTITY libao-version                "0.8.5">   
 <!ENTITY libogg-version               "1.1.2">   
 <!ENTITY libvorbis-version            "1.1.0"> 

Modified: trunk/BOOK/gnome/add/gnomemeeting.xml
===================================================================
--- trunk/BOOK/gnome/add/gnomemeeting.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/gnome/add/gnomemeeting.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -59,7 +59,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="SDL"/> (required for full-screen video)</para>
+<para><xref linkend="sdl"/> (required for full-screen video)</para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>December 20th, 2004 [igor]: Updated to
+SDL-1.2.8.</para></listitem>
+
 <listitem><para>December 19th, 2004 [dj]: Added gcc-3.3.3-linkonce patch
 and updated to OpenOffice-1.1.3 and associated patches.</para></listitem>
 

Modified: trunk/BOOK/kde/add/kdeaddons.xml
===================================================================
--- trunk/BOOK/kde/add/kdeaddons.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/kde/add/kdeaddons.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -50,7 +50,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="db"/>, 
 <xref linkend="xmms"/> and 
-<xref linkend="SDL"/></para>
+<xref linkend="sdl"/></para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/kde/add/kdemultimedia.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -58,7 +58,7 @@
 <xref linkend="xine-lib"/>,
 <xref linkend="flac"/>,
 <xref linkend="speex"/>, 
-<xref linkend="SDL"/>, 
+<xref linkend="sdl"/>, 
 <xref linkend="gstreamer"/> 
 (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>), 
 <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, 

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -118,7 +118,7 @@
 <sect4><title>Optional multimedia utilities</title>
 <para><ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>, 
 <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>, 
-<xref linkend="SDL"/>, 
+<xref linkend="sdl"/>, 
 <ulink url="http://swfdec.sourceforge.net/">swfdec</ulink> and 
 <xref linkend="xine-lib"/></para>
 </sect4>

Modified: trunk/BOOK/multimedia/libdriv/libdv.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libdv.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/libdriv/libdv.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -36,7 +36,7 @@
 
 <sect3><title><application>libdv</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="popt"/>, <xref linkend="pkgconfig"/>, <xref linkend="SDL"/>, 
+<para><xref linkend="popt"/>, <xref linkend="pkgconfig"/>, <xref linkend="sdl"/>, 
 <xref linkend="GTK"/> and X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)
 </para></sect4>
 </sect3>

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -3,19 +3,19 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY SDL-download-http "http://www.libsdl.org/release/SDL-&SDL-version;.tar.gz">
-  <!ENTITY SDL-download-ftp  " ">
-  <!ENTITY SDL-size          "2.4 MB">
-  <!ENTITY SDL-buildsize     "46 MB">
-  <!ENTITY SDL-time          "0.99 SBU">
+  <!ENTITY sdl-download-http "http://www.libsdl.org/release/SDL-&sdl-version;.tar.gz">
+  <!ENTITY sdl-download-ftp  " ">
+  <!ENTITY sdl-size          "2.5 MB">
+  <!ENTITY sdl-buildsize     "33 MB">
+  <!ENTITY sdl-time          "0.99 SBU">
 ]>
-<sect1 id="SDL" xreflabel="SDL-&SDL-version;">
+<sect1 id="sdl" xreflabel="SDL-&sdl-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="sdl.html"?>
-<title>SDL-&SDL-version;</title>
+<title>SDL-&sdl-version;</title>
 
 <sect2>
 <title>Introduction to <application><acronym>SDL</acronym></application></title>
@@ -27,21 +27,13 @@
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&SDL-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&SDL-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &SDL-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &SDL-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &SDL-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): <ulink url="&sdl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&sdl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &sdl-size;</para></listitem>
+<listitem><para>Estimated disk space required: &sdl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &sdl-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch (if compiled using 
-<application>GCC</application>-3.4.x): 
-<ulink url="&patch-root;/SDL-&SDL-version;-gcc34-2.patch"/></para>
-</listitem>
-</itemizedlist></sect3>
-
 <sect3><title><application><acronym>SDL</acronym></application> 
 dependencies</title>
 <sect4><title>Optional</title>
@@ -69,8 +61,7 @@
 <para>Install <application><acronym>SDL</acronym></application> by running the 
 following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../SDL-&SDL-version;-gcc34-2.patch &&
-./configure --prefix=/usr --disable-debug &&
+<screen><userinput><command>./configure --prefix=/usr --disable-debug &&
 make &&
 make install</command></userinput></screen>
 
@@ -79,7 +70,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><option>--disable-debug</option>: This switch configures
+<para><parameter>--disable-debug</parameter>: This switch configures
 <application><acronym>SDL</acronym></application> to build with aggressive 
 optimizations.</para>
 
@@ -119,4 +110,3 @@
 </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -53,7 +53,7 @@
 <xref linkend="ffmpeg"/>, 
 <xref linkend="aalib"/>, 
 <xref linkend="libmng"/>, 
-<xref linkend="SDL"/>, 
+<xref linkend="sdl"/>, 
 <xref linkend="flac"/>, 
 <xref linkend="libfame"/>, 
 <xref linkend="libogg"/>, 

Modified: trunk/BOOK/multimedia/videoutils/avifile.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/avifile.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/videoutils/avifile.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -73,7 +73,7 @@
 
 <sect3><title><application>Avifile</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="qt"/> and <xref linkend="SDL"/></para>
+<para><xref linkend="qt"/> and <xref linkend="sdl"/></para>
 </sect4>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -40,13 +40,6 @@
 <listitem><para>Estimated build time: &ffmpeg-time;</para></listitem></itemizedlist>
 </sect3>
 
-<!-- <sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/ffmpeg-&ffmpeg-version;-gcc34-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3> -->
-
 <sect3><title><application>FFmpeg</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="libvorbis"/>, 
@@ -54,7 +47,7 @@
 <xref linkend="liba52"/>, 
 <xref linkend="imlib2"/>, 
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="SDL"/>, 
+<xref linkend="sdl"/>, 
 <xref linkend="freetype2"/>, 
 <ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAC</ulink> and 
 <ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD</ulink></para>

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -99,7 +99,7 @@
 <xref linkend="libogg"/>
 <xref linkend="libvorbis"/>,
 <xref linkend="aalib"/>,
-<xref linkend="SDL"/>,
+<xref linkend="sdl"/>,
 <xref linkend="xvid"/>,
 <xref linkend="arts"/>,
 <xref linkend="alsa"/>,

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	2004-12-20 15:01:39 UTC (rev 3122)
@@ -69,7 +69,7 @@
 <xref linkend="mplayer"/>, 
 <xref linkend="libdv"/>, 
 <xref linkend="libdvdread"/>, 
-<xref linkend="SDL"/>, 
+<xref linkend="sdl"/>, 
 <xref linkend="avifile"/>, 
 <xref linkend="libfame"/>, 
 <xref linkend="libmpeg3"/>, 

Deleted: trunk/patches/SDL-1.2.7-gcc34-2.patch
===================================================================
--- trunk/patches/SDL-1.2.7-gcc34-2.patch	2004-12-20 06:27:21 UTC (rev 3121)
+++ trunk/patches/SDL-1.2.7-gcc34-2.patch	2004-12-20 15:01:39 UTC (rev 3122)
@@ -1,268 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2004-08-24
-Initial Package Version: 1.2.7
-Origin: Gentoo CVS
-Upstream Status: Sent
-Description: Fixes Compile Issues with GCC 3.4.x
-
-$LastChangedBy$
-$Date$
-
-diff -Naur SDL-1.2.7.orig/src/audio/SDL_mixer_MMX.c SDL-1.2.7/src/audio/SDL_mixer_MMX.c
---- SDL-1.2.7.orig/src/audio/SDL_mixer_MMX.c	2002-11-09 06:13:28.000000000 +0000
-+++ SDL-1.2.7/src/audio/SDL_mixer_MMX.c	2004-08-24 18:14:09.306226896 +0000
-@@ -15,13 +15,11 @@
- {
-     __asm__ __volatile__ (
- 
--"	movl %0,%%edi\n"	// edi = dst
--"	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
- 
--"	movl %2,%%ebx\n"	// ebx = size
-+"	movl %2,%%edx\n"	// edx = size
- 
--"	shrl $4,%%ebx\n"	// process 16 bytes per iteration = 8 samples
-+"	shrl $4,%%edx\n"	// process 16 bytes per iteration = 8 samples
- 
- "	jz .endS16\n"
- 
-@@ -39,14 +37,14 @@
- ".align 16\n"
- "	.mixloopS16:\n"
- 
--"	movq (%%esi),%%mm1\n" // mm1 = a|b|c|d
-+"	movq (%1),%%mm1\n" // mm1 = a|b|c|d
- 
- "	movq %%mm1,%%mm2\n" // mm2 = a|b|c|d
- 
--"	movq 8(%%esi),%%mm4\n" // mm4 = e|f|g|h
-+"	movq 8(%1),%%mm4\n" // mm4 = e|f|g|h
- 
- 	// pré charger le buffer dst dans mm7
--"	movq (%%edi),%%mm7\n" // mm7 = dst[0]"
-+"	movq (%0),%%mm7\n" // mm7 = dst[0]"
- 
- 	// multiplier par le volume
- "	pmullw %%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
-@@ -69,11 +67,11 @@
- "	punpcklwd %%mm5,%%mm6\n" // mm6 = g*v|h*v
- 
- 	// pré charger le buffer dst dans mm5
--"	movq 8(%%edi),%%mm5\n" // mm5 = dst[1]
-+"	movq 8(%0),%%mm5\n" // mm5 = dst[1]
- 
- 	// diviser par 128
- "	psrad $7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME
--"	addl $16,%%esi\n"
-+"	add $16,%1\n"
- 
- "	psrad $7,%%mm3\n" // mm3 = c*v/128|d*v/128
- 
-@@ -87,15 +85,15 @@
- 
- 	// mm4 = le sample avec le volume modifié
- "	packssdw %%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v)
--"	movq %%mm3,(%%edi)\n"
-+"	movq %%mm3,(%0)\n"
- 
- "	paddsw %%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst
- 
--"	movq %%mm6,8(%%edi)\n"
-+"	movq %%mm6,8(%0)\n"
- 
--"	addl $16,%%edi\n"
-+"	add $16,%0\n"
- 
--"	dec %%ebx\n"
-+"	dec %%edx\n"
- 
- "	jnz .mixloopS16\n"
- 
-@@ -103,9 +101,9 @@
- 
- ".endS16:\n"
- 	 :
--	 : "m" (dst), "m"(src),"m"(size),
-+	 : "r" (dst), "r"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+	 : "eax","edx","memory"
- 	 );
- }
- 
-@@ -119,11 +117,9 @@
- {
-     __asm__ __volatile__ (
- 
--"	movl %0,%%edi\n"	// edi = dst
--"	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
- 
--"	movd %%ebx,%%mm0\n"
-+"	movd %%edx,%%mm0\n"
- "	movq %%mm0,%%mm1\n"
- "	psllq $16,%%mm0\n"
- "	por %%mm1,%%mm0\n"
-@@ -132,17 +128,17 @@
- "	psllq $16,%%mm0\n"
- "	por %%mm1,%%mm0\n"
- 
--"	movl %2,%%ebx\n"	// ebx = size
--"	shr $3,%%ebx\n"	// process 8 bytes per iteration = 8 samples
-+"	movl %2,%%edx\n"	// edx = size
-+"	shr $3,%%edx\n"	// process 8 bytes per iteration = 8 samples
- 
--"	cmp $0,%%ebx\n"
-+"	cmp $0,%%edx\n"
- "	je .endS8\n"
- 
- ".align 16\n"
- "	.mixloopS8:\n"
- 
- "	pxor %%mm2,%%mm2\n"		// mm2 = 0
--"	movq (%%esi),%%mm1\n"	// mm1 = a|b|c|d|e|f|g|h
-+"	movq (%1),%%mm1\n"	// mm1 = a|b|c|d|e|f|g|h
- 
- "	movq %%mm1,%%mm3\n" 	// mm3 = a|b|c|d|e|f|g|h
- 
-@@ -152,10 +148,10 @@
- "	punpckhbw %%mm2,%%mm1\n"	// mm1 = 0|a|0|b|0|c|0|d
- 
- "	punpcklbw %%mm2,%%mm3\n"	// mm3 = 0|e|0|f|0|g|0|h
--"	movq (%%edi),%%mm2\n"	// mm2 = destination
-+"	movq (%0),%%mm2\n"	// mm2 = destination
- 
- "	pmullw %%mm0,%%mm1\n"	// mm1 = v*a|v*b|v*c|v*d
--"	addl $8,%%esi\n"
-+"	add $8,%1\n"
- 
- "	pmullw %%mm0,%%mm3\n"	// mm3 = v*e|v*f|v*g|v*h
- "	psraw $7,%%mm1\n"		// mm1 = v*a/128|v*b/128|v*c/128|v*d/128 
-@@ -166,19 +162,19 @@
- 
- "	paddsb %%mm2,%%mm3\n"	// add to destination buffer
- 
--"	movq %%mm3,(%%edi)\n"	// store back to ram
--"	addl $8,%%edi\n"
-+"	movq %%mm3,(%0)\n"	// store back to ram
-+"	add $8,%0\n"
- 
--"	dec %%ebx\n"
-+"	dec %%edx\n"
- 
- "	jnz .mixloopS8\n"
- 
- ".endS8:\n"
- "	emms\n"
- 	 :
--	 : "m" (dst), "m"(src),"m"(size),
-+	 : "r" (dst), "r"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+	 : "eax","edx","memory"
- 	 );
- }
- #endif
-diff -Naur SDL-1.2.7.orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c
---- SDL-1.2.7.orig/src/cpuinfo/SDL_cpuinfo.c	2004-02-10 15:31:35.000000000 +0000
-+++ SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c	2004-08-24 18:14:09.308226592 +0000
-@@ -118,7 +118,7 @@
- "        movl    %%edi,%%ebx\n"
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+	: "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
-@@ -153,7 +153,7 @@
- "        movl    %%edi,%%ebx\n"
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+	: "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
-diff -Naur SDL-1.2.7.orig/src/video/SDL_yuv_mmx.c SDL-1.2.7/src/video/SDL_yuv_mmx.c
---- SDL-1.2.7.orig/src/video/SDL_yuv_mmx.c	2004-02-18 17:22:04.000000000 +0000
-+++ SDL-1.2.7/src/video/SDL_yuv_mmx.c	2004-08-24 18:14:09.312225984 +0000
-@@ -120,12 +120,12 @@
- 		 "movd (%2), %%mm2\n"           //    0  0  0  0 l3 l2 l1 l0
- 		 "punpcklbw %%mm7,%%mm1\n" //         0  v3 0  v2 00 v1 00 v0
- 		 "punpckldq %%mm1,%%mm1\n" //         00 v1 00 v0 00 v1 00 v0
--		 "psubw _MMX_0080w,%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 
-+		 "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 
- 
- 		 // create Cr_g (result in mm0)
- 		 "movq %%mm1,%%mm0\n"           // r1 r1 r0 r0 r1 r1 r0 r0
--		 "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
--		 "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
-+		 "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
-+		 "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
- 		 "psraw  $6, %%mm0\n"           // red=red/64
- 		 "psraw  $6, %%mm1\n"           // red=red/64
- 		 
-@@ -134,8 +134,8 @@
- 		 "movq (%2,%4),%%mm3\n"         //    0  0  0  0 L3 L2 L1 L0
- 		 "punpckldq %%mm3,%%mm2\n"      //   L3 L2 L1 L0 l3 l2 l1 l0
- 		 "movq %%mm2,%%mm4\n"           //   L3 L2 L1 L0 l3 l2 l1 l0
--		 "pand _MMX_FF00w,%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
--		 "pand _MMX_00FFw,%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
-+		 "pand %[_MMX_FF00w],%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
-+		 "pand %[_MMX_00FFw],%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
- 		 "psrlw $8,%%mm2\n"             //   0  L3  0 L1  0 l3  0 l1
- 
- 		 // create R (result in mm6)
-@@ -152,11 +152,11 @@
- 		 "movd (%1), %%mm1\n"      //         0  0  0  0  u3 u2 u1 u0
- 		 "punpcklbw %%mm7,%%mm1\n" //         0  u3 0  u2 00 u1 00 u0
- 		 "punpckldq %%mm1,%%mm1\n" //         00 u1 00 u0 00 u1 00 u0
--		 "psubw _MMX_0080w,%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 
-+		 "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 
- 		 // create Cb_g (result in mm5)
- 		 "movq %%mm1,%%mm5\n"            // u1 u1 u0 u0 u1 u1 u0 u0
--		 "pmullw _MMX_UgrnRGB,%%mm5\n"    // blue*-109dec=1.7129*64
--		 "pmullw _MMX_UbluRGB,%%mm1\n"    // blue*114dec=1.78125*64
-+		 "pmullw %[_MMX_UgrnRGB],%%mm5\n"    // blue*-109dec=1.7129*64
-+		 "pmullw %[_MMX_UbluRGB],%%mm1\n"    // blue*114dec=1.78125*64
- 		 "psraw  $6, %%mm5\n"            // blue=red/64
- 		 "psraw  $6, %%mm1\n"            // blue=blue/64
- 
-@@ -238,8 +238,14 @@
- 		 "popl %%ebx\n"
- 		 :
- 		 : "m" (cr), "r"(cb),"r"(lum),
--		 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--		 : "%ebx"
-+		 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
-+         [_MMX_0080w] "m" (*_MMX_0080w),
-+         [_MMX_00FFw] "m" (*_MMX_00FFw),
-+         [_MMX_FF00w] "m" (*_MMX_FF00w),
-+         [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB),
-+         [_MMX_VredRGB] "m" (*_MMX_VredRGB),
-+         [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB),
-+         [_MMX_UbluRGB] "m" (*_MMX_UbluRGB)
- 		 );
- }
- 
-@@ -413,8 +419,16 @@
- 	 "popl %%ebx\n"
-          :
-          :"m" (cr), "r"(cb),"r"(lum),
--	 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--	 : "%ebx"
-+	 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
-+     [_MMX_0080w] "m" (*_MMX_0080w),
-+ [_MMX_Ugrn565] "m" (*_MMX_Ugrn565),
-+ [_MMX_Ublu5x5] "m" (*_MMX_Ublu5x5),
-+ [_MMX_00FFw] "m" (*_MMX_00FFw),
-+ [_MMX_Vgrn565] "m" (*_MMX_Vgrn565),
-+ [_MMX_Vred5x5] "m" (*_MMX_Vred5x5),
-+ [_MMX_Ycoeff] "m" (*_MMX_Ycoeff),
-+ [_MMX_red565] "m" (*_MMX_red565),
-+ [_MMX_grn565] "m" (*_MMX_grn565)
-          );
- }
- 




More information about the blfs-book mailing list