Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
251fcdfd
Commit
251fcdfd
authored
3 years ago
by
Ariadne Conill
Browse files
Options
Downloads
Patches
Plain Diff
community/pulseaudio: even more meson 0.58 mitigations
parent
920ac07c
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/pulseaudio/APKBUILD
+2
-0
2 additions, 0 deletions
community/pulseaudio/APKBUILD
community/pulseaudio/meson-echo-cancel.patch
+34
-0
34 additions, 0 deletions
community/pulseaudio/meson-echo-cancel.patch
with
36 additions
and
0 deletions
community/pulseaudio/APKBUILD
+
2
−
0
View file @
251fcdfd
...
...
@@ -66,6 +66,7 @@ source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.
link-libintl.patch
0001-filter-apply-Look-for-filter-parameters-also-in-device-properties.patch
meson-opt-doxygen.patch
meson-echo-cancel.patch
$pkgname
.initd
$pkgname
.confd
"
...
...
@@ -262,6 +263,7 @@ sha512sums="
2c31c5bc592e748248215f8f62f85687cfec230b05f65441e6dafa5fa77d4967e97636209b2011a4501ed1337ecd880b264baa175586fc85183a980846cb8146 link-libintl.patch
fffee2f95c86c5e53e5b668bcc67a6cb6a2c887c6880a0dbe598e8844c8e0eb3d0128a9b1fcbdd6155e309df10ae0009fd2abe928cef3b3f047ebe1d4c7bec97 0001-filter-apply-Look-for-filter-parameters-also-in-device-properties.patch
20525b78b4f701e8776b1da8e4aacf9ad83e2d3f78f5f3c3f59fb25fa9f76b44b30c30ffee63856ca00ac99b3ab010edd7556cf3c4b200f5f2dcd9172e64ed97 meson-opt-doxygen.patch
e53fdd85e51762384a9a548d62ad3e31a0e48c5f1e6ca7dbd1ba205d077af8b2b714ffb56ee8bcf6e603d952a50262675c23ca0523483b0115e0311f27caeef0 meson-echo-cancel.patch
34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd
75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
"
This diff is collapsed.
Click to expand it.
community/pulseaudio/meson-echo-cancel.patch
0 → 100644
+
34
−
0
View file @
251fcdfd
From 2a07c83cfcc8f6a513a6c0c138e6aec1cebab71f Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 12 May 2021 21:10:54 +0200
Subject: [PATCH] build-sys: meson: Add missing include dir
Otherwise building module-echo-cancel fails here:
FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
30 | #include "adrian-aec-orc-gen.h"
| ^~~~~~~~~~~~~~~~~~~~~~
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
---
src/modules/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index f9b46f844..9c498a4e1 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -304,7 +304,7 @@
foreach m : all_modules
mod = shared_module(name,
sources,
headers,
- include_directories : [configinc, topinc],
+ include_directories : [configinc, topinc, include_directories('.')],
c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
install : true,
install_rpath : rpath_dirs,
--
GitLab
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment