From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 04 20:28:01 2020 Received: (at submit) by debbugs.gnu.org; 5 Jan 2020 01:28:01 +0000 Received: from localhost ([127.0.0.1]:43535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inuhx-0007jz-Nh for submit@debbugs.gnu.org; Sat, 04 Jan 2020 20:28:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:35380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inuhu-0007jp-Kq for submit@debbugs.gnu.org; Sat, 04 Jan 2020 20:27:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49565) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inuhs-0007n9-4U for guix-patches@gnu.org; Sat, 04 Jan 2020 20:27:54 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inuho-0008RQ-Ky for guix-patches@gnu.org; Sat, 04 Jan 2020 20:27:52 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59141) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1inuho-0008No-4h for guix-patches@gnu.org; Sat, 04 Jan 2020 20:27:48 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 4F57EE0005 for ; Sun, 5 Jan 2020 01:27:45 +0000 (UTC) From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH] Add xmoto Date: Sun, 05 Jan 2020 02:27:44 +0100 Message-ID: <87lfqmu1yn.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.196 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-=-= Content-Type: text/plain Hello, The following patch adds xmoto. Feedback welcome. Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-xmoto.patch >From 8038314365cf2b1371428237aab938ba72ecf883 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Jan 2020 02:20:35 +0100 Subject: [PATCH] gnu: Add xmoto. * gnu/packages/games.scm (xmoto): New variable. * gnu/packages/patches/xmoto-remove-glext.patch: New file. * gnu/packages/patches/xmoto-reproducible.patch: New file. * gnu/packages/patches/xmoto-utf8.patch: New file. * gnu/local.mk (dist_patch_DATA): Reference new files. --- gnu/local.mk | 3 + gnu/packages/games.scm | 85 +++++++++++++++++++ gnu/packages/patches/xmoto-remove-glext.patch | 23 +++++ gnu/packages/patches/xmoto-reproducible.patch | 24 ++++++ gnu/packages/patches/xmoto-utf8.patch | 16 ++++ 5 files changed, 151 insertions(+) create mode 100644 gnu/packages/patches/xmoto-remove-glext.patch create mode 100644 gnu/packages/patches/xmoto-reproducible.patch create mode 100644 gnu/packages/patches/xmoto-utf8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83bba6b644..92bfdbb20c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1490,6 +1490,9 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xmoto-utf8.patch \ + %D%/packages/patches/xmoto-remove-glext.patch \ + %D%/packages/patches/xmoto-reproducible.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 066e2c8cf3..d9a3eeca35 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9485,3 +9485,88 @@ control of the board by capturing or adding to one square. This package is part of the KDE games module.") (license (list license:gpl2+ license:fdl1.2+)))) + +(define-public xmoto + (package + (name "xmoto") + (version "0.5.11") + (source + (origin + (method url-fetch) + (uri (string-append + "http://download.tuxfamily.org/xmoto/xmoto/" version "/" + "xmoto-" version "-src.tar.gz")) + (sha256 + (base32 "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155")) + (patches + (search-patches + "xmoto-remove-glext.patch" ;fixes licensing issue + "xmoto-reproducible.patch" + "xmoto-utf8.patch")) + ;; Unbundle ODE. + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "src/ode") + #t)))) + (build-system gnu-build-system) + (arguments + ;; XXX: First flag prevents a build error with GCC7+. The second + ;; flag works around missing text in game. Both are fixed + ;; upstream. Remove once xmoto 0.5.12+ is released. + `(#:make-flags '("CXXFLAGS=-fpermissive -D_GLIBCXX_USE_CXX11_ABI=0") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (apps (string-append out "/share/applications")) + (pixmaps (string-append out "/share/pixmaps"))) + (install-file "extra/xmoto.desktop" apps) + (install-file "extra/xmoto.xpm" pixmaps) + #t))) + (add-after 'install-desktop-file 'install-fonts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/")) + (target-dir (string-append (assoc-ref outputs "out") + "/share/xmoto/Textures/Fonts/"))) + (for-each (lambda (f) + (let ((font (string-append font-dir f)) + (target (string-append target-dir f))) + (delete-file target) + (symlink font target))) + '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) + #t))) + (add-after 'install-fonts 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (install-file "xmoto.6" + (string-append (assoc-ref outputs "out") + "/share/man/man6")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("curl" ,curl) + ("font-dejavu" ,font-dejavu) + ("glu" ,glu) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libxdg-basedir" ,libxdg-basedir) + ("libxml2" ,libxml2) + ("lua" ,lua-5.2) + ("ode" ,ode) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://xmoto.tuxfamily.org/") + (synopsis "2D motocross platform game") + (description "X-Moto is a challenging 2D motocross platform game, +where physics play an all important role in the gameplay. You need to +control your bike to its limit, if you want to have a chance finishing +the more difficult of the challenges.") + (license (list license:gpl2+ ;whole project + license:bsd-4 ;src/bzip + license:bsd-3 ;src/md5sum + license:lgpl2.1+ ;src/iqsort.h + license:expat)))) diff --git a/gnu/packages/patches/xmoto-remove-glext.patch b/gnu/packages/patches/xmoto-remove-glext.patch new file mode 100644 index 0000000000..ad0c848d1d --- /dev/null +++ b/gnu/packages/patches/xmoto-remove-glext.patch @@ -0,0 +1,23 @@ +Description: Allow building without upstream-supplied glext.h +Author: Stephen Kitt +Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=803 + +--- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h ++++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h +@@ -1,7 +1,6 @@ + #ifdef ENABLE_OPENGL + /* Pull in OpenGL headers */ + /* following scissored from SDL_opengl.h */ +-#define __glext_h_ /* Don't let gl.h include glext.h */ + #ifdef HAVE_APPLE_OPENGL_FRAMEWORK + #include /* Header File For The OpenGL Library */ + #include /* Header File For The GLU Library */ +@@ -12,8 +11,5 @@ + #include /* Header File For The OpenGL Library */ + #include /* Header File For The GLU Library */ + #endif +-#undef __glext_h_ +- +-#include "../glext.h" + + #endif diff --git a/gnu/packages/patches/xmoto-reproducible.patch b/gnu/packages/patches/xmoto-reproducible.patch new file mode 100644 index 0000000000..606f4ec714 --- /dev/null +++ b/gnu/packages/patches/xmoto-reproducible.patch @@ -0,0 +1,24 @@ +Description: Avoid __DATE__ and __TIME__ to build reproducibly +Author: Stephen Kitt + +--- a/src/GameInit.cpp ++++ b/src/GameInit.cpp +@@ -248,7 +248,6 @@ + Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */ + + LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str()); +- LogInfo("compiled at "__DATE__" "__TIME__); + if(SwapEndian::bigendien) { + LogInfo("Systeme is bigendien"); + } else { +--- a/src/states/StateOptions.cpp ++++ b/src/states/StateOptions.cpp +@@ -1233,8 +1233,6 @@ + int p=25; + makeWindowOptions_infos_line(v_window, "Version", "X-Moto " + XMBuild::getVersionString(true), p); + p+=20; +- makeWindowOptions_infos_line(v_window, "Compilation date", __DATE__ " " __TIME__, p); +- p+=20; + makeWindowOptions_infos_line(v_window, "User data directory", XMFS::getUserDir(FDT_DATA), p); + p+=20; + 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 new file mode 100644 index 0000000000..e5d0dfb2a4 --- /dev/null +++ b/gnu/packages/patches/xmoto-utf8.patch @@ -0,0 +1,16 @@ +Description: Build with g++'s new utf8.h +Author: Stephen Kitt + +--- a/src/helpers/utf8.h ++++ b/src/helpers/utf8.h +@@ -18,8 +18,8 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + =============================================================================*/ + +-#ifndef __UTF8_H__ +-#define __UTF8_H__ ++#ifndef __XMOTO_UTF8_H__ ++#define __XMOTO_UTF8_H__ + + #include + #include -- 2.24.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 16 16:44:06 2020 Received: (at 38932) by debbugs.gnu.org; 16 Jan 2020 21:44:06 +0000 Received: from localhost ([127.0.0.1]:38488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isCvt-0000he-SE for submit@debbugs.gnu.org; Thu, 16 Jan 2020 16:44:06 -0500 Received: from mira.cbaines.net ([212.71.252.8]:39052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isCvp-0000h7-NW for 38932@debbugs.gnu.org; Thu, 16 Jan 2020 16:44:04 -0500 Received: from localhost (unknown [46.237.162.0]) by mira.cbaines.net (Postfix) with ESMTPSA id A32C6179DD; Thu, 16 Jan 2020 21:44:00 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 17abb313; Thu, 16 Jan 2020 21:43:58 +0000 (UTC) References: <87lfqmu1yn.fsf@nicolasgoaziou.fr> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: mail@nicolasgoaziou.fr Subject: Re: [bug#38932] [PATCH] Add xmoto In-reply-to: <87lfqmu1yn.fsf@nicolasgoaziou.fr> Date: Thu, 16 Jan 2020 21:43:55 +0000 Message-ID: <87wo9roz50.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 38932 Cc: 38932@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Nicolas Goaziou writes: > Hello, > > The following patch adds xmoto. > > Feedback welcome. Only comment I have is that "if you want to have a chance finishing the more difficult challenges" reads better to me in the description. Apart from that it looks good to me :) I'm pretty sure I'm worse at the game than when I used to play it though! Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl4g2RtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfjPA//QJ4nGIJrwus8rHx0H84MWMesN8WI9ZZMV4+zR7Fz+arszWj86NguoH2D X95TWM4UulejEKSRJpejCKCsEzX+1XFJnm6GABAwwIBuummhnNhpGI8HAFrovQs4 OTuI4855WlHHbnsEzkMcocr9GYlbuLZ6dAK7o03J9OUMhBjulmp+V3WoqdsSJj/G 1wjtsMsbp26/Wjd4ffrslQISAZop0kZIVip3XDRXBoqLmFCC88Zl8LmVg0z6Em7Q /l+2QvwYOpna0hnFXuUScJ2G460lG4NGu7NYR4wvtrNWr7Q/JciY3LshZ9exgO4K 3pbDjkWztbXaGkOYbdjBCGjPpaVuPPU4pxkFom64fM4o/ypd+cpuKqzqwbdNxPOM h8liO5zA+O8D8NWH5OHi5ZCMIW3CdUb4cm+zrdmCf9CWq0vcPOfX02LXRJ3Tmv3b H9t9xEgiHEQHn5iDIDXIK29A0UiMi5EPcbyk533SIQqD7c4Y1TATMRdGtT7b7DWR 8RO31v2iNp4oDNizgbE4yRGdekSDSSyZMBwh/uAdf5JU9WvGAi+mVuJvrvy/Kkiu ShuPVWnv5XX4Z8JptXj/3ldLDwDIH9vThvs6dzxVmPd1YYIWse0amYsXGnZWYFMG 7TQUp7yzugTq6VyZ3IIfHhLsPOViUrwNSORuaAyAZ1Xceu0NSKA= =aYYy -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 16 17:26:39 2020 Received: (at 38932-done) by debbugs.gnu.org; 16 Jan 2020 22:26:39 +0000 Received: from localhost ([127.0.0.1]:38513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDb5-0001mT-0G for submit@debbugs.gnu.org; Thu, 16 Jan 2020 17:26:39 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:33593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDb2-0001mK-TR for 38932-done@debbugs.gnu.org; Thu, 16 Jan 2020 17:26:37 -0500 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay10.mail.gandi.net (Postfix) with ESMTPSA id BBE85240005; Thu, 16 Jan 2020 22:26:34 +0000 (UTC) From: Nicolas Goaziou To: Christopher Baines Subject: Re: [bug#38932] [PATCH] Add xmoto References: <87lfqmu1yn.fsf@nicolasgoaziou.fr> <87wo9roz50.fsf@cbaines.net> Date: Thu, 16 Jan 2020 23:26:32 +0100 In-Reply-To: <87wo9roz50.fsf@cbaines.net> (Christopher Baines's message of "Thu, 16 Jan 2020 21:43:55 +0000") Message-ID: <87wo9rt4vb.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 38932-done Cc: 38932-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Christopher Baines writes: > Only comment I have is that "if you want to have a chance finishing the > more difficult challenges" reads better to me in the description. > > Apart from that it looks good to me :) Applied as 40d2bddd01dd054e68aadc98f77380a8b9977f3c (and subsequent patch as I had forgotten to fix the description). Thank you! > I'm pretty sure I'm worse at the game than when I used to play it > though! Heh. This is a difficult game. Regards, -- Nicolas Goaziou From unknown Wed Jun 18 00:19:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 14 Feb 2020 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator