From e8a4b5e7d775dc916cd8d43e71b56932195d0c34 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 14 Aug 2022 20:57:50 +0200 Subject: mediainfo: update to 22.06 mediainfo_0.7.62 no longer builds. Fix it by spliting the recipe into its 3 components, zenlib mediainfolib and the CLI program and update to latest version. Signed-off-by: Max Krummenacher --- recipes-multimedia/mediainfo/mediainfo_0.7.62.bb | 52 ---------------------- recipes-multimedia/mediainfo/mediainfo_22.06.bb | 5 +++ recipes-multimedia/mediainfo/mediainfo_22.06.inc | 11 +++++ recipes-multimedia/mediainfo/mediainfolib_22.06.bb | 5 +++ recipes-multimedia/mediainfo/zenlib_22.06.bb | 3 ++ 5 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 recipes-multimedia/mediainfo/mediainfo_0.7.62.bb create mode 100644 recipes-multimedia/mediainfo/mediainfo_22.06.bb create mode 100644 recipes-multimedia/mediainfo/mediainfo_22.06.inc create mode 100644 recipes-multimedia/mediainfo/mediainfolib_22.06.bb create mode 100644 recipes-multimedia/mediainfo/zenlib_22.06.bb diff --git a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb deleted file mode 100644 index 370bd63..0000000 --- a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb +++ /dev/null @@ -1,52 +0,0 @@ -HOMEPAGE = "mediainfo.sourceforge.net" -SUMMARY = "Mediainfo is a tool to analyze multimedia files" -LICENSE = "GPLv2_modified" - -inherit autotools - -SRC_URI = "https://mediaarea.net/download/binary/mediainfo/0.7.62/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/License.html;md5=7f3735d23c6ef724bbd1475e4f82edcf" - -SRC_URI[md5sum] = "ba10422974111fdff5cf1bb38410c9a1" -SRC_URI[sha256sum] = "ecdde190c9f02ab26769e590314c4841a1c182e8488f1ad8584bdfb374562564" - -S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI" - -do_configure () { - #build zenlib - cd ${WORKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/ - my_runconf - oe_runmake - - #build media info lib - cd ${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/ - my_runconf - oe_runmake - - #build media info - cd ${S} - oe_runconf -} - -do_install:prepend () { - #install media info - cd ${S} -} - -my_runconf() { - cfgscript="./configure" - if [ -x "$cfgscript" ] ; then - bbnote "Running $cfgscript --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir={datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-silent-rules --disable-dependency-tracking --with-libtool-sysroot=/home/tegradev/oe-core/build/out-eglibc/sysroots/colibri-t20 $@" - set +e - ${CACHED_CONFIGUREVARS} $cfgscript --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)} $@ - if [ "$?" != "0" ]; then - echo "Configure failed. The contents of all config.log files follows to aid debugging" - find /home/tegradev/oe-core/build/out-eglibc/work/armv7ahf-vfp-angstrom-linux-gnueabi/mediainfo-0.7.62-r0/mediainfo-0.7.62 -name config.log -print -exec cat {} \; - bbfatal "oe_runconf failed" - fi - set -e - else - bbfatal "no configure script found at $cfgscript" - fi -} - diff --git a/recipes-multimedia/mediainfo/mediainfo_22.06.bb b/recipes-multimedia/mediainfo/mediainfo_22.06.bb new file mode 100644 index 0000000..e9bbf83 --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfo_22.06.bb @@ -0,0 +1,5 @@ +require mediainfo_22.06.inc + +DEPENDS:append = " mediainfolib" + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI" diff --git a/recipes-multimedia/mediainfo/mediainfo_22.06.inc b/recipes-multimedia/mediainfo/mediainfo_22.06.inc new file mode 100644 index 0000000..3d5fcba --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfo_22.06.inc @@ -0,0 +1,11 @@ +HOMEPAGE = "mediainfo.sourceforge.net" +SUMMARY = "Mediainfo is a tool to analyze multimedia files" +LICENSE = "Apache-2.0|LGPL-2.1-or-later|GPL-2.0-or-later|MPL-2.0" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "zlib" +SRC_URI = "https://mediaarea.net/download/binary/mediainfo/${PV}/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/License.html;md5=d9af910c0a24603839b95a00d63c1ecc" + +SRC_URI[sha256sum] = "e96633cfced36e7810fc5cd0f15a83362be1f4670e0b38971d8172003dd068d3" diff --git a/recipes-multimedia/mediainfo/mediainfolib_22.06.bb b/recipes-multimedia/mediainfo/mediainfolib_22.06.bb new file mode 100644 index 0000000..b84eeda --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfolib_22.06.bb @@ -0,0 +1,5 @@ +require mediainfo_22.06.inc + +DEPENDS:append = " zenlib" + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library" diff --git a/recipes-multimedia/mediainfo/zenlib_22.06.bb b/recipes-multimedia/mediainfo/zenlib_22.06.bb new file mode 100644 index 0000000..966fb18 --- /dev/null +++ b/recipes-multimedia/mediainfo/zenlib_22.06.bb @@ -0,0 +1,3 @@ +require mediainfo_22.06.inc + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library" -- cgit v1.2.3