3rdparty: update deps

ossia · Dec 9, 2024 · e6bd926 · e6bd926
1 parent 66f9c7f
commit e6bd926
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/3rdparty/avendish b/3rdparty/avendish
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ if(OSSIA_SDK)
   else()
     set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${OSSIA_SDK}/ffmpeg/lib/pkgconfig")
   endif()
-  
+
   include_directories("${OSSIA_SDK}/pipewire/include/pipewire-0.3")
   include_directories("${OSSIA_SDK}/pipewire/include/spa-0.2")
 endif()

diff --git a/src/lib/score/serialization/IsTemplate.hpp b/src/lib/score/serialization/IsTemplate.hpp
@@ -85,6 +85,13 @@ struct is_template<T<A1, A2, A3, A4, A5, A6, B>> : std::true_type
 {
 };
 
+template <
+    template <class, class, class, class, class, class, class, bool> class T, class A1,
+    class A2, class A3, class A4, class A5, class A6, class A7, bool B>
+struct is_template<T<A1, A2, A3, A4, A5, A6, A7, B>> : std::true_type
+{
+};
+
 template <class>
 struct is_custom_serialized : std::false_type
 {

diff --git a/src/lib/score/serialization/MapSerialization.hpp b/src/lib/score/serialization/MapSerialization.hpp
@@ -84,20 +84,20 @@ struct TSerializer<JSONObject, std::unordered_map<T, U, H, E, A>> : MapSerialize
 #if !defined(OSSIA_NO_FAST_CONTAINERS)
 template <
     class Key, class T, class Hash, class KeyEqual, class AllocatorOrContainer,
-    class Bucket, bool IsSegmented>
+    class Bucket, class BC, bool IsSegmented>
 struct TSerializer<
     DataStream, ankerl::unordered_dense::detail::table<
-                    Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, IsSegmented>>
+                    Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BC, IsSegmented>>
     : MapSerializer
 {
 };
 
 template <
     class Key, class T, class Hash, class KeyEqual, class AllocatorOrContainer,
-    class Bucket, bool IsSegmented>
+    class Bucket, class BC, bool IsSegmented>
 struct TSerializer<
     JSONObject, ankerl::unordered_dense::detail::table<
-                    Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, IsSegmented>>
+                    Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BC, IsSegmented>>
     : MapSerializer
 {
 };

diff --git a/src/plugins/score-plugin-js/JS/Qml/QmlObjects.hpp b/src/plugins/score-plugin-js/JS/Qml/QmlObjects.hpp
@@ -17,6 +17,7 @@
 #include <ossia/detail/math.hpp>
 #include <ossia/detail/ssize.hpp>
 #include <ossia/network/domain/domain.hpp>
+#include <ossia-qt/js_utilities.hpp>
 
 #include <QJSValue>
 #include <QObject>
@@ -32,7 +33,6 @@
 #include <verdigris>
 
 class QQuickItem;
-W_REGISTER_ARGTYPE(QJSValue)
 namespace JS
 {
 class SCORE_PLUGIN_JS_EXPORT Inlet : public QObject
+69 −0		examples/Advanced/AI/PromptComposer.hpp
+5 −4		examples/Advanced/UI/2DView.hpp
+1 −0		examples/Advanced/Utilities/LFO.hpp
+2 −2		examples/Advanced/Utilities/LightnessComputer.hpp
+9 −0		include/avnd/binding/ossia/to_value.hpp
+19 −11		include/avnd/concepts/gfx.hpp
+18 −25		include/avnd/concepts/parameter.hpp
+5 −0		include/avnd/introspection/input.hpp
+6 −0		include/avnd/introspection/output.hpp
+5 −0		include/avnd/introspection/port.hpp
+1 −0		include/avnd/wrappers/metadatas.hpp
+149 −0		include/halp/geometry.hpp
+4 −2		include/halp/gradient_port.hpp
+1 −1		3rdparty/async-mqtt5
+1 −1		3rdparty/unordered_dense
+1 −1		3rdparty/whereami
+2 −1		cmake/deps/spdlog.cmake
+0 −1		src/ossia-qt/http/http_protocol.cpp
+8 −2		src/ossia-qt/js_utilities.cpp
+5 −0		src/ossia-qt/js_utilities.hpp
+169 −57		src/ossia-qt/serial/serial_protocol.cpp
+14 −1		src/ossia-qt/serial/serial_protocol.hpp
+73 −0		src/ossia/gfx/texture_parameter.cpp
+30 −0		src/ossia/gfx/texture_parameter.hpp
+9 −8		src/ossia/network/base/message_queue.hpp
+6 −1		src/ossia/network/common/extended_types.cpp
+4 −0		src/ossia/network/common/extended_types.hpp
+2 −0		src/ossia/network/generic/wrapped_parameter.hpp
+25 −2		src/ossia/network/osc/detail/osc_value_write_visitor.hpp
+1 −2		src/ossia/network/osc/detail/sender.hpp
+77 −1		src/ossia/network/sockets/serial_socket.hpp
+3 −0		src/ossia/protocols/mqtt/mqtt_protocol.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ if(OSSIA_SDK) @@
       else()
         set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${OSSIA_SDK}/ffmpeg/lib/pkgconfig")
       endif()
       include_directories("${OSSIA_SDK}/pipewire/include/pipewire-0.3")
       include_directories("${OSSIA_SDK}/pipewire/include/spa-0.2")
     endif()
@@ Expand Down @@