From 463b45aa753217d975394129989f40c7082fd95b Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Mon, 16 Dec 2024 16:27:10 +0100 Subject: [PATCH] [libmediainfo] update to 24.12 (#42703) --- ports/libmediainfo/msvc-arm.diff | 25 --------- ports/libmediainfo/no-windows-namespace.diff | 56 -------------------- ports/libmediainfo/portfile.cmake | 4 +- ports/libmediainfo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmediainfo.json | 5 ++ 6 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 ports/libmediainfo/msvc-arm.diff delete mode 100644 ports/libmediainfo/no-windows-namespace.diff diff --git a/ports/libmediainfo/msvc-arm.diff b/ports/libmediainfo/msvc-arm.diff deleted file mode 100644 index c7bef07500..0000000000 --- a/ports/libmediainfo/msvc-arm.diff +++ /dev/null @@ -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 - diff --git a/ports/libmediainfo/no-windows-namespace.diff b/ports/libmediainfo/no-windows-namespace.diff deleted file mode 100644 index 6f3918a873..0000000000 --- a/ports/libmediainfo/no-windows-namespace.diff +++ /dev/null @@ -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 - #ifdef WINDOWS -- namespace WindowsNamespace -- { -+ #ifndef WIN32_LEAN_AND_MEAN -+ #define WIN32_LEAN_AND_MEAN -+ #endif -+ #ifndef NOMINMAX -+ #define NOMINMAX -+ #endif - #include - #undef Yield -- #undef max -- } - #else - #include - #include -@@ -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 diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index 460820d6cc..bc730b27f8 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -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) diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index dc8605f395..0f552b47be 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 99fedd301f..45f9b1ed67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4797,7 +4797,7 @@ "port-version": 0 }, "libmediainfo": { - "baseline": "24.11", + "baseline": "24.12", "port-version": 0 }, "libmem": { diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index c9c4a0158c..1459a2bdbb 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a01bcb32d2a7e297b961a492bc2aec19aa55cbc8", + "version": "24.12", + "port-version": 0 + }, { "git-tree": "294f2cfc21bf3881eeb3ce4c968998aa6db6adfb", "version": "24.11",