Commit 6723f08a authored by Felix Paul Kühne's avatar Felix Paul Kühne

* upgraded x264 to the latest revision (701) with a minor patch for Darwin to...

* upgraded x264 to the latest revision (701) with a minor patch for Darwin to include recent speed improvements
parent 223ae3b0
...@@ -743,7 +743,8 @@ flac-$(FLAC_VERSION).tar.gz: ...@@ -743,7 +743,8 @@ flac-$(FLAC_VERSION).tar.gz:
flac: flac-$(FLAC_VERSION).tar.gz flac: flac-$(FLAC_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/flac-mactel.patch (patch -p 0 < Patches/flac-mactel.patch && cd $@ && autoconf)
(patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
endif endif
ifneq ($(HOST),$(BUILD)) ifneq ($(HOST),$(BUILD))
(patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf) (patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
...@@ -755,7 +756,7 @@ ifdef HAVE_WIN32 ...@@ -755,7 +756,7 @@ ifdef HAVE_WIN32
else else
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
ifdef HAVE_DARWIN_OS_ON_INTEL ifdef HAVE_DARWIN_OS_ON_INTEL
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations --disable-oggtest && sed -e 's%-Wl,-syslibroot,%-syslibroot %' -i.orig src/libFLAC/Makefile && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && sed -e 's%-Wl,-syslibroot,%-syslibroot %' -i.orig src/libFLAC/Makefile && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install)
else else
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install)
endif endif
...@@ -1201,9 +1202,12 @@ CLEAN_PKG += libdca ...@@ -1201,9 +1202,12 @@ CLEAN_PKG += libdca
ifdef SVN ifdef SVN
x264: x264:
$(SVN) co svn://svn.videolan.org/x264/trunk/ -r 604 x264 $(SVN) co svn://svn.videolan.org/x264/trunk/ -r 701 x264
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch ) (cd $@; patch -p 0 < ../Patches/x264-svn-win32.patch )
endif
ifdef HAVE_DARWIN_OS
(cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
endif endif
else else
x264-$(X264_VERSION).tar.gz: x264-$(X264_VERSION).tar.gz:
......
Index: configure
===================================================================
--- configure (revision 701)
+++ configure (working copy)
@@ -396,7 +396,7 @@
CFLAGS="$CFLAGS -fPIC"
ASFLAGS="$ASFLAGS -D__PIC__"
# resolve textrels in the x86 asm
- LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+ LDFLAGS="$LDFLAGS -Wl"
fi
if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
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