[packages/v4l-utils] - explicit gconv module path (fixes x32 build)

qboosh qboosh at pld-linux.org
Tue Jul 23 21:15:23 CEST 2024


commit 9cf617a4558140312e957b3d433f2bc7bdc1acbb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 23 21:06:16 2024 +0200

    - explicit gconv module path (fixes x32 build)

 v4l-utils.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/v4l-utils.spec b/v4l-utils.spec
index a2201a2..e13c7e2 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -205,6 +205,7 @@ EN300-468-TAB00.
 %meson build \
 	%{!?with_static_libs:--default-library=shared} \
 	-Ddoxygen-doc=%{__enabled_disabled apidocs} \
+	-Dgconvsysdir=%{_libdir}/gconv \
 	-Dlibdvbv5=enabled \
 	-Dqvidcap=%{__enabled_disabled qvidcap} \
 %if %{without qt}
@@ -295,13 +296,15 @@ done
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qv4l2
-%{?with_qvidcap:%attr(755,root,root) %{_bindir}/qvidcap}
 %{_desktopdir}/qv4l2.desktop
-%{?with_qvidcap:%{_desktopdir}/qvidcap.desktop}
 %{_iconsdir}/hicolor/*/apps/qv4l2.*
-%{?with_qvidcap:%{_iconsdir}/hicolor/*/apps/qvidcap.*}
 %{_mandir}/man1/qv4l2.1*
-%{?with_qvidcap:%{_mandir}/man1/qvidcap.1*}
+%if %{with qvidcap}
+%attr(755,root,root) %{_bindir}/qvidcap
+%{_desktopdir}/qvidcap.desktop
+%{_iconsdir}/hicolor/*/apps/qvidcap.*
+%{_mandir}/man1/qvidcap.1*
+%endif
 %endif
 
 %files -n ir-keytable
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/v4l-utils.git/commitdiff/9cf617a4558140312e957b3d433f2bc7bdc1acbb



More information about the pld-cvs-commit mailing list