diff --git a/ports/opengl/glu.pc.in b/ports/opengl/glu.pc.in new file mode 100644 index 0000000000..1d086a91e1 --- /dev/null +++ b/ports/opengl/glu.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: glu +Description: OpenGL Utility Library +Version: @WINDOWS_SDK_SEMVER@ +Requires: opengl +Libs: -L${libdir} -lGlU32 +Cflags: -I${includedir} diff --git a/ports/opengl/opengl.pc.in b/ports/opengl/opengl.pc.in new file mode 100644 index 0000000000..231bce0851 --- /dev/null +++ b/ports/opengl/opengl.pc.in @@ -0,0 +1,9 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: OpenGL +Description: OpenGL library and headers. +Version: @WINDOWS_SDK_SEMVER@ +Libs: -L${libdir} -lOpenGL32 +Cflags: -I${includedir} diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index 72625fa15f..5a20f8ea09 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -62,6 +62,18 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore elseif(WINDOWS_SDK MATCHES "8.") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") endif() + + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY) + endif() + vcpkg_fixup_pkgconfig() + else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) endif() diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index da77cb58b2..e921d648fb 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,6 +1,5 @@ { "name": "opengl", - "version-string": "0.0", - "port-version": 9, + "version-date": "2022-03-14", "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." } diff --git a/versions/baseline.json b/versions/baseline.json index 0619f47f64..477aacabff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5061,8 +5061,8 @@ "port-version": 3 }, "opengl": { - "baseline": "0.0", - "port-version": 9 + "baseline": "2022-03-14", + "port-version": 0 }, "opengl-registry": { "baseline": "2021-11-17", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index 687d48943c..f2e28fba53 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", + "version-date": "2022-03-14", + "port-version": 0 + }, { "git-tree": "9fa8ed2a1fb625613a32ee95d2413dbc921860f7", "version-string": "0.0",