From patchwork Sun Dec 8 21:28:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180973 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3568848ile; Sun, 8 Dec 2019 13:28:47 -0800 (PST) X-Google-Smtp-Source: APXvYqyeBtGOjMBZTKWl+A4IF0kindmJsy+0hjpwgOAfzm0cVsxTccMbRpIwqbzRvIoIvmqc9/5u X-Received: by 2002:a63:1c66:: with SMTP id c38mr15299918pgm.368.1575840527808; Sun, 08 Dec 2019 13:28:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575840527; cv=none; d=google.com; s=arc-20160816; b=IrOf1R9XakU/kxUrPkBIk+k8MyrzmN2BYj5EwZfAe7fI0yE1n+EcHUnWrj8u/Wt1ym hMXk9Dwl/38IHvlgAl8KkEe3kzwhxKI7Q32DIGYTGZ6ICHyjdio9Z9GXygBkeVaStq4s Rifw6N2h8E9UFzndIV3o5an9V2gGg8znPyCZ4jtmsgiZ/Z4a5bqt5z0i86pmXnk3MIKm 35UNOsqY8oZe7t8JUzzgPPGJSNUBN8YVf+kV9wqElzwVLhN1tX+CI5CG00nzYiuWoo/l 133ErFWz4ia5m1rD8zoPHYqe4d0RSGVyd0rVrvyxs47h3sYaQo+cO9aL8J5w0Wk7XcE6 WzHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=MEUPuARAhjnkQxwSLpmajz0/6ghcfBkmYi3Q6jeGn6g=; b=DJ1Oh+ej88L+ZzEBKQm7qW/abXEfTbl+jckotrsGmjbt8LLI4XxthFptsnDZhXCBzR GwiVTx56t7HM0TwhZgdEo9DpPGzgsf3croMif2uNmJu1wLJ0HWReuG+jMbKwEHo1ju7c sVGQFBTS/BJ5Sl5L6i+OlwhE5RNfqbzVRT8W4zTGQVe2JEnHompNpQrcOk9K6oQWUwKp dWgDiv4+5J6YW0yh6IrmsFAWWBx+UheSPmjNg31ZZpwKDt/zm207fLmgoks/omEJhSk1 aWiFdaRWgTMqL3nrUlP4qVpgyCpdRK1TbBUua9hmO17UqTke/DgZjx7TY1V5t+disH5g UULw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="WHd/WYMq"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m9si5225968plt.288.2019.12.08.13.28.46; Sun, 08 Dec 2019 13:28:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="WHd/WYMq"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7E49B7FAAA; Sun, 8 Dec 2019 21:28:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mail.openembedded.org (Postfix) with ESMTP id 369787F7C3 for ; Sun, 8 Dec 2019 21:28:35 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id bh2so3774005plb.11 for ; Sun, 08 Dec 2019 13:28:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=w4HpuXfEwvSuz+7hWpY/Df51bFURxtQNmNwLJ0NZJ+g=; b=WHd/WYMqcQFPIJs8mBDcySTjhxVJb+UbIb3UwLh1lk8ifTpTb2TE6j7QIQiALJEch4 BVJrseQFK4Zqb7v/VRciRhw3JgGRc/upLyh0/TKiJ3f8frwLQGFoz71uqL4tLw9ScfCQ l7de1TGWyHRHPvzjoO3gFD2p0LDRuLTcFgAUiDBTim4ztjGyp97+U849Qm4QkYu/Zk56 YH0aFgwi4qRQr3WJNaTGEM4vu+7xsqHSLpV7YKb6Pi6kLDQGsgpGzXXRmbJJh3d0Zr1J I+VXprTecou4pkstXqib5pyuvf7wV1h7rxt3ccL1o+fnHuW8PLHWRnC57Tf3ajoHGKlZ euFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=w4HpuXfEwvSuz+7hWpY/Df51bFURxtQNmNwLJ0NZJ+g=; b=Z8MQXzUKtZA6nXUn8Ibw+XHFYeUbZaeJ34TgmO16pB8j26eJL94U30xtedWtqQYpdV I5iSoiZzBnPLp17wW3JJzZACSJg70+9hE87vx4+464t1dJqeJ3pDKex42szyTZ3vHsCv ORjmmmlVlsr43GU8FCZjS2ZNvp52W3yiWZdGBNfB1xdAjSBPQPuJ+jZkyBKtl6h39Cg4 5TYGHFov/h7L1Nx7UMifLwwwpziFdWNLqBLklQIEmbWWoZ8fGFBKRdu0Lk8oVxQVQd1e hlCkh7wmJ/mzIkiGfyjWC+bgFwkFn57HIHG5n7pXfwMETJHV6iM6AEMD6FHa2cBMATDT tF8w== X-Gm-Message-State: APjAAAUQ7NDpSFk0ZWtF0CKHbWt8HFcgv3XOlzCGN01N3Z5fGg79RhIH qMF92rMVx8bZY5Zk1LTfkgO3zpQfy4E= X-Received: by 2002:a17:90a:ca12:: with SMTP id x18mr28256371pjt.66.1575840516522; Sun, 08 Dec 2019 13:28:36 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::afb7]) by smtp.gmail.com with ESMTPSA id o14sm6305895pgm.67.2019.12.08.13.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2019 13:28:36 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 8 Dec 2019 13:28:26 -0800 Message-Id: <20191208212826.3162194-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH] id3lib: Update to newer debian patchset X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org adopt the patch routine, since the format of tarball has changed Signed-off-by: Khem Raj --- .../recipes-multimedia/id3lib/id3lib_3.8.3.bb | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index fc80cc0acf..9d311608e4 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb @@ -7,12 +7,46 @@ DEPENDS = "zlib" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \ - http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \ + ${DEBIAN_MIRROR}/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-16.2.debian.tar.xz;name=patch;subdir=${BP} \ file://acdefine.patch \ " SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7" SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079" -SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b" -SRC_URI[patch.sha256sum] = "9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c" +SRC_URI[patch.md5sum] = "997c764d3be11c9a51779d93facf1118" +SRC_URI[patch.sha256sum] = "ac2ee23ec89ba2af51d2c6dd5b1b6bf9f8a9f813de251bc182941439a4053176" inherit autotools + +# Unlike other Debian packages, id3lib*.diff.gz contains another series of +# patches maintained by quilt. So manually apply them before applying other local +# patches. Also remove all temp files before leaving, because do_patch() will pop +# up all previously applied patches in the start +id3lib_do_patch() { + cd ${S} + # it's important that we only pop the existing patches when they've + # been applied, otherwise quilt will climb the directory tree + # and reverse out some completely different set of patches + if [ -d ${S}/patches ]; then + # whilst this is the default directory, doing it like this + # defeats the directory climbing that quilt will otherwise + # do; note the directory must exist to defeat this, hence + # the test inside which we operate + QUILT_PATCHES=${S}/patches quilt pop -a + fi + if [ -d ${S}/.pc-id3lib ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-id3lib ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-id3lib +} + +do_unpack[cleandirs] += "${S}" + +# We invoke base do_patch at end, to incorporate any local patch +python do_patch() { + bb.build.exec_func('id3lib_do_patch', d) + bb.build.exec_func('patch_do_patch', d) +}