From a01aa44818d455d63c109bf725d6af9dbf7539d1 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 26 Feb 2026 19:11:51 +0900 Subject: [PATCH 1/2] [avcpp] update to 3.0.1 --- ports/avcpp/0003-fix-minmax.patch | 31 ------------- ports/avcpp/portfile.cmake | 77 +++++++++++++++---------------- ports/avcpp/vcpkg.json | 2 +- versions/a-/avcpp.json | 5 ++ versions/baseline.json | 2 +- 5 files changed, 45 insertions(+), 72 deletions(-) delete mode 100644 ports/avcpp/0003-fix-minmax.patch diff --git a/ports/avcpp/0003-fix-minmax.patch b/ports/avcpp/0003-fix-minmax.patch deleted file mode 100644 index 3100048f878bb4..00000000000000 --- a/ports/avcpp/0003-fix-minmax.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/avutils.h b/src/avutils.h -index ad8ca49..178e8d5 100644 ---- a/src/avutils.h -+++ b/src/avutils.h -@@ -510,10 +510,10 @@ T guessValue(const T& value, L list) - return value; - - T best = value; -- T bestDistance = std::numeric_limits::max(); -+ T bestDistance = (std::numeric_limits::max)(); - - for (auto&& cur : list) { -- auto const distance = std::max(cur, value) - std::min(cur, value); -+ auto const distance = (std::max)(cur, value) - (std::min)(cur, value); - if (distance < bestDistance) { - bestDistance = distance; - best = cur; -@@ -565,11 +565,11 @@ T guessValue(const T& value, const L * list, C endListComparator) - return value; - - T best = value; -- T bestDistance = std::numeric_limits::max(); -+ T bestDistance = (std::numeric_limits::max)(); - - for (const L * ptr = list; !endListComparator(*ptr); ++ptr) { - auto const cur = *ptr; -- auto const distance = std::max(cur, value) - std::min(cur, value); -+ auto const distance = (std::max)(cur, value) - (std::min)(cur, value); - if (distance < bestDistance) { - bestDistance = distance; - best = cur; diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index e694bece9404ad..857e3077365e74 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -1,39 +1,38 @@ -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 a0f4a6577ab9586cd9f8b5bc4ea4329a74857918099473fb366d57dc01d90be6653f81e0a4dd83cb1b35370c99bb34313f2d015d27fac26689feff97a97ff18b - HEAD_REF master - PATCHES - 0002-av_init_packet_deprecation.patch - 0003-fix-minmax.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) - -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 -) -vcpkg_cmake_install() -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(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}") +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 f23102b3404aad89fe0bf1b7b19c72b09771c55c58043954999afbead7b2e68a4cd807073596c5d39b328fb17c69d23f9e64f86e8092a1b059c05bb6c2df82a7 + HEAD_REF master + PATCHES + 0002-av_init_packet_deprecation.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) + +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 +) +vcpkg_cmake_install() +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(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 0a7ea77b19774b..3480c0d81778dc 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "avcpp", - "version": "2.90.1", + "version": "3.0.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", diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 7434100276dbca..3fd9463670df94 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "098a4dbb76ffa733ac2f0e19ec1155ee0e040f07", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "bfc7b9ad3262b1757d1c5e8acccae0d21e2224cc", "version": "2.90.1", diff --git a/versions/baseline.json b/versions/baseline.json index 9fdf86c187345d..263985f0bd9417 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -429,7 +429,7 @@ "port-version": 0 }, "avcpp": { - "baseline": "2.90.1", + "baseline": "3.0.1", "port-version": 0 }, "avir": { From 21580e411ad4cf16d503c1a7931422e1f3a06f88 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 26 Feb 2026 19:13:01 +0900 Subject: [PATCH 2/2] revert end of lines --- ports/avcpp/portfile.cmake | 76 +++++++++++++++++++------------------- versions/a-/avcpp.json | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index 857e3077365e74..8b8fd1b6c44358 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -1,38 +1,38 @@ -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 f23102b3404aad89fe0bf1b7b19c72b09771c55c58043954999afbead7b2e68a4cd807073596c5d39b328fb17c69d23f9e64f86e8092a1b059c05bb6c2df82a7 - HEAD_REF master - PATCHES - 0002-av_init_packet_deprecation.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) - -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 -) -vcpkg_cmake_install() -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(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}") +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 f23102b3404aad89fe0bf1b7b19c72b09771c55c58043954999afbead7b2e68a4cd807073596c5d39b328fb17c69d23f9e64f86e8092a1b059c05bb6c2df82a7 + HEAD_REF master + PATCHES + 0002-av_init_packet_deprecation.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) + +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 +) +vcpkg_cmake_install() +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(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/versions/a-/avcpp.json b/versions/a-/avcpp.json index 3fd9463670df94..457d6ad2e86bd7 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "098a4dbb76ffa733ac2f0e19ec1155ee0e040f07", + "git-tree": "4e0e7dc8ef987b1b2f13002eaf3cca4c9927d0a9", "version": "3.0.1", "port-version": 0 },