[packages/ffmpeg/ffmpeg-4.4] append opencv include dir to compiler flags only if opencv is enabled

atler atler at pld-linux.org
Thu Sep 28 21:26:02 CEST 2023


commit 47682335bb74b5d03832ea931fffe426e2a03af1
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Sep 28 20:46:54 2023 +0200

    append opencv include dir to compiler flags only if opencv is enabled

 ffmpeg.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 74ced1d..51a7346 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -617,8 +617,8 @@ EOF
 	--libdir=%{_libdir} \
 	--shlibdir=%{_libdir} \
 	--mandir=%{_mandir} \
-	--extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}%{?with_decklink: -I/usr/include/decklink} -I/usr/include/opencv4" \
-	--extra-cxxflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcxxflags}%{?with_decklink: -I/usr/include/decklink} -I/usr/include/opencv4" \
+	--extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}%{?with_decklink: -I/usr/include/decklink}%{?with_opencv: -I/usr/include/opencv4}" \
+	--extra-cxxflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcxxflags}%{?with_decklink: -I/usr/include/decklink}%{?with_opencv: -I/usr/include/opencv4}" \
 	--extra-ldflags="%{rpmcflags} %{rpmldflags}" \
 	--cc="%{__cc}" \
 	--disable-debug \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/47682335bb74b5d03832ea931fffe426e2a03af1



More information about the pld-cvs-commit mailing list