rpms/camstream/devel camstream-0.26.3-linkage.patch, NONE, 1.1 camstream-0.26.3-x86_64-asm.patch, 1.3, 1.4 camstream.spec, 1.13, 1.14
Simon Perreault (nomis80)
fedora-extras-commits at redhat.com
Mon Dec 25 18:20:36 UTC 2006
Author: nomis80
Update of /cvs/extras/rpms/camstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv520
Modified Files:
camstream-0.26.3-x86_64-asm.patch camstream.spec
Added Files:
camstream-0.26.3-linkage.patch
Log Message:
Fixed dependency on kernel include <linux/linkage.h>. (from upstream)
camstream-0.26.3-linkage.patch:
--- NEW FILE camstream-0.26.3-linkage.patch ---
diff -urp camstream-0.26.3.old/camstream/video/video_asm_add.S camstream-0.26.3/camstream/video/video_asm_add.S
--- camstream-0.26.3.old/camstream/video/video_asm_add.S 2000-08-06 16:10:57.000000000 -0400
+++ camstream-0.26.3/camstream/video/video_asm_add.S 2006-12-24 14:03:24.000000000 -0500
@@ -2,7 +2,7 @@
#include "video_def.h"
-ENTRY(calc_add)
+calc_add:
enter $0, $0
push %ebx
push %esi
@@ -23,7 +23,7 @@ ENTRY(calc_add)
leave
ret
-ENTRY(calc_add_mmx)
+calc_add_mmx:
enter $0, $0
push %ebx
push %esi
@@ -50,7 +50,7 @@ ENTRY(calc_add_mmx)
ret
-ENTRY(calc_add_mmxs)
+calc_add_mmxs:
enter $0, $0
push %ebx
push %esi
@@ -76,7 +76,7 @@ ENTRY(calc_add_mmxs)
leave
ret
-ENTRY(calc_add128_mmx)
+calc_add128_mmx:
enter $0, $0
push %ebx
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:
.text
-ENTRY(calc_diff128)
+calc_diff128:
enter $0, $0
push %ebx
push %esi
@@ -43,7 +43,7 @@ ENTRY(calc_diff128)
ret
-ENTRY(calc_diff128_mmx)
+calc_diff128_mmx:
enter $0, $0
push %ebx
push %esi
@@ -87,7 +87,7 @@ ENTRY(calc_diff128_mmx)
# calc_intg: perform Integrator step, that is, add a buffer to another
-ENTRY(calc_intg128)
+calc_intg128:
enter $0, $0
push %ebx
push %esi
@@ -114,7 +114,7 @@ ENTRY(calc_intg128)
# Perform Integrator step with MMX instructions
-ENTRY(calc_intg128_smx)
+calc_intg128_smx:
enter $0, $0
push %ebx
push %esi
diff -urp camstream-0.26.3.old/camstream/video/video_def.h camstream-0.26.3/camstream/video/video_def.h
--- camstream-0.26.3.old/camstream/video/video_def.h 2000-08-06 16:10:57.000000000 -0400
+++ camstream-0.26.3/camstream/video/video_def.h 2006-12-24 14:02:34.000000000 -0500
@@ -1,6 +1,3 @@
-#define __ASSEMBLY__
-#include <linux/linkage.h>
-
#define Number 8(%ebp)
#define Dst 12(%ebp)
#define Src1 16(%ebp)
camstream-0.26.3-x86_64-asm.patch:
Index: camstream-0.26.3-x86_64-asm.patch
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream-0.26.3-x86_64-asm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- camstream-0.26.3-x86_64-asm.patch 24 Dec 2006 18:19:23 -0000 1.3
+++ camstream-0.26.3-x86_64-asm.patch 25 Dec 2006 18:20:06 -0000 1.4
@@ -4,7 +4,7 @@
+++ ./camstream/video/video_asm.S 2004-04-17 18:23:37.614457752 +0100
@@ -17,52 +17,52 @@
- ENTRY(calc_diff128)
+ calc_diff128:
enter $0, $0
- push %ebx
- push %esi
@@ -45,7 +45,7 @@
ret
- ENTRY(calc_diff128_mmx)
+ calc_diff128_mmx:
enter $0, $0
- push %ebx
- push %esi
@@ -106,7 +106,7 @@
@@ -89,24 +89,24 @@
# calc_intg: perform Integrator step, that is, add a buffer to another
- ENTRY(calc_intg128)
+ calc_intg128:
enter $0, $0
- push %ebx
- push %esi
@@ -143,7 +143,7 @@
@@ -116,36 +116,36 @@
# Perform Integrator step with MMX instructions
- ENTRY(calc_intg128_smx)
+ calc_intg128_smx:
enter $0, $0
- push %ebx
- push %esi
@@ -198,7 +198,7 @@
+++ ./camstream/video/video_asm_add.S 2004-04-17 18:23:54.272925280 +0100
@@ -4,102 +4,102 @@
- ENTRY(calc_add)
+ calc_add:
enter $0, $0
- push %ebx
- push %esi
@@ -231,7 +231,7 @@
leave
ret
- ENTRY(calc_add_mmx)
+ calc_add_mmx:
enter $0, $0
- push %ebx
- push %esi
@@ -274,7 +274,7 @@
ret
- ENTRY(calc_add_mmxs)
+ calc_add_mmxs:
enter $0, $0
- push %ebx
- push %esi
@@ -316,7 +316,7 @@
leave
ret
- ENTRY(calc_add128_mmx)
+ calc_add128_mmx:
enter $0, $0
- push %ebx
- push %esi
@@ -361,10 +361,7 @@
ret
--- ./camstream/video/video_def.h.old 2004-04-17 18:22:25.357442488 +0100
+++ ./camstream/video/video_def.h 2004-04-17 18:24:14.037920544 +0100
-@@ -1,8 +1,8 @@
- #define __ASSEMBLY__
- #include <linux/linkage.h>
-
+@@ -1,5 +1,5 @@
-#define Number 8(%ebp)
-#define Dst 12(%ebp)
-#define Src1 16(%ebp)
Index: camstream.spec
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- camstream.spec 24 Dec 2006 18:19:23 -0000 1.13
+++ camstream.spec 25 Dec 2006 18:20:06 -0000 1.14
@@ -1,6 +1,6 @@
Name: camstream
Version: 0.26.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Set of programs to make use of your webcam
@@ -8,10 +8,11 @@
License: GPL
URL: http://www.smcc.demon.nl/camstream/
Source0: http://www.smcc.demon.nl/camstream/download/camstream-0.26.3.tar.gz
-Source1: %{name}.desktop
-Source2: %{name}.png
-Patch0: %{name}-makefiles.patch
-Patch1: %{name}-%{version}-x86_64-asm.patch
+Source1: camstream.desktop
+Source2: camstream.png
+Patch0: camstream-makefiles.patch
+Patch1: camstream-0.26.3-linkage.patch
+Patch2: camstream-0.26.3-x86_64-asm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel, autoconf, desktop-file-utils
@@ -27,8 +28,9 @@
%prep
%setup -q
%patch0 -p1
-%ifarch x86_64
%patch1 -p1
+%ifarch x86_64
+%patch2 -p1
%endif
@@ -89,6 +91,9 @@
%changelog
+* Sun Dec 24 2006 Simon Perreault <nomis80 at nomis80.org> - 0.26.3-10
+- Fixed dependency on kernel include <linux/linkage.h>.
+
* Sat Mar 11 2006 Simon Perreault <nomis80 at nomis80.org> - 0.26.3-9
- Taking ownership of package.
- Fixed build dependencies (#178654).
More information about the scm-commits
mailing list