Commit c0125ee7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

* remove the patch and try a hacky, but supposed to be working fix by LordRPI

parent 52e7774e
......@@ -124,6 +124,7 @@ endif
ifeq ($(HOST),i686-apple-darwin8)
FFMPEGCONF += --enable-memalign-hack
X264CONF += --extra-ldflags=-read_only_relocs suppress
endif
ifdef HAVE_DARWIN_OS
......@@ -1191,9 +1192,6 @@ x264:
ifdef HAVE_WIN32
(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
endif
ifeq ($(HOST),i686-apple-darwin8)
(cd x264; patch -p 0 < ../Patches/x264-svn-darwin_intel.patch )
endif
else
x264-$(X264_VERSION).tar.gz:
$(WGET) $(X264_URL)
......
Index: common/i386/i386inc.asm
===================================================================
--- common/i386/i386inc.asm (revision 564)
+++ common/i386/i386inc.asm (working copy)
@@ -41,7 +41,7 @@
; section instead until NASM is fixed.
%macro SECTION_RODATA 0
%ifidn __OUTPUT_FORMAT__,macho
- SECTION .text
+ SECTION .text align=16
fakegot:
%else
SECTION .rodata data align=16
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment