From patchwork Sun Dec 18 15:51:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 45412 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 AC06627BBEB; Sun, 18 Dec 2022 15:52:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 996D227BBE9 for ; Sun, 18 Dec 2022 15:52:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6vxL-0006Fu-Ud; Sun, 18 Dec 2022 10:52:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6vxK-0006Fg-Dw for guix-patches@gnu.org; Sun, 18 Dec 2022 10:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6vxJ-0005jS-Ud for guix-patches@gnu.org; Sun, 18 Dec 2022 10:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6vxJ-00079b-LS for guix-patches@gnu.org; Sun, 18 Dec 2022 10:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v1 1/3] gnu: python-pygame: Update to 2.1.2. References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> In-Reply-To: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 15:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167137867327483 (code B ref 60153); Sun, 18 Dec 2022 15:52:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 15:51:13 +0000 Received: from localhost ([127.0.0.1]:34571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vwX-00079D-0d for submit@debbugs.gnu.org; Sun, 18 Dec 2022 10:51:13 -0500 Received: from knopi.disroot.org ([178.21.23.139]:54962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vwV-000796-Di for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 10:51:12 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C53F1407BD for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:51:09 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kzhxdgfUCQoz for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:51:08 +0100 (CET) Message-ID: <169f8bfa-c40d-b5bb-ad7e-6517267096b7@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671378668; bh=2FRzpmnqsFZoFnAGOmilVNfcZUl9E5CErvr4DrgAuac=; h=Date:To:From:Subject; b=iat+fGUwQo0HihEAo4e2uWqCP3bZ/GUQD4HHeBmxZdH1AYL6B340q1xpXeUoz31GY vhr7Bok1DZ5Mba3UEOXALywEGWzkQ+fSlnGmJ4ZTFG5XBOaXItpttEzqxxhLG8AP4J uTKq3LJMtn/Sm9eAaSRk4qdzLTr4Vf8LzpboPiWlUbzrBWQtPzly+iLQ5tFmaFf2HN EpCsHncmOeh/WgsF3wQSR6ADP0r7ubBHof/5f/OsvzJNkUfMUUrQqdPw0CssTIsFuS nLfaFxcKZrMaXA5eulaC04Fr/TJWuUMHnHjxAXIMsSd07c30LQPekYuMrd7jtNwzCh Y1hceZ26re20w== Date: Sun, 18 Dec 2022 23:51:04 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 3e89a0d6f4cca4338661625bdf2b701425341507 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Sat, 17 Dec 2022 17:37:21 +0800 Subject: [PATCH v1 1/3] gnu: python-pygame: Update to 2.1.2. * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. --- gnu/packages/game-development.scm | 98 +++++++++++-------------------- 1 file changed, 35 insertions(+), 63 deletions(-) + ("sdl2-ttf" ,sdl2-ttf) + ("sdl2-gfx" ,sdl2-gfx) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libX11" ,libx11) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4a0435045b..f9a53799f5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1194,82 +1194,54 @@ (define-public quesoglc (define-public python-pygame (package (name "python-pygame") - (version "1.9.4") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "pygame" version)) (sha256 (base32 - "1dn0nb86jl7yr8709cncxdr0yrmviqakw7zx3g8jbbwrr60if3bh")))) + "0g6j79naab7583kymf1bgxc5l5c9h5laq887rmvh8vw8iyifrl6n")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Fix the configure script to allow passing the dependencies + ;; as environment variables. + (substitute* "buildconfig/config_unix.py" + (("localbase.d") "d") + (("origincdirs = .*/include.*]") + "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")") + (("ORIGLIBDIRS") "LIBRARY_PATH") + ;; Fix headers + (("SDL_ttf.h") "SDL2/SDL_ttf.h") + (("SDL_image.h") "SDL2/SDL_image.h") + (("SDL_mixer.h") "SDL2/SDL_mixer.h")) + (substitute* "src_c/imageext.c" + (("SDL_image.h") "SDL2/SDL_image.h")) + (substitute* "src_c/font.h" + (("SDL_ttf.h") "SDL2/SDL_ttf.h")) + (substitute* "src_c/mixer.h" + (("SDL_mixer.h") "SDL2/SDL_mixer.h")) + (substitute* "src_c/_sdl2/mixer.c" + (("SDL_mixer.h") "SDL2/SDL_mixer.h")))))) (build-system python-build-system) (arguments `(#:tests? #f ; tests require pygame to be installed first #:phases (modify-phases %standard-phases - ;; Set the paths to the dependencies manually because - ;; the configure script does not allow passing them as - ;; parameters. This also means we can skip the configure - ;; phase. + ;; Pass the dependencies to the configure script + ;; through environment variables. (add-before 'build 'set-library-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((sdl-ref (assoc-ref inputs "sdl")) - (font-ref (assoc-ref inputs "sdl-ttf")) - (image-ref (assoc-ref inputs "sdl-image")) - (mixer-ref (assoc-ref inputs "sdl-mixer")) - (smpeg-ref (assoc-ref inputs "libsmpeg")) - (png-ref (assoc-ref inputs "libpng")) - (jpeg-ref (assoc-ref inputs "libjpeg")) - (freetype-ref (assoc-ref inputs "freetype")) - (v4l-ref (assoc-ref inputs "v4l-utils")) - (out-ref (assoc-ref outputs "out"))) - (substitute* "Setup.in" - (("SDL = -I/usr/include/SDL") - (string-append "SDL = -I" sdl-ref "/include/SDL -I."))) - (substitute* "Setup.in" - (("FONT = -lSDL_ttf") - (string-append "FONT = -I" font-ref "/include/SDL -L" - font-ref "/lib -lSDL_ttf"))) - (substitute* "Setup.in" - (("IMAGE = -lSDL_image") - (string-append "IMAGE = -I" image-ref "/include/SDL -L" - image-ref "/lib -lSDL_image"))) - (substitute* "Setup.in" - (("MIXER = -lSDL_mixer") - (string-append "MIXER = -I" mixer-ref "/include/SDL -L" - mixer-ref "/lib -lSDL_mixer"))) - (substitute* "Setup.in" - (("SMPEG = -lsmpeg") - (string-append "SMPEG = -I" smpeg-ref "/include/smpeg -L" - smpeg-ref "/lib -lsmpeg"))) - (substitute* "Setup.in" - (("PNG = -lpng") - (string-append "PNG = -I" png-ref "/include -L" - png-ref "/lib -lpng"))) - (substitute* "Setup.in" - (("JPEG = -ljpeg") - (string-append "JPEG = -I" jpeg-ref "/include -L" - jpeg-ref "/lib -ljpeg"))) - - (substitute* "Setup.in" - (("FREETYPE = -lfreetype") - (string-append "FREETYPE = -I" freetype-ref "/include/freetype2 -L" - freetype-ref "/lib -lfreetype"))) - - (substitute* "Setup.in" - (("^pypm") "#pypm")) - ;; Create a path to a header file provided by v4l-utils. - (system* "mkdir" "linux") - (system* "ln" "--symbolic" - (string-append v4l-ref "/include/libv4l1-videodev.h") - "linux/videodev.h") - (system* "ln" "--symbolic" "Setup.in" "Setup"))))))) + (lambda _ + (setenv "LOCALBASE" " ")))))) + (native-inputs + (list pkg-config)) (inputs `(("freetype" ,freetype) - ("sdl" ,sdl) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("sdl-gfx" ,sdl-gfx) + ("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer)