[svn] r5085 - trunk/rpms/mjpegtools

[packagers at lists.rpmforge.net]

Author: thias
Date: 2007-01-16 16:28:36 +0100 (Tue, 16 Jan 2007)
New Revision: 5085

Removed:
   trunk/rpms/mjpegtools/jpeg-mmx-0.1.6-gcc41.patch
Modified:
   trunk/rpms/mjpegtools/mjpegtools.spec
Log:
Quick mjpegtools fix (was required for ppc build), remove obsolete patch.


Deleted: trunk/rpms/mjpegtools/jpeg-mmx-0.1.6-gcc41.patch
===================================================================
--- trunk/rpms/mjpegtools/jpeg-mmx-0.1.6-gcc41.patch	2007-01-16 15:19:51 UTC (rev 5084)
+++ trunk/rpms/mjpegtools/jpeg-mmx-0.1.6-gcc41.patch	2007-01-16 15:28:36 UTC (rev 5085)
@@ -1,12 +0,0 @@
-diff -Naupr jpeg-mmx.orig/jquant_x86simd.c jpeg-mmx/jquant_x86simd.c
---- jpeg-mmx.orig/jquant_x86simd.c	2003-08-02 06:31:28.000000000 +0200
-+++ jpeg-mmx/jquant_x86simd.c	2006-03-17 15:52:41.000000000 +0100
-@@ -104,7 +104,7 @@ void jcquant_sse( INT16 *psrc, INT16 *pd
- 
- 	/* Initialise zero block flags */
- 	/* Set up SSE rounding mode */
--	__asm__ ( "ldmxcsr %0\n" : : "X" (trunc_mxcsr) );
-+	__asm__ ( "ldmxcsr %0\n" : : "m" (trunc_mxcsr) );
- 
- 	for (i=0; i < 64 ; i+=4)
- 	{

Modified: trunk/rpms/mjpegtools/mjpegtools.spec
===================================================================
--- trunk/rpms/mjpegtools/mjpegtools.spec	2007-01-16 15:19:51 UTC (rev 5084)
+++ trunk/rpms/mjpegtools/mjpegtools.spec	2007-01-16 15:28:36 UTC (rev 5085)
@@ -20,7 +20,7 @@
 Summary: Tools for recording, editing, playing and encoding mpeg video
 Name: mjpegtools
 Version: 1.9.0
-Release: 0.3
+Release: 0.4
 License: GPL
 Group: Applications/Multimedia
 URL: http://mjpeg.sourceforge.net/
@@ -64,9 +64,7 @@
 %build
 %configure
 # Don't use %{?_smp_mflags}, the build can fail! (1.8.0)
-# Force CFLAGS in order to remove the custom ARCHFLAGS set for x86 and ppc
-# Since the pthread flags are added to CFLAGS and CXXFLAGS by configure, re-add
-%{__make} CFLAGS="%{optflags} -lpthread" CXXFLAGS="%{optflags} -lpthread"
+%{__make}
 
 
 %install
@@ -109,6 +107,9 @@
 
 
 %changelog
+* Tue Jan 16 2007 Matthias Saou <http://freshrpms.net/> 1.9.0-0.4
+- Disable forcing our optflags as they seem to work again "the simple way".
+
 * Thu Dec 28 2006 Dag Wieers <dag at wieers.com> - 1.9.0-0.3
 - Rebuild against SDL_gfx 2.0.15.