[libde265] Fix incorrect pc file (#31477)

* [libde265] Fix incorrect pc file

* Apply upstream change
This commit is contained in:
Cheney Wang 2023-05-19 02:28:08 +08:00 committed by GitHub
parent f2446c13a9
commit 14a96b1980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 17 deletions

View File

@ -0,0 +1,11 @@
diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
index 2856f90..ccbc8b6 100644
--- a/libde265/CMakeLists.txt
+++ b/libde265/CMakeLists.txt
@@ -147,5 +147,6 @@ else()
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()
+set(VERSION ${PROJECT_VERSION}) # so that the replacement in libde265.pc will work with both autotools and CMake
configure_file(../libde265.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

View File

@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-interface-include.patch
fix-lib-version.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -23,22 +24,6 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265)
vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN)
set(prefix "")
set(exec_prefix [[${prefix}]])
set(libdir [[${prefix}/lib]])
set(includedir [[${prefix}/include]])
set(LIBS "")
configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" @ONLY)
# The produced library name is `liblibde265.a` or `libde265.lib`
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265")
# libde265's pc file assumes libstdc++, which isn't always true.
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" " -lstdc++" "")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" " -lstdc++" "")
endif()
vcpkg_fixup_pkgconfig()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

View File

@ -1,6 +1,7 @@
{
"name": "libde265",
"version": "1.0.11",
"port-version": 1,
"description": "Open h.265 video codec implementation.",
"homepage": "https://www.libde265.org/",
"license": "LGPL-3.0-only",

View File

@ -3930,7 +3930,7 @@
},
"libde265": {
"baseline": "1.0.11",
"port-version": 0
"port-version": 1
},
"libdeflate": {
"baseline": "1.17",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "35f74e1100615e9ff16d6b05529baf8e7de774aa",
"version": "1.0.11",
"port-version": 1
},
{
"git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550",
"version": "1.0.11",