dimitry-ishenko
commented
3 years ago The following patch takes care of all compilation issues:
diff --git a/accelerator/accelerator.cpp b/accelerator/accelerator.cpp
index cda8f08..aaa155b 100644
--- a/accelerator/accelerator.cpp
+++ b/accelerator/accelerator.cpp
@@ -26,7 +26,7 @@ struct accelerator::impl
{
}
- std::unique_ptr<core::image_mixer> create_image_mixer(const int channel_id)
+ spl::unique_ptr<core::image_mixer> create_image_mixer(const int channel_id)
{
try
{
@@ -37,7 +37,7 @@ struct accelerator::impl
if(!ogl_device_)
ogl_device_.reset(new ogl::device());
- return std::make_unique<ogl::image_mixer>(
+ return spl::make_unique<ogl::image_mixer>(
spl::make_shared_ptr(ogl_device_),
env::properties().get(L"configuration.mixer.blend-modes", false),
env::properties().get(L"configuration.mixer.straight-alpha", false),
@@ -50,7 +50,7 @@ struct accelerator::impl
if(path_ == L"gpu" || path_ == L"ogl")
CASPAR_LOG_CURRENT_EXCEPTION();
}
- return std::make_unique<cpu::image_mixer>(channel_id);
+ return spl::make_unique<cpu::image_mixer>(channel_id);
}
};
@@ -63,7 +63,7 @@ accelerator::~accelerator()
{
}
-std::unique_ptr<core::image_mixer> accelerator::create_image_mixer(const int channel_id)
+spl::unique_ptr<core::image_mixer> accelerator::create_image_mixer(const int channel_id)
{
return impl_->create_image_mixer(channel_id);
}
diff --git a/accelerator/accelerator.h b/accelerator/accelerator.h
index 6ac03ea..2a0cd2d 100644
--- a/accelerator/accelerator.h
+++ b/accelerator/accelerator.h
@@ -16,7 +16,7 @@ public:
accelerator(const std::wstring& path, const core::video_format_repository format_repository);
~accelerator();
- std::unique_ptr<core::image_mixer> create_image_mixer(int channel_id);
+ spl::unique_ptr<core::image_mixer> create_image_mixer(int channel_id);
std::shared_ptr<ogl::device> get_ogl_device() const;
private:
@@ -24,4 +24,4 @@ private:
spl::unique_ptr<impl> impl_;
};
-}}
\ No newline at end of file
+}}
diff --git a/dependencies64/cef/linux/libcef_dll/CMakeLists.txt b/dependencies64/cef/linux/libcef_dll/CMakeLists.txt
index e36196c..ec2d81a 100644
--- a/dependencies64/cef/linux/libcef_dll/CMakeLists.txt
+++ b/dependencies64/cef/linux/libcef_dll/CMakeLists.txt
@@ -17,6 +17,12 @@ endmacro()
set(CEF_TARGET libcef_dll_wrapper)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ list(APPEND CEF_CXX_COMPILER_FLAGS
+ -Wno-attributes # The cfi-icall attribute is not supported by the GNU C++ compiler
+ )
+endif()
+
set(LIBCEF_SRCS
ptr_util.h
transfer_util.cc
diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index f782a50..7ef9101 100644
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -196,7 +196,7 @@ class decklink_timecode : public IDeckLinkTimecode
return S_OK;
}
- HRESULT GetString(BSTR* timecode) override { return S_FALSE; }
+ HRESULT GetString(const char** timecode) override { return S_FALSE; }
BMDTimecodeFlags GetFlags() override { return flags_; }
@@ -583,7 +583,7 @@ struct decklink_consumer
if (result == bmdOutputFrameDisplayedLate) {
std::wstring str = print() + L" late scheduled=" + boost::lexical_cast<std::wstring>(video_scheduled_) + L"*";
- long long timestamp = 0;
+ long timestamp = 0;
double speed = 0;
if (SUCCEEDED(output_->GetScheduledStreamTime(format_desc_.time_scale, ×tamp, &speed))) {
str += L" decklink=" + boost::lexical_cast<std::wstring>(timestamp);
@@ -595,7 +595,7 @@ struct decklink_consumer
audio_scheduled_ += dframe->audio_data().size() / in_channel_layout_.num_channels;
} else if (result == bmdOutputFrameDropped) {
std::wstring str = print() + L" dropped scheduled=" + boost::lexical_cast<std::wstring>(video_scheduled_) + L"*";
- long long timestamp = 0;
+ long timestamp = 0;
double speed = 0;
if (SUCCEEDED(output_->GetScheduledStreamTime(format_desc_.time_scale, ×tamp, &speed))) {
str += L" decklink=" + boost::lexical_cast<std::wstring>(timestamp);
Julusian
Trying to build the server using the
set-variables-and-build-linux.shscript insidebuild-scriptsfails miserably.Things I've run into so far:
acceleratorfails due to mix-up betweenstdandsplnamespaces.Fix:
std::->spl::ceffails witherror: 'cfi-icall' attribute directive ignored [-Werror=attributes].Fix: add
-Wno-attributesto CMakeLists.txt.decklink_consumerfails witherror: 'BSTR' has not been declared.Fix:
BSTR->const char*.I can work through some of these issues, but I am wondering how far this rabbit hole leads and if there is interest in having Linux version of the server.
I've recently upgraded to 2.3.0, but found out they've gutted framerate producer from it, so I am looking at alternatives.