From d5b222a563b3aa673d32abd639736e87c774a36e Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 23 Sep 2020 02:24:03 -0700 Subject: [PATCH 1/2] [x264] Fix *inx dynamic build --- ports/x264/CONTROL | 2 +- ports/x264/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 0a4af3912f140f..565775b153a42a 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,6 +1,6 @@ Source: x264 Version: 157-303c484ec828ed0 -Port-Version: 9 +Port-Version: 10 Homepage: https://github.com/mirror/x264 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format Build-Depends: pthread (linux&osx) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 1c9e32e9251816..4d03fafa81fd8c 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -47,10 +47,10 @@ vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/x264.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/x264.lib) -else() +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # force U_STATIC_IMPLEMENTATION macro file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") From d70c6c29ca2ece3b99cf0042d69253c554e8733b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 24 Sep 2020 19:07:48 -0700 Subject: [PATCH 2/2] bump version --- ports/x264/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 565775b153a42a..c3f2c7e95e7c8a 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,6 +1,6 @@ Source: x264 Version: 157-303c484ec828ed0 -Port-Version: 10 +Port-Version: 11 Homepage: https://github.com/mirror/x264 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format Build-Depends: pthread (linux&osx)