From patchwork Sat Mar 2 09:50:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 1050596 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=e-labworks.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b="J2/eZZ/7"; 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 44BM3S66PWz9s3q for ; Sat, 2 Mar 2019 20:50:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1DB5887ECE; Sat, 2 Mar 2019 09:50:25 +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 fFwUj9GIugg5; Sat, 2 Mar 2019 09:50:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BEBE587EA5; Sat, 2 Mar 2019 09:50:22 +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 4E69C1BF330 for ; Sat, 2 Mar 2019 09:50:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A38187EA5 for ; Sat, 2 Mar 2019 09:50:21 +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 XLRPYmVi3dHB for ; Sat, 2 Mar 2019 09:50:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9CD1487E9B for ; Sat, 2 Mar 2019 09:50:15 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id d2so183521qti.11 for ; Sat, 02 Mar 2019 01:50:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=khHqo+zxstG+USjoAJuct1Pqwg7Chi/J2q4/QIDAHmk=; b=J2/eZZ/7B5QEfMp7ZfMgI0y7LB5iw/Cw0rqBYt30yr0P1rTH76RwWOTR8fETgBdOTM TqFmxPGGYcN9F8QZyVJFkzItX9zSRu0xprqb3y1Pmwk2MC/+5qk3031dw9qZvZJ3XpK7 HXCJJ3SRPSBeBAAFn+tC//Dvu5S16aOkR71UXVlckwLrcgFbNtIkFEVOECQO1aSYlBbM hRZQ10Yjf5DRitIpL+nDAtfixJZFJexr+wT44SBuPOq6WaVxQFFD4X3u5MaGYXd6Qqjz +cfI6b70QU7CirSf5G/ky2iuztt+6+JX2NyPdpvtWN2b0GOeoH0u/ehnGMH8s/Leb6mA oFuw== 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=khHqo+zxstG+USjoAJuct1Pqwg7Chi/J2q4/QIDAHmk=; b=ftrOWuutXv8KyvxdRtCKaTaH/7SKrpC1cYJI6DxTKeEwK6PS9lv5YkDhbVUdOziXdc ByrJs45wjP0d1D8bSBbqRraOasLTqTRloo+WUgHAYDE0mmCrcRcUW/oleqkBppbhcMEm qbhVpSsZMxNwmGK5fl+HDtdQCohvN6vkT35B6AYjH+Rr8kCXNLBjOXF03vWm9MXoupgh ljHJaA4ofPEHn1dDMy5LwEBvw07+ltlTh4NVrQ4nLyTP69HJmowoxjgsyZgYltr4coB0 Mv5wFOJP+iwiAFH38Mk3pePKfFEZbDv/HNh6OLyXh7pEp6UEu5JjFvVnCJVfyOAWBJoC q5dQ== X-Gm-Message-State: APjAAAWieQFw/CefHYodzNbhLWho0foxymZrWuORW8U2bvoSMqM/w9Lp IDX5//YFCIfX1M6UxbLol5m5ch0owLM= X-Google-Smtp-Source: APXvYqxhq67ZyKdjSL/eI977twbRnMd6ozOfFMv05jy+EchliRwvwH10orwJ0OFgq2t+6uxgPIFszQ== X-Received: by 2002:aed:3783:: with SMTP id j3mr7723671qtb.16.1551520214385; Sat, 02 Mar 2019 01:50:14 -0800 (PST) Received: from localhost.localdomain ([177.45.107.120]) by smtp.gmail.com with ESMTPSA id z41sm196644qtz.5.2019.03.02.01.50.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2019 01:50:13 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Sat, 2 Mar 2019 06:50:05 -0300 Message-Id: <20190302095005.9862-1-sergio.prado@e-labworks.com> X-Mailer: git-send-email 2.17.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/stella: bump version to 6.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: Sergio Prado Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - add hashes for license files - remove patch with changes already upstream [1] [1] https://github.com/stella-emu/stella/commit/483013baa7b357fdf0daa2e510c537d460132584 Signed-off-by: Sergio Prado --- ...x-error-when-building-with-uClibc-ng.patch | 54 ------------------- package/stella/stella.hash | 4 +- package/stella/stella.mk | 2 +- 3 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch diff --git a/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch b/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch deleted file mode 100644 index ffbc83187bc1..000000000000 --- a/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sat, 9 Sep 2017 15:04:58 -0300 -Subject: [PATCH] Fix error when building with uClibc-ng -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The uClibc-ng C library defines a type called R0 that conflits with a -global variable called R0 from PaddleReader.cxx. - -src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol - R0 = 1.5e3, - ^ -/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘ R0’ - R0 = 0, - ^~ - -So let's redefine R0 as a private member of the PaddleReader class. - -Signed-off-by: Sergio Prado ---- - src/emucore/tia/PaddleReader.cxx | 1 - - src/emucore/tia/PaddleReader.hxx | 2 ++ - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx -index 69c828ea6c5c..27ff828200ee 100644 ---- a/src/emucore/tia/PaddleReader.cxx -+++ b/src/emucore/tia/PaddleReader.cxx -@@ -22,7 +22,6 @@ - static constexpr double - C = 68e-9, - RPOT = 1e6, -- R0 = 1.5e3, - USUPP = 5; - - static constexpr double TRIPPOINT_LINES = 379; -diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx -index 00238a4fe5b5..0032e6efd015 100644 ---- a/src/emucore/tia/PaddleReader.hxx -+++ b/src/emucore/tia/PaddleReader.hxx -@@ -65,6 +65,8 @@ class PaddleReader : public Serializable - - bool myIsDumped; - -+ static constexpr double R0 = 1.5e3; -+ - private: - PaddleReader(const PaddleReader&) = delete; - PaddleReader(PaddleReader&&) = delete; --- -1.9.1 - diff --git a/package/stella/stella.hash b/package/stella/stella.hash index ef17ff75a09d..72a28f70a4ad 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,2 +1,4 @@ # Locally computed: -sha256 74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac stella-5.0.2-src.tar.xz +sha256 17aa8c5f08e09c51dd7dd933f93b0a1929d2832bd66f3bd994fa50ebb2b9a2b1 stella-6.0-src.tar.xz +sha256 c946a9ee632ee40111bad6e81c84b3e0bc1e49183b7a809f05d4d371f5f587bb Copyright.txt +sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 158a51109b78..a4df6ea65946 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 5.0.2 +STELLA_VERSION = 6.0 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+