[libmediainfo] update to 24.12 (#42703)

This commit is contained in:
Maxime Gervais 2024-12-16 16:27:10 +01:00 committed by GitHub
parent eb4c5067c5
commit 463b45aa75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 86 deletions

View File

@ -1,25 +0,0 @@
diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h
index d3ac0f9..eeefa40 100644
--- a/Source/ThirdParty/aes-gladman/aesopt.h
+++ b/Source/ThirdParty/aes-gladman/aesopt.h
@@ -183,7 +183,7 @@ Issue Date: 20/12/2007
AES_REV_DKS must NOT be defined when such assembler files are
built
*/
-#if 1 && defined( _WIN64 ) && defined( _MSC_VER )
+#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 )
# define INTEL_AES_POSSIBLE
#endif
diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h
index b44c5cb..6ba31c1 100644
--- a/Source/ThirdParty/aes-gladman/brg_endian.h
+++ b/Source/ThirdParty/aes-gladman/brg_endian.h
@@ -101,6 +101,7 @@ Issue Date: 20/12/2007
defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \
defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \
defined( vax ) || defined( vms ) || defined( VMS ) || \
+ defined( _M_ARM64 ) || defined ( _M_ARM ) || \
defined( __VMS ) || defined( _M_X64 )
# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN

View File

@ -1,56 +0,0 @@
diff --git a/Source/MediaInfo/MediaInfo_Internal.cpp b/Source/MediaInfo/MediaInfo_Internal.cpp
index 05e0d53..1da1ef5 100644
--- a/Source/MediaInfo/MediaInfo_Internal.cpp
+++ b/Source/MediaInfo/MediaInfo_Internal.cpp
@@ -66,12 +66,14 @@
#if MEDIAINFO_ADVANCED && defined(MEDIAINFO_FILE_YES)
#include <limits>
#ifdef WINDOWS
- namespace WindowsNamespace
- {
+ #ifndef WIN32_LEAN_AND_MEAN
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ #ifndef NOMINMAX
+ #define NOMINMAX
+ #endif
#include <windows.h>
#undef Yield
- #undef max
- }
#else
#include <unistd.h>
#include <signal.h>
@@ -973,7 +975,7 @@ static void CtrlC_Received()
}
#ifdef WINDOWS
-static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD SignalType)
+static BOOL WINAPI SignalHandler(DWORD SignalType)
{
if (SignalType==CTRL_C_EVENT)
{
@@ -986,12 +988,12 @@ static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD Signa
static void CtrlC_Register()
{
- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, TRUE);
+ SetConsoleCtrlHandler(SignalHandler, TRUE);
}
static void CtrlC_Unregister()
{
- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, FALSE);
+ SetConsoleCtrlHandler(SignalHandler, FALSE);
}
#else //WINDOWS
static void SignalHandler(int SignalType)
@@ -1445,7 +1447,7 @@ void MediaInfo_Internal::Entry()
}
#ifdef WINDOWS
- WindowsNamespace::Sleep(0);
+ Sleep(0);
#elif defined(_POSIX_PRIORITY_SCHEDULING)
sched_yield();
#endif //_POSIX_PRIORITY_SCHEDULING

View File

@ -3,12 +3,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MediaArea/MediaInfoLib
REF "v${MEDIAINFO_VERSION}"
SHA512 51b940f577aa88d24d00dcf00cc90dfb7e8fb38e19c96517bea59ffb92877b7c8af9dcc0d93e152c707ce06725958e43dd8f64b85f099140fc8f536cea5b21b5
SHA512 efcf796a679aa91e9003ecc655401d856ee9de3c01e03236f0ea09525d725fa7bb7fc0a1816d97482c7774c2209ec74420086775a59d6f4b5309107b22e67c31
HEAD_REF master
PATCHES
msvc-arm.diff
dependencies.diff
no-windows-namespace.diff
)
vcpkg_find_acquire_program(PKGCONFIG)

View File

@ -1,6 +1,6 @@
{
"name": "libmediainfo",
"version": "24.11",
"version": "24.12",
"description": "Get most relevant technical and tag data from video and audio files",
"homepage": "https://github.com/MediaArea/MediaInfoLib",
"dependencies": [

View File

@ -4797,7 +4797,7 @@
"port-version": 0
},
"libmediainfo": {
"baseline": "24.11",
"baseline": "24.12",
"port-version": 0
},
"libmem": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a01bcb32d2a7e297b961a492bc2aec19aa55cbc8",
"version": "24.12",
"port-version": 0
},
{
"git-tree": "294f2cfc21bf3881eeb3ce4c968998aa6db6adfb",
"version": "24.11",