From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uI03D3su4GC/GwAAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 11:31:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4JUVC3su4GBiJgAAB5/wlQ (envelope-from ) for ; Sat, 03 Jul 2021 09:31:39 +0000 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 BC6E411519 for ; Sat, 3 Jul 2021 11:31:38 +0200 (CEST) Received: from localhost ([::1]:59332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzt-0005rx-PW for larch@yhetil.org; Sat, 03 Jul 2021 05:31:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzO-0005pu-CT for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzL-0005PG-Ee for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzL-00057g-C2 for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 5/5] gnu: Add python-pygame-sdl2. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530463519625 (code B ref 49329); Sat, 03 Jul 2021 09:31:03 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:35 +0000 Received: from localhost ([127.0.0.1]:37944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyt-00056O-IN for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:31195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyh-00055q-GF for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:23 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH6B51XBJz1LZVs for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH6B51XBJz1LZVs DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304621; bh=TACTcAQTzZRNdB1nu7ByqgpxhYNYoQTIM8TSxqVrI14=; h=From:To:Subject:Date:In-Reply-To:References:From; b=kdtSwQRmHAIHHqDztZV8KLffrvxPV1FjznetjJUAfewSw+k6JP+Zqzh+dGGli4zOp C30fHNIEw+l/DVs1Z06yNbPzIHbn0ogtv2HQAbW2GsEBBg6Q1SYBrrqdqUvPA5Io6q R2zqaRXQmIwRoczBBPVivVbACP3mTUWsg4KQHP1Y= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:43 +0200 Message-Id: <20210703092842.32189-5-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625304698; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=TACTcAQTzZRNdB1nu7ByqgpxhYNYoQTIM8TSxqVrI14=; b=RkZYmelMPZLtskche517Psmq7ltriasEvckt+die4pWXskMRovSeUbPXITixbLBjZgU0g6 uc6qTYUJmo0bcK8xKgNK4wvLiu0yk6pQ/IL8d9wE37pnbndio/qbdvLNtD1JVGIekGUZr0 NnanZPc6N5k+esjCyxV+WGzFtDi8HzLqpOc0ketR3OjAt8C0jmILPAop2YPAc9z1/NfahE PG0VkRDJfHEdK5+PJgyoN8I/aMsiN3FYKeMuCHRpTAnBx5OpdIYvnh/KkV1Rp4VBoV7tAV 2X309amZsylx1R1vUIf0kFoZjgVJGm/U2t02GMFoa7aKYz5XCM6rr3gyPbPgiQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625304698; a=rsa-sha256; cv=none; b=AVAET0B97iE1J/s9d9NDVkGk2e2BGwoIntdh4umXFhJ/PZM+hukTnmMtAtP7HPDPvAKqJZ LDDhNFKwzA+wITZtR9PoxFMM0QgstrJh68NqbQxCr9A+DM466CwM8yvaYCPtdu69C1RtHX LYRrcpOSsCyXYO7H2KoCBUXyKgYCIQJKdZ1ErmRLM0izJwC/jhExRNsLl1hMrZquSt6OYX hadDDIf6sLhC3glAoNqXZ6lLdEHX5CrFXAt64EujCBx8A/R1hIomWtoY+Hl2r4zjP13qEc TBoPa6DtwcbuOJZZ1/LlPcZfi2Ig2IK+7dja4zFjqvALztYFy0m+ch30gTLQow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=kdtSwQRm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=kdtSwQRm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BC6E411519 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: U82m53cqnMDc * gnu/packages/game-development.scm (python-pygame-sdl2): New variable. Inherit package definition from previous python2-pygame-sdl2, with the following additions: [source]: Also drop “gen3” in snippet. [arguments]: Drop #:python. [native-inputs]: Use ‘python-cython’ instead of ‘python2-cython’. (python2-pygame-sdl2): Define in terms of python-pygame-sdl2. --- gnu/packages/game-development.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5d5fa5cf8b..e1593c0f82 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1106,12 +1106,12 @@ to create fully featured games and multimedia programs in the python language.") (define-public python2-pygame (package-with-python2 python-pygame)) -(define-public python2-pygame-sdl2 +(define-public python-pygame-sdl2 (let ((real-version "2.1.0") (renpy-version "7.4.6")) (package - (inherit python2-pygame) - (name "python2-pygame-sdl2") + (inherit python-pygame) + (name "python-pygame-sdl2") (version (string-append real-version "-for-renpy-" renpy-version)) (source (origin @@ -1124,12 +1124,12 @@ to create fully featured games and multimedia programs in the python language.") '(begin ;; drop generated sources (delete-file-recursively "gen") + (delete-file-recursively "gen3") (delete-file-recursively "gen-static") #t)))) (build-system python-build-system) (arguments `(#:tests? #f ; tests require pygame to be installed first - #:python ,python-2 #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-vars @@ -1149,7 +1149,7 @@ to create fully featured games and multimedia programs in the python language.") `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) (native-inputs - `(("python2-cython" ,python2-cython))) + `(("python-cython" ,python-cython))) (home-page "https://www.renpy.org/") (synopsis "Reimplementation of the Pygame API using SDL2") (description "Pygame_SDL2 reimplements the Pygame API using SDL2, @@ -1158,6 +1158,9 @@ While it aims to be used as a drop-in replacement, it appears to be developed mainly for Ren'py.") (license (list license:lgpl2.1 license:zlib))))) +(define-public python2-pygame-sdl2 + (package-with-python2 python-pygame-sdl2)) + (define-public python2-renpy (package (name "python2-renpy") -- 2.32.0