summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-multimedia/recipes-multimedia
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-10-30 23:42:48 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-10-30 23:43:27 +0300
commitbbbd5f468dc9c43b203cac3775f6c1b782ca7cba (patch)
treec1102cd773825fb6d69caaff22011b069e71a646 /meta-openembedded/meta-multimedia/recipes-multimedia
parent157744bac930642ebf7952ec8dc3df2faffd0928 (diff)
downloadopenbmc-bbbd5f468dc9c43b203cac3775f6c1b782ca7cba.tar.xz
meta-openembedded: subtree update:2258c9a767..164a6030b0
Alejandro Hernandez Samaniego (1): emacs: Fix packaging for emacs-minimal Andreas Müller (8): fluidsynth: upgrade 2.1.3 -> 2.1.5 hdf5: Shorten SUMMARY and move long text to DESCRIPTION wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it wxwidgets: upgrade 3.1.3 -> 3.1.4 babl: upgrade 0.1.78 -> 0.1.82 gegl: upgrade 0.4.24 -> 0.4.26 gimp: upgrade 2.10.20 -> 2.10.22 Andrej Valek (2): nss: upgrade 3.56 -> 3.57 nspr: upgrade 4.26 -> 4.29 Chen Qi (2): open-isns: use /run instead of /var/run in systemd service file openhpi: use /run instead of /var/run in systemd service file Daniel Ammann (2): dhex: add homepage pcsc-tools: add new package Fagundes, Paulo (1): vnstat: add recipe Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.14 -> 6.1.16 Gianluca Pacchiella (1): Add missing dependencies for rsnapshot. Khem Raj (5): meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT apitrace: Disable secuirty flags for clang iscsi-initiator-utils: Silence a clang warning on 64bit systems minifi-cpp: Do not use lld on riscv32 redis: Fix build with clang on riscv32 Leon Anavi (44): python3-aiohttp: Upgrade 3.6.2 -> 3.6.3 python3-ujson: Upgrade 3.2.0 -> 4.0.1 python3-passlib: Upgrade 1.7.2 -> 1.7.4 python3-croniter: Upgrade 0.3.34 -> 0.3.35 python3-isort: Upgrade 5.5.4 -> 5.6.4 python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8 python3-yarl: Upgrade 1.6.0 -> 1.6.2 python3-sqlparse: Upgrade 0.3.1 -> 0.4.1 python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20 python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0 python3-markdown: Upgrade 3.3 -> 3.3.1 python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0 python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7 python3-luma-core: Upgrade 1.17.1 -> 1.17.2 python3-graphviz: Upgrade 0.14.1 -> 0.14.2 python3-yappi: Upgrade 1.2.5 -> 1.3.0 python3-iniconfig: Upgrade 1.0.1 -> 1.1.1 transmission: Upgrade 2.94 -> 3.00 python3-regex: Upgrade 2020.10.11 -> 2020.10.15 python3-colorama: Upgrade 0.4.3 -> 0.4.4 python3-zipp: Upgrade 3.3.0 -> 3.3.1 python3-pychromecast: Upgrade 7.5.0 -> 7.5.1 python3-semver: Upgrade 2.10.2 -> 2.13.0 python3-pydicti: Upgrade 1.1.3 -> 1.1.4 python3-humanize: Upgrade 3.0.1 -> 3.1.0 python3-dominate: Upgrade 2.5.2 -> 2.6.0 python3-urllib3: Upgrade 1.25.10 -> 1.25.11 python3-bitarray: Upgrade 1.5.3 -> 1.6.0 python3-markdown: Upgrade 3.3.1 -> 3.3.2 python3-pymisp: Upgrade 2.4.131 -> 2.4.133 python3-typeguard: Upgrade 2.9.1 -> 2.10.0 python3-traitlets: Upgrade 5.0.4 -> 5.0.5 python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1 python3-lxml: Upgrade 4.5.2 -> 4.6.1 python3-regex: Upgrade 2020.10.15 -> 2020.10.23 python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5 python3-cryptography: Upgrade 3.1.1 -> 3.2 python3-psutil: Upgrade 5.7.2 -> 5.7.3 python3-pyparted: Upgrade 3.11.6 -> 3.11.7 python3-tqdm: Upgrade 4.50.2 -> 4.51.0 python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1 python3-luma-core: Upgrade 1.17.2 -> 1.17.3 python3-zipp: Upgrade 3.3.1 -> 3.4.0 python3-aiohttp: Upgrade 3.6.3 -> 3.7.1 Luca Boccassi (2): Add recipe for fsverity-utils Add new recipe for squashfs-tools-ng Mario Schuknecht (1): wireguard-tools: Fix systemd service installation Martin Jansa (3): packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST python3-colorama: add native and nativesdk to BBCLASSEXTEND mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled Michael Tretter (1): apitrace: add new recipe Mingli Yu (1): mariadb: Upgrade to 10.5.6 Pascal Bach (1): fmt: make available as native and nativesdk Pierre-Jean Texier (3): c-periphery: upgrade 2.2.1 -> 2.2.4 c-periphery: fix typo in SUMMARY stunnel: upgrade 5.56 -> 5.57 Qi.Chen@windriver.com (4): php: use /run instead /var/run in systemd service file lmsensors: use /run instead of /var/run for systemd service cyrus-sasl: use /run instead of /var/run for systemd service file freediameter: use /run instead of /var/run in systemd service file Ross Burton (2): mpv: fetch waf in do_fetch glmark2: no need to patch waf Sakib Sajal (1): python3-prettytable: add python3-wcwidth to RDEPENDS Siming Yuan (1): python3-paramiko: fixing runtime dependencies Taisei Nakano (1): anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM Ulrich Ölmann (1): usb-modeswitch, usb-modeswitch-data: fix usrmerge Yi Zhao (2): samba: upgrade 4.10.17 -> 4.10.18 networkmanager: remove PACKAGECONFIG[dhclient] Zang Ruochen (13): firewalld: upgrade 0.9.0 -> 0.9.1 mtr: upgrade 0.93 -> 0.94 wireshark: upgrade 3.2.6 -> 3.2.7 hwdata: upgrade 0.339 -> 0.340 libmbim: upgrade 1.24.2 -> 1.24.4 linuxptp: upgrade 3.0 -> 3.1 memtester: upgrade 4.4.0 -> 4.5.0 paho-mqtt-c: upgrade 1.3.5 -> 1.3.6 mm-common: upgrade 1.0.1 -> 1.0.2 poppler: upgrade 20.09.0 -> 20.10.0 spdlog: upgrade 1.8.0 -> 1.8.1 libcgi-perl: upgrade 4.50 -> 4.51 libcurses-perl: upgrade 1.36 -> 1.37 zangrc (8): gphoto2: upgrade 2.5.23 -> 2.5.26 libgphoto2: upgrade 2.5.25 -> 2.5.26 libmtp: upgrade 1.1.17 -> 1.1.18 libp11: upgrade 0.4.10 -> 0.4.11 libpwquality: upgrade 1.4.2 -> 1.4.4 libqmi: upgrade 1.26.4 -> 1.26.6 nano: upgrade 5.2 -> 5.3 protobuf: upgrade 3.13.0 -> 3.13.0.1 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia')
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc6
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb6
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb4
3 files changed, 8 insertions, 8 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index fcc9df8c3..73c1d0db6 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
-SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "19a20eb8526465fdf940b740b13462d71e190a1a"
+SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x"
+SRCREV = "6776569abe9a885bcec14141692fa93c0568d51c"
S = "${WORKDIR}/git"
-PV = "2.1.3"
+PV = "2.1.5"
inherit cmake pkgconfig lib_package
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
index 818b9271f..b214672c6 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
@@ -1,6 +1,9 @@
SUMMARY = "Music Player Daemon"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+LICENSE_FLAGS = "${@bb.utils.contains_any('PACKAGECONFIG', ['ffmpeg', 'aac'], 'commercial', '', d)}"
+
HOMEPAGE ="http://www.musicpd.org"
inherit autotools useradd systemd pkgconfig
@@ -27,8 +30,7 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
-PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib"
-PACKAGECONFIG_append = " ${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', '', d)}"
+PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib"
PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index c9db21ab5..b4f09cdf5 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -30,8 +30,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\
dleyna-renderer \
dleyna-server \
dvb-apps \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac", "", d)} \
- fdk-aac \
+ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac fdk-aac mpd", "", d)} \
gerbera \
libao \
libavc1394 \
@@ -43,7 +42,6 @@ RDEPENDS_packagegroup-meta-multimedia = "\
libmusicbrainz \
libmpdclient \
mpc \
- mpd \
ncmpc \
libmpd \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \