-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[freeglut] updated to 3.2.1 (#11423)
* [freeglut] updated to 3.2.1 * [freeglut] address review comments * [freeglut] add glut forwarding header * [freeglut] revert incorrect wrapper location * [freeglut] enable FREEGLUT_REPLACE_GLUT * [freeglut] static lib renaming is not needed anymore * [freeglut] revert FREEGLUT_REPLACE_GLUT setting, always use glut.h * Revert "[freeglut] static lib renaming is not needed anymore" This reverts commit 550018c.
- Loading branch information
Showing
5 changed files
with
58 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: freeglut | ||
| Version: 3.0.0-9 | ||
| Version: 3.2.1 | ||
| Homepage: https://sourceforge.net/projects/freeglut/ | ||
| Description: Open source implementation of GLUT with source and binary backwards compatibility. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/src/fg_gl2.h b/src/fg_gl2.h | ||
| index ab8ba5c..a1a52da 100644 | ||
| --- a/src/fg_gl2.h | ||
| +++ b/src/fg_gl2.h | ||
| @@ -67,13 +67,19 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); | ||
| typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); | ||
| typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); | ||
|
|
||
| -FGH_PFNGLGENBUFFERSPROC fghGenBuffers; | ||
| -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; | ||
| -FGH_PFNGLBINDBUFFERPROC fghBindBuffer; | ||
| -FGH_PFNGLBUFFERDATAPROC fghBufferData; | ||
| -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; | ||
| -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; | ||
| -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; | ||
| +#if __GNUC__ > 9 | ||
| +#define FG_ATTRIBUTE_COMMON __attribute__((__common__)) | ||
| +#else | ||
| +#define FG_ATTRIBUTE_COMMON | ||
| +#endif | ||
| + | ||
| +FGH_PFNGLGENBUFFERSPROC FG_ATTRIBUTE_COMMON fghGenBuffers; | ||
| +FGH_PFNGLDELETEBUFFERSPROC FG_ATTRIBUTE_COMMON fghDeleteBuffers; | ||
| +FGH_PFNGLBINDBUFFERPROC FG_ATTRIBUTE_COMMON fghBindBuffer; | ||
| +FGH_PFNGLBUFFERDATAPROC FG_ATTRIBUTE_COMMON fghBufferData; | ||
| +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghEnableVertexAttribArray; | ||
| +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghDisableVertexAttribArray; | ||
| +FGH_PFNGLVERTEXATTRIBPOINTERPROC FG_ATTRIBUTE_COMMON fghVertexAttribPointer; | ||
|
|
||
| # endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 15 additions & 21 deletions
36
ports/freeglut/use_targets_to_export_x11_dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,23 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 0d3260b..edf034a 100644 | ||
| index 6f403af..4ced28a 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -257,8 +257,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) | ||
| @@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS | ||
| include/GL/freeglut_ext.h | ||
| include/GL/freeglut_std.h | ||
| ) | ||
| -IF(FREEGLUT_REPLACE_GLUT) | ||
| +IF(TRUE) | ||
| LIST(APPEND FREEGLUT_HEADERS | ||
| include/GL/glut.h | ||
| ) | ||
| @@ -312,8 +312,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) | ||
| INCLUDE(CheckIncludeFiles) | ||
| IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) | ||
| IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) | ||
| FIND_PACKAGE(X11 REQUIRED) | ||
| - INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) | ||
| - LIST(APPEND LIBS ${X11_LIBRARIES}) | ||
| - INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) | ||
| - LIST(APPEND LIBS ${X11_X11_LIB}) | ||
| + LIST(APPEND LIBS X11::X11) | ||
| IF(X11_Xrandr_FOUND) | ||
| SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) | ||
| LIST(APPEND LIBS ${X11_Xrandr_LIB}) | ||
| @@ -339,9 +337,15 @@ ENDIF() | ||
|
|
||
| IF(FREEGLUT_BUILD_SHARED_LIBS) | ||
| ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) | ||
| + IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) | ||
| + TARGET_LINK_LIBRARIES(freeglut PRIVATE X11::X11) | ||
| + ENDIF() | ||
| ENDIF() | ||
| IF(FREEGLUT_BUILD_STATIC_LIBS) | ||
| ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) | ||
| + IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) | ||
| + TARGET_LINK_LIBRARIES(freeglut_static PRIVATE X11::X11) | ||
| + ENDIF() | ||
| ENDIF() | ||
|
|
||
|
|