move to own git serverHEADmaster

9 files changed, 252 insertions, 0 deletions

diff --git a/vcpkg/ports/freeglut/android.patch b/vcpkg/ports/freeglut/android.patch
new file mode 100644
index 0000000..dd4753f
--- /dev/null
+++ b/vcpkg/ports/freeglut/android.patch
@@ -0,0 +1,12 @@
+diff --git a/src/android/native_app_glue/android_native_app_glue.c b/src/android/native_app_glue/android_native_app_glue.c
+index be8d941..6ddae78 100644
+--- a/src/android/native_app_glue/android_native_app_glue.c
++++ b/src/android/native_app_glue/android_native_app_glue.c
+@@ -18,6 +18,7 @@
+ #include <jni.h>
+ 
+ #include <errno.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/resource.h>
diff --git a/vcpkg/ports/freeglut/cmake-version.patch b/vcpkg/ports/freeglut/cmake-version.patch
new file mode 100644
index 0000000..34a951b
--- /dev/null
+++ b/vcpkg/ports/freeglut/cmake-version.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a5fb2b..a9ddfea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.5 FATAL_ERROR)
+ PROJECT(freeglut LANGUAGES C)
+ 
+ if (POLICY CMP0072)
diff --git a/vcpkg/ports/freeglut/fix-debug-macro.patch b/vcpkg/ports/freeglut/fix-debug-macro.patch
new file mode 100644
index 0000000..69f9e82
--- /dev/null
+++ b/vcpkg/ports/freeglut/fix-debug-macro.patch
@@ -0,0 +1,35 @@
+diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
+index a658c7c..a5efb3b 100644
+--- a/include/GL/freeglut_std.h
++++ b/include/GL/freeglut_std.h
+@@ -70,7 +70,7 @@
+ 
+         /* Link with Win32 static freeglut lib */
+ #       if FREEGLUT_LIB_PRAGMAS
+-#           ifdef NDEBUG
++#           if defined(NDEBUG) || !defined(_DEBUG)
+ #              pragma comment (lib, "freeglut_static.lib")
+ #           else
+ #              pragma comment (lib, "freeglut_staticd.lib")
+@@ -88,7 +88,7 @@
+ 
+             /* Link with Win32 shared freeglut lib */
+ #           if FREEGLUT_LIB_PRAGMAS
+-#               ifdef NDEBUG
++#               if defined(NDEBUG) || !defined(_DEBUG)
+ #                   pragma comment (lib, "freeglut.lib")
+ #               else
+ #                   pragma comment (lib, "freeglutd.lib")
+diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c
+index a1b9cbb..a20c53d 100644
+--- a/src/blackberry/fg_main_blackberry.c
++++ b/src/blackberry/fg_main_blackberry.c
+@@ -31,7 +31,7 @@
+ #include "fg_internal.h"
+ #include "egl/fg_window_egl.h"
+ 
+-#ifdef NDEBUG
++#if defined(NDEBUG) || !defined(_DEBUG)
+ #define LOGI(...)
+ #endif
+ 
diff --git a/vcpkg/ports/freeglut/portfile.cmake b/vcpkg/ports/freeglut/portfile.cmake
new file mode 100755
index 0000000..29df67d
--- /dev/null
+++ b/vcpkg/ports/freeglut/portfile.cmake
@@ -0,0 +1,74 @@
+vcpkg_download_distfile(fgPlatformDestroyContext_PATCH
+    URLS https://github.com/freeglut/freeglut/commit/800772e993a3ceffa01ccf3fca449d3279cde338.diff?full_index=1
+    FILENAME FreeGLUTProject-freeglut-800772e.diff
+    SHA512 08a20f3c2d3e093c9cdc973a021600e9e6169d37c035bc4c64480f23cb8a3338514087c68a2bbc4ffd7a9febe542f5d0172a638357a02c2f0af93d3273f5717e
+)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO FreeGLUTProject/freeglut
+    REF "v${VERSION}"
+    SHA512 9be8dcc266daacc21aa0e11261bfe864260de6802e98e7dc84964904df4a89e52960eba94d58f4c18fc1f0ff3f13810d59fc33313c2a6e3f07d18f0b50b95849
+    HEAD_REF master
+    PATCHES
+        android.patch
+        x11-dependencies-export.patch
+        fix-debug-macro.patch
+        windows-output-name.patch
+        cmake-version.patch
+        ${fgPlatformDestroyContext_PATCH}
+)
+
+if(VCPKG_TARGET_IS_OSX)
+    message("Freeglut currently requires Xquartz for macOS.")
+elseif(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID)
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev")
+endif()
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FREEGLUT_DYNAMIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFREEGLUT_BUILD_STATIC_LIBS=${FREEGLUT_STATIC}
+        -DFREEGLUT_BUILD_SHARED_LIBS=${FREEGLUT_DYNAMIC}
+        -DFREEGLUT_REPLACE_GLUT=ON
+        -DFREEGLUT_BUILD_DEMOS=OFF
+        -DINSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it
+)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT)
+vcpkg_fixup_pkgconfig()
+
+file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc"  "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+foreach(file IN LISTS pc_files)
+    vcpkg_replace_string("${file}" ";-D" " -D" IGNORE_UNCHANGED)
+endforeach()
+
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc")
+    if(NOT VCPKG_BUILD_TYPE)
+        if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd" IGNORE_UNCHANGED)
+        endif()
+        file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc")
+    endif()
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h"
+        "ifdef FREEGLUT_STATIC"
+        "if 1 //ifdef FREEGLUT_STATIC"
+    )
+endif()
+
+# Clean
+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}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/vcpkg/ports/freeglut/usage b/vcpkg/ports/freeglut/usage
new file mode 100644
index 0000000..30c5e63
--- /dev/null
+++ b/vcpkg/ports/freeglut/usage
@@ -0,0 +1,9 @@
+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)

