From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wAPeHODw1WEWKQAAgWs5BA (envelope-from ) for ; Wed, 05 Jan 2022 20:26:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QPp+GeDw1WHjOwEAauVa8A (envelope-from ) for ; Wed, 05 Jan 2022 20:26:24 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 996C52E9C2 for ; Wed, 5 Jan 2022 20:26:23 +0100 (CET) Received: from localhost ([::1]:35064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5BvQ-0002S3-Ej for larch@yhetil.org; Wed, 05 Jan 2022 14:26:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5BmQ-0004fm-TG for guix-patches@gnu.org; Wed, 05 Jan 2022 14:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5BmQ-00089O-IC for guix-patches@gnu.org; Wed, 05 Jan 2022 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5BmQ-0004kr-Ez for guix-patches@gnu.org; Wed, 05 Jan 2022 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53035] [PATCH] gnu: supertux: Update to 0.6.3. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jan 2022 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53035@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164141021918147 (code B ref -1); Wed, 05 Jan 2022 19:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2022 19:16:59 +0000 Received: from localhost ([127.0.0.1]:41882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5BmC-0004aP-1K for submit@debbugs.gnu.org; Wed, 05 Jan 2022 14:16:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:55802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5Bm2-0004UK-ND for submit@debbugs.gnu.org; Wed, 05 Jan 2022 14:16:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Bm2-0003gA-Hj for guix-patches@gnu.org; Wed, 05 Jan 2022 14:16:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Blu-0007yP-4Y for guix-patches@gnu.org; Wed, 05 Jan 2022 14:16:33 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2C217240103 for ; Wed, 5 Jan 2022 20:16:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1641410187; bh=d51YxX9ydSNPQY91iX1KgZpEsvdOBv9wyoLwDfLhirQ=; h=From:To:Cc:Subject:Date:From; b=S3MlisE+xQQwwDaZatTW2fiSQnMy+2iW0OcZnC35l0Pf96On1gBsj2OVbLaU/VmBn mDOAFNgImL5DN4j0RTgcTNegEJtnc5H6/UQzShmTFTSIT70vY6L0U4yNMqX0C3TwaC Pz28boTIvclekkUO6BV6KOMe8DQ3Apbiu215/8Osd0dWmzpkq6YL+zIoi9XBYpRgUf HhUqv0dYdlUBorwQ2qyTss75QQOBUne94UERIfc3+RurMqNnA0yjmt7sJTS93l7KAC w8NwXgBf14ijF/clSSGNcekrVzte5nxk1FBIzTmF6tKW0bYe0rTisNjtz9PzPOSmo+ 43q9NiGMoTkdw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JTfNV4hbSz9rxF; Wed, 5 Jan 2022 20:16:26 +0100 (CET) From: Felix Gruber Date: Wed, 5 Jan 2022 19:16:11 +0000 Message-Id: <20220105191611.31705-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641410784; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=0ynkKq4lAE7uNJH7OxCk7nA0SYhAq7F8x5OmECYZJ78=; b=ab6tTbPyoRD8Y9IcagJmvwDEYcqIQRlpT4tFI31yZ75Wan7GGtvuGcG2KxGuICsbvqaG1c lA7s/+oV9ZmgNGGgOJQnd43DocMVBb6GFQmtveb0mP9DbBHYcz9ud9Dyuee1ItrPfDK1Hh +8hDciGUt9OmH7NX6tyBJKTrW1/wkomtBm84nhlleQdXiXC1kPRif3hwV9IUDb+jhfa8bK +MQO3rbm5fgYWuW4Wj2YI5sMn4Q0M1ZQkdOrJ5lo5VAP9XbCseJTNABfIMBZSZVynOWo+5 KIZE+/njiTXpJytoIiOd1I8RKb8Xk5xYYQrAa0dxKgwYizkHgdyGWxFVpWsDlg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641410784; a=rsa-sha256; cv=none; b=fjJyFJcQTDdcZz1WzAt73mRPSZHdQykDZM8e+7prQfYrMS6QuLqyXgPSLmNgtl7zMXtRQM Iv9jeNaS2MdHXisoJwW/yeMfaQnxB/ygT4xepCtlVL+zTWMi9GrLybTD9/kq3zAujxs/yL /vLzx9xq78tPGyJsFqO5sUv6796Wei1f6gYVyJOHgYy0godE3WVFxfu6f131XQrEW+N8vU wdOxDaYLJBxOiU7KMGcKvn3T28ULuGtkvmGYmp6Uk6s1TfMpokRmemG2FylMjxUMM0KFxU av+70lAUycW2ZYgZSbw5P8leaWSd5l4P6GzJinCiD+E81nWZPvwu9EAXgVnHvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=S3MlisE+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.60 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=S3MlisE+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 996C52E9C2 X-Spam-Score: 0.60 X-Migadu-Scanner: scn1.migadu.com X-TUID: NFrYcYd6UTEk * gnu/packages/games.scm (supertux): Update to 0.6.3. [inputs] Sort list and add glm. * gnu/packages/patches/supertux-unbundle-squirrel.patch: Update patch. --- gnu/packages/games.scm | 23 ++++++++++--------- .../patches/supertux-unbundle-squirrel.patch | 17 ++++++++------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d884df588a..0dbc444aba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5442,7 +5442,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -5451,7 +5451,7 @@ with the \"Stamp\" tool within Tux Paint.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96")) + "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments @@ -5471,18 +5471,19 @@ with the \"Stamp\" tool within Tux Paint.") (string-append "${SQUIRREL_PREFIX}/include/squirrel")))) #t))))) (build-system cmake-build-system) - (inputs (list sdl2 - sdl2-image - sdl2-mixer - openal - mesa + (inputs (list glm + boost + curl + freetype glew - libvorbis libogg + libvorbis + mesa + openal physfs - curl - boost - freetype + sdl2 + sdl2-image + sdl2-mixer squirrel)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/patches/supertux-unbundle-squirrel.patch b/gnu/packages/patches/supertux-unbundle-squirrel.patch index 054183b75f..f504aacfdd 100644 --- a/gnu/packages/patches/supertux-unbundle-squirrel.patch +++ b/gnu/packages/patches/supertux-unbundle-squirrel.patch @@ -1,9 +1,8 @@ -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-05-24 17:58:19.693090158 -0400 -+++ b/CMakeLists.txt 2019-05-24 17:57:43.349473252 -0400 -@@ -375,44 +375,15 @@ - - include(ConfigureChecks) +--- a/CMakeLists.txt 2022-01-05 18:51:17.828392874 +0100 ++++ b/CMakeLists.txt 2022-01-05 18:54:50.826717830 +0100 +@@ -487,48 +487,15 @@ + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ppc) + endif() - -## Also build external/squirrel @@ -15,6 +14,9 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex) -ExternalProject_Add(squirrel - SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/" +- BUILD_BYPRODUCTS +- "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}" +- "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}" - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} @@ -22,7 +24,8 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} -- -DINSTALL_INC_DIR=include) +- -DINSTALL_INC_DIR=include +- -DCMAKE_POSITION_INDEPENDENT_CODE=ON) - -if(WIN32) - add_library(squirrel_lib SHARED IMPORTED) -- 2.30.2