[svn] r3154 - trunk/rpms/libmpeg3

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Apr 22 01:22:40 CEST 2005


Author: thias
Date: 2005-04-22 01:22:38 +0200 (Fri, 22 Apr 2005)
New Revision: 3154

Added:
   trunk/rpms/libmpeg3/libmpeg3-1.5.4-gcc4.patch
Modified:
   trunk/rpms/libmpeg3/libmpeg3.spec
Log:
Add gcc4 patch (home made, beware! ;-)).


Added: trunk/rpms/libmpeg3/libmpeg3-1.5.4-gcc4.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.5.4-gcc4.patch	2005-04-21 19:28:39 UTC (rev 3153)
+++ trunk/rpms/libmpeg3/libmpeg3-1.5.4-gcc4.patch	2005-04-21 23:22:38 UTC (rev 3154)
@@ -0,0 +1,17 @@
+diff -Naupr libmpeg3-1.5.4.orig/video/output.c libmpeg3-1.5.4/video/output.c
+--- libmpeg3-1.5.4.orig/video/output.c	2003-11-07 22:32:32.000000000 +0100
++++ libmpeg3-1.5.4/video/output.c	2005-04-22 01:16:21.000000000 +0200
+@@ -497,10 +497,11 @@ asm(
+ 	*data++ = 0;
+ 
+ #define STORE_PIXEL_RGB565 \
+-	*((unsigned short*)data)++ = \
++	*((unsigned short*)data) = \
+ 		((CLIP(r_l) & 0xf8) << 8) | \
+ 		((CLIP(g_l) & 0xfc) << 3) | \
+-		((CLIP(b_l) & 0xf8) >> 3);
++		((CLIP(b_l) & 0xf8) >> 3); \
++	*((unsigned short*)data) += 1;
+ 
+ #define STORE_PIXEL_RGB888 \
+ 	*data++ = CLIP(r_l); \

Modified: trunk/rpms/libmpeg3/libmpeg3.spec
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3.spec	2005-04-21 19:28:39 UTC (rev 3153)
+++ trunk/rpms/libmpeg3/libmpeg3.spec	2005-04-21 23:22:38 UTC (rev 3154)
@@ -5,11 +5,12 @@
 Summary: Decoder of various derivatives of MPEG standards
 Name: libmpeg3
 Version: 1.5.4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 URL: http://heroinewarrior.com/libmpeg3.php3
 Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
+Patch: libmpeg3-1.5.4-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: nasm
 Provides: %{name}-devel = %{version}-%{release}
@@ -28,6 +29,7 @@
 
 %prep
 %setup
+%patch -p1 -b .gcc4
 
 %build
 # With gcc 3.4 (FC3), build fails with -O2 and also with -fPIC :-(
@@ -67,6 +69,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4
+- Add gcc4 patch.
+
 * Thu Nov  4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3
 - Remove unneeded /usr/bin fix, since we don't use "make install".
 - Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4.




More information about the commits mailing list