move to own git serverHEADmaster

7 files changed, 312 insertions, 0 deletions

diff --git a/vcpkg/ports/fltk/config-path.patch b/vcpkg/ports/fltk/config-path.patch
new file mode 100644
index 0000000..946f446
--- /dev/null
+++ b/vcpkg/ports/fltk/config-path.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/setup.cmake b/CMake/setup.cmake
+index 60b7da1..6831d29 100644
+--- a/CMake/setup.cmake
++++ b/CMake/setup.cmake
+@@ -65,6 +65,8 @@ else ()
+   set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
+ endif (WIN32 AND NOT CYGWIN)
+ 
++set(FLTK_CONFIG_PATH share/fltk)
++
+ include(TestBigEndian)
+ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+ 
diff --git a/vcpkg/ports/fltk/dependencies.patch b/vcpkg/ports/fltk/dependencies.patch
new file mode 100644
index 0000000..8483998
--- /dev/null
+++ b/vcpkg/ports/fltk/dependencies.patch
@@ -0,0 +1,97 @@
+diff --git a/CMake/options.cmake b/CMake/options.cmake
+index d1e299f..d20e9c8 100644
+--- a/CMake/options.cmake
++++ b/CMake/options.cmake
+@@ -101,11 +101,14 @@ endif ()
+ #######################################################################
+ 
+ if (OPTION_USE_SYSTEM_ZLIB)
+-  find_package (ZLIB)
++  find_package(ZLIB REQUIRED)
++  set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ if (OPTION_USE_SYSTEM_LIBPNG)
+-  find_package (PNG)
++  find_package(PNG REQUIRED)
++  set(HAVE_PNG_H "${PNG_FOUND}")
++  set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ # If we use the system zlib, we must also use the system png zlib and vice versa
+@@ -148,7 +151,8 @@ set (HAVE_LIBZ 1)
+ #######################################################################
+ 
+ if (OPTION_USE_SYSTEM_LIBJPEG)
+-  find_package (JPEG)
++  find_package(JPEG REQUIRED)
++  set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ if (OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
+@@ -228,7 +232,7 @@ endif (APPLE)
+ # find X11 libraries and headers
+ set (PATH_TO_XLIBS)
+ if (NOT APPLE AND NOT WIN32)
+-  include (FindX11)
++  find_package(X11)
+   if (X11_FOUND)
+     set (USE_X11 1)
+     list (APPEND FLTK_LDLIBS -lX11)
+@@ -351,7 +355,7 @@ if (HAVE_GL)
+ endif (HAVE_GL)
+ 
+ if (OPTION_USE_GL)
+-  include (FindOpenGL)
++  find_package(OpenGL REQUIRED)
+   if (APPLE)
+     set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
+   endif (APPLE)
+@@ -421,7 +425,7 @@ set (FLTK_PTHREADS_FOUND FALSE)
+ 
+ if (OPTION_USE_THREADS)
+ 
+-  include (FindThreads)
++  find_package(Threads REQUIRED)
+ 
+   if (CMAKE_HAVE_THREADS_LIBRARY)
+     add_definitions ("-D_THREAD_SAFE -D_REENTRANT")
+diff --git a/CMake/resources.cmake b/CMake/resources.cmake
+index a763fb6..5fdb3d5 100644
+--- a/CMake/resources.cmake
++++ b/CMake/resources.cmake
+@@ -39,7 +39,7 @@ endmacro (fl_find_header)
+ # Include FindPkgConfig for later use of pkg-config
+ #######################################################################
+ 
+-include (FindPkgConfig)
++find_package(PkgConfig)
+ 
+ # fl_debug_var (PKG_CONFIG_FOUND)
+ # fl_debug_var (PKG_CONFIG_EXECUTABLE)
+@@ -131,8 +131,7 @@ mark_as_advanced (HAVE_X11_XREGION_H)
+ 
+ # where to find freetype headers
+ 
+-find_path (FREETYPE_PATH freetype.h PATH_SUFFIXES freetype2)
+-find_path (FREETYPE_PATH freetype/freetype.h PATH_SUFFIXES freetype2)
++set(FREETYPE_PATH "" CACHE INTERNAL "Obsolete")
+ 
+ if (FREETYPE_PATH)
+   include_directories (${FREETYPE_PATH})
+@@ -142,11 +141,12 @@ mark_as_advanced (FREETYPE_PATH)
+ 
+ #######################################################################
+ # libraries
+-find_library (LIB_dl dl)
++set(LIB_dl "${CMAKE_DL_LIBS}" CACHE STRING "")
+ if (NOT APPLE)
+-  find_library (LIB_fontconfig fontconfig)
++  find_package(Fontconfig REQUIRED)
++  set(LIB_fontconfig "${Fontconfig_LIBRARIES}" CACHE INTERNAL "")
+ endif (NOT APPLE)
+-find_library (LIB_freetype freetype)
++set(LIB_freetype "" CACHE INTERNAL "Obsolete")
+ find_library (LIB_GL GL)
+ find_library (LIB_MesaGL MesaGL)
+ find_library (LIB_GLEW NAMES GLEW glew32)
diff --git a/vcpkg/ports/fltk/fix-system-link.patch b/vcpkg/ports/fltk/fix-system-link.patch
new file mode 100644
index 0000000..e4c3240
--- /dev/null
+++ b/vcpkg/ports/fltk/fix-system-link.patch
@@ -0,0 +1,16 @@
+diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
+index 7e3490b..682a000 100644
+--- a/CMake/fl_add_library.cmake
++++ b/CMake/fl_add_library.cmake
+@@ -39,6 +39,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+ 
+   target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+ 
++    if (APPLE)
++        find_library(Cocoa Cocoa)
++        target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
++    endif()
++
+   # target properties for all libraries
+ 
+   set_target_properties(${TARGET_NAME}
diff --git a/vcpkg/ports/fltk/include.patch b/vcpkg/ports/fltk/include.patch
new file mode 100644
index 0000000..993c717
--- /dev/null
+++ b/vcpkg/ports/fltk/include.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
+index 29baa95..7e3490b 100644
+--- a/CMake/fl_add_library.cmake
++++ b/CMake/fl_add_library.cmake
+@@ -37,6 +37,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+ 
+   add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
+ 
++  target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
++
+   # target properties for all libraries
+ 
+   set_target_properties(${TARGET_NAME}
diff --git a/vcpkg/ports/fltk/math-h-polyfill.patch b/vcpkg/ports/fltk/math-h-polyfill.patch
new file mode 100644
index 0000000..1591f19
--- /dev/null
+++ b/vcpkg/ports/fltk/math-h-polyfill.patch
@@ -0,0 +1,13 @@
+diff --git a/FL/math.h b/FL/math.h
+index b574000..216a2ad 100644
+--- a/FL/math.h
++++ b/FL/math.h
+@@ -47,7 +47,7 @@
+ #    define M_SQRT1_2       0.70710678118654752440
+ #  endif // !M_SQRT2
+ 
+-#  if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__)
++#  if defined(FLTK_ENABLE_MATH_H_POLYFILL)
+ 
+ inline double rint(double v) {return floor(v+.5);}
+ inline double copysign(double a, double b) {return b<0 ? -a : a;}
diff --git a/vcpkg/ports/fltk/portfile.cmake b/vcpkg/ports/fltk/portfile.cmake
new file mode 100644
index 0000000..aa07bfa
--- /dev/null
+++ b/vcpkg/ports/fltk/portfile.cmake
@@ -0,0 +1,115 @@
+# FLTK has many improperly shared global variables that get duplicated into every DLL
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO fltk/fltk
+    REF "release-${VERSION}"
+    SHA512 b18ff6322349af4416a37d28c4f42ebe355260786ed42bdd54dcc20dc92db1a38a8db74e6d637fdff8f320bdd51e2515c0fa939d30679c5f22ea99fb32c97204
+    PATCHES
+        dependencies.patch
+        config-path.patch
+        include.patch
+        fix-system-link.patch
+        math-h-polyfill.patch
+)
+file(REMOVE_RECURSE
+    "${SOURCE_PATH}/jpeg"
+    "${SOURCE_PATH}/png"
+    "${SOURCE_PATH}/zlib"
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        opengl  OPTION_USE_GL
+)
+
+set(fluid_path_param "")
+if(VCPKG_CROSSCOMPILING)
+    set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
+set(runtime_dll "ON")
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+    set(runtime_dll "OFF")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DFLTK_BUILD_TEST=OFF
+        -DOPTION_LARGE_FILE=ON
+        -DHAVE_ALSA_ASOUNDLIB_H=OFF # tests only
+        -DOPTION_USE_SYSTEM_ZLIB=ON
+        -DOPTION_USE_SYSTEM_LIBPNG=ON
+        -DOPTION_USE_SYSTEM_LIBJPEG=ON
+        -DOPTION_BUILD_SHARED_LIBS=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1
+        "-DCocoa:STRING=-framework Cocoa" # avoid absolute path
+        ${fluid_path_param}
+        -DFLTK_MSVC_RUNTIME_DLL=${runtime_dll}
+    MAYBE_UNUSED_VARIABLES
+        Cocoa
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup()
+
+vcpkg_copy_pdbs()
+
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/fltk-config")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../.." IGNORE_UNCHANGED)
+    if(NOT VCPKG_BUILD_TYPE)
+        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../..")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../.." IGNORE_UNCHANGED)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "{prefix}/include" "{prefix}/../include")
+    endif()
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/fluid${VCPKG_TARGET_EXECUTABLE_SUFFIX}" OR
+   EXISTS "${CURRENT_PACKAGES_DIR}/bin/fluid${VCPKG_TARGET_BUNDLE_SUFFIX}")
+   file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fluid.icns" "${CURRENT_PACKAGES_DIR}/debug/bin/fluid.icns")
+   vcpkg_copy_tools(TOOL_NAMES fluid AUTO_CLEAN)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE
+        "${CURRENT_PACKAGES_DIR}/debug/bin"
+        "${CURRENT_PACKAGES_DIR}/bin"
+    )
+endif()
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+foreach(FILE IN ITEMS Fl_Export.H fl_utf8.h)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "0")
+    else()
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "1")
+    endif()
+endforeach()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fltk/UseFLTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel;${SOURCE_PATH}" [[${CMAKE_CURRENT_LIST_DIR}/../../include]])
+
+set(copyright_files "${SOURCE_PATH}/COPYING")
+if("opengl" IN_LIST FEATURES)
+    file(READ "${SOURCE_PATH}/src/freeglut_geometry.cxx" freeglut_copyright)
+    string(REGEX MATCH " [*] Copyright.*" freeglut_copyright "${freeglut_copyright}" )
+    string(REGEX REPLACE "[*]/.*" "" freeglut_copyright "${freeglut_copyright}")
+    file(WRITE "${CURRENT_BUILDTREES_DIR}/Freeglut code copyright" "${freeglut_copyright}")
+    list(APPEND copyright_files "${CURRENT_BUILDTREES_DIR}/Freeglut code copyright")
+
+    file(READ "${SOURCE_PATH}/src/freeglut_teapot.cxx" teapot_copyright)
+    string(REGEX MATCH " [*][^*]*Silicon Graphics, Inc.*" teapot_copyright "${teapot_copyright}")
+    string(REGEX REPLACE "[*]/.*" "" teapot_copyright "${teapot_copyright}")
+    file(WRITE "${CURRENT_BUILDTREES_DIR}/Original teapot code copyright" "${teapot_copyright}")
+    list(APPEND copyright_files "${CURRENT_BUILDTREES_DIR}/Original teapot code copyright")
+endif()
+vcpkg_install_copyright(FILE_LIST ${copyright_files})
diff --git a/vcpkg/ports/fltk/vcpkg.json b/vcpkg/ports/fltk/vcpkg.json
new file mode 100644
index 0000000..e9ccae9
--- /dev/null
+++ b/vcpkg/ports/fltk/vcpkg.json
@@ -0,0 +1,45 @@
+{
+  "name": "fltk",
+  "version": "1.3.11",
+  "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
+  "homepage": "https://www.fltk.org/",
+  "license": null,
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "fltk",
+      "host": true,
+      "default-features": false
+    },
+    {
+      "name": "fontconfig",
+      "platform": "!osx"
+    },
+    {
+      "name": "freetype",
+      "default-features": false
+    },
+    "libjpeg-turbo",
+    "libpng",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ],
+  "default-features": [
+    "opengl"
+  ],
+  "features": {
+    "opengl": {
+      "description": "OpenGL support",
+      "dependencies": [
+        "opengl"
+      ]
+    }
+  }
+}