Imported Upstream version 15.11.0~ds0

2 files changed, 65 insertions, 10 deletions

diff --git a/setup/scripts/make_pkgs.cmd b/setup/scripts/make_pkgs.cmd
index 44a54a9..1220686 100644
--- a/setup/scripts/make_pkgs.cmd
+++ b/setup/scripts/make_pkgs.cmd
@@ -98,6 +98,7 @@ set VER_MINOR=
 set VER_BUILD=

 set VER_REVISION=

 set VER_REV_CMD=

+set DEF_QT5=

 set /p ALL_PKG_VER="Version: "

 echo.

 

@@ -153,8 +154,14 @@ goto end
 echo --- SMPlayer NSIS Package [32-bit] ---

 echo.

 

+if exist %TOP_LEVEL_DIR%\smplayer-build\Qt5Core.dll (

+  set DEF_QT5=/DQT5

+) else (

+  set DEF_QT5=

+)

+

 if exist %TOP_LEVEL_DIR%\smplayer-build (

-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %TOP_LEVEL_DIR%\smplayer.nsi

+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %DEF_QT5% %TOP_LEVEL_DIR%\smplayer.nsi

 )

 

 if not "%USER_CHOICE%" == "10"  goto end

@@ -163,8 +170,14 @@ if not "%USER_CHOICE%" == "10"  goto end
 echo --- SMPlayer NSIS Package [64-bit] ---

 echo.

 

+if exist %TOP_LEVEL_DIR%\smplayer-build64\Qt5Core.dll (

+  set DEF_QT5="/DQT5"

+) else (

+  set DEF_QT5=

+)

+

 if exist %TOP_LEVEL_DIR%\smplayer-build64 (

-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi

+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %DEF_QT5% %TOP_LEVEL_DIR%\smplayer.nsi

 )

 

 goto end

@@ -238,7 +251,7 @@ copy /y "%PORTABLE_EXE_DIR%\smplayer-portable.exe" "%SMPLAYER_PORTABLE_DIR%\smpl
 

 ::

 echo Finalizing package...

-7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!buildinfo -xr!buildinfo64 -mx9 >nul

+7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul

 

 echo.

 echo Restoring source folder(s) back to its original state...

@@ -326,7 +339,7 @@ copy /y "%PORTABLE_EXE_DIR%\smplayer-portable64.exe" "%SMPLAYER_PORTABLE_DIR%\sm
 

 ::

 echo Finalizing package...

-7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%-x64.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!codecs -xr!buildinfo -xr!buildinfo64 -mx9 >nul

+7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%-x64.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!codecs -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul

 

 echo.

 echo Restoring source folder(s) back to its original state...

diff --git a/setup/smplayer.nsi b/setup/smplayer.nsi
index b162e25..1f67f9f 100644
--- a/setup/smplayer.nsi
+++ b/setup/smplayer.nsi
@@ -42,10 +42,11 @@
   !define SMPLAYER_UNINST_EXE "uninst.exe"

   !define SMPLAYER_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"

 

+  !define MPV_VERSION "20150923"

 !ifdef WIN64

-  !define MPV_FILENAME "mpv-x86_64-20150903.7z"

+  !define MPV_FILENAME "mpv-x86_64-${MPV_VERSION}.7z"

 !else

-  !define MPV_FILENAME "mpv-i686-20150903.7z"

+  !define MPV_FILENAME "mpv-i686-${MPV_VERSION}.7z"

 !endif

 

   !define INSTALLER_VERSION "1"

@@ -57,9 +58,9 @@
   Name "SMPlayer ${SMPLAYER_VERSION}"

   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"

 !ifdef WIN64

-    OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"

+  OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"

 !else

-    OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"

+  OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"

 !endif

 

   ;Version tab properties

@@ -123,6 +124,8 @@
   Var YTDL_Version_Remote_File

   Var YTDL_Previous_Version_State

 

+  Var MPV_Version

+

 ;--------------------------------

 ;Interface Settings

 

@@ -413,7 +416,7 @@ SectionGroup $(MPlayerMPVGroupTitle)
   Section "MPlayer" SecMPlayer

 

     SetOutPath "$INSTDIR\mplayer"

