early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,31 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MediaArea/MediaInfoLib
REF v21.03
SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811
HEAD_REF master
PATCHES vcpkg_support_in_cmakelists.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/Project/CMake"
OPTIONS
-DBUILD_ZENLIB=0
-DBUILD_ZLIB=0
)
vcpkg_cmake_install()
if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib")
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib")
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

21
externals/vcpkg/ports/libmediainfo/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,21 @@
{
"name": "libmediainfo",
"version-string": "21.03",
"port-version": 2,
"description": "Get most relevant technical and tag data from video and audio files",
"homepage": "https://github.com/MediaArea/MediaInfoLib",
"dependencies": [
"curl",
"libzen",
"tinyxml2",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
]
}

View File

@@ -0,0 +1,55 @@
diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
index f983343..c6ba5ea 100644
--- a/Project/CMake/CMakeLists.txt
+++ b/Project/CMake/CMakeLists.txt
@@ -88,7 +88,7 @@ endif()
find_package(TinyXML)
# use system curl if is present
-find_package(CURL)
+find_package(CURL CONFIG REQUIRED)
include_directories(${MediaInfoLib_SOURCES_PATH})
include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/)
@@ -400,13 +400,7 @@ endif()
target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES})
if(MSVC AND BUILD_SHARED_LIBS)
- get_target_property(LOCATION mediainfo LOCATION_DEBUG)
- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
-
- get_target_property(LOCATION mediainfo LOCATION_RELWITHDEBINFO)
- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+ install(FILES $<TARGET_PDB_FILE:mediainfo> DESTINATION ${BIN_INSTALL_DIR} OPTIONAL)
endif()
if (APPLE)
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..8c34364 100644
--- a/Source/ThirdParty/aes-gladman/brg_endian.h
+++ b/Source/ThirdParty/aes-gladman/brg_endian.h
@@ -110,7 +110,8 @@ Issue Date: 20/12/2007
defined( __MRC__ ) || defined( __MVS__ ) || defined( __MWERKS__ ) || \
defined( sparc ) || defined( __sparc) || defined( SYMANTEC_C ) || \
defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM ) || \
- defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX )
+ defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) || \
+ defined( _M_ARM64 ) || defined ( _M_ARM )
# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN
#elif 0 /* **** EDIT HERE IF NECESSARY **** */