From patchwork Tue Feb 12 08:33:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1040443 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zGCl6pVRz9rxp for ; Tue, 12 Feb 2019 19:34:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E73081926; Tue, 12 Feb 2019 08:34:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hkOwcj04Bm30; Tue, 12 Feb 2019 08:34:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C215686429; Tue, 12 Feb 2019 08:34:07 +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 506D51BF2A0 for ; Tue, 12 Feb 2019 08:34:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4DB3F85DC4 for ; Tue, 12 Feb 2019 08:34:06 +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 P8F7GFEZ3FKy for ; Tue, 12 Feb 2019 08:34:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B661185D35 for ; Tue, 12 Feb 2019 08:34:03 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A6B3A16005E for ; Tue, 12 Feb 2019 09:34:00 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 43zGCW5fNgz6tmL for ; Tue, 12 Feb 2019 09:33:59 +0100 (CET) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XHNADvF4EYdr; Tue, 12 Feb 2019 09:33:55 +0100 (CET) Received: from nzxt.fritz.box (port-92-193-201-198.dynamic.qsc.de [92.193.201.198]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 12 Feb 2019 09:33:55 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Tue, 12 Feb 2019 09:33:51 +0100 Message-Id: <20190212083351.376-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/luv: bump to version 1.25.0-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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove upstream patch which is included in the new release. Signed-off-by: Jörg Krause --- ...lude-compat-5.3.h-in-luv-header-file.patch | 62 ------------------- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch diff --git a/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch b/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch deleted file mode 100644 index 22428c98f7..0000000000 --- a/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0b541b828142dab6c23b0f4415dd2fd052d69ff1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 31 Oct 2018 18:14:18 +0100 -Subject: [PATCH] Do not include compat-5.3.h in luv header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not include compat-5.3.h in luv header file - -Exposing the compat-5.3.h header file directly in the luv.h header file -is not a good idea, because it causes redefinition errors when building, -for example latest luvi version 2.8.0, with a shared luv library and -LuaJIT 2.0.5. - -Therefore, include the compat header file in the luv.c source file. - -Note, that luvi version 2.8.0 (and 2.7.6) still fails to build against the -shared luv library using LuaJIT 2.0.5, as it does use `luaL_newlib` which is -not available in Lua 5.1. However, this is unrelated to the luv library as -luvi itself should define the macro for Lua 5.1. - -Upstream status: https://github.com/luvit/luv/pull/310 - -Signed-off-by: Jörg Krause ---- - src/luv.c | 3 +++ - src/luv.h | 4 ---- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/luv.c b/src/luv.c -index c4c7cb7..4af7582 100644 ---- a/src/luv.c -+++ b/src/luv.c -@@ -15,6 +15,9 @@ - * - */ - -+#if (LUA_VERSION_NUM != 503) -+#include "c-api/compat-5.3.h" -+#endif - #include "luv.h" - #include "util.c" - #include "lhandle.c" -diff --git a/src/luv.h b/src/luv.h -index 27c8c94..4fedd3f 100644 ---- a/src/luv.h -+++ b/src/luv.h -@@ -50,10 +50,6 @@ - #define MAX_TITLE_LENGTH (8192) - #endif - --#if (LUA_VERSION_NUM != 503) --#include "c-api/compat-5.3.h" --#endif -- - #if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunused-function" --- -2.19.1 - diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 24440bef8e..125e7c5f03 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27886acb3d3f531a3d6ca70360d2593ddf1a8d4daf94ca3beea14d9381227ff7 luv-1.22.0-1.tar.gz +sha256 6003b271170a6cef1056725f3a3b9faf56e7ebf83f1d1cc05e272be808a46206 luv-1.25.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 87158b72ed..4901088a3d 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.22.0-1 +LUV_VERSION = 1.25.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt