From 51b14cd4e1230dd51c11ffeff6f7d53c61cc5297 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Tue, 31 Oct 2023 18:48:06 -0700 Subject: [PATCH] [lensfun] Remove cpu features (#34832) * remove invalid cpu features * bump port version * oops * version db * build_for_sse=off * version db * sse2 = off * version db --- ports/lensfun/portfile.cmake | 8 ++------ ports/lensfun/vcpkg.json | 11 ++--------- versions/baseline.json | 2 +- versions/l-/lensfun.json | 5 +++++ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ports/lensfun/portfile.cmake b/ports/lensfun/portfile.cmake index 935133309f5775..fee3222bbc2fc2 100644 --- a/ports/lensfun/portfile.cmake +++ b/ports/lensfun/portfile.cmake @@ -12,11 +12,6 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LENSFUN_STATIC_LIB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LENSFUN_STATIC_CRT) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - sse BUILD_FOR_SSE - sse2 BUILD_FOR_SSE2 -) set(LENSFUN_EXTRA_OPTS "") if (VCPKG_TARGET_IS_WINDOWS) @@ -26,7 +21,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} ${LENSFUN_EXTRA_OPTS} -DBUILD_STATIC=${LENSFUN_STATIC_LIB} -DBUILD_WITH_MSVC_STATIC_RUNTIME=${LENSFUN_STATIC_CRT} @@ -35,6 +29,8 @@ vcpkg_cmake_configure( -DINSTALL_PYTHON_MODULE=ON -DINSTALL_HELPER_SCRIPTS=OFF -DBUILD_LENSTOOL=OFF + -DBUILD_FOR_SSE=OFF + -DBUILD_FOR_SSE2=OFF ) vcpkg_cmake_install() diff --git a/ports/lensfun/vcpkg.json b/ports/lensfun/vcpkg.json index 8291e2b5deea51..d4bdc39b842947 100644 --- a/ports/lensfun/vcpkg.json +++ b/ports/lensfun/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lensfun", "version": "0.3.4", + "port-version": 1, "description": "Provide a open source database of photographic lenses and their characteristics", "homepage": "https://scnlib.dev/", "license": "LGPL-3.0 OR GPL-3.0", @@ -15,13 +16,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "sse": { - "description": "Build with support for SSE" - }, - "sse2": { - "description": "Build with support for SSE2" - } - } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index da0ff6b3d9e6b8..3f8ca4c0a312a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3970,7 +3970,7 @@ }, "lensfun": { "baseline": "0.3.4", - "port-version": 0 + "port-version": 1 }, "leptonica": { "baseline": "1.83.1", diff --git a/versions/l-/lensfun.json b/versions/l-/lensfun.json index c0f68257041da2..e716e4d6240245 100644 --- a/versions/l-/lensfun.json +++ b/versions/l-/lensfun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a085269b70f184d8dbf07c595e37ce336bd79906", + "version": "0.3.4", + "port-version": 1 + }, { "git-tree": "1dd927cfac7033fe1aa1031d588ebe8295f7765c", "version": "0.3.4",