From patchwork Tue Jan 4 22:23:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35953 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 93BDB27BBEA; Tue, 4 Jan 2022 22:24:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A30E27BBE9 for ; Tue, 4 Jan 2022 22:24:20 +0000 (GMT) Received: from localhost ([::1]:60578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sE7-0007n0-Go for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:24:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sDq-0007lK-FH for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sDq-0001xx-3S for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sDq-00036m-0S for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53016] [PATCH] gnu: freedroidrpg: Update to 1.0rc1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53016 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53016@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164133501211895 (code B ref -1); Tue, 04 Jan 2022 22:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jan 2022 22:23:32 +0000 Received: from localhost ([127.0.0.1]:38967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDL-00035l-Pj for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:33802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDK-00035e-Ai for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sDK-0007cK-6c for guix-patches@gnu.org; Tue, 04 Jan 2022 17:23:30 -0500 Received: from mout01.posteo.de ([185.67.36.65]:33595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sDH-0001vJ-B5 for guix-patches@gnu.org; Tue, 04 Jan 2022 17:23:29 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8A101240026 for ; Tue, 4 Jan 2022 23:23:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1641335004; bh=O+L2mbRrxAjrh0iiaF+l1lWSH9jh3qtYKxzUXLRvk9c=; h=From:To:Cc:Subject:Date:From; b=XqRaEH1L3etvCWpaFPKq3NQLfnLlYQl0POX7jCc6aeEd5r8/upW0QJMkm7sI6P1UD f7K/vUDPtAWttaMCMvaxGIhYXTAvtm+mw39UORjDejsQbXIpAX1+iyzdHKkITovX28 4qVzEX9aryqLTP1iNRcUq0HGn7Y6vsdzqjWkqASn2HhA5WYpwZY1UQ+QNHZxcHq9wx 2VNaKvDbZHhXka8SheXNGR6OoPvb2YSGyGP468IY5dAoSbvBAuDUwD8pShJIQ3epV/ 0sEeqF0I4oiIsY8HYTXFAnAekbQoBxo+FmoMpxJML3me21LniskW5USrBoAh7y7AJn hFZHMaafn212A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JT6Zg75cjz6tms; Tue, 4 Jan 2022 23:23:23 +0100 (CET) From: Felix Gruber Date: Tue, 4 Jan 2022 22:23:14 +0000 Message-Id: <20220104222314.24931-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (freedroidrpg): Update to 1.0rc1. [source]: Handle rc suffix in version number. [arguments]: Add -fcommon to CFLAGS. [inputs]: Use new simplified format. Add glew. --- gnu/packages/games.scm | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5896fa4333..123136f65c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1349,20 +1349,23 @@ effects and music to make a completely free game.") (define-public freedroidrpg (package (name "freedroidrpg") - (version "0.16.1") + (version "1.0rc1") (source (origin (method url-fetch) - (uri (string-append "http://ftp.osuosl.org/pub/freedroid/" - "freedroidRPG-" (version-major+minor version) "/" - "freedroidRPG-" version ".tar.gz")) + (uri (let ((major+minor + (version-major+minor + (string-replace-substring version "rc" ".")))) + (string-append "http://ftp.osuosl.org/pub/freedroid/" + "freedroidRPG-" major+minor "/" + "freedroidRPG-" version ".tar.gz"))) (sha256 - (base32 "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2")))) + (base32 "1rywdngsfhkxv5gsya3dvv8kjxs5zjv57a3h364q9llsc82kdcxa")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list - (string-append "CFLAGS=" + (string-append "CFLAGS=-fcommon " "-I" (assoc-ref %build-inputs "sdl-gfx") "/include/SDL " "-I" (assoc-ref %build-inputs "sdl-image") "/include/SDL " "-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL") @@ -1374,18 +1377,19 @@ effects and music to make a completely free game.") (native-inputs (list pkg-config)) (inputs - `(("glu" ,glu) - ("libjpeg" ,libjpeg-turbo) - ("libogg" ,libogg) - ("libpng" ,libpng) - ("libvorbis" ,libvorbis) - ("mesa" ,mesa) - ("python" ,python-wrapper) - ("sdl" ,sdl) - ("sdl-gfx" ,sdl-gfx) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("zlib" ,zlib))) + (list glew + glu + libjpeg-turbo + libogg + libpng + libvorbis + mesa + python-wrapper + sdl + sdl-gfx + sdl-image + sdl-mixer + zlib)) (home-page "https://www.freedroid.org/") (synopsis "Isometric role-playing game against killer robots") (description