From patchwork Sat Feb 12 00:30:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Charles X-Patchwork-Id: 37208 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 6F8E527BBEA; Sat, 12 Feb 2022 01:19:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D1F1A27BBE9 for ; Sat, 12 Feb 2022 01:19:49 +0000 (GMT) Received: from localhost ([::1]:41364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIh4n-0005DO-0P for patchwork@mira.cbaines.net; Fri, 11 Feb 2022 20:19:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIgJa-0007Q3-BQ for guix-patches@gnu.org; Fri, 11 Feb 2022 19:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIgJZ-0007EJ-Vv for guix-patches@gnu.org; Fri, 11 Feb 2022 19:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIgJZ-0005lw-Q7 for guix-patches@gnu.org; Fri, 11 Feb 2022 19:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53704] Bump Resent-From: Charles Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Feb 2022 00:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Julien Lepiller Cc: "53704@debbugs.gnu.org" <53704@debbugs.gnu.org> Received: via spool by 53704-submit@debbugs.gnu.org id=B53704.164462582222139 (code B ref 53704); Sat, 12 Feb 2022 00:31:01 +0000 Received: (at 53704) by debbugs.gnu.org; 12 Feb 2022 00:30:22 +0000 Received: from localhost ([127.0.0.1]:32989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIgIr-0005ks-Gv for submit@debbugs.gnu.org; Fri, 11 Feb 2022 19:30:22 -0500 Received: from mail-40130.protonmail.ch ([185.70.40.130]:30550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIgIo-0005k6-OX for 53704@debbugs.gnu.org; Fri, 11 Feb 2022 19:30:15 -0500 Date: Sat, 12 Feb 2022 00:30:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1644625807; bh=kemrdg8Rff6bSx1APS+AvQFn8v1GVFc67WXKzZIHchI=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=CPMwzjlzwhMhOmjsNQMsUU35AjRvF8Radg8tNiwcgU92BeUg5aUkvLog4evyV7tvY edAc6Y77eT7YNW/SjAS2Pp4vJx7StEcq9cPYaFfiPhHrQbWsnk22NqZggS5EZbCvp7 3YxeABgHs1/tg5OAT4hoBg2ywkEtxcEbJLtOKPVmCD8E+i7fnsgh/Zk6tNaCnzmye5 ZTz5ilqTDlYXbM1BFg7B8h34pDeYgES7e0h1pct0QqO+o6a4eTIzoND7yU+g2EV/aG sSJumjK+bcSx9vPgh9DJQzE2Kco5xjoglJHM4uyIyNJ5yhYL9m48Z+kmU4TCspsnjv DE58wS6OYMf9w== Message-ID: <3c9dxjEeXYXD76uUQgjwTlqZOtOb7IFb8FX50AHQoH9bc-bapcr6kxnaouHjVYd3CaIPjKPiuUwZ6tx6VW-YRPKUMri5i_mLx4du5ux81a8=@protonmail.com> In-Reply-To: <33CA9DF7-1E9D-410D-9775-61825B56A0DF@lepiller.eu> References: <_jHX_rdAkHOB9IqHIQfXfggyuZwAL-8cC92ZuWnlLfjZtXdqUHY5XBLRjD32CGrxNx7uBzHJgAtN_YdHoifX1Y4Vhaayg_gWJX6wqPZDhx4=@protonmail.com> <33CA9DF7-1E9D-410D-9775-61825B56A0DF@lepiller.eu> 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" Reply-to: Charles X-ACL-Warn: , Charles via Guix-patches X-Patchwork-Original-From: Charles via Guix-patches via From: Charles X-getmail-retrieved-from-mailbox: Patches Thanks for the review, Julien. Here is a new patch that includes your suggestions. ------- Original Message ------- On Friday, February 11th, 2022 at 1:05 AM, Julien Lepiller wrote: > Your patch looks good, though I haven't tested yet. In your synopsis, it's "an emulator", not "a emulator". The patches should contain author information. Did you create them yourself? Did you get them from somewhere else? > > The gcc patch could be replaced with a phase that substitutes cc for gcc. > > You need to add the patches to gnu/local.mk. > > Thanks! > > On February 11, 2022 7:51:31 AM GMT+01:00, Charles via Guix-patches via wrote: > > > Is there any chance this can get merged? If there is something wrong with the package, I am happy to fix it. From 3b03ca688dd33091d4e43754eaf3c74ad00cbd10 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 1 Feb 2022 10:36:06 -0600 Subject: [PATCH] gnu: emulators: Add visualboyadvance-m. * gnu/packages/emulators.scm (visualboyadvance-m): New variable. * gnu/packages/patches/visualboyadvance-m-fix-rpath.patch: New patch. --- gnu/local.mk | 1 + gnu/packages/emulators.scm | 53 +++++++++++++++++++ .../visualboyadvance-m-fix-rpath.patch | 25 +++++++++ 3 files changed, 79 insertions(+) create mode 100644 gnu/packages/patches/visualboyadvance-m-fix-rpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b08b40b9c..5e6bceedfb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1960,6 +1960,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ + %D%/packages/patches/visualboyadvance-m-fix-rpath.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9ec73bc11f..ae4c395d78 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 Charles Jackson ;;; ;;; This file is part of GNU Guix. ;;; @@ -814,6 +815,58 @@ (define-public sameboy from an emulator---from save states to scaling filters.") (license license:expat))) +(define-public visualboyadvance-m + (package + (name "visualboyadvance-m") + (version "2.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/visualboyadvance-m/visualboyadvance-m/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg")) + (patches (search-patches "visualboyadvance-m-fix-rpath.patch")))) + (build-system cmake-build-system) + (arguments + '(#:build-type "Release" + #:tests? #f + #:configure-flags + (list "-DENABLE_SSP=ON" + "-DENABLE_ONLINEUPDATES=OFF" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "wxwidgets"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-c-compiler + (lambda _ + (substitute* "cmake/HostCompile.cmake" + ((" cc ") " gcc ")))) + (add-before 'configure 'set-home + (lambda _ (setenv "HOME" (getcwd))))))) + (native-inputs (list + gettext-minimal + nasm + pkg-config + zip)) + (inputs (list + ffmpeg + gtk+ + libpng + mesa + openal + sdl2 + sfml + wxwidgets + zlib)) + (home-page "https://vba-m.com/") + (synopsis "Performant Nintendo Gameboy emulator") + (description "Visual Boy Advance M is an emulator of the Game Boy, Game Boy +Color, and Game Boy Advance handheld game consoles.") + (license license:gpl2+))) + (define-public mupen64plus-core (package (name "mupen64plus-core") diff --git a/gnu/packages/patches/visualboyadvance-m-fix-rpath.patch b/gnu/packages/patches/visualboyadvance-m-fix-rpath.patch new file mode 100644 index 0000000000..9116f35b2a --- /dev/null +++ b/gnu/packages/patches/visualboyadvance-m-fix-rpath.patch @@ -0,0 +1,25 @@ +From 6ec4f4224aa360d5c233941148465ad1c8c77f33 Mon Sep 17 00:00:00 2001 +From: Charles Jackson +Date: Mon, 31 Jan 2022 23:24:17 -0600 +Subject: [PATCH] Fix rpath + +--- + CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 010c9b0e..3a959b59 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -610,9 +610,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) + + set(MY_C_LINKER_FLAGS ${MY_C_LINKER_FLAGS} -Wl,-allow-multiple-definition) + +- if(CMAKE_PREFIX_PATH) +- list(GET CMAKE_PREFIX_PATH 0 prefix_path_first) +- set(MY_C_LINKER_FLAGS ${MY_C_LINKER_FLAGS} "-Wl,-rpath-link=${prefix_path_first}/lib") +- endif() ++ set(MY_C_LINKER_FLAGS ${MY_C_LINKER_FLAGS} "-Wl,-rpath,$ENV{LIBRARY_PATH}") + endif() + + # set linker flags \ No newline at end of file -- 2.34.0