From patchwork Sun Dec 15 16:01:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 16528 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 64E96178E1; Sun, 15 Dec 2019 16:02:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 15136178D8 for ; Sun, 15 Dec 2019 16:02:11 +0000 (GMT) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igWLS-0005gw-K7 for patchwork@mira.cbaines.net; Sun, 15 Dec 2019 11:02:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33675) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igWLM-0005gZ-5s for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igWLK-00016G-Pw for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igWLK-00015M-Kz for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1igWLK-0004nf-Jb for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38623] [PATCH 1/3] gnu: Add sdl2-cs. References: <20191215155621.23849-1-mail@ambrevar.xyz> In-Reply-To: <20191215155621.23849-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2019 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38623@debbugs.gnu.org Received: via spool by 38623-submit@debbugs.gnu.org id=B38623.157642568918404 (code B ref 38623); Sun, 15 Dec 2019 16:02:02 +0000 Received: (at 38623) by debbugs.gnu.org; 15 Dec 2019 16:01:29 +0000 Received: from localhost ([127.0.0.1]:37062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1igWKk-0004md-2K for submit@debbugs.gnu.org; Sun, 15 Dec 2019 11:01:29 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:38065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1igWKh-0004mE-7M for 38623@debbugs.gnu.org; Sun, 15 Dec 2019 11:01:24 -0500 Received: from localhost.localdomain (lfbn-idf2-1-1340-76.w92-169.abo.wanadoo.fr [92.169.151.76]) (Authenticated sender: mail@ambrevar.xyz) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 6878810000C for <38623@debbugs.gnu.org>; Sun, 15 Dec 2019 16:01:21 +0000 (UTC) From: Pierre Neidhardt Date: Sun, 15 Dec 2019 17:01:18 +0100 Message-Id: <20191215160120.25948-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sdl.scm (sdl2-cs): New variable. --- gnu/packages/sdl.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 3974cc75ab..f7a34003d1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module ((guix licenses) #:hide (freetype)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -46,6 +48,7 @@ #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages mono) #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -570,3 +573,46 @@ sound and device input (keyboards, joysticks, mice, etc.).") The bindings are written in pure Scheme using Guile's foreign function interface.") (license lgpl3+))) + +(define-public sdl2-cs + (let ((commit "1a3556441e1394eb0b5d46aeb514b8d1090b93f8")) + (package + (name "sdl2-cs") + (version (git-version "B1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flibitijibibo/SDL2-CS") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "007mzkqr9nmvfrvvhs2r6cm36lzgsww24kwshsz9c4fd97f9qk58")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "release"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "bin/Release/SDL2-CS.dll" (string-append out "/lib")) + #t)))))) + (native-inputs + `(("mono" ,mono))) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer) + ("sdl2-ttf" ,sdl2-ttf))) + (home-page "https://dthompson.us/projects/guile-sdl2.html") + (synopsis "C# wrapper for SDL2") + (description + "SDL2-CS provides C# bindings for the SDL2 C shared library. +The C# wrapper was written to be used for FNA's platform support. However, this +is written in a way that can be used for any general C# application.") + (license zlib)))) From patchwork Sun Dec 15 16:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 16529 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 2E374178E1; Sun, 15 Dec 2019 16:02:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E5B6D178D8 for ; Sun, 15 Dec 2019 16:02:16 +0000 (GMT) Received: from localhost ([::1]:40812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igWLY-0005me-G0 for patchwork@mira.cbaines.net; Sun, 15 Dec 2019 11:02:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33765) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igWLO-0005hL-9y for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igWLK-00014H-Bv for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igWLK-00013T-72 for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1igWLK-0004nY-5h for guix-patches@gnu.org; Sun, 15 Dec 2019 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38623] [PATCH 2/3] gnu: Add mojoshader-cs. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2019 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38623@debbugs.gnu.org Received: via spool by 38623-submit@debbugs.gnu.org id=B38623.157642568618394 (code B ref 38623); Sun, 15 Dec 2019 16:02:02 +0000 Received: (at 38623) by debbugs.gnu.org; 15 Dec 2019 16:01:26 +0000 Received: from localhost ([127.0.0.1]:37060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1igWKj-0004mb-Rk for submit@debbugs.gnu.org; Sun, 15 Dec 2019 11:01:26 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:43323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1igWKh-0004mF-7L for 38623@debbugs.gnu.org; Sun, 15 Dec 2019 11:01:23 -0500 Received: from localhost.localdomain (lfbn-idf2-1-1340-76.w92-169.abo.wanadoo.fr [92.169.151.76]) (Authenticated sender: mail@ambrevar.xyz) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 986D910000D for <38623@debbugs.gnu.org>; Sun, 15 Dec 2019 16:01:21 +0000 (UTC) From: Pierre Neidhardt Date: Sun, 15 Dec 2019 17:01:19 +0100 Message-Id: <20191215160120.25948-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191215160120.25948-1-mail@ambrevar.xyz> References: <20191215160120.25948-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mojoshader-cs): New variable. --- gnu/packages/gl.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 63e12efe06..dc6b003c5d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages mono) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -889,3 +890,39 @@ the shaders at runtime.") (description "This is the last version of the mojoshader library with the glProgramViewportFlip before it was replaced with glProgramViewportInfo.") (license license:zlib)))) + +(define-public mojoshader-cs + (let ((commit "10d0dba21ff1cfe332eb7de328a2adce01286bd7")) + (package + (name "mojoshader-cs") + (version (git-version "20191205" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FNA-XNA/MojoShader") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11mdhf3fmb9rsn2iv753gmb596j4dh5j2iipgw078vg0lj23rml7")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "-C" "csharp"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "csharp/bin/MojoShader-CS.dll" (string-append out "/lib")) + #t)))))) + (native-inputs + `(("mono" ,mono))) + (home-page "https://github.com/FNA-XNA/MojoShader") + (synopsis "C# wrapper for MojoShader") + (description + "This is an hg->git mirror of MojoShader, with MojoShader# added for FNA.") + (license license:zlib))))