update FLTK to v1.3.5 (#8457)

* Update to fltk-1.3.5

* Update to fltk-1.3.5

* Update ports/fltk/portfile.cmake

Co-Authored-By: Victor Romero <romerosanchezv@gmail.com>

2 files changed, 93 insertions, 91 deletions

diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL
index 9b047e013..a029a5e85 100644
--- a/ports/fltk/CONTROL
+++ b/ports/fltk/CONTROL
@@ -1,5 +1,5 @@
-Source: fltk

-Version: 1.3.4-8

-Homepage: https://www.fltk.org/

-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.

-Build-Depends: zlib, libpng, libjpeg-turbo

+Source: fltk
+Version: 1.3.5-1
+Homepage: https://www.fltk.org/
+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.
+Build-Depends: zlib, libpng, libjpeg-turbo
diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake
index 77bf7bb22..bc3853857 100644
--- a/ports/fltk/portfile.cmake
+++ b/ports/fltk/portfile.cmake
@@ -1,86 +1,88 @@
-include(vcpkg_common_functions)

-

-vcpkg_download_distfile(ARCHIVE

-    URLS "http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz"

-    FILENAME "fltk.tar.gz"

-    SHA512 0be1c8e6bb7a8c7ef484941a73868d5e40b90e97a8e5dc747bac2be53a350621975406ecfd4a9bcee8eeb7afd886e75bf7a6d6478fd6c56d16e54059f22f0891

-)

-

-vcpkg_extract_source_archive_ex(

-    OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE}

-    PATCHES

-        findlibsfix.patch

-        add-link-libraries.patch

-)

-

-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    set(BUILD_SHARED ON)

-else()

-    set(BUILD_SHARED OFF)

-endif()

-

-if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")

-    set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")

-else()

-    set(OPTION_USE_GL)

-endif()

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS

-        -DOPTION_BUILD_EXAMPLES=OFF

-        -DOPTION_USE_SYSTEM_ZLIB=ON

-        -DOPTION_USE_SYSTEM_LIBPNG=ON

-        -DOPTION_USE_SYSTEM_LIBJPEG=ON

-        -DOPTION_BUILD_SHARED_LIBS=${BUILD_SHARED}

-        ${OPTION_USE_GL}

-)

-

-vcpkg_install_cmake()

-

-file(REMOVE_RECURSE

-    ${CURRENT_PACKAGES_DIR}/CMAKE

-    ${CURRENT_PACKAGES_DIR}/debug/CMAKE

-    ${CURRENT_PACKAGES_DIR}/debug/include

-)

-

-file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)

-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)

-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config)

-

-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)

-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config)

-

-vcpkg_copy_pdbs()

-

-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fltk)

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-    file(REMOVE_RECURSE

-        ${CURRENT_PACKAGES_DIR}/debug/bin

-        ${CURRENT_PACKAGES_DIR}/bin

-    )

-else()

-    file(GLOB SHARED_LIBS "${CURRENT_PACKAGES_DIR}/lib/*_SHARED.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*_SHAREDd.lib")

-    file(GLOB STATIC_LIBS "${CURRENT_PACKAGES_DIR}/lib/*.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")

-    list(FILTER STATIC_LIBS EXCLUDE REGEX "_SHAREDd?\\.lib\$")

-    file(REMOVE ${STATIC_LIBS})

-    foreach(SHARED_LIB ${SHARED_LIBS})

-        string(REGEX REPLACE "_SHARED(d?)\\.lib\$" "\\1.lib" NEWNAME ${SHARED_LIB})

-        file(RENAME ${SHARED_LIB} ${NEWNAME})

-    endforeach()

-endif()

-

-foreach(FILE Fl_Export.H fl_utf8.h)

-    file(READ ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} FLTK_HEADER)

-    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-        string(REPLACE "defined(FL_DLL)" "0" FLTK_HEADER "${FLTK_HEADER}")

-    else()

-        string(REPLACE "defined(FL_DLL)" "1" FLTK_HEADER "${FLTK_HEADER}")

-    endif()

-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} "${FLTK_HEADER}")

-endforeach()

-

-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.gz"
+    FILENAME "fltk-1.3.5.tar.gz"
+    SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+        findlibsfix.patch
+        add-link-libraries.patch
+)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_SHARED ON)
+else()
+    set(BUILD_SHARED OFF)
+endif()
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
+    set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")
+else()
+    set(OPTION_USE_GL "-DOPTION_USE_GL=ON")
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DOPTION_BUILD_EXAMPLES=OFF
+        -DOPTION_LARGE_FILE=ON
+        -DOPTION_USE_THREADS=ON
+        -DOPTION_USE_SYSTEM_ZLIB=ON
+        -DOPTION_USE_SYSTEM_LIBPNG=ON
+        -DOPTION_USE_SYSTEM_LIBJPEG=ON
+        -DOPTION_BUILD_SHARED_LIBS=${BUILD_SHARED}
+        ${OPTION_USE_GL}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/CMAKE
+    ${CURRENT_PACKAGES_DIR}/debug/CMAKE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+)
+
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config)
+
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config)
+
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fltk)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE
+        ${CURRENT_PACKAGES_DIR}/debug/bin
+        ${CURRENT_PACKAGES_DIR}/bin
+    )
+else()
+    file(GLOB SHARED_LIBS "${CURRENT_PACKAGES_DIR}/lib/*_SHARED.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*_SHAREDd.lib")
+    file(GLOB STATIC_LIBS "${CURRENT_PACKAGES_DIR}/lib/*.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")
+    list(FILTER STATIC_LIBS EXCLUDE REGEX "_SHAREDd?\\.lib\$")
+    file(REMOVE ${STATIC_LIBS})
+    foreach(SHARED_LIB ${SHARED_LIBS})
+        string(REGEX REPLACE "_SHARED(d?)\\.lib\$" "\\1.lib" NEWNAME ${SHARED_LIB})
+        file(RENAME ${SHARED_LIB} ${NEWNAME})
+    endforeach()
+endif()
+
+foreach(FILE Fl_Export.H fl_utf8.h)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} FLTK_HEADER)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        string(REPLACE "defined(FL_DLL)" "0" FLTK_HEADER "${FLTK_HEADER}")
+    else()
+        string(REPLACE "defined(FL_DLL)" "1" FLTK_HEADER "${FLTK_HEADER}")
+    endif()
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} "${FLTK_HEADER}")
+endforeach()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)