From 8737bff2bfec303b4affd06be9f44acd4b13f34d Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Sun, 5 Jan 2025 12:04:03 +0100 Subject: [PATCH] link FFMPEG and include stdlib required for building with gcc-14 applies debian patches: include_stdlib.patch ffmpeg_link_libraries.patch https://salsa.debian.org/science-team/netgen/-/blob/d7ca1c564d90d00ce3d83e0b63c36fbec11cf1ce/debian/patches/include_stdlib.patch https://salsa.debian.org/science-team/netgen/-/blob/d7ca1c564d90d00ce3d83e0b63c36fbec11cf1ce/debian/patches/ffmpeg_link_libraries.patch Fixes: #192 --- CMakeLists.txt | 3 +++ ng/encoding.hpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c54e30e3..bf239b963 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -439,6 +439,9 @@ if (USE_MPEG) find_package(FFMPEG REQUIRED) add_definitions(-DFFMPEG -D__STDC_CONSTANT_MACROS) include_directories(${FFMPEG_INCLUDE_DIR}) + if(USE_GUI) + target_link_libraries(nggui INTERFACE ${FFMPEG_LIBRARIES}) + endif(USE_GUI) endif (USE_MPEG) ####################################################################### diff --git a/ng/encoding.hpp b/ng/encoding.hpp index 9ea2ffb5f..8fa6977f0 100644 --- a/ng/encoding.hpp +++ b/ng/encoding.hpp @@ -3,6 +3,9 @@ #ifdef FFMPEG +#include +using namespace std; + extern "C" { #include #include