Update to SPDX license names

Apply updates from running the new convert-spdx-licenses script
from upstream.  This is not currently a hard requirement from
upstream, but futureproofs for when the license name mapping is
finally removed.  Additionally, a few license declarations of just
"BSD" have been updated with the more specifc "BSD-3-Clause" after
inspecting the licenses in the source, as the non-specific name
now triggers a warning.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia86d412fe76ff3217456fcea81cb44f68bc1ced8

6 files changed, 6 insertions, 6 deletions

diff --git a/recipes-multimedia/flite/flite_1.06.bb b/recipes-multimedia/flite/flite_1.06.bb
index b1f83754f..f3b77c383 100755
--- a/recipes-multimedia/flite/flite_1.06.bb
+++ b/recipes-multimedia/flite/flite_1.06.bb
@@ -1,7 +1,7 @@
 SUMMARY = "The Flite+hts_engine is an English TTS System."
 HOMEPAGE = "http://hts-engine.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a1ab16abd1c593cab35c2987fd871678"
 
diff --git a/recipes-multimedia/hts_engine/hts-engine_1.10.bb b/recipes-multimedia/hts_engine/hts-engine_1.10.bb
index ed5cae63c..5a72c5af5 100644
--- a/recipes-multimedia/hts_engine/hts-engine_1.10.bb
+++ b/recipes-multimedia/hts_engine/hts-engine_1.10.bb
@@ -1,7 +1,7 @@
 SUMMARY = "hts_engine is software to synthesize speech waveform from HMMs trained by the HMM-based speech synthesis system (HTS)."
 HOMEPAGE = "http://hts-engine.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b3be85b37c90bfd4d34d79a0e3f28700"
 
diff --git a/recipes-multimedia/libmp4v2/libmp4v2_git.bb b/recipes-multimedia/libmp4v2/libmp4v2_git.bb
index ed6c8b44f..5fb6cbc88 100644
--- a/recipes-multimedia/libmp4v2/libmp4v2_git.bb
+++ b/recipes-multimedia/libmp4v2/libmp4v2_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "The MP4v2 library provides an API to create and modify mp4 files"
 HOMEPAGE = "https://github.com/sergiomb2/libmp4v2/wiki"
-LICENSE = "MPLv1.1"
+LICENSE = "MPL-1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb3014b036b6d2151d944aef6a84c36f"
 
 inherit autotools-brokensep pkgconfig
diff --git a/recipes-multimedia/musicpd/mpc_0.33.bb b/recipes-multimedia/musicpd/mpc_0.33.bb
index 09190a819..b3178ea81 100644
--- a/recipes-multimedia/musicpd/mpc_0.33.bb
+++ b/recipes-multimedia/musicpd/mpc_0.33.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A minimalist command line interface to the Music Player Daemon"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 HOMEPAGE = "https://www.musicpd.org/clients/mpc/"
 
diff --git a/recipes-multimedia/musicpd/mpd_0.23.5.bb b/recipes-multimedia/musicpd/mpd_0.23.5.bb
index 5596760d5..f6baca523 100644
--- a/recipes-multimedia/musicpd/mpd_0.23.5.bb
+++ b/recipes-multimedia/musicpd/mpd_0.23.5.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Music Player Daemon"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 HOMEPAGE ="http://www.musicpd.org"
diff --git a/recipes-multimedia/openjtalk/openjtalk_1.09.bb b/recipes-multimedia/openjtalk/openjtalk_1.09.bb
index 0c780a072..a5f73139b 100644
--- a/recipes-multimedia/openjtalk/openjtalk_1.09.bb
+++ b/recipes-multimedia/openjtalk/openjtalk_1.09.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Open JTalk is a Japanese text-to-speech system."
 HOMEPAGE = "http://open-jtalk.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ec9073c0ca40ff7c388b31cfd6a07a9e"