mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 00:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enable x264 patching and fix patch file.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2013-10-01 08:58:14 +02:00
parent 6c60ddbebc
commit ce17708a34
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
submodules/build/builders.d/x264.mk
View file

@ -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)

14
submodules/build/builders.d/x264.patch
View file

@ -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
.endfunc