From 0f98ad5a1b61e4d2521dc4a6c5ee21f50a54682a Mon Sep 17 00:00:00 2001
From: Ian Walton <ian@iwalton.com>
Date: Sun, 4 Apr 2021 15:54:50 -0400
Subject: [PATCH] More installer and packaging fixes.

---
 CMakeModules/CompleteBundleWin.cmake.in |   7 ++++---
 CMakeModules/VersionConfiguration.cmake |  12 +++---------
 README.md                               |   6 ++++--
 bundle/win/Bundle.wxs                   |   4 ++--
 bundle/win/JMP.wxs                      |  11 +++--------
 bundle/win/pmstheme.xml                 |   2 +-
 bundle/win/progress-bar.png             | Bin 103 -> 1561 bytes
 src/ui/webview.qml                      |   2 +-
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/CMakeModules/CompleteBundleWin.cmake.in b/CMakeModules/CompleteBundleWin.cmake.in
index 027ff74f..eb7d7f51 100644
--- a/CMakeModules/CompleteBundleWin.cmake.in
+++ b/CMakeModules/CompleteBundleWin.cmake.in
@@ -3,7 +3,7 @@ set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@)
 execute_process(COMMAND @QTROOT@/bin/windeployqt.exe --verbose 9 --qmldir @SOURCE_ROOT@/src/ui ${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe)
 
 # on windows windeployqt doesnt install non qt libraries, let cmake do that
-include(BundleUtilities)
+# include(BundleUtilities)
 
 foreach(d @CMAKE_FIND_ROOT_PATH@)
   list(APPEND SEARCHDIRS ${d}/bin)
@@ -13,8 +13,9 @@ endforeach()
 get_filename_component(CEC_DIR @CEC_LIBRARY@ DIRECTORY)
 list(APPEND SEARCHDIRS ${CEC_DIR})
 
-fixup_bundle("${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe" "" "${SEARCHDIRS}") 
-install(PROGRAMS ${VCREDIST_DIR}/vc_redist_2015_x64.exe DESTINATION .)
+# fixup_bundle("${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe" "" "${SEARCHDIRS}") 
+#install(PROGRAMS ${VCREDIST_DIR}/vcredist_msvc2017_x64.exe DESTINATION .)
+file(INSTALL @MPV_LIBRARY@ DESTINATION "${CMAKE_INSTALL_PREFIX}")
 
 if(@DO_ENABLE_ANGLE_DEP@)
   message(STATUS "Deploying separate ANGLE deps")
diff --git a/CMakeModules/VersionConfiguration.cmake b/CMakeModules/VersionConfiguration.cmake
index 2b20cc39..a01b6376 100644
--- a/CMakeModules/VersionConfiguration.cmake
+++ b/CMakeModules/VersionConfiguration.cmake
@@ -26,14 +26,8 @@ set(VERSION_NANO 0)
 
 option(UPGRADE_DEBUG "" OFF)
 
-if(UPGRADE_DEBUG)
-  set(VERSION_STRING "1.0.4.177-195ef65f")
-  set(VERSION_STRING_SHORT "1.0.4")
-  set(CANONICAL_VERSION_STRING "1.0.4-195ef65f")
-else()
-  set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}.${VERSION_BUILD}-${GIT_REVISION}")
-  set(VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}")
-  set(CANONICAL_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}-${GIT_REVISION}")
-endif()
+set(VERSION_STRING "1.0.0")
+set(VERSION_STRING_SHORT "1.0.0")
+set(CANONICAL_VERSION_STRING "1.0.0")
 
 configure_file(src/core/Version.cpp.in src/core/Version.cpp)
diff --git a/README.md b/README.md
index 59c64817..7cfb5e5c 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ Please install:
    - Place the contents in the build directory, in a subfolder called `mpv`.
    - Move the contents of the `include` folder to an `mpv` folder inside the `include` folder.
    - Move the `mpv-1.dll` to `mpv.dll`.
