Mercurial > mxe-octave
changeset 7133:1661d85f0497
of-video: Add patch for missing include of <cassert>.
* src/of-video-1-cassert.patch: Add new file.
* dist-files.mk: Add new file to list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 28 Mar 2024 19:21:22 +0100 |
parents | 91a699a47331 |
children | ebdff9919577 |
files | dist-files.mk src/of-video-1-cassert.patch |
diffstat | 2 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Mar 28 19:20:14 2024 +0100 +++ b/dist-files.mk Thu Mar 28 19:21:22 2024 +0100 @@ -546,6 +546,7 @@ of-tisean-3-octave-9-compat.patch \ of-tisean.mk \ of-tsa.mk \ + of-video-1-cassert.patch \ of-video.mk \ of-windows.mk \ of-zenity.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-video-1-cassert.patch Thu Mar 28 19:21:22 2024 +0100 @@ -0,0 +1,26 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1711649841 -3600 +# Thu Mar 28 19:17:21 2024 +0100 +# Node ID af6f049d3bf3cbc16bb780f721b95ee1f2cf7668 +# Parent 9d9deeb848dceb16f50fe7c44795c57900230b89 +Include <cassert> in file that uses "assert". + +* src/cap_ffmpeg_impl_ov.hpp: The header <cassert> happened to be include via +some headers from Octave before. That is no longer the case for Octave 10. +Include the header directly in a file that requires it. + +See also: https://github.com/Andy1978/octave-video/issues/1 + +diff -r 9d9deeb848dc -r af6f049d3bf3 src/cap_ffmpeg_impl_ov.hpp +--- a/src/cap_ffmpeg_impl_ov.hpp Sat Jul 08 08:28:52 2023 +0200 ++++ b/src/cap_ffmpeg_impl_ov.hpp Thu Mar 28 19:17:21 2024 +0100 +@@ -132,6 +132,8 @@ + extern "C" { + #endif + ++#include <cassert> ++ + #include "ffmpeg_codecs.hpp" + + #include <libavutil/mathematics.h>