summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-21 00:45:08 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-21 00:45:08 +0200
commitfb5296605e84a09764c7428e778c54af5033b722 (patch)
treeb28dca7373c1fff585fd11a73d903a6d7a008db0
parentgnu: emacs-hyperbole: Use inputs instead of propagated inputs. (diff)
downloadguix-fb5296605e84a09764c7428e778c54af5033b722.tar.gz
guix-fb5296605e84a09764c7428e778c54af5033b722.tar.bz2
guix-fb5296605e84a09764c7428e778c54af5033b722.tar.xz
gnu: xmoto: Update to 0.6.0-0-f7ca787.
* gnu/packages/games.scm (xmoto): Update to 0.6.0-0-f7ca787. [source]: Remove patches. [arguments]: Remove make-flags keyword. * gnu/packages/patches/xmoto-remove-glext.patch: * gnu/packages/patches/xmoto-reproducible.patch: * gnu/packages/patches/xmoto-utf8.patch: Delete files. * gnu/local.mk: Register previous deletions.
-rw-r--r--gnu/local.mk3
-rw-r--r--gnu/packages/games.scm187
-rw-r--r--gnu/packages/patches/xmoto-remove-glext.patch23
-rw-r--r--gnu/packages/patches/xmoto-reproducible.patch24
-rw-r--r--gnu/packages/patches/xmoto-utf8.patch16
5 files changed, 104 insertions, 149 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 090d0ee..347d4bb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1609,9 +1609,6 @@ dist_patch_DATA = \
1609 %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ 1609 %D%/packages/patches/xf86-video-voodoo-pcitag.patch \
1610 %D%/packages/patches/xfce4-panel-plugins.patch \ 1610 %D%/packages/patches/xfce4-panel-plugins.patch \
1611 %D%/packages/patches/xfce4-settings-defaults.patch \ 1611 %D%/packages/patches/xfce4-settings-defaults.patch \
1612 %D%/packages/patches/xmoto-utf8.patch \
1613 %D%/packages/patches/xmoto-remove-glext.patch \
1614 %D%/packages/patches/xmoto-reproducible.patch \
1615 %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ 1612 %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \
1616 %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ 1613 %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
1617 %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ 1614 %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 39669ba..d01d3fc 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10420,89 +10420,110 @@ This package is part of the KDE games module.")
10420 (license (list license:gpl2+ license:fdl1.2+)))) 10420 (license (list license:gpl2+ license:fdl1.2+))))
10421 10421
10422(define-public xmoto 10422(define-public xmoto
10423 (package 10423 ;; The commit below includes a fix to a build error.
10424 (name "xmoto") 10424 (let ((commit "f7ca787d02bd876c6eb989a28b180a05220621ee")
10425 (version "0.5.11") 10425 (revision "0"))
10426 (source 10426 (package
10427 (origin 10427 (name "xmoto")
10428 (method url-fetch) 10428 (version (git-version "0.6.0" revision commit))
10429 (uri (string-append 10429 (source
10430 "http://download.tuxfamily.org/xmoto/xmoto/" version "/" 10430 (origin
10431 "xmoto-" version "-src.tar.gz")) 10431 (method git-fetch)
10432 (sha256 10432 (uri (git-reference
10433 (base32 "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155")) 10433 (url "https://github.com/xmoto/xmoto.git")
10434 (patches 10434 (commit commit)))
10435 (search-patches 10435 (file-name (git-file-name name version))
10436 "xmoto-remove-glext.patch" ;fixes licensing issue 10436 (sha256
10437 "xmoto-reproducible.patch" 10437 (base32 "1kiwqni58vjdqfb289d1dqcb758hdl2k970dawxq5vdaqrbnsxv4"))
10438 "xmoto-utf8.patch")) 10438 (modules '((guix build utils)
10439 ;; Unbundle ODE. 10439 (ice-9 ftw)
10440 (modules '((guix build utils))) 10440 (srfi srfi-1)))
10441 (snippet 10441 ;; XXX: Remove some bundled libraries. Guix provides
10442 `(begin 10442 ;; Chipmunk, but it appears to be incompatible with the
10443 (delete-file-recursively "src/ode") 10443 ;; (older) one bundled. Likewise, Guix provides ODE, but
10444 #t)))) 10444 ;; using it induces rendering issues. Eventually, libccd is
10445 (build-system gnu-build-system) 10445 ;; required to compile built-in ODE.
10446 (arguments 10446 (snippet
10447 ;; XXX: First flag prevents a build error with GCC7+. The second 10447 `(begin
10448 ;; flag works around missing text in game. Both are fixed 10448 (let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode")))
10449 ;; upstream. Remove once xmoto 0.5.12+ is released. 10449 (with-directory-excursion "vendor"
10450 `(#:make-flags '("CXXFLAGS=-fpermissive -D_GLIBCXX_USE_CXX11_ABI=0") 10450 (for-each delete-file-recursively
10451 #:phases 10451 (lset-difference string=?
10452 (modify-phases %standard-phases 10452 (scandir ".")
10453 (add-after 'install 'install-desktop-file 10453 (cons* "." ".." keep))))
10454 (lambda* (#:key outputs #:allow-other-keys) 10454 (substitute* "src/CMakeLists.txt"
10455 (let* ((out (assoc-ref outputs "out")) 10455 (("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library)
10456 (apps (string-append out "/share/applications")) 10456 (if (member library keep) line ""))))
10457 (pixmaps (string-append out "/share/pixmaps"))) 10457 #t))))
10458 (install-file "extra/xmoto.desktop" apps) 10458 (build-system cmake-build-system)
10459 (install-file "extra/xmoto.xpm" pixmaps) 10459 (arguments
10460 #t))) 10460 `(#:tests? #f ;no test
10461 (add-after 'install-desktop-file 'install-fonts 10461 #:phases
10462 (lambda* (#:key outputs inputs #:allow-other-keys) 10462 (modify-phases %standard-phases
10463 (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") 10463 ;; Install phase ignores this man page. Install it early,
10464 "/share/fonts/truetype/")) 10464 ;; because the process moves to another directory shortly
10465 (target-dir (string-append (assoc-ref outputs "out") 10465 ;; after.
10466 "/share/xmoto/Textures/Fonts/"))) 10466 (add-after 'unpack 'install-man-page
10467 (for-each (lambda (f) 10467 (lambda* (#:key outputs #:allow-other-keys)
10468 (let ((font (string-append font-dir f)) 10468 (install-file "xmoto.6"
10469 (target (string-append target-dir f))) 10469 (string-append (assoc-ref outputs "out")
10470 (delete-file target) 10470 "/share/man/man6"))
10471 (symlink font target))) 10471 #t))
10472 '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) 10472 (add-after 'unpack 'fix-hard-coded-directory
10473 #t))) 10473 (lambda* (#:key outputs #:allow-other-keys)
10474 (add-after 'install-fonts 'install-man-page 10474 (substitute* "src/common/VFileIO.cpp"
10475 (lambda* (#:key outputs #:allow-other-keys) 10475 (("/usr/share")
10476 (install-file "xmoto.6" 10476 (string-append (assoc-ref outputs "out") "/share")))
10477 (string-append (assoc-ref outputs "out") 10477 #t))
10478 "/share/man/man6")) 10478 (add-before 'build 'set-SDL
10479 #t))))) 10479 ;; Set correct environment for SDL.
10480 (native-inputs 10480 (lambda* (#:key inputs #:allow-other-keys)
10481 `(("gettext" ,gettext-minimal))) 10481 (setenv "CPATH"
10482 (inputs 10482 (string-append
10483 `(("curl" ,curl) 10483 (assoc-ref inputs "sdl") "/include/SDL:"
10484 ("font-dejavu" ,font-dejavu) 10484 (or (getenv "CPATH") "")))
10485 ("glu" ,glu) 10485 #t))
10486 ("libjpeg" ,libjpeg-turbo) 10486 (add-after 'install 'unbundle-fonts
10487 ("libpng" ,libpng) 10487 ;; Unbundle DejaVuSans TTF files.
10488 ("libxdg-basedir" ,libxdg-basedir) 10488 (lambda* (#:key outputs inputs #:allow-other-keys)
10489 ("libxml2" ,libxml2) 10489 (let ((font-dir (string-append (assoc-ref inputs "font-dejavu")
10490 ("lua" ,lua-5.2) 10490 "/share/fonts/truetype/"))
10491 ("ode" ,ode) 10491 (target-dir (string-append (assoc-ref outputs "out")
10492 ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) 10492 "/share/xmoto/Textures/Fonts/")))
10493 ("sqlite" ,sqlite) 10493 (for-each (lambda (f)
10494 ("zlib" ,zlib))) 10494 (let ((font (string-append font-dir f))
10495 (home-page "https://xmoto.tuxfamily.org/") 10495 (target (string-append target-dir f)))
10496 (synopsis "2D motocross platform game") 10496 (delete-file target)
10497 (description "X-Moto is a challenging 2D motocross platform game, where 10497 (symlink font target)))
10498physics play an all important role in the gameplay. You need to control your 10498 '("DejaVuSans.ttf" "DejaVuSansMono.ttf"))
10499bike to its limit, if you want to have a chance finishing the more difficult 10499 #t))))))
10500challenges.") 10500 (native-inputs
10501 (license (list license:gpl2+ ;whole project 10501 `(("gettext" ,gettext-minimal)
10502 license:bsd-4 ;src/bzip 10502 ("pkg-config" ,pkg-config)))
10503 license:bsd-3 ;src/md5sum 10503 (inputs
10504 license:lgpl2.1+ ;src/iqsort.h 10504 `(("bzip2" ,bzip2)
10505 license:expat)))) 10505 ("curl" ,curl)
10506 ("font-dejavu" ,font-dejavu)
10507 ("glu" ,glu)
10508 ("libjpeg" ,libjpeg-turbo)
10509 ("libpng" ,libpng)
10510 ("libxdg-basedir" ,libxdg-basedir)
10511 ("libxml2" ,libxml2)
10512 ("lua" ,lua-5.1)
10513 ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
10514 ("sqlite" ,sqlite)
10515 ("zlib" ,zlib)))
10516 (home-page "https://xmoto.tuxfamily.org/")
10517 (synopsis "2D motocross platform game")
10518 (description
10519 "X-Moto is a challenging 2D motocross platform game, where
10520physics play an all important role in the gameplay. You need to
10521control your bike to its limit, if you want to have a chance finishing
10522the more difficult challenges.")
10523 (license (list license:gpl2+ ;whole project
10524 license:bsd-3 ;vendor/md5sum
10525 license:lgpl2.1+
10526 license:expat)))))
10506 10527
10507(define-public eboard 10528(define-public eboard
10508 (package 10529 (package
diff --git a/gnu/packages/patches/xmoto-remove-glext.patch b/gnu/packages/patches/xmoto-remove-glext.patch
deleted file mode 100644
index ad0c848..0000000
--- a/gnu/packages/patches/xmoto-remove-glext.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Description: Allow building without upstream-supplied glext.h
2Author: Stephen Kitt <steve@sk2.org>
3Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=803
4
5--- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h
6+++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h
7@@ -1,7 +1,6 @@
8 #ifdef ENABLE_OPENGL
9 /* Pull in OpenGL headers */
10 /* following scissored from SDL_opengl.h */
11-#define __glext_h_ /* Don't let gl.h include glext.h */
12 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
13 #include <OpenGL/gl.h> /* Header File For The OpenGL Library */
14 #include <OpenGL/glu.h> /* Header File For The GLU Library */
15@@ -12,8 +11,5 @@
16 #include <GL/gl.h> /* Header File For The OpenGL Library */
17 #include <GL/glu.h> /* Header File For The GLU Library */
18 #endif
19-#undef __glext_h_
20-
21-#include "../glext.h"
22
23 #endif
diff --git a/gnu/packages/patches/xmoto-reproducible.patch b/gnu/packages/patches/xmoto-reproducible.patch
deleted file mode 100644
index 606f4ec..0000000
--- a/gnu/packages/patches/xmoto-reproducible.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Description: Avoid __DATE__ and __TIME__ to build reproducibly
2Author: Stephen Kitt <skitt@debian.org>
3
4--- a/src/GameInit.cpp
5+++ b/src/GameInit.cpp
6@@ -248,7 +248,6 @@
7 Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */
8
9 LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str());
10- LogInfo("compiled at "__DATE__" "__TIME__);
11 if(SwapEndian::bigendien) {
12 LogInfo("Systeme is bigendien");
13 } else {
14--- a/src/states/StateOptions.cpp
15+++ b/src/states/StateOptions.cpp
16@@ -1233,8 +1233,6 @@
17 int p=25;
18 makeWindowOptions_infos_line(v_window, "Version", "X-Moto " + XMBuild::getVersionString(true), p);
19 p+=20;
20- makeWindowOptions_infos_line(v_window, "Compilation date", __DATE__ " " __TIME__, p);
21- p+=20;
22 makeWindowOptions_infos_line(v_window, "User data directory", XMFS::getUserDir(FDT_DATA), p);
23 p+=20;
24 makeWindowOptions_infos_line(v_window, "User config directory", XMFS::getUserDir(FDT_CONFIG), p);
diff --git a/gnu/packages/patches/xmoto-utf8.patch b/gnu/packages/patches/xmoto-utf8.patch
deleted file mode 100644
index e5d0dfb..0000000
--- a/gnu/packages/patches/xmoto-utf8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Description: Build with g++'s new utf8.h
2Author: Stephen Kitt <skitt@debian.org>
3
4--- a/src/helpers/utf8.h
5+++ b/src/helpers/utf8.h
6@@ -18,8 +18,8 @@
7 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
8 =============================================================================*/
9
10-#ifndef __UTF8_H__
11-#define __UTF8_H__
12+#ifndef __XMOTO_UTF8_H__
13+#define __XMOTO_UTF8_H__
14
15 #include <vector>
16 #include <string>