forked from pool/v4l-utils
Accepting request 874201 from home:adra:branches:devel:libraries:c_c++
Force C++14 as the code is not C++17 ready. Fixes GCC 11 build (boo#1181884), Don't exclude /usr/lib/udev/systemd-udevd.service.d/50-rc_keymap.conf for Leap 15.3 OBS-URL: https://build.opensuse.org/request/show/874201 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=77
This commit is contained in:
parent
d473537c27
commit
69d6567515
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 21 22:22:50 UTC 2021 - Asterios Dramis <asterios.dramis@gmail.com>
|
||||
|
||||
- Force C++14 as the code is not C++17 ready. Fixes GCC 11 build
|
||||
(boo#1181884).
|
||||
- Don't exclude /usr/lib/udev/systemd-udevd.service.d/50-rc_keymap.conf
|
||||
for Leap 15.3.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 8 13:37:47 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package v4l
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -187,6 +187,7 @@ qv4l2 is a test control and streaming test application for video4linux.
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
export CXXFLAGS="-std=c++14 %{optflags}"
|
||||
autoreconf -vfi
|
||||
%configure \
|
||||
--disable-static \
|
||||
@ -199,6 +200,7 @@ autoreconf -vfi
|
||||
--with-udevdir=%{_udevdir}
|
||||
|
||||
%if "%{flavor}" == "qv4l2"
|
||||
export CXXFLAGS="-std=c++14 %{optflags}"
|
||||
%make_build -C utils/libmedia_dev
|
||||
%make_build -C utils/libv4l2util
|
||||
%make_build -C utils/qv4l2
|
||||
@ -241,7 +243,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%dir %{_sysconfdir}/rc_keymaps/
|
||||
%config(noreplace) %{_sysconfdir}/rc_maps.cfg
|
||||
%{_udevdir}/rc_keymaps
|
||||
%if 0%{?suse_version} > 1500
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150200 && 0%{?is_opensuse}
|
||||
%dir %{_unitdir}/systemd-udevd.service.d
|
||||
%{_unitdir}/systemd-udevd.service.d/50-rc_keymap.conf
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user