From 488eb387cb834bbe6a4655b3dc43f740f7d0343f Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Sun, 12 Feb 2012 20:49:55 +0100
Subject: [PATCH] Use my new pvlc build in update-vlc.sh

---
 admin/win/update-vlc.sh | 71 +++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/admin/win/update-vlc.sh b/admin/win/update-vlc.sh
index e3035280d..685aa8c42 100644
--- a/admin/win/update-vlc.sh
+++ b/admin/win/update-vlc.sh
@@ -1,51 +1,52 @@
 #!/bin/bash
-mkdir -p vlc/
 
 if [ "$1" = "-c" ] ; then
 echo "Continuing last download.."
-rm -rvf vlc/prefix/
+rm -rvf vlc/
 else
-echo "Remove old vlc dir..."
-rm -rvf vlc/*
+echo "Update archive..."
 fi
 
-cd vlc/
+rm -rvf vlc/
+
 
 echo "Download phonon archive..."
-#wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
-#wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
-#wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
-wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
+# wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
+# wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
+# wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
+# wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
+wget -c http://download.tomahawk-player.org/test/pvlc.tar.bz2
 
 echo "Extract binary..."
-7z x phonon*.7z
-#mv -v vlc-*/ vlc/
-#unzip tomahawk-vlc-0.1.zip
+# 7z x phonon*.7z
+# mv -v vlc-*/ vlc/
+# unzip tomahawk-vlc-0.1.zip
+tar xvjf pvlc.tar.bz2
 
-echo "Download phonon_vlc_no_video.dll..."
-wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
-cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll
+# echo "Download phonon_vlc_no_video.dll..."
+# wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
+# cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll
 
-echo "Strip unneeded plugins from vlc/plugins..."
-cd prefix/bin/plugins
-rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
-    libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
-    *qt4* *skins2* libaccess_bd_plugin.dll \
-    libaudiobargraph_* libball_plugin.dll \
-    libdirac_plugin.dll \
-    libgnutls_plugin.dll \
-    libcaca_plugin.dll \
-    libfreetype_plugin.dll \
-    libaccess_output_shout_plugin.dll \
-    libremoteosd_plugin.dll \
-    libsdl_image_plugin.dll \
-    libvout_sdl_plugin.dll \
-    libpng_plugin.dll \
-    libgoom_plugin.dll \
-    libatmo_plugin.dll \
-    libmux_ts_plugin.dll \
-    libkate_plugin.dll \
-    libtaglib_plugin.dll
+# echo "Strip unneeded plugins from vlc/plugins..."
+# cd prefix/bin/plugins
+# rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
+#     libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
+#     *qt4* *skins2* libaccess_bd_plugin.dll \
+#     libaudiobargraph_* libball_plugin.dll \
+#     libdirac_plugin.dll \
+#     libgnutls_plugin.dll \
+#     libcaca_plugin.dll \
+#     libfreetype_plugin.dll \
+#     libaccess_output_shout_plugin.dll \
+#     libremoteosd_plugin.dll \
+#     libsdl_image_plugin.dll \
+#     libvout_sdl_plugin.dll \
+#     libpng_plugin.dll \
+#     libgoom_plugin.dll \
+#     libatmo_plugin.dll \
+#     libmux_ts_plugin.dll \
+#     libkate_plugin.dll \
+#     libtaglib_plugin.dll
 
 
 # this is for vlc-1.2