diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-09-17 09:31:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 18:31:30 -0700 |
| commit | 69d5556d0d8c105f75055326cef346546e40e615 (patch) | |
| tree | a12bad6152ccaa044abdd44945b4f2aee1ad374c /ports/libproxy/fix-dependency-libmodman.patch | |
| parent | 574c125d6f1dd8150dadf1e116cd182823591626 (diff) | |
| download | vcpkg-69d5556d0d8c105f75055326cef346546e40e615.tar.gz vcpkg-69d5556d0d8c105f75055326cef346546e40e615.zip | |
[ffnvcodec/libproxy] Update to latest release version (#20169)
* [ffnvcodec/libproxy] Update to latest release version
* Small changes
* [ffnvcodec] Use version instead of version-string.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/libproxy/fix-dependency-libmodman.patch')
| -rw-r--r-- | ports/libproxy/fix-dependency-libmodman.patch | 59 |
1 files changed, 45 insertions, 14 deletions
diff --git a/ports/libproxy/fix-dependency-libmodman.patch b/ports/libproxy/fix-dependency-libmodman.patch index c84b86d01..84a17411b 100644 --- a/ports/libproxy/fix-dependency-libmodman.patch +++ b/ports/libproxy/fix-dependency-libmodman.patch @@ -1,21 +1,52 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 451e7a6..b6782fb 100644 +index 4f51e38..32a0319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,13 +32,15 @@ option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) - ### Subdirectories - # Conditionally build bundled libmodman - option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) --find_package(libmodman QUIET) +@@ -31,11 +31,15 @@ include(cmake/ctest.cmk) + include(cmake/paths.cmk) + + option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) +- +-### Subdirectories +- +-add_subdirectory(libmodman) +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +find_package(libmodman REQUIRED) - if(LIBMODMAN_FOUND) - if("${LIBMODMAN_VERSION_MAJOR}" STREQUAL "2") - message(STATUS "Building with system libmodman") - else() - message(FATAL_ERROR "Found incompatible libmodman on your system (libmodman 2.X is needed)") - endif() ++if(LIBMODMAN_FOUND) + include_directories(${LIBMODMAN_INCLUDE_DIR}) + link_libraries(${LIBMODMAN_LIBRARIES}) ++else() ++ ### Subdirectories ++ add_subdirectory(libmodman) ++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ++endif() + + # Conditionally build bindings + if(NOT WIN32) +diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk +index 9356486..f9eed2c 100644 +--- a/libproxy/cmake/libproxy.cmk ++++ b/libproxy/cmake/libproxy.cmk +@@ -1,8 +1,8 @@ + add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES}) + if(WIN32) +- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};ws2_32;${LIBPROXY_LIBRARIES}) else() - if(FORCE_SYSTEM_LIBMODMAN) - message(FATAL_ERROR "Libmodman could not be found on your system") +- target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) + endif() + file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR) + if(WIN32) +@@ -21,8 +21,8 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp + set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") + set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") +-if(NOT APPLE) +- set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") +-endif() ++#if(NOT APPLE) ++# set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") ++#endif() + install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) + install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) |