From patchwork Mon Sep 27 22:16:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 33369 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 911AC27BBE1; Mon, 27 Sep 2021 23:26:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE4EA27BBE3 for ; Mon, 27 Sep 2021 23:26:07 +0100 (BST) Received: from localhost ([::1]:36420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUz4Y-0006Cw-SC for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 18:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUyvm-0004eh-AB for guix-patches@gnu.org; Mon, 27 Sep 2021 18:17:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUyvm-0007nS-1W for guix-patches@gnu.org; Mon, 27 Sep 2021 18:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUyvl-0008V8-Pd for guix-patches@gnu.org; Mon, 27 Sep 2021 18:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50653] [PATCH v2] gnu: Add sdlpop. References: <-p2XzmyUeU34-LyC3z50Id77Y3mrwZAnC3s3bUigV4CSc1rE9Pz-FYX9HxF97dLz1oBPpUEx06AoVSLT5eJGyZRZOFmCSfXlSzKHc5U8iCc=@protonmail.com> In-Reply-To: <-p2XzmyUeU34-LyC3z50Id77Y3mrwZAnC3s3bUigV4CSc1rE9Pz-FYX9HxF97dLz1oBPpUEx06AoVSLT5eJGyZRZOFmCSfXlSzKHc5U8iCc=@protonmail.com> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 22:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen Cc: 50653@debbugs.gnu.org Received: via spool by 50653-submit@debbugs.gnu.org id=B50653.163278100032647 (code B ref 50653); Mon, 27 Sep 2021 22:17:01 +0000 Received: (at 50653) by debbugs.gnu.org; 27 Sep 2021 22:16:40 +0000 Received: from localhost ([127.0.0.1]:43042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUyvI-0008UO-8A for submit@debbugs.gnu.org; Mon, 27 Sep 2021 18:16:40 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:29203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUyvG-0008U9-CI for 50653@debbugs.gnu.org; Mon, 27 Sep 2021 18:16:31 -0400 Date: Mon, 27 Sep 2021 22:16:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1632780983; bh=W0dvzzR5Z3og1LNnT4XE+Ji7Jga3J05WB2bf38GcNqU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=DaJ3mfwyaRgy8aTZ2dePPDY4lYFQzlE50o53RcFhuX3lJ2EbTbgoD8zqcrydXAj7b 70PYfedwFCrVlC6RLgMdidJfA6VFOGgcsYInm+ILT+dVIJSkYATOXBy3woPGsoxXKO kHEeLb61eALay3YvmcE3MfGS+AsYCkaPH3Sj8PbM= Message-ID: MIME-Version: 1.0 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Xinglu, thank you for the review and comments. Here's the updated patch. If you or anyone committing the patch disagrees with the copyright sorting then be my guest and remove it. Otherwise IMHO the list should be sorted to maintain order :-) --8<---------------cut here---------------start------------->8--- * gnu/packages/games.scm (sdlpop): New variable. [copyright]: Sort by date pkill9@runbox.com. --- 2.32.0 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c39770c260..9a6e36ccc1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2019 Josh Holland +;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2017, 2019 Hartmut Goebel ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero ;;; Copyright © 2020 Naga Malleswari @@ -63,7 +64,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Noisytoot -;;; Copyright © 2019 Pkill -9 +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, build a shelter and try to get attention, so you get found.") (license license:cc-by4.0)))) +(define-public sdlpop + (package + (name "sdlpop") + (version "1.22") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NagyD/SDLPoP") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests provided + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'prepare-build + ;; Set correct environment for SDL. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl") + "/include/SDL2:" + (or (getenv "CPATH") ""))))) + (add-after 'unpack 'chdir + (lambda _ + (chdir "src"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (opt (string-append out "/opt/sdlpop")) + (app (string-append out "/usr/share/applications")) + (template "src/SDLPoP.desktop.template")) + (chdir "..") + (install-file "prince" bin) + (substitute* template (("\\$ROOT") out)) + (install-file template app) + (rename-file (string-append app "/SDLPoP.desktop.template") + (string-append app "/SDLPoP.desktop")) + (install-file "SDLPoP.ini" opt) + (copy-recursively "data" (string-append bin "/data")) + (copy-recursively "doc" opt) + (copy-recursively "mods" opt))))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer))))) + (synopsis "Open-source port of Prince of Persia") + (description "This package provides port of Prince of Persia, based on the +disassembly of the DOS version, extended with new features.") + (home-page "https://github.com/NagyD/SDLPoP") + (license license:gpl3+))) + (define-public fheroes2 (package (name "fheroes2")