mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Update meson dependency to 0.50.0

Browse source 
This is needed for currently used features (disabler and install in
configure_file).
This commit is contained in:
Arun Raghavan 2019-04-17 15:58:45 +05:30
parent 2f6a46ca1a
commit b943caa17f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -1,6 +1,6 @@
project('pulseaudio', 'c', 'cpp', project('pulseaudio', 'c', 'cpp',
version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(),
meson_version : '>= 0.47.0', meson_version : '>= 0.50.0',
default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
) )
@ -250,7 +250,7 @@ if get_option('database') == 'tdb'
elif get_option('database') == 'gdbm' elif get_option('database') == 'gdbm'
database_dep = cc.find_library('gdbm', required : true) database_dep = cc.find_library('gdbm', required : true)
else else
database_dep = dependency('', required:false) database_dep = dependency('', required: false)
endif endif
if get_option('ipv6') if get_option('ipv6')

3
scripts/Dockerfile
View file

@ -43,10 +43,11 @@ RUN apt-get update && apt-get install -y \
libxtst-dev \ libxtst-dev \
make \ make \
ninja-build \ ninja-build \
python3-setuptools \
systemd systemd
# Install meson from upstream tarball # Install meson from upstream tarball
ARG MESON_VERSION=0.47.0 ARG MESON_VERSION=0.50.0
RUN apt-get install -y wget && \ RUN apt-get install -y wget && \
wget -q https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz && \ wget -q https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz && \
tar -xf meson-${MESON_VERSION}.tar.gz && \ tar -xf meson-${MESON_VERSION}.tar.gz && \