[vlfeat] 01/02: patch import

[Dima Kogan]

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

dkogan-guest pushed a commit to annotated tag debian/0.9.17+dfsg0-4
in repository vlfeat.

commit 3fb62901056afdca3c1425872028ed05460c335e
Author: Dima Kogan <dima at secretsauce.net>
Date:   Mon Dec 23 13:34:55 2013 -0800

    patch import
---
 ...SE2-and-AVX-to-work-on-Debian-s-wide-arra.patch | 23 +++++++++++++++++
 ...-try-to-generate-x86-specific-code-on-non.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 55 insertions(+)

diff --git a/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
new file mode 100644
index 0000000..3ba19b9
--- /dev/null
+++ b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
@@ -0,0 +1,23 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Mon, 23 Dec 2013 13:34:04 -0800
+Subject: I disable SSE2 and AVX to work on Debian's wide array of arches
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d6b20fd..ad0158f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -90,8 +90,8 @@ SHELL = /bin/bash
+ all:
+ 
+ # Select which features to disable
+-# DISABLE_SSE2=yes
+-# DISABLE_AVX=yes
++DISABLE_SSE2=yes
++DISABLE_AVX=yes
+ # DISABLE_THREADS=yes
+ # DISABLE_OPENMP=yes
+ 
diff --git a/debian/patches/0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch b/debian/patches/0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch
new file mode 100644
index 0000000..a0f7170
--- /dev/null
+++ b/debian/patches/0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch
@@ -0,0 +1,30 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Mon, 23 Dec 2013 13:34:33 -0800
+Subject: I no longer try to generate x86-specific code on non-x86 boxes
+
+---
+ vl/host.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/vl/host.c b/vl/host.c
+index ef97cdc..a9654f0 100644
+--- a/vl/host.c
++++ b/vl/host.c
+@@ -441,6 +441,8 @@ _vl_cpuid (vl_int32* info, int function)
+ 
+ #endif
+ 
++#if defined(VL_ARCH_IX86) || defined(VL_ARCH_X64) || defined(VL_ARCH_IA64)
++
+ void
+ _vl_x86cpu_info_init (VlX86CpuInfo *self)
+ {
+@@ -488,6 +490,8 @@ _vl_x86cpu_info_to_string_copy (VlX86CpuInfo const *self)
+   return string ;
+ }
+ 
++#endif
++
+ /** ------------------------------------------------------------------
+  ** @brief Human readable static library configuration
+  ** @return a new string with the static configuration.
diff --git a/debian/patches/series b/debian/patches/series
index 371dae5..1d4847e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
 0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
 0007-removed-architecture-detection-logic.patch
 0008-Removed-google-adsense-and-google-analytics-from-the.patch
+0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
+0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch

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