aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Tassoux <contact@rt2.fr>2020-10-13 02:09:50 +0200
committerGitHub <noreply@github.com>2020-10-12 17:09:50 -0700
commit6ce7f41d8e20cbf9c176d132ab78c68fd360ed39 (patch)
tree9b98f40c97a4e220b42376ad3682c9c33c94a041
parent16b68c2f35771c250b354248f11015f9def2a89b (diff)
downloadvcpkg-6ce7f41d8e20cbf9c176d132ab78c68fd360ed39.tar.gz
vcpkg-6ce7f41d8e20cbf9c176d132ab78c68fd360ed39.zip
[implot] Update to v0.7 (#13296)
* [implot] Update to v0.5 https://github.com/epezent/implot/releases/tag/v0.5 * [implot] Update to v0.6 https://github.com/epezent/implot/releases/tag/v0.6 * [implot] Update to v0.7 https://github.com/epezent/implot/releases/tag/v0.7 * [implot] Fix Mac OS build failure
-rw-r--r--ports/implot/CMakeLists.txt2
-rw-r--r--ports/implot/CONTROL2
-rw-r--r--ports/implot/mac_os_build_fix.patch12
-rw-r--r--ports/implot/portfile.cmake5
4 files changed, 18 insertions, 3 deletions
diff --git a/ports/implot/CMakeLists.txt b/ports/implot/CMakeLists.txt
index 0033221ca..5d23a83c0 100644
--- a/ports/implot/CMakeLists.txt
+++ b/ports/implot/CMakeLists.txt
@@ -23,6 +23,7 @@ target_sources(
${PROJECT_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/implot.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/implot_items.cpp
${CMAKE_CURRENT_SOURCE_DIR}/implot_demo.cpp
)
@@ -37,6 +38,7 @@ install(
if(NOT IMPLOT_SKIP_HEADERS)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/implot.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/implot_internal.h
DESTINATION include
)
endif()
diff --git a/ports/implot/CONTROL b/ports/implot/CONTROL
index 0f6633b28..7dc18cb97 100644
--- a/ports/implot/CONTROL
+++ b/ports/implot/CONTROL
@@ -1,5 +1,5 @@
Source: implot
-Version: 0.4
+Version: 0.7
Homepage: https://github.com/epezent/implot
Description: Advanced 2D Plotting for Dear ImGui
Build-Depends: imgui
diff --git a/ports/implot/mac_os_build_fix.patch b/ports/implot/mac_os_build_fix.patch
new file mode 100644
index 000000000..5061b5461
--- /dev/null
+++ b/ports/implot/mac_os_build_fix.patch
@@ -0,0 +1,12 @@
+diff --git a/implot_demo.cpp b/implot_demo.cpp
+--- a/implot_demo.cpp
++++ b/implot_demo.cpp
+@@ -1426,7 +1426,7 @@
+ static int F = 0;
+ static double t1, t2;
+
+- static ImVector<ImVector<ImPlotPoint>> records;
++ static ImVector<ImVector<ImPlotPoint> > records;
+
+ if (running) {
+ F++;
diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake
index b783f57ae..b5bd81b0d 100644
--- a/ports/implot/portfile.cmake
+++ b/ports/implot/portfile.cmake
@@ -3,9 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO epezent/implot
- REF v0.4
- SHA512 ab54a97fcfcdc21c47d56e7e9ba1fbd05ae0f9e8f9bf0bd742e9daa6231931ac0c3a7cb0a1637b254df531b2611b27a301cc9f51d6caa950e20d05ab5fc31247
+ REF v0.7
+ SHA512 b4b1c8ab8d031c884626cf2b31d30baa786b5a1942aabf0856cdb8f2fa091c8117d165c4789a5f9b58ae7a01e89e43e7145a308cfe64af6e28da776d1707c125
HEAD_REF master
+ PATCHES mac_os_build_fix.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})