diff --git a/ports/avcpp/fix-pkgconfig-location.patch b/ports/avcpp/fix-pkgconfig-location.patch new file mode 100644 index 0000000000..d24d00602b --- /dev/null +++ b/ports/avcpp/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0104f4..dae0942 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -128,7 +128,7 @@ if (AVCPP_NOT_SUBPROJECT) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libavcpp.pc" +- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig") ++ DESTINATION "lib/pkgconfig") + + endif() + endif() diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index fcbf37585e..48ff0896b4 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -9,26 +9,29 @@ vcpkg_from_github( HEAD_REF master PATCHES 0002-av_init_packet_deprecation.patch + fix-pkgconfig-location.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC} - -DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED} + "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}" + "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}" -DAV_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +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) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 9f1e067384..e619be0be2 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avcpp", "version-date": "2021-06-14", + "port-version": 1, "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "dependencies": [ @@ -12,6 +13,7 @@ "avdevice", "avfilter", "avformat", + "postproc", "swresample", "swscale" ] diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 4b4edbcc80..9394cae4e4 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caf5460d5bfca1d608b7c7eab2bd2872080bf0d8", + "version-date": "2021-06-14", + "port-version": 1 + }, { "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", "version-date": "2021-06-14", diff --git a/versions/baseline.json b/versions/baseline.json index 9e45d2137c..011091d02e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -242,7 +242,7 @@ }, "avcpp": { "baseline": "2021-06-14", - "port-version": 0 + "port-version": 1 }, "avisynthplus": { "baseline": "3.7.0",