* 0ad
@ 2016-12-23 21:15 ng0
2016-12-23 21:15 ` [PATCH 1/3] gnu: Add mozjs-38 ng0
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ng0 @ 2016-12-23 21:15 UTC (permalink / raw)
To: guix-devel
[PATCH 1/3] gnu: Add mozjs-38.
[PATCH 2/3] gnu: Add 0ad-data.
[PATCH 3/3] gnu: Add 0ad.
The main TODO here is 0ad itself.
Right now this is just something I'm stuck with because I have other priorities around Guix.
TODO 1: Unbundle and/or replicate spidermonkey as shipped by upstream 0ad. This is absolutely required as certain patches are applied which can not be sent upstream by them.
TODO 2: After I added the /bin/sh symlink phase I didn't touch this package for a while and didn't fix any errors which might exist now.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] gnu: Add mozjs-38.
2016-12-23 21:15 0ad ng0
@ 2016-12-23 21:15 ` ng0
2016-12-23 21:15 ` [PATCH 2/3] gnu: Add 0ad-data ng0
2016-12-23 21:15 ` [PATCH 3/3] gnu: Add 0ad ng0
2 siblings, 0 replies; 4+ messages in thread
From: ng0 @ 2016-12-23 21:15 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@we.make.ritual.n0.is>
* gnu/packages/gnuzilla.scm (mozjs-38): New variable.
---
gnu/packages/gnuzilla.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 07ed2af0b..6383ef1c6 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -149,6 +150,64 @@ in C/C++.")
`(("libffi" ,libffi)
("zlib" ,zlib)))))
+(define-public mozjs-38
+ (package (inherit mozjs)
+ (name "mozjs")
+ (version "38.2.1.rc0")
+ (source (origin
+ (method url-fetch)
+ (uri (list
+ ;; The upstream server at people.mozilla.org produces
+ ;; a tls handshake error, the file at people.freebsd.org
+ ;; is identical and produces no such error.
+ (string-append
+ "https://people.freebsd.org/~sunpoet/distfiles/"
+ name "-" version ".tar.bz2")
+ ;; XXX: The upstream server at people.mozilla.org
+ (string-append
+ "https://people.mozilla.org/~sstangl/"
+ name "-" version ".tar.bz2")))
+ (sha256
+ (base32
+ "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"))))
+ (arguments
+ '(;; XXX: parallel build fails, lacking:
+ ;; mkdir -p "system_wrapper_js/"
+ #:parallel-build? #f
+ ;; Tests fail due to missing module 'xpt':
+ ;; ImportError: No module named xpt
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (replace
+ 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (chdir "js/src")
+ ;; configure fails if it is followed by SHELL and CONFIG_SHELL
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (substitute* "js.pc.in"
+ (("@MOZILLA_VERSION@") "38.2.1"))
+ (zero? (system* "./configure"
+ (string-append "--prefix=" out)
+ "--with-system-nspr"
+ "--enable-system-ffi"
+ "--enable-threadsafe"
+ "--enable-gcgenerational" ; required by 0ad
+ "--enable-shared-js" ; required by 0ad
+ ;; required by gcgenerational:
+ "--disable-exact-rooting"))))))))
+ (native-inputs
+ `(("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-2)))
+ (propagated-inputs
+ `(("nspr" ,nspr))) ; in the Requires.private field of mozjs-24.pc
+ (inputs
+ `(("libffi" ,libffi)
+ ("zlib" ,zlib)))))
+
(define-public nspr
(package
(name "nspr")
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] gnu: Add 0ad-data.
2016-12-23 21:15 0ad ng0
2016-12-23 21:15 ` [PATCH 1/3] gnu: Add mozjs-38 ng0
@ 2016-12-23 21:15 ` ng0
2016-12-23 21:15 ` [PATCH 3/3] gnu: Add 0ad ng0
2 siblings, 0 replies; 4+ messages in thread
From: ng0 @ 2016-12-23 21:15 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@we.make.ritual.n0.is>
* gnu/packages/games.scm (0ad-data): New variable.
---
gnu/packages/games.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8b1d80dda..5ad1a310a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3068,3 +3068,49 @@ symbols, the game needs graphics to render the non-euclidean world.")
for Un*x systems with X11.")
(home-page "http://olofson.net/kobodl/")
(license license:gpl2+)))
+
+(define 0ad-data
+ (package
+ (name "0ad-data")
+ (version "0.0.21-alpha")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://releases.wildfiregames.com/0ad-"
+ version "-unix-data.tar.xz"))
+ (file-name (string-append name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"))))
+ (build-system trivial-build-system)
+ (native-inputs
+ `(("source" ,source)
+ ("tar" ,tar)
+ ("xz" ,(@ (gnu packages compression) xz))))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let ((tar (string-append
+ (assoc-ref %build-inputs "tar")
+ "/bin/tar"))
+ (install-dir (string-append %output
+ "/share/0ad/data"))
+ (path (string-append (assoc-ref %build-inputs
+ "xz")
+ "/bin")))
+ (setenv "PATH" path)
+ (system* tar "xvf" (assoc-ref %build-inputs "source"))
+ (chdir (string-append "0ad-" ,version))
+ (mkdir-p install-dir)
+ (copy-recursively "." install-dir)))))
+ (synopsis "Data for the game 0ad")
+ (description
+ "Data files for 0ad.")
+ (home-page "http://play0ad.com")
+ (license (list license:gpl2
+ ;; license:lppl1.3c TODO: ADD.
+ ;; license:bitstream-vera TODO: ADD.
+ license:cc-by-sa3.0))))
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] gnu: Add 0ad.
2016-12-23 21:15 0ad ng0
2016-12-23 21:15 ` [PATCH 1/3] gnu: Add mozjs-38 ng0
2016-12-23 21:15 ` [PATCH 2/3] gnu: Add 0ad-data ng0
@ 2016-12-23 21:15 ` ng0
2 siblings, 0 replies; 4+ messages in thread
From: ng0 @ 2016-12-23 21:15 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@we.make.ritual.n0.is>
* gnu/packages/games.scm (0ad): New variable.
---
gnu/packages/games.scm | 129 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 128 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5ad1a310a..c5bdd9caa 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -57,6 +57,7 @@
#:use-module (gnu packages audio)
#:use-module (gnu packages avahi)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages game-development)
@@ -65,6 +66,7 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
@@ -74,8 +76,10 @@
#:use-module (gnu packages mp3)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages messaging)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
@@ -98,12 +102,15 @@
#:use-module (gnu packages xiph)
#:use-module (gnu packages curl)
#:use-module (gnu packages lua)
+ #:use-module (gnu packages upnp)
+ #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages video)
#:use-module (gnu packages xml)
#:use-module (gnu packages tcl)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages tls)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages ruby)
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)
#:use-module (guix build-system python)
@@ -3114,3 +3121,123 @@ for Un*x systems with X11.")
;; license:lppl1.3c TODO: ADD.
;; license:bitstream-vera TODO: ADD.
license:cc-by-sa3.0))))
+
+(define-public 0ad
+ (package
+ (name "0ad")
+ (version "0.0.21-alpha")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://releases.wildfiregames.com/0ad-"
+ version "-unix-build.tar.xz"))
+ (file-name (string-append name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"))))
+ (inputs
+ `(("0ad-data" ,0ad-data)
+ ("curl" ,curl)
+ ("enet" ,enet)
+ ("perl" ,perl)
+ ("icu4c" ,icu4c)
+ ("libxml2" ,libxml2)
+ ("nspr" ,nspr)
+ ("libpng" ,libpng)
+ ("sdl2" ,sdl2)
+ ("miniupnpc" ,miniupnpc)
+ ("zlib" ,zlib)
+ ("openjpeg" ,openjpeg)
+ ("mesa" ,mesa)
+ ("libx11" ,libx11)
+ ("libxcursor" ,libxcursor)
+ ("wxwidgets" ,wxwidgets)
+ ("gloox" ,gloox) ; lobby
+ ("mozjs-38" ,mozjs-38)
+ ;; TODO: ("nvidia-texture-tools" ,nvidia-texture-tools)
+ ("libvorbis" ,libvorbis)
+ ("openal" ,openal)))
+ (native-inputs
+ `(("cmake" ,cmake)
+ ("pkg-config" ,pkg-config)
+ ("boost" ,boost)
+ ("mesa" ,mesa)
+ ("zip" ,zip)
+ ("python-2" ,python-2)
+ ("python" ,python)
+ ("ruby" ,ruby)
+ ("bash" ,bash)
+ ("libsm" ,libsm)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'create-/bin/sh-symlink
+ (lambda _
+ ;; The build system creates files during build which expect
+ ;; /bin/sh to exist (shebang).
+ (let ((bash (string-append (assoc-ref %build-inputs "bash")
+ "/bin/sh")))
+ (symlink bash (string-append (assoc-ref %outputs "out")
+ "/bin/sh")))))
+ (add-after 'unpack 'delete-bundles
+ (lambda _
+ (delete-file-recursively "libraries/source/spidermonkey")))
+ ;; We need to use the included premake4.
+ (add-before 'configure 'build-premake4
+ (lambda _
+ (setenv "CC" "gcc")
+ (zero? (system* "make" "-C"
+ "build/premake/premake4/build/gmake.unix"))))
+ (replace 'configure
+ (lambda* _
+ (with-directory-excursion "build/premake"
+ (zero? (system* "premake4/bin/release/premake4"
+ "--file=premake4.lua"
+ "--outpath=../workspaces/gcc/"
+ "--platform=x64"
+ "--os=linux"
+ "--with-system-miniupnpc"
+ "--with-system-mozjs38"
+ "--minimal-flags" ;"--without-nvtt"
+ "--with-pch" "--with-tests" "--with-audio"
+ "--enable-atlas" "--with-lobby" "--enable-collada"
+ ;; TODO: nvidia-texture-tools "--with-system-nvtt"
+ "gmake")))))
+ ;; XXX: 0ad bundles spidermonkey, the tl;dr is that it requires exactly
+ ;; the bundled version with the applied patches or it can and will
+ ;; lead to crashes and incompabilities.
+ ;; However we could replicate this and unbundle it, use a mozjs-0ad
+ ;; which is kept in sync with what's included in 0ad.
+ ;; (add-before 'build 'build-bundled-spidermonkey
+ ;; (lambda* _
+ ;; (with-directory-excursion "libraries/source/spidermonkey"
+ ;; ;; Here we must either unbundle and build this separate
+ ;; ;; or unpack and run a recursive patch-shebang and repeat
+ ;; ;; the entire package like we already do in the `mozjs' package.
+ ;; ;; (system* "tar" "xvf" "mozjs-31.2.0.rc0.tar.bz2")
+ ;; ;; (chdir "mozjs31"
+ ;; ;; The following will fail, which is why the part above was started.
+ ;; (zero? (system* "./build.sh")))))
+ (add-before 'build 'build-bundled-fcollada
+ (lambda _
+ (zero? (system* "make" "-C" "libraries/source/fcollada/src"))))
+ (replace 'build
+ (lambda _
+ (zero? (system* "make" "-C" "build/workspaces/gcc" "verbose=1"))))
+ (replace 'check
+ (lambda* _
+ (with-directory-excursion "binaries/system"
+ (zero? (system* "./test" "-libdir" "binaries/system"))))))))
+ (home-page "http://play0ad.com")
+ (synopsis "Real-time strategy game with single- and multi-player modes")
+ (description
+ "0 A.D. is a real-time strategy game. It is a historical war and
+economy game focusing on the years between 500 B.C. and 1 B.C. for the
+first part, and a planned second part for the years 1 A.D. to 500 A.D.")
+ (license (list license:expat
+ license:cc-by-sa3.0
+ license:zlib
+ license:lgpl2.1
+ license:gpl2))))
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-23 21:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-23 21:15 0ad ng0
2016-12-23 21:15 ` [PATCH 1/3] gnu: Add mozjs-38 ng0
2016-12-23 21:15 ` [PATCH 2/3] gnu: Add 0ad-data ng0
2016-12-23 21:15 ` [PATCH 3/3] gnu: Add 0ad ng0
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).