Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions ports/freeglut/gles.patch

This file was deleted.

17 changes: 0 additions & 17 deletions ports/freeglut/no_x64_enforcement.patch

This file was deleted.

6 changes: 2 additions & 4 deletions ports/freeglut/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FreeGLUTProject/freeglut
REF "v${VERSION}"
SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
SHA512 9be8dcc266daacc21aa0e11261bfe864260de6802e98e7dc84964904df4a89e52960eba94d58f4c18fc1f0ff3f13810d59fc33313c2a6e3f07d18f0b50b95849
HEAD_REF master
PATCHES
android.patch
gles.patch # amends https://github.com/freeglut/freeglut/commit/093a5a46
x11-dependencies-export.patch
fix-debug-macro.patch
no_x64_enforcement.patch
windows-output-name.patch
)

Expand Down Expand Up @@ -65,4 +63,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/glut")

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
3 changes: 1 addition & 2 deletions ports/freeglut/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "freeglut",
"version": "3.4.0",
"port-version": 3,
"version": "3.6.0",
"description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
"homepage": "https://sourceforge.net/projects/freeglut/",
"license": null,
Expand Down
10 changes: 5 additions & 5 deletions ports/freeglut/windows-output-name.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d07c9..5b79f06 100644
index 99957a1..9a5fb2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,12 +436,12 @@ IF(WIN32)
@@ -533,12 +533,12 @@ IF(WIN32)
LIST(APPEND LIBS winmm gdi32)
IF(FREEGLUT_BUILD_SHARED_LIBS)
TARGET_COMPILE_DEFINITIONS(freeglut PRIVATE FREEGLUT_EXPORTS)
Expand All @@ -15,10 +15,10 @@ index 98d07c9..5b79f06 100644
- SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
+ SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME freeglut)
ENDIF()
ENDIF()
ELSE()
# need to set machine:x64 for linker, at least for VC10, and
# doesn't hurt for older compilers:
diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index a5efb3b..6bdcdfb 100644
index e5da4ce..4eea6eb 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -71,9 +71,9 @@
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2913,8 +2913,8 @@
"port-version": 4
},
"freeglut": {
"baseline": "3.4.0",
"port-version": 3
"baseline": "3.6.0",
"port-version": 0
},
"freeimage": {
"baseline": "3.18.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/freeglut.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "501dfdaa34842155768b87802ae16c0d99baa820",
"version": "3.6.0",
"port-version": 0
},
{
"git-tree": "b222b77ede99ed4a9cfa085f32609a746340ee9d",
"version": "3.4.0",
Expand Down