[opencv] 12/17: Remove patches/fix_VFP_asm.patch, already applied to upstream

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to branch master
in repository opencv.

commit d40d4e0e6ab3112c9853f5251d56fc5c99205e24
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue Aug 29 12:35:41 2017 +0900

    Remove patches/fix_VFP_asm.patch, already applied to upstream
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/fix_VFP_asm.patch | 16 ----------------
 debian/patches/series            |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/fix_VFP_asm.patch b/debian/patches/fix_VFP_asm.patch
deleted file mode 100644
index 13e69ac..0000000
--- a/debian/patches/fix_VFP_asm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix compilation failure of this header in arm (where VFP is enabled)
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/opencv/opencv/pull/8976
-Applied-Upstream: https://github.com/opencv/opencv/commit/25020f267236ab8e715fabbbdea5b81e39a01120
-
---- a/modules/core/include/opencv2/core/fast_math.hpp
-+++ b/modules/core/include/opencv2/core/fast_math.hpp
-@@ -72,7 +72,7 @@
-         int res; \
-         float temp; \
-         (void)temp; \
--        asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
-+        __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
-         return res
-     // 2. version for double
-     #ifdef __clang__
diff --git a/debian/patches/series b/debian/patches/series
index d702194..dd22f72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ disable_opengl_test_build
 mathjax
 change_jquery.js_path
 disable_dnn.patch
-fix_VFP_asm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git