From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4L0gD7kUTWPwQwEAbAwnHQ (envelope-from ) for ; Mon, 17 Oct 2022 10:39:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eC0tD7kUTWNwGgEA9RJhRA (envelope-from ) for ; Mon, 17 Oct 2022 10:39:21 +0200 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 C6C01C54B for ; Mon, 17 Oct 2022 10:39:20 +0200 (CEST) Received: from localhost ([::1]:42996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okLea-0007SM-15 for larch@yhetil.org; Mon, 17 Oct 2022 04:39:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okLeJ-0007Qs-KS for guix-patches@gnu.org; Mon, 17 Oct 2022 04:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okLeI-0003bM-EV for guix-patches@gnu.org; Mon, 17 Oct 2022 04:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okLeI-0004TW-7h for guix-patches@gnu.org; Mon, 17 Oct 2022 04:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58499] [PATCH] gnu: add citra (stable version) Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 08:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58499 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: florhizome@posteo.net, 58499@debbugs.gnu.org Received: via spool by 58499-submit@debbugs.gnu.org id=B58499.166599588417126 (code B ref 58499); Mon, 17 Oct 2022 08:39:02 +0000 Received: (at 58499) by debbugs.gnu.org; 17 Oct 2022 08:38:04 +0000 Received: from localhost ([127.0.0.1]:47225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okLdM-0004S9-Cy for submit@debbugs.gnu.org; Mon, 17 Oct 2022 04:38:04 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:46635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okLdJ-0004RH-LA for 58499@debbugs.gnu.org; Mon, 17 Oct 2022 04:38:02 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4MrVkC0tbJz1LZ3J; Mon, 17 Oct 2022 10:37:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4MrVkC0tbJz1LZ3J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1665995876; bh=UBHhiio6JBb9Gg/UbEFYZlKoswR2UTPN5p9PjQfX5dM=; h=Subject:From:To:Date:In-Reply-To:References:From; b=DSE8JQQMwDrFM+FwXsHPCgcACib9a/PNJHael0sXsY5d/mWnv4tlEzAL3nywzjFNV vQGlDPUL9/A4Nn6s7XDgq7c5I6qgam0NS8g6mnWs+q13jUBgnig7SAw1FMIHGjL/Ju lZhtVZ13vKf7pQFjrUfYAk6e93DCWWS4Z39OcFKc= Message-ID: <697c4dd0589e00f9be2ec09fd7f798326efb0c4f.camel@ist.tugraz.at> From: Liliana Marie Prikler Date: Mon, 17 Oct 2022 10:37:54 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665995961; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=UBHhiio6JBb9Gg/UbEFYZlKoswR2UTPN5p9PjQfX5dM=; b=uRRT13Uu22YTOkGc7ZRjdrxHSyygo3TIz0PTYWsqYwXsq3cEBexG5fADioZRY1RKIqrMZC Ld3v2SneN6hFMlkQtnh6jnYYipGCOziyrN6a1pIiDbl/mnpOJMGMDeVNUPGk6MkS+9QyR+ cmUUaEwCDewpLfUpJ//PXTAwWv9C0jqi57nOK8m1q1pliOKsXgrQ6ckF11ceDjBY0u5Hpt 9Ql+gOx/3BXEhjmzWZLCn/bJX9YZwyOMYhI2MMhBptm2x2TjRJZLvEEnUaNELe+AFdfWDP vLzrl1vMc0IYRR1P+yD7r1C5U1IRl2KDDRMqv2LSQusEiRk4J03tOCJuE4VZ1w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665995961; a=rsa-sha256; cv=none; b=DWuPjoy8MHzA4eix6cRsx/CZWpBSC5TnErZOk+cyP05URsNh4tNo61ihFhc50JVAAtNHmE 2wOnVQVwM6z6AcNUL/k7ajpBTbqV/sx6lnAmByOK+eKuFAqdVR5jdNvZfhsG/YfW2adKVh oVBGhZbtlNNCFB0NB25+SV9jFvsvjTQ11VKsV3ohGsC/svIzxuT8cJfVJgM2QrO1sFeEQm eaQtOjfXm+LwgQY8bgXADULRoubawc6Qj4V4vuSASs4YHzY9pYJOOm/IC3G7Qq05yr5oXz ZXRj/6VdXV4hD/iNnv73G9vwRsyXS45KtbRX/Ka773AoPzILTzEBW0BdVihjVg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=DSE8JQQM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.88 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=DSE8JQQM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C6C01C54B X-Spam-Score: 5.88 X-Migadu-Scanner: scn1.migadu.com X-TUID: ke6rpn45Gkak Am Donnerstag, dem 13.10.2022 um 14:59 +0000 schrieb florhizome@posteo.net: > From: florhizome >=20 > 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. :) Missing ChangeLog. Title should be: "gnu: Add citra." > --- Notes not meant for the commit log go below this line. > =C2=A0gnu/packages/emulators.scm | 60 > ++++++++++++++++++++++++++++++++++++++ > =C2=A01 file changed, 60 insertions(+) >=20 > 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) > =C2=A0=C2=A0 #:use-module (gnu packages cross-base) > =C2=A0=C2=A0 #:use-module (gnu packages curl) > =C2=A0=C2=A0 #:use-module (gnu packages digest) > +=C2=A0 #:use-module (gnu packages documentation) > =C2=A0=C2=A0 #:use-module (gnu packages elf) > =C2=A0=C2=A0 #:use-module (gnu packages flex) > =C2=A0=C2=A0 #:use-module (gnu packages fltk) > @@ -74,6 +75,7 @@ (define-module (gnu packages emulators) > =C2=A0=C2=A0 #:use-module (gnu packages gl) > =C2=A0=C2=A0 #:use-module (gnu packages glib) > =C2=A0=C2=A0 #:use-module (gnu packages gnome) > +=C2=A0 #:use-module (gnu packages gstreamer) > =C2=A0=C2=A0 #:use-module (gnu packages gtk) > =C2=A0=C2=A0 #:use-module (gnu packages image) > =C2=A0=C2=A0 #:use-module (gnu packages libedit) > @@ -105,6 +107,7 @@ (define-module (gnu packages emulators) > =C2=A0=C2=A0 #:use-module (gnu packages xorg) > =C2=A0=C2=A0 #:use-module (gnu packages web) > =C2=A0=C2=A0 #:use-module (guix build-system cmake) > +=C2=A0 #:use-module (guix build-system qt) > =C2=A0=C2=A0 #:use-module (guix build-system glib-or-gtk) > =C2=A0=C2=A0 #:use-module (guix build-system gnu) > =C2=A0=C2=A0 #:use-module (guix build-system meson) > @@ -245,9 +248,66 @@ (define-public desmume > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "DeSmuME is an emulator for the Nintendo D= S handheld gaming > console.") > =C2=A0=C2=A0=C2=A0=C2=A0 (license license:gpl2))) > =C2=A0 > +(define-public citra > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (name "citra") > +=C2=A0=C2=A0=C2=A0 (version "1785") I'd prefer a let-bound revision/commit pair, since this is very much experimental software. Citra seems to be using a build version base of "0" [cf. 1], so we can do the same. =20 > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0 (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (git-reference > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (url "https://github.com/citra-emu/citra-nightly") Even if using nightly revisions, I think we might want to prefer the main repository. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (commit > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (string-append "nightly-" version)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (recursive? #t))) Recursive checkouts are discouraged. Wherefore do you need one? > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (file-name (git-file-name name vers= ion)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "1grkrrxs1497i51spgnwmg= fkqgkm7gplylhcrk67agaklx65d5s9")))) > +=C2=A0=C2=A0=C2=A0 (build-system qt-build-system) > +=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:configure-flags > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(list "-DUSE_SYSTEM_BOOST=3DON" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DCITRA_USE_BUNDLED_FFMPEG=3DOFF" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DCITRA_USE_BUNDLED_QT=3DOFF" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DCITRA_USE_BUNDLED_SDL2=3DOFF" Don't forget to actually unbundle all of the above. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DCMAKE_BUILD_TYPE=3DRelease" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=3DOFF" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=3DOFF" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DENABLE_QT_TRANSLATION=3DON" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DENABLE_WEB_SERVICE=3DON" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DENABLE_FFMPEG_AUDIO_DECODER=3DON" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DUSE_DISCORD_PRESENCE=3DON") Don't enable features for the profit of proprietary software. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:tests? #f Why? > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(modify-phases %standard-phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (add-before= 'configure 'delete-check > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (lambda _ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (substitute* "CMakeLists.txt" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (("check_submodules_present\\(\\)")""))))))) > +=C2=A0=C2=A0=C2=A0 (native-inputs > +=C2=A0=C2=A0=C2=A0=C2=A0 (list pkg-config doxygen)) > +=C2=A0=C2=A0=C2=A0 (inputs > +=C2=A0=C2=A0=C2=A0=C2=A0 (list qtbase-5 qtmultimedia-5 qttools-5 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 qtwayland l= ibpng libxkbcommon > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 openssl > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ffmpeg puls= eaudio curl rapidjson > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sdl2 libusb= boost)) > +=C2=A0=C2=A0=C2=A0 ;;gstreamer-plugins-bad needed for camera support > +=C2=A0=C2=A0=C2=A0 (propagated-inputs (list gst-plugins-bad xdg-utils sh= ared-mime- > info)) For the gst-plugins, check if you can isolate a minimum set of them.=20 Also, use wrappers rather than propagation. > +=C2=A0=C2=A0=C2=A0 (home-page "https://citra-emu.org") > +=C2=A0=C2=A0=C2=A0 (synopsis "Nintendo 3DS Emulator") > +=C2=A0=C2=A0=C2=A0 (description "Citra is an experimental open-source Ni= ntendo 3DS > + emulator/debugger written in C++.=C2=A0 It is written with portability > in > + mind, with builds actively maintained for Windows, Linux and macOS. > + The \"nightly\" version marks the stable release.") "Citra is an experimental emulator/debugger for the Nintendo 3DS written in C++. It emulates a subset of the Nintendo 3DS' hardware." > +=C2=A0=C2=A0=C2=A0 (license license:gpl3+))) Should be gpl2+. Cheers [1] https://github.com/citra-emu/citra/blob/47c4f31c8db86b043a1802a65f1df08aeec= 8e772/CMakeModules/GenerateSCMRev.cmake#L22