cleanup: remove leftover libvpx bits

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32450 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

5 files changed, 2 insertions, 66 deletions

diff --git a/.gitignore b/.gitignore
index d8ad4af90d..121f3b5e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -439,9 +439,6 @@ config.log
 # /xbmc/cores/dvdplayer/Codecs
 /xbmc/cores/dvdplayer/Codecs/Makefile
 
-# /xbmc/cores/dvdplayer/Codecs/libvpx/
-/xbmc/cores/dvdplayer/Codecs/libvpx/
-
 # /xbmc/cores/dvdplayer/Codecs/ffmpeg/
 /xbmc/cores/dvdplayer/Codecs/ffmpeg/config.h
 /xbmc/cores/dvdplayer/Codecs/ffmpeg/config.err
diff --git a/lib/libvpx/Makefile b/lib/libvpx/Makefile
deleted file mode 100644
index 0f6ffd4746..0000000000
--- a/lib/libvpx/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  libvpx build script.
-#
-#  A quick and dirty Makefile to download and build libvpx
-#
-#  Darwin: libvpx is built as an static lib for linkage with FFmpeg.
-#  x86-darwin8-gcc is targeted so we can run on the AppleTV.
-#  prefix is /opt/local so XBMC's build system will pick it up.
-#  
-#  Usage:
-#    make
-
-LIBVPX_VERS= 0.9.1
-LIBVPX_SRC = libvpx-$(LIBVPX_VERS)
-LIBVPX_LIB = $(LIBVPX_SRC)/libvpx.a
-
-# get OS type from shell
-OSTYPE	= $(shell uname)
-ifeq ($(OSTYPE),Darwin)
-PREFIX = --prefix=/opt/local
-TARGET = --target=x86-darwin8-gcc
-DOWNLOAD_SRC = curl --output $(LIBVPX_SRC).tar.bz2 http://webm.googlecode.com/files/$(LIBVPX_SRC).tar.bz2
-else
-DOWNLOAD_SRC = wget http://webm.googlecode.com/files/$(LIBVPX_SRC).tar.bz2
-endif
-
-all:: $(LIBVPX_LIB)
-
-$(LIBVPX_LIB): $(LIBVPX_SRC)/Makefile
-	make -C $(LIBVPX_SRC)
-
-$(LIBVPX_SRC)/Makefile:
-	$(DOWNLOAD_SRC)
-	tar -xjf $(LIBVPX_SRC).tar.bz2
-	cd $(LIBVPX_SRC); ./configure $(PREFIX) $(TARGET) --disable-examples --enable-vp8
-
-install:
-	make -C $(LIBVPX_SRC) install
-clean:
-	make -C $(LIBVPX_SRC) clean
-
-distclean::
-	rm $(LIBVPX_SRC).tar.bz2
-	rm -rf $(LIBVPX_SRC)
diff --git a/tools/Linux/packaging/debian/xbmc-get-orig-source b/tools/Linux/packaging/debian/xbmc-get-orig-source
index dc1dd53b0c..22f1a2148c 100755
--- a/tools/Linux/packaging/debian/xbmc-get-orig-source
+++ b/tools/Linux/packaging/debian/xbmc-get-orig-source
@@ -94,7 +94,6 @@ prepare_orig_tarball() {
         rm -rf xbmc-$XBMC_VERSION/lib/librtmp
         rm -rf xbmc-$XBMC_VERSION/lib/libSDL-OSX
         rm -rf xbmc-$XBMC_VERSION/lib/libssh_win32
-        rm -rf xbmc-$XBMC_VERSION/lib/libvpx
         rm -rf xbmc-$XBMC_VERSION/lib/pcre
         rm -rf xbmc-$XBMC_VERSION/libmicrohttpd_win32
         rm -rf xbmc-$XBMC_VERSION/libmysql_win32
diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
index b0af83763e..90a1612eca 100644
--- a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
+++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
@@ -29,7 +29,7 @@ OPTIONS="
 --enable-encoder=ac3 \
 --enable-encoder=aac"
 
-./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2 -I../libvpx/" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
+./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
  
 make -j3 && 
 mkdir .libs &&
diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0030-add-build-scripts.patch b/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0030-add-build-scripts.patch
index 462f566c36..a00b0c2090 100644
--- a/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0030-add-build-scripts.patch
+++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0030-add-build-scripts.patch
@@ -78,23 +78,7 @@ index 0000000..8efebcc
 +--enable-encoder=ac3 \
 +--enable-encoder=aac"
 +
-+if [ -d ../libvpx ]
-+then
-+echo Building libvpx ...
-+echo
-+cd ../libvpx
-+./configure --disable-examples --enable-vp8 --target=x86-win32-gcc && make
-+cd ../ffmpeg
-+fi
-+
-+if [ -f ../libvpx/libvpx.a ] 
-+then
-+echo Building ffmpeg with libvpx ...
-+echo
-+OPTIONS="$OPTIONS --enable-libvpx"
-+fi
-+
-+./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2 -I../libvpx/" --extra-ldflags="-L../../../../../system/players/dvdplayer -L../libvpx" ${OPTIONS} &&
++./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
 + 
 +make -j3 && 
 +mkdir .libs &&