From patchwork Thu Oct 13 14:59:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: florhizome X-Patchwork-Id: 43380 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 2E81127BBED; Thu, 13 Oct 2022 18:48:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6288127BBE9 for ; Thu, 13 Oct 2022 18:48:35 +0100 (BST) Received: from localhost ([::1]:33160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oj2Jt-0001PT-AQ for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 13:48:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oj2JP-0001Nz-26 for guix-patches@gnu.org; Thu, 13 Oct 2022 13:48:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oj2JO-000245-4N for guix-patches@gnu.org; Thu, 13 Oct 2022 13:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oj2JN-0000MV-RF for guix-patches@gnu.org; Thu, 13 Oct 2022 13:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58499] [PATCH] gnu: add citra (stable version) Resent-From: florhizome@posteo.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 17:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58499 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58499@debbugs.gnu.org Cc: florhizome X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16656832231182 (code B ref -1); Thu, 13 Oct 2022 17:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Oct 2022 17:47:03 +0000 Received: from localhost ([127.0.0.1]:34868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oj2IN-0000IV-U0 for submit@debbugs.gnu.org; Thu, 13 Oct 2022 13:47:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:55540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oizgr-000227-Jy for submit@debbugs.gnu.org; Thu, 13 Oct 2022 11:00:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oizgq-0001Ix-MG for guix-patches@gnu.org; Thu, 13 Oct 2022 11:00:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oizgl-00078p-3D for guix-patches@gnu.org; Thu, 13 Oct 2022 11:00:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 39391240027 for ; Thu, 13 Oct 2022 16:59:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1665673195; bh=cEgerNa4OdU5XS16weJlQAz/o1OGxoAYu73F1ir2F5g=; h=From:To:Cc:Subject:Date:From; b=DPIZ61xA83AjEWog+TKjWLn82dMSAzl21Yu/Iem6IwmHuNqTDzuPhkbTC8/qbGcyK wo24oGDmOoM6TMgjCe0uyLHrbWkfbP2oyYSesaauOcHrc/A9PdInMBA8C6PaAeRxHc dIcLrmiEzFE5jNCThvjm1cp+nHo3iePH6UQ0PdqIPVLM7bxTCcJ0Iy/w+1jxPNoczz Jh6xfb+z1B6JPqyiKO3DHsAth5oLlhh2IvOFggc+gQjzpuO2VsnfKr0yQUb9q1vke2 gybOupMY++WuU5K+YP10jmOVPTDsU7ygaxVJ3d8glN1rdRZzbU2eWS03VkOiDFX3Y9 wOUJl0UJrf0WQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MpCNn4d1dz9rxV; Thu, 13 Oct 2022 16:59:53 +0200 (CEST) From: florhizome@posteo.net Date: Thu, 13 Oct 2022 14:59:47 +0000 Message-Id: MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=florhizome@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 13 Oct 2022 13:46:57 -0400 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" X-getmail-retrieved-from-mailbox: Patches From: florhizome This adds the citra emulator for nintendo 3ds games - the nightly repo marks the stable version. NixOs does some things for compatibility checks that we don't but it works fine so far. :) --- gnu/packages/emulators.scm | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) base-commit: 86ec52f66735b122b9035eba56516fd16f3be958 prerequisite-patch-id: 253e1cc8278ab9981294f4e483c7b29a466672d9 diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 38795b703c..3121a71484 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -61,6 +61,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) + #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) @@ -74,6 +75,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libedit) @@ -105,6 +107,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages xorg) #:use-module (gnu packages web) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -245,9 +248,66 @@ (define-public desmume "DeSmuME is an emulator for the Nintendo DS handheld gaming console.") (license license:gpl2))) +(define-public citra + (package + (name "citra") + (version "1785") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/citra-emu/citra-nightly") + (commit + (string-append "nightly-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1grkrrxs1497i51spgnwmgfkqgkm7gplylhcrk67agaklx65d5s9")))) + (build-system qt-build-system) + (arguments + (list + #:configure-flags + #~(list "-DUSE_SYSTEM_BOOST=ON" + "-DCITRA_USE_BUNDLED_FFMPEG=OFF" + "-DCITRA_USE_BUNDLED_QT=OFF" + "-DCITRA_USE_BUNDLED_SDL2=OFF" + "-DCMAKE_BUILD_TYPE=Release" + "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=OFF" + "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" + "-DENABLE_QT_TRANSLATION=ON" + "-DENABLE_WEB_SERVICE=ON" + "-DENABLE_FFMPEG_AUDIO_DECODER=ON" + "-DUSE_DISCORD_PRESENCE=ON") + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'delete-check + (lambda _ + (substitute* "CMakeLists.txt" + (("check_submodules_present\\(\\)")""))))))) + (native-inputs + (list pkg-config doxygen)) + (inputs + (list qtbase-5 qtmultimedia-5 qttools-5 + qtwayland libpng libxkbcommon + openssl + ffmpeg pulseaudio curl rapidjson + sdl2 libusb boost)) + ;;gstreamer-plugins-bad needed for camera support + (propagated-inputs (list gst-plugins-bad xdg-utils shared-mime-info)) + (home-page "https://citra-emu.org") + (synopsis "Nintendo 3DS Emulator") + (description "Citra is an experimental open-source Nintendo 3DS + emulator/debugger written in C++. It is written with portability in + mind, with builds actively maintained for Windows, Linux and macOS. + The \"nightly\" version marks the stable release.") + (license license:gpl3+))) + ;; Building from recent Git because the official 5.0 release no longer builds. ;; Following commits and revision numbers of beta versions listed at ;; https://dolphin-emu.org/download/. + (define-public dolphin-emu (let ((commit "a34823df61df65168aa40ef5e82e44defd4a0138") (revision "13178"))