Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Feb 2024 04:14:34 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d5183fa79df2 - main - multimedia/ffmpeg4: unbreak GLSLANG=on build after d35ea7b74f4a
Message-ID:  <202402010414.4114EYfx040623@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d5183fa79df24e0716ab928298d161804e8530de

commit d5183fa79df24e0716ab928298d161804e8530de
Author:     Travis Hunter <cth-freebsd@pm.me>
AuthorDate: 2024-01-31 16:45:34 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-02-01 04:13:42 +0000

    multimedia/ffmpeg4: unbreak GLSLANG=on build after d35ea7b74f4a
    
    libavfilter/glslang.cpp:164:5: error: use of undeclared identifier 'assert'
        assert(glslang_refcount);
        ^
    
    PR:             276469
    Tested by:      vvd
    Regressed by:   https://github.com/KhronosGroup/glslang/commit/6f9ab3c2deb6
    See also:       https://github.com/ffmpeg/ffmpeg/commit/246f841b53e1
---
 multimedia/ffmpeg4/files/patch-libavfilter_glslang.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/multimedia/ffmpeg4/files/patch-libavfilter_glslang.cpp b/multimedia/ffmpeg4/files/patch-libavfilter_glslang.cpp
new file mode 100644
index 000000000000..a331fdeb349f
--- /dev/null
+++ b/multimedia/ffmpeg4/files/patch-libavfilter_glslang.cpp
@@ -0,0 +1,10 @@
+--- libavfilter/glslang.cpp.orig	2023-04-12 18:01:50 UTC
++++ libavfilter/glslang.cpp
+@@ -16,6 +16,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include <cassert>
+ #include <pthread.h>
+ 
+ extern "C" {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402010414.4114EYfx040623>