summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2019-02-21 22:13:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 10:43:06 +0000
commit2e1e41041b294016de4086bc13d4eb3603d45130 (patch)
tree0e4ff276c0a326331422ef715dd7084ace70dbff
parent51254af4b052464fa0cfb94d8b3d02025ca063dc (diff)
downloadpoky-2e1e41041b294016de4086bc13d4eb3603d45130.tar.gz
alsa-plugins: 1.1.6 -> 1.1.8
Changelogs: http://alsa-project.org/main/index.php/Changes_v1.1.6_v1.1.7 http://alsa-project.org/main/index.php/Changes_v1.1.7_v1.1.8 The --enable-avcodec configure option was renamed to --enable-libav, and I renamed the respective packageconfig item too. There's a new pcm plugin: aaf (AVTP Audio Format). I added a packageconfig item for it, but I didn't test it, because libavtp doesn't seem to be currently packaged for OpenEmbedded. There are now configuration files for most of the plugins. I removed the symlink creation for 50-pulseaudio.conf, because upstream now creates the symlinks for us. 99-pulseaudio-default.conf is an exception, because upstream ships it only as an example, and upstream doesn't install a symlink for it (upstream actually installs it directly under /etc, but I moved it back to /usr/share), so for that file we still have to create the symlink ourselves. The lavcrate plugin was converted to use libavresample (and renamed to lavrate). Libavresample is provided by ffmpeg, but ffmpeg was by default built with libavresample disabled. This patch now enables libavresample by default in the ffmpeg recipe in order to not cause a regression in alsa-plugins. SRC_URI was changed to a more reliable source (at least currently the ftp server is flaky). (From OE-Core rev: ddf5421331180bc45697511b44cdd4a4e6dda6ff) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins_1.1.8.bb (renamed from meta/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb)89
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.1.bb2
2 files changed, 75 insertions, 16 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.8.bb
index ee06191ea9..2d9cc06f58 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.8.bb
@@ -20,9 +20,9 @@ LIC_FILES_CHKSUM = "\
20 file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ 20 file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
21" 21"
22 22
23SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2" 23SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2"
24SRC_URI[md5sum] = "8387279e99feeb2ecffaac5f293223d7" 24SRC_URI[md5sum] = "d0f87211d1560f2c07c8eae4297bc4f6"
25SRC_URI[sha256sum] = "6f1d31ebe3b1fa1cc8dade60b7bed1cb2583ac998167002d350dc0a5e3e40c13" 25SRC_URI[sha256sum] = "7f77df171685ccec918268477623a39db4d9f32d5dc5e76874ef2467a2405994"
26 26
27DEPENDS += "alsa-lib" 27DEPENDS += "alsa-lib"
28 28
@@ -33,8 +33,9 @@ PACKAGECONFIG ??= "\
33 speexdsp \ 33 speexdsp \
34 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ 34 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
35" 35"
36PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" 36PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,avtp"
37PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 37PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
38PACKAGECONFIG[libav] = "--enable-libav,--disable-libav,libav"
38PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" 39PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin"
39PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus" 40PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus"
40PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" 41PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
@@ -54,15 +55,11 @@ do_install_append() {
54 rm ${D}${libdir}/alsa-lib/*.la 55 rm ${D}${libdir}/alsa-lib/*.la
55 56
56 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then 57 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then
57 # We use the example as is, so just drop the .example suffix. 58 # We use the example as is. Upstream installs the file under
58 mv ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf 59 # /etc, but we move it under /usr/share and add a symlink under
59 60 # /etc to be consistent with other installed configuration
60 # The conf.d files are installed in datadir, but alsa-lib 61 # files.
61 # searches for conf.d files only in sysconfdir. Distributions 62 mv ${D}${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf
62 # are expected to create symlinks in sysconfdir, so that's what
63 # we do here.
64 mkdir -p ${D}${sysconfdir}/alsa/conf.d
65 ln -s ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf ${D}${sysconfdir}/alsa/conf.d/50-pulseaudio.conf
66 ln -s ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf ${D}${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf 63 ln -s ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf ${D}${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf
67 fi 64 fi
68} 65}
@@ -73,6 +70,68 @@ python populate_packages_prepend() {
73 d.setVar("RDEPENDS_alsa-plugins", packages) 70 d.setVar("RDEPENDS_alsa-plugins", packages)
74} 71}
75 72
73# Many plugins have a configuration file (plus a symlink in /etc) associated
74# with them. We put the plugin and it's configuration usually in the same
75# package, but that's problematic when the configuration file is related to
76# multiple plugins, as is the case with the pulse, oss and maemo plugins. In
77# case of the pulse plugins, we have a separate alsa-plugins-pulseaudio-conf
78# package that depends on all the pulse plugins, which ensures that all plugins
79# that the configuration references are installed. The oss and maemo
80# configuration files, on the other hand, are in the respective pcm plugin
81# packages. Therefore it's possible to install the configuration file without
82# the ctl plugin that the configuration file references. This is unlikely to
83# cause big problems, but some kind of improvement to the packaging could
84# probably be done here (at least it would be good to handle the different
85# plugins in a consistent way).
86FILES_${MLPREFIX}libasound-module-ctl-arcam-av += "\
87 ${datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf \
88 ${sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf \
89"
90FILES_${MLPREFIX}libasound-module-pcm-a52 += "\
91 ${datadir}/alsa/alsa.conf.d/60-a52-encoder.conf \
92 ${sysconfdir}/alsa/conf.d/60-a52-encoder.conf \
93"
94FILES_${MLPREFIX}libasound-module-pcm-alsa-dsp += "\
95 ${datadir}/alsa/alsa.conf.d/98-maemo.conf \
96 ${sysconfdir}/alsa/conf.d/98-maemo.conf \
97"
98FILES_${MLPREFIX}libasound-module-pcm-jack += "\
99 ${datadir}/alsa/alsa.conf.d/50-jack.conf \
100 ${sysconfdir}/alsa/conf.d/50-jack.conf \
101"
102FILES_${MLPREFIX}libasound-module-pcm-oss += "\
103 ${datadir}/alsa/alsa.conf.d/50-oss.conf \
104 ${sysconfdir}/alsa/conf.d/50-oss.conf \
105"
106FILES_${MLPREFIX}libasound-module-pcm-speex += "\
107 ${datadir}/alsa/alsa.conf.d/60-speex.conf \
108 ${sysconfdir}/alsa/conf.d/60-speex.conf \
109"
110FILES_${MLPREFIX}libasound-module-pcm-upmix += "\
111 ${datadir}/alsa/alsa.conf.d/60-upmix.conf \
112 ${sysconfdir}/alsa/conf.d/60-upmix.conf \
113"
114FILES_${MLPREFIX}libasound-module-pcm-usb-stream += "\
115 ${datadir}/alsa/alsa.conf.d/98-usb-stream.conf \
116 ${sysconfdir}/alsa/conf.d/98-usb-stream.conf \
117"
118FILES_${MLPREFIX}libasound-module-pcm-vdownmix += "\
119 ${datadir}/alsa/alsa.conf.d/60-vdownmix.conf \
120 ${sysconfdir}/alsa/conf.d/60-vdownmix.conf \
121"
122FILES_${MLPREFIX}libasound-module-rate-lavrate += "\
123 ${datadir}/alsa/alsa.conf.d/10-rate-lav.conf \
124 ${sysconfdir}/alsa/conf.d/10-rate-lav.conf \
125"
126FILES_${MLPREFIX}libasound-module-rate-samplerate += "\
127 ${datadir}/alsa/alsa.conf.d/10-samplerate.conf \
128 ${sysconfdir}/alsa/conf.d/10-samplerate.conf \
129"
130FILES_${MLPREFIX}libasound-module-rate-speexrate += "\
131 ${datadir}/alsa/alsa.conf.d/10-speexrate.conf \
132 ${sysconfdir}/alsa/conf.d/10-speexrate.conf \
133"
134
76# The rate plugins create some symlinks. For example, the samplerate plugin 135# The rate plugins create some symlinks. For example, the samplerate plugin
77# creates these links to the main plugin file: 136# creates these links to the main plugin file:
78# 137#
@@ -89,10 +148,10 @@ python populate_packages_prepend() {
89# The symlinks cause QA errors, because usually it's a bug if a non 148# The symlinks cause QA errors, because usually it's a bug if a non
90# -dev/-dbg/-nativesdk package contains links to .so files, but in this case 149# -dev/-dbg/-nativesdk package contains links to .so files, but in this case
91# the errors are false positives, so we disable the QA checks. 150# the errors are false positives, so we disable the QA checks.
92FILES_${MLPREFIX}libasound-module-rate-lavcrate += "${libdir}/alsa-lib/*rate_lavcrate_*.so" 151FILES_${MLPREFIX}libasound-module-rate-lavrate += "${libdir}/alsa-lib/*rate_lavrate_*.so"
93FILES_${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so" 152FILES_${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so"
94FILES_${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so" 153FILES_${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so"
95INSANE_SKIP_${MLPREFIX}libasound-module-rate-lavcrate = "dev-so" 154INSANE_SKIP_${MLPREFIX}libasound-module-rate-lavrate = "dev-so"
96INSANE_SKIP_${MLPREFIX}libasound-module-rate-samplerate = "dev-so" 155INSANE_SKIP_${MLPREFIX}libasound-module-rate-samplerate = "dev-so"
97INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so" 156INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so"
98 157
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.1.bb
index 0506e11c4b..749b3d0dd8 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.1.bb
@@ -42,7 +42,7 @@ DEPENDS = "alsa-lib zlib libogg nasm-native"
42 42
43inherit autotools pkgconfig 43inherit autotools pkgconfig
44 44
45PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \ 45PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
46 bzlib gpl lzma theora x264 \ 46 bzlib gpl lzma theora x264 \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}" 47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}"
48 48