diff --git a/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake b/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 0000000..f7f792c
--- /dev/null
+++ b/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,37 @@
+_find_package(${ARGS})

+if(GLUT_FOUND AND UNIX AND NOT ANDROID)

+    cmake_policy(PUSH)

+    cmake_policy(SET CMP0012 NEW)

+    cmake_policy(SET CMP0054 NEW)

+    cmake_policy(SET CMP0057 NEW)

+

+    if(GLUT_LINK_LIBRARIES)

+        # Since CMake 3.22, FindGLUT.cmake loads the glut pkg-config module.

+        # We need `-lglut` resolved to an absolute path.

+        set(GLUT_LIBRARIES "${GLUT_LINK_LIBRARIES}")

+    else()

+        find_package(X11)

+        # Before CMake 3.14, FindX11.cmake doesn't create imported targets.

+        # For X11, we simply assume shared linkage of system libs,

+        # so order and transitive usage requirements don't matter.

+        if(X11_FOUND AND NOT "X11" IN_LIST GLUT_LIBRARIES)

+            list(APPEND GLUT_LIBRARIES "${X11_X11_LIB}")

+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_X11_LIB}")

+        endif()

+        if(X11_Xrandr_FOUND AND NOT "Xrandr" IN_LIST GLUT_LIBRARIES)

+            list(APPEND GLUT_LIBRARIES "${X11_Xrandr_LIB}")

+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xrandr_LIB}")

+        endif()

+        # X11_xf86vmode_FOUND for CMake < 3.14

+        if((X11_Xxf86vm_FOUND OR X11_xf86vmode_FOUND) AND NOT "Xxf86vm" IN_LIST GLUT_LIBRARIES)

+            list(APPEND GLUT_LIBRARIES "${X11_Xxf86vm_LIB}")

+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xxf86vm_LIB}")

+        endif()

+        if(X11_Xi_FOUND AND NOT GLUT_Xi_LIBRARY AND NOT "Xi" IN_LIST GLUT_LIBRARIES)

+            list(APPEND GLUT_LIBRARIES "${X11_Xi_LIB}")

+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xi_LIB}")

+        endif()

+    endif()

+

+    cmake_policy(POP)

+endif()

diff --git a/vcpkg/ports/freeglut/vcpkg.json b/vcpkg/ports/freeglut/vcpkg.json
new file mode 100644
index 0000000..651fa10
--- /dev/null
+++ b/vcpkg/ports/freeglut/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "freeglut",
+  "version": "3.6.0",
+  "port-version": 2,
+  "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
+  "homepage": "https://sourceforge.net/projects/freeglut/",
+  "license": null,
+  "supports": "!ios",
+  "dependencies": [
+    "opengl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/vcpkg/ports/freeglut/windows-output-name.patch b/vcpkg/ports/freeglut/windows-output-name.patch
new file mode 100644
index 0000000..c485d3f
--- /dev/null
+++ b/vcpkg/ports/freeglut/windows-output-name.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99957a1..9a5fb2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -533,12 +533,12 @@ IF(WIN32)
+     LIST(APPEND LIBS winmm gdi32)
+     IF(FREEGLUT_BUILD_SHARED_LIBS)
+         TARGET_COMPILE_DEFINITIONS(freeglut PRIVATE FREEGLUT_EXPORTS)
+-        SET_TARGET_PROPERTIES(freeglut PROPERTIES OUTPUT_NAME ${LIBNAME})
++        SET_TARGET_PROPERTIES(freeglut PROPERTIES OUTPUT_NAME freeglut)
+     ENDIF()
+     IF(FREEGLUT_BUILD_STATIC_LIBS)
+         TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC)
+         IF(FREEGLUT_REPLACE_GLUT)
+-            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
++            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME freeglut)
+         ENDIF()
+         # 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 e5da4ce..4eea6eb 100644
+--- a/include/GL/freeglut_std.h
++++ b/include/GL/freeglut_std.h
+@@ -71,9 +71,9 @@
+         /* Link with Win32 static freeglut lib */
+ #       if FREEGLUT_LIB_PRAGMAS
+ #           if defined(NDEBUG) || !defined(_DEBUG)
+-#              pragma comment (lib, "freeglut_static.lib")
++#              pragma comment (lib, "freeglut.lib")
+ #           else
+-#              pragma comment (lib, "freeglut_staticd.lib")
++#              pragma comment (lib, "freeglutd.lib")
+ #           endif
+ #       endif
+ 
diff --git a/vcpkg/ports/freeglut/x11-dependencies-export.patch b/vcpkg/ports/freeglut/x11-dependencies-export.patch
new file mode 100644
index 0000000..fd25986
--- /dev/null
+++ b/vcpkg/ports/freeglut/x11-dependencies-export.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5568b63..bec3de5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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})