diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-09-24 21:37:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 12:37:17 -0700 |
| commit | 2b02b97a2e6705f7855845fc31d20e7a75e8b43d (patch) | |
| tree | 3d37f04384d0d957097e99f430d210c9854e39ec /ports | |
| parent | 9ac48a6c493523bd499a0ed613ab080af9246938 (diff) | |
| download | vcpkg-2b02b97a2e6705f7855845fc31d20e7a75e8b43d.tar.gz vcpkg-2b02b97a2e6705f7855845fc31d20e7a75e8b43d.zip | |
[x264] Fix x64-windows-static (#13450)
* try fixing x264
* fix remaining issues
* Remove unnecessary COPY_SOURCE
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/x264/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x264/portfile.cmake | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 0a4af3912..565775b15 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 1c9e32e92..1d1bc2392 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -47,9 +47,20 @@ vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_TARGET_IS_WINDOWS) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - 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) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) else() # force U_STATIC_IMPLEMENTATION macro file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) |