mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 12:47:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[unrar] Don't use a custom struct member alignment (#8053)

Browse Source
This commit is contained in:
FaultyRAM 2019-09-07 09:21:43 +10:00 committed by Robert Schumacher
parent 0872eebe34
commit 17785faec8
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unrar/CONTROL
View File

@ -1,4 +1,4 @@
Source: unrar Source: unrar
Version: 5.5.8-2 Version: 5.5.8-3
Homepage: https://www.rarlab.com Homepage: https://www.rarlab.com
Description: rarlab's unrar libary Description: rarlab's unrar libary

52
ports/unrar/msbuild-use-default-sma.patch Normal file
View File

@ -0,0 +1,52 @@
diff --git a/UnRARDll.vcxproj b/UnRARDll.vcxproj
index ec5c17b00..7d3d91bc6 100644
--- a/UnRARDll.vcxproj
+++ b/UnRARDll.vcxproj
@@ -138,7 +138,6 @@
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
@@ -168,7 +167,6 @@
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
@@ -198,7 +196,6 @@
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<BufferSecurityCheck>true</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
@@ -239,7 +236,6 @@
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<BufferSecurityCheck>true</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -274,7 +270,6 @@
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<BufferSecurityCheck>true</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
@@ -315,7 +310,6 @@
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StructMemberAlignment>4Bytes</StructMemberAlignment>
<BufferSecurityCheck>true</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>

8
ports/unrar/portfile.cmake
View File

@ -3,7 +3,6 @@ set(UNRAR_VERSION "5.5.8")
set(UNRAR_SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa) set(UNRAR_SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa)
set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz) set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz)
set(UNRAR_URL http://www.rarlab.com/rar/${UNRAR_FILENAME}) set(UNRAR_URL http://www.rarlab.com/rar/${UNRAR_FILENAME})
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/unrar)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@ -13,7 +12,12 @@ vcpkg_download_distfile(ARCHIVE
FILENAME ${UNRAR_FILENAME} FILENAME ${UNRAR_FILENAME}
SHA512 ${UNRAR_SHA512} SHA512 ${UNRAR_SHA512}
) )
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${UNRAR_VERSION}
PATCHES msbuild-use-default-sma.patch
)
vcpkg_build_msbuild( vcpkg_build_msbuild(
PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj" PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj"