From patchwork Sun Dec 22 22:37:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1214784 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EoVownUW"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47gy5D30bJz9sPV for ; Mon, 23 Dec 2019 09:36:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A71588709D; Sun, 22 Dec 2019 22:36:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qKXydRpn1uOl; Sun, 22 Dec 2019 22:36:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6DDE9870A9; Sun, 22 Dec 2019 22:36:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2A7661BF31C for ; Sun, 22 Dec 2019 22:36:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1F334870A9 for ; Sun, 22 Dec 2019 22:36:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JOHBOH2EEkBo for ; Sun, 22 Dec 2019 22:36:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id B72788709D for ; Sun, 22 Dec 2019 22:36:25 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id d16so14781619wre.10 for ; Sun, 22 Dec 2019 14:36:25 -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=tzyXFC1Yo2NDhyhL3M1opPZ/ktNoFPweUPZlQxayPB4=; b=EoVownUWlGxhQ+g3vkBc4UaGZBvXOOYX2WblhlMktatQZ/uewxfkmrrPz3duLl3/AA uNwmnpAD2kFeH37EBRcouJ0ElHLH993wcLPAgPl3cCfnfvcHQGjKgcV61w3FLaFdZ+SD wheFrTlauNWq2c3O+z6r2gl20m7eAm7csmeRDKT/VCNbMq1aw4tkSlu4gWXCQhCusb+0 GWJ8NttZjZakk67oE3C3cTVHnXvxtUHZsRy9PQFKDUTZ1AZS7ZNGJHFiSDclDO+NIl8z 1cp4Hm8Qs8VDzjTtNfvxBdDkMGhtDMXs6AhRmvE+ggy8Pk0mXALcYta2lkKbfHZc7UGW LlhQ== 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=tzyXFC1Yo2NDhyhL3M1opPZ/ktNoFPweUPZlQxayPB4=; b=pfBDHth40NEYwqpp6iYrNlttQriD/jTde8nZ8eAXFFzGBJ7gs8ASy0VMVjgMDazb4n 9jDhqz/KmmoacRSFp2D4fIZXOomP8i+FADf3hOAtRE0x111NKbhe6G4mou9XzwjWyWBU RONL08pihOY5rhgc5hY1gK50UAHr7+F4I7xDP0Zq5dwtwkKiyVuBzpFI1WoLkS8IsaUx 0+TGCon1RNyDc7IdYfigwvj45lopmrBqHEQMwVtOsUTBdIReXsNakQpcjzO93HDmm1FN 6gg/ypEUmS1Y8QKPNEoCRtStWtEh1lIS92ffY7i4SxnuircU8EsgjkcJojpqu3mie/XC tkTA== X-Gm-Message-State: APjAAAUHXC8SIrlTJod0CrGoKnoSzczIomQRa0dZ2oVY2LxhyOpPsgwc RG1PEge22CiVz8YmJik3EcIwHUIi X-Google-Smtp-Source: APXvYqxX87a1zqpUwd1xVJpAg8L2vXpevA3IAI+6pUIGrlSqkYtcuxuFghtj4VsyWrAfhZWD45iWOg== X-Received: by 2002:adf:dd8a:: with SMTP id x10mr26935086wrl.117.1577054183911; Sun, 22 Dec 2019 14:36:23 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id b16sm19459741wrj.23.2019.12.22.14.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 14:36:23 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 22 Dec 2019 23:37:20 +0100 Message-Id: <20191222223721.3982310-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/twolame: bump to version 0.4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop patch (already in version) - Update hash of license file (trailing whitespace removed: https://github.com/njh/twolame/commit/2cdcd064aa340b30209d8a0e86cef5a22394b4d5) Signed-off-by: Fabrice Fontaine --- ...001-Fix-static-linking-with-libmagic.patch | 228 ------------------ package/twolame/twolame.hash | 4 +- package/twolame/twolame.mk | 2 +- 3 files changed, 3 insertions(+), 231 deletions(-) delete mode 100644 package/twolame/0001-Fix-static-linking-with-libmagic.patch diff --git a/package/twolame/0001-Fix-static-linking-with-libmagic.patch b/package/twolame/0001-Fix-static-linking-with-libmagic.patch deleted file mode 100644 index 094d7e997e..0000000000 --- a/package/twolame/0001-Fix-static-linking-with-libmagic.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 484275de103b2214cb8ff3868a2562e2c61ce0e1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 8 Nov 2018 20:57:08 +0100 -Subject: [PATCH] Fix static linking with libmagic - -libmagic (from file package) already provides the buffer_init function -so to avoid a build failure for applications wanting to statically link -with twolame and libmagic (for example sox), rename buffer_init into -bitbuffer_init (also rename buffer_deinit into bitbuffer_deinit and -buffer_sstell into bitbuffer_sstell for consistency) - -Fixes: - - http://autobuild.buildroot.org/results/b3fc62e7f372fe595966e84091c11ccdb4cfa77c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/njh/twolame/pull/81] ---- - libtwolame/bitbuffer.c | 4 ++-- - libtwolame/bitbuffer.h | 6 +++--- - libtwolame/energy.c | 2 +- - libtwolame/twolame.c | 32 ++++++++++++++++---------------- - 4 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/libtwolame/bitbuffer.c b/libtwolame/bitbuffer.c -index 38a632b..5b2fc4b 100644 ---- a/libtwolame/bitbuffer.c -+++ b/libtwolame/bitbuffer.c -@@ -33,7 +33,7 @@ - - - /*create bit buffer*/ --bit_stream *buffer_init(unsigned char *buffer, int buffer_size) -+bit_stream *bitbuffer_init(unsigned char *buffer, int buffer_size) - { - bit_stream *bs = (bit_stream *) TWOLAME_MALLOC(sizeof(bit_stream)); - -@@ -49,7 +49,7 @@ bit_stream *buffer_init(unsigned char *buffer, int buffer_size) - } - - /* Dellocate bit buffer */ --void buffer_deinit(bit_stream ** bs) -+void bitbuffer_deinit(bit_stream ** bs) - { - - if (bs == NULL || *bs == NULL) -diff --git a/libtwolame/bitbuffer.h b/libtwolame/bitbuffer.h -index 0201347..f377c8f 100644 ---- a/libtwolame/bitbuffer.h -+++ b/libtwolame/bitbuffer.h -@@ -39,11 +39,11 @@ typedef struct bit_stream_struc { - } bit_stream; - - --bit_stream *buffer_init(unsigned char *buffer, int buffer_size); --void buffer_deinit(bit_stream ** bs); -+bit_stream *bitbuffer_init(unsigned char *buffer, int buffer_size); -+void bitbuffer_deinit(bit_stream ** bs); - - /*return the current bit stream length (in bits)*/ --#define buffer_sstell(bs) (bs->totbit) -+#define bitbuffer_sstell(bs) (bs->totbit) - - #endif - -diff --git a/libtwolame/energy.c b/libtwolame/energy.c -index 219bd2c..312d8ae 100644 ---- a/libtwolame/energy.c -+++ b/libtwolame/energy.c -@@ -73,7 +73,7 @@ void do_energy_levels(twolame_options * glopts, bit_stream * bs) - unsigned char rhibyte, rlobyte, lhibyte, llobyte; - - // Get the position (in butes) of the end of the mpeg audio frame -- int frameEnd = buffer_sstell(bs) / 8; -+ int frameEnd = bitbuffer_sstell(bs) / 8; - - - // find the maximum in the left and right channels -diff --git a/libtwolame/twolame.c b/libtwolame/twolame.c -index fa4bcc0..d3b8450 100644 ---- a/libtwolame/twolame.c -+++ b/libtwolame/twolame.c -@@ -442,7 +442,7 @@ static int encode_frame(twolame_options * glopts, bit_stream * bs) - glopts->num_crc_bits = 0; - - // Store the number of bits initially in the bit buffer -- initial_bits = buffer_sstell(bs); -+ initial_bits = bitbuffer_sstell(bs); - - adb = available_bits(glopts); - -@@ -580,7 +580,7 @@ static int encode_frame(twolame_options * glopts, bit_stream * bs) - - - // Calulate the number of bits in this frame -- frameBits = buffer_sstell(bs) - initial_bits; -+ frameBits = bitbuffer_sstell(bs) - initial_bits; - if (frameBits % 8) { /* a program failure */ - fprintf(stderr, "Sent %ld bits = %ld slots plus %ld\n", frameBits, frameBits / 8, - frameBits % 8); -@@ -630,7 +630,7 @@ int twolame_encode_buffer(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - - // Use up all the samples in in_buffer -@@ -658,7 +658,7 @@ int twolame_encode_buffer(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -667,7 +667,7 @@ int twolame_encode_buffer(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return (mp2_size); - } -@@ -687,7 +687,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Use up all the samples in in_buffer - while (num_samples) { -@@ -714,7 +714,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -723,7 +723,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - - return (mp2_size); -@@ -771,7 +771,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - - // Use up all the samples in in_buffer -@@ -800,7 +800,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -809,7 +809,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return (mp2_size); - } -@@ -829,7 +829,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Use up all the samples in in_buffer - while (num_samples) { -@@ -857,7 +857,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -866,7 +866,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - - return (mp2_size); -@@ -885,7 +885,7 @@ int twolame_encode_flush(twolame_options * glopts, unsigned char *mp2buffer, int - return 0; - } - // Create bit stream structure -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Pad out the PCM buffers with 0 and encode the frame - for (i = glopts->samples_in_buffer; i < TWOLAME_SAMPLES_PER_FRAME; i++) { -@@ -897,7 +897,7 @@ int twolame_encode_flush(twolame_options * glopts, unsigned char *mp2buffer, int - glopts->samples_in_buffer = 0; - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return mp2_size; - } --- -2.17.1 - diff --git a/package/twolame/twolame.hash b/package/twolame/twolame.hash index eab52876af..74941ae30c 100644 --- a/package/twolame/twolame.hash +++ b/package/twolame/twolame.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a twolame-0.3.13.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 cc35424f6019a88c6f52570b63e1baf50f62963a3eac52a03a800bb070d7c87d twolame-0.4.0.tar.gz +sha256 257a842724705950b07da76ce0e22ffa80ec77b3e9dfc6702522ac342409da0f COPYING diff --git a/package/twolame/twolame.mk b/package/twolame/twolame.mk index d5628d1b0a..5837b80a56 100644 --- a/package/twolame/twolame.mk +++ b/package/twolame/twolame.mk @@ -4,7 +4,7 @@ # ################################################################################ -TWOLAME_VERSION = 0.3.13 +TWOLAME_VERSION = 0.4.0 TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION) TWOLAME_DEPENDENCIES = host-pkgconf libsndfile TWOLAME_INSTALL_STAGING = YES From patchwork Sun Dec 22 22:37:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1214785 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BPGjmuPZ"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47gy5J6K73z9sPV for ; Mon, 23 Dec 2019 09:36:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 09B6E870A9; Sun, 22 Dec 2019 22:36:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HYAIkwaPC4H7; Sun, 22 Dec 2019 22:36:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 28E9B878B0; Sun, 22 Dec 2019 22:36:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 36E241BF31C for ; Sun, 22 Dec 2019 22:36:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2B138854D7 for ; Sun, 22 Dec 2019 22:36:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 353Y5yd-ad9P for ; Sun, 22 Dec 2019 22:36:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 54185854D0 for ; Sun, 22 Dec 2019 22:36:27 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id y11so14807535wrt.6 for ; Sun, 22 Dec 2019 14:36:27 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=yQZKxLLJ+J7mq200TZYrtas91OI/I7ZeHJSOjHqDH54=; b=BPGjmuPZPZIwVCa9QwF0n/eiDLqjVwZ5sthSQ0LRfNpjXpNPwsKlMHqECMn6gjaTsw WjxmKHcmXZI5qktZ/xVe3m6/mjDaKg9+8F25o05PJpLez272mR03y2ZNBY/Pme2Mh8sa Wl8Sxc8W+Avf7D92bkdYyUBdOfR1dfi9YVJXmW86bqmScP1cRE6YPRqXimYneDLaos40 afRC5AVhlKSu7kczIUj8pLKASIQc2UswrJG3q1+RE5YFGX8RPE5JS1cP3s+SAnZkFsZn 63gZGeXlxGg0hcNMqhNs6Nm5mLEBtpZOgckLeHviiatg+VgSCPWSIoGln5j/aK7EUG6b oOqQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=yQZKxLLJ+J7mq200TZYrtas91OI/I7ZeHJSOjHqDH54=; b=W8UbV+9rH/M3dUcqn/TctBZ8o7P0AepGeeQhs+tLzT3HsnDcoBiJIFKdC0GnUKf7R+ UERz9Z2bzazIudG6QgsyQWanw0+dS21m52gJZb147EQc6xV5wa4HjVxVJCZmNl7rTSA7 k1tCUiYs72dm5gy3kaC8JL0yyGb0FSXjO1+x9DV/JeAc9b6mywhINfEzH5NKBYQVHIwo nEZYwDKg0bhR4a1kF6AcyomBwN7mxymxz0A504fW0UfYUUdpAwYGjqCUdJpHgaYv4GTp eNnB702oCl6yf1RdiQJJeQ3kfSq4nrnU8moxXvc614ftbefAsYYqs12FOWjDEg4Q6VuO ttiw== X-Gm-Message-State: APjAAAXhTt0192vYr+yLuwgoLFSeQVhQm1D8MP25knOb6ooc4hZdnMoY 9mDM6Q8PkUdyzeFBdnBamdMAanTL X-Google-Smtp-Source: APXvYqy2E1UqU/Lc97Sbpta/p8vjlQ4ol4eY96XNyuARnsx6tTqOhKi4Q2yGfI/jre6Y3xqmdQjdwQ== X-Received: by 2002:adf:f850:: with SMTP id d16mr27328187wrq.161.1577054185457; Sun, 22 Dec 2019 14:36:25 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id b16sm19459741wrj.23.2019.12.22.14.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 14:36:24 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 22 Dec 2019 23:37:21 +0100 Message-Id: <20191222223721.3982310-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191222223721.3982310-1-fontaine.fabrice@gmail.com> References: <20191222223721.3982310-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/twolame: libsndfile is optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" libsndfile is optional not mandatory since version 0.4.0 and https://github.com/njh/twolame/commit/fe2770bffb9da10b7a26c82a340c81299ff82c76 Signed-off-by: Fabrice Fontaine --- package/twolame/Config.in | 1 - package/twolame/twolame.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/twolame/Config.in b/package/twolame/Config.in index 95b148b815..588afa4826 100644 --- a/package/twolame/Config.in +++ b/package/twolame/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_TWOLAME bool "twolame" - select BR2_PACKAGE_LIBSNDFILE help TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME by Mike Cheng, which in turn is based upon diff --git a/package/twolame/twolame.mk b/package/twolame/twolame.mk index 5837b80a56..b1abf077b5 100644 --- a/package/twolame/twolame.mk +++ b/package/twolame/twolame.mk @@ -6,9 +6,15 @@ TWOLAME_VERSION = 0.4.0 TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION) -TWOLAME_DEPENDENCIES = host-pkgconf libsndfile TWOLAME_INSTALL_STAGING = YES TWOLAME_LICENSE = LGPL-2.1+ TWOLAME_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +TWOLAME_DEPENDENCIES += host-pkgconf libsndfile +TWOLAME_CONF_OPTS += --enable-sndfile +else +TWOLAME_CONF_OPTS += --disable-sndfile +endif + $(eval $(autotools-package))