From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41986) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqobJ-0006pg-1c for guix-patches@gnu.org; Sun, 12 Jan 2020 20:33:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqobG-0001x8-Fz for guix-patches@gnu.org; Sun, 12 Jan 2020 20:33:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iqobG-0001wm-C2 for guix-patches@gnu.org; Sun, 12 Jan 2020 20:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iqobG-0006pg-9O for guix-patches@gnu.org; Sun, 12 Jan 2020 20:33:02 -0500 Subject: [bug#39109] [PATCH] gnu: red-eclipse: Update to 2.0.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:41517) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqob6-0006pY-2z for guix-patches@gnu.org; Sun, 12 Jan 2020 20:32:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqob2-00017s-1i for guix-patches@gnu.org; Sun, 12 Jan 2020 20:32:51 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iqob1-000107-F2 for guix-patches@gnu.org; Sun, 12 Jan 2020 20:32:47 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9FBB016005F for ; Mon, 13 Jan 2020 02:32:44 +0100 (CET) From: Kei Kebreau Date: Sun, 12 Jan 2020 20:32:40 -0500 Message-Id: <20200113013240.28578-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39109@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/games.scm (red-eclipse): Update to 2.0.0. [source]: Remove obsolete patch, and fetch submodules making recursive tr= ue. [arguments]: Remove "unpack-data" phase and adjust "add-store-data-package-path-as-default" phase. [inputs]: Add freetype and remove data-sources. * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: Delete f= ile. * gnu/local.mk (dist_patch_DATA): Delete file. --- gnu/local.mk | 1 - gnu/packages/games.scm | 96 +++---------------- .../red-eclipse-remove-gamma-name-hack.patch | 52 ---------- 3 files changed, 12 insertions(+), 137 deletions(-) delete mode 100644 gnu/packages/patches/red-eclipse-remove-gamma-name-ha= ck.patch diff --git a/gnu/local.mk b/gnu/local.mk index cb46ee7880..4cd33f779e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1344,7 +1344,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ - %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d5d8e7ad0..856157e869 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3169,45 +3169,8 @@ http://lavachat.symlynx.com/unix/") (license license:gpl2+))) =20 (define-public red-eclipse - (let ((release "1.6.0") - (revision 0) - (data-sources - '(("acerspyro" "12b0bngl7hlxw4iwdbn99jp081yl6z1ic0s788nm349drbr= 2pck8") - ("actors" "0x7qqx67679q6ark9zz02skwhzgabid69kwi6zmhfpfgicn492= 7r") - ("appleflap" "08xslwqfqz3j4m03pv5ry2gdzj5k2ns51z8n6sln3sa94i9= x8qkm") - ("blendbrush" "18zf5i2ax4p14x4c9nhk9fq6l1xgbxw62gm72vx59vbfdp= jrw3cg") - ("caustics" "172fxwx7kbz5nmbjq98kr52ips505wb99fibgnpg8cj02syr= ya8k") - ("crosshairs" "14w8ysqzdsx9bzpfbl700jzngbh14rdghhjdf6zd6jlkvr= l6754r") - ("dziq" "056imqszvp90j7cgz52ly0f31px64gsrmvm9k2c78ldbx87jnhc3= ") - ("elyvisions" "1bsgr0gr7njydj8fqclh0a27lrsyic3xfd5a4vwggw7g54= azpgk2") - ("fonts" "00ibisza1qci0ghf2rynyf28l6r3nqhfzjf80k6gg76q4v7p1my= x") - ("freezurbern" "07l9ldk9b82f12c13wcg5xxdf15bw0yjxk3vvk8v3ygrl= 2mwksyr") - ("john" "1jdmwkrdi5b9pivkm22rxhmkk1db9dx6l54wzcc23cvdz04ij93k= ") - ("jojo" "0f7kjy43fbk9kw8fip6bbw4gn3pryh0fndlahjfkaysrx98krdj3= ") - ("jwin" "0nc8dndnpqk2ad6316a8k6kgzsrkpwvk8s4gyh7aqfi4axfclril= ") - ("luckystrike" "04jiipqahphmvz5cd74dygr62dlvv6l4iglb8hzh4pp8f= rhls8bq") - ("maps" "0an46ipjvw4h0nxvb6qvnzp1cdkzlkiinqz4zh9lmxy1ds0gclim= ") - ("mayhem" "15k10imm2wr6c6fq35n4r99k7kz7n9zdnjlw6dmdq6fba67i6s= bc") - ("mikeplus64" "0v4wiiivm3829j4phlavy22n4c6k6ib9ixxpdz7r6ysg5c= dkaw33") - ("misc" "13rfgwrlfhflz6inbkg3fypyf8im0m49sw112b17qrw2zgp8i1rz= ") - ("nieb" "0z0h9jdn2gkkjil3vsvwidb1p2k09pi5n3wjxza12hhvqmcs7q8f= ") - ("nobiax" "08bfp4q6gbfis18bp1h4d0hqssk79jc4fhyjxnv21dbam4v4mn= kn") - ("particles" "1vsx3fgg19xggxfhz3vlrh6nqhmw7kl9kmxrvb2j84blp00= vd6z2") - ("philipk" "14irscg80607i5k5l2ci0n9nwibvda2f3xsykgv96d0vldrp5= n5a") - ("projectiles" "09bnfsrywirwgjm6d7ff5nicx6w6b7w9568x9pb5q0nca= ps3l85s") - ("props" "1dlabbprlkif8af3daf9nbgcwgxiymvj0yiphqhlri8ylfy2vpz= 4") - ("skyboxes" "14bi3md5y47cvb9ybipdvksz40gqsqw2r0lh3zzqb4acq367= w18y") - ("snipergoth" "0m8rvvy5n8n9pm0b5cqvzsxsw51mqk8m7s1h3qc849b38i= sliwq2") - ("sounds" "0ivf3w5bphz5pzzx6kwcb67vbly1l19cgv3s0cyp8n87afiqj5= rd") - ("textures" "0qdmgx7zbcqnb9rrga2izr93p5inirczhddfxs504rsnv0v8= vyxm") - ("torley" "05ppyhghq859cbbxzj3dnl9fcx3ghy04ds1pylypwg2hsxzbjw= cd") - ("trak" "0g3vq86q91a3syli38lwc8ca4ychfwsmmqf85kqzfzyd627ybclm= ") - ("ulukai" "0asa5fz400impklcg6dy2f7jiaqfc1sn1c36fpg8jd01gw66lw= 93") - ("unnamed" "0rz5683j7sfwkcycfypbv4b0ihp0qwn9rzskfsabwc1s5g324= 917") - ("vanities" "13f18783rc8cjf22p61zr8m5g1migzlx05fzl8xnbjdkqq4c= dyix") - ("vegetation" "1y5d97nfmvax7y4fr0y5v0c8zb1ajkqwx76kjd4qc9n4sp= dsi5sc") - ("weapons" "103g1dhxv5ffz4ddg2xcbshbgv9606chsbas3pzk6h9ybqsyj= rqh") - ("wicked" "1884rk34a2dj83gz82rc4zh3ch0dyj5221hvsr0a5h60578i7y= j6")))) + (let ((release "2.0.0") + (revision 0)) (package (name "red-eclipse") (version (if (zero? revision) @@ -3218,13 +3181,12 @@ http://lavachat.symlynx.com/unix/") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/red-eclipse/base.git") - (commit (string-append "v" release)))) + (url "https://github.com/redeclipse/base.git") + (commit (string-append "v" release)) + (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0qy9kmq21wc4bdhwifasxc5dv1y5c53sn7dfmyc5y3zyz8wjyij4"= )) - (patches - (search-patches "red-eclipse-remove-gamma-name-hack.patch")))) + (base32 "0sz0mqhwx8r9n4mk3qrxw420nlsm3y0n48gd0lazgd64lfqjh3ab"= )))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3235,34 +3197,13 @@ http://lavachat.symlynx.com/unix/") (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-data - (lambda* (#:key inputs #:allow-other-keys) - (delete-file-recursively "data") - (mkdir "data") - (with-directory-excursion "data" - (for-each (lambda (name) - (copy-recursively (assoc-ref inputs name) n= ame)) - (list ,@(map car data-sources)))) - #t)) - (add-after 'unpack-data 'add-store-data-package-path-as-defau= lt + (add-after 'unpack 'add-store-data-package-path-as-default (lambda* (#:key outputs #:allow-other-keys) (substitute* "src/engine/server.cpp" - (("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))= " - _ - else_part - addpackagedir_original - addpackagedir_open - addpackagedir_close) - (string-append else_part - "{ " - addpackagedir_open - "\"" + (("data =3D \"data\"") + (string-append "data =3D \"" (assoc-ref outputs "out") - "/share/redeclipse/data\"" - addpackagedir_close - " " - addpackagedir_original - " }"))) + "/share/redeclipse/data\""))) #t)) (delete 'configure) ; no configure script (add-after 'set-paths 'set-sdl-paths @@ -3319,24 +3260,11 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%= " `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) + ("freetype" ,freetype) ("glu" ,glu) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image - sdl2-mixer))) - ;; Create origin records for the many separate data packages. - ,@(map (match-lambda - ((name hash) - (list name - (origin - (method git-fetch) - (uri - (git-reference - (url (string-append "https://github.com/" - "red-eclipse/" name ".g= it")) - (commit (string-append "v" release)))) - (sha256 (base32 hash)) - (file-name (git-file-name name version)))))) - data-sources))) + sdl2-mixer))))) (home-page "http://redeclipse.net/") (synopsis "Arena shooter derived from the Cube 2 engine") (description diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patc= h b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch deleted file mode 100644 index 573920cb99..0000000000 --- a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001 -From: Lee Salzman -Date: Tue, 12 Sep 2017 14:45:10 -0400 -Subject: [PATCH] remove gamma name hack - ---- - src/engine/main.cpp | 6 +++--- - src/shared/cube.h | 8 -------- - 2 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/src/engine/main.cpp b/src/engine/main.cpp -index 1032004d..77c9233a 100644 ---- a/src/engine/main.cpp -+++ b/src/engine/main.cpp -@@ -278,10 +278,10 @@ static void setgamma(int val) - } -=20 - static int curgamma =3D 100; --VARF(IDF_PERSIST, gamma, 30, 100, 300, -+VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300, - { -- if(initing || gamma =3D=3D curgamma) return; -- curgamma =3D gamma; -+ if(initing || reqgamma =3D=3D curgamma) return; -+ curgamma =3D reqgamma; - setgamma(curgamma); - }); -=20 -diff --git a/src/shared/cube.h b/src/shared/cube.h -index 3864c492..7ff5e267 100644 ---- a/src/shared/cube.h -+++ b/src/shared/cube.h -@@ -3,19 +3,11 @@ -=20 - #define _FILE_OFFSET_BITS 64 -=20 --#ifdef __GNUC__ --#define gamma __gamma --#endif -- - #ifdef WIN32 - #define _USE_MATH_DEFINES - #endif - #include -=20 --#ifdef __GNUC__ --#undef gamma --#endif -- - #include - #include - #include --=20 2.24.1