diff options
| -rw-r--r-- | ports/x264/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x264/portfile.cmake | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index c3f2c7e95..ce64f5f7c 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,6 +1,6 @@ Source: x264 Version: 157-303c484ec828ed0 -Port-Version: 11 +Port-Version: 12 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 83544bd54..d2084978c 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -12,6 +12,10 @@ vcpkg_from_github( "uwp-cflags.patch" ) +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") + if(VCPKG_TARGET_IS_WINDOWS) _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) _vcpkg_determine_autotools_target_cpu(HOST_ARCH) @@ -22,8 +26,12 @@ endif() if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00) list(APPEND OPTIONS --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib) + list(APPEND OPTIONS --disable-asm) endif() +if(VCPKG_TARGET_IS_LINUX) + list(APPEND OPTIONS --enable-pic) +endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -37,7 +45,6 @@ vcpkg_configure_make( --disable-ffms --disable-gpac --disable-lsmash - --disable-asm --enable-debug ) |