diff -Nru x264-0.123.2189+git35cf912/debian/changelog x264-0.123.2189+git35cf912/debian/changelog
--- x264-0.123.2189+git35cf912/debian/changelog	2012-05-02 21:26:15.000000000 +0100
+++ x264-0.123.2189+git35cf912/debian/changelog	2012-05-15 19:07:38.000000000 +0100
@@ -1,3 +1,9 @@
+x264 (2:0.123.2189+git35cf912-1+rpi1) unstable; urgency=low
+
+  * Disable build of neon variant
+
+ -- Peter Michael Green <plugwash@p10link.net>  Tue, 15 May 2012 18:06:50 +0000
+
 x264 (2:0.123.2189+git35cf912-1) unstable; urgency=low
 
   * Update to new upstream snapshot
diff -Nru x264-0.123.2189+git35cf912/debian/confflags x264-0.123.2189+git35cf912/debian/confflags
--- x264-0.123.2189+git35cf912/debian/confflags	2012-05-02 21:24:34.000000000 +0100
+++ x264-0.123.2189+git35cf912/debian/confflags	2012-05-15 19:39:30.000000000 +0100
@@ -124,18 +124,23 @@
 ifeq (arm,$(DEB_HOST_GNU_CPU))
 armv6t2_asm := movt r0, \#0
 has_armv6t2 := $(call check_asm, $(armv6t2_asm))
-ifeq ($(has_armv6t2),1)
+#ifeq ($(has_armv6t2),1)
 # extract the actual -march= the toolchain targets
 toolchain_arch := $(shell $(CC) -v 2>&1 | sed -n '/^Configured with: / s/.* --with-arch=\([^ ]*\).*/\1/p')
 ifeq ($(toolchain_arch),)
-toolchain_arch := armv6t2
+toolchain_arch := armv6
 endif
 shared_extra_cflags += -march=$(toolchain_arch)
-else
-do_opt := yes
-opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
-endif
+static_extra_cflags += -march=$(toolchain_arch)
+static_confflags += --disable-asm
+
+do_opt := no
+#else
+#do_opt := yes
+#opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
+#shared_confflags += --disable-asm
+#endif
 endif
 
 # S390 upstream arch, s390 and s390x Debian arches; no upstream flags by