-    File /r /x mplayer.exe /x mencoder.exe /x mplayer64.exe /x mencoder64.exe /x *.exe.debug /x gdb.exe /x gdb64.exe /x buildinfo /x buildinfo64 /x buildinfo-mencoder-32 /x buildinfo-mencoder-debug-32 /x buildinfo-mplayer-32 /x buildinfo-mplayer-debug-32 /x buildinfo-mencoder-64 /x buildinfo-mencoder-debug-64 /x buildinfo-mplayer-64 /x buildinfo-mplayer-debug-64 "${SMPLAYER_BUILD_DIR}\mplayer\*.*"

+    File /r /x mplayer.exe /x mencoder.exe /x mplayer64.exe /x mencoder64.exe /x *.exe.debug /x gdb.exe /x gdb64.exe /x vfw2menc.exe /x buildinfo /x buildinfo64 /x buildinfo-mencoder-32 /x buildinfo-mencoder-debug-32 /x buildinfo-mplayer-32 /x buildinfo-mplayer-debug-32 /x buildinfo-mencoder-64 /x buildinfo-mencoder-debug-64 /x buildinfo-mplayer-64 /x buildinfo-mplayer-debug-64 "${SMPLAYER_BUILD_DIR}\mplayer\*.*"

 !ifdef WIN64

     File /oname=mplayer.exe "${SMPLAYER_BUILD_DIR}\mplayer\mplayer64.exe"

 !else

@@ -467,6 +470,7 @@ SectionGroup $(MPlayerMPVGroupTitle)
 

     IfFileExists "$INSTDIR\mplayer\mpv*.exe" 0 mpvInstFailed

         WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPV 0x1

+        WriteRegStr   HKLM "${SMPLAYER_REG_KEY}" "MPV_Version" "${MPV_VERSION}"

         Goto dl_youtube-dl

       mpvInstFailed:

         Abort $(MPV_Inst_Failed)

@@ -540,7 +544,22 @@ Section -RestorePrograms
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\smtube.exe" "$INSTDIR"

     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\docs\smtube\*" "$INSTDIR\docs\smtube"

     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\translations\*" "$INSTDIR\translations"

+!ifdef QT5

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5WebKit.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Sql.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Qml.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Quick.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Positioning.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Multimedia.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Sensors.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5WebChannel.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5WebKitWidgets.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5OpenGL.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5PrintSupport.dll" "$INSTDIR"

+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5MultimediaWidgets.dll" "$INSTDIR"

+!else

     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\QtWebKit4.dll" "$INSTDIR"

+!endif

   ${EndIf}

 

 !ifndef WIN64

@@ -943,6 +962,13 @@ Function Backup_MPV
     Return

   ${EndIf}

 

+  ClearErrors

+  ReadRegStr $MPV_Version HKLM "${SMPLAYER_REG_KEY}" "MPV_Version"

+  IfErrors NoBackup 0

+    IntCmp $MPV_Version ${MPV_VERSION} +3 0 +3

+      DetailPrint "A newer version of MPV is available and will be downloaded."

+      Goto NoBackup

+

   IfFileExists "$SMPlayer_Path\mplayer\mpv*.exe" 0 NoBackup

     DetailPrint $(Info_MPV_Backup)

     CreateDirectory "$PLUGINSDIR\mpvbak"

@@ -963,7 +989,23 @@ Function Backup_SMTube
     CopyFiles /SILENT "$SMPlayer_Path\smtube.exe" "$PLUGINSDIR\smtubebak"

     CopyFiles /SILENT "$SMPlayer_Path\docs\smtube\*" "$PLUGINSDIR\smtubebak\docs\smtube"

     CopyFiles /SILENT "$SMPlayer_Path\translations\smtube*.qm" "$PLUGINSDIR\smtubebak\translations"

-	CopyFiles /SILENT "$SMPlayer_Path\QtWebKit4.dll" "$PLUGINSDIR\smtubebak"

+!ifdef QT5

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKit.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Sql.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Qml.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Quick.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Positioning.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Multimedia.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Sensors.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebChannel.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKitWidgets.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5OpenGL.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5PrintSupport.dll" "$PLUGINSDIR\smtubebak"

+    CopyFiles /SILENT "$SMPlayer_Path\Qt5MultimediaWidgets.dll" "$PLUGINSDIR\smtubebak"

+!else

+    CopyFiles /SILENT "$SMPlayer_Path\QtWebKit4.dll" "$PLUGINSDIR\smtubebak"

+!endif

+

     StrCpy $Restore_SMTube 1

     Return

   NoBackup: