All of our patches to lame 4.0 can be removed when lame 4.1 is released, but none are backports so the patches will fail to apply. Add comments so that it is easy to verify the patches be be dropped.
Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-multimedia/lame/lame/clang.patch | 3 ++- meta/recipes-multimedia/lame/lame/id3tags.patch | 3 ++- meta/recipes-multimedia/lame/lame/no-gtk1.patch | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-multimedia/lame/lame/clang.patch b/meta/recipes-multimedia/lame/lame/clang.patch index 9e434fcbe7d..dbe15dad045 100644 --- a/meta/recipes-multimedia/lame/lame/clang.patch +++ b/meta/recipes-multimedia/lame/lame/clang.patch @@ -13,7 +13,8 @@ Move the HAVE_CLANG block up into the FULL_OPTIMIZATION case, alongside HAVE_GCC. This option is never enabled (as it's basically "use native") so resolves the build failure. -Upstream-Status: Pending +Upstream-Status: Inappropriate [obsoleted by "Detect and enable optimization + and hardening flags across the builds" upstream in lame-4.1] Signed-off-by: Ross Burton <[email protected]> diff --git i/configure.ac w/configure.ac diff --git a/meta/recipes-multimedia/lame/lame/id3tags.patch b/meta/recipes-multimedia/lame/lame/id3tags.patch index 1ce36b9e890..e71d943a227 100644 --- a/meta/recipes-multimedia/lame/lame/id3tags.patch +++ b/meta/recipes-multimedia/lame/lame/id3tags.patch @@ -7,7 +7,8 @@ https://sourceforge.net/p/lame/mailman/message/59358795/ This has been also fixed in the dev tree and will be included in LAME release 4.1. -Upstream-Status: Pending +Upstream-Status: Inappropriate [obsoleted by "frontend, libmp3lame: fix ID3v2 + UTF-8 tag path" upstream in lame-4.1] Signed-off-by: Leon Anavi <[email protected]> diff --git a/frontend/parse.c b/frontend/parse.c diff --git a/meta/recipes-multimedia/lame/lame/no-gtk1.patch b/meta/recipes-multimedia/lame/lame/no-gtk1.patch index 1d7527e1800..fa6379b8a9a 100644 --- a/meta/recipes-multimedia/lame/lame/no-gtk1.patch +++ b/meta/recipes-multimedia/lame/lame/no-gtk1.patch @@ -1,4 +1,5 @@ -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [obsoleted by "frontend: replace the mp3x frame + analyzer with a GTK4 implementation" upstream in lame-4.1] # Acquired from OpenEmbedded -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#246622): https://lists.openembedded.org/g/openembedded-core/message/246622 Mute This Topic: https://lists.openembedded.org/mt/121427709/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
