From 361b5ba66fa88e9ff4cccba71f54ecd1d072e059 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 19 Nov 2018 14:19:43 +0000 Subject: [PATCH] - partial PLD merge --- qemu.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/qemu.spec b/qemu.spec index 61e8d3e..93ce3a9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -25,6 +25,8 @@ %bcond_without user_static # build linux-user static packages %bcond_with lttng # lttng-ust trace backend support %bcond_with systemtap # SystemTap/dtrace trace backend support +%bcond_with virgl # build virgl support +%bcond_without xkbcommon # xkbcommon support %if %{with gtk2} %undefine with_gtk3 @@ -117,8 +119,10 @@ BuildRequires: texinfo %{?with_lttng:BuildRequires: userspace-rcu-devel} BuildRequires: vde2-devel BuildRequires: which +%{?with_virgl:BuildRequires: virglrenderer-devel} %{?with_xen:BuildRequires: xen-devel >= 3.4} BuildRequires: xfsprogs-devel +%{?with_xkbcommon:BuildRequires: xorg-lib-libxkbcommon-devel} BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel %if %{with gtk2} @@ -900,6 +904,7 @@ build dynamic \ --enable-vnc-png \ --enable-vnc-sasl \ %{!?with_vte:--disable-vte} \ + %{__enable_disable virgl virglrenderer} \ %{__enable_disable xen} \ --enable-modules \ --disable-netmap \ @@ -1036,7 +1041,7 @@ fi %dir /etc/qemu %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf %attr(755,root,root) %{_bindir}/virtfs-proxy-helper -%attr(755,root,root) %{_bindir}/qemu-keymap +%{?with_xkbcommon:%attr(755,root,root) %{_bindir}/qemu-keymap} %attr(755,root,root) %{_bindir}/qemu-nbd %attr(755,root,root) %{_bindir}/qemu-pr-helper %attr(755,root,root) %{_bindir}/qemu-tilegx @@ -1099,14 +1104,16 @@ fi # modules without too many external dependencies %attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so -%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so +%{?with_libnfs:%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so} %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so -%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so -%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so +%{?with_pulseaudio:%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so} +%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so} %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so +%if %{with gtk2} || %{with gtk3} %attr(755,root,root) %{_libdir}/%{name}/ui-gtk.so -%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so +%endif +%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so} %files img %defattr(644,root,root,755) -- 2.46.0