peterdelevoryas / rpms / qemu

Forked from rpms/qemu 2 years ago
Clone

dcfe42 Fix build on el8, exclude jack subpackage

Authored and Committed by crobinso 3 years ago
1 file changed. 18 lines added. 2 lines removed.
    Fix build on el8, exclude jack subpackage
    
    Signed-off-by: Cole Robinson <crobinso@redhat.com>
    
        
file modified
+18 -2
qemu.spec CHANGED
@@ -74,6 +74,11 @@
74
74
%global have_pmem 1
75
75
%endif
76
76
77
+ %global have_jack 1
78
+ %if 0%{?rhel}
79
+ %global have_jack 0
80
+ %endif
81
+
77
82
78
83
# Matches edk2.spec ExclusiveArch
79
84
%global have_edk2 0
@@ -161,7 +166,6 @@
161
166
%define requires_audio_oss Requires: %{name}-audio-oss = %{evr}
162
167
%define requires_audio_pa Requires: %{name}-audio-pa = %{evr}
163
168
%define requires_audio_sdl Requires: %{name}-audio-sdl = %{evr}
164
- %define requires_audio_jack Requires: %{name}-audio-jack = %{evr}
165
169
%define requires_char_baum Requires: %{name}-char-baum = %{evr}
166
170
%define requires_device_usb_redirect Requires: %{name}-device-usb-redirect = %{evr}
167
171
%define requires_device_usb_smartcard Requires: %{name}-device-usb-smartcard = %{evr}
@@ -175,6 +179,12 @@
175
179
%define requires_device_display_virtio_gpu_ccw Requires: %{name}-device-display-virtio-gpu-ccw = %{evr}
176
180
%define requires_device_display_virtio_vga Requires: %{name}-device-display-virtio-vga = %{evr}
177
181
182
+ %if %{have_jack}
183
+ %define requires_audio_jack Requires: %{name}-audio-jack = %{evr}
184
+ %else
185
+ %define requires_audio_jack %{nil}
186
+ %endif
187
+
178
188
%if %{have_spice}
179
189
%define requires_ui_spice_app Requires: %{name}-ui-spice-app = %{evr}
180
190
%define requires_ui_spice_core Requires: %{name}-ui-spice-core = %{evr}
@@ -404,8 +414,10 @@ BuildRequires: daxctl-devel
404
414
BuildRequires: libdrm-devel
405
415
# fuse block device
406
416
BuildRequires: fuse-devel
417
+ %if %{have_jack}
407
418
# jack audio driver
408
419
BuildRequires: jack-audio-connection-kit-devel
420
+ %endif
409
421
410
422
%if %{user_static}
411
423
BuildRequires: glibc-static pcre-static glib2-static zlib-static
@@ -583,11 +595,13 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
583
595
%description audio-sdl
584
596
This package provides the additional SDL audio driver for QEMU.
585
597
598
+ %if %{have_jack}
586
599
%package audio-jack
587
600
Summary: QEMU Jack audio driver
588
601
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
589
602
%description audio-jack
590
603
This package provides the additional Jack audio driver for QEMU.
604
+ %endif
591
605
592
606
593
607
%package ui-curses
@@ -1165,7 +1179,7 @@ mkdir build-dynamic
1165
1179
pushd build-dynamic
1166
1180
1167
1181
run_configure \
1168
- --audio-drv-list=pa,sdl,alsa,jack,oss \
1182
+ --audio-drv-list=pa,sdl,alsa,try-jack,oss \
1169
1183
--enable-kvm \
1170
1184
--enable-system \
1171
1185
--target-list-exclude=moxie-softmmu \
@@ -1543,8 +1557,10 @@ getent passwd qemu >/dev/null || \
1543
1557
%{_libdir}/qemu/audio-pa.so
1544
1558
%files audio-sdl
1545
1559
%{_libdir}/qemu/audio-sdl.so
1560
+ %if %{have_jack}
1546
1561
%files audio-jack
1547
1562
%{_libdir}/qemu/audio-jack.so
1563
+ %endif
1548
1564
1549
1565
1550
1566
%files ui-curses