commit 42674c0df1cb53c4aa25b7287c524e227e953fc6
author Pohsiang (John) Hsu <pohhsu@microsoft.com> Tue Jul 01 09:10:09 2025 -0700
committer Marge Bot <marge-bot@fdo.invalid> Tue Jul 08 14:50:28 2025 +0000
tree fa00eef0d25f7ced597f17e92a266e849635495d
parent fd073bc1c3ad02454f9ab18dc1e2a297d092235a

mediafoundation: make file version the same as product version, and increment version to 1.0.6

for 1.0.5 release, File version was showing 1.0.0.0 and Production version was showing 1.0.5.0.
now both show 1.0.6.0.

Reviewed-by: Yubo Xie <yuboxie@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35981>

src/gallium/targets/mediafoundation/mediafoundation.rc.in

diff --git a/src/gallium/targets/mediafoundation/mediafoundation.rc.in b/src/gallium/targets/mediafoundation/mediafoundation.rc.in
index 95f6a2c..3b66b97 100644
--- a/src/gallium/targets/mediafoundation/mediafoundation.rc.in
+++ b/src/gallium/targets/mediafoundation/mediafoundation.rc.in
@@ -1,8 +1,13 @@
 #include <windows.h>
 
+#define VER_MAJOR @VER_MAJOR@
+#define VER_MINOR @VER_MINOR@
+#define VER_PATCH @VER_PATCH@
+#define VER_BUILD @VER_BUILD@
+
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @FileVersion@
- PRODUCTVERSION @ProductVersion@
+ FILEVERSION VER_MAJOR, VER_MINOR, VER_PATCH, VER_BUILD
+ PRODUCTVERSION VER_MAJOR, VER_MINOR, VER_PATCH, VER_BUILD
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS VOS__WINDOWS32

src/gallium/targets/mediafoundation/meson.build

diff --git a/src/gallium/targets/mediafoundation/meson.build b/src/gallium/targets/mediafoundation/meson.build
index 85d749b..cc46a29 100644
--- a/src/gallium/targets/mediafoundation/meson.build
+++ b/src/gallium/targets/mediafoundation/meson.build
@@ -52,22 +52,31 @@
 )
 
 winmod = import('windows')
-dll_version = '1.0.5'
 foreach codec : mft_codecs
   gallium_mf_name = 'ms' + codec + 'hmft'
   if get_option('mediafoundation-store-dll')
     gallium_mf_name += '_store'
   endif
-  mft_dll_version = dll_version
+
+  major_version = '1'
+  minor_version = '0'
+  patch_version = '6'
+  build_version = '0'
+  mft_dll_version = '@0@.@1@.@2@'.format(major_version, minor_version, patch_version)
 
   mediafoundation_rc_conf_data = configuration_data()
+  mediafoundation_rc_conf_data.set('VER_MAJOR', major_version)
+  mediafoundation_rc_conf_data.set('VER_MINOR', minor_version)
+  mediafoundation_rc_conf_data.set('VER_PATCH', patch_version)
+  mediafoundation_rc_conf_data.set('VER_BUILD', build_version)
+
   mediafoundation_rc_conf_data.set('CompanyName',       '"Microsoft Corporation"')
   mediafoundation_rc_conf_data.set('FileDescription',   '"Media Foundation DX12 Encoder MFT"')
-  mediafoundation_rc_conf_data.set('FileVersion',       '@0@.0'.format(mft_dll_version))
+  mediafoundation_rc_conf_data.set('FileVersion',       '@0@.@1@.@2@.@3@'.format(major_version, minor_version, patch_version, build_version))
   mediafoundation_rc_conf_data.set('InternalName',      '"@0@"'.format(gallium_mf_name))
   mediafoundation_rc_conf_data.set('OriginalFilename',  '"@0@"'.format(gallium_mf_name))
   mediafoundation_rc_conf_data.set('ProductName',       '"Media Foundation Encoder MFT"')
-  mediafoundation_rc_conf_data.set('ProductVersion',    '@0@.0'.format(mft_dll_version))
+  mediafoundation_rc_conf_data.set('ProductVersion',    '@0@.@1@.@2@.@3@'.format(major_version, minor_version, patch_version, build_version))
 
   rc_file = configure_file(
     configuration: mediafoundation_rc_conf_data,