[fltk] Update to 1.3.6 rc1 and fix osx build (#17586)

* [fltk] Update to 1.3.6 rc1 * [fltk] Fix osx build failure * update patch * update version record
2021-05-21 16:16:33 +08:00 · 2021-05-21 16:16:33 +08:00 · eb891c23ef
parent 8e820ffb19
commit eb891c23ef
10 changed files with 86 additions and 98 deletions
--- a/ports/fltk/add-link-libraries.patch
+++ b/ports/fltk/add-link-libraries.patch
@ -1,13 +0,0 @@
-diff --git a/CMake/macros.cmake b/CMake/macros.cmake
-index 4def62d..27b4901 100644
--- a/CMake/macros.cmake
-+++ b/CMake/macros.cmake
-@@ -67,6 +67,8 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
- 		COMPILE_DEFINITIONS "FL_DLL"
- 		)
- 	endif (${LIBTYPE} STREQUAL "SHARED")
-+
-+    target_link_libraries(${LIBRARY_NAME} gdi32 gdiplus user32 advapi32 ole32 shell32 comdlg32)
-     endif (MSVC)
- 
-     install(TARGETS ${LIBRARY_NAME}
--- a/ports/fltk/config-path.patch
+++ b/ports/fltk/config-path.patch
@ -1,13 +1,13 @@
-diff --git a/CMake/setup.cmake b/CMake/setup.cmake
-index 4d960a5..194887d 100644
--- a/CMake/setup.cmake
-+++ b/CMake/setup.cmake
-@@ -88,6 +88,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/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)
+ 
--- a/ports/fltk/findlibsfix.patch
+++ b/ports/fltk/findlibsfix.patch
@ -1,23 +1,21 @@
 diff --git a/CMake/resources.cmake b/CMake/resources.cmake
-index 37c0c08..b1f52d1 100644
+index 57173f2..149aa62 100644
 --- a/CMake/resources.cmake
 +++ b/CMake/resources.cmake
-@@ -26,10 +26,10 @@ find_file(HAVE_DLFCN_H dlfcn.h)
- find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2 freetype2/freetype)
- find_file(HAVE_GL_GL_H GL/gl.h)
- find_file(HAVE_GL_GLU_H GL/glu.h)
-find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
-+#find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
- find_file(HAVE_LOCALE_H locale.h)
- find_file(HAVE_OPENGL_GLU_H OpenGL/glu.h)
-find_file(HAVE_PNG_H png.h)
-+#find_file(HAVE_PNG_H png.h)
- find_file(HAVE_PTHREAD_H pthread.h)
- find_file(HAVE_STDIO_H stdio.h)
- find_file(HAVE_STRINGS_H strings.h)
-@@ -38,6 +38,17 @@ find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h)
- find_file(HAVE_X11_XREGION_H X11/Xregion.h)
- find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions)
+@@ -52,10 +52,8 @@ include (FindPkgConfig)
+ fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
+ fl_find_header (HAVE_DLFCN_H dlfcn.h)
+ fl_find_header (HAVE_GL_GLU_H GL/glu.h)
+-fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h)
+ fl_find_header (HAVE_LOCALE_H locale.h)
+ fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h)
+-fl_find_header (HAVE_PNG_H png.h)
+ fl_find_header (HAVE_STDIO_H stdio.h)
+ fl_find_header (HAVE_STRINGS_H strings.h)
+ fl_find_header (HAVE_SYS_SELECT_H sys/select.h)
+@@ -64,6 +62,17 @@ fl_find_header (HAVE_SYS_STDTYPES_H sys/stdtypes.h)
+ fl_find_header (HAVE_X11_XREGION_H "X11/Xlib.h;X11/Xregion.h")
+ fl_find_header (HAVE_XDBE_H "X11/Xlib.h;X11/extensions/Xdbe.h")
 
 +find_package(PNG REQUIRED)
 +if(PNG_FOUND)
@ -30,22 +28,20 @@ index 37c0c08..b1f52d1 100644
 +	set(LIB_zlib ${ZLIB_LIBRARIES})
 +endif()
 +
- if (MSVC)
-   message(STATUS "Note: The following three headers should all be found!")
-   message(STATUS "HAVE_GL_GL_H = '${HAVE_GL_GL_H}'")
-@@ -92,12 +103,12 @@ find_library(LIB_freetype freetype)
- find_library(LIB_GL GL)
- find_library(LIB_MesaGL MesaGL)
- find_library(LIB_jpeg jpeg)
-find_library(LIB_png png)
-find_library(LIB_zlib z)
-+#find_library(LIB_png png)
-+#find_library(LIB_zlib z)
+ if (WIN32 AND NOT CYGWIN)
+   # we don't use pthreads on Windows (except for Cygwin, see options.cmake)
+   set (HAVE_PTHREAD_H 0)
+@@ -171,12 +180,10 @@ find_library (LIB_GL GL)
+ find_library (LIB_MesaGL MesaGL)
+ find_library (LIB_GLEW GLEW)
+ find_library (LIB_jpeg jpeg)
+-find_library (LIB_png png)
+-find_library (LIB_zlib z)
 
- mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
- mark_as_advanced(LIB_GL LIB_MesaGL)
-mark_as_advanced(LIB_jpeg LIB_png LIB_zlib)
-+mark_as_advanced(LIB_jpeg)
+ mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype)
+ mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW)
+-mark_as_advanced (LIB_jpeg LIB_png LIB_zlib)
+mark_as_advanced (LIB_jpeg)
 
 #######################################################################
 # functions
--- a/ports/fltk/fix-system-link.patch
+++ b/ports/fltk/fix-system-link.patch
@ -1,18 +1,16 @@
-diff --git a/CMake/macros.cmake b/CMake/macros.cmake
-index 0c2586f..eb77510 100644
--- a/CMake/macros.cmake
-+++ b/CMake/macros.cmake
-@@ -37,6 +37,13 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
-     add_library(${LIBRARY_NAME} ${LIBTYPE} ${LIBFILES})
- 
-     target_include_directories(${LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
-+    
+diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
+index 6fa2fc5..e5ba493 100644
+--- a/CMake/fl_add_library.cmake
+++ b/CMake/fl_add_library.cmake
+@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+   add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
+   
+   target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+  
 +    if (APPLE)
 +        find_library(Cocoa Cocoa)
-+        target_link_libraries(${LIBRARY_NAME} PUBLIC $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
-+    elseif (WIN32)
-+        target_link_libraries(${LIBRARY_NAME} PUBLIC gdi32 gdiplus user32 advapi32 ole32 shell32 comdlg32)
+        target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
 +    endif()
 
-     set_target_properties(${LIBRARY_NAME}
-         PROPERTIES
+   # target properties for all libraries
+ 
--- a/ports/fltk/fltk_version.dat
+++ b/ports/fltk/fltk_version.dat
@ -0,0 +1 @@
+1.3.6
--- a/ports/fltk/include.patch
+++ b/ports/fltk/include.patch
@ -1,13 +1,13 @@
-diff --git a/CMake/macros.cmake b/CMake/macros.cmake
-index ca03371..bde2c7e 100644
--- a/CMake/macros.cmake
-+++ b/CMake/macros.cmake
-@@ -36,6 +36,8 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
- 
-     add_library(${LIBRARY_NAME} ${LIBTYPE} ${LIBFILES})
- 
-+    target_include_directories(${LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
-+
-     set_target_properties(${LIBRARY_NAME}
-         PROPERTIES
-         OUTPUT_NAME ${LIBRARY_NAME}
+diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
+index 29baa95..6fa2fc5 100644
+--- a/CMake/fl_add_library.cmake
+++ b/CMake/fl_add_library.cmake
+@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+   endif (MSVC)
+ 
+   add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
+  
+  target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+ 
+   # target properties for all libraries
+ 
--- a/ports/fltk/portfile.cmake
+++ b/ports/fltk/portfile.cmake
@ -1,23 +1,25 @@
 # FLTK has many improperly shared global variables that get duplicated into every DLL
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

-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_fail_port_install(ON_TARGET "UWP")

-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    REPO fltk/fltk
+    REF  46604ef40bde400c0c33fb5790b023629d1bd445 #1.3.6 rc1
+    SHA512 692996be22b289a473be9371dbf558a940d7dda72ce655141610d55de5f7e6a331010a8d999fe4e3feaa01fff7797a4403173b3b804329579d08fbc77ba7958e
+    HEAD_REF master
    PATCHES
        findlibsfix.patch
-        add-link-libraries.patch
        config-path.patch
        include.patch
        fix-system-link.patch
 )

+# Remove these 2 lines when the next update
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/fltk_version.dat DESTINATION ${SOURCE_PATH})
+file(REMOVE ${SOURCE_PATH}/VERSION)
+
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
    set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")
 else()
@ -28,7 +30,7 @@ vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
    OPTIONS
-        -DOPTION_BUILD_EXAMPLES=OFF
+        -DFLTK_BUILD_TEST=OFF
        -DOPTION_LARGE_FILE=ON
        -DOPTION_USE_THREADS=ON
        -DOPTION_USE_SYSTEM_ZLIB=ON
--- a/ports/fltk/vcpkg.json
+++ b/ports/fltk/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "fltk",
-  "version": "1.3.5",
-  "port-version": 4,
+  "version": "1.3.6",
  "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/",
  "dependencies": [
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2013,8 +2013,8 @@
      "port-version": 0
    },
    "fltk": {
-      "baseline": "1.3.5",
-      "port-version": 4
+      "baseline": "1.3.6",
+      "port-version": 0
    },
    "fluidlite": {
      "baseline": "2020-08-27",
--- a/versions/f-/fltk.json
+++ b/versions/f-/fltk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f242495c4ab5a13a640e506c0b02d052b0ea7b80",
+      "version": "1.3.6",
+      "port-version": 0
+    },
    {
      "git-tree": "09b2ceac638353fa15310751f007a9e868087460",
      "version": "1.3.5",