diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-31 01:27:07 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-31 02:31:18 +0100 |
| commit | 1d9a9d27ae4d7981a0df749708b683859ee5c58e (patch) | |
| tree | 2d1fe0fdbd9496289bf9561fbbe1369d26eee260 /gnu/packages/games.scm | |
| parent | 4cae7e67f3164b0626a2a25215f5d94141a860da (diff) | |
| download | guix-1d9a9d27ae4d7981a0df749708b683859ee5c58e.tar guix-1d9a9d27ae4d7981a0df749708b683859ee5c58e.tar.gz | |
gnu: meandmyshadow: Update to 0.5.
* gnu/packages/games.scm (meandmyshadow): Update to 0.5.
[source]: Add unreleased bugfix patch.
[arguments]: Remove obsolete ‘set-sdl'paths’ phase.
[inputs]: Switch to SDL 2. Add lua. Remove libx11, mesa, and glu.
* gnu/packages/patches/meandmyshadow-define-paths-earlier.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/games.scm')
| -rw-r--r-- | gnu/packages/games.scm | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e28dd9fa83..250f6151ef 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -572,7 +572,7 @@ automata. The following features are available: (define-public meandmyshadow (package (name "meandmyshadow") - (version "0.4.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/meandmyshadow/" @@ -580,37 +580,23 @@ automata. The following features are available: "-src.tar.gz")) (sha256 (base32 - "0wl5dc75qy001s6043cx0vr2l5y2qfv1cldqnwill9sfygqj9p95")))) + "1b6qf83vdfv8jwn2jq9ywmda2qn2f5914i7mwfy04m17wx593m3m")) + (patches (search-patches + ;; This will not be needed in the next release. + "meandmyshadow-define-paths-earlier.patch")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; there are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-sdl'paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake/Modules/FindSDL_gfx.cmake" - (("/usr/local/include/SDL") - (string-append (assoc-ref inputs "sdl") - "/include/SDL"))) - ;; Because SDL provides lib/libX11.so.6 we need to explicitly - ;; link with libX11, even though we're using the GL backend. - (substitute* "CMakeLists.txt" - (("\\$\\{X11_LIBRARIES\\}") "-lX11")) - #t))))) + `(#:tests? #f)) ; there are no tests (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("sdl" ,(sdl-union (list sdl - sdl-image - sdl-gfx - sdl-mixer - sdl-ttf))) - ("libx11" ,libx11) ; needed by sdl's libX11 + `(("curl" ,curl) ("libarchive" ,libarchive) - ("openssl" ,openssl) - ("mesa" ,mesa) - ("glu" ,glu) - ("curl" ,curl))) + ("lua" ,lua) + ("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf))))) (home-page "http://meandmyshadow.sourceforge.net/") (synopsis "Puzzle/platform game") (description "Me and My Shadow is a puzzle/platform game in which you try |