From ec8a8ef1cf6979453ea14cd7a5efd3c1cdece96e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:25 -0800 Subject: taglib: upgrade 1.13.1 -> 2.0 and add utfcpp recipe to support that (From OE-Core rev: d264d2134ba169d29b857389fea88c58c38f377a) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/taglib/taglib_1.13.1.bb | 42 ---------------------------- meta/recipes-support/taglib/taglib_2.0.bb | 42 ++++++++++++++++++++++++++++ meta/recipes-support/utfcpp/utfcpp_4.0.5.bb | 16 +++++++++++ 4 files changed, 59 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-support/taglib/taglib_1.13.1.bb create mode 100644 meta/recipes-support/taglib/taglib_2.0.bb create mode 100644 meta/recipes-support/utfcpp/utfcpp_4.0.5.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a44e065d2d..9faac4a89f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -836,6 +836,7 @@ RECIPE_MAINTAINER:pn-usbutils = "Alexander Kanavin " RECIPE_MAINTAINER:pn-util-linux = "Chen Qi " RECIPE_MAINTAINER:pn-util-linux-libuuid = "Chen Qi " RECIPE_MAINTAINER:pn-util-macros = "Unassigned " +RECIPE_MAINTAINER:pn-utfcpp = "Anuj Mittal " RECIPE_MAINTAINER:pn-v86d = "Alexander Kanavin " RECIPE_MAINTAINER:pn-vala = "Alexander Kanavin " RECIPE_MAINTAINER:pn-valgrind = "Alexander Kanavin " diff --git a/meta/recipes-support/taglib/taglib_1.13.1.bb b/meta/recipes-support/taglib/taglib_1.13.1.bb deleted file mode 100644 index b26563ae91..0000000000 --- a/meta/recipes-support/taglib/taglib_1.13.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Library for reading and editing the meta-data of popular audio formats" -DESCRIPTION = "Platform-independent library (tested on Windows/Linux) for reading and writing metadata in media files, including video, audio, and photo formats. This is a convenient one-stop-shop to present or tag all your media collection, regardless of which format/container these might use. You can read/write the standard or more common tags/properties of a media, or you can also create and retrieve your own custom tags." -SECTION = "libs/multimedia" -HOMEPAGE = "http://taglib.github.io/" -LICENSE = "LGPL-2.1-only | MPL-1.1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ - file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" - -DEPENDS = "zlib" - -SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" - -SRC_URI[sha256sum] = "c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b" - -UPSTREAM_CHECK_URI = "https://taglib.org/" -UPSTREAM_CHECK_REGEX = "taglib-(?P\d+(\.\d+)+)\.tar" - -BINCONFIG = "${bindir}/taglib-config" - -inherit cmake pkgconfig binconfig-disabled - -PACKAGES =+ "${PN}-c" -FILES:${PN}-c = "${libdir}/libtag_c.so.*" - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \ - -DHAVE_BOOST_BYTESWAP=FALSE \ - -DCMAKE_CXX_STANDARD=11 \ - -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -" -CXXFLAGS += "-std=c++11" - -do_configure:prepend () { - rm -f ${S}/admin/ltmain.sh - rm -f ${S}/admin/libtool.m4.in -} - -# without -fPIC depending packages failed with many error like: -# | <...>/ld: error: <...>/usr/lib/libtag.a(modfilebase.cpp.o): requires unsupported dynamic reloc R_ARM_THM_MOVW_ABS_NC; recompile with -fPIC -CXXFLAGS += "-fPIC" diff --git a/meta/recipes-support/taglib/taglib_2.0.bb b/meta/recipes-support/taglib/taglib_2.0.bb new file mode 100644 index 0000000000..4bf9be15ae --- /dev/null +++ b/meta/recipes-support/taglib/taglib_2.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Library for reading and editing the meta-data of popular audio formats" +DESCRIPTION = "Platform-independent library (tested on Windows/Linux) for reading and writing metadata in media files, including video, audio, and photo formats. This is a convenient one-stop-shop to present or tag all your media collection, regardless of which format/container these might use. You can read/write the standard or more common tags/properties of a media, or you can also create and retrieve your own custom tags." +SECTION = "libs/multimedia" +HOMEPAGE = "http://taglib.github.io/" +LICENSE = "LGPL-2.1-only | MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ + file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" + +DEPENDS = "zlib utfcpp" + +SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" + +SRC_URI[sha256sum] = "e36ea877a6370810b97d84cf8f72b1e4ed205149ab3ac8232d44c850f38a2859" + +UPSTREAM_CHECK_URI = "https://taglib.org/" +UPSTREAM_CHECK_REGEX = "taglib-(?P\d+(\.\d+)+)\.tar" + +BINCONFIG = "${bindir}/taglib-config" + +inherit cmake pkgconfig binconfig-disabled + +PACKAGES =+ "${PN}-c" +FILES:${PN}-c = "${libdir}/libtag_c.so.*" + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \ + -DHAVE_BOOST_BYTESWAP=FALSE \ + -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" +CXXFLAGS += "-std=c++11" + +do_configure:prepend () { + rm -f ${S}/admin/ltmain.sh + rm -f ${S}/admin/libtool.m4.in +} + +# without -fPIC depending packages failed with many error like: +# | <...>/ld: error: <...>/usr/lib/libtag.a(modfilebase.cpp.o): requires unsupported dynamic reloc R_ARM_THM_MOVW_ABS_NC; recompile with -fPIC +CXXFLAGS += "-fPIC" diff --git a/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb b/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb new file mode 100644 index 0000000000..5ac6fd369a --- /dev/null +++ b/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb @@ -0,0 +1,16 @@ +SUMMARY = " UTF-8 with C++ in a Portable Way" +HOMEPAGE = "https://github.com/nemtrif/utfcpp" + +LICENSE = "BSL-1.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://extern/ftest/LICENSE;md5=d33c6488d3b003723a5f17ac984db030" + +SRC_URI = "gitsm://github.com/nemtrif/utfcpp;protocol=https;branch=master" + +SRCREV = "6be08bbea14ffa0a5c594257fb6285a054395cd7" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/utf8cpp/cmake" -- cgit v1.2.3-54-g00ecf