build fixes

This commit is contained in:
Wim Taymans 2017-07-04 11:30:49 +02:00
parent 4558073da6
commit 8886f5d373
4 changed files with 19 additions and 12 deletions

View file

@ -31,6 +31,7 @@ Source0: http://freedesktop.org/software/pipewire/releases/pipewire-%{ver
BuildRequires: meson >= 0.35.0 BuildRequires: meson >= 0.35.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(gio-unix-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-net-1.0) >= 1.10.0
BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.10.0 BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.10.0
BuildRequires: systemd-devel >= 184 BuildRequires: systemd-devel >= 184
BuildRequires: alsa-lib-devel
BuildRequires: libv4l-devel
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}

View file

@ -2,12 +2,12 @@
alsa_dep = dependency('alsa') alsa_dep = dependency('alsa')
v4l2_dep = dependency('libv4l2') v4l2_dep = dependency('libv4l2')
xv_dep = dependency('x11') x11_dep = dependency('x11', required : false)
sdl_dep = dependency('sdl2') sdl_dep = dependency('sdl2', required : false)
avcodec_dep = dependency('libavcodec') avcodec_dep = dependency('libavcodec', required : false)
avformat_dep = dependency('libavformat') avformat_dep = dependency('libavformat', required : false)
avfilter_dep = dependency('libavfilter') avfilter_dep = dependency('libavfilter', required : false)
libva_dep = dependency('libva') libva_dep = dependency('libva', required : false)
libudev_dep = dependency('libudev') libudev_dep = dependency('libudev')
threads_dep = dependency('threads') threads_dep = dependency('threads')

View file

@ -1,7 +1,9 @@
subdir('alsa') subdir('alsa')
subdir('audiomixer') subdir('audiomixer')
subdir('audiotestsrc') subdir('audiotestsrc')
subdir('ffmpeg') if avcodec_dep.found()
subdir('ffmpeg')
endif
subdir('support') subdir('support')
subdir('test') subdir('test')
subdir('videotestsrc') subdir('videotestsrc')

View file

@ -18,11 +18,13 @@ executable('stress-ringbuffer', 'stress-ringbuffer.c',
include_directories : [spa_inc, spa_libinc ], include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, pthread_lib], dependencies : [dl_lib, pthread_lib],
install : false) install : false)
executable('test-v4l2', 'test-v4l2.c', if sdl_dep.found()
executable('test-v4l2', 'test-v4l2.c',
include_directories : [spa_inc, spa_libinc ], include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, sdl_dep, pthread_lib], dependencies : [dl_lib, sdl_dep, pthread_lib],
link_with : spalib, link_with : spalib,
install : false) install : false)
endif
executable('test-props', 'test-props.c', executable('test-props', 'test-props.c',
include_directories : [spa_inc, spa_libinc ], include_directories : [spa_inc, spa_libinc ],
dependencies : [], dependencies : [],