packages: lensfun/lensfun.spec, lensfun/lensfun-vectorize.patch (NEW) - fix...

[draenog]

Author: draenog                      Date: Sun Sep  5 09:18:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes #2983139 in ufraw

---- Files affected:
packages/lensfun:
   lensfun.spec (1.5 -> 1.6) , lensfun-vectorize.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lensfun/lensfun.spec
diff -u packages/lensfun/lensfun.spec:1.5 packages/lensfun/lensfun.spec:1.6
--- packages/lensfun/lensfun.spec:1.5	Tue Jun 29 16:28:12 2010
+++ packages/lensfun/lensfun.spec	Sun Sep  5 11:18:35 2010
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Baza danych obiektywów z funkcją korekcji zdjęć
 Name:		lensfun
 Version:	0.2.5
-Release:	1
+Release:	2
 License:	LGPLv3 and CC-BY-SA
 Group:		Libraries
 Source0:	http://download.berlios.de/lensfun/%{name}-%{version}.tar.bz2
 # Source0-md5:	a10438dffae68a5988fc54b0393a3755
 URL:		http://developer.berlios.de/projects/lensfun/
 Patch0:		%{name}-build.patch
+Patch1:		%{name}-vectorize.patch
 BuildRequires:	doxygen >= 1.5.0
 BuildRequires:	glib2-devel >= 2.0.0
 BuildRequires:	libpng >= 1.0
@@ -57,6 +58,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 # configure is a python application which tries to mimic autoconf
@@ -117,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/09/05 09:18:35  draenog
+- fixes #2983139 in ufraw
+
 Revision 1.5  2010/06/29 14:28:12  draenog
 - package api manual
 - rel. 1

================================================================
Index: packages/lensfun/lensfun-vectorize.patch
diff -u /dev/null packages/lensfun/lensfun-vectorize.patch:1.1
--- /dev/null	Sun Sep  5 11:18:40 2010
+++ packages/lensfun/lensfun-vectorize.patch	Sun Sep  5 11:18:35 2010
@@ -0,0 +1,80 @@
+Index: configure
+===================================================================
+--- configure	(revision 107)
++++ configure	(revision 110)
+@@ -118,4 +118,5 @@
+ print "Target directory for libraries:     " + tibs.LIBDIR
+ print "Target directory for include files: " + tibs.INCLUDEDIR
+ print "Target directory for documentation: " + tibs.DOCDIR
++print "Use vector instruction set(-s):     " + ", ".join (x for x in tibs.VECTORIZATION)
+ print "--------------------------------------------------------------------"
+Index: libs/lensfun/cpuid.cpp
+===================================================================
+--- libs/lensfun/cpuid.cpp	(revision 107)
++++ libs/lensfun/cpuid.cpp	(revision 110)
+@@ -25,17 +25,14 @@
+ guint _lf_detect_cpu_features ()
+ {
+ #define cpuid(cmd) \
+-    asm ( \
++    __asm volatile ( \
+         "push %%"R_BX"\n" \
+         "cpuid\n" \
+         "pop %%"R_BX"\n" \
+        : "=a" (ax), "=c" (cx),  "=d" (dx) \
+        : "0" (cmd))
+ 
+-    register __SIZE_TYPE__ ax asm (R_AX);
+-    register __SIZE_TYPE__ bx asm (R_BX);
+-    register __SIZE_TYPE__ dx asm (R_DX);
+-    register __SIZE_TYPE__ cx asm (R_CX);
++    __SIZE_TYPE__ ax, cx, dx, tmp;
+     static GStaticMutex lock = G_STATIC_MUTEX_INIT;
+     static guint cpuflags = -1;
+ 
+@@ -45,7 +42,7 @@
+         cpuflags = 0;
+ 
+         /* Test cpuid presence by checking bit 21 of eflags */
+-        asm (
++        __asm volatile (
+             "pushf\n"
+             "pop     %0\n"
+             "mov     %0, %1\n"
+@@ -57,7 +54,7 @@
+             "cmp     %0, %1\n"
+             "setne   %%al\n"
+             "movzb   %%al, %0\n"
+-            : "=r" (ax), "=r" (bx));
++            : "=r" (ax), "=r" (tmp));
+ 
+         if (ax)
+         {
+@@ -88,12 +85,12 @@
+                     cpuflags |= LF_CPU_FLAG_SSE4_2;
+             }
+ 
+-            /* Is there extensions */
++            /* Are there extensions? */
+             cpuid (0x80000000);
+ 
+             if (ax)
+             {
+-                /* Request for extensions */
++                /* Ask extensions */
+                 cpuid (0x80000001);
+ 
+                 if (dx & 0x80000000)
+@@ -112,12 +109,4 @@
+ #undef cpuid
+ }
+ 
+-#else
+-
+-guint
+-rs_detect_cpu_features()
+-{
+-    return 0;
+-}
+-
+ #endif /* __i386__ || __x86_64__ */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lensfun/lensfun.spec?r1=1.5&r2=1.6&f=u