summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-03-27 06:40:41 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-03-27 06:40:41 +0000
commit561d6e28bdf70a8a97bf812dd8786bf309b59009 (patch)
tree77c25fc409633453542512e30e216a8da47025fb /games-fps
parentadd ia64 support (bug #509212) (diff)
downloadhistorical-561d6e28bdf70a8a97bf812dd8786bf309b59009.tar.gz
historical-561d6e28bdf70a8a97bf812dd8786bf309b59009.tar.bz2
historical-561d6e28bdf70a8a97bf812dd8786bf309b59009.zip
add support for ia64 with patch from Émeric Maschino via bug #509212
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/quake2-icculus/ChangeLog17
-rw-r--r--games-fps/quake2-icculus/Manifest21
-rw-r--r--games-fps/quake2-icculus/files/0.16-rogue-armor.patch4
-rw-r--r--games-fps/quake2-icculus/files/0.16-rogue-nan.patch4
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch6
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch4
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch45
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch5
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch97
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch4
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch4
-rw-r--r--games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild19
12 files changed, 154 insertions, 76 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 652f8ef82146..d5165e8bf06f 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,19 @@
# ChangeLog for games-fps/quake2-icculus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.48 2014/07/04 08:19:46 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.49 2015/03/27 06:40:34 mr_bones_ Exp $
+
+ 27 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/quake2-icculus-0.16.1-ia64.patch, files/0.16-rogue-armor.patch,
+ files/0.16-rogue-nan.patch, files/quake2-icculus-0.16.1-alsa.patch,
+ files/quake2-icculus-0.16.1-amd64.patch,
+ files/quake2-icculus-0.16.1-gcc41.patch,
+ files/quake2-icculus-0.16.1-gentoo-paths.patch,
+ files/quake2-icculus-0.16.1-gnusource.patch,
+ files/quake2-icculus-0.16.1-ldflags.patch,
+ files/quake2-icculus-0.16.1-no-asm-io.patch,
+ files/quake2-icculus-0.16.1-x11_mouse.patch,
+ files/quake2-icculus-0.16.1-x11_soft.patch, quake2-icculus-0.16.1-r1.ebuild:
+ add support for ia64 with patch from Émeric Maschino via bug #509212
04 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
quake2-icculus-0.16.1-r1.ebuild:
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 70e98870a968..a3cdbbf34ac6 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,20 +1,21 @@
-AUX 0.16-rogue-armor.patch 312 SHA256 8198edf3c33d04cfe1cbde0ac64174f85614b1952478c39ad5986736057145a2 SHA512 0c3a5add1eeeb038054377fc3efd73c58b21498006d8d4126f3b8810f76268652a376bbf0ea4f9771e31d68a1ced3691001d2fb770def68d78ec5b507aa3f217 WHIRLPOOL d2570d92c1b6cb4a93be332b25267e3e8db3cb58b2ed91e0e39800810b3c671e29669f913f14a153b94bf2396f5e407a61684f63f3442d7f4cb84a515e4f7a60
-AUX 0.16-rogue-nan.patch 242 SHA256 9de64221141c8e9e2c519504176029a57ad627ca9b68830e53d53db31f01a3c0 SHA512 3dbd39ccb0806231c3df1ae9559226f5fe1a0035172c7a900d1894299947d522bd6df6f873fa96c0b2bffccbb935e493d7c9a847d89d1c0c99666b9a70fae4ad WHIRLPOOL cf432ca19e253ceb002598e561b783e7353d36e3f21c329c0e5a2c09e902c8b4cde03309c13478528014651204f7bc0c6ac4c4a3728235fda37ce7e296e1f3c3
+AUX 0.16-rogue-armor.patch 240 SHA256 b3e4932c1b3a40ca8e235d29d73263a06c7ed7aa4a757a613ff061a384c7ebe9 SHA512 591fccd0cbc1225982b6d95d4818a4d0ff409717de8799b1d49f424633169d8a8187206220c24b60a341337aec2e297dfd8517dd478223e7d557ee85f6ecc453 WHIRLPOOL 9cd537bdd2e62a066e0d20b513458eb97b77bfd47b7eebc520d6dab4bd8c01d5b46da53798890f7880eac7611ef829cdb109a5f135429427fc05d9a295f0b77e
+AUX 0.16-rogue-nan.patch 170 SHA256 58052b59e897789aec3c02267890689e7a0efbaa9bc5e3c78e612ce2de0f32e0 SHA512 3d9b3a95a85a6fa39f2c6f7ad5e49b313b723bfb0fa88392f8690df27c16a7d6ad7617043b6fd66dc87cbbac9b01b941b8cbc8ecf4e045b908e844832c80d26a WHIRLPOOL 956681196820db3f51e7320a93d1b510fd82b469b7410c8d321eba689427a5911d1c0d967eeace573d1409f72f4a114556e6f06fd74b7edeb35b5f20d546608b
AUX README-postinstall 3083 SHA256 90f8cce0737adf8a95afac11ca30911a59801659cb5ebf29943792586eed1a45 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe WHIRLPOOL 32b83ba760f6cb4929ccdda6b2e68e68ed9decf71fb96e562451d79ba6218fa3a48ecbbe1a648e773a17b923f9c3b14e74e2d75e17e89e0ac6a40b7788560835
-AUX quake2-icculus-0.16.1-alsa.patch 4455 SHA256 1beb982fa6ed920917fac92953ff3dda8437a8da3b55be7d2a41ca3019061cc4 SHA512 4677bbd7c13e68cd053846d7978d9aa86f8b2bb0dc5deb454a4d996d6f74e2edfc6391c5aa7a0f1f0ebbe64f98e9966d1edf8bf8b3f247c882d10376fbf9d945 WHIRLPOOL fe4aa2ba3edaf003bb905661bac0343cc09a714f976da6aea472f94893c752e69921c41e1ee5c8f690b9bcdc4b54f6ff797c15cc3f95588b3b13e345472fd460
+AUX quake2-icculus-0.16.1-alsa.patch 4386 SHA256 acae335903b33e1d4274db167dd57961569f34e0a26142f5bfa809f754993bbd SHA512 8bb9e4d6f551ebe3e6715e044453affd7edd749650791fca32b5286038e75a59685c7d47efce8ac7b9dff488e6c2952dfdc68807f3365d276afb4b7387ad5dbc WHIRLPOOL c953f67764a4edd2316a729301c42c7bae6541f8863a12b03f3eb0f9b69d56aad8feb7d65178849e26a7787319ff4f832238bf155ea3931f9e93d9c9e1083d15
AUX quake2-icculus-0.16.1-amd64.patch 534 SHA256 e95aeace865f089b6c1c9e0c362da407d1bd603147fb6886b9c13b37218c3a37 SHA512 03faf4b85aa176a267847196fb56204b6d02bde0ebef858a34edb3c87cb41e57636d9b6e5b3be44163e918cb4b3ff38299b2db9de90690179108ee77146b942d WHIRLPOOL 23093e8624751afb7a4ec7b524745853cafa5394bcc97acde170f7b8aa946747ffc7d97f4f55bf0c5776056b55c5d30cfef8b67102c7acbc4cca2ee742cb9d96
-AUX quake2-icculus-0.16.1-gcc41.patch 364 SHA256 1010f97c15f202de682f56ac372cc342299f1e6c20e9072d8fa346a1469adf72 SHA512 bff2bc44114e5b0a42ef4411adff9094a8ce34295eec45049cdcb567d8a3d0cbc6d92ae93e2dc499a039606dc1c94acf716c32bdeadc39c10d749c71007a430e WHIRLPOOL 2a968b3460918b468b32c00dfd7bbe95be5ec015d12c62ad534a9528daf8ddedc10b4ddd9486b78a93139dbb78e9e1bd96a05ba05d7226beb1baca666a4bf817
-AUX quake2-icculus-0.16.1-gentoo-paths.patch 7688 SHA256 22d47f76fe1f06028088d2b7d9b1bc0bf1c91c559149859373af29f467ed2ea9 SHA512 85d13d1a5a1b6c4942cf54b583adbda3b2579eff757d41f690fa42367b075b424618336796583fc6d2ac1565c4de114f3cc183e056b7cd2601702b2c69dc6d1b WHIRLPOOL 9b679691605d1a381d484512d417b6b1e60233c7c12bea2d092e15b79f1214aebcc02a064124c3b2de277808223e3824facf47d04f56e7d7541f992c80a06ee4
-AUX quake2-icculus-0.16.1-gnusource.patch 482 SHA256 9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617 SHA512 2d54e456f5ec40e27e6f885a863fad96d297232b0bffeedf8a3bb090d0005fe3ccbe9cd82311e64c0ca47969120e6f3536ecc391684828660892c49e8a42abf3 WHIRLPOOL 7f76efb1464feb706d6e8825a5a30cbf774e8fcf70f34c54a58955e07fa55d0ada1f83a495ee1c9a945e90862bd002d7cc04e57cd6a33c72bf09268cf34f908f
-AUX quake2-icculus-0.16.1-ldflags.patch 1609 SHA256 b161ab85ab2fd8a4bf5b20e8ac9a80429f735eb1bae611b79b92677f04eacc42 SHA512 c50a0ba2b1a117834ff2a1faa7ae45508ef5bcba08d279ccb4a563f565873c670bdf8ac2d5a320c061b7550c9844b7280abc86ec02f2dedf95dcfff62e4752cf WHIRLPOOL f48263260a49d68dc36ed9fcf8aee56f33d36819ab33434343df535c6ea1cd13eb1a9533c84d0a4a29603632b920ea5375761cc5517f10b84660f3a749ec2e78
+AUX quake2-icculus-0.16.1-gcc41.patch 292 SHA256 bce6396cf2871ae102089a932666be6ce3a5974483a21610b135d39f95db0f59 SHA512 87193f69670e7cd6573bd4ff550202fda2702a5d7dfadb3af31f673b8910958ec3718e0d7ae558666c6a6921c43d543626dc8eaa0e3822345f33aecdbdf7ee50 WHIRLPOOL b868ba28f8bda9f454cdc80f89ad286fb25bbd27e07dbdacf0af7811b3b9b61d9ebe58aed7c7bef0c31b617046c1a31ebe7636a26291b0881db6df0fe7a430ba
+AUX quake2-icculus-0.16.1-gentoo-paths.patch 6419 SHA256 e290602dea3e13f5a2b8f5ae041957f0f0bc5b46a6ad037a17e3ca5659d32ab5 SHA512 91a83f82b013245256db386a212c044bfbd637e1685e532d2ca75959e6870e65f3763f6d83c85db184d46a0ed77b5d4a53c4f7421b55b82a4709bdfc70d0f307 WHIRLPOOL dde1c56a6daf256e8c861419b5bf54e41ff897c7c0397bb423e7fa131c19ae444b38591b0b22e408dd2c5cedc354653608ad55b993d57b218358ac58c45acf7e
+AUX quake2-icculus-0.16.1-gnusource.patch 316 SHA256 2217f9e8ed131967f018d8b0b64aa9dc317cc14b18c837da7c58450126cf5731 SHA512 0e1bed0bfd7ab31ad574a17534a49e89b44ef99308b90d9a30726f7d39ec4606514643e064968a5d9e53dd7a20394d5a27162fba06f37713ee3bc1e65f31b76b WHIRLPOOL b63d75b344e3353b828fbc2ebca1145b8400ebddd71e1e780a75a32decd825b0296386e03f500ab069805660d7a578f340d778f1c24b8088be1336bb598f682a
+AUX quake2-icculus-0.16.1-ia64.patch 2399 SHA256 5ed84452f0e2414cd668d3a12f30366c2ed188dcc7d8eb17d2725340873a4db9 SHA512 fce5f699ecabe8ca9f215507172be537c8850fc91ed44224a588780bf76901d60486c220d5bf821b70fe9d2687f6ec9d966b78008de1f6cf4f1ac3644bb66844 WHIRLPOOL 89e9958904eb2e5f598ff9652164435a650c56b0d66f9169f1f63e822d064b94d5c52442630bd4ce9fd176154f2c6acd2bcbc0c6c507a8e05a07d635a5a3dcc9
+AUX quake2-icculus-0.16.1-ldflags.patch 1537 SHA256 fa9404c4852f6b2e0cafee6407135e8445f4fc3dd899ae773d86ad4d7fa8facc SHA512 c4a1dc06b02c227e0cbb8e289b2eab864f5f599f0f92cb376d2a6be7d746774b89fddba21c003c91908a9a140fe639e1588dcff28cccc1a531a6eff8e8f4ccf0 WHIRLPOOL 559ae777b960d5934d49d9b4a2c9fd77395c23b0e5b72b3c89281d20c4a0cc1d6adbf57edade4d7c6bab1f169b9247fd8fa4ce50722a4c49c9764d9514bfcc03
AUX quake2-icculus-0.16.1-no-asm-io.patch 513 SHA256 05a648b32ce0c260046706ee2f4c6f49a0e7049ed07cd02fd895f6fd83556012 SHA512 ad2d62ce9c69f10683bd5a0970339c82acdf9543b802a0ed070fb025efab6b3aad6e352cc29de5e3120449a3b679823feb920dc175f33b00d230cb9082be3f16 WHIRLPOOL b81a56274664edfcdeeda97e4ef7a648cbe1fb9f15334914252aa38400fe549b537365793be2fedb0141f0105dddc764b8e7260169baecad5e968afb70a8b3e5
-AUX quake2-icculus-0.16.1-x11_mouse.patch 402 SHA256 4b727e1d61220a8a0bacd812b19d8a01d2c66c38b24e5155608ea94d00d2431b SHA512 46f7b425a1a365e4a9c6dd9cb470a276e75497c56405ad73bed371669879651e0923b2bbe9defcced1313b757d993c7a3552f6796c8c649f6394718c1bb43051 WHIRLPOOL cd362595af45bd154f3478a64efa58b58fefef8bc7806d2ef59aaf903a6ba5da50f7dc20a19d1fe2be022bb07254d99a89c28ff3ea885b1a24e2d5c94151b66b
+AUX quake2-icculus-0.16.1-x11_mouse.patch 330 SHA256 828baf64ded015bc5e0c77b5354d0ff3ebacd8964745d36d89422c7cf7f90fa2 SHA512 4387615cab034dd37fb502e7f7411a9cf5ac9370ef474e123c1ea550d79fb06c838ac1de6e443d3e9aeea73ec905bd7464f57f9a561d4eca90852abace20eea0 WHIRLPOOL bcfbf7f03b26c588c119bab4ad860ec3ec3a6a9b87a24e04beedd0a0a76776171fabbbb456ecd5da289307a1335087f5cf298dde8ab7f24deff99de59ebfb36a
AUX quake2-icculus-0.16.1-x11_soft.patch 1128 SHA256 dba3c805e599f055ad43656e38c2a67d9288d758a87dc9d092db144a1a6cd0c1 SHA512 c8d479919fd4440041d1f2e3a020c45cfb6522d6ff675845bd646c0b736d6ce4b400bcdf99b7f4d456938e8e946e02e40ebab4d574779fb86cff49e4213abc1f WHIRLPOOL a287ca704b83fd6f506f2ac8451645efcd3ebcb835f3e86adefc1ea663545983b79b49ebf3c0d99a92e43b36a120e4ead59bd4793b297145c79749b35fc81b47
AUX quake2.xpm 1234 SHA256 0a5232384c56ccead145345a30e4ed7004bf36fe7656d43c46f1bed34d8fc2a9 SHA512 e7ed561123c2919a514ba7e4bcd32214bb368764cb53ad314b2816abefa0368247c0a9d463d9e96217c3583aa30f0f79b80bb5f798f6af857f4a0b069ab57e80 WHIRLPOOL b3237e526b0261d68a0682823b3841043c1bcc80987ad820519defe733beeee626b01955e9d1e3b1647c8dde8b32ed9b6bd3898a78168452ec234481f6e02176
DIST maxpak.pak 3282742 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770 SHA512 49eef504190323add8bbe6fd007ee51a17dc843898a2199a44a0b214a14da90202070f9eb025503c58b64d6306832bdb6c0d04efe927ea651eb83b0517a59782 WHIRLPOOL 4f372e574d337834661992a6ac17f249c4df42603dd023962644db792f58d3a58f1f328c198d2cf4a666a60cce5c0eb56e0f6c495cef405db8a6d46ba0127980
DIST quake2-r0.16.1.tar.gz 1525384 SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2 WHIRLPOOL 017d0c6add0302fa2f74bc4b2603fff36589417ac7fd150429f8e83be846bef53695ac4edaa22ec5a8b38cf2aaf73ea733e1e142d8e8a0cc778826753dc96b14
DIST roguesrc320.shar.Z 626769 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141 WHIRLPOOL 84430a1596179086cc440196974f83e13edff52378c8418d84e46bcd78f5e6856aa1a8b6a9e1a9e5496c1845ca19b3af6be346661580601e6581920529109dbd
DIST xatrixsrc320.shar.Z 455917 SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa WHIRLPOOL d5254a11f49ecd0cc341d6b51cc31bd6d43597e0341df09662849e235a07452eef80fc881983ed34bcfd47fca575e8592aa306f53a3b82d1464167b16cee4fed
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5480 SHA256 a1ac923898c3dcabab7ea6057175854deaecaa3d5fd1fb776d24bd4081618fb5 SHA512 30788e9015ed968816b88afd4831f3e214cc497ed8a7cdc5f9e57ab9dee4b4c2f2591f085c48ad1d74620ae7eb872d11ecd97577f41f72cebf8119f53bee4523 WHIRLPOOL cd239879acc4a1d67a9fbf7daa5428c653bb4cf51a20b1d7de58b33fac44ad60fcc776f520d50d9d41ebc994f38f7b968869d34db86bbd8dbc02e44990127cf5
-MISC ChangeLog 8614 SHA256 13070e7eb96ccfec13768d24fe9cd4308744dc6fc7ade23e2d9b56d5c7774c0d SHA512 3a4accd77dcac665f67b4932e9b20a277b955aab4919735636ddfafdf9cd623423794a24c08149c7832158e316039d3bae8c606518b0c80a507b4a998d309013 WHIRLPOOL 53ad10de7a15699e94c6d23e553689604213661db9a6d0098b4517165c163df448ec6fc245ef4678aecd6cdc2a8a63fd8d6cea827714d2a4f8ff07412dc0063f
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5427 SHA256 152b71a81663e6bd30a78bc209159799e735140c17be74bbaa42c74a31934924 SHA512 8bf938f35418e1a0e45d8f737e7e7aa8dfd2a08013248f7af0c0a3ae24b6efbabdf6e8e035074f4e5c94adac93fdd80a45470762fd7ba911d69dc255685329c7 WHIRLPOOL a9cd2653f1e1d58d2190011fa79d2c34fa19940e025d89b9528eefd6864ca142e5d7e9f47bbe5d577f5de6c2acc4b7f26325b638b14c80beab88d996d72722c4
+MISC ChangeLog 9286 SHA256 f117d03093ad70310b2abacdcb3c04c98ae0233ff5369bf84b610714d900973d SHA512 5d22192ebbbda8888cc809f5beeac494c911bd9d0e4f20f8c7d06ff9ff45a513be29687f17f6d0046bf9aabb08b610e6060ff567c46ca6dd578802ca8b5b6c17 WHIRLPOOL 728243e35cb2fb89803691637ccd9f066a30dc2d8236126909df7b3711e96f60419262ea61349ceb9fbca1ef30c2af12fd768bf1d3817b55efae0409f2068d04
MISC metadata.xml 513 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c SHA512 ea99d61d4c0b39f1e403edcfdd56dbaa117450748c9136885ec1828b760605e4c064e02c04e73d9a5339ffdb5cf8581794cc5a40dc5ab601b6e3edab06361cac WHIRLPOOL fd818babc2cad1f17a1423c6292b8c85ddf61bc0a10b00e52f83ec1c442953fd919eb7637b7afd1304a805d8371b32bdc232ae3601a926be82b49dfff2144e61
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
index 33c524fcbedf..194f965a0501 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig 2006-06-24 16:50:49.000000000 +0200
-+++ src/rogue/g_local.h 2006-06-24 17:44:35.000000000 +0200
+--- src/rogue/g_local.h.orig
++++ src/rogue/g_local.h
@@ -545,9 +545,6 @@
extern int sm_meat_index;
extern int snd_fry;
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
index 5db9d892c006..0961fa68a985 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig 2005-01-03 02:16:03.233329552 -0500
-+++ src/rogue/g_local.h 2005-01-03 02:16:03.244327880 -0500
+--- src/rogue/g_local.h.orig
++++ src/rogue/g_local.h
@@ -24,3 +24,3 @@
#ifndef _WIN32
-#include <nan.h>
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
index bab60d3b8f42..185359373c4b 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
@@ -1,7 +1,7 @@
---- src/linux/snd_alsa.c.old 2012-03-28 19:22:06.533174832 +0200
-+++ src/linux/snd_alsa.c 2012-03-28 19:22:19.670009575 +0200
+--- src/linux/snd_alsa.c.old
++++ src/linux/snd_alsa.c
@@ -22,13 +22,22 @@
- $Id: quake2-icculus-0.16.1-alsa.patch,v 1.1 2012/03/28 22:32:18 tupone Exp $
+ $Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $
*/
-#define BUFFER_SIZE 4096
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
index 2afa968d23f0..626cf5a1b64d 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
@@ -1,5 +1,5 @@
---- src/xatrix/g_local.h.old 2006-05-06 11:58:32.000000000 +0200
-+++ src/xatrix/g_local.h 2006-05-06 11:58:52.000000000 +0200
+--- src/xatrix/g_local.h.old
++++ src/xatrix/g_local.h
@@ -446,11 +446,6 @@
extern int sm_meat_index;
extern int snd_fry;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
index c017051583b8..61f0bb2286e5 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
@@ -1,10 +1,5 @@
-Index: Makefile
-===================================================================
-RCS file: /cvs/cvsroot/quake2/Makefile,v
-retrieving revision 1.56
-diff -u -p -r1.56 Makefile
---- Makefile 5 May 2005 22:23:34 -0000 1.56
-+++ Makefile 29 Aug 2005 22:52:28 -0000
+--- Makefile
++++ Makefile
@@ -74,35 +74,46 @@ endif
CC=gcc
@@ -90,13 +85,8 @@ diff -u -p -r1.56 Makefile
targets: $(TARGETS)
-Index: src/linux/qgl_linux.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/linux/qgl_linux.c,v
-retrieving revision 1.9
-diff -u -p -r1.9 qgl_linux.c
---- src/linux/qgl_linux.c 25 Sep 2002 13:39:58 -0000 1.9
-+++ src/linux/qgl_linux.c 29 Aug 2005 22:52:28 -0000
+--- src/linux/qgl_linux.c
++++ src/linux/qgl_linux.c
@@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname )
// dllname, dlerror());
@@ -118,13 +108,8 @@ diff -u -p -r1.9 qgl_linux.c
}
Com_Printf ("Using %s for OpenGL...", fn);
} else {
-Index: src/linux/vid_so.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/linux/vid_so.c,v
-retrieving revision 1.10
-diff -u -p -r1.10 vid_so.c
---- src/linux/vid_so.c 24 Sep 2004 22:11:44 -0000 1.10
-+++ src/linux/vid_so.c 29 Aug 2005 22:52:28 -0000
+--- src/linux/vid_so.c
++++ src/linux/vid_so.c
@@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name )
//regain root
seteuid(saved_euid);
@@ -169,13 +154,8 @@ diff -u -p -r1.10 vid_so.c
}
/*****************************************************************************/
-Index: src/qcommon/files.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/qcommon/files.c,v
-retrieving revision 1.11
-diff -u -p -r1.11 files.c
---- src/qcommon/files.c 2 Jan 2005 03:38:12 -0000 1.11
-+++ src/qcommon/files.c 29 Aug 2005 22:52:29 -0000
+--- src/qcommon/files.c
++++ src/qcommon/files.c
@@ -60,6 +60,7 @@ typedef struct pack_s
char fs_gamedir[MAX_OSPATH];
@@ -215,13 +195,8 @@ diff -u -p -r1.11 files.c
//
// then add a '.quake2/baseq2' directory in home directory by default
-Index: src/qcommon/qcommon.h
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/qcommon/qcommon.h,v
-retrieving revision 1.5
-diff -u -p -r1.5 qcommon.h
---- src/qcommon/qcommon.h 12 Apr 2005 13:12:21 -0000 1.5
-+++ src/qcommon/qcommon.h 29 Aug 2005 22:52:29 -0000
+--- src/qcommon/qcommon.h
++++ src/qcommon/qcommon.h
@@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit
#endif
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
index cc7c8451293b..ad1f37309c30 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -1,6 +1,5 @@
-diff -Naur quake2-r0.16.1/src/linux/q_shlinux.c quake2-r0.16.1-modified/src/linux/q_shlinux.c
---- quake2-r0.16.1/src/linux/q_shlinux.c 2002-02-09 17:09:23.000000000 -0500
-+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c 2007-06-26 13:40:25.000000000 -0400
+--- quake2-r0.16.1/src/linux/q_shlinux.c
++++ quake2-r0.16.1-modified/src/linux/q_shlinux.c
@@ -17,6 +17,9 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
new file mode 100644
index 000000000000..ae1aa2e4068c
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
@@ -0,0 +1,97 @@
+--- quake2-r0.16.1.orig/Makefile
++++ quake2-r0.16.1/Makefile
+@@ -54,24 +54,26 @@ endif
+
+
+ # this nice line comes from the linux kernel makefile
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
+
+ ifneq ($(ARCH),x86_64)
+ ifneq ($(ARCH),i386)
+ ifneq ($(ARCH),axp)
++ifneq ($(ARCH),ia64)
+ ifneq ($(ARCH),ppc)
+ ifneq ($(ARCH),sparc)
+ $(error arch $(ARCH) is currently not supported)
+ endif
+ endif
+ endif
+ endif
+ endif
++endif
+
+ CC=gcc
+
+ ifndef OPT_CFLAGS
+ ifeq ($(ARCH),axp)
+ OPT_CFLAGS=-ffast-math -funroll-loops \
+ -fomit-frame-pointer -fexpensive-optimizations
+ endif
+@@ -283,16 +285,46 @@ ifeq ($(ARCH),axp)
+ $(warning Warning: SDL support not supported for $(ARCH))
+ endif
+
+ ifeq ($(strip $(BUILD_SDLGL)),YES)
+ $(warning Warning: SDLGL support not supported for $(ARCH))
+ endif
+ endif # ARCH axp
+
++ifeq ($(ARCH),ia64)
++ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
++ TARGETS += $(BUILDDIR)/sdlquake2
++ endif
++
++ ifeq ($(strip $(BUILD_SVGA)),YES)
++ TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT)
++ endif
++
++ ifeq ($(strip $(BUILD_X11)),YES)
++ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
++ endif
++
++ ifeq ($(strip $(BUILD_GLX)),YES)
++ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
++ endif
++
++ ifeq ($(strip $(BUILD_FXGL)),YES)
++ TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT)
++ endif
++
++ ifeq ($(strip $(BUILD_SDL)),YES)
++ TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT)
++ endif
++
++ ifeq ($(strip $(BUILD_SDLGL)),YES)
++ TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT)
++ endif
++endif # ARCH ia64
++
+ ifeq ($(ARCH),ppc)
+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
+ TARGETS += $(BUILDDIR)/sdlquake2
+ endif
+
+ ifeq ($(strip $(BUILD_SVGA)),YES)
+ $(warning Warning: SVGAlib support not supported for $(ARCH))
+ endif
+--- quake2-r0.16.1.orig/src/linux/sys_linux.c
++++ quake2-r0.16.1/src/linux/sys_linux.c
+@@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
+ char *path;
+ char *str_p;
+ #if defined __i386__
+ const char *gamename = "gamei386.so";
+ #elif defined __x86_64__
+ const char *gamename = "gamex86_64.so";
+ #elif defined __alpha__
+ const char *gamename = "gameaxp.so";
++#elif defined __ia64__
++ const char *gamename = "gameia64.so";
+ #elif defined __powerpc__
+ const char *gamename = "gameppc.so";
+ #elif defined __sparc__
+ const char *gamename = "gamesparc.so";
+ #else
+ #error Unknown arch
+ #endif
+
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
index ec37b8be0fe8..978c9c9820ea 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old 2010-09-15 09:31:41.000000000 +0200
-+++ Makefile 2010-09-15 10:13:01.000000000 +0200
+--- Makefile.old
++++ Makefile
@@ -169,18 +169,18 @@
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
index b4a7dcc2eb94..6dc6f0f1ddfb 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
@@ -1,5 +1,5 @@
---- src/linux/rw_x11.c.old 2012-04-06 20:51:11.545642465 +0200
-+++ src/linux/rw_x11.c 2012-04-06 20:55:48.159425787 +0200
+--- src/linux/rw_x11.c.old
++++ src/linux/rw_x11.c
@@ -989,8 +989,8 @@
}
else
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 2566266fac29..65a90a14703d 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.29 2014/07/04 08:19:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.30 2015/03/27 06:40:34 mr_bones_ Exp $
EAPI=5
inherit eutils toolchain-funcs games
@@ -15,7 +15,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
UIDEPEND="aalib? ( media-libs/aalib )
@@ -39,17 +39,9 @@ S=${WORKDIR}/${MY_P}
pkg_setup() {
games_pkg_setup
- local alert_user
-
if ! use qmax && $( use opengl || use sdl ) ; then
- einfo "The 'qmax' graphical improvements are recommended."
+ elog "The 'qmax' graphical improvements are recommended."
echo
- alert_user=y
- fi
-
- if [[ -n "${alert_user}" ]] ; then
- ebeep
- epause
fi
}
@@ -78,7 +70,8 @@ src_prepare() {
"${FILESDIR}"/${P}-gnusource.patch \
"${FILESDIR}"/${P}-x11_soft.patch \
"${FILESDIR}"/${P}-x11_mouse.patch \
- "${FILESDIR}"/${P}-alsa.patch
+ "${FILESDIR}"/${P}-alsa.patch \
+ "${FILESDIR}"/${P}-ia64.patch
if use xatrix ; then
epatch "${FILESDIR}/${P}"-gcc41.patch