rpms/camstream/devel camstream-0.26.3-linkage.patch, 1.1, 1.2 camstream.spec, 1.14, 1.15

[Simon Perreault (nomis80)]

Author: nomis80

Update of /cvs/extras/rpms/camstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10439

Modified Files:
	camstream-0.26.3-linkage.patch camstream.spec 
Log Message:
Fixed linkage patch for i386.


camstream-0.26.3-linkage.patch:

Index: camstream-0.26.3-linkage.patch
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream-0.26.3-linkage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- camstream-0.26.3-linkage.patch	25 Dec 2006 18:20:06 -0000	1.1
+++ camstream-0.26.3-linkage.patch	25 Dec 2006 22:01:04 -0000	1.2
@@ -39,8 +39,18 @@
  	push %esi
 diff -urp camstream-0.26.3.old/camstream/video/video_asm.S camstream-0.26.3/camstream/video/video_asm.S
 --- camstream-0.26.3.old/camstream/video/video_asm.S	2000-08-06 16:10:57.000000000 -0400
-+++ camstream-0.26.3/camstream/video/video_asm.S	2006-12-24 14:02:58.000000000 -0500
-@@ -15,7 +15,7 @@ mm_128w:
++++ camstream-0.26.3/camstream/video/video_asm.S	2006-12-25 15:46:39.000000000 -0500
+@@ -3,6 +3,9 @@
+ 
+ #include "video_def.h"
+ 
++.globl  calc_diff128
++.globl  calc_intg128
++
+ 	.data
+ 
+ mm_0:
+@@ -15,7 +18,7 @@ mm_128w:
  
  	.text
  	
@@ -49,7 +59,7 @@
  	enter $0, $0
  	push %ebx
  	push %esi
-@@ -43,7 +43,7 @@ ENTRY(calc_diff128)
+@@ -43,7 +46,7 @@ ENTRY(calc_diff128)
  	ret
  	
  
@@ -58,7 +68,7 @@
  	enter $0, $0
  	push %ebx
  	push %esi
-@@ -87,7 +87,7 @@ ENTRY(calc_diff128_mmx)
+@@ -87,7 +90,7 @@ ENTRY(calc_diff128_mmx)
  	
  
  # calc_intg: perform Integrator step, that is, add a buffer to another
@@ -67,7 +77,7 @@
  	enter $0, $0
  	push %ebx
  	push %esi
-@@ -114,7 +114,7 @@ ENTRY(calc_intg128)
+@@ -114,7 +117,7 @@ ENTRY(calc_intg128)
  
  
  # Perform Integrator step with MMX instructions


Index: camstream.spec
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- camstream.spec	25 Dec 2006 18:20:06 -0000	1.14
+++ camstream.spec	25 Dec 2006 22:01:04 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           camstream
 Version:        0.26.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Set of programs to make use of your webcam
 
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Sun Dec 24 2006 Simon Perreault <nomis80 at nomis80.org> - 0.26.3-11
+- Fixed linkage patch for i386.
+
 * Sun Dec 24 2006 Simon Perreault <nomis80 at nomis80.org> - 0.26.3-10
 - Fixed dependency on kernel include <linux/linkage.h>.