diff --git a/meta/recipes-multimedia/lame/lame/clang.patch b/meta/recipes-multimedia/lame/lame/clang.patch index 116000c577..9e434fcbe7 100644 --- a/meta/recipes-multimedia/lame/lame/clang.patch +++ b/meta/recipes-multimedia/lame/lame/clang.patch @@ -16,18 +16,18 @@ so resolves the build failure. Upstream-Status: Pending Signed-off-by: Ross Burton -diff --git i/configure.in w/configure.in -index 5e43179..d51b017 100644 ---- i/configure.in -+++ w/configure.in -@@ -960,45 +960,43 @@ if test "x$HAVE_GCC" = "xyes" -o "x$HAVE_CLANG" = "xyes"; then +diff --git i/configure.ac w/configure.ac +index 1111111..2222222 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -1021,45 +1021,43 @@ if test "x$HAVE_GCC" = "xyes" -o "x$HAVE_CLANG" = "xyes"; then ;; esac fi + + if test "x${HAVE_CLANG}" = "xyes"; then + case "${CLANG_VERSION}" in -+ 3.[89]*|[45].*) ++ 3.[[89]]*|[[45]].*|1[[0-9]].*) + OPTIMIZATION="-Ofast" + ;; + *) @@ -48,23 +48,23 @@ index 5e43179..d51b017 100644 + OPTIMIZATION="${OPTIMIZATION} -march=i686 \ + -mtune=native" + ;; -+ *86) -+ OPTIMIZATION="${OPTIMIZATION} -march=native \ -+ -mtune=native" -+ ;; + esac + ++ # if someone supplies own CFLAGS, we don't add our own ++ if test "x${ac_save_CFLAGS}" != "x"; then ++ OPTIMIZATION="" ++ fi + fi ;; *) AC_MSG_ERROR(bad value �${CONFIG_EXPOPT}� for expopt option) ;; esac - + - - if test "x${HAVE_CLANG}" = "xyes"; then - case "${CLANG_VERSION}" in -- 3.[89]*|[45].*) +- 3.[[89]]*|[[45]].*|1[[0-9]].*) - OPTIMIZATION="-Ofast" - ;; - *) @@ -85,12 +85,12 @@ index 5e43179..d51b017 100644 - OPTIMIZATION="${OPTIMIZATION} -march=i686 \ - -mtune=native" - ;; -- *86) -- OPTIMIZATION="${OPTIMIZATION} -march=native \ -- -mtune=native" -- ;; - esac - +- # if someone supplies own CFLAGS, we don't add our own +- if test "x${ac_save_CFLAGS}" != "x"; then +- OPTIMIZATION="" +- fi - fi - - diff --git a/meta/recipes-multimedia/lame/lame/id3tags.patch b/meta/recipes-multimedia/lame/lame/id3tags.patch new file mode 100644 index 0000000000..1df79b0b8f --- /dev/null +++ b/meta/recipes-multimedia/lame/lame/id3tags.patch @@ -0,0 +1,49 @@ +Upstream-Status: Pending + +diff --git a/frontend/parse.c b/frontend/parse.c +index 4a6b660..2ae7eb2 100644 +--- a/frontend/parse.c ++++ b/frontend/parse.c +@@ -402,6 +402,10 @@ static int getIntValue(char const* token, char const* arg, int* ptr) + } + + #ifdef ID3TAGS_EXTENDED ++extern int ++id3tag_set_comment_ucs2(lame_t gfp, char const *lang, unsigned short const *desc, unsigned short const *text); ++extern int ++id3tag_set_fieldvalue_ucs2(lame_t gfp, const unsigned short *fieldvalue); + static int + set_id3v2tag(lame_global_flags* gfp, TextEncoding enc, int type, unsigned short const* str) + { +@@ -410,13 +414,13 @@ set_id3v2tag(lame_global_flags* gfp, TextEncoding enc, int type, unsigned short + case TENC_UTF8: + switch (type) + { +- case 'a': return id3tag_set_textinfo_utf8(gfp, "TPE1", str); +- case 't': return id3tag_set_textinfo_utf8(gfp, "TIT2", str); +- case 'l': return id3tag_set_textinfo_utf8(gfp, "TALB", str); +- case 'g': return id3tag_set_textinfo_utf8(gfp, "TCON", str); ++ case 'a': return id3tag_set_textinfo_utf8(gfp, "TPE1", (const char *)str); ++ case 't': return id3tag_set_textinfo_utf8(gfp, "TIT2", (const char *)str); ++ case 'l': return id3tag_set_textinfo_utf8(gfp, "TALB", (const char *)str); ++ case 'g': return id3tag_set_textinfo_utf8(gfp, "TCON", (const char *)str); + case 'c': return id3tag_set_comment_ucs2(gfp, 0, 0, str); +- case 'n': return id3tag_set_textinfo_utf8(gfp, "TRCK", str); +- case 'y': return id3tag_set_textinfo_utf8(gfp, "TYER", str); ++ case 'n': return id3tag_set_textinfo_utf8(gfp, "TRCK", (const char *)str); ++ case 'y': return id3tag_set_textinfo_utf8(gfp, "TYER", (const char *)str); + case 'v': return id3tag_set_fieldvalue_ucs2(gfp, str); + } + ;; +diff --git a/include/libmp3lame.sym b/include/libmp3lame.sym +index 7651fb3..77657ab 100644 +--- a/include/libmp3lame.sym ++++ b/include/libmp3lame.sym +@@ -193,6 +193,7 @@ hip_decode_headers + hip_decode1 + hip_decode1_headers + hip_decode1_headersB ++hip_finish_pinfo + lame_decode_init + lame_decode + lame_decode_headers diff --git a/meta/recipes-multimedia/lame/lame/no-gtk1.patch b/meta/recipes-multimedia/lame/lame/no-gtk1.patch index e88d7f1bb4..1d7527e180 100644 --- a/meta/recipes-multimedia/lame/lame/no-gtk1.patch +++ b/meta/recipes-multimedia/lame/lame/no-gtk1.patch @@ -2,12 +2,12 @@ Upstream-Status: Inappropriate [configuration] # Acquired from OpenEmbedded ---- lame-3.96.1/configure.in~no-gtk1.patch 2004-07-25 15:52:12.000000000 +0100 -+++ lame-3.96.1/configure.in 2004-09-10 15:54:39.000000000 +0100 -@@ -363,7 +363,12 @@ - +--- lame-4.0/configure.ac~no-gtk1.patch ++++ lame-4.0/configure.ac +@@ -477,7 +477,12 @@ + dnl configure use of features - + -AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") +#AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") +HAVE_GTK="no" diff --git a/meta/recipes-multimedia/lame/lame_3.100.bb b/meta/recipes-multimedia/lame/lame_4.0.bb similarity index 76% rename from meta/recipes-multimedia/lame/lame_3.100.bb rename to meta/recipes-multimedia/lame/lame_4.0.bb index 42689df351..0dd94e9d25 100644 --- a/meta/recipes-multimedia/lame/lame_3.100.bb +++ b/meta/recipes-multimedia/lame/lame_4.0.bb @@ -4,18 +4,19 @@ HOMEPAGE = "https://lame.sourceforge.io/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290" SECTION = "console/utils" LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=a03aed0afc52dd24ed99db06d64a9fa3 \ file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \ " -DEPENDS = "ncurses gettext-native" +DEPENDS = "ncurses mpg123 gettext-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch \ file://clang.patch \ + file://id3tags.patch \ " -SRC_URI[sha256sum] = "ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e" +SRC_URI[sha256sum] = "3df5124d5ad3a98312ffd7ba6a9b36230e4f8a3e66d3ce0f425e336c32d216eb" inherit autotools pkgconfig sourceforge-releases