[arch-commits] Commit in lensfun/trunk (2 files)

[Tobias Powalowski]

    Date: Thursday, June 28, 2012 @ 06:32:50
  Author: tpowa
Revision: 162691

upgpkg: lensfun 0.2.6-1

bump to latest version

Modified:
  lensfun/trunk/PKGBUILD
Deleted:
  lensfun/trunk/runtime.cpu.detection.fix.backport.patch

------------------------------------------+
 PKGBUILD                                 |   12 +----
 runtime.cpu.detection.fix.backport.patch |   68 -----------------------------
 2 files changed, 4 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-28 07:30:01 UTC (rev 162690)
+++ PKGBUILD	2012-06-28 10:32:50 UTC (rev 162691)
@@ -2,21 +2,19 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=lensfun
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
 url="http://lensfun.berlios.de/"
 license=('LGPL3')
 depends=('glibc' 'glib2')
 makedepends=('python2' 'libpng' 'doxygen')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "runtime.cpu.detection.fix.backport.patch")
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
-    patch -p0 -i "${srcdir}/runtime.cpu.detection.fix.backport.patch"
     ./configure \
         --prefix=/usr \
         --libdir=/usr/lib
@@ -27,6 +25,4 @@
     cd "${srcdir}/${pkgname}-${pkgver}"
     make INSTALL_PREFIX="$pkgdir" install
 }
-
-md5sums=('a10438dffae68a5988fc54b0393a3755'
-         'a2033928f263db319de78182ab12fb7d')
+md5sums=('740e4749db04da0a597630dd6339b966')

Deleted: runtime.cpu.detection.fix.backport.patch
===================================================================
--- runtime.cpu.detection.fix.backport.patch	2012-06-28 07:30:01 UTC (rev 162690)
+++ runtime.cpu.detection.fix.backport.patch	2012-06-28 10:32:50 UTC (rev 162691)
@@ -1,68 +0,0 @@
---- libs/lensfun/cpuid.cpp.bak	2011-07-07 00:13:34.227910367 -0400
-+++ libs/lensfun/cpuid.cpp	2011-07-07 03:27:39.676452438 -0400
-@@ -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__ */