+ - [WIX](https://wixtoolset.org/releases/v3.11.2/stable)
 
 You need to run these commands in git bash.
 
@@ -67,8 +68,9 @@ unzip dist.zip
 Open the "x86_x64 Cross Tools Command Prompt for VS 2017". `cd` to the `build` directory. Run:
 
 ```
-cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=C:\Qt\Qt5.9.9\5.9.9\msvc2017_64 -DMPV_INCLUDE_DIR=mpv\include -DMPV_LIBRARY=mpv\mpv.dll -DVCREDIST_DIR=C:\Qt\Qt5.9.9\vcredist -DCMAKE_INSTALL_PREFIX=output ..
-lib /def:mpv\mpv.def /out:mpv\mpv-1.lib /MACHINE:X64
+set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin
+cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=C:/Qt/Qt5.9.9/5.9.9/msvc2017_64 -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/mpv.dll -DCMAKE_INSTALL_PREFIX=output ..
+lib /def:mpv\mpv.def /out:mpv\mpv.dll.lib /MACHINE:X64
 ninja
 ninja windows_package
 ```
diff --git a/bundle/win/Bundle.wxs b/bundle/win/Bundle.wxs
index 874297ba..5cda801c 100644
--- a/bundle/win/Bundle.wxs
+++ b/bundle/win/Bundle.wxs
@@ -244,7 +244,7 @@
         <MsiProperty Name="WINDOWSTYPE" Value="[WinRegInstallationType]" />
       </MsiPackage>
       <ExePackage Id="vcredist_repair"
-                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\vcredist_x64.exe"
+                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\vcredist_x64.exe"
                   Name="vcredist_x64.exe"
                   InstallCommand="/repair /quiet /norestart"
                   InstallCondition="Bad_VCRedist"
@@ -254,7 +254,7 @@
         <ExitCode Value="1638" Behavior="success"/>
       </ExePackage>
       <ExePackage Id="vcredist"
-                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\vcredist_x64.exe"
+                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\vcredist_x64.exe"
                   Name="vcredist_x64.exe"
                   InstallCommand="/install /quiet /norestart"
                   InstallCondition="NOT Bad_VCRedist"
diff --git a/bundle/win/JMP.wxs b/bundle/win/JMP.wxs
index 506930c4..473ebbe5 100644
--- a/bundle/win/JMP.wxs
+++ b/bundle/win/JMP.wxs
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" 
-     xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
   <?include Global.wxi ?>
   <?include Version.wxi ?>
 
 
-  <?define FirstProductVersion=1.0.0 ?>
+  <?define FirstProductVersion=0.0.0 ?>
   <?define JellyfinMediaPlayerRegistryKey=Software\Jellyfin\Jellyfin Media Player?>
 
     <!-- To keep things simple, the installer considers each new release
@@ -102,11 +101,7 @@
         <RegistryKey Root="HKCU" Key="Software\Jellyfin\Jellyfin Media Player">
           <RegistryValue Name="InstallFolder" Type="string" Value="[INSTALLLOCATION]" Action="write" KeyPath="no" />
         </RegistryKey>
-        
-                <!-- Firewall Exceptions -->
-        <!-- These should probably go in their own component, but it's easier just to put them here -->
-        <fire:FirewallException Id="FWX1" Name="Jellyfin Media Player" Program="[INSTALLLOCATION]JellyfinMediaPlayer.exe" Scope="any" IgnoreFailure="yes" />
-                  
+                          
         <RemoveFolder Id="JellyfinStartMenuFolder" On="uninstall" />
       </Component>
     </DirectoryRef>
diff --git a/bundle/win/pmstheme.xml b/bundle/win/pmstheme.xml
index 82e24dd9..e96886b0 100644
--- a/bundle/win/pmstheme.xml
+++ b/bundle/win/pmstheme.xml
@@ -6,7 +6,7 @@
   <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
   <Font Id="3" Height="-12" Weight="500" Foreground="FFFFFF" Background="1F1F1F">Segoe UI</Font>
   <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="1F1F1F" Underline="yes">Segoe UI</Font>
-  <Font Id="5" Height="-24" Weight="500" Foreground="197BCC">Segoe UI</Font>
+  <Font Id="5" Height="-24" Weight="500" Foreground="a75dc3">Segoe UI</Font>
   
   <Text X="11" Y="26" Width="-11" Height="30" FontId="5" Visible="yes" DisablePrefix="yes" Center="yes">#(loc.Title)</Text>
   <Image X="200" Y="75" Width="85" Height="85" ImageFile="jellyfin-chevron-85.png" Visible="yes" />
diff --git a/bundle/win/progress-bar.png b/bundle/win/progress-bar.png
index e822bc5a81b6da4a69beec390e8695fe46837ca9..fecaf3633a93b8c05265789333747e5ac3fbe36f 100644
GIT binary patch
delta 1544
zcmZ{cdpOez9L9glj8fWB#FUk5gj{N5uC2B`;Z!bZwOnR2GZtbl`Hf0hF)8<^)p9v`
zI3x8Wq~%gB5z2OiR;HwdA~D8M&vTyh&pFTc`Tp~H-}e(*pq8Z%LK70a{bG&;#v$oZ
zks*|DGBPHfPDYX$ln?-53|9IcuaO$5EeTC)l$2BiQ4C))>{zl+SAk9BVrh_2qz3uz
zNX6@Y@|#UC`Grp9?~?r_+_udpoECy@lzVlBUqeQPGY^-NXGYNl)gV7VicvpG9Zx*l
z*02=ul6I+c6hu>oW8d#-K{bDl>Yve_I&&HkHJATU&gmP;lN0S0NuT%BXE=jDSi!a_
zj-l<b&$`9hWm+g_srAS*BM9yw5ZM!Z=AGgs&IVI^5;{2Ti6f4ssqUh+PrWkd(4GAa
z^>x+i#_#=m)SYow?L+=?bqHRol?+atQz%$ddrk(bk~8>xWKINa?ZZua0zV;#jy>;}
z;s+^&#u<8sU;QE|Mucu164pnx!W+N%etqyj@tnODXE3;;Xv2K`41Xe<D%noI>+&LS
zaHRWbXCz_S6w8RXl9L;FrFwL%H168U*kf%SQm)0lbZqe<O}jkK?hKN<<by^9pu*;O
z9RnALsNvTcb&vrC*JG4Sm0d+q`6f@B?vH79um9Y_7z_`gy#dxk-ljJ5A&N#^zCHgi
zHAg%C$`j*Ji6+^f30xMn*)lVt6~q{avn2L60=0E(|0#38?F4||zM%u?Omvl(v&(Po
z^hBrQHsqM#qv!&d>b6t)j;0k}f8KTleRxJMdiU!Yrj=W@ZH%sIzjXn>2EU{A`jKvW
zVc=d;TpR1gW%H`}?S>o8tM6o+b(G0WcY9Y>mlhV$s#2ECZA&zdht)-6cbs`!a<R&B
z?$wM-<vP?-7CbG}uJ1YO6{CMnVRy3Iq(fN4;i5|m_dUVG&9xJ3)#5K0qY#&_1W@_?
zUbu_voAiQoX(Q*kN0)mI@`4|?&00V~!y&1U@8t+k(&Vd)EJXT>{*csIa?0%oh{S3<
z$`~?>h&)7%-@!T#cxZOt&_TTv@wv~!^?d`d5SQVDk=+?53ppI9+!~|0%aRmebjLPr
zwuQxM(>zq-Ra?%I5-ve#6}g}yw|6sk;P5ccx^5e-+lR(~!TZo<Pr=_8rQGr6RXe06
z8i!bf6TT(=xRgbuO&~B~-3I*)MWN%<*{(rQ@$hb46;T<|a80#VZoV`r5y#KfS2PHC
z#(c8%w#%T@x`&X&;h~cZ=BG_cx~yN?9N0M7N)7dP-G^a+m8}0t2hS4ph)OW?%2+(X
z@pZ%rpIWC*`-v_~Pc_Stw4r?__G(qnkE$I?8zTzii|}>aQ(R56iWc;>fvj=W6W@^o
zIy%A*);r_W_~rX#7&A!xiCe21W7{XqgE4O+mdF~Ld@ly0dTSdkflNl%?--BM;RiB2
z&YuzK?g(bydXSq5t`O6j-n|-XS%7_jNDwVbZ%Hk7UYat6E#(OEy1<8y2k1(Cw*OQ|
zUh!wG?cyyv!y?dD?sv@=%rf;^S<TeHvPHM<l`8i%IlYBX{IQd1+&+ms321DndSv=Y
zwkx^>77lfMkz68<nLg+y^KF)If%{V)vT~hjrXhQan1})JQ-YQRwm$i`c+p5v)|)qY
z_Tb}>vDtBgK2qz59fK!!IDgVag@F%&4$n+oPwH7G8P}Ul1Jz$I<|eT#gW>Gru(=$D
z<$Ocg)<#P8<z(a&J$Tk60VgLkP2m|-!<c7JFBZyif^*EC*?Y5(1r{<nd|~`9Q2a@c
zxao<F9OP9fGD^W1AE0NJUA0DBu-xmTfaW28h5woLJ3lgIhRU!<q0{awKTTJ&R(IOa
zPyb5)Z?~*ITmQ@dk3(GwBKTR;s7Ze%^Xs@HPUaQ>04N6?#A1MzpT})1yS7SH>9}Lj
z0AQj2^A#8+&atZy7K8WL4;xcb(l9jU8Butv2#LqIdaDRY0RaK?O$L+CSNgcn746NN
gmu;-LDS_qyFzo|7KwI=8u66<Zeosu5n_@uf-`{KJVE_OC

delta 74
zcmbQqlRiP&g@GmA(btiIVPik{pF~y$1_n7#7sn6|+2n+Tgdg?GqCVAkb)Tshn9b?2
epdnG0f#Fj)o9*d0i#UKP89ZJ6T-G@yGywo}9~h(n

diff --git a/src/ui/webview.qml b/src/ui/webview.qml
index 1bcd5c85..3a8fcee9 100644
--- a/src/ui/webview.qml
+++ b/src/ui/webview.qml
@@ -213,7 +213,7 @@ KonvergoWindow
     z: 5
     anchors.centerIn: parent
     color: "#999999"
-    linkColor: "#cc7b19"
+    linkColor: "#a85dc3"
     text: "Generic error"
     font.pixelSize: 32
     font.bold: true