diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2020-02-03 15:45:23 +0100 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2020-02-03 15:45:23 +0100 |
| commit | 3310f8e728e95071943097fe07b4f0135394f4e0 (patch) | |
| tree | 5a44ac4e1b09392b8092faff4b0730241f116fb2 | |
| parent | 3f6be88a04c0b850d328d90239d5a33d0d467c62 (diff) | |
| download | vcpkg-3310f8e728e95071943097fe07b4f0135394f4e0.tar.gz vcpkg-3310f8e728e95071943097fe07b4f0135394f4e0.zip | |
fix the xrandr link issue
| -rw-r--r-- | ports/libwebp/0009-glut.patch | 23 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/ports/libwebp/0009-glut.patch b/ports/libwebp/0009-glut.patch new file mode 100644 index 000000000..e1bf267ed --- /dev/null +++ b/ports/libwebp/0009-glut.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efd10887b..8b41cc1ba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -470,7 +470,7 @@ if(WEBP_BUILD_VWEBP) + target_link_libraries(vwebp
+ ${OPENGL_LIBRARIES}
+ exampleutil
+- ${GLUT_glut_LIBRARY}
++ GLUT::GLUT
+ imageioutil
+ webp
+ webpdemux)
+@@ -481,6 +481,9 @@ if(WEBP_BUILD_VWEBP) + if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) + find_package(X11 REQUIRED) + target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) ++ if(X11_Xrandr_FOUND) # due to glut linking xrandr if found ++ target_link_libraries(vwebp ${X11_Xrandr_LIB}) ++ endif() + endif() + install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index d24fd12d1..81040ad05 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0006-fix-dependecies-platform.patch 0007-fix-arm-build.patch 0008-sdl.patch + 0009-glut.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |