* [PATCH] gnu: red-eclipse: Update to 1.5.5.
@ 2016-08-01 13:03 Kei Kebreau
2016-08-01 14:03 ` Thompson, David
2016-08-01 14:27 ` Ricardo Wurmus
0 siblings, 2 replies; 4+ messages in thread
From: Kei Kebreau @ 2016-08-01 13:03 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 180 bytes --]
An important version bump for Red Eclipse, with necessary changes to
keep it building properly. I've also included the example server
configuration file in the config directory.
[-- Attachment #1.2: 0001-gnu-red-eclipse-Update-to-1.5.5.patch --]
[-- Type: text/plain, Size: 8359 bytes --]
From e073dce57fb51ce99cc93c2f8b8c2adf650ad6af Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Mon, 1 Aug 2016 08:56:23 -0400
Subject: [PATCH] gnu: red-eclipse: Update to 1.5.5.
* gnu/packages/games.scm (red-eclipse): Update to 1.5.5.
(arguments)[phases]: Adjust phases for the red-eclipse update.
---
gnu/packages/games.scm | 78 ++++++++++++++++++++++++++------------------------
1 file changed, 41 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9245742..e98d627 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2107,42 +2107,42 @@ http://lavachat.symlynx.com/unix/")
(define-public red-eclipse
(let ((data-sources
- '(("acerspyro" "0gxxr6nbac918b49x1cp72nw951hqm5m4iyi2shb1612ly384w8q")
- ("actors" "1jq9q82m6nx07nwpb5cnpdcwa33jrcgg0j2yir8zk6zpnxdmp0il")
- ("appleflap" "1cn41c6xs68l88rmphqh4rlsh6h04xnkkvklxdpqpvvr4zlsmi85")
- ("blendbrush" "0wjbgnniirl9arv274m8mpdqbbq7d09g0pq1z9dl56sazmbk5yy0")
- ("caustics" "0gxv1pqhi6c27mqi9mwqyfnzv9rq5sva1vgxhb9ljh231rmkdc15")
- ("crosshairs" "0vlyhd10mly2qnjpwvss9ani7dg3v2njpf7457ilx7fk9a3hlbkk")
- ("elyvisions" "0s0l77rd9fd09imvj05pwcz4bqrn3j8qsw8prv5pi5bqa50mbn19")
- ("fonts" "0apn8j9lf43nmnidq1f0azhrr1n896g7si4djbix1bwll6ild0mq")
- ("freezurbern" "0y60s3g8v8bl2m6pk2yr9fzl67ymv821x6l2f9hszzydlcjwlscn")
- ("john" "1lmwn0r7qpyac2qrnkv9llhsbyzqpgr27hxq2qn1rfbq12fja0ld")
- ("jojo" "0sh3ricqlqw868a0mz2n9iw7lhp650pysd2wkcdizhcmw2hlayx9")
- ("jwin" "1r459jhxx64j3vdw886ypkm6zg0yg6cr2qark54i1zdskjhp762k")
- ("luckystrike" "08xq87crcz0jq45q1g6p8h4xrm1bcqzd019zp7n0f9c3p9j6al91")
- ("maps" "1f0hqh8mbd4nzqi4hja4k5f380nszhx8igajg5ini4p9cp39x9vi")
- ("mayhem" "1hn9jp64aiz8k6p2nxyg82h2nc8fadgghzhrm26y7i4bz9xwxacm")
- ("mikeplus64" "1kj2zznxykgm3f1h1fvd8xzim5f292lyh96l2gj5km1nynzjmaap")
- ("misc" "1phmzjs5rmika3568b7jb6ywbsi40r711rhg8cbsflllcp7hdidf")
- ("nobiax" "08in9c24m2pq7x371q10ny4q3l1l3zb8m029iypy2lx9gr99i7hm")
- ("particles" "0wcd3s6vhrjknffnfqrcpkcqk1r01f1fiz6q7n4srhpdv3i4d6vm")
- ("philipk" "1s0kmap8iv5sddanrhycblskj3ywvz9xg2m11f6vnfy108palkga")
- ("projectiles" "0xdhrs9rsncd1f88s5igdbfksli7h0irg5jdbj6p2a3rgdzb3gnj")
- ("props" "1sbh3a94pmzic78bil0dvdh4fd8s6gh52f77jdram3w0gwv79x3r")
- ("skyboxes" "0hy95a6ps0fk4cq8j6pjipk8rnsjna9bm0ly2l373gbshlfg6zgi")
- ("sounds" "1pnyd7acm19sj1k1cy9hq3n3dnzzaiak7j5f0h7fikiybq5rdk7b")
- ("textures" "0gxfnc4xm0kp3pd7lhd4yy1dqq00g727h21l64nyiw2b2d6n1755")
- ("torley" "1cri5mf8ls8mvpn1x1p9hacyg9ibilaiz07gqv2hl2q8ww5xc1s6")
- ("trak" "0xyk5z59kn9ym9n5fdcrwhqig6gjcjgnrgi9rqbbai713w9vpsbq")
- ("ulukai" "0ziv9c4inmza40mas1w9dp048y6f646x00bs7kqv33hd1snbg3v3")
- ("unnamed" "0hm291k9azilnp0m04zhm52vml1rhxk1z4l74v66spbikr6s2zdx")
- ("vanities" "1qbc2v67kdrlvq10miw3dfmg3j9w9bq1hgqrzjcbph0l4gra1ndw")
- ("vegetation" "13928yw0wflcj620cmp8rqwplaw8508f3j4zi32vxida1ksz6xn0")
- ("weapons" "1ghn6nfcnd5lyl8dnj22csldvf9hrb32wjzpab4sjjz3iyv0zmr3")
- ("wicked" "0q9badvg6ix5rhl05s83kw2v6a49jpnbkqk4ls89qahaddfagi8g"))))
+ '(("acerspyro" "0s6q56i5marpm67lx70g5109lir5d6r45y45i8kbz6arc1spa7pp")
+ ("actors" "0jclmciz64i81ngxwbag8x5m8wvxkhraa9c7plix566y6rh28fv1")
+ ("appleflap" "1iz5igzdksamldhy0zh4vdjkxqhmg5c0n5g64pd3kan6h8vlbkq4")
+ ("blendbrush" "1hz3x5npp25dixcadp020xyahmd1i3ihs4cdf77iy84i9njbp7bv")
+ ("caustics" "05sbj46lrc6lkf7j6ls6jwc21n0qzxvfhfy9j7hdw482p9gvz54h")
+ ("crosshairs" "05vfxc6vm91dyf1kzig550fglgydp9szl9135q677lk4g60w5dfh")
+ ("elyvisions" "0fzdbxc40ggqmv4v1llx6sys2gjc6l1nxsbi5scpxqvm86dbddi9")
+ ("fonts" "0sbvnd96aip49dy1ja01s36p8fwwczibpic7myfw1frs110m0zgr")
+ ("freezurbern" "0k60dzzq42mfq360qf7bsf4alhy6k5gjfaidg2i1wsz5zssgmqwn")
+ ("john" "1ln9v8vfm0ggavvdyl438cy4mizzm1i87r9msx1sbja30q8f57c1")
+ ("jojo" "0cdgl82s4bm6qlv07fsq5l7anbywvvw13d0mng831yn6scf0hxb1")
+ ("jwin" "0yg5vriffyckgfjmi4487sw07hsp44b3gfw90f0v4jsgbjjm2v20")
+ ("luckystrike" "0f82caq09znsr9m08qnlbh3jl9j5w0ysga0b7d5ayqr5lpqxfk9k")
+ ("maps" "14m23h3mip12anhx7i9k5xlapwkjbw4n0l7lj1b7dfcimf71gjll")
+ ("mayhem" "0dxrr6craqi7ag724qfj9y0lb0pmwyrfpap02cndmjbbacdya0ra")
+ ("mikeplus64" "040giyrk3hdd26sxhdx37q4mk923g5v3jbrinq1fw2yfvsl6n1cs")
+ ("misc" "07xfs9hngshg27rl2vf65nyxilgnak3534h8msaan0fjgmzvlk0q")
+ ("nobiax" "1n3nghi5426r2zav4rsfih8gn37sfa85absvhdwhir8wycsvbkh6")
+ ("particles" "0yj0nykal3fgxx50278xl2zn2bfz09wbrjcvng56aa6hhfiwp8gd")
+ ("philipk" "1m3krkxq9hsknbmxg1g5sgnpcv7c8c2q7zpbizw2wb3dir8snvcj")
+ ("projectiles" "05swvalja7vzqc3dlk136n5b5kdzn3a8il6bg1h12alcaa0k9rba")
+ ("props" "1cqi6gw5s4z5pj06x6kiiilh4if0hm1yrbqys5dln23mcvw8f0ny")
+ ("skyboxes" "1mm6xl89b0l98l2h3qn99id7svmpwr940bydgjbcrvlx21yqdric")
+ ("sounds" "03q7jazf0chszyiaa9cxirbwdnckcp5fl812sj42lv0z4sqz222l")
+ ("textures" "1caqyxa9xkrwpyhac65akdv1l7nqychgz7zfivasnskk2yy6jani")
+ ("torley" "1hp8lkzqmdqyq3jn9rains32diw11gg1w3dxxlln5pc041cd7vil")
+ ("trak" "0wlczjax33q0hz75lgc4qnxlm592pcxgnbkin5qrglv59nrxzxyr")
+ ("ulukai" "0dkn7qxf92sidhsy4sm4v5z54n449a2z2w9qax5cfgzs78kb5c34")
+ ("unnamed" "0p9mmfp0vplmswyxh8qab33phcl8lzmzh3mms4f7i587hppdg6db")
+ ("vanities" "1w23853lmvj4kx5cbxvb5dk598jiqz7ml2bm0qiy7idkf5mcd2lv")
+ ("vegetation" "0jw1ljhmv62fzvklid6i8syiacmrs075cp7r3gc069bg4fg47cpn")
+ ("weapons" "1p64ry1s4y7hkgm6i2rdk2x78368359wvx8v81gg179p3sjnjkww")
+ ("wicked" "1kmpy2n15lyh50rqjspyfg3qrc72jf0n3dx2y3ian7pjfp6ldxd9"))))
(package
(name "red-eclipse")
- (version "1.5.3")
+ (version "1.5.5")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/red-eclipse/base"
@@ -2150,7 +2150,7 @@ http://lavachat.symlynx.com/unix/")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1y0jv5lz69zisiw8sd5z9a9v21zc83by1sx9b7dly78ngif4gc4l"))))
+ "0xl3655876i8j5nixy0yp73s0yw9nwysj68fyhqs2agmvshryy96"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -2178,13 +2178,15 @@ http://lavachat.symlynx.com/unix/")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
- "/include/SDL"))
+ "/include/SDL2"))
#t))
(add-after 'install 'copy-data
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(copy-recursively "config"
(string-append out "/config"))
+ (copy-file "doc/examples/servinit.cfg"
+ (string-append out "/config/servinit.cfg"))
(copy-recursively "data"
(string-append out "/data")))
#t))
@@ -2222,7 +2224,9 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(inputs
`(("curl" ,curl)
("glu" ,glu)
- ("sdl-union" ,(sdl-union))
+ ("sdl-union" ,(sdl-union (list sdl2
+ sdl2-image
+ sdl2-mixer)))
;; Create origin records for the many separate data packages.
,@(map (match-lambda
((name hash)
--
2.9.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: red-eclipse: Update to 1.5.5.
2016-08-01 13:03 [PATCH] gnu: red-eclipse: Update to 1.5.5 Kei Kebreau
@ 2016-08-01 14:03 ` Thompson, David
2016-08-01 14:27 ` Ricardo Wurmus
1 sibling, 0 replies; 4+ messages in thread
From: Thompson, David @ 2016-08-01 14:03 UTC (permalink / raw)
To: Kei Kebreau; +Cc: guix-devel
On Mon, Aug 1, 2016 at 9:03 AM, Kei Kebreau <kei@openmailbox.org> wrote:
>
> An important version bump for Red Eclipse, with necessary changes to
> keep it building properly. I've also included the example server
> configuration file in the config directory.
LGTM. I really need to try this game out when I get a chance.
Thanks!
- Dave
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: red-eclipse: Update to 1.5.5.
2016-08-01 13:03 [PATCH] gnu: red-eclipse: Update to 1.5.5 Kei Kebreau
2016-08-01 14:03 ` Thompson, David
@ 2016-08-01 14:27 ` Ricardo Wurmus
2016-08-01 15:43 ` Kei Kebreau
1 sibling, 1 reply; 4+ messages in thread
From: Ricardo Wurmus @ 2016-08-01 14:27 UTC (permalink / raw)
To: Kei Kebreau; +Cc: guix-devel
Hi Kei,
> An important version bump for Red Eclipse, with necessary changes to
> keep it building properly. I've also included the example server
> configuration file in the config directory.
thanks for the update.
> + (copy-file "doc/examples/servinit.cfg"
> + (string-append out "/config/servinit.cfg"))
I think this should not be part of this patch as it doesn’t directly
relate to the update. Could you please split this?
> * gnu/packages/games.scm (red-eclipse): Update to 1.5.5.
> (arguments)[phases]: Adjust phases for the red-eclipse update.
The summary should rather be something like this:
* gnu/packages/games.scm (red-eclipse): Update to 1.5.5.
[arguments]: Adjust phases.
[inputs]: Use sdl2.
~~ Ricardo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: red-eclipse: Update to 1.5.5.
2016-08-01 14:27 ` Ricardo Wurmus
@ 2016-08-01 15:43 ` Kei Kebreau
0 siblings, 0 replies; 4+ messages in thread
From: Kei Kebreau @ 2016-08-01 15:43 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> Hi Kei,
>
>> An important version bump for Red Eclipse, with necessary changes to
>> keep it building properly. I've also included the example server
>> configuration file in the config directory.
>
> thanks for the update.
>
>> + (copy-file "doc/examples/servinit.cfg"
>> + (string-append out "/config/servinit.cfg"))
>
> I think this should not be part of this patch as it doesn’t directly
> relate to the update. Could you please split this?
>
>> * gnu/packages/games.scm (red-eclipse): Update to 1.5.5.
>> (arguments)[phases]: Adjust phases for the red-eclipse update.
>
> The summary should rather be something like this:
>
> * gnu/packages/games.scm (red-eclipse): Update to 1.5.5.
> [arguments]: Adjust phases.
> [inputs]: Use sdl2.
>
> ~~ Ricardo
Thanks for the recommendations. I'll push the patches later with your
changes in mind.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-01 15:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-01 13:03 [PATCH] gnu: red-eclipse: Update to 1.5.5 Kei Kebreau
2016-08-01 14:03 ` Thompson, David
2016-08-01 14:27 ` Ricardo Wurmus
2016-08-01 15:43 ` Kei Kebreau
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).