diff --git a/v4l-utils.changes b/v4l-utils.changes index 9b18430..774f1d9 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 11 15:13:58 UTC 2016 - schwab@suse.de + +- Don't build qv4l2 on arm + ------------------------------------------------------------------- Fri Jan 8 11:29:30 UTC 2016 - tchvatal@suse.com diff --git a/v4l-utils.spec b/v4l-utils.spec index 6790800..ea6c684 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -18,6 +18,12 @@ %define _udevdir %(pkg-config --variable udevdir udev) %define so_ver 0 +%ifarch aarch64 %arm +# qv4l2 does not support GLES +%bcond_with qv4l2 +%else +%bcond_without qv4l2 +%endif Name: v4l-utils Version: 1.8.1 Release: 0 @@ -179,6 +185,9 @@ qv4l2 is a test control and streaming test application for video4linux. %configure \ --disable-static \ --disable-silent-rules \ +%if %{without qv4l2} + --disable-qv4l2 \ +%endif --with-udevdir=%{_udevdir} make %{?_smp_mflags} @@ -192,7 +201,9 @@ find %{buildroot} -type f -name "*.la" -delete -print # Not needed (links to plugins in libv4l subdir) rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} +%if %{with qv4l2} %suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV +%endif %post -n libdvbv5-%{so_ver} -p /sbin/ldconfig @@ -295,6 +306,7 @@ rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} %{_libdir}/libv4l*.so %{_libdir}/pkgconfig/libv4l*.pc +%if %{with qv4l2} %files -n qv4l2 %defattr(-,root,root,-) %doc COPYING ChangeLog README TODO @@ -307,5 +319,6 @@ rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/*/apps/qv4l2.* %{_mandir}/man1/qv4l2.1%{ext_man} +%endif %changelog