From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIuu8-0001sV-29 for guix-patches@gnu.org; Tue, 23 Apr 2019 08:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIuu5-0000sE-6z for guix-patches@gnu.org; Tue, 23 Apr 2019 08:52:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIuu2-0000qx-LM for guix-patches@gnu.org; Tue, 23 Apr 2019 08:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hIuu2-0006Fw-Fb for guix-patches@gnu.org; Tue, 23 Apr 2019 08:52:02 -0400 Subject: [bug#35391] [PATCH] Add jumpnbump Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:53426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIutO-0000UP-Sh for guix-patches@gnu.org; Tue, 23 Apr 2019 08:51:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIue9-0007Xb-FJ for guix-patches@gnu.org; Tue, 23 Apr 2019 08:35:38 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:50673) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIue9-0007Uz-2w for guix-patches@gnu.org; Tue, 23 Apr 2019 08:35:37 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 5A26910000F for ; Tue, 23 Apr 2019 12:35:30 +0000 (UTC) From: Nicolas Goaziou Date: Tue, 23 Apr 2019 14:35:30 +0200 Message-ID: <87y340hpbh.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35391@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello, The following patches add sdl2-net and jumpnbump. Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-sdl2-net.patch Content-Description: Add sdl2-net >From b563954f9dcab8a802e06f4de5dfdef51686dc2e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Apr 2019 14:24:12 +0200 Subject: [PATCH 1/2] gnu: Add sdl2-net. * gnu/packages/sdl.scm (sdl2-net): New variable. --- gnu/packages/sdl.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index fffb06204f..53bfd09987 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -398,6 +398,22 @@ directory.") (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) +(define-public sdl2-net + (package (inherit sdl-net) + (name "sdl2-net") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri + (string-append "http://www.libsdl.org/projects/SDL_net/release/" + "SDL2_net-" version ".tar.gz")) + (sha256 + (base32 + "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm")))) + (propagated-inputs + (propagated-inputs-with-sdl2 sdl-net)))) + (define-public sdl2-ttf (package (inherit sdl-ttf) (name "sdl2-ttf") -- 2.21.0 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-jumpnbump.patch Content-Description: Add jumpnbump >From cdcb767c38ea75459736525917e552590a9359de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Apr 2019 14:25:52 +0200 Subject: [PATCH 2/2] gnu: Add jumpnbump. * gnu/packages/games.scm (jumpnbump): New variable. --- gnu/packages/games.scm | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index da917e2870..f260cbf471 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6998,3 +6998,47 @@ pursue their favorite interesting flight simulation idea, and last but certainly not least as a fun, realistic, and challenging desktop flight simulator.") (license license:gpl2+))) + +(define-public jumpnbump + (package + (name "jumpnbump") + (version "1.60") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/LibreGames/jumpnbump.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gwi58ck4magvdim8wmxdqnsi0fqdpvqia9kcc7q73nqf34jjz3v")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'fix-sdl-path + ;; XXX: For some reason, `sdl2-config' reports stand-alone SDL + ;; directory, not SDL-union provided as an input to the package. + ;; We force the latter with "--prefix=" option. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("sdl2-config" command) + (string-append command " --prefix=" (assoc-ref inputs "sdl")))) + #t))))) + (inputs + `(("bzip2" ,bzip2) + ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net))) + ("zlib" ,zlib))) + (native-inputs + `(("gettext" ,gettext-minimal))) ;for msgfmt + (home-page "https://gitlab.com/LibreGames/jumpnbump") + (synopsis "Cute multiplayer platform game with bunnies") + (description "You, as a bunny, have to jump on your opponents to make them +explode. It's a true multiplayer game; you can't play this alone. You can +play with up to four players simultaneously. It has network support.") + (license license:gpl2+))) -- 2.21.0 --=-=-=--