diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index 4587c211cd..6e57794b7e 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -1,13 +1,13 @@ -# avcpp doesn't export any symbols -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} +if(VCPKG_TARGET_IS_WINDOWS) + # avcpp doesn't export any symbols + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO h4tr3d/avcpp REF "v${VERSION}" - SHA512 1e66afcf9a1f1085001aab9eb270cbbc6930cc42e60567300676d220120c421c44d24c7aeccb0b5c3ebd9de574ca1efbc67a29c681e3e11a796c32cc370069e4 + SHA512 f709b0ef30d4a516747156788716476fb71dda12fbedf6b757bbb82340a0a33bae5cc0e5be1e7fb00e70c8a9a693610e383caab137875d4a5043c1a9801ec9dd HEAD_REF master PATCHES 0002-av_init_packet_deprecation.patch @@ -17,20 +17,17 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) -if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) - vcpkg_add_to_path(${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf) -endif() +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}" "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DAV_BUILD_EXAMPLES=OFF - -DBUILD_TESTING=OFF ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() @@ -38,6 +35,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() +file(READ "${SOURCE_PATH}/LICENSE.md" LICENSE_MD) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-bsd.txt" "${SOURCE_PATH}/LICENSE-lgpl2.txt" COMMENT "${LICENSE_MD}") diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 318b5f7171..4deca6c742 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "avcpp", - "version": "2.1.0", + "version": "2.2.1", "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "license": "LGPL-2.1-only OR BSD-3-Clause", @@ -18,10 +18,6 @@ "swscale" ] }, - { - "name": "pkgconf", - "host": true - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 2c47c0d682..1493f9931a 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37ae9f7b52ea3f3ce0da3c7564f006639816c084", + "version": "2.2.1", + "port-version": 0 + }, { "git-tree": "7227fc33d6f65475816f10bffcdbedd6d2485298", "version": "2.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index cd5bc6ca08..229948a87b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -345,7 +345,7 @@ "port-version": 1 }, "avcpp": { - "baseline": "2.1.0", + "baseline": "2.2.1", "port-version": 0 }, "avisynthplus": {