diff --git a/.gitignore b/.gitignore index 331d4888d..d86eed290 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,3 @@ stamp-* .dirstamp *.orig *.rej -subprojects/*/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 964bfe2a4..e6b36da87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # container and push it to the project's container registry on fd.o GitLab. # This step is only run when the tag for the container changes, else it is # effectively a no-op. All of this infrastructure is inherited from the -# freedesktop/ci-templates repository which is the recommended way to set up CI +# wayland/ci-templates repository which is the recommended way to set up CI # infrastructure on fd.o GitLab. # # Once the container stage is done, we move on to the 'build' stage where we @@ -10,15 +10,6 @@ # there doesn't seem to be significant value to splitting the stages at the # moment. -# Create merge request pipelines for open merge requests, branch pipelines -# otherwise. This allows MRs for new users to run CI. -workflow: - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS - when: never - - if: $CI_COMMIT_BRANCH - stages: - container - build @@ -28,21 +19,22 @@ variables: # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES. # The tag is an arbitrary string that identifies the exact container # contents. - FDO_DISTRIBUTION_TAG: '2023-08-13-00' + FDO_DISTRIBUTION_TAG: '2021-11-03-00' FDO_DISTRIBUTION_VERSION: '20.04' FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio' + UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" include: # We pull templates from master to avoid the overhead of periodically # scanning for changes upstream. This does means builds might occasionally # break due to upstream changing things, so if you see unexpected build # failures, this might be one cause. - - project: 'freedesktop/ci-templates' + - project: 'wayland/ci-templates' ref: 'master' file: '/templates/ubuntu.yml' build-container: - extends: .fdo.container-build@ubuntu + extends: .fdo.container-ifnot-exists@ubuntu stage: container variables: GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image @@ -56,7 +48,6 @@ build-container: check curl dbus-x11 - doxygen g++ gcc gettext @@ -97,19 +88,17 @@ build-container: wget build-meson: - extends: .fdo.distribution-image@ubuntu stage: build + image: $UBUNTU_IMAGE script: - # Install meson (higher than our min version to support our wrap file) - - wget -q https://github.com/mesonbuild/meson/releases/download/0.63.2/meson-0.63.2.tar.gz - - tar -xf meson-0.63.2.tar.gz - - cd meson-0.63.2 + # Install meson + - wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz + - tar -xf meson-0.50.0.tar.gz + - cd meson-0.50.0 - python3 setup.py install - cd .. - # needed to generate a version - - git fetch https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git --tags # Do the actual build - - meson build -Dwebrtc-aec=enabled + - meson build --werror - cd build - ninja - ulimit -c 0 # don't dump core files on tests that are supposed to assert diff --git a/NEWS b/NEWS index a7a5dbd90..883efab8c 100644 --- a/NEWS +++ b/NEWS @@ -1,74 +1,18 @@ -PulseAudio 17.0 +PulseAudio 16.2 -Changes at a glance: - * Notes for end users - * Updates to ALSA UCM-based setups - * Battery level indication to Bluetooth devices - * Support for the Bluetooth FastStream codec - * webrtc-audio-processing dependency updated - * Trigger role groups added to module-role-cork - * XDG base directory spec for profile-set loading - * Notes for application developers - * PA_RATE_MAX increased - * Notes for packagers - * webrtc-audio-processing dependency updated +A bug fix release. + + * A couple of time-smoother-2 fixes, mainly manifesting in issues for GStreamer clients + * Fix a crash in some restricted environments + * Minor RTP spec compliance fix + * Minur completion and tests fixups Contributors -Alistair Leslie-Hughes -Alper Nebi Yasak Arun Raghavan -Asier Sarasua Garmendia -Ataberk Özen -Balázs Meskó -Biswapriyo Nath -Dylan Van Assche -Eero Nurkkala -Ettore Atalan -Fabrice Fontaine -Fran Diéguez Georg Chini -Gioele Barabucci -Gogo Gogsi -Hector Martin -Hugo Carvalho -Hui Wang Igor V. Kovalenko -Jaechul Lee -Jan Kuparinen -Jan Palus -Jaroslav Kysela -Jiri Grönroos -Joachim Philipp -Jordi Mas -Marijn Suijten -Mart Raudsepp -Nicolas Cavallari -Peter Meerwald-Stadler -Philip Goto -Rosen Penev -Rudi Heitbaum -Sabri Ünal -Sean Greenslade -Seong-ho Cho -Shunsuke Shimizu -SimonP -Takashi Sakamoto -Tanu Kaskinen -Temuri Doghonadze -Toni Estevez -Weijia Wang -Wim Taymans -Yureka -acheronfail flyingOwl -grimst -hashitaku -mooo -peijiankang -redfast00 -wael -김인수 PulseAudio 16.1 diff --git a/doxygen/meson.build b/doxygen/meson.build index 7659de35c..afc0e4989 100644 --- a/doxygen/meson.build +++ b/doxygen/meson.build @@ -1,8 +1,3 @@ -doxygen = find_program('doxygen', required: get_option('doxygen')) -if not doxygen.found() - subdir_done() -endif - cdata.set('DOXYGEN_OUTPUT_DIRECTORY', meson.current_build_dir()) doxygen_conf = configure_file( @@ -12,4 +7,4 @@ doxygen_conf = configure_file( ) run_target('doxygen', - command : [doxygen, doxygen_conf]) + command : ['doxygen', doxygen_conf]) diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in index ca365dc23..d4eb03458 100644 --- a/man/pactl.1.xml.in +++ b/man/pactl.1.xml.in @@ -174,9 +174,7 @@ License along with PulseAudio; if not, see .