[bug#53704] Bump

[Maxime Devos <maximedevos@telenet.be>]

[-- 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 --]