You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.2 KiB
38 lines
1.2 KiB
5 years ago
|
From 0626b1a9085f80b4a162964376d1fdadf3e3dcdf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Williamson <awilliam@redhat.com>
|
||
|
|
Date: Mon, 25 May 2020 12:08:23 -0700
|
||
|
|
Subject: [PATCH] Makefile.am: set videoencoder_CPPFLAGS not
|
||
|
|
videoencoder_CFLAGS
|
||
|
|
|
||
|
|
videoencoder is built as C++, not C, we should be setting
|
||
|
|
CPPFLAGS here, not CFLAGS. This is what we do for debugviewer and
|
||
|
|
snd2png.
|
||
|
|
|
||
|
|
This broke build on Fedora Rawhide, because /usr/include/opencv2
|
||
|
|
no longer exists there. There is /usr/include/opencv4/opencv2 and
|
||
|
|
this should be fine because we should get -I/usr/include/opencv4
|
||
|
|
from OPENCV_CFLAGS, but because of this bug, that wasn't set
|
||
|
|
correctly and the build failed. With this change it works.
|
||
|
|
|
||
|
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||
|
|
---
|
||
|
|
Makefile.am | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index 61dbe1d2..57911b05 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -119,7 +119,7 @@ pkglibexec_FOLDERS = \
|
||
|
|
pkglibexec_PROGRAMS = videoencoder
|
||
|
|
|
||
|
|
videoencoder_SOURCES = videoencoder.cpp
|
||
|
|
-videoencoder_CFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
|
||
|
|
+videoencoder_CPPFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
|
||
|
|
videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm
|
||
|
|
|
||
|
|
EXTRA_DIST = \
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|