From patchwork Mon Feb 17 14:58:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20301 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 8D58727BBE4; Mon, 17 Feb 2020 14:59:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7676E27BBEB for ; Mon, 17 Feb 2020 14:59:13 +0000 (GMT) Received: from localhost ([::1]:46568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3hrd-00022k-1c for patchwork@mira.cbaines.net; Mon, 17 Feb 2020 09:59:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3hrT-0001yp-Sr for guix-patches@gnu.org; Mon, 17 Feb 2020 09:59:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3hrR-0005oJ-V0 for guix-patches@gnu.org; Mon, 17 Feb 2020 09:59:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3hrR-0005oB-Ru for guix-patches@gnu.org; Mon, 17 Feb 2020 09:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3hrR-0004Rt-QO for guix-patches@gnu.org; Mon, 17 Feb 2020 09:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39644] [PATCH] [PATCH] WIP: gnu: Add rpcs3. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Feb 2020 14:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39644@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158195153117083 (code B ref -1); Mon, 17 Feb 2020 14:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Feb 2020 14:58:51 +0000 Received: from localhost ([127.0.0.1]:39043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j3hr9-0004RL-I6 for submit@debbugs.gnu.org; Mon, 17 Feb 2020 09:58:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:59461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j3hr4-0004R4-AF for submit@debbugs.gnu.org; Mon, 17 Feb 2020 09:58:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38413) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3hr2-0001ia-4F for guix-patches@gnu.org; Mon, 17 Feb 2020 09:58:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3hqz-0005ai-W5 for guix-patches@gnu.org; Mon, 17 Feb 2020 09:58:35 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:22403) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j3hqz-0005YU-Mj for guix-patches@gnu.org; Mon, 17 Feb 2020 09:58:33 -0500 X-Originating-IP: 92.169.129.147 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 09B37240022 for ; Mon, 17 Feb 2020 14:58:29 +0000 (UTC) From: Pierre Neidhardt Date: Mon, 17 Feb 2020 15:58:29 +0100 Message-Id: <20200217145829.16235-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emulators.scm (rpcs3): New variable. Package does not work at the moment. cmake fails with: --8<---------------cut here---------------start------------->8--- CMake Error at 3rdparty/CMakeLists.txt:417 (add_library): add_library cannot create ALIAS target "3rdparty::libusb" because target "usb-1.0-static" does not already exist. CMake Error at 3rdparty/CMakeLists.txt:420 (add_library): add_library cannot create ALIAS target "3rdparty::pugixml" because target "pugixml" does not already exist. CMake Error at 3rdparty/CMakeLists.txt:421 (add_library): add_library cannot create ALIAS target "3rdparty::yaml-cpp" because target "yaml-cpp" does not already exist. CMake Error at 3rdparty/CMakeLists.txt:422 (add_library): add_library cannot create ALIAS target "3rdparty::xxhash" because target "xxhash" does not already exist. CMake Error at 3rdparty/CMakeLists.txt:432 (add_library): add_library cannot create ALIAS target "3rdparty::faudio" because target "FAudio" does not already exist. -- cotire 1.8.0 loaded. -- Found Git: /gnu/store/khvcbw37r31xmfdalplw10xz9d4j6v8l-git-2.25.0/bin/git (found version "2.25.0") CMake Warning at rpcs3/git-version.cmake:33 (message): git not found, unable to include version. Call Stack (most recent call first): rpcs3/CMakeLists.txt:6 (include) -- Performing Test HAS_NO_PIE -- Performing Test HAS_NO_PIE - Success -- Performing Test COMPILER_SUPPORTS_MARCH_NATIVE -- Performing Test COMPILER_SUPPORTS_MARCH_NATIVE - Success -- Found X11: /gnu/store/b824dq3bccq0bhjli3li0fzi11lg1bh3-xorgproto-2019.1/include -- Looking for XOpenDisplay in /gnu/store/06ybqkh3lb3g7c77b74izy32grglf45x-libx11-1.6.8/lib/libX11.so;/gnu/store/j01p4wjas358cvayyjqpl449hmpanra8-libxext-1.3.4/lib/libXext.so -- Looking for XOpenDisplay in /gnu/store/06ybqkh3lb3g7c77b74izy32grglf45x-libx11-1.6.8/lib/libX11.so;/gnu/store/j01p4wjas358cvayyjqpl449hmpanra8-libxext-1.3.4/lib/libXext.so - found -- Looking for gethostbyname -- Looking for gethostbyname - found -- Looking for connect -- Looking for connect - found -- Looking for remove -- Looking for remove - found -- Looking for shmat -- Looking for shmat - found -- Initializing RPCS3_SRC_DIR=/tmp/guix-build-rpcs3-0.0.8.drv-0/source/rpcs3 -- Looking for pthread.h -- Looking for pthread.h - found -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - found -- Found Threads: TRUE -- CXX target rpcs3_emu cotired without unity build excluding ../../Utilities/JIT.cpp, Cell/PPUTranslator.cpp. -- RPCS3_GIT_VERSION: unknown -- RPCS3_GIT_BRANCH: unknown -- CXX target rpcs3 cotired without unity build. -- Configuring incomplete, errors occurred! See also "/tmp/guix-build-rpcs3-0.0.8.drv-0/build/CMakeFiles/CMakeOutput.log". See also "/tmp/guix-build-rpcs3-0.0.8.drv-0/build/CMakeFiles/CMakeError.log". command "cmake" "../source" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DCMAKE_INSTALL_PREFIX=/gnu/store/0p9v13dy10abknx6j48yn9dwwx614x56-rpcs3-0.0.8" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" "-DCMAKE_INSTALL_RPATH=/gnu/store/0p9v13dy10abknx6j48yn9dwwx614x56-rpcs3-0.0.8/lib" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_FFMPEG=ON" "-DBUILD_LLVM_SUBMODULE=OFF" "-DWITH_LLVM=OFF" "-DUSE_NATIVE_INSTRUCTIONS=OFF" failed with status 1 --8<---------------cut here---------------end--------------->8--- --- gnu/packages/emulators.scm | 85 +++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b9c854ca25..650c80e4dc 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019, 2020 Pierre Neidhardt ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Jakub Kądziołka ;;; @@ -46,6 +46,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages digest) #:use-module (gnu packages elf) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) @@ -61,6 +62,7 @@ #:use-module (gnu packages libedit) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) @@ -72,12 +74,14 @@ #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages wxwidgets) @@ -1563,3 +1567,82 @@ 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 rpcs3 + ;; git-version is `$(git rev-list HEAD --count)-$(git rev-parse --short HEAD)`. + (let ((git-version "9605-7a7ac625c")) + (package + (name "rpcs3") + (version "0.0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/RPCS3/rpcs3") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1219lzr18f7jfgval5scmw7xllgqs43sxg659f37rx8vy9f9r3s8")))) + (build-system cmake-build-system) + (arguments + `(;; #:parallel-build? #f + #:configure-flags '("-DUSE_SYSTEM_LIBPNG=ON" + "-DUSE_SYSTEM_FFMPEG=ON" + ;; "-DXXHASH_BUNDLED_MODE=OFF" + ;; "-DYAML_CPP_BUILD_TOOLS=OFF" + ;; "-DYAML_CPP_BUILD_CONTRIB=OFF" + ;; "-DSKIP_GLSLANG_INSTALL=ON" + "-DBUILD_LLVM_SUBMODULE=OFF" + "-DWITH_LLVM=OFF" + "-DUSE_NATIVE_INSTRUCTIONS=OFF") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-git-version + (lambda* _ + ;; Version must be set manually since the build system would use + ;; .git otherwise. + (with-output-to-file "rpcs3/git-version.h" + (lambda () + (display + (string-append + "#define RPCS3_GIT_VERSION \"" ,git-version "\"\n" + "#define RPCS3_GIT_BRANCH \"HEAD\"\n" + "#define RPCS3_GIT_VERSION_NO_UPDATE 1\n")))) + #t))))) + (native-inputs + `(("gcc" ,gcc-9) + ;; ("llvm" ,llvm) + ("pkg-config" ,pkg-config) + ;; ("git" ,git) + )) + (inputs + `(("mesa" ,mesa) + ("glslang" ,glslang) + ("glew" ,glew) + ("openal" ,openal) + ("sdl2" ,sdl2) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader) + ("libpng" ,libpng) + ("ffmpeg" ,ffmpeg) + ("faudio" ,faudio) + ("libevdev" ,libevdev) + ("xxhash" ,xxhash) + ("yaml-cpp" ,yaml-cpp) + ("libusb" ,libusb) + ("hidapi" ,hidapi) + ("pugixml" ,pugixml) + ("python" ,python) + ("alsa-lib" ,alsa-lib) + ("wayland" ,wayland) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtquickcontrols" ,qtquickcontrols) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://rpcs3.net/") + (synopsis "PlayStation 3 emulator and debugger") + (description + "RPCS3 is a multi-platform Sony PlayStation 3 emulator and debugger +written in C++.") + (supported-systems '("x86_64-linux")) + (license license:gpl2+))))