From ce17708a34aed56628577059e14b44c01e130ea2 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 1 Oct 2013 08:58:14 +0200 Subject: [PATCH] Re-enable x264 patching and fix patch file. --- submodules/build/builders.d/x264.mk | 8 ++++---- submodules/build/builders.d/x264.patch | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index 1488b6960..e84bed136 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -39,10 +39,10 @@ endif x264-configure-option+= --extra-cflags="${XCFLAGS}" 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: mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir) diff --git a/submodules/build/builders.d/x264.patch b/submodules/build/builders.d/x264.patch index 74bd49a01..60ffc6701 100644 --- a/submodules/build/builders.d/x264.patch +++ b/submodules/build/builders.d/x264.patch @@ -1,15 +1,3 @@ -diff --git a/common/arm/asm.S b/common/arm/asm.S -index 8e70403..259bb92 100644 ---- a/common/arm/asm.S -+++ b/common/arm/asm.S -@@ -47,6 +47,7 @@ ELF .eabi_attribute 25, \val - .endm - - .macro function name -+ .align 2 - .global EXTERN_ASM\name - EXTERN_ASM\name: - ELF .hidden \name diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S index a459553..bc91505 100644 --- a/common/arm/cpu-a.S @@ -145,4 +133,4 @@ index e851562..c159f9e 100644 + sublt r0, ip, r0 movlt r0, #0 bx lr - .endfunc \ No newline at end of file + .endfunc