From 8886f5d373a184b25a4a3c88d6f8ed6ffdae67b2 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 4 Jul 2017 11:30:49 +0200
Subject: [PATCH] build fixes

---
 pipewire.spec           |  3 +++
 spa/meson.build         | 12 ++++++------
 spa/plugins/meson.build |  4 +++-
 spa/tests/meson.build   | 12 +++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pipewire.spec b/pipewire.spec
index 838335a14..d7727c319 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -31,6 +31,7 @@ Source0:        http://freedesktop.org/software/pipewire/releases/pipewire-%{ver
 
 BuildRequires:  meson >= 0.35.0
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.32
@@ -40,6 +41,8 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.10.0
 BuildRequires:  pkgconfig(gstreamer-net-1.0) >= 1.10.0
 BuildRequires:  pkgconfig(gstreamer-allocators-1.0) >= 1.10.0
 BuildRequires:  systemd-devel >= 184
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libv4l-devel
 
 Requires(pre):  shadow-utils
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
diff --git a/spa/meson.build b/spa/meson.build
index f79ed4053..c3ca91530 100644
--- a/spa/meson.build
+++ b/spa/meson.build
@@ -2,12 +2,12 @@
 
 alsa_dep = dependency('alsa')
 v4l2_dep = dependency('libv4l2')
-xv_dep = dependency('x11')
-sdl_dep = dependency('sdl2')
-avcodec_dep = dependency('libavcodec')
-avformat_dep = dependency('libavformat')
-avfilter_dep = dependency('libavfilter')
-libva_dep = dependency('libva')
+x11_dep = dependency('x11', required : false)
+sdl_dep = dependency('sdl2', required : false)
+avcodec_dep = dependency('libavcodec', required : false)
+avformat_dep = dependency('libavformat', required : false)
+avfilter_dep = dependency('libavfilter', required : false)
+libva_dep = dependency('libva', required : false)
 libudev_dep = dependency('libudev')
 threads_dep = dependency('threads')
 
diff --git a/spa/plugins/meson.build b/spa/plugins/meson.build
index 332cc2cc8..883c048ed 100644
--- a/spa/plugins/meson.build
+++ b/spa/plugins/meson.build
@@ -1,7 +1,9 @@
 subdir('alsa')
 subdir('audiomixer')
 subdir('audiotestsrc')
-subdir('ffmpeg')
+if avcodec_dep.found()
+  subdir('ffmpeg')
+endif
 subdir('support')
 subdir('test')
 subdir('videotestsrc')
diff --git a/spa/tests/meson.build b/spa/tests/meson.build
index 53212fd08..dd5fec970 100644
--- a/spa/tests/meson.build
+++ b/spa/tests/meson.build
@@ -18,11 +18,13 @@ executable('stress-ringbuffer', 'stress-ringbuffer.c',
            include_directories : [spa_inc, spa_libinc ],
            dependencies : [dl_lib, pthread_lib],
            install : false)
-executable('test-v4l2', 'test-v4l2.c',
-           include_directories : [spa_inc, spa_libinc ],
-           dependencies : [dl_lib, sdl_dep, pthread_lib],
-           link_with : spalib,
-           install : false)
+if sdl_dep.found()
+  executable('test-v4l2', 'test-v4l2.c',
+             include_directories : [spa_inc, spa_libinc ],
+             dependencies : [dl_lib, sdl_dep, pthread_lib],
+             link_with : spalib,
+             install : false)
+endif
 executable('test-props', 'test-props.c',
            include_directories : [spa_inc, spa_libinc ],
            dependencies : [],