From 4aa170c387cb20dd7ea7ca59bc32b145464f1b8a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 20 Dec 2012 08:45:16 +0100
Subject: [PATCH] Fix x264 build.

---
 submodules/build/builders.d/x264.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk
index fbe943686..e821edce6 100644
--- a/submodules/build/builders.d/x264.mk
+++ b/submodules/build/builders.d/x264.mk
@@ -43,12 +43,12 @@ ifneq (,$(findstring armv7,$(host)))
 endif
 
 x264_dir?=externals/x264
-$(BUILDER_SRC_DIR)/$(x264_dir)/patched :
-	cd $(BUILDER_SRC_DIR)/$(x264_dir) \
-	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
-	&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
+#$(BUILDER_SRC_DIR)/$(x264_dir)/patched :
+#	cd $(BUILDER_SRC_DIR)/$(x264_dir) \
+#	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
+#	&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
 
-$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched
+$(BUILDER_BUILD_DIR)/$(x264_dir)/configure:
 	mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir)
 	cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
 	&& rsync -av --exclude ".git"  $(BUILDER_SRC_DIR)/$(x264_dir)/* . 
@@ -66,6 +66,9 @@ clean-x264:
 
 veryclean-x264:
 	-cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean
+	cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
+	&& git checkout common/arm/asm.S \
+	&& rm -f patched
 	rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir)
 
 clean-makefile-x264: