diff --git a/Dockerfile b/Dockerfile index 18bd98a..6c52487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,10 +34,10 @@ ENV SKYBOLT_DEPS=/usr/src/SkyboltDependenciesHeaderOnly ## Skybolt + patches -RUN echo patches against Skybolt master d7de7172be13f64815e9746138613b61d0b09536 +RUN echo patches against Skybolt master c662c1efbe62dbc20350dccddf20f43e072543a2 WORKDIR /usr/src -RUN git clone https://github.com/Piraxus/Skybolt.git +RUN git clone --depth=1 https://github.com/Piraxus/Skybolt.git WORKDIR /usr/src/Skybolt/build COPY patches/skybolt/*.patch ./ RUN \ @@ -55,8 +55,10 @@ RUN json_DIR=${SKYBOLT_DEPS}/json \ cmake .. \ -D CMAKE_CXX_COMPILER=g++ \ -D CMAKE_CXX_FLAGS="-DBOOST_LOG_DYN_LINK -Wno-register" \ - -D CMAKE_POSITION_INDEPENDENT_CODE=ON \ - -D BUILD_CIGI_COMPONENT_PLUGIN=ON + -D CMAKE_POSITION_INDEPENDENT_CODE=ON + +# -D BUILD_CIGI_COMPONENT_PLUGIN=ON + RUN (cd src/Skybolt/SkyboltVisTests && ln -s ../../../.. Source) RUN make -j5 diff --git a/patches/skybolt/0001-Findcigicl-fix-linux-library-name.patch b/patches/skybolt/0001-Findcigicl-fix-linux-library-name.patch deleted file mode 100644 index 4919237..0000000 --- a/patches/skybolt/0001-Findcigicl-fix-linux-library-name.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 722c0ffc605d4c7dc0f998954f5613e24c620268 Mon Sep 17 00:00:00 2001 -From: Peter Ross -Date: Sun, 20 Dec 2020 20:00:36 +1100 -Subject: [PATCH 1/5] Findcigicl: fix linux library name - ---- - CMake/Modules/Findcigicl.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMake/Modules/Findcigicl.cmake b/CMake/Modules/Findcigicl.cmake -index 7ae6dbd..21fc139 100644 ---- a/CMake/Modules/Findcigicl.cmake -+++ b/CMake/Modules/Findcigicl.cmake -@@ -9,13 +9,13 @@ FIND_PATH(cigicl_INCLUDE_DIR cigicl/CigiTypes.h - ) - - FIND_LIBRARY(cigicl_LIB_R -- NAMES ccl_dll -+ NAMES ccl_dll cigicl - PATH_SUFFIXES - lib - ) - - FIND_LIBRARY(cigicl_LIB_D -- NAMES ccl_dllD -+ NAMES ccl_dllD cigicl - PATH_SUFFIXES - lib - ) --- -2.29.2 - diff --git a/patches/skybolt/0002-FindToolWindowManager.cmake-LIB_D-fix.patch b/patches/skybolt/0002-FindToolWindowManager.cmake-LIB_D-fix.patch deleted file mode 100644 index 6762e24..0000000 --- a/patches/skybolt/0002-FindToolWindowManager.cmake-LIB_D-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cdb967eb2374d4c73233974e5d03b4d46f9dac24 Mon Sep 17 00:00:00 2001 -From: Peter Ross -Date: Sun, 20 Dec 2020 20:00:36 +1100 -Subject: [PATCH 2/5] FindToolWindowManager.cmake: LIB_D fix - ---- - CMake/Modules/FindToolWindowManager.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/Modules/FindToolWindowManager.cmake b/CMake/Modules/FindToolWindowManager.cmake -index 371791b..993b3df 100644 ---- a/CMake/Modules/FindToolWindowManager.cmake -+++ b/CMake/Modules/FindToolWindowManager.cmake -@@ -15,7 +15,7 @@ FIND_LIBRARY(ToolWindowManager_LIB_R - ) - - FIND_LIBRARY(ToolWindowManager_LIB_D -- NAMES qtoolwindowmanagerd -+ NAMES qtoolwindowmanagerd qtoolwindowmanager - PATH_SUFFIXES - lib - ) --- -2.29.2 - diff --git a/patches/skybolt/0002-PlanetFeaturesSource-force-type-gcc-10.2.patch b/patches/skybolt/0002-PlanetFeaturesSource-force-type-gcc-10.2.patch new file mode 100644 index 0000000..871daeb --- /dev/null +++ b/patches/skybolt/0002-PlanetFeaturesSource-force-type-gcc-10.2.patch @@ -0,0 +1,32 @@ +From fd3874c5e26adf26323b6a66dae2e2ffdac7fbd6 Mon Sep 17 00:00:00 2001 +From: Peter Ross +Date: Tue, 4 May 2021 16:21:41 +1000 +Subject: [PATCH 2/2] PlanetFeaturesSource: force type (gcc 10.2) + +--- + .../Renderable/Planet/Features/PlanetFeaturesSource.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp +index 22ae6ee..7e6bbba 100644 +--- a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp ++++ b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp +@@ -412,7 +412,7 @@ static void addJsonTilesToTreeRecursive(FeatureTile& tile, WorldFeatures::QuadTr + tile.key.level = j["level"]; + tile.key.x = j["x"]; + tile.key.y = j["y"]; +- tile.featureCountInFile += j["featureCount"]; ++ tile.featureCountInFile += (size_t)j["featureCount"]; + + auto it = j.find("children"); + if (it != j.end()) +@@ -622,4 +622,4 @@ std::string statsToString(const std::vector& features) + } + + } // namespace mapfeatures +-} // namespace skybolt +\ No newline at end of file ++} // namespace skybolt +-- +2.30.2 + diff --git a/patches/skybolt/0003-OIS-include-path-case-sensitive-on-linux.patch b/patches/skybolt/0003-OIS-include-path-case-sensitive-on-linux.patch deleted file mode 100644 index 7f70c5e..0000000 --- a/patches/skybolt/0003-OIS-include-path-case-sensitive-on-linux.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3b2c5b57f9e22e4293de42e519ee7d5b3ef1bd61 Mon Sep 17 00:00:00 2001 -From: Peter Ross -Date: Sun, 20 Dec 2020 20:00:36 +1100 -Subject: [PATCH 3/5] OIS include path - case sensitive on linux - ---- - CMake/Modules/FindOIS.cmake | 6 ++++-- - src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp | 10 +++++----- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/CMake/Modules/FindOIS.cmake b/CMake/Modules/FindOIS.cmake -index 8c4ef17..e98af3f 100644 ---- a/CMake/Modules/FindOIS.cmake -+++ b/CMake/Modules/FindOIS.cmake -@@ -4,7 +4,7 @@ - # OIS_INCLUDE_DIR, where to find headers - - --FIND_PATH(OIS_INCLUDE_DIR OIS/OIS.h -+FIND_PATH(OIS_INCLUDE_DIR ois/OIS.h - PATHS - $ENV{OGRE_DEPENDENCIES_DIR} - PATH_SUFFIXES -@@ -15,16 +15,18 @@ FIND_LIBRARY(OIS_LIBRARY_R - NAMES OIS - PATHS - $ENV{OGRE_DEPENDENCIES_DIR}/lib/Release -+ $ENV{OGRE_DEPENDENCIES_DIR}/lib - ) - - FIND_LIBRARY(OIS_LIBRARY_D - NAMES OISd OIS - PATHS - $ENV{OGRE_DEPENDENCIES_DIR}/lib/Debug -+ $ENV{OGRE_DEPENDENCIES_DIR}/lib - ) - - SET(OIS_LIBRARIES optimized ${OIS_LIBRARY_R} debug ${OIS_LIBRARY_D}) - - IF(OIS_LIBRARY AND OIS_INCLUDE_DIR) - SET(OIS_FOUND "YES") --ENDIF() -\ No newline at end of file -+ENDIF() -diff --git a/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp b/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp -index 9e666ae..37644d3 100644 ---- a/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp -+++ b/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp -@@ -6,11 +6,11 @@ - - #include "InputPlatformOis.h" - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - #include - #include --- -2.29.2 - diff --git a/patches/skybolt/0003-ShaderSourceFileChangeMonitor-missing-include.patch b/patches/skybolt/0003-ShaderSourceFileChangeMonitor-missing-include.patch new file mode 100644 index 0000000..2fcd4e0 --- /dev/null +++ b/patches/skybolt/0003-ShaderSourceFileChangeMonitor-missing-include.patch @@ -0,0 +1,24 @@ +From a2b274affdecbf61e554b18917b7423726296d19 Mon Sep 17 00:00:00 2001 +From: Peter Ross +Date: Thu, 24 Jun 2021 10:29:46 +1000 +Subject: [PATCH 3/3] ShaderSourceFileChangeMonitor: missing include + +--- + src/Skybolt/SkyboltVis/Shader/ShaderSourceFileChangeMonitor.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Skybolt/SkyboltVis/Shader/ShaderSourceFileChangeMonitor.h b/src/Skybolt/SkyboltVis/Shader/ShaderSourceFileChangeMonitor.h +index 3a5e23d..8c321ee 100644 +--- a/src/Skybolt/SkyboltVis/Shader/ShaderSourceFileChangeMonitor.h ++++ b/src/Skybolt/SkyboltVis/Shader/ShaderSourceFileChangeMonitor.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + namespace skybolt { + namespace vis { +-- +2.30.2 + diff --git a/patches/skybolt/0005-Sky.frag-gl_FragColor-is-deprecated-n-GLSL4.patch b/patches/skybolt/0005-Sky.frag-gl_FragColor-is-deprecated-n-GLSL4.patch deleted file mode 100644 index 84aa510..0000000 --- a/patches/skybolt/0005-Sky.frag-gl_FragColor-is-deprecated-n-GLSL4.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8331c1471da438757f47a7f26d404f201fe6e678 Mon Sep 17 00:00:00 2001 -From: Peter Ross -Date: Sun, 20 Dec 2020 20:00:36 +1100 -Subject: [PATCH 5/5] Sky.frag: gl_FragColor is deprecated n GLSL4 - ---- - Assets/Shaders/Sky.frag | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Assets/Shaders/Sky.frag b/Assets/Shaders/Sky.frag -index 4715058..a695a24 100644 ---- a/Assets/Shaders/Sky.frag -+++ b/Assets/Shaders/Sky.frag -@@ -12,11 +12,12 @@ in vec3 scattering; - in vec3 singleScattering; - in vec3 fragPosRelCamera; - -+out vec4 FragColor; -+ - uniform vec3 lightDirection; - - void main(void) - { - vec3 viewDir = normalize(fragPosRelCamera); -- gl_FragColor.rgb = GetSkyRadianceFromScattering(scattering, singleScattering, viewDir, lightDirection); -- gl_FragColor.a = 1.0; --} -\ No newline at end of file -+ FragColor = vec4(GetSkyRadianceFromScattering(scattering, singleScattering, viewDir, lightDirection), 1.0); -+} --- -2.29.2 -