From 3b942172bafac51a7d7563a075a1612db7135687 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 7 Nov 2023 08:12:25 +0100 Subject: [PATCH] jack: Revert to 1.9.22 There is no version "2". The tag "jack2-control-api-relicense-nedko" incorrectly triggered AUH to identify it as version "2". Additionally, the previous recipe version "1.19.22" was also incorrect. It should actually have been "1.9.22". License-Update: Update the licenses based on analysis of the code Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- .../jack/{jack_2.bb => jack_1.9.22.bb} | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) rename meta-oe/recipes-multimedia/jack/{jack_2.bb => jack_1.9.22.bb} (67%) diff --git a/meta-oe/recipes-multimedia/jack/jack_2.bb b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb similarity index 67% rename from meta-oe/recipes-multimedia/jack/jack_2.bb rename to meta-oe/recipes-multimedia/jack/jack_1.9.22.bb index 1d197b32c7..b5c52a6edc 100644 --- a/meta-oe/recipes-multimedia/jack/jack_2.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb @@ -6,15 +6,20 @@ flow model and lock-free programming techniques for graph access have \ been used to have a more dynamic and robust system." SECTION = "libs/multimedia" -LICENSE = "GPL-2.0-or-later | LGPL-2.1-or-later | MIT | AFL-2.1" -LIC_FILES_CHKSUM = "file://common/jack/control.h;beginline=2;endline=21;md5=9edb8b99b7a0dcd49dbf8741444f123d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ - " +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://common/JackControlAPI.cpp;beginline=5;endline=19;md5=9d1921199e203163f160313243f853d6 \ + file://common/JackControlAPI.h;beginline=4;endline=18;md5=9d1921199e203163f160313243f853d6 \ + file://common/jack/jack.h;beginline=2;endline=17;md5=0a668d22ce661159cad28d1c3b8e66af \ + file://common/JackServer.h;beginline=2;endline=17;md5=9bf0870727804a994ee2d19fd368d940 \ +" DEPENDS = "libsamplerate0 libsndfile1" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=develop;protocol=https" -SRCREV = "520dfa0ac5a72d292f5b9fc5835926f925129764" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" S = "${WORKDIR}/git"