From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH] gnu: python-pygame: Update to 1.9.3. Date: Tue, 21 Feb 2017 18:53:19 +0100 Message-ID: <20170221175319.10067-1-dannym@scratchpost.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgEdA-0006pr-Hq for guix-devel@gnu.org; Tue, 21 Feb 2017 12:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgEd6-0005Hs-MI for guix-devel@gnu.org; Tue, 21 Feb 2017 12:53:40 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:59186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgEd6-0005HY-Gc for guix-devel@gnu.org; Tue, 21 Feb 2017 12:53:36 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/game-development.scm (python-pygame)[version]: Update to 1.9.3. [source]: Use pypi-uri. [inputs]: Add freetype. [arguments]: Remove python-2. Substitute "FREETYPE". Remove "src/movie.c" dummy substitution. (python2-pygame): New variable. --- gnu/packages/game-development.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 619c2f1bc..908ce4834 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -526,18 +526,16 @@ interface (API).") (define-public python-pygame (package (name "python-pygame") - (version "1.9.1") + (version "1.9.3") (source (origin (method url-fetch) - (uri (string-append "http://pygame.org/ftp/pygame-" - version "release.tar.gz")) + (uri (pypi-uri "pygame" version)) (sha256 (base32 - "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52")))) + "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; Tests require pygame to be installed first. + `(#:tests? #f ; Tests require pygame to be installed first. #:phases (modify-phases %standard-phases ;; Set the paths to the dependencies manually because @@ -553,6 +551,7 @@ interface (API).") (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" @@ -582,9 +581,14 @@ interface (API).") (("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")) - (substitute* "src/movie.c") ;; Create a path to a header file provided by v4l-utils. (system* "mkdir" "linux") (system* "ln" "--symbolic" @@ -592,7 +596,8 @@ interface (API).") "linux/videodev.h") (system* "ln" "--symbolic" "Setup.in" "Setup"))))))) (inputs - `(("sdl" ,sdl) + `(("freetype" ,freetype) + ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("sdl-mixer" ,sdl-mixer) ("sdl-ttf" ,sdl-ttf) @@ -619,3 +624,6 @@ to create fully featured games and multimedia programs in the python language.") license:psfl license:public-domain license:lgpl2.1+)))) + +(define-public python2-pygame + (package-with-python2 python-pygame))