From patchwork Mon Apr 22 17:10:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1088774 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.137; helo=fraxinus.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="fj8znYKK"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ntQP0P8rz9s6w for ; Tue, 23 Apr 2019 03:11:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E47F785E79; Mon, 22 Apr 2019 17:11:04 +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 95mJULl6jsQE; Mon, 22 Apr 2019 17:11:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B985D85657; Mon, 22 Apr 2019 17:11:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AC04A1BF3EC for ; Mon, 22 Apr 2019 17:11:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A6B7786C1A for ; Mon, 22 Apr 2019 17:11:00 +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 4nmQbLRYgVM0 for ; Mon, 22 Apr 2019 17:10:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 98A3986B04 for ; Mon, 22 Apr 2019 17:10:58 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id h18so15202345wml.1 for ; Mon, 22 Apr 2019 10:10:58 -0700 (PDT) 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; bh=K+hDtIJj+JyLNtrCA1FMTr6dcvTg+i6qnNlWCTScfTY=; b=fj8znYKKzX4J6IomKc9CnmlfQhTvsMCWpqX55c2/ZK15frPcd2aa5KWaL2kxpoluyn Y9If+KVvijlI7jLBu+q6ht6zaKDYxmKW+JGAJNYbQ6QFVq6UfrrF29VQd+WG6ipoiSj9 qGDlpZFPKjAVVndY0PZxsnEaPIRQUJTWO7k7i77n4AujWCf7CGih0CPQ+XOjpPkz7GkU uiwRY67TnEq7HOmoLuUT396ux6lXD/P1zE/VpHOOBgL7GgG/DZKjuXxMt++zshKRGRoY TVW/Vk3pCPXJ7Zdm1dz2lk7A8DYjzA1+OF8EZ9gAu09TzOzDrDOgKEj5VkxoWjSyh+z7 CYWQ== 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; bh=K+hDtIJj+JyLNtrCA1FMTr6dcvTg+i6qnNlWCTScfTY=; b=ZPbSJjhAKsRUpNBiXAOo1UqPl57A3+fVpfUUyjRU8Hcu6cByRAUDb4lG6++2nMRF8s UlI5OeOUD8LxnBmmT1okFH6/RF+yrNnci3e9h8x+x9z2fyzEkRwuXww+AH1EZz7zwzuh 0TxwKMuAAGk/WKEjfouT+uRYYOyWR0v+UmfYAgRRCpsYbjSjiZo04DsjqoR9v5xq98bR PJnVZ0/5nnVOF/CyYXytNLEGVUx4BOeu2GPryjvwo97l9VU1xNa7n69U7dcRwtHXTSc+ l5CX/SVboAgEXWZONJFRgnWVya6b5FBFgEobtItZxvH1WjtFddNJBiguiIwVknk3NXyq hqWQ== X-Gm-Message-State: APjAAAUjVY/HG4Jk0RcTrGj1Lu7GF8yA6yQdQs1ScfxI1Y7Hh99Na5nK sXO9MTq+UmVshj9ESu7WNXYcJTDY X-Google-Smtp-Source: APXvYqwM5NsAO/Ka/Qoul0D9EqYBHZjytGNTyyTqjXjTATm3spkqW1BfmbQ/p7aeZxbB7iVVUMC29A== X-Received: by 2002:a1c:35c3:: with SMTP id c186mr13872345wma.135.1555953056779; Mon, 22 Apr 2019 10:10:56 -0700 (PDT) Received: from localhost.localdomain (2a01cb0589880c008a3268f7cbc0fc5c.ipv6.abo.wanadoo.fr. [2a01:cb05:8988:c00:8a32:68f7:cbc0:fc5c]) by smtp.gmail.com with ESMTPSA id a13sm19787300wrn.63.2019.04.22.10.10.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Apr 2019 10:10:55 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 22 Apr 2019 19:10:49 +0200 Message-Id: <20190422171049.22034-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190422171049.22034-1-romain.naour@gmail.com> References: <20190422171049.22034-1-romain.naour@gmail.com> Subject: [Buildroot] [PATCH 3/3] package/supertuxkart: bump to version 1.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: Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove upstream patch 0001-Fix-3091.patch. Add enet, libsquish and nettle new dependencies. Add host-pkgconf since the CMakeLists.txt now use pkg-config for enet. Make sure that glew and wiiuse libraries from staging are used instead of bundled versions. See: http://blog.supertuxkart.net/2019/04/supertuxkart-10-release.html Signed-off-by: Romain Naour --- package/supertuxkart/0001-Fix-3091.patch | 59 -------------------------------- package/supertuxkart/Config.in | 4 +++ package/supertuxkart/supertuxkart.hash | 8 ++--- package/supertuxkart/supertuxkart.mk | 13 +++++-- 4 files changed, 18 insertions(+), 66 deletions(-) delete mode 100644 package/supertuxkart/0001-Fix-3091.patch diff --git a/package/supertuxkart/0001-Fix-3091.patch b/package/supertuxkart/0001-Fix-3091.patch deleted file mode 100644 index dae2a37ce1..0000000000 --- a/package/supertuxkart/0001-Fix-3091.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001 -From: Benau -Date: Sun, 14 Jan 2018 10:19:37 +0800 -Subject: [PATCH] Fix #3091 - -Signed-off-by: Fabrice Fontaine - #define CPU_MMX_SUPPORT (1) - #endif --#if __SSE__ || _M_X64 || _M_IX86_FP >= 1 || CPU_ENABLE_SSE -+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE - #include - #define CPU_SSE_SUPPORT (1) - #endif --#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2 || CPU_ENABLE_SSE2 -+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2 - #include - #define CPU_SSE2_SUPPORT (1) - #endif -@@ -95,23 +95,23 @@ - #define CPU_POPCNT_SUPPORT (1) - #endif - #if __LZCNT__ || CPU_ENABLE_LZCNT -- #include -+ #include - #define CPU_LZCNT_SUPPORT (1) - #endif - #if __F16C__ || CPU_ENABLE_F16C -- #include -+ #include - #define CPU_F16C_SUPPORT (1) - #endif - #if __BMI__ || CPU_ENABLE_BMI -- #include -+ #include - #define CPU_BMI_SUPPORT (1) - #endif - #if __BMI2__ || CPU_ENABLE_BMI2 -- #include -+ #include - #define CPU_BMI2_SUPPORT (1) - #endif - #if __TBM__ || CPU_ENABLE_TBM -- #include -+ #include - #define CPU_TBM_SUPPORT (1) - #endif - diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 51759160eb..21093cc085 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -10,12 +10,16 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_ENET select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBGLEW select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBSQUISH select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_NETTLE select BR2_PACKAGE_OPENAL select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 4bba3f2c2a..dc65c700b9 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0 supertuxkart-0.9.3-src.tar.xz -# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.3/ -sha1 2650ba20976472f10122a8600cc239507a9b6f24 supertuxkart-0.9.3-src.tar.xz -md5 8de5455b8fdbb92679e302b76c9041cf supertuxkart-0.9.3-src.tar.xz +sha256 6d88f43f0de5202766ba305c87e3d9843103e81d31b7193059286098d2a5d980 supertuxkart-1.0-src.tar.xz +# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.0/ +sha1 cd270c851c5b15fb69c6e78e9824d87187c1f801 supertuxkart-1.0-src.tar.xz +md5 3059ea9c146b50f40f2b59a606da0fc0 supertuxkart-1.0-src.tar.xz diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 37756213fa..02558df800 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 0.9.3 +SUPERTUXKART_VERSION = 1.0 SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION) @@ -15,14 +15,19 @@ SUPERTUXKART_LICENSE = GPL-3.0+ SUPERTUXKART_LICENSE_FILES = COPYING SUPERTUXKART_DEPENDENCIES = \ + host-pkgconf \ freetype \ + enet \ jpeg \ libcurl \ libgl \ + libglew \ libglu \ libogg \ libpng \ + libsquish \ libvorbis \ + nettle \ openal \ xlib_libXrandr \ zlib @@ -31,7 +36,9 @@ SUPERTUXKART_DEPENDENCIES = \ # the only user of the bundled libraries, turn off shared libraries entirely. # Disable In-game recorder (there is no libopenglrecorder package) SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_RECORDER=OFF + -DBUILD_RECORDER=OFF \ + -DUSE_SYSTEM_GLEW=ON \ + -DUSE_SYSTEM_ENET=ON ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) SUPERTUXKART_DEPENDENCIES += libfribidi @@ -42,7 +49,7 @@ endif ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils -SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON +SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF