[SCM] vlc/master: Disable NEON on armel.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9744d5a26d51b4b9bdf4e4d36fc6879a3e87be30
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 30 17:35:08 2012 +0200

    Disable NEON on armel.
    
    NEON must be supported on all supported CPUs. Otherwise VLC will SIGILL on
    CPU without NEON support. NEON is not available on ARMv4.

diff --git a/debian/rules b/debian/rules
index bf8c1d9..0ee1c7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,7 +166,7 @@ removeplugins += 3dn mmx mmxext sse2
 endif
 
 # ARM specific optimizations
-ifneq ($(filter $(DEB_HOST_ARCH_CPU),armel armhf),)
+ifneq ($(filter $(DEB_HOST_ARCH_CPU),armhf),)
 confflags += --enable-neon
 else
 confflags += --disable-neon

-- 
VLC media player packaging