Permalink
Browse files

Fix windows deployment to use local vlc plugins again

  • Loading branch information...
dschmidt committed Jul 23, 2011
1 parent a9e3b71 commit 34c618ed945b1fd09564c1a03d7217b7e3bddce0
Showing with 15 additions and 3 deletions.
  1. +7 −1 CMakeModules/NSIS.template.in
  2. +4 −0 CPackOptions.cmake.in
  3. +4 −2 admin/win/update-vlc.sh
@@ -21,10 +21,16 @@
!define MING_BIN "${MING_PATH}/bin"
!define MING_LIB "${MING_PATH}/lib"
!define BUILD_PATH "@CMAKE_BINARY_DIR@"
+!define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
!define QT_DLL_PATH "${MING_BIN}"
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
+
+; We use official release plugins
+; mingw32-vlc from obs misses a lot and has even broken ones probably
+!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc" ; SIC! ^
+!define VLC_PLUGIN_PATH "${VLC_PATH}\plugins"
+
!define NSI_PATH "@CMAKE_SOURCE_DIR@/admin/win/nsi"
;-----------------------------------------------------------------------------
View
@@ -3,6 +3,10 @@
# in this file.
if(CPACK_GENERATOR MATCHES "NSIS")
+ if( NOT EXISTS "@CMAKE_SOURCE_DIR@/admin/win/vlc/")
+ MESSAGE(FATAL_ERROR "\n You don't have vlc in your admin/win/ dir. \n Please change into that dir and execute 'sh update-vlc.sh'" )
+ endif()
+
#SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
# set the install/unistall icon used for the installer itself
View
@@ -5,7 +5,7 @@ rm -rf vlc/
echo "Download specified binary..."
#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://nightlies.videolan.org/build/win32/trunk-20110524-1321/vlc-1.2.0-git-20110524-1321-win32.7z"
+wget -c "http://nightlies.videolan.org/build/win32/trunk-20110723-0002/vlc-1.2.0-git-20110723-0002-win32.7z"
echo "Extract binary..."
7z x vlc-*.7z
@@ -14,7 +14,9 @@ mv -v vlc-*/ vlc/
echo "Strip unneeded plugins from vlc/plugins..."
cd vlc/plugins/
rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
- */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub*
+ */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub* \
+ services_discover/ visualization/ control/ meta_engine/ misc/
+
echo "Downloaded and stripped VLC"

0 comments on commit 34c618e

Please sign in to comment.