From unknown Wed Jun 18 23:09:40 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#41778 <41778@debbugs.gnu.org> To: bug#41778 <41778@debbugs.gnu.org> Subject: Status: [PATCH WIP 0/2] Add ppsspp Reply-To: bug#41778 <41778@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:09:40 +0000 retitle 41778 [PATCH WIP 0/2] Add ppsspp reassign 41778 guix-patches submitter 41778 Leo Prikler severity 41778 normal tag 41778 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 09 17:41:15 2020 Received: (at submit) by debbugs.gnu.org; 9 Jun 2020 21:41:15 +0000 Received: from localhost ([127.0.0.1]:32849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jilze-0004ff-Vv for submit@debbugs.gnu.org; Tue, 09 Jun 2020 17:41:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:43010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jilzd-0004fX-VZ for submit@debbugs.gnu.org; Tue, 09 Jun 2020 17:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jilzd-0006dd-N6 for guix-patches@gnu.org; Tue, 09 Jun 2020 17:41:13 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jilzR-0002N3-Ly for guix-patches@gnu.org; Tue, 09 Jun 2020 17:41:12 -0400 Received: from nijino.local (212-88-11-71.hdsl.highway.telekom.at [212.88.11.71]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49hNpV5yT6z1LLyX for ; Tue, 9 Jun 2020 23:40:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49hNpV5yT6z1LLyX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1591738850; bh=hH/XXgNcNqJiKaJNtsiaZtopFMA89+mwxKXckb/ItrM=; h=Subject:From:To:Date:From; b=a/wJ1Z/eqOtOsK/7yKCRjoKZ+84Zva0wdqdrl01fVtAsCU1NmwCdjpwZ/9c0mGBat tXr9skm3xsWvQt+QR5A2e9cunAJ4yDR3ck0eb/EHQl5MPsG9PcitorjFKnMl8qjDEa b/pzi/DL5Lo2MXDBJreiEYMTfiwtX0jTqPExtEog= Message-ID: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> Subject: [PATCH WIP 0/2] Add ppsspp From: Leo Prikler To: guix-patches@gnu.org Date: Tue, 09 Jun 2020 23:40:47 +0200 Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/09 17:40:52 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_DKIM_INVALID=0.01, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, Guix I've been wanting to play some old PSP games, so I tried packaging ppsspp. The build works for me so far, but it's not very clean -- I'd especially appreciate it if someone could help me remove all those gratuitous sources from ext. The package description mentions spirv-cross, which I still have in my local checkout after applying an early version of 40495. That patch has been lying around since early April and is IIUC not applied since it was bundled together with taisei, whose description raised some debate about formalities. If needed, I can split that patch and resend it, but credit should still go to Vitaliy. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 09 17:47:36 2020 Received: (at 41778) by debbugs.gnu.org; 9 Jun 2020 21:47:36 +0000 Received: from localhost ([127.0.0.1]:32855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jim5n-0004pG-Le for submit@debbugs.gnu.org; Tue, 09 Jun 2020 17:47:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jim5m-0004p6-DM for 41778@debbugs.gnu.org; Tue, 09 Jun 2020 17:47:34 -0400 Received: from localhost.localdomain (212-88-11-71.hdsl.highway.telekom.at [212.88.11.71]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49hNyB5brjz1LBN0 for <41778@debbugs.gnu.org>; Tue, 9 Jun 2020 23:47:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49hNyB5brjz1LBN0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1591739250; bh=bq6D5egvIIffx/uvZShBOCDv/cCerW/11x01vZNYu2o=; h=From:To:Subject:Date:From; b=dJPwaLeaqv1dTQ7tO2dXaMr8Vd2A9tHMjAjZFKA2K8M66Ki5L3KJs/s3kCtAqfszV gakXhzhTqB8+BUf3W8WCCzM/rMLRrN5zCrhghPZfxQEhM1HXJj4NqfwBXSn3+nWkxW yn0/GPZ6YqxNhgBDXo717xZ90IcIx3V4/e+Zsbmg= From: Leo Prikler To: 41778@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Add armips. Date: Tue, 9 Jun 2020 23:47:19 +0200 Message-Id: <20200609214720.19041-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/assembly.scm (armips): New variable. --- gnu/packages/assembly.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c9582bc596..5567208d27 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -371,3 +371,37 @@ It understands mnemonics and generates code for NMOS 6502s (such as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") (license license:gpl2))) + +(define-public armips + (package + (name "armips") + (version "0.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kingcom/armips.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (invoke "./armipstests" "../source/Tests"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "armips" (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (home-page "https://github.com/Kingcom/armips") + (synopsis "Assembler for various ARM and MIPS platforms") + (description + "armips is an assembler with full support for the MIPS R3000, MIPS R4000, +Allegrex and RSP instruction sets, partial support for the EmotionEngine +instruction set, as well as complete support for the ARM7 and ARM9 instruction +sets, both THUMB and ARM mode.") + (license license:expat))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 09 17:47:37 2020 Received: (at 41778) by debbugs.gnu.org; 9 Jun 2020 21:47:37 +0000 Received: from localhost ([127.0.0.1]:32858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jim5p-0004pT-0s for submit@debbugs.gnu.org; Tue, 09 Jun 2020 17:47:37 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jim5n-0004pE-Ec for 41778@debbugs.gnu.org; Tue, 09 Jun 2020 17:47:36 -0400 Received: from localhost.localdomain (212-88-11-71.hdsl.highway.telekom.at [212.88.11.71]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49hNyD5wXMz1DTk9 for <41778@debbugs.gnu.org>; Tue, 9 Jun 2020 23:47:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49hNyD5wXMz1DTk9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1591739252; bh=/XRKo60TMqdXCBvZQj+OBPhzxu/LgO0JDyTG+TLCQdQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=uezR94lYhNt67H2N2NcIZsFLbaY8/1Z3HoIj4iqboiBoHaA3PGj6bP9ucQU757Stj sYh3hkcXCPX8yDsM+aczOwiac1TIZtvEGujnsyHzTHJorOZKj8gbajcV5V8HTO518u FUAPWzOESU7QncaU81WNT8wg0nd9eQntvPmD4zLA= From: Leo Prikler To: 41778@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Add ppsspp. Date: Tue, 9 Jun 2020 23:47:20 +0200 Message-Id: <20200609214720.19041-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200609214720.19041-1-leo.prikler@student.tugraz.at> References: <20200609214720.19041-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/emulators.scm (ppsspp): New variable. --- gnu/packages/emulators.scm | 115 +++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9798ac370e..2e11807325 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1622,3 +1622,118 @@ derived from Gens. Project goals include clean source code, combined features from various forks of Gens, and improved platform portability.") (supported-systems '("i686-linux" "x86_64-linux")) (license license:gpl2+))) + +(define-public ppsspp + (package + (name "ppsspp") + (version "1.9.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0cbxrm7i4xymlglb2aqyiiys3wm6zvnrn5n0cw4fcxdvh196ivwm")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python))) + (inputs + `(;; TODO: find a way to add FFMPEG + ;; ("ffmpeg" ,ffmpeg) + ;; TODO: unbundle builds + ("armips-source" ,(package-source armips)) + ("glslang-source" ,(package-source glslang)) + ("spirv-cross-source" ,(package-source spirv-cross)) + + ("lang" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp-lang.git") + (commit "3a5eb3fcb4852cb28c9138e78492effa0c227253"))) + (sha256 + (base32 + "0cnv9g5l75dmdb0hq7xxbxl06z18p1621j41bggfqj1015kvq7jk")))) + ("tests" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/pspautotests.git") + (commit "2970fbcc23c258ebc03bba922926003fe37555e5"))) + (sha256 + (base32 + "1c3lkjhknwmiyikrfjrghfxnkd2jp698c28s4kwv6qjwdj2nwc1i")))) + + ("glew" ,glew) + ("libpng" ,libpng) + ("mesa" ,mesa) + ("sdl2" ,sdl2) + ("snappy" ,snappy) + ("zlib" ,zlib))) + (arguments + `(#:out-of-source? #f + #:configure-flags (list "-DUSE_FFMPEG=OFF" ; see TODO above + "-DUSE_DISCORD=OFF" + ;; for testing + "-DUNITTEST=ON" "-DHEADLESS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-external-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; TODO: unbundle builds + ;; not only should we not copy these sources in, + ;; we should also remove as much from ext/ as we can + (copy-recursively (assoc-ref inputs "armips-source") + "ext/armips") + (copy-recursively (assoc-ref inputs "glslang-source") + "ext/glslang") + (copy-recursively (assoc-ref inputs "spirv-cross-source") + "ext/SPIRV-Cross") + ;; some tests are externalised, so we add them here + (copy-recursively (assoc-ref inputs "tests") + "pspautotests") + ;; i18n is externalised, so we add it here + (copy-recursively (assoc-ref inputs "lang") + "assets/lang") + #t)) + (replace 'check + (lambda _ + (for-each + (lambda (t) (invoke "./unitTest" t)) + '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin" + "SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit" + "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap")) + (invoke "python3" "test.py" "-g") + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin/ppsspp (string-append out "/bin/ppsspp")) + (share (string-append out "/share/ppsspp"))) + (copy-recursively "icons/hicolor" + (string-append out "/share/icons/hicolor")) + (install-file "PPSSPPSDL" share) + (copy-recursively "assets" (string-append share "/assets")) + + (make-desktop-entry-file + (string-append out "/share/applications/ppsspp.desktop") + #:name "PPSSPP" + #:exec (string-append share "/PPSSPPSDL") + #:icon "ppsspp") + + (mkdir-p (string-append out "/bin")) + (with-output-to-file bin/ppsspp + (lambda () + (format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\"" + (which "sh") share))) + (chmod bin/ppsspp #o755) + + #t)))))) + (home-page "https://www.ppsspp.org/") + (synopsis "PSP emulator") + (description + "PPSSPP is a \"high-level\" emulator simulating the PSP operating system.") + (license license:gpl2+))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 06:02:37 2020 Received: (at submit) by debbugs.gnu.org; 29 Jun 2020 10:02:37 +0000 Received: from localhost ([127.0.0.1]:48009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqcX-0000xq-5w for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:02:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:34268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqcV-0000xg-6r for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:02:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpqcU-0008Gw-Ve for guix-patches@gnu.org; Mon, 29 Jun 2020 06:02:34 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:41553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpqcR-0004by-66 for guix-patches@gnu.org; Mon, 29 Jun 2020 06:02:34 -0400 Received: from nijino.local (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wNMH4JZ9z1LZXc for ; Mon, 29 Jun 2020 12:02:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wNMH4JZ9z1LZXc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593424939; bh=dnnLbgJGwJSnUSfndbQ77LP8AndRo7/tZ1Z0ErYtgSU=; h=Subject:From:To:Date:In-Reply-To:References:From; b=iJEUWgylAQss8KFFMbYhwLfFCD9OSUL4eAXHdoPzzxiubxz3eR+Pdg9AkHkCHXpAp OwI5h2w/QQ4rRsWH0Pkn6jb+9RO0eyHL9QYSDQk3M7AkFWOA6q5SspDY0K6LndEu7x 6etEEv3QZlnEu7k3JR78FJBuTkoNIjlnW0I70J6I= Message-ID: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> Subject: Re: [PATCH 0/3] Add ppsspp From: Leo Prikler To: guix-patches@gnu.org Date: Mon, 29 Jun 2020 12:02:18 +0200 In-Reply-To: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/29 06:02:21 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Following the release of version 1.10, I've updated my package descriptions. I've also been able to unbundle some sources, but not all of them. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 06:07:23 2020 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 10:07:23 +0000 Received: from localhost ([127.0.0.1]:48017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqh9-00016H-6R for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:23 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqh7-000165-6L for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:21 -0400 Received: from localhost.localdomain (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wNT23WcGz1LWp5 for <41778@debbugs.gnu.org>; Mon, 29 Jun 2020 12:07:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wNT23WcGz1LWp5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593425238; bh=bq6D5egvIIffx/uvZShBOCDv/cCerW/11x01vZNYu2o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rFatMA5VDrZqaT9EyIa3vYu/Jv/qD2DiynYI/yhnrjwlF0WJWeFKLk1ARMf99zdVf JeEBu1MXpPKLo1mcDGjcMupEYL17ifKIBPPZ/bZI4GaubCE4wBVHYrGnejPXLt7Z76 FURckGRR7dJWAqPIDt1xqNrLjywfN2EaVSKRQo4I= From: Leo Prikler To: 41778@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add armips. Date: Mon, 29 Jun 2020 12:06:48 +0200 Message-Id: <20200629100649.26638-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 In-Reply-To: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> References: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/assembly.scm (armips): New variable. --- gnu/packages/assembly.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c9582bc596..5567208d27 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -371,3 +371,37 @@ It understands mnemonics and generates code for NMOS 6502s (such as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") (license license:gpl2))) + +(define-public armips + (package + (name "armips") + (version "0.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kingcom/armips.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (invoke "./armipstests" "../source/Tests"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "armips" (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (home-page "https://github.com/Kingcom/armips") + (synopsis "Assembler for various ARM and MIPS platforms") + (description + "armips is an assembler with full support for the MIPS R3000, MIPS R4000, +Allegrex and RSP instruction sets, partial support for the EmotionEngine +instruction set, as well as complete support for the ARM7 and ARM9 instruction +sets, both THUMB and ARM mode.") + (license license:expat))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 06:07:29 2020 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 10:07:29 +0000 Received: from localhost ([127.0.0.1]:48021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqhF-00016a-H3 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:29 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:32386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqh9-00016E-38 for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:23 -0400 Received: from localhost.localdomain (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wNT446xJz1LWpc for <41778@debbugs.gnu.org>; Mon, 29 Jun 2020 12:07:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wNT446xJz1LWpc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593425240; bh=uSrQTOKH6j51Q2vwnk0BnjNXKl1BYsKlLapNC9wDoxQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QEFjk12cZ2bwwgG7StVxcA3M9cD5I6DYeRF4VsxcOgYVF0zl3u8ZFDw6FPr6EscdP GLyFWuNzrRD0fuEdcyZO4dfJCSSs63xtPk3li/7zux7WtLGMW3L9wqR7YCkaYSluXX 938CIr0KLaFGtgGTlRs2ZExwSac0J1WNb1eynai8= From: Leo Prikler To: 41778@debbugs.gnu.org Subject: [PATCH 2/3] gnu: add spirv-cross. Date: Mon, 29 Jun 2020 12:06:49 +0200 Message-Id: <20200629100649.26638-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 In-Reply-To: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> References: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/vulkan.scm (spirv-cross): New variable. --- gnu/packages/vulkan.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index d5f5be6816..6468b0ec3d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -102,6 +102,55 @@ SPIR-V modules. The project includes an assembler, binary module parser,disassembler, validator, and optimizer for SPIR-V.") (license license:asl2.0))) +(define-public spirv-cross + (package + (name "spirv-cross") + (version "2020-05-19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Cross") + (commit version))) + (sha256 + (base32 + "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(;; FIXME: The following tests fail: + ;; 15 - spirv-cross-test-opt + ;; 16 - spirv-cross-test-metal-opt + ;; 17 - spirv-cross-test-hlsl-opt + #:tests? #f + #:configure-flags + (list "-DSPIRV_CROSS_SHARED=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests-to-find-deps + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/glslang(.*)/bin") + (string-append (assoc-ref inputs "glslang") "/bin"))) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") + (string-append (assoc-ref inputs "spirv-tools") "/bin"))) + #t))))) + (inputs `(("glslang" ,glslang) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) + (native-inputs `(("python" ,python))) + (home-page "https://github.com/KhronosGroup/SPIRV-Cross") + (synopsis "Parser for and converter of SPIR-V to other shader languages") + (description + "SPIRV-Cross tries hard to emit readable and clean output from the +SPIR-V. The goal is to emit GLSL or MSL that looks like it was written by a +human and not awkward IR/assembly-like code. NOTE: Individual features are +expected to be mostly complete, but it is possible that certain obscure GLSL +features are not yet supported. However, most missing features are expected +to be \"trivial\" improvements at this stage.") + (license license:asl2.0))) + (define-public glslang (package (name "glslang") -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 06:07:37 2020 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 10:07:37 +0000 Received: from localhost ([127.0.0.1]:48023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqhJ-00016u-Pf for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:37 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:48880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqhD-00016Z-FY for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:31 -0400 Received: from localhost.localdomain (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wNT655NWz1LWp5 for <41778@debbugs.gnu.org>; Mon, 29 Jun 2020 12:07:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wNT655NWz1LWp5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593425242; bh=ujgqPZ4TP8T26e7PgqlawtugwFg8wqOAWZw0cOt40fs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ptrmDZZHVjBnQMZJ1f8ftONaDNqylrY0Ij7a4S/Gtn5eqONa80PAhYVDwW4cOzZ+K +A5fMxeGo71/WdGwtW6J+eJoOQ7zAqpSTVKz+mqPPnRTWYhQpgcyscRKFegU6Dm5xN SW/W07QcQXoEr1k6s0yRaMJp3W/2kPrSJhL/y5No= From: Leo Prikler To: 41778@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Add ppsspp. Date: Mon, 29 Jun 2020 12:06:50 +0200 Message-Id: <20200629100649.26638-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 In-Reply-To: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> References: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/emulators.scm (ppsspp): New variable. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/emulators.scm | 137 +++++++ .../ppsspp-disable-upgrade-and-gold.patch | 358 ++++++++++++++++++ 3 files changed, 496 insertions(+) create mode 100644 gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch diff --git a/gnu/local.mk b/gnu/local.mk index a1f32a10bf..9738edfa89 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1350,6 +1350,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ + %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5525b066f4..c3c6d07348 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1778,3 +1778,140 @@ performance, features, and ease of use.") "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator framework based on QEMU.") (license license:gpl2+)))) + +(define-public ppsspp + (package + (name "ppsspp") + (version "1.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl")) + (file-name (git-file-name name version)) + (patches + (search-patches "ppsspp-disable-upgrade-and-gold.patch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; unbundle sources + (substitute* (list "Common/Vulkan/VulkanContext.cpp" + "ext/native/thin3d/vulkan_utils.cpp" + "GPU/Common/ShaderCommon.cpp" + "GPU/Common/ShaderTranslation.cpp" + "SDL/SDLMain.cpp") + (("ext/glslang/") "") + (("ext/SPIRV-Cross/") "spirv_cross/")) + ;; patch CMakeLists + (substitute* "CMakeLists.txt" + (("include_directories\\(ext/glslang\\)") "") + (("spirv-cross-glsl" all) + (string-append all + " spirv-cross-core spirv-cross-cpp" + " spirv-cross-reflect spirv-cross-util"))) + (substitute* "ext/CMakeLists.txt" + (("add_subdirectory\\(glslang\\)") "") + (("add_subdirectory\\(SPIRV-Cross-build\\)") "")) + (delete-file-recursively "ext/cmake") + (substitute* "git-version.cmake" + (("unknown") ,version)))))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + `(;; TODO: unbundle builds + ("armips-source" ,(package-source armips)) + + ("lang" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp-lang.git") + (commit "d184ba2b607a03435be579406b816c90add334e6"))) + (sha256 + (base32 + "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")))) + ("tests" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/pspautotests.git") + (commit "328b839c7243e7f733f9eae88d059485e3d808e7"))) + (sha256 + (base32 + "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")))) + + ("ffmpeg" ,ffmpeg) + ("glew" ,glew) + ("glslang" ,glslang) + ("libpng" ,libpng) + ("mesa" ,mesa) + ("sdl2" ,sdl2) + ("snappy" ,snappy) + ("spirv-cross" ,spirv-cross) + ("zlib" ,zlib))) + (arguments + `(#:out-of-source? #f + #:configure-flags (list "-DUSE_DISCORD=OFF" + "-DUSE_SYSTEM_FFMPEG=ON" + ;; for testing + "-DUNITTEST=ON" "-DHEADLESS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-external-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; TODO: unbundle builds + ;; not only should we not copy these sources in, + ;; we should also remove as much from ext/ as we can + (copy-recursively (assoc-ref inputs "armips-source") + "ext/armips") + ;; some tests are externalised, so we add them here + (copy-recursively (assoc-ref inputs "tests") + "pspautotests") + ;; i18n is externalised, so we add it here + (copy-recursively (assoc-ref inputs "lang") + "assets/lang") + #t)) + (replace 'check + (lambda _ + (for-each + (lambda (t) (invoke "./unitTest" t)) + '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin" + "SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit" + "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap")) + (invoke "python3" "test.py" "-g") + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin/ppsspp (string-append out "/bin/ppsspp")) + (share (string-append out "/share/ppsspp"))) + (copy-recursively "icons/hicolor" + (string-append out "/share/icons/hicolor")) + (install-file "PPSSPPSDL" share) + (copy-recursively "assets" (string-append share "/assets")) + + (make-desktop-entry-file + (string-append out "/share/applications/ppsspp.desktop") + #:name "PPSSPP" + #:exec (string-append share "/PPSSPPSDL") + #:icon "ppsspp") + + (mkdir-p (string-append out "/bin")) + (with-output-to-file bin/ppsspp + (lambda () + (format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\"" + (which "sh") share))) + (chmod bin/ppsspp #o755) + + #t)))))) + (home-page "https://www.ppsspp.org/") + (synopsis "PSP emulator") + (description + "PPSSPP is a \"high-level\" emulator simulating the PSP operating system.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch new file mode 100644 index 0000000000..9503ab6f31 --- /dev/null +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -0,0 +1,358 @@ +From 951f2269f67d618d376656db831796c119f4f6b3 Mon Sep 17 00:00:00 2001 +From: Leo Prikler +Date: Fri, 26 Jun 2020 18:20:04 +0200 +Subject: [PATCH] ppsspp: disable upgrade and gold + +--- + Core/Config.cpp | 11 ------- + Core/Config.h | 2 -- + Qt/QtMain.cpp | 6 ---- + SDL/SDLMain.cpp | 6 ---- + UI/DevScreens.cpp | 3 -- + UI/GameSettingsScreen.cpp | 1 - + UI/MainScreen.cpp | 63 +------------------------------------ + UI/MiscScreens.cpp | 31 ++---------------- + UWP/PPSSPP_UWPMain.cpp | 6 ---- + Windows/MainWindowMenu.cpp | 2 +- + Windows/main.cpp | 6 ---- + android/jni/app-android.cpp | 6 ---- + 12 files changed, 5 insertions(+), 138 deletions(-) + +diff --git a/Core/Config.cpp b/Core/Config.cpp +index 214aeb433..04e3b151d 100644 +--- a/Core/Config.cpp ++++ b/Core/Config.cpp +@@ -428,7 +428,6 @@ static ConfigSetting generalSettings[] = { + ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), + ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), + ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), +- ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true), + ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), + ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), + ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... +@@ -1229,16 +1228,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { + upgradeMessage = ""; + } + +- // Check for new version on every 10 runs. +- // Sometimes the download may not be finished when the main screen shows (if the user dismisses the +- // splash screen quickly), but then we'll just show the notification next time instead, we store the +- // upgrade number in the ini. +- if (iRunCount % 10 == 0 && bCheckForNewVersion) { +- std::shared_ptr dl = g_DownloadManager.StartDownloadWithCallback( +- "http://www.ppsspp.org/version.json", "", &DownloadCompletedCallback); +- dl->SetHidden(true); +- } +- + INFO_LOG(LOADER, "Loading controller config: %s", controllerIniFilename_.c_str()); + bSaveSettings = true; + +diff --git a/Core/Config.h b/Core/Config.h +index 084eacc94..e7134cab5 100644 +--- a/Core/Config.h ++++ b/Core/Config.h +@@ -99,7 +99,6 @@ struct Config { + bool bIgnoreBadMemAccess; + bool bFastMemory; + int iCpuCore; +- bool bCheckForNewVersion; + bool bForceLagSync; + bool bFuncReplacements; + bool bHideSlowWarnings; +@@ -521,4 +520,3 @@ std::string CreateRandMAC(); + // TODO: Find a better place for this. + extern http::Downloader g_DownloadManager; + extern Config g_Config; +- +diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp +index 7713b6587..1d92d1175 100644 +--- a/Qt/QtMain.cpp ++++ b/Qt/QtMain.cpp +@@ -194,12 +194,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_FILE_BROWSER: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp +index 52028d087..d8697d210 100644 +--- a/SDL/SDLMain.cpp ++++ b/SDL/SDLMain.cpp +@@ -356,12 +356,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + switch (prop) { + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp +index f146d099e..625ee124c 100644 +--- a/UI/DevScreens.cpp ++++ b/UI/DevScreens.cpp +@@ -603,9 +603,6 @@ void SystemInfoScreen::CreateViews() { + #ifdef _M_SSE + buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); + #endif +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- buildConfig->Add(new InfoItem("GOLD", "")); +- } + + ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); + cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); +diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp +index 8202870c7..81112f822 100644 +--- a/UI/GameSettingsScreen.cpp ++++ b/UI/GameSettingsScreen.cpp +@@ -796,7 +796,6 @@ void GameSettingsScreen::CreateViews() { + } + #endif + +- systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); + const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png"; + const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg"; + if (File::Exists(bgPng) || File::Exists(bgJpg)) { +diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp +index 43535913d..36834020d 100644 +--- a/UI/MainScreen.cpp ++++ b/UI/MainScreen.cpp +@@ -1054,11 +1054,7 @@ void MainScreen::CreateViews() { + sprintf(versionString, "%s", PPSSPP_GIT_VERSION); + rightColumnItems->SetSpacing(0.0f); + LinearLayout *logos = new LinearLayout(ORIENT_HORIZONTAL); +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- } else { +- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- } ++ logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); + logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new LinearLayoutParams(Margins(-12, 0, 0, 0)))); + rightColumnItems->Add(logos); + TextView *ver = rightColumnItems->Add(new TextView(versionString, new LinearLayoutParams(Margins(70, -6, 0, 0)))); +@@ -1070,11 +1066,6 @@ void MainScreen::CreateViews() { + rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); + rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); + rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); +- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- Choice *gold = rightColumnItems->Add(new Choice(mm->T("Buy PPSSPP Gold"))); +- gold->OnClick.Handle(this, &MainScreen::OnSupport); +- gold->SetIcon(ImageID("I_ICONGOLD")); +- } + + #if !PPSSPP_PLATFORM(UWP) + // Having an exit button is against UWP guidelines. +@@ -1099,28 +1090,6 @@ void MainScreen::CreateViews() { + } else if (tabHolder_->GetVisibility() != V_GONE) { + root_->SetDefaultFocusView(tabHolder_); + } +- +- auto u = GetI18NCategory("Upgrade"); +- +- upgradeBar_ = 0; +- if (!g_Config.upgradeMessage.empty()) { +- upgradeBar_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); +- +- UI::Margins textMargins(10, 5); +- UI::Margins buttonMargins(0, 0); +- UI::Drawable solid(0xFFbd9939); +- upgradeBar_->SetBG(solid); +- upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); +- upgradeBar_->Add(new Button(u->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); +- upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade); +- +- // Slip in under root_ +- LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL); +- newRoot->Add(root_); +- newRoot->Add(upgradeBar_); +- root_->ReplaceLayoutParams(new LinearLayoutParams(1.0)); +- root_ = newRoot; +- } + } + + UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { +@@ -1128,27 +1097,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { + return UI::EVENT_DONE; + } + +-UI::EventReturn MainScreen::OnDownloadUpgrade(UI::EventParams &e) { +-#if PPSSPP_PLATFORM(ANDROID) +- // Go to app store +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +- } else { +- LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); +- } +-#else +- // Go directly to ppsspp.org and let the user sort it out +- LaunchBrowser("https://www.ppsspp.org/downloads.html"); +-#endif +- return UI::EVENT_DONE; +-} +- +-UI::EventReturn MainScreen::OnDismissUpgrade(UI::EventParams &e) { +- g_Config.DismissUpgrade(); +- upgradeBar_->SetVisibility(UI::V_GONE); +- return UI::EVENT_DONE; +-} +- + void MainScreen::sendMessage(const char *message, const char *value) { + // Always call the base class method first to handle the most common messages. + UIScreenWithBackground::sendMessage(message, value); +@@ -1319,15 +1267,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { + return UI::EVENT_DONE; + } + +-UI::EventReturn MainScreen::OnSupport(UI::EventParams &e) { +-#ifdef __ANDROID__ +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +-#else +- LaunchBrowser("https://central.ppsspp.org/buygold"); +-#endif +- return UI::EVENT_DONE; +-} +- + UI::EventReturn MainScreen::OnPPSSPPOrg(UI::EventParams &e) { + LaunchBrowser("https://www.ppsspp.org"); + return UI::EVENT_DONE; +diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp +index a6542c65d..f5f101594 100644 +--- a/UI/MiscScreens.cpp ++++ b/UI/MiscScreens.cpp +@@ -498,11 +498,7 @@ void LogoScreen::render() { + char temp[256]; + // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. + snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); +- } else { +- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); +- } ++ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); + dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); + //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER); + dc.SetFontScale(1.0f, 1.0f); +@@ -538,10 +534,6 @@ void CreditsScreen::CreateViews() { + // Really need to redo this whole layout with some linear layouts... + + int rightYOffset = 0; +- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- root_->Add(new Button(cr->T("Buy Gold"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport); +- rightYOffset = 74; +- } + root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); + root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); + root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); +@@ -550,20 +542,7 @@ void CreditsScreen::CreateViews() { + #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) + root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); + #endif +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- root_->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- } else { +- root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- } +-} +- +-UI::EventReturn CreditsScreen::OnSupport(UI::EventParams &e) { +-#ifdef __ANDROID__ +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +-#else +- LaunchBrowser("https://central.ppsspp.org/buygold"); +-#endif +- return UI::EVENT_DONE; ++ root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); + } + + UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { +@@ -747,11 +726,7 @@ void CreditsScreen::render() { + + // TODO: This is kinda ugly, done on every frame... + char temp[256]; +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION); +- } else { +- snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); +- } ++ snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); + credits[0] = (const char *)temp; + + UIContext &dc = *screenManager()->getUIContext(); +diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp +index 24f3b964d..1d66ba7ee 100644 +--- a/UWP/PPSSPP_UWPMain.cpp ++++ b/UWP/PPSSPP_UWPMain.cpp +@@ -399,12 +399,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return false; + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp +index b5e1bb0eb..71b29b48a 100644 +--- a/Windows/MainWindowMenu.cpp ++++ b/Windows/MainWindowMenu.cpp +@@ -1377,7 +1377,7 @@ namespace MainWindow { + { + W32Util::CenterWindow(hDlg); + HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); +- std::string windowText = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP "; ++ std::string windowText = "PPSSPP "; + windowText.append(PPSSPP_GIT_VERSION); + SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); + } +diff --git a/Windows/main.cpp b/Windows/main.cpp +index 3795597e2..fd98d0453 100644 +--- a/Windows/main.cpp ++++ b/Windows/main.cpp +@@ -268,12 +268,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp +index 086371085..0a340c0ae 100644 +--- a/android/jni/app-android.cpp ++++ b/android/jni/app-android.cpp +@@ -372,12 +372,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_IMAGE_BROWSER: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +-- +2.26.2 + -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 18:02:50 2020 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 22:02:50 +0000 Received: from localhost ([127.0.0.1]:49689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1rV-0001qA-Fw for submit@debbugs.gnu.org; Mon, 29 Jun 2020 18:02:50 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:37813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1rS-0001pv-OJ for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 18:02:47 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D05E7C0004; Mon, 29 Jun 2020 22:02:39 +0000 (UTC) From: Nicolas Goaziou To: Leo Prikler Subject: Re: [bug#41778] [PATCH 0/3] Add ppsspp References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> Date: Tue, 30 Jun 2020 00:02:36 +0200 In-Reply-To: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> (Leo Prikler's message of "Mon, 29 Jun 2020 12:02:18 +0200") Message-ID: <87wo3pil8j.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41778 Cc: 41778@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Leo Prikler writes: > Following the release of version 1.10, I've updated my package > descriptions. I've also been able to unbundle some sources, but not > all of them. OOC, did you try to symlink sources instead of copying them? Note that you don't mention what is left to unbundle. Would it make sense to add this information? Otherwise, LGTM, barring the description of spirv-cross, where I suggest to drop the "NOTE:" part. It reminds me taisei package felt through the cracks. I'll apply it once spirv-cross is pushed. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 19:34:01 2020 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 23:34:01 +0000 Received: from localhost ([127.0.0.1]:49768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq3Hk-000420-S4 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 19:34:01 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:55170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq3Hh-00041o-Ep for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 19:34:00 -0400 Received: from nijino.local (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wkMk1WCXz1LLyX; Tue, 30 Jun 2020 01:33:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wkMk1WCXz1LLyX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593473634; bh=V/Au0gwCojTg4H2Z5kNoFug1qFncP9waG25o5WZtCc0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Hqd9nPnge2WgbTz4k0fu07hgBp5Yxrz7x2aY81ndsWg4gpD98nCsnxfue4J4BVKSt vSqbk5OM3sbV+arzUHGoOCIrNHFi79v+MOPLg86HC0+xOdFahYhi7BE3po/04gL3M+ t0xUSuqHk26PaapOvxaiK+NUzrZIFCqxUpk8qmVE= Message-ID: <2aaef91e896f56a9f06a696a8c4e75c8b4cc65bf.camel@student.tugraz.at> Subject: Re: [bug#41778] [PATCH 0/3] Add ppsspp From: Leo Prikler To: Nicolas Goaziou Date: Tue, 30 Jun 2020 01:33:52 +0200 In-Reply-To: <87wo3pil8j.fsf@nicolasgoaziou.fr> References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> <87wo3pil8j.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778 Cc: 41778@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Am Dienstag, den 30.06.2020, 00:02 +0200 schrieb Nicolas Goaziou: > Hello, > > Leo Prikler writes: > > > Following the release of version 1.10, I've updated my package > > descriptions. I've also been able to unbundle some sources, but > > not > > all of them. > > OOC, did you try to symlink sources instead of copying them? No, but I'd imagine it would not work out great, because the source is a git checkout in /gnu/store, which is read-only and it is compiled in- place. > Note that you don't mention what is left to unbundle. Would it make > sense to add this information? I'm looking mostly at the contents of ext/ here, which has stuff we already package, like cityhash among others. A bit of context is given in the unbundling snippet I use for glslang and spirv-cross, which I've managed to unbundle, but the rest are not pulled in as submodules, so it would require a `guix build --source` and manual analysis to sift through all that. I don't think a less vague comment could improve this understanding without risking to be invalidated at some point in the future. Perhaps I could clarify, that it's "mostly ext/", but even that is not completely true, since upstream also has ffmpeg as a toplevel submodule (which I don't pull in, instead using the flags they already provide for using system ffmpeg). > Otherwise, LGTM, barring the description of spirv-cross, where I > suggest > to drop the "NOTE:" part. It reminds me taisei package felt through > the > cracks. I'll apply it once spirv-cross is pushed. To be fair, that's where I copied it from – I think I already mentioned that. I just updated the version and added some details in the comment regarding failing tests and hence added my updated patch. I also think this description to be quite weird, but at the same time am unsure on how to better rephrase it. I will send an updated version of it once I do come up with something better than just dropping the "NOTE:" part. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 30 11:08:45 2020 Received: (at 41778-done) by debbugs.gnu.org; 30 Jun 2020 15:08:45 +0000 Received: from localhost ([127.0.0.1]:51442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqHsL-00068f-BW for submit@debbugs.gnu.org; Tue, 30 Jun 2020 11:08:45 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:52355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqHsI-00068Q-NI for 41778-done@debbugs.gnu.org; Tue, 30 Jun 2020 11:08:43 -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 23BCC10000F; Tue, 30 Jun 2020 15:08:34 +0000 (UTC) From: Nicolas Goaziou To: Leo Prikler Subject: Re: [bug#41778] [PATCH 0/3] Add ppsspp References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> <87wo3pil8j.fsf@nicolasgoaziou.fr> <2aaef91e896f56a9f06a696a8c4e75c8b4cc65bf.camel@student.tugraz.at> Date: Tue, 30 Jun 2020 17:08:31 +0200 In-Reply-To: <2aaef91e896f56a9f06a696a8c4e75c8b4cc65bf.camel@student.tugraz.at> (Leo Prikler's message of "Tue, 30 Jun 2020 01:33:52 +0200") Message-ID: <87ftaciob4.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41778-done Cc: 41778-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Leo Prikler writes: > No, but I'd imagine it would not work out great, because the source is > a git checkout in /gnu/store, which is read-only and it is compiled in- > place. Oh ok. I didn't get it was compiled in-place. > I'm looking mostly at the contents of ext/ here, which has stuff we > already package, like cityhash among others. A bit of context is given > in the unbundling snippet I use for glslang and spirv-cross, which I've > managed to unbundle, but the rest are not pulled in as submodules, so > it would require a `guix build --source` and manual analysis to sift > through all that.=20=20 > I don't think a less vague comment could improve this understanding > without risking to be invalidated at some point in the future. Perhaps > I could clarify, that it's "mostly ext/", but even that is not > completely true, since upstream also has ffmpeg as a toplevel submodule > (which I don't pull in, instead using the flags they already provide > for using system ffmpeg). Fair enough. >> Otherwise, LGTM, barring the description of spirv-cross, where I >> suggest >> to drop the "NOTE:" part. It reminds me taisei package felt through >> the >> cracks. I'll apply it once spirv-cross is pushed. > To be fair, that's where I copied it from =E2=80=93 I think I already men= tioned > that. I know. And this is what reminded about taisei. > I just updated the version and added some details in the comment > regarding failing tests and hence added my updated patch. I also think > this description to be quite weird, but at the same time am unsure on > how to better rephrase it. I will send an updated version of it once I > do come up with something better than just dropping the "NOTE:" part. Well, I still think dropping the note is appropriate, but I won't fight over it. Let me know if you find something that suits you better. I applied your patches. I tweaked comments. In particular comments starting with two semicolons are full sentences and are supposed to start with a capital and end with a full stop. Thank you! Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 30 17:31:22 2020 Received: (at 41778-done) by debbugs.gnu.org; 30 Jun 2020 21:31:22 +0000 Received: from localhost ([127.0.0.1]:51818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqNqa-00079e-Lt for submit@debbugs.gnu.org; Tue, 30 Jun 2020 17:31:22 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:46802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqNqX-00079S-V3 for 41778-done@debbugs.gnu.org; Tue, 30 Jun 2020 17:31:19 -0400 Received: from nijino.local (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49xHbk0bDZz3wbT; Tue, 30 Jun 2020 23:31:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593552674; bh=+7fs8/rG2MYgwAi4I8SLSj/jFRzH8qM81rQhgbX7HYk=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=F6RLwzAbyiK/atrKEA4B/ZSVLNmwrDaCGJ9MbbZf2YtK8TWm9nyW/9GI+Wk5oa4i/ lj4AX371QOMe2Grmobk24ns4agCSK8qxI6hD7b/HXD+RY5ufHKX0xvf+5TzkVvnBID 6QLn+IWn6iQGavkhPFx1mbGB3kzf+jot4+n4s8E4= Message-ID: <00d0e783bc3dde4e96fcee56f02ac6e12bb15743.camel@student.tugraz.at> Subject: Re: [bug#41778] [PATCH 0/3] Add ppsspp From: Leo Prikler To: Nicolas Goaziou Date: Tue, 30 Jun 2020 23:31:13 +0200 In-Reply-To: <87ftaciob4.fsf@nicolasgoaziou.fr> References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> <87wo3pil8j.fsf@nicolasgoaziou.fr> <2aaef91e896f56a9f06a696a8c4e75c8b4cc65bf.camel@student.tugraz.at> <87ftaciob4.fsf@nicolasgoaziou.fr> Content-Type: multipart/mixed; boundary="=-gWHRVctk+reS2FzNOjl+" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41778-done Cc: 41778-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-gWHRVctk+reS2FzNOjl+ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Am Dienstag, den 30.06.2020, 17:08 +0200 schrieb Nicolas Goaziou: > Well, I still think dropping the note is appropriate, but I won't > fight > over it. Let me know if you find something that suits you better. Don't get me wrong, I agree on dropping the note, but I didn't want to resend the patch just to delete it (since deletion is a rather trivial operation, simpler even than forming partial sentences to full ones in comments). Either way, I do have a better phrasing now, which I'll attach. > I applied your patches. I tweaked comments. In particular comments > starting with two semicolons are full sentences and are supposed to > start with a capital and end with a full stop. Thanks you! I managed to unbundle some more sources today and also cleaned up my comments as I did so. Regards, Leo --=-gWHRVctk+reS2FzNOjl+ Content-Disposition: attachment; filename="0001-gnu-spirv-cross-Improve-description.patch" Content-Type: text/x-patch; name="0001-gnu-spirv-cross-Improve-description.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA4ZDQ0YmZkZDhiZmMwZDk1OTVmZjFlY2JjNWZkNWYwMGE1ZDFmNGM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW8gUHJpa2xlciA8bGVvLnByaWtsZXJAc3R1ZGVudC50dWdy YXouYXQ+CkRhdGU6IFR1ZSwgMzAgSnVuIDIwMjAgMTE6NDE6MzYgKzAyMDAKU3ViamVjdDogW1BB VENIIDEvMl0gZ251OiBzcGlydi1jcm9zczogSW1wcm92ZSBkZXNjcmlwdGlvbi4KCiogZ251L3Bh Y2thZ2VzL3Z1bGthbi5zY20gKHNwaXJ2LWNyb3NzKVtkZXNjcmlwdGlvbl06IFNpbXBsaWZ5Lgot LS0KIGdudS9wYWNrYWdlcy92dWxrYW4uc2NtIHwgOCArLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDEgaW5zZXJ0aW9uKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdl cy92dWxrYW4uc2NtIGIvZ251L3BhY2thZ2VzL3Z1bGthbi5zY20KaW5kZXggMmU2NDBmNTAyYy4u ZmUzN2I1OWUyNiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Z1bGthbi5zY20KKysrIGIvZ251 L3BhY2thZ2VzL3Z1bGthbi5zY20KQEAgLTE0NCwxMyArMTQ0LDcgQEAgcGFyc2VyLGRpc2Fzc2Vt YmxlciwgdmFsaWRhdG9yLCBhbmQgb3B0aW1pemVyIGZvciBTUElSLVYuIikKICAgICAoc3lub3Bz aXMgIlBhcnNlciBmb3IgYW5kIGNvbnZlcnRlciBvZiBTUElSLVYgdG8gb3RoZXIgc2hhZGVyIGxh bmd1YWdlcyIpCiAgICAgKGRlc2NyaXB0aW9uCiAgICAgICJTUElSVi1Dcm9zcyB0cmllcyBoYXJk IHRvIGVtaXQgcmVhZGFibGUgYW5kIGNsZWFuIG91dHB1dCBmcm9tIHRoZQotU1BJUi1WLiAgVGhl IGdvYWwgaXMgdG8gZW1pdCBHTFNMIG9yIE1TTCB0aGF0IGxvb2tzIGxpa2UgaXQgd2FzIHdyaXR0 ZW4gYnkKLWEgaHVtYW4gYW5kIG5vdCBhd2t3YXJkIElSL2Fzc2VtYmx5LWxpa2UgY29kZS4KLQot Tk9URTogSW5kaXZpZHVhbCBmZWF0dXJlcyBhcmUgZXhwZWN0ZWQgdG8gYmUgbW9zdGx5IGNvbXBs ZXRlLCBidXQgaXQgaXMKLXBvc3NpYmxlIHRoYXQgY2VydGFpbiBvYnNjdXJlIEdMU0wgZmVhdHVy ZXMgYXJlIG5vdCB5ZXQgc3VwcG9ydGVkLiAgSG93ZXZlciwKLW1vc3QgbWlzc2luZyBmZWF0dXJl cyBhcmUgZXhwZWN0ZWQgdG8gYmUgYGB0cml2aWFsJycgaW1wcm92ZW1lbnRzIGF0IHRoaXMKLXN0 YWdlLiIpCitTUElSLVYsIGFpbWluZyB0byBlbWl0IEdMU0wgb3IgTVNMIHRoYXQgbG9va3MgbGlr ZSBodW1hbi13cml0dGVuIGNvZGUuIikKICAgICAobGljZW5zZSBsaWNlbnNlOmFzbDIuMCkpKQog CiAoZGVmaW5lLXB1YmxpYyBnbHNsYW5nCi0tIAoyLjI3LjAKCg== --=-gWHRVctk+reS2FzNOjl+ Content-Disposition: attachment; filename="0002-gnu-ppsspp-Unbundle-more-sources.patch" Content-Type: text/x-patch; name="0002-gnu-ppsspp-Unbundle-more-sources.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA2NTViNjE0ZjY0M2VlYWFjNTcwZGRlM2Q5OTliYjZmZDI5ZjU1YWY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW8gUHJpa2xlciA8bGVvLnByaWtsZXJAc3R1ZGVudC50dWdy YXouYXQ+CkRhdGU6IFR1ZSwgMzAgSnVuIDIwMjAgMTk6MzQ6MzggKzAyMDAKU3ViamVjdDogW1BB VENIIDIvMl0gZ251OiBwcHNzcHA6IFVuYnVuZGxlIG1vcmUgc291cmNlcy4KCiogZ251L3BhY2th Z2VzL2VtdWxhdG9ycyAocHBzc3BwKVtzb3VyY2VdOiBVcGRhdGUgdW5idW5kbGluZyBzbmlwcGV0 LgpbaW5wdXRzXTogQWRkIGNpdHloYXNoLCBsaWJ6aXAsIHZ1bGthbi1oZWFkZXJzLCB2dWxrYW4t bG9hZGVyLCB4eGhhc2guClthcmd1bWVudHNdPCM6Y29uZmlndXJlLWZsYWdzPjogQWRkIC1EVVNF X1NZU1RFTV9MSUJaSVA9T04uClVwZGF0ZSBjb21tZW50cyBhY2NvcmRpbmdseS4KLS0tCiBnbnUv cGFja2FnZXMvZW11bGF0b3JzLnNjbSB8IDc5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2VtdWxhdG9ycy5zY20gYi9nbnUvcGFja2Fn ZXMvZW11bGF0b3JzLnNjbQppbmRleCA4YjM5NTE3ZTNmLi44YTljYTQyOGE5IDEwMDY0NAotLS0g YS9nbnUvcGFja2FnZXMvZW11bGF0b3JzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZW11bGF0b3Jz LnNjbQpAQCAtNDgsNiArNDgsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjb21w cmVzc2lvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY3Jvc3MtYmFzZSkKICAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY3VybCkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgZGlnZXN0KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBlbGYpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGZvbnRzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBm b250dXRpbHMpCkBAIC0xODU4LDI1ICsxODU5LDY5IEBAIGZyYW1ld29yayBiYXNlZCBvbiBRRU1V LiIpCiAgICAgICAgKG1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykpKQogICAgICAgIChzbmlw cGV0CiAgICAgICAgIGAoYmVnaW4KLSAgICAgICAgICAgOzsgVW5idW5kbGUgc291cmNlcy4KLSAg ICAgICAgICAgKHN1YnN0aXR1dGUqIChsaXN0ICJDb21tb24vVnVsa2FuL1Z1bGthbkNvbnRleHQu Y3BwIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImV4dC9uYXRpdmUvdGhpbjNkL3Z1 bGthbl91dGlscy5jcHAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiR1BVL0NvbW1v bi9TaGFkZXJDb21tb24uY3BwIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkdQVS9D b21tb24vU2hhZGVyVHJhbnNsYXRpb24uY3BwIgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIlNETC9TRExNYWluLmNwcCIpCisgICAgICAgICAgIDs7IFRoZSBmb2xsb3dpbmcgaXMgcXVp dGUgYSBoZWF2eS1oYW5kZWQgd2F5IG9mIHVuYnVuZGxpbmcgUFBTU1BQLgorICAgICAgICAgICA7 OyBUaGVyZSBhcmUgc3RpbGwgYSBudW1iZXIgb2YgZXh0ZXJuYWwgc291cmNlcywgdGhhdCB3ZSBk b24ndAorICAgICAgICAgICA7OyByZW1vdmUgaGVyZS4gIFNvbWUgbWF5IGJlIHBhY2thZ2VkLCBv dGhlcnMgYXJlIG5vdC4KKyAgICAgICAgICAgOzsgRmlyc3QsIHdlIHBhdGNoIGV4aXN0aW5nIHNv dXJjZXMgdG8gaW5jbHVkZSB0aGUgcmlnaHQgaGVhZGVycy4KKyAgICAgICAgICAgKHN1YnN0aXR1 dGUqIChhcHBlbmQgKGxpc3QgImV4dC9uYXRpdmUvdGhpbjNkL3Z1bGthbl91dGlscy5jcHAiCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJleHQvbmF0aXZlL3RoaW4zZC90 aGluM2RfdnVsa2FuLmNwcCIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaW5k LWZpbGVzICJDb21tb24iICIuKlxcLihofGNwcCkiKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoZmluZC1maWxlcyAiQ29yZSIgIi4qXFwuKGh8Y3BwKSIpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzICJHUFUiICIuKlxcLihofGNwcCkiKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1maWxlcyAiU0RMIiAiLipcXC4oaHxj cHApIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbmQtZmlsZXMgIlVJIiAi LipcXC4oaHxjcHApIikpCisgICAgICAgICAgICAgOzsgVGhlc2UgaGVhZGVycyBhcmUgYWxsIGhh cmQtY29kZWQgaW4gdGhlIG9yaWdpbmFsIHNvdXJjZS4KKyAgICAgICAgICAgICAoKCJleHQvY2l0 eWhhc2gvIikgIiIpCiAgICAgICAgICAgICAgKCgiZXh0L2dsc2xhbmcvIikgIiIpCi0gICAgICAg ICAgICAgKCgiZXh0L1NQSVJWLUNyb3NzLyIpICJzcGlydl9jcm9zcy8iKSkKLSAgICAgICAgICAg OzsgUGF0Y2ggQ01ha2VMaXN0cy4KKyAgICAgICAgICAgICAoKCJleHQvU1BJUlYtQ3Jvc3MvIikg InNwaXJ2X2Nyb3NzLyIpCisgICAgICAgICAgICAgKCgiZXh0L3Z1bGthbi8iKSAidnVsa2FuLyIp CisgICAgICAgICAgICAgKCgiZXh0L3h4aGFzaC5oIikgInh4aGFzaC5oIikKKyAgICAgICAgICAg ICA7OyBUaGVzZSBkZWZpbml0aW9ucyBkbyBub3QgYWN0dWFsbHkgZXhpc3QgaW4gdGhlIFZ1bGth biBoZWFkZXJzLAorICAgICAgICAgICAgIDs7IGJ1dCBQUFNTUFAgZGVmaW5lcyB0aGVtIGluIGV4 dC92dWxrYW4uCisgICAgICAgICAgICAgKCgiVktfRk9STUFUX0JFR0lOX1JBTkdFIikgIlZLX0ZP Uk1BVF9VTkRFRklORUQiKQorICAgICAgICAgICAgICgoIlZLX0ZPUk1BVF9FTkRfUkFOR0UiKSAi VktfRk9STUFUX0FTVENfMTJ4MTJfU1JHQl9CTE9DSyIpKQorICAgICAgICAgICA7OyBOZXh0LCB3 ZSBwYXRjaCBDTWFrZUxpc3RzLgogICAgICAgICAgICAoc3Vic3RpdHV0ZSogIkNNYWtlTGlzdHMu dHh0IgorICAgICAgICAgICAgIDs7IERyb3AgdW5uZWNlc3NhcnkgaW5jbHVkZXMgYW5kIHRhcmdl dHMuCiAgICAgICAgICAgICAgKCgiaW5jbHVkZV9kaXJlY3Rvcmllc1xcKGV4dC9nbHNsYW5nXFwp IikgIiIpCisgICAgICAgICAgICAgKCgiaW5jbHVkZV9kaXJlY3Rvcmllc1xcKGV4dC94eGhhc2hc XCkiKSAiIikKKyAgICAgICAgICAgICAoKCJpbmNsdWRlX2RpcmVjdG9yaWVzXFwoZXh0L2NpdHlo YXNoXFwpIikgIiIpCisgICAgICAgICAgICAgKCgic2V0X3RhcmdldF9wcm9wZXJ0aWVzXFwoY2l0 eWhhc2ggLipcXCkiKSAiIikKKyAgICAgICAgICAgICA7OyBGaXggbGlua2luZyB0byBHTEVXLgor ICAgICAgICAgICAgICgoIlRBUkdFVCBFeHQ6OkdMRVciKSAidHJ1ZSIpCisgICAgICAgICAgICAg KCgidGFyZ2V0X2xpbmtfbGlicmFyaWVzXFwobmF0aXZlIEV4dDo6R0xFV1xcKSIpCisgICAgICAg ICAgICAgICJmaW5kX3BhY2thZ2UoR0xFVylcbnRhcmdldF9saW5rX2xpYnJhcmllcyhuYXRpdmUg R0xFVzo6R0xFVykiKQorICAgICAgICAgICAgICgoIkV4dDo6U25hcHB5IikgInNuYXBweSIpCisg ICAgICAgICAgICAgOzsgRG9uJ3Qgc2VhcmNoIGZvciBjaXR5aGFzaC94eGhhc2gsIHdlIGFscmVh ZHkgaGF2ZSB0aGVtLgorICAgICAgICAgICAgICgoImFkZF9saWJyYXJ5XFwoKGNpdHl8eHgpaGFz aCBTVEFUSUMiKSAiaWYoKVxuZW5kaWYoIikKKyAgICAgICAgICAgICAoKCJleHQveHhoYXNoXFwu W2NoXSIpICIiKQorICAgICAgICAgICAgICgoImV4dC9uYXRpdmUvZXh0L2NpdHloYXNoLy4qXFwu KGNwcHxoKSIpICIiKQorICAgICAgICAgICAgIDs7IExpbmsgYWxsIG9mIHNwaXJ2LWNyb3NzLgog ICAgICAgICAgICAgICgoInNwaXJ2LWNyb3NzLWdsc2wiIGFsbCkKICAgICAgICAgICAgICAgKHN0 cmluZy1hcHBlbmQgYWxsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgc3BpcnYtY3Jv c3MtY29yZSBzcGlydi1jcm9zcy1jcHAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg c3BpcnYtY3Jvc3MtcmVmbGVjdCBzcGlydi1jcm9zcy11dGlsIikpKQogICAgICAgICAgICAoc3Vi c3RpdHV0ZSogImV4dC9DTWFrZUxpc3RzLnR4dCIKKyAgICAgICAgICAgICAoKCJhZGRfc3ViZGly ZWN0b3J5XFwoZ2xld1xcKSIpICIiKQogICAgICAgICAgICAgICgoImFkZF9zdWJkaXJlY3Rvcnlc XChnbHNsYW5nXFwpIikgIiIpCisgICAgICAgICAgICAgKCgiYWRkX3N1YmRpcmVjdG9yeVxcKHNu YXBweVxcKSIpICIiKQogICAgICAgICAgICAgICgoImFkZF9zdWJkaXJlY3RvcnlcXChTUElSVi1D cm9zcy1idWlsZFxcKSIpICIiKSkKLSAgICAgICAgICAgKGRlbGV0ZS1maWxlLXJlY3Vyc2l2ZWx5 ICJleHQvY21ha2UiKQorICAgICAgICAgICA7OyBGaW5hbGx5LCB3ZSBjYW4gZGVsZXRlIHRoZSBi dW5kbGVkIHNvdXJjZXMuCisgICAgICAgICAgIChmb3ItZWFjaCBkZWxldGUtZmlsZS1yZWN1cnNp dmVseQorICAgICAgICAgICAgICAgICAgICAgJygiZXh0L2NtYWtlIgorICAgICAgICAgICAgICAg ICAgICAgICAiZXh0L2dsZXciCisgICAgICAgICAgICAgICAgICAgICAgICJleHQvZ2xzbGFuZyIg ImV4dC9nbHNsYW5nLWJ1aWxkIgorICAgICAgICAgICAgICAgICAgICAgICAiZXh0L25hdGl2ZS9l eHQvY2l0eWhhc2giCisgICAgICAgICAgICAgICAgICAgICAgICJleHQvbmF0aXZlL2V4dC9saWJw bmcxNyIKKyAgICAgICAgICAgICAgICAgICAgICAgImV4dC9uYXRpdmUvZXh0L2xpYnppcCIKKyAg ICAgICAgICAgICAgICAgICAgICAgImV4dC9zbmFwcHkiCisgICAgICAgICAgICAgICAgICAgICAg ICJleHQvU1BJUlYtQ3Jvc3MiICJleHQvU1BJUlYtQ3Jvc3MtYnVpbGQiCisgICAgICAgICAgICAg ICAgICAgICAgICJleHQvdnVsa2FuIgorICAgICAgICAgICAgICAgICAgICAgICAiZXh0L3h4aGFz aC5jIgorICAgICAgICAgICAgICAgICAgICAgICAiZXh0L3h4aGFzaC5oIgorICAgICAgICAgICAg ICAgICAgICAgICAiZXh0L3psaWIiKSkKKyAgICAgICAgICAgOzsgU2luY2Ugd2UgYXJlIG5vdCBp bmNsdWRpbmcgZ2l0IGFzIGFuIGlucHV0LCBQUFNTUFAgaXMgY29uZnVzZWQKKyAgICAgICAgICAg OzsgYWJvdXQgaXRzIHZlcnNpb24uICBMZXQncyBmaXggdGhhdCBoZXJlLgogICAgICAgICAgICAo c3Vic3RpdHV0ZSogImdpdC12ZXJzaW9uLmNtYWtlIgogICAgICAgICAgICAgICgoInVua25vd24i KSAsdmVyc2lvbikpKSkpKQogICAgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQpA QCAtMTg4NCwxNiArMTkyOSwyMSBAQCBmcmFtZXdvcmsgYmFzZWQgb24gUUVNVS4iKQogICAgICBg KCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCiAgICAgICAgKCJweXRob24iICxweXRob24pKSkK ICAgICAoaW5wdXRzCi0gICAgIGAoKCJmZm1wZWciICxmZm1wZWcpCisgICAgIGAoKCJjaXR5aGFz aCIgLGNpdHloYXNoKQorICAgICAgICgiZmZtcGVnIiAsZmZtcGVnKQogICAgICAgICgiZ2xldyIg LGdsZXcpCiAgICAgICAgKCJnbHNsYW5nIiAsZ2xzbGFuZykKICAgICAgICAoImxpYnBuZyIgLGxp YnBuZykKKyAgICAgICAoImxpYnppcCIgLGxpYnppcCkKICAgICAgICAoIm1lc2EiICxtZXNhKQog ICAgICAgICgic2RsMiIgLHNkbDIpCiAgICAgICAgKCJzbmFwcHkiICxzbmFwcHkpCiAgICAgICAg KCJzcGlydi1jcm9zcyIgLHNwaXJ2LWNyb3NzKQorICAgICAgICgidnVsa2FuLWhlYWRlcnMiICx2 dWxrYW4taGVhZGVycykKKyAgICAgICAoInZ1bGthbi1sb2FkZXIiICx2dWxrYW4tbG9hZGVyKQor ICAgICAgICgieHhoYXNoIiAseHhoYXNoKQogICAgICAgICgiemxpYiIgLHpsaWIpCi0gICAgICAg OzsgVE9ETzogdW5idW5kbGUgYnVpbGRzLgorICAgICAgIDs7IFRPRE86IHVuYnVuZGxlIGFybWlw cy4KICAgICAgICAoImFybWlwcy1zb3VyY2UiICwocGFja2FnZS1zb3VyY2UgYXJtaXBzKSkKICAg ICAgICAoImxhbmciCiAgICAgICAgICwob3JpZ2luCkBAIC0xOTE1LDE1ICsxOTY1LDE0IEBAIGZy YW1ld29yayBiYXNlZCBvbiBRRU1VLiIpCiAgICAgIGAoIzpvdXQtb2Ytc291cmNlPyAjZgogICAg ICAgICM6Y29uZmlndXJlLWZsYWdzIChsaXN0ICItRFVTRV9ESVNDT1JEPU9GRiIKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiLURVU0VfU1lTVEVNX0ZGTVBFRz1PTiIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA7OyBGb3IgdGVzdGluZy4KKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLURVU0VfU1lTVEVNX0xJQlpJUD1PTiIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA7OyBmb3IgdGVzdGluZwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICItRFVOSVRURVNUPU9OIiAiLURIRUFETEVTUz1PTiIpCiAgICAgICAgIzpwaGFzZXMKICAg ICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCiAgICAgICAgICAoYWRkLWFmdGVy ICd1bnBhY2sgJ2FkZC1leHRlcm5hbC1zb3VyY2VzCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtl eSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIDs7IFRPRE86IHVuYnVu ZGxlIGJ1aWxkcy4gIE5vdCBvbmx5IHNob3VsZCB3ZSBub3QgY29weSB0aGVzZQotICAgICAgICAg ICAgIDs7IHNvdXJjZXMgaW4sIHdlIHNob3VsZCBhbHNvIHJlbW92ZSBhcyBtdWNoIGZyb20gImV4 dC8iIGFzIHdlCi0gICAgICAgICAgICAgOzsgY2FuLgorICAgICAgICAgICAgIDs7IFRPRE86IHVu YnVuZGxlIGFybWlwcy4KICAgICAgICAgICAgICAoY29weS1yZWN1cnNpdmVseSAoYXNzb2MtcmVm IGlucHV0cyAiYXJtaXBzLXNvdXJjZSIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ImV4dC9hcm1pcHMiKQogICAgICAgICAgICAgIDs7IFNvbWUgdGVzdHMgYXJlIGV4dGVybmFsaXNl ZCwgc28gd2UgYWRkIHRoZW0gaGVyZS4KLS0gCjIuMjcuMAoK --=-gWHRVctk+reS2FzNOjl+-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 01 06:15:55 2020 Received: (at 41778-done) by debbugs.gnu.org; 1 Jul 2020 10:15:56 +0000 Received: from localhost ([127.0.0.1]:52322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqZmV-0002jr-O9 for submit@debbugs.gnu.org; Wed, 01 Jul 2020 06:15:55 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:38711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqZmQ-0002ja-JA for 41778-done@debbugs.gnu.org; Wed, 01 Jul 2020 06:15:54 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 99FAEE0008; Wed, 1 Jul 2020 10:15:43 +0000 (UTC) From: Nicolas Goaziou To: Leo Prikler Subject: Re: [bug#41778] [PATCH 0/3] Add ppsspp References: <785a75894730f36908da7c0775f85058eb32787e.camel@student.tugraz.at> <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> <87wo3pil8j.fsf@nicolasgoaziou.fr> <2aaef91e896f56a9f06a696a8c4e75c8b4cc65bf.camel@student.tugraz.at> <87ftaciob4.fsf@nicolasgoaziou.fr> <00d0e783bc3dde4e96fcee56f02ac6e12bb15743.camel@student.tugraz.at> Date: Wed, 01 Jul 2020 12:15:39 +0200 In-Reply-To: <00d0e783bc3dde4e96fcee56f02ac6e12bb15743.camel@student.tugraz.at> (Leo Prikler's message of "Tue, 30 Jun 2020 23:31:13 +0200") Message-ID: <87mu4jfsms.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41778-done Cc: 41778-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Leo Prikler writes: > Thanks you! I managed to unbundle some more sources today and also > cleaned up my comments as I did so. There sure is some work involved here! I applied both patch, thank you! Regards, -- Nicolas Goaziou From unknown Wed Jun 18 23:09:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 29 Jul 2020 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator