From f4759a6ded9c7090df01c55a87a9fcecf860fe33 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Fri, 3 Apr 2020 19:17:41 +0200 Subject: [PATCH] [opus] Make AVX an optional feature (#10634) --- ports/opus/CONTROL | 5 ++++- ports/opus/portfile.cmake | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL index c7b8d246f..f4ed522c3 100644 --- a/ports/opus/CONTROL +++ b/ports/opus/CONTROL @@ -1,4 +1,7 @@ Source: opus -Version: 1.3.1 +Version: 1.3.1-2 Homepage: https://github.com/xiph/opus Description: Totally open, royalty-free, highly versatile audio codec + +Feature: avx +Description: Builds the library with avx instruction set diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index bf23718df..a770da51f 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -12,7 +10,14 @@ vcpkg_from_github( HEAD_REF master) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + avx AVX_SUPPORTED +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + PREFER_NINJA) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus) vcpkg_copy_pdbs()