[pulseaudio-commits] [Git][pulseaudio/webrtc-audio-processing][master] 2 commits: ci: Add an aarch64 build

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / webrtc-audio-processing


Commits:
e23c10c5 by Arun Raghavan at 2020-11-27T13:20:12-05:00
ci: Add an aarch64 build

- - - - -
e5402cd6 by Arun Raghavan at 2020-11-27T14:03:06-05:00
build: Fix up some ARM-related mistakes

- - - - -


3 changed files:

- .gitlab-ci.yml
- webrtc/common_audio/meson.build
- webrtc/modules/audio_processing/meson.build


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -19,10 +19,9 @@ 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: '2020-10-26.1'
+  BASE_TAG: '2020-11-27.1'
   FDO_DISTRIBUTION_VERSION: '20.10'
   FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
-  UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
 
 include:
   # We pull templates from master to avoid the overhead of periodically
@@ -33,9 +32,8 @@ include:
     ref: 'master'
     file: '/templates/ubuntu.yml'
 
-build-container:
-  extends: .fdo.container-build at ubuntu
-  stage: container
+# Common container build template
+.ubuntu-container-build:
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
 
@@ -50,9 +48,37 @@ build-container:
       ninja-build
       python3-setuptools
 
-build:
+# Used to extend both container and build jobs
+.ubuntu-x86_64:
+  variables:
+    FDO_DISTRIBUTION_TAG: "x86_64-$BASE_TAG"
+
+# Used to extend both container and build jobs
+.ubuntu-aarch64:
+  tags:
+    - aarch64
+  variables:
+    FDO_DISTRIBUTION_TAG: "aarch64-$BASE_TAG"
+
+build-container-x86_64:
+  extends:
+    - .fdo.container-build at ubuntu@x86_64
+    - .ubuntu-container-build
+    - .ubuntu-x86_64
+  stage: container
+
+build-container-aarch64:
+  extends:
+    - .fdo.container-build at ubuntu@aarch64
+    - .ubuntu-container-build
+    - .ubuntu-aarch64
+  stage: container
+
+# Common build template
+.build:
   stage: build
-  image: $UBUNTU_IMAGE
+  extends:
+    - .fdo.distribution-image at ubuntu
   script:
     - meson build
     - cd build
@@ -60,3 +86,13 @@ build:
   artifacts:
     paths:
       - build/
+
+build-x86_64:
+  extends:
+    - .build
+    - .ubuntu-x86_64
+
+build-aarch64:
+  extends:
+    - .build
+    - .ubuntu-aarch64


=====================================
webrtc/common_audio/meson.build
=====================================
@@ -124,7 +124,7 @@ if have_neon
     'signal_processing/cross_correlation_neon.c',
     'signal_processing/downsample_fast_neon.c',
     'signal_processing/min_max_operations_neon.c',
-    'third_party/ooura/fft_size_128/ooura_fft_neon.c',
+    'third_party/ooura/fft_size_128/ooura_fft_neon.cc',
   ]
 endif
 


=====================================
webrtc/modules/audio_processing/meson.build
=====================================
@@ -186,7 +186,7 @@ endif
 
 if have_neon
   webrtc_audio_processing_sources += [
-    'aecm/aecm_core_neon.c',
+    'aecm/aecm_core_neon.cc',
   ]
 endif
 



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/d938d2cf521741f2bf87e97157f92a4de075dcff...e5402cd638c316bc544114b5ef13ca8e9c52132b

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/d938d2cf521741f2bf87e97157f92a4de075dcff...e5402cd638c316bc544114b5ef13ca8e9c52132b
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/20201127/598ef798/attachment-0001.htm>