From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yOySIf5EUmFR0wAAgWs5BA (envelope-from ) for ; Tue, 28 Sep 2021 00:26:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iLAdHf5EUmGNSgAAbx9fmQ (envelope-from ) for ; Mon, 27 Sep 2021 22:26:06 +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 CE098EF65 for ; Tue, 28 Sep 2021 00:26:05 +0200 (CEST) Received: from localhost ([::1]:36420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUz4X-0006Cw-1q for larch@yhetil.org; Mon, 27 Sep 2021 18:26:05 -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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches From: phodina via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632781565; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=W0dvzzR5Z3og1LNnT4XE+Ji7Jga3J05WB2bf38GcNqU=; b=qFvPQM5WGe9r2npAssVJHPi2MLWv3zlItGcbcFgYFZsBhA724FOd7Y0h0z6EPf8HM+XiQM tj2BdAForotQW4dtuFVv+RhvBCJZ91/1P3Z4hjGcqPhqbweKwFwW2vwabWQI9TZJTkuKna Apry3ncVWOybE5N55EQ6OzRWkg31YNaFN/zgb7bX4Zwp8CrNt4hxvEvMCasn937i6E2NBR UrD7eeP/z04B6bQ4OPvWpzEa+eUzSseLTrFnXDUhcJ4xlyZHVVQ26WX5+dYOHs38aA2eXd hOmbEJB43ve9JPwphhqm1e+sVoJb1hwCAGwxoELfznoIKPXAvlAovwqdbTq0LA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632781565; a=rsa-sha256; cv=none; b=YGdYv83Wol9tmMeTJkgOe0m+grsIKEyIeALz5AKOcpSRslSsZng1m4tN1kQA6U4SKTH1x9 Fr16NQRysfFjSlUMADzZyswnhk5eeFpKL9dlQqYo3Xnqxl0dq2InlbnrWFGKA0ntoxhe/C h1mn7fukjBSlLkkcK6rL/vEq2Yz1Ak/ZGO3H9qSIYe3N1RiRgT0sK9VX2tvibgSr0qDll5 BJ44Pi7mxLupfTq8/BG+YqiZqHvwIbcOx6kWaP+jrBdtZqtW74iwr6dy8yMe5B/VsYc87+ B5NxQV0B3JiWAxZtdvg6FUFEss69ee6w9KF+MvNfqMkVkClnbdd44so/kNRLew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=DaJ3mfwy; dmarc=pass (policy=none) header.from=gnu.org; 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: -2.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=DaJ3mfwy; dmarc=pass (policy=none) header.from=gnu.org; 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: CE098EF65 X-Spam-Score: -2.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: LEDBTKSmu2ls 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. 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 =C2=A9 2019, 2020 Guillaume Le Vaillant ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar ;;; Copyright =C2=A9 2019 Josh Holland +;;; Copyright =C2=A9 2019 Pkill -9 ;;; Copyright =C2=A9 2017, 2019 Hartmut Goebel ;;; Copyright =C2=A9 2020 Alberto Eleuterio Flores Guerrero ;;; Copyright =C2=A9 2020 Naga Malleswari @@ -63,7 +64,7 @@ ;;; Copyright =C2=A9 2021 Felix Gruber ;;; Copyright =C2=A9 2021 Solene Rapenne ;;; Copyright =C2=A9 2021 Noisytoot -;;; Copyright =C2=A9 2019 Pkill -9 +;;; Copyright =C2=A9 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -12480,6 +12481,62 @@ do so you need to explore the island, find food, b= uild 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") -- 2.32.0