[vlc-commits] commit: contribs: fixed libvpx compilation on Mac OS X ( Felix Paul Kühne )

[git at videolan.org]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun May 23 01:08:02 2010 +0200| [ab99dcdf9e787d31b9bd4ff70b09d82f43060188] | committer: Felix Paul Kühne 

contribs: fixed libvpx compilation on Mac OS X

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab99dcdf9e787d31b9bd4ff70b09d82f43060188
---

 extras/contrib/src/Distributions/darwin.mak    |    2 +-
 extras/contrib/src/Distributions/darwin64.mak  |    2 +-
 extras/contrib/src/Makefile                    |   16 ++++++++++++++++
 extras/contrib/src/Patches/libvpx-darwin.patch |   13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 2e6c15e..1962d64 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,7 +1,7 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
     .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 \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index becfd45..121442c 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,7 +1,7 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
     .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 \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8243ff5..0dfb347 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -149,6 +149,7 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
+FFMPEGCONF += --enable-libvpx
 ifdef HAVE_DARWIN_32
 FFMPEGCONF += --cc=gcc-4.0
 else
@@ -920,12 +921,27 @@ libvpx-$(VPX_VERSION).tar.bz2:
 vpx: libvpx-$(VPX_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/libvpx-cross.patch
+ifdef HAVE_DARWIN_OS
+	patch -p0 < Patches/libvpx-darwin.patch
+endif
 
 ifdef HAVE_WIN32
 VPX_TARGET=x86-win32-gcc
 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
 endif
+endif
 
 .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)
diff --git a/extras/contrib/src/Patches/libvpx-darwin.patch b/extras/contrib/src/Patches/libvpx-darwin.patch
new file mode 100644
index 0000000..f1970cb
--- /dev/null
+++ b/extras/contrib/src/Patches/libvpx-darwin.patch
@@ -0,0 +1,13 @@
+--- 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