From patchwork Fri Mar 18 11:50:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Rafael Giani X-Patchwork-Id: 5448 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE6E0C433EF for ; Fri, 18 Mar 2022 11:50:43 +0000 (UTC) Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by mx.groups.io with SMTP id smtpd.web09.8760.1647604242332997818 for ; Fri, 18 Mar 2022 04:50:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@mailbox.org header.s=mail20150812 header.b=pPPSiB91; spf=pass (domain: mailbox.org, ip: 80.241.56.152, mailfrom: crg7475@mailbox.org) Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KKj4t4Q9Qz9sV1 for ; Fri, 18 Mar 2022 12:50:38 +0100 (CET) From: Carlos Rafael Giani DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1647604238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=AhrC3oAuEXyGzhUzvcFzkN0+VZzmcNHhFkJMYP0K/Gc=; b=pPPSiB91cLG64jzw89p3QQkKyfZUvS2RtUeeWLVuieY3CmHM3pU+fPspnjFpugMZC0fGN3 Jl9OwuIQtg7hf8dRG0quAvjzfrvMfbXnMUunvMbgMjFckRM9YIoIak1CeH83XiZvuO67UR vpclI6ypdFBsQWZX6ELGxkY4Z1moSKP1GMM/noix2OOGK8MGagM97a2MwYSPVVJEKqXWbq TeZ4Aiqu6M6EI2gUWP7v0UapJYigE+Oc1PHp5p2LSoB1tnNCYmNhha4Jv1VT5wbxFtqAnR Qxrpl6P3rurfwMdl/lykClViVoRQ/WMV+ZK/cT1bKbAzer5APrmEZ+7HsaQ4iA== To: openembedded-devel@lists.openembedded.org Subject: [meta-multimedia][PATCH] libopenmpt: Upgrade to version 0.6.2 Date: Fri, 18 Mar 2022 12:50:25 +0100 Message-Id: <20220318115025.479223-1-crg7475@mailbox.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Mar 2022 11:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96057 * libopenmpt-modplug got removed and now exists as a separate project. * SDL1 is no longer supported. Signed-off-by: Carlos Rafael Giani --- ...bopenmpt_0.3.10.bb => libopenmpt_0.6.2.bb} | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) rename meta-multimedia/recipes-multimedia/libopenmpt/{libopenmpt_0.3.10.bb => libopenmpt_0.6.2.bb} (68%) diff --git a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb similarity index 68% rename from meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb rename to meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb index b1634732c..a7b6b0007 100644 --- a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb +++ b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb @@ -1,41 +1,33 @@ SUMMARY = "C and C++ cross-platform library for decoding tracked music files (modules)" DESCRIPTION = "libopenmpt is a cross-platform C++ and C library to decode tracked \ music files (modules) into a raw PCM audio stream. It also comes with openmpt123, a \ -cross-platform command-line or terminal based module file player, and libopenmpt_modplug, \ -a wrapper around libopenmpt that provides an interface that is ABI compatile with \ -libmodplug. libopenmpt is based on the player code of the OpenMPT project." +cross-platform command-line or terminal based module file player. libopenmpt is based \ +on the player code of the OpenMPT project." HOMEPAGE = "https://lib.openmpt.org/libopenmpt/" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e804150573f149befef6c07e173f20c3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae09d6164bdecb499183479fd32b66fb" DEPENDS = "virtual/libiconv" SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "66bbc6fbb5f27a554cb145d805e9ef9d" -SRC_URI[sha256sum] = "14a137b8d1a20e1b6a5e67cbc9467ab7e5e4e67d5aa38a247afc825685c53939" +SRC_URI[md5sum] = "d21fb799695cbe10a1e9aeaea23ed708" +SRC_URI[sha256sum] = "50c0d62ff2d9afefa36cce9f29042cb1fb8d4f0b386b81a0fc7734f35e21e6b6" S = "${WORKDIR}/libopenmpt-${PV}+release.autotools" inherit autotools pkgconfig ptest PACKAGECONFIG ??= " \ - libopenmpt-modplug openmpt123 \ + openmpt123 \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ flac mpg123 ogg sndfile vorbis vorbisfile zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ " -# libopenmpt_modplug is a library that wraps libopenmpt calls into -# functions that are ABI compatible with libmodplug. This allows for -# using modplug headers and linking against libopenmpt_modplug -# instead of against the original libmodplug library. -# NOTE: The wrapper is compatible to the ABI from libmodplug version -# 0.8.8 and newer. -PACKAGECONFIG[libopenmpt-modplug] = "--enable-libopenmpt_modplug,--disable-libopenmpt_modplug" PACKAGECONFIG[openmpt123] = "--enable-openmpt123,--disable-openmpt123" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" @@ -45,22 +37,15 @@ PACKAGECONFIG[mpg123] = "--with-mpg123,--without-mpg123,mpg123" PACKAGECONFIG[ogg] = "--with-ogg,--without-ogg,libogg" PACKAGECONFIG[portaudio] = "--with-portaudio,--without-portaudio,portaudio-v19" PACKAGECONFIG[pulseaudio] = "--with-pulseaudio,--without-pulseaudio,pulseaudio" -PACKAGECONFIG[sdl] = "--with-sdl,--without-sdl,virtual/libsdl" PACKAGECONFIG[sdl2] = "--with-sdl2,--without-sdl2,virtual/libsdl2" PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" PACKAGECONFIG[vorbisfile] = "--with-vorbisfile,--without-vorbisfile,libvorbis" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -# --disable-libmodplug is necessary, since otherwise we'd -# have a collision with the libmodplug package, because of the -# libmodplug.so file. (libmodplug.so from libopenmpt isintended -# to be used as a drop-in replacement, and according to the -# documentation, is not complete.) EXTRA_OECONF += " \ --disable-doxygen-doc \ --disable-examples \ - --disable-libmodplug \ --without-portaudiocpp \ " @@ -85,8 +70,7 @@ python __anonymous() { bb.error("sdl and sdl2 packageconfigs cannot be both enabled") } -PACKAGES =+ "${PN}-modplug ${PN}-openmpt123 ${PN}-openmpt123-doc" -FILES:${PN}-modplug = "${libdir}/libopenmpt_modplug.so.*" +PACKAGES =+ "${PN}-openmpt123 ${PN}-openmpt123-doc" FILES:${PN}-openmpt123 = "${bindir}/openmpt123" FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" @@ -94,7 +78,6 @@ FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" # The SemVer versioning scheme is incompatible with Debian/Ubuntu # package version names. DEBIAN_NOAUTONAME:${PN} = "1" -DEBIAN_NOAUTONAME:${PN}-modplug = "1" RDEPENDS:${PN}:libc-glibc = " \ glibc-gconv-cp1252 \