fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 08:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
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>
This commit is contained in:
Pohsiang (John) Hsu 2025-07-01 09:10:09 -07:00 • committed by Marge Bot
parent fd073bc1c3
commit 42674c0df1
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/targets/mediafoundation/mediafoundation.rc.in
View file

@ -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

17
src/gallium/targets/mediafoundation/meson.build
View file

@ -52,22 +52,31 @@ mediafoundation_def = custom_target(
)
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,