Commit ab99dcdf authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: fixed libvpx compilation on Mac OS X

parent 13acaa7e
# Darwin rules # Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \ .flac .speex .shout .faad .lame .twolame .ebml .matroska .vpx .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
......
# Darwin rules # Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \ .flac .speex .shout .faad .lame .twolame .ebml .matroska .vpx .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
......
...@@ -149,6 +149,7 @@ endif ...@@ -149,6 +149,7 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
X264CONF=--host=$(HOST) X264CONF=--host=$(HOST)
X264CONF += --enable-pic X264CONF += --enable-pic
FFMPEGCONF += --enable-libvpx
ifdef HAVE_DARWIN_32 ifdef HAVE_DARWIN_32
FFMPEGCONF += --cc=gcc-4.0 FFMPEGCONF += --cc=gcc-4.0
else else
...@@ -920,12 +921,27 @@ libvpx-$(VPX_VERSION).tar.bz2: ...@@ -920,12 +921,27 @@ libvpx-$(VPX_VERSION).tar.bz2:
vpx: libvpx-$(VPX_VERSION).tar.bz2 vpx: libvpx-$(VPX_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
patch -p0 < Patches/libvpx-cross.patch patch -p0 < Patches/libvpx-cross.patch
ifdef HAVE_DARWIN_OS
patch -p0 < Patches/libvpx-darwin.patch
endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
VPX_TARGET=x86-win32-gcc VPX_TARGET=x86-win32-gcc
else else
ifdef HAVE_DARWIN_OS
ifdef HAVE_DARWIN_64
VPX_TARGET=x86_64-darwin9-gcc
else
ifdef HAVE_DARWIN_OS_ON_INTEL
VPX_TARGET=x86-darwin9-gcc
else
VPX_TARGET=ppc32-darwin9-gcc
endif
endif
else
VPX_TARGET=FIXME VPX_TARGET=FIXME
endif endif
endif
.vpx: vpx .vpx: vpx
(cd $<; ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && XCC=$(CC) XNM=$(NM) XSTRIP=$(STRIP) make && make install) (cd $<; ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && XCC=$(CC) XNM=$(NM) XSTRIP=$(STRIP) make && make install)
......
--- vpx/configure 2010-05-18 17:58:33.000000000 +0200
+++ vpx_fixed/configure 2010-05-23 01:03:13.000000000 +0200
@@ -411,9 +411,7 @@
}
fi
check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
- check_ld <<EOF || die "Toolchain is unable to link executables"
-int main(void) {return 0;}
-EOF
+
# check system headers
check_header stdint.h
check_header pthread.h
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