Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/
Date: Sun, 01 Aug 2021 18:27:58
Message-Id: 1627842460.1bc7bfc2ebacbbe65f8176233d6271af7d02d8cc.sam@gentoo
1 commit: 1bc7bfc2ebacbbe65f8176233d6271af7d02d8cc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 1 07:03:52 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 1 18:27:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc7bfc2
7
8 media-tv/v4l-utils: use C++14 for now, drop qt5 workaround for C++11
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-tv/v4l-utils/v4l-utils-1.20.0.ebuild | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
16 index 6a579d1605e..71e15ab03e4 100644
17 --- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
18 +++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
19 @@ -68,14 +68,15 @@ src_prepare() {
20 }
21
22 src_configure() {
23 + append-cxxflags -std=c++14
24 +
25 if use qt5; then
26 - append-cxxflags -std=c++11
27 local qt5_paths=( \
28 MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
29 UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
30 RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
31 )
32 - if use !opengl; then
33 + if ! use opengl; then
34 sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
35 fi
36 fi