This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 8014cc7620d75abecd023f35169a363bba790f55
Author:     Marvin Scholz <[email protected]>
AuthorDate: Tue Feb 17 14:25:16 2026 +0100
Commit:     Marvin Scholz <[email protected]>
CommitDate: Tue Feb 17 15:17:37 2026 +0000

    configure: cleanup libopencolorio check
    
    Do a proper pkg-config check instead of just blindly compiling a test
    program even if pkg-config doesn't find anything.
---
 configure | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure b/configure
index c407849751..e7c6418490 100755
--- a/configure
+++ b/configure
@@ -7337,10 +7337,7 @@ enabled libopencore_amrnb && require libopencore_amrnb 
opencore-amrnb/interf_dec
 enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h 
D_IF_init -lopencore-amrwb
 enabled libopencv         && { check_pkg_config libopencv opencv4 
opencv2/core/core_c.h cvCreateImageHeader ||
                                require libopencv opencv2/core/core_c.h 
cvCreateImageHeader -lopencv_core -lopencv_imgproc; }
-enabled libopencolorio    && add_cxxflags $(pkg-config --cflags OpenColorIO) &&
-                                OCIO_LIBS=$($pkg_config --libs OpenColorIO) &&
-                            require_cpp OpenColorIO OpenColorIO/OpenColorIO.h 
"namespace OCIO = OCIO_NAMESPACE; OCIO::ConfigRcPtr cfg = 
OCIO::Config::Create();" $OCIO_LIBS -lstdc++ &&
-                            append libopencolorio_extralibs "$OCIO_LIBS 
-lstdc++"
+enabled libopencolorio    && require_pkg_config_cxx libopencolorio 
"OpenColorIO" OpenColorIO/OpenColorIO.h OCIO_NAMESPACE::Config
 enabled libopenh264       && require_pkg_config libopenh264 "openh264 >= 
1.3.0" wels/codec_api.h WelsGetCodecVersion
 enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 
2.1.0" openjpeg.h opj_version ||
                                { require_pkg_config libopenjpeg "libopenjp2 >= 
2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to