summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc27
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch46
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/0001-introduce-a-special-build-flag-to-explicitly-disable.patch161
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb)6
4 files changed, 26 insertions, 214 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index ec51d8b279..4e32b27087 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -56,7 +56,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \
56 file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \ 56 file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \
57" 57"
58 58
59DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native" 59DEPENDS = "libatomic-ops libsndfile1 libtool"
60# optional 60# optional
61DEPENDS += "udev alsa-lib glib-2.0" 61DEPENDS += "udev alsa-lib glib-2.0"
62DEPENDS += "speexdsp libxml-parser-perl-native libcap" 62DEPENDS += "speexdsp libxml-parser-perl-native libcap"
@@ -158,12 +158,22 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
158 --no-create-home --shell /bin/false \ 158 --no-create-home --shell /bin/false \
159 --groups audio,pulse --gid pulse pulse" 159 --groups audio,pulse --gid pulse pulse"
160 160
161PACKAGES =+ "\
162 libpulse \
163 libpulse-mainloop-glib \
164 libpulse-simple \
165 libpulsecommon \
166 libpulsecore \
167 ${PN}-pa-info \
168 ${PN}-server \
169 ${PN}-misc \
170 "
171
161# The console-kit module is included here explicitly so bitbake can map to the 172# The console-kit module is included here explicitly so bitbake can map to the
162# RDEPENDS we define for it in this recipe, and thereby ensure that when 173# RDEPENDS we define for it in this recipe, and thereby ensure that when
163# adding the console-kit module to an image, we also get the necessary 174# adding the console-kit module to an image, we also get the necessary
164# consolekit package produced. 175# consolekit package produced.
165PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ 176PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}"
166 pulseaudio-server pulseaudio-misc ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}"
167 177
168#upgrade path: 178#upgrade path:
169RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 179RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -183,6 +193,7 @@ FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
183FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" 193FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"
184FILES_${PN}-conf = "${sysconfdir}" 194FILES_${PN}-conf = "${sysconfdir}"
185FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" 195FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
196FILES_${PN}-pa-info = "${bindir}/pa-info"
186FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" 197FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*"
187 198
188#SYSTEMD_PACKAGES = "${PN}-server" 199#SYSTEMD_PACKAGES = "${PN}-server"
@@ -214,6 +225,16 @@ python populate_packages_prepend() {
214 do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) 225 do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True)
215} 226}
216 227
228# pa-info is a bash script that collects information about the audio setup.
229# It's primarily useful for attaching an information dump when reporting bugs.
230RDEPENDS_${PN}-pa-info = "\
231 alsa-utils-amixer \
232 alsa-utils-aplay \
233 alsa-utils-scripts \
234 bash \
235 ${PN}-server \
236 "
237
217RDEPENDS_pulseaudio-server = " \ 238RDEPENDS_pulseaudio-server = " \
218 pulseaudio-module-filter-apply \ 239 pulseaudio-module-filter-apply \
219 pulseaudio-module-filter-heuristics \ 240 pulseaudio-module-filter-heuristics \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch
deleted file mode 100644
index 15026a2f83..0000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
2From: Takashi Iwai <tiwai@suse.de>
3Date: Sun, 21 Apr 2019 11:59:30 +0200
4Subject: [PATCH] alsa: Fix inclusion of use-case.h
5
6The recent change in ALSA upstream stripped -I$include/alsa path from
7pkgconfig. We already fixed for this change in some places but still
8the code for UCM was overlooked, and this resulted in the unresolved
9symbols in alsa card module. Fix them as well.
10
11Signed-off-by: Takashi Iwai <tiwai@suse.de>
12Upstream-Status: Backport
13---
14 configure.ac | 2 +-
15 src/modules/alsa/alsa-ucm.h | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index c004bd70d..b44ed1595 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
23 AS_IF([test "x$HAVE_ALSA" = "x1"],
24 [
25 save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
26- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
27+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
28 CPPFLAGS="$save_CPPFLAGS"
29 ],
30 HAVE_ALSA_UCM=0)
31diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
32index 53abf3f90..c926f3cc3 100644
33--- a/src/modules/alsa/alsa-ucm.h
34+++ b/src/modules/alsa/alsa-ucm.h
35@@ -23,7 +23,7 @@
36 ***/
37
38 #ifdef HAVE_ALSA_UCM
39-#include <use-case.h>
40+#include <alsa/use-case.h>
41 #else
42 typedef void snd_use_case_mgr_t;
43 #endif
44--
452.21.0
46
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-introduce-a-special-build-flag-to-explicitly-disable.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-introduce-a-special-build-flag-to-explicitly-disable.patch
deleted file mode 100644
index b7e9cd8c5c..0000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-introduce-a-special-build-flag-to-explicitly-disable.patch
+++ /dev/null
@@ -1,161 +0,0 @@
1From 36feb98e568221e24286615730888d5f6ff323f0 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 7 Dec 2018 15:12:38 +0800
4Subject: [PATCH] introduce a special build flag to explicitly disables running
5 from build tree
6
7It is helpful to improve reproducibility build [1] since
8PA_SRCDIR/PA_BUILDDIR contains build path, disable running
9from build tree could drop these macros at precompilation.
10
11[1] https://reproducible-builds.org/
12
13Upstream-Status: Submitted [pulseaudio-discuss@lists.freedesktop.org]
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15Acked-by: Tanu Kaskinen <tanuk@iki.fi>
16---
17 configure.ac | 10 ++++++++++
18 src/daemon/daemon-conf.c | 4 +++-
19 src/daemon/main.c | 6 ++++++
20 src/modules/alsa/alsa-mixer.c | 4 ++++
21 src/modules/gconf/module-gconf.c | 2 +-
22 src/modules/gsettings/module-gsettings.c | 2 +-
23 src/pulsecore/core-util.c | 4 +++-
24 7 files changed, 28 insertions(+), 4 deletions(-)
25
26diff --git a/configure.ac b/configure.ac
27index c9c414f..8b345ef 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -998,6 +998,16 @@ AS_IF([test "x$enable_asyncns" = "xyes" && test "x$HAVE_LIBASYNCNS" = "x0"],
31 AM_CONDITIONAL([HAVE_LIBASYNCNS], [test "x$HAVE_LIBASYNCNS" = x1])
32 AS_IF([test "x$HAVE_LIBASYNCNS" = "x1"], AC_DEFINE([HAVE_LIBASYNCNS], 1, [Have libasyncns?]))
33
34+#### Running from build tree (optional) ####
35+
36+AC_ARG_ENABLE([running-from-build-tree],
37+ AS_HELP_STRING([--disable-running-from-build-tree],[Disable running from build tree]))
38+
39+AS_IF([test "x$enable_running_from_build_tree" != "xno"],
40+ AC_DEFINE([HAVE_RUNNING_FROM_BUILD_TREE], 1, [Have running from build tree]))
41+
42+AC_SUBST(HAVE_RUNNING_FROM_BUILD_TREE)
43+
44 #### TCP wrappers (optional) ####
45
46 AC_ARG_ENABLE([tcpwrap],
47diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
48index 9883126..f01eff4 100644
49--- a/src/daemon/daemon-conf.c
50+++ b/src/daemon/daemon-conf.c
51@@ -155,12 +155,14 @@ pa_daemon_conf *pa_daemon_conf_new(void) {
52 c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%d.%d" PA_PATH_SEP "modules",
53 pa_win32_get_toplevel(NULL), PA_MAJOR, PA_MINOR);
54 #else
55+#ifdef HAVE_RUNNING_FROM_BUILD_TREE
56 if (pa_run_from_build_tree()) {
57 pa_log_notice("Detected that we are run from the build tree, fixing search path.");
58 c->dl_search_path = pa_xstrdup(PA_BUILDDIR);
59 } else
60- c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
61 #endif
62+ c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
63+#endif //Endof #ifdef OS_IS_WIN32
64
65 return c;
66 }
67diff --git a/src/daemon/main.c b/src/daemon/main.c
68index c80fa94..1e00388 100644
69--- a/src/daemon/main.c
70+++ b/src/daemon/main.c
71@@ -932,6 +932,12 @@ int main(int argc, char *argv[]) {
72
73 pa_log_debug("Running in VM: %s", pa_yes_no(pa_running_in_vm()));
74
75+#ifdef HAVE_RUNNING_FROM_BUILD_TREE
76+ pa_log_debug("Running from build tree: %s", pa_yes_no(pa_run_from_build_tree()));
77+#else
78+ pa_log_debug("Running from build tree: no");
79+#endif
80+
81 #ifdef __OPTIMIZE__
82 pa_log_debug("Optimized build: yes");
83 #else
84diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
85index a524d6d..670f646 100644
86--- a/src/modules/alsa/alsa-mixer.c
87+++ b/src/modules/alsa/alsa-mixer.c
88@@ -2571,9 +2571,11 @@ static int path_verify(pa_alsa_path *p) {
89 }
90
91 static const char *get_default_paths_dir(void) {
92+#ifdef HAVE_RUNNING_FROM_BUILD_TREE
93 if (pa_run_from_build_tree())
94 return PA_SRCDIR "/modules/alsa/mixer/paths/";
95 else
96+#endif
97 return PA_ALSA_PATHS_DIR;
98 }
99
100@@ -4455,7 +4457,9 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
101 fname = "default.conf";
102
103 fn = pa_maybe_prefix_path(fname,
104+#ifdef HAVE_RUNNING_FROM_BUILD_TREE
105 pa_run_from_build_tree() ? PA_SRCDIR "/modules/alsa/mixer/profile-sets/" :
106+#endif
107 PA_ALSA_PROFILE_SETS_DIR);
108
109 r = pa_config_parse(fn, NULL, items, NULL, false, ps);
110diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
111index c0f4dde..76a1f19 100644
112--- a/src/modules/gconf/module-gconf.c
113+++ b/src/modules/gconf/module-gconf.c
114@@ -51,7 +51,7 @@ int pa__init(pa_module*m) {
115 u->buf_fill = 0;
116
117 if ((u->fd = pa_start_child_for_read(
118-#if defined(__linux__) && !defined(__OPTIMIZE__)
119+#if defined(__linux__) && defined(HAVE_RUNNING_FROM_BUILD_TREE)
120 pa_run_from_build_tree() ? PA_BUILDDIR "/gconf-helper" :
121 #endif
122 PA_GCONF_HELPER, NULL, &u->pid)) < 0)
123diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c
124index 330eca1..209c857 100644
125--- a/src/modules/gsettings/module-gsettings.c
126+++ b/src/modules/gsettings/module-gsettings.c
127@@ -51,7 +51,7 @@ int pa__init(pa_module*m) {
128 u->buf_fill = 0;
129
130 if ((u->fd = pa_start_child_for_read(
131-#if defined(__linux__) && !defined(__OPTIMIZE__)
132+#if defined(__linux__) && defined(HAVE_RUNNING_FROM_BUILD_TREE)
133 pa_run_from_build_tree() ? PA_BUILDDIR "/gsettings-helper" :
134 #endif
135 PA_GSETTINGS_HELPER, NULL, &u->pid)) < 0)
136diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
137index 64e9f21..f85dd20 100644
138--- a/src/pulsecore/core-util.c
139+++ b/src/pulsecore/core-util.c
140@@ -3436,15 +3436,17 @@ void pa_reset_personality(void) {
141 }
142
143 bool pa_run_from_build_tree(void) {
144- char *rp;
145 static bool b = false;
146
147+#ifdef HAVE_RUNNING_FROM_BUILD_TREE
148+ char *rp;
149 PA_ONCE_BEGIN {
150 if ((rp = pa_readlink("/proc/self/exe"))) {
151 b = pa_startswith(rp, PA_BUILDDIR);
152 pa_xfree(rp);
153 }
154 } PA_ONCE_END;
155+#endif
156
157 return b;
158 }
159--
1602.7.4
161
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb
index 88b4975a66..7f8ebc2090 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb
@@ -2,13 +2,11 @@ require pulseaudio.inc
2 2
3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ 3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
4 file://0001-client-conf-Add-allow-autospawn-for-root.patch \ 4 file://0001-client-conf-Add-allow-autospawn-for-root.patch \
5 file://0001-introduce-a-special-build-flag-to-explicitly-disable.patch \
6 file://0001-alsa-Fix-inclusion-of-use-case.h.patch \
7 file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ 5 file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \
8 file://volatiles.04_pulse \ 6 file://volatiles.04_pulse \
9 " 7 "
10SRC_URI[md5sum] = "c42f1f1465e8df9859d023dc184734bf" 8SRC_URI[md5sum] = "e41d606f90254ed45c90520faf83d95c"
11SRC_URI[sha256sum] = "809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055" 9SRC_URI[sha256sum] = "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057"
12 10
13do_compile_prepend() { 11do_compile_prepend() {
14 mkdir -p ${S}/libltdl 12 mkdir -p ${S}/libltdl
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 12:35:41 +0000