-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
52 changed files
with
451 additions
and
262 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
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,7 +1,7 @@ | ||
| { | ||
| "name": "ace", | ||
| "version": "7.0.11", | ||
| "port-version": 1, | ||
| "port-version": 2, | ||
| "maintainers": "Johnny Willemsen <[email protected]>", | ||
| "description": "The ADAPTIVE Communication Environment", | ||
| "homepage": "https://github.com/DOCGroup/ACE_TAO", | ||
|
|
||
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
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
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| The package freeglut is compatible with built-in CMake targets: | ||
| freeglut provides CMake targets: | ||
|
|
||
| find_package(FreeGLUT CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:FreeGLUT::freeglut>,FreeGLUT::freeglut,FreeGLUT::freeglut_static>) | ||
|
|
||
| freeglut is compatible with built-in CMake targets: | ||
|
|
||
| find_package(GLUT REQUIRED) | ||
| target_link_libraries(main PRIVATE GLUT::GLUT) |
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
16 changes: 11 additions & 5 deletions
16
...freeglut/windows-static-output-name.patch → ports/freeglut/windows-output-name.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
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,63 +1,20 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 6f403af..4ced28a 100644 | ||
| index 5568b63..bec3de5 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -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 | ||
| ) | ||
| @@ -319,23 +319,27 @@ IF(CMAKE_COMPILER_IS_GNUCC) | ||
| ENDIF() | ||
| ENDIF(CMAKE_COMPILER_IS_GNUCC) | ||
|
|
||
| +SET(xlibs_private "") | ||
| INCLUDE(CheckIncludeFiles) | ||
| IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) | ||
| FIND_PACKAGE(X11 REQUIRED) | ||
| - INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) | ||
| - LIST(APPEND LIBS ${X11_X11_LIB}) | ||
| + LIST(APPEND LIBS X11::X11) | ||
| + set(xlibs_private "-lX11") | ||
| IF(X11_Xrandr_FOUND) | ||
| SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) | ||
| - LIST(APPEND LIBS ${X11_Xrandr_LIB}) | ||
| + LIST(APPEND LIBS X11::Xrandr) | ||
| + STRING(APPEND xlibs_private " -lXrandr") | ||
| ENDIF() | ||
| - IF(X11_xf86vmode_FOUND) | ||
| + IF(X11_Xxf86vm_FOUND) | ||
| SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) | ||
| - LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) | ||
| + LIST(APPEND LIBS X11::Xxf86vm) | ||
| + STRING(APPEND xlibs_private " -lXxf86vm") | ||
| ENDIF() | ||
| IF(X11_Xinput_FOUND) | ||
| # Needed for multi-touch: | ||
| CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) | ||
| - LIST(APPEND LIBS ${X11_Xinput_LIB}) | ||
| + LIST(APPEND LIBS X11::Xi) | ||
| + STRING(APPEND xlibs_private " -lXi") | ||
| ELSE() | ||
| MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") | ||
| ENDIF() | ||
| @@ -586,13 +590,13 @@ ELSEIF(FREEGLUT_GLES) | ||
| ELSEIF(FREEGLUT_WAYLAND) | ||
| SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGLESv2 -lGLESv1_CM -lEGL -lxkbcommon -lm") | ||
| ELSE() | ||
| - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lGLESv1_CM -lEGL -lm") | ||
| + SET(PC_LIBS_PRIVATE "${xlibs_private} -lGLESv2 -lGLESv1_CM -lEGL -lm") | ||
| ENDIF() | ||
| ELSE() | ||
| IF(FREEGLUT_WAYLAND) | ||
| SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGL -lxkbcommon -lm") | ||
| ELSE() | ||
| - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") | ||
| + SET(PC_LIBS_PRIVATE "${xlibs_private} -lGL -lm") | ||
| @@ -620,6 +620,15 @@ ELSE() | ||
| SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") | ||
| ENDIF() | ||
| ENDIF() | ||
| +if(NOT X11_Xrandr_FOUND) | ||
| + string(REPLACE " -lXrandr" "" PC_LIBS_PRIVATE "${PC_LIBS_PRIVATE}") | ||
| +endif() | ||
| +if(NOT X11_xf86vmode_FOUND) | ||
| + string(REPLACE " -lXxf86vm" "" PC_LIBS_PRIVATE "${PC_LIBS_PRIVATE}") | ||
| +endif() | ||
| +if(X11_Xinput_FOUND) | ||
| + string(REPLACE "-lX11 " "-lX11 -lXi " PC_LIBS_PRIVATE "${PC_LIBS_PRIVATE}") | ||
| +endif() | ||
| # Client applications need to define FreeGLUT GLES version to | ||
| # bootstrap headers inclusion in freeglut_std.h: | ||
| SET(PC_LIBNAME ${LIBNAME}) |
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,12 @@ | ||
| diff --git a/cmake/GameNetworkingSocketsConfig.cmake.in b/cmake/GameNetworkingSocketsConfig.cmake.in | ||
| index 1a27988..5076a6e 100644 | ||
| --- a/cmake/GameNetworkingSocketsConfig.cmake.in | ||
| +++ b/cmake/GameNetworkingSocketsConfig.cmake.in | ||
| @@ -3,6 +3,7 @@ | ||
| include(CMakeFindDependencyMacro) | ||
|
|
||
| find_dependency(Threads) | ||
| +find_dependency(Protobuf) | ||
|
|
||
| if(@USE_CRYPTO@ STREQUAL "OpenSSL") | ||
| find_dependency(OpenSSL) |
Oops, something went wrong.