From 768932ab5b79921ec829b297ae264eedde11ae19 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:19:48 +0200 Subject: [PATCH] [libflac] Disable man pages (#26016) * [libflac] Remove documentation * version * [libflac] Disable man pages * version * man already removed * version --- ports/libflac/portfile.cmake | 14 +++++++------- ports/libflac/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/l-/libflac.json | 5 +++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index 9af82a6d36..39e6055922 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -19,12 +19,8 @@ else() endif() if("asm" IN_LIST FEATURES) - if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Feature asm only supports x86 architecture.") - endif() - VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) + GET_FILENAME_COMPONENT(NASM_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path("${NASM_PATH}") endif() @@ -35,12 +31,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF - -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) + -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR} + -DINSTALL_MANPAGES=OFF +) vcpkg_cmake_install() @@ -50,6 +49,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/LICENSE") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC/export.h" diff --git a/ports/libflac/vcpkg.json b/ports/libflac/vcpkg.json index 7ca4b9dcc4..ee275816a3 100644 --- a/ports/libflac/vcpkg.json +++ b/ports/libflac/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libflac", "version": "1.3.4", + "port-version": 1, "description": "Library for manipulating FLAC files", "homepage": "https://xiph.org/flac/", "license": "GFDL-1.2-or-later", @@ -17,7 +18,8 @@ ], "features": { "asm": { - "description": "Use any assembly optimization routines" + "description": "Use any assembly optimization routines", + "supports": "x86" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 9c2911f706..8ee198b389 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3622,7 +3622,7 @@ }, "libflac": { "baseline": "1.3.4", - "port-version": 0 + "port-version": 1 }, "libfort": { "baseline": "0.4.2", diff --git a/versions/l-/libflac.json b/versions/l-/libflac.json index 46b06a0c63..23d75d3435 100644 --- a/versions/l-/libflac.json +++ b/versions/l-/libflac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6931704180602d16a54e15759cd6c04739d40699", + "version": "1.3.4", + "port-version": 1 + }, { "git-tree": "a3dff2074f8f7a8ac9d8e9c5e78d8cae8538f3ef", "version": "1.3.4",