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

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Sep 5 21:15:22 PDT 2004


Author: randy
Date: 2004-09-05 22:15:20 -0600 (Sun, 05 Sep 2004)
New Revision: 2716

Added:
   trunk/patches/SDL-1.2.7-gcc34-2.patch
Removed:
   trunk/patches/SDL-1.2.7-gcc34-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
Log:
Updated SDL gcc34 patch

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-05 16:21:20 UTC (rev 2715)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-06 04:15:20 UTC (rev 2716)
@@ -23,8 +23,8 @@
 <itemizedlist>
 
 <listitem><para>September 5th, 2004 [randy]: Added optional dependencies 
-and build/functionality fix patches to transcode instructions.</para>
-</listitem>
+and build/functionality fix patches to transcode instructions; updated
+SDL gcc34 patch.</para></listitem>
 
 <listitem><para>September 5th, 2004 [randy]: Added gcc34 patch to 
 libFAME instructions to fix broken library if compiled with 

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml	2004-09-05 16:21:20 UTC (rev 2715)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml	2004-09-06 04:15:20 UTC (rev 2716)
@@ -38,7 +38,7 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch (if compiled using 
 <application>GCC</application>-3.4.x): 
-<ulink url="&patch-root;/SDL-&SDL-version;-gcc34-1.patch"/></para>
+<ulink url="&patch-root;/SDL-&SDL-version;-gcc34-2.patch"/></para>
 </listitem>
 </itemizedlist></sect3>
 
@@ -69,7 +69,7 @@
 <para>Install <application><acronym>SDL</acronym></application> by running the 
 following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../SDL-&SDL-version;-gcc34-1.patch &&
+<screen><userinput><command>patch -Np1 -i ../SDL-&SDL-version;-gcc34-2.patch &&
 ./configure --prefix=/usr --disable-debug &&
 make &&
 make install</command></userinput></screen>

Deleted: trunk/patches/SDL-1.2.7-gcc34-1.patch
===================================================================
--- trunk/patches/SDL-1.2.7-gcc34-1.patch	2004-09-05 16:21:20 UTC (rev 2715)
+++ trunk/patches/SDL-1.2.7-gcc34-1.patch	2004-09-06 04:15:20 UTC (rev 2716)
@@ -1,124 +0,0 @@
-Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
-Date: 2004-04-11
-Initial Package Version: 1.2.7
-Upstream Status: Not submitted
-Origin: jbit from LFS-IRC's custom hacks
-Description: fixes inline asm code for gcc 3.4 compilation
-
-$LastChangedBy$
-$Date$
-
-diff -aur SDL-1.2.7/src/audio/SDL_mixer_MMX.c SDL-1.2.7-new/src/audio/SDL_mixer_MMX.c
---- SDL-1.2.7/src/audio/SDL_mixer_MMX.c	2002-11-08 22:13:28.000000000 -0800
-+++ SDL-1.2.7-new/src/audio/SDL_mixer_MMX.c	2004-04-11 06:27:06.765672328 -0700
-@@ -14,7 +14,7 @@
- void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
- {
-     __asm__ __volatile__ (
--
-+"	pushl %%ebx\n" //XXX: Jbit hack
- "	movl %0,%%edi\n"	// edi = dst
- "	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
-@@ -102,10 +102,11 @@
- "	emms\n"
- 
- ".endS16:\n"
-+"	popl %%ebx\n" //XXX: Jbit hack
- 	 :
- 	 : "m" (dst), "m"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+	 : "eax","esi", "edi","memory"
- 	 );
- }
- 
-@@ -119,6 +120,7 @@
- {
-     __asm__ __volatile__ (
- 
-+"	pushl %%ebx\n"		//XXX: Jbit hack
- "	movl %0,%%edi\n"	// edi = dst
- "	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
-@@ -175,10 +177,11 @@
- 
- ".endS8:\n"
- "	emms\n"
-+"	popl %%ebx\n"		//XXX: Jbit hack
- 	 :
- 	 : "m" (dst), "m"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+	 : "eax","esi", "edi","memory"
- 	 );
- }
- #endif
-diff -aur SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7-new/src/cpuinfo/SDL_cpuinfo.c
---- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c	2004-02-10 07:31:35.000000000 -0800
-+++ SDL-1.2.7-new/src/cpuinfo/SDL_cpuinfo.c	2004-04-11 06:27:06.761672450 -0700
-@@ -105,6 +105,7 @@
- 	int features = 0;
- #if defined(__GNUC__) && defined(i386)
- 	__asm__ (
-+"		pushl %%ebx\n" //XXX: Jbit Hack
- "        movl    %%ebx,%%edi\n"
- "        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
- "        cpuid                       # Get and save vendor ID          \n"
-@@ -116,9 +117,10 @@
- "        movl    %%edx,%0                                              \n"
- "1:                                                                    \n"
- "        movl    %%edi,%%ebx\n"
-+"		popl %%ebx\n" //XXX: Jbit Hack
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+	: "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
-@@ -141,6 +143,7 @@
- 	int features = 0;
- #if defined(__GNUC__) && defined(i386)
- 	__asm__ (
-+"		pushl %%ebx\n" //XXX: Jbit Hack
- "        movl    %%ebx,%%edi\n"
- "        movl    $0x80000000,%%eax   # Query for extended functions    \n"
- "        cpuid                       # Get extended function limit     \n"
-@@ -151,9 +154,10 @@
- "        movl    %%edx,%0                                              \n"
- "1:                                                                    \n"
- "        movl    %%edi,%%ebx\n"
-+"		popl %%ebx\n" //XXX: Jbit Hack
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+	: "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
-diff -aur SDL-1.2.7/src/video/SDL_yuv_mmx.c SDL-1.2.7-new/src/video/SDL_yuv_mmx.c
---- SDL-1.2.7/src/video/SDL_yuv_mmx.c	2004-02-18 09:22:04.000000000 -0800
-+++ SDL-1.2.7-new/src/video/SDL_yuv_mmx.c	2004-04-11 06:27:06.763672389 -0700
-@@ -238,9 +238,7 @@
- 		 "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) );
- }
- 
- void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
-@@ -413,9 +411,7 @@
- 	 "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)  );
- }
- 
- #endif /* GCC i386 inline assembly */

Added: trunk/patches/SDL-1.2.7-gcc34-2.patch
===================================================================
--- trunk/patches/SDL-1.2.7-gcc34-2.patch	2004-09-05 16:21:20 UTC (rev 2715)
+++ trunk/patches/SDL-1.2.7-gcc34-2.patch	2004-09-06 04:15:20 UTC (rev 2716)
@@ -0,0 +1,268 @@
+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)
+          );
+ }
+ 


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




More information about the blfs-book mailing list