all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxime Devos <maximedevos@telenet.be>
To: Charles <charles.b.jackson@protonmail.com>,
	Julien Lepiller <julien@lepiller.eu>
Cc: "53704@debbugs.gnu.org" <53704@debbugs.gnu.org>
Subject: [bug#53704] Bump
Date: Sat, 12 Feb 2022 14:31:22 +0100	[thread overview]
Message-ID: <11a5c7052c3f76dcf41fc614fed551ee019c1f96.camel@telenet.be> (raw)
In-Reply-To: <3c9dxjEeXYXD76uUQgjwTlqZOtOb7IFb8FX50AHQoH9bc-bapcr6kxnaouHjVYd3CaIPjKPiuUwZ6tx6VW-YRPKUMri5i_mLx4du5ux81a8=@protonmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 607 bytes --]

Hi,

I've modified the package definition and patch a bit to
make it simpler (visualboyadvance-m-fix-rpath.patch now only removed
things), cross-compilable (it uses cc-for-target instead of hardcoding
"gcc" and LIBRARY_PATH is unused) and avoid using constructs that
are being deprecated (%build-inputs --> this-package-input).

The list+local-file will have to be replaced by search-patches.

Cross-compilation is untested because gtk+ cannot currently be
cross-compiled.

It seems to work, at least the application starts, I don't have any VBA
games to test it with.

Greetings,
Maxime.

[-- Attachment #1.2: Type: text/x-scheme, Size: 2371 bytes --]

(use-modules (guix packages) (gnu packages gettext)
  (guix git-download)
  (guix search-paths)
  (gnu packages)
  (guix gexp)
  (guix utils)
  (guix build-system cmake)
  (gnu packages audio)
  (gnu packages cmake)
  (gnu packages assembly)
  (gnu packages pkg-config)
  (gnu packages compression)
  (gnu packages wxwidgets)
  (gnu packages game-development)
  (gnu packages sdl)
  (gnu packages video)
  (gnu packages gtk)
  (gnu packages image)
  (gnu packages gl)
  ((guix licenses) #:prefix license:))

(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 (list (local-file "visualboyadvance-m-fix-rpath.patch")))))
    (build-system cmake-build-system)
    (arguments
     (list #:build-type
           "Release"
           #:tests?
           #f ;no tests
           #:configure-flags
           #~(list "-DENABLE_SSP=ON" "-DENABLE_ONLINEUPDATES=OFF"
                   (string-append "-DCMAKE_PREFIX_PATH="
                                  #$(this-package-input "wxwidgets")))
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'unpack 'set-c-compiler
                 (lambda _
                   (substitute* "cmake/HostCompile.cmake"
                     ((" cc ") (string-append " "
                                              #$(cc-for-target) " "))))))))
    (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+)))

visualboyadvance-m


[-- Attachment #1.3: visualboyadvance-m-fix-rpath.patch --]
[-- Type: text/x-patch, Size: 818 bytes --]

From 6ec4f4224aa360d5c233941148465ad1c8c77f33 Mon Sep 17 00:00:00 2001
From: Charles Jackson <charles.b.jackson@protonmail.com>
Date: Mon, 31 Jan 2022 23:24:17 -0600
Subject: [PATCH] Fix rpath

---
 CMakeLists.txt | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 010c9b0e..3a959b59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -610,9 +610,5 @@ 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()
     endif()
 
     # set linker flags


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

  parent reply	other threads:[~2022-02-12 13:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-01 17:36 [bug#53704] Add Visualboyadvance-m Charles via Guix-patches via
2022-02-11  6:51 ` [bug#53704] Bump Charles via Guix-patches via
2022-02-11  7:05   ` Julien Lepiller
2022-02-12  0:30     ` Charles via Guix-patches via
2022-02-12  9:54       ` Maxime Devos
2022-02-12 10:11       ` Maxime Devos
2022-02-12 11:35       ` Maxime Devos
2022-02-12 12:17         ` Maxime Devos
2022-02-12 13:31       ` Maxime Devos [this message]
2022-02-12 23:45         ` Charles via Guix-patches via
2022-02-27  0:19           ` Charles via Guix-patches via
2022-02-27 10:52           ` Maxime Devos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11a5c7052c3f76dcf41fc614fed551ee019c1f96.camel@telenet.be \
    --to=maximedevos@telenet.be \
    --cc=53704@debbugs.gnu.org \
    --cc=charles.b.jackson@protonmail.com \
    --cc=julien@lepiller.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.