[SCM] vlc/master: Fix noopt handling

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 73c24f7f4b87cbb26352022541e7bbc4afc3e1fb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Apr 4 21:05:03 2016 +0200

    Fix noopt handling

diff --git a/debian/rules b/debian/rules
index 1e2126b..eb2e3d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,6 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 confflags += --enable-debug
 endif
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-confflags += \
-	--disable-optimizations \
-	--disable-mmx \
-	--disable-sse \
-	--disable-altivec \
-	$(NULL)
-endif
-
 # configure flags
 confflags += \
 	--config-cache \
@@ -201,6 +192,15 @@ confflags += --disable-crystalhd
 removeplugins += libcrystalhd
 endif
 
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+confflags += \
+	--disable-optimizations \
+	--disable-mmx \
+	--disable-sse \
+	--disable-altivec \
+	$(NULL)
+removeplugins += mmx sse2 altivec neon
+else
 # amd64 and i386 specific optimizations
 ifeq (,$(filter-out amd64 i386,$(DEB_HOST_ARCH_CPU)))
 confflags += --enable-mmx --enable-sse
@@ -230,6 +230,7 @@ ifeq (,$(filter-out powerpcspe,$(DEB_HOST_ARCH)))
 DEB_CFLAGS_MAINT_APPEND += -mtune=8548
 DEB_CXXFLAGS_MAINT_APPEND += -mtune=8548
 endif
+endif
 
 export DEB_CFLAGS_MAINT_APPEND
 export DEB_CXXFLAGS_MAINT_APPEND

-- 
VLC media player packaging