From patchwork Fri Jan 17 04:45:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37099 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 1B7B527BBEA; Fri, 17 Jan 2025 04:47:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 524A727BBE2 for ; Fri, 17 Jan 2025 04:47:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYeGI-0005Kb-8f; Thu, 16 Jan 2025 23:47:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYeGE-0005Jp-56 for guix-patches@gnu.org; Thu, 16 Jan 2025 23:47:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYeGB-0004zp-Vi for guix-patches@gnu.org; Thu, 16 Jan 2025 23:47:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=FP0ENwlzwIF5o5l9n9qRQpro8tI04ZgXyqOtCN/jvGScJi3q6qV2VxYbiaqQ55cyLwU4V3nYmUnYsp073SatUfPqQGkTZJ7bTapJwpLV1RE8/dBsFsgUGTSELMFye2EVGrA23Bs/K4wcN6/+4nIkW8FOBh6Fa2hXu1DF3+tGtuQ2H4hiFOmu28/NM4DFkDG2v1mM98NWZJ+KjfsqHmz8d5E3dhD97h2MgBU/awCF/3wITY/+KzJlvB2KqIojrP40nPYeOWf057/fpx2UqHGnec2rxqAzUJ3pxkOf/Z8Znf/Ej4P9jB5sl3rA4CccQXbL5VCEmljTJCVl8X6lkUFZEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tYeG6-0001SZ-Pd; Thu, 16 Jan 2025 23:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH 2/7] gnu: dolphin-emu: Unbundle more libraries and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 17 Jan 2025 04:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.17370892115561 (code B ref 75619); Fri, 17 Jan 2025 04:47:02 +0000 Received: (at 75619) by debbugs.gnu.org; 17 Jan 2025 04:46:51 +0000 Received: from localhost ([127.0.0.1]:35597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYeFq-0001RT-Mv for submit@debbugs.gnu.org; Thu, 16 Jan 2025 23:46:51 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:51607) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tYeFm-0001RA-Ur for 75619@debbugs.gnu.org; Thu, 16 Jan 2025 23:46:45 -0500 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-216401de828so29293225ad.3 for <75619@debbugs.gnu.org>; Thu, 16 Jan 2025 20:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737089196; x=1737693996; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=RkS2Vy5ijZDQfNBbPABHFrPVrb6UO5NRO8DOXsMfooxCn3IArB7WFv/uTF4y5zzdQG xljlMR+FvewmLan0H6c5lDa/6J1eC1D3F48o2OuTYsU1i0C1DtDiljWtJddg4gZ/fpSC rjOBZmOarXuYsoDcgyjGq5r9Ki43NazsVeL3ZREReXgPZARrqmu4VE0f25SyOkSsaPC/ MdFBJsVrCVhhUQkDpBgwls07CNgNstEQTbX2drAi+HnXMKQWSM+GmS8gU5qsVgirDCBv xvXw/sN799o/wGp8LJP27kmceBI1tHwnEZC9ukGkZN2RXm+KTH9AiRAXEd/u3pu4ycBG 74qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737089196; x=1737693996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=hbpplXm6SByvc35PsyNHvoq1UX+TcyEicrV7ZH3S2L5PtLpvNFXT8ULHrHL4SK0C9p mBgGC3G47NSBnZb7FXZB6D5Lz4A/8DYJTTZgRIMopuNxKQREa3uC5QYI3HXz3U0sO9le lquaJ4qURwB8+VTEQuT9tjkzIN2OdNz1TGgAd1fhnZriI9eVi2ol/AwYYbt7ALtyqcOY G9eQ7fgh2RvY/NZwwRcPEnIKcU4Jm9flbnG4na0PqvYEI+f89JfkfNGRr7xsr5/HHNnB 8KuVB7cSS13+oW3G41Q78VEr7a0mFJoaytuvn5n3F8Ht8v3ZUSOSbJ2ZZ4uspsOTe0SI 4NsA== X-Gm-Message-State: AOJu0YycdIpCNoMnIbv+Gm52S6CNCj8uS1RIvppYshEHhz185rKtFHVa EYzKyPf3s1qx742xpjZZaAbygT/7CD2Tb23gbBoC4hX+Pp8iOdcFfB/Nc/PM X-Gm-Gg: ASbGnctjIb+vHGvE6zMwwsamdaef+SGQqOfMahUfUCWs9uTvCpPFrTIBedCAVgGKW/6 oz7+zSSqNRBJfl5QJDHVG4iOBDVNzGtA6zl6F2F0eNya3wZZuCri+atMq6ynntBP1rmkHFymoR2 3tMpuz+wNr2TdiN1WzyeDlWsUK85/z3bigVAlzvRSTA56R+Xi4ialU0hHBabPeh6P0H+xcUwdgP vWfsf7IMJccuLVAjAF6zTOk4ZCjAb+ukt8iUh1hPK0EOAdY0sA9wHn/x1XnziL7Je2+puxkFLzs LQiG75ZRik2f X-Google-Smtp-Source: AGHT+IFhmvmM95mtgowWm0z6Moifa+C7PtuLQ/j+oecCB5dbb1LqnOK8onRR/W2HgOJZNay9vHJAbw== X-Received: by 2002:a05:6a00:4207:b0:72d:710d:611c with SMTP id d2e1a72fcca58-72dafae2337mr2599942b3a.20.1737089196198; Thu, 16 Jan 2025 20:46:36 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-a9bdf57de17sm863935a12.77.2025.01.16.20.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 20:46:35 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Jan 2025 13:45:52 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emulators.scm (dolphin-emu) [source] : Delete bzip2, cubeb, enet, fmt, pugixml, soundtouch, xxhash and zstd sources and de-register enet, soundtouch and xxhash from the build system. [arguments] <#:tests?>: Delete argument. <#:phases>: Add remove-unittests-target-post-build-command and post-check phases. <#:configure-flags>: Specify CMAKE_CXX_FLAGS to locate soundtouch headers. <#:test-target>: New argument. [inputs]: Add bzip2, cubeb, enet, fmt-7, minizip-ng, xxhash and zstd:lib. Replace soundtouch with soundtouch-1/integer-samples. Change-Id: Id996d992674f9efbbb2eb562286447a388716a82 --- gnu/packages/emulators.scm | 142 ++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 42 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9e2d6485dd..6f77329f27 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Christopher Howard ;;; Copyright © 2021 Felipe Balbi ;;; Copyright © 2021, 2024 Felix Gruber -;;; Copyright © 2021, 2024 Maxim Cournoyer +;;; Copyright © 2021, 2024, 2025 Maxim Cournoyer ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2023 c4droid ;;; Copyright © 2023 Yovan Naumovski @@ -94,6 +94,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -294,58 +295,112 @@ (define-public dolphin-emu ;; Remove external stuff we don't need. (for-each (lambda (dir) (delete-file-recursively - (string-append "Externals/" dir))) - '("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg" - "gettext" "hidapi" "libpng" "libusb" "mbedtls" - "miniupnpc" "MoltenVK" "zlib")) + (string-append "Externals/" dir))) + '("LZO" "OpenAL" "Qt" "SFML" "bzip2" + ;; XXX: Attempting to use the vulkan-headers package + ;; results in "error: + ;; ‘VK_PRESENT_MODE_RANGE_SIZE_KHR’ was not declared + ;; in this scope". + ;;"Vulkan" + "cubeb" "curl" "enet" + "ffmpeg" "fmt" "gettext" + ;; XXX: Attempting to use an unbundled glslang at the + ;; exact commit used by Dolphin still results in + ;; "error: ‘DefaultTBuiltInResource’ is not a member + ;; of ‘glslang’". + ;;"glslang" + ;; XXX: Googletest cannot currently easily be + ;; unbundled, as there are missing linking + ;; directives. + ;;"gtest" + "hidapi" "libpng" "libusb" "mbedtls" + "miniupnpc" "minizip" "MoltenVK" "pugixml" + "soundtouch" + "xxhash" "zlib" "zstd")) ;; Clean up source. (for-each delete-file - (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")))))) + (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) + ;; Do not attempt to include now-missing directories. + (substitute* "CMakeLists.txt" + ((".*add_subdirectory.*Externals/enet.*") "") + ((".*add_subdirectory.*Externals/soundtouch.*") "") + ((".*add_subdirectory.*Externals/xxhash.*") "")))))) (build-system cmake-build-system) (arguments - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'generate-fonts&hardcore-libvulkan-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((fontfile - (search-input-file inputs - "/share/fonts/truetype/wqy-microhei.ttc")) - (libvulkan - (search-input-file inputs "/lib/libvulkan.so"))) - (chdir "docs") - (invoke "bash" "-c" "g++ -O2 $(freetype-config \ + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'remove-unittests-target-post-build-command + (lambda _ + ;; To skip a few problematic tests, CTest will be manually + ;; invoked in the post-check phase. + (with-directory-excursion "Source/UnitTests" + (substitute* "CMakeLists.txt" + (("add_custom_command\\(TARGET unittests POST_BUILD.*") + ""))))) + (add-before 'configure 'generate-fonts&hardcore-libvulkan-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((fontfile + (search-input-file inputs + "/share/fonts/truetype/wqy-microhei.ttc")) + (libvulkan + (search-input-file inputs "/lib/libvulkan.so"))) + (chdir "docs") + (invoke "bash" "-c" "g++ -O2 $(freetype-config \ --cflags --libs) gc-font-tool.cpp -o gc-font-tool") - (invoke "./gc-font-tool" "a" fontfile "font_western.bin") - (invoke "./gc-font-tool" "s" fontfile "font_japanese.bin") - (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") - (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") - (chdir "..") - (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" - (("\"vulkan\", 1") (string-append "\"vulkan\"")) - (("\"vulkan\"") (string-append "\"" libvulkan "\"")) - (("Common::DynamicLibrary::GetVersionedFilename") "")))))) - - ;; The FindGTK2 cmake script only checks hardcoded directories for - ;; glib/gtk headers. - - #:configure-flags - (list (string-append "-DX11_INCLUDE_DIR=" - (assoc-ref %build-inputs "libx11") - "/include") - (string-append "-DX11_LIBRARIES=" - (assoc-ref %build-inputs "libx11") - "/lib/libX11.so") - "-DX11_FOUND=1"))) + (invoke "./gc-font-tool" "a" fontfile "font_western.bin") + (invoke "./gc-font-tool" "s" fontfile "font_japanese.bin") + (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") + (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") + (chdir "..") + (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" + (("\"vulkan\", 1") (string-append "\"vulkan\"")) + (("\"vulkan\"") (string-append "\"" libvulkan "\"")) + (("Common::DynamicLibrary::GetVersionedFilename") ""))))) + (add-after 'check 'post-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "Source/UnitTests" + (invoke "ctest" "-V" "--output-on-failure" + ;; These tests fail due to libusb failing to + ;; init inside the build container. + "-E" (string-join + '("MMIOTest" + "PageFaultTest" + "CoreTimingTest" + "FileSystemTest" + "PowerPCTest" + "VertexLoaderTest") + "|"))))))) + ;; The FindGTK2 cmake script only checks hardcoded directories for + ;; glib/gtk headers. Also add some include directories via the CXX + ;; flags to let GCC find some headers not actively searched by the + ;; build system. + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=" + "-I" (search-input-directory + %build-inputs "include/soundtouch")) + (string-append "-DX11_INCLUDE_DIR=" + #$(this-package-input "libx11") + "/include") + (string-append "-DX11_LIBRARIES=" + (search-input-file %build-inputs + "lib/libX11.so")) + "-DX11_FOUND=1") + #:test-target "unittests")) (native-inputs (list gettext-minimal pkg-config)) (inputs (list alsa-lib ao bluez + bzip2 + cubeb curl + enet eudev ffmpeg-4 + fmt-7 font-wqy-microhei freetype glew @@ -363,6 +418,7 @@ (define-public dolphin-emu mbedtls-lts mesa miniupnpc + minizip-ng openal pugixml pulseaudio @@ -370,9 +426,11 @@ (define-public dolphin-emu sdl2 sfml soil - soundtouch + soundtouch-1/integer-samples vulkan-loader - zlib)) + xxhash + zlib + `(,zstd "lib"))) (home-page "https://dolphin-emu.org/") (synopsis "Nintendo Wii and GameCube emulator") (description @@ -380,7 +438,7 @@ (define-public dolphin-emu GameCube and the Wii. It provides compatibility with all PC controllers, turbo speed, networked multiplayer, and graphical enhancements.") (supported-systems '("x86_64-linux" "aarch64-linux")) - ; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. + ;; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. (license (list license:gpl2+ license:asl2.0 license:fdl1.2+))))) (define-public dosbox