From 344bb081f5c97878434fa2f6d93072dbfa577b6f Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Thu, 12 Aug 2021 19:04:39 +0200 Subject: [PATCH] opus-tools: update to 0.2, move to meta-multimedia and fix license The license in version 0.1.8 was already BSD-2-Clause and GPLv2 (for the "opusinfo" command). The license checksum change is due to trivial changes on the license text ("https" instead of "http" and whitespace changes). This new version now DEPENDs on "libopusenc" and "opusfile" too, but this required to move the recipe to meta-multimedia instead. Signed-off-by: Michael Opdenacker Signed-off-by: Khem Raj --- .../opus-tools/opus-tools_0.2.bb | 15 +++++++++++++++ .../packagegroups/packagegroup-meta-multimedia.bb | 1 + .../packagegroups/packagegroup-meta-oe.bb | 1 - .../opus-tools/opus-tools_0.1.8.bb | 15 --------------- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb delete mode 100644 meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb diff --git a/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb b/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb new file mode 100644 index 000000000..b5e6ed947 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Opus Audio Tools" +HOMEPAGE = "http://www.opus-codec.org/" + +LICENSE = "BSD-2-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=79f6fc2a6239fbe5f6e52f20ac76698c" + +SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" +SRC_URI[md5sum] = "ff2d0536e960cabbfb8ca7c8c1759b6c" +SRC_URI[sha256sum] = "b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86" + +S = "${WORKDIR}/opus-tools-${PV}" + +DEPENDS = "libopus libopusenc flac opusfile" + +inherit autotools pkgconfig diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 9e0c319c3..5522731a2 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -66,6 +66,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ mycroft \ openal-soft \ opusfile \ + opus-tools \ libdvdcss \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "sox streamripper", "", d)} \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 47ee3099a..b03525de3 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -668,7 +668,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ live555-examples \ live555-mediaserver \ libmikmod \ - opus-tools \ libmodplug \ sound-theme-freedesktop \ yavta \ diff --git a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb deleted file mode 100644 index a84f2bf07..000000000 --- a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Opus Audio Tools" -HOMEPAGE = "http://www.opus-codec.org/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1" - -SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" -SRC_URI[md5sum] = "b424790eda9357a4df394e2d7ca19eac" -SRC_URI[sha256sum] = "e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6" - -S = "${WORKDIR}/opus-tools-${PV}" - -DEPENDS = "libopus flac" - -inherit autotools pkgconfig