From 41d862cc26195ebc05f9a0f53e6a3f184b52ce4b Mon Sep 17 00:00:00 2001
From: Kaleb Luedtke <jluedtk@jci.com>
Date: Wed, 20 Apr 2022 10:47:10 -0500
Subject: [PATCH] Set extra version number when building MSI

* Use the @VERSION_EXTRA@ which is used in the exe build in place of the
  static '0'
* Change the Display Name in appwiz.cpl to be just the product name,
  matching the exe build

(cherry picked from commit cafda6718082ab655f23b88a6a94dac747c57a19)

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
---
 extras/package/win32/msi/config.wxi.in | 3 ++-
 extras/package/win32/msi/product.wxs   | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/msi/config.wxi.in b/extras/package/win32/msi/config.wxi.in
index 8173d71396..eac56f22f5 100644
--- a/extras/package/win32/msi/config.wxi.in
+++ b/extras/package/win32/msi/config.wxi.in
@@ -10,8 +10,9 @@
     <?define VerMajor = "@VERSION_MAJOR@" ?>
     <?define VerMinor = "@VERSION_MINOR@" ?>
     <?define VerPatch = "@VERSION_REVISION@" ?>
+    <?define VerExtra = "@VERSION_EXTRA@" ?>
     <?define Version = "$(var.VerMajor).$(var.VerMinor).$(var.VerPatch)" ?>
-    <?define VersionLong = "$(var.Version).0" ?>
+    <?define VersionLong = "$(var.Version).$(var.VerExtra)" ?>
 
     <?define SourceDir = "vlc-@VERSION@" ?>
     <!--<?define PluginsPath = "$(var.BinPath)\plugins" ?>
diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index bc96a58c10..dde15cab15 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -25,7 +25,7 @@
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <Product
         Id='*'
-        Name='$(var.ProductName) $(var.Version) ($(var.PlatformString))'
+        Name='$(var.ProductName)'
         Language='1033'
         Version='$(var.VersionLong)'
         Manufacturer='$(var.Manufacturer)'
@@ -408,5 +408,3 @@
     <ProgressText Action="RegisterAxvlc">Registering DirectX plugin...</ProgressText>
     <ProgressText Action="UnregisterAxvlc">Removing DirectX plugin...</ProgressText>
 -->
-
-