diff --git a/ports/freetype-gl/0006-link-targets-glew.patch b/ports/freetype-gl/0006-link-targets-glew.patch new file mode 100644 index 00000000000000..184a2070ad2d87 --- /dev/null +++ b/ports/freetype-gl/0006-link-targets-glew.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f8d7dd..40d72f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,7 +112,7 @@ include_directories( + ${OPENGL_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} +- ${GLEW_INCLUDE_PATH} ++ + ${PROJECT_BINARY_DIR} + ) + +@@ -196,7 +196,7 @@ target_link_libraries(freetype-gl + ${OPENGL_LIBRARY} + ${FREETYPE_LIBRARIES} + ${MATH_LIBRARY} +- ${GLEW_LIBRARY} ++ GLEW::GLEW + ) + + if(freetype-gl_BUILD_MAKEFONT) +@@ -207,7 +207,7 @@ if(freetype-gl_BUILD_MAKEFONT) + ${OPENGL_LIBRARY} + ${FREETYPE_LIBRARIES} + ${MATH_LIBRARY} +- ${GLEW_LIBRARY} ++ GLEW::GLEW + ) + + if(MSVC AND NOT (MSVC_VERSION LESS 1900)) diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 5dffbd140c3f81..1d03835d4a58aa 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0003-Add-exports.patch 0004-Change-install-dir-for-pkgconfig.patch 0005-add-version.patch + 0006-link-targets-glew.patch ) vcpkg_check_features( diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index a659b5bd65f68e..56013718688926 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freetype-gl", "version": "1.0", + "port-version": 1, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ diff --git a/ports/glew/0004-definition-GLEW_NO_GLU.patch b/ports/glew/0004-definition-GLEW_NO_GLU.patch new file mode 100644 index 00000000000000..b9230b9b82e6eb --- /dev/null +++ b/ports/glew/0004-definition-GLEW_NO_GLU.patch @@ -0,0 +1,12 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index 25fb90b..68b977d 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -155,6 +155,7 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12) + else() + target_compile_definitions(glew_s INTERFACE "GLEW_STATIC") + foreach(t glew glew_s) ++ target_compile_definitions(${t} PUBLIC $) + target_include_directories(${t} PUBLIC $) + endforeach() + set(MAYBE_EXPORT EXPORT glew-targets) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 0757e2cd95dd7d..847a3096b3277c 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive( PATCHES fix-LNK2019.patch base_address.patch # Accepted upstream as https://github.com/nigels-com/glew/commit/ef7d12ecb7f1f336f6d3a80cebd6163b2c094108 + 0004-definition-GLEW_NO_GLU.patch ) vcpkg_cmake_configure( diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json index a0c251e58d2694..7e650c3035ec7d 100644 --- a/ports/glew/vcpkg.json +++ b/ports/glew/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glew", "version": "2.2.0", - "port-version": 4, + "port-version": 5, "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", "homepage": "https://github.com/nigels-com/glew", "supports": "!android", diff --git a/versions/baseline.json b/versions/baseline.json index 473260f7f95142..43d536983a11cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2922,7 +2922,7 @@ }, "freetype-gl": { "baseline": "1.0", - "port-version": 0 + "port-version": 1 }, "freexl": { "baseline": "2.0.0", @@ -3130,7 +3130,7 @@ }, "glew": { "baseline": "2.2.0", - "port-version": 4 + "port-version": 5 }, "glfw3": { "baseline": "3.4", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index d9c0894a52b04f..1f47908735d865 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71dfebb898ff8cecac6cc59d8a865a56712a783f", + "version": "1.0", + "port-version": 1 + }, { "git-tree": "214e21b36f0f4b0ae0d9514eed1eba20f3c2ff4d", "version": "1.0", diff --git a/versions/g-/glew.json b/versions/g-/glew.json index bccbda57424b7f..8de283507b74f5 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c70117b6ee330758f04a593be04d75a5d45fdd8", + "version": "2.2.0", + "port-version": 5 + }, { "git-tree": "bf42d73479dcd0f239b71dbed4d0d3af22efb294", "version": "2.2.0",