[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 6 commits: build-sys: Bump cpp_std to c++17

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
e2b63d15 by Arun Raghavan at 2023-09-01T11:21:11-04:00
build-sys: Bump cpp_std to c++17

Match it with webrtc-audio-processing, which is what we care about.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -
9b37e8d9 by Arun Raghavan at 2023-09-01T11:21:12-04:00
build-sys: Add a webrtc-audio-processing wrap file

This will make things easier on systems where this is missing, as well
as allow us to test things in CI until packages land in
Ubuntu/Fedora/...

The wrap file is taken as-is from the GStreamer project.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -
217c0e90 by Arun Raghavan at 2023-09-01T11:21:15-04:00
ci: Force build of webrtc-aec

Makes sure we build this, either with system deps or the fallback wrap
file. We also bump the CI meson version to support [provide] in the
wrap file.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -
3e68ebf4 by Arun Raghavan at 2023-09-01T11:21:26-04:00
ci: Add doxygen to build image

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -
63d38a68 by Arun Raghavan at 2023-09-01T11:21:27-04:00
ci: Drop -werror in build

Can't rely on this while building abseil on older Ubuntu (or at all,
perhaps).

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -
6abe0c58 by Arun Raghavan at 2023-09-01T11:21:29-04:00
build-sys: Bump webrtc-audio-processing wrap to 1.2

Should make builds actually work now.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>

- - - - -


4 changed files:

- .gitignore
- .gitlab-ci.yml
- meson.build
- + subprojects/webrtc-audio-processing.wrap


Changes:

=====================================
.gitignore
=====================================
@@ -37,3 +37,4 @@ stamp-*
 .dirstamp
 *.orig
 *.rej
+subprojects/*/


=====================================
.gitlab-ci.yml
=====================================
@@ -19,7 +19,7 @@ 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-04-21-00'
+  FDO_DISTRIBUTION_TAG: '2023-08-13-00'
   FDO_DISTRIBUTION_VERSION: '20.04'
   FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio'
 
@@ -47,6 +47,7 @@ build-container:
       check
       curl
       dbus-x11
+      doxygen
       g++
       gcc
       gettext
@@ -90,14 +91,14 @@ build-meson:
   extends: .fdo.distribution-image at ubuntu
   stage: build
   script:
-    # 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
+    # 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
     - python3 setup.py install
     - cd ..
     # Do the actual build
-    - meson build --werror
+    - meson build -Dwebrtc-aec=enabled
     - cd build
     - ninja
     - ulimit -c 0 # don't dump core files on tests that are supposed to assert


=====================================
meson.build
=====================================
@@ -1,7 +1,7 @@
 project('pulseaudio', 'c',
         version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(),
         meson_version : '>= 0.50.0',
-        default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
+        default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
         )
 
 if not meson.is_subproject()


=====================================
subprojects/webrtc-audio-processing.wrap
=====================================
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = webrtc-audio-processing
+url = https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing.git
+push-url = git at gitlab.freedesktop.org:pulseaudio/webrtc-audio-processing.git
+revision = v1.2
+
+[provide]
+dependency_names = webrtc-audio-coding-1, webrtc-audio-processing-1



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/421cf15486eea1b52f10e2b0be305018fee8c285...6abe0c58d2350c9992f5404438949fbf1c5630cb

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/421cf15486eea1b52f10e2b0be305018fee8c285...6abe0c58d2350c9992f5404438949fbf1c5630cb
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20230901/00d0076a/attachment-0001.htm>