Contrib: support for vpx with HACKS

The library buildsystem is a MESS, and I am polite...
The patch is a bad workaround for the wait of a better solution.
Is google really that low a standard? Maybe they should recrute other people...

Only tested on Win32 so far

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ccbca85a812d8a8fde10fd2641fd0ac3ab854f3c..411e4355bc62c8d061d7c922f20c61a92720adf7 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -909,6 +909,36 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+
+# ***************************************************************************
+# libvp8
+# ***************************************************************************
+
+libvpx-$(VPX_VERSION).tar.bz2:
+       $(WGET) $(VPX_URL)
+
+vpx: libvpx-$(VPX_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+ifneq ($(HOST),$(BUILD))
+       patch -p0 < Patches/libvpx-cross.patch
+endif
+
+ifdef HAVE_WIN32
+VPX_TARGET=x86-win32-gcc
+else
+VPX_TARGET=FIXME
+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)
+       (cd $<; cp vp8/*.h vpx_codec/*.h $(PREFIX)/include) # Of course, why the hell would one expect it to be listed or in make install?
+       (cd $<; cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
+       touch $@
+
+CLEAN_FILE += .vpx
+CLEAN_PKG += vpx
+DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
+
 # ***************************************************************************
 # lame
 # ***************************************************************************

diff --git a/extras/contrib/src/Patches/libvpx-cross.patch b/extras/contrib/src/Patches/libvpx-cross.patch
new file mode 100644 (file)
index 0000000..08d63b5
--- /dev/null
+++ b/extras/contrib/src/Patches/libvpx-cross.patch
@@ -0,0 +1,13 @@
+--- vpx/build/make/Makefile    2010-05-18 17:58:33.000000000 +0200
++++ vpx.new/build/make/Makefile        2010-05-20 00:06:42.000000000 +0200
+@@ -77,6 +77,10 @@
+ TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN)))
+ quiet:=$(if $(verbose),,yes)
+ qexec=$(if $(quiet),@)
++ 
++CC=$(XCC)
++STRIP=$(XSTRIP)
++NM=$(XNM)
+ 
+ # Cancel built-in implicit rules
+ %: %.o

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e881164c54196a34525695fd4765763ac97dbd1d..7c0789aa72ed5ccc97610a0c2515338dc2ed4bdc 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -242,3 +242,5 @@ PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
 SQLITE_VERSION=3.6.20
 SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h
+VPX_VERSION=0.9.0
+VPX_URL=http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2