Merge branch 'master' into openssl-unix-dynamic

4 files changed, 28 insertions, 30 deletions

diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
deleted file mode 100644
index e9b8c52a5..000000000
--- a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001
-From: Juha Sointusalo <juha.sointusalo@gmail.com>
-Date: Thu, 13 Dec 2018 21:38:23 +0200
-Subject: [PATCH] fix building DLL on Windows
-
-Without FTGL_LIBRARY all symbols are declared to be imported instead of
-exported and linking the library fails.
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6c5a57..6b230ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
- OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON)
- IF(BUILD_SHARED_LIBS)
-  	SET(LIB_TYPE SHARED)
-+	ADD_DEFINITIONS(-DFTGL_LIBRARY)
- ELSE(BUILD_SHARED_LIBS)
- 	SET(LIB_TYPE STATIC)
- 	ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC)
--- 
-2.18.0.windows.1
-
diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL
index 2abfa8778..b8e652144 100644
--- a/ports/ftgl/CONTROL
+++ b/ports/ftgl/CONTROL
@@ -1,5 +1,5 @@
 Source: ftgl

-Version: 2.3.1

+Version: 2.4.0-1
 Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.

   Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.

   FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.

diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch
new file mode 100644
index 000000000..f3459352a
--- /dev/null
+++ b/ports/ftgl/Fix-headersFilePath.patch
@@ -0,0 +1,23 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 693e49f..c47ff3c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,9 +1,5 @@
+-
+-
+-
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake)
+ 
+-
+ ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}")
+ 
+ IF(WIN32)
+@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES
+     FTGlyphContainer.h
+     FTInternals.h
+     FTLibrary.cpp
+-    FTLibrary.h
++    FTGL/FTLibrary.h
+     FTList.h
+     FTPoint.cpp
+     FTSize.cpp
diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake
index a8878af0f..65df89b20 100644
--- a/ports/ftgl/portfile.cmake
+++ b/ports/ftgl/portfile.cmake
@@ -1,12 +1,13 @@
 include(vcpkg_common_functions)

+vcpkg_find_acquire_program(DOXYGEN)

 

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO frankheckenbach/ftgl

-    REF 2.3.1

-    SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a

+    REF 483639219095ad080538e07ceb5996de901d4e74
+    SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f

     HEAD_REF master

-    PATCHES "0001-fix-building-DLL-on-Windows.patch"

+    PATCHES Fix-headersFilePath.patch

 )

 

 vcpkg_configure_cmake(