Permalink
Browse files

version bump

  • Loading branch information...
1 parent 2606a9c commit d7b80476d56db71a269c78969dbf406e9f7c3961 hasufell committed Oct 9, 2012
@@ -3,12 +3,15 @@ DIST map-parpax-b03.pk3 14537626 SHA256 fb00c1369dfd321174c905776f808c4f1922fa86
DIST map-plat23-b6.pk3 26656654 SHA256 722cf217c3c044a48a17abd3236007e9dd40974589716f91e37ed8d1a4a7e48e SHA512 c45f6221897440d95a2306855a4024b12432ca729a34b419aa880d7cf3e352651b7ef0413673a3c0324e6e412bb57daf1412d324f760f91c5536a47e5aca9da2 WHIRLPOOL 5b972dd75f5a5feeec8ae8f915c14b49a58da2fc1a66a68fea78cb1c41fc89d068286188829393caefaa6656c728b65c2f21fadd1164fa3b0eadc12ce9a13390
DIST unv-pak5.pk3 14248510 SHA256 3a686448fbb3d9c9c06af090d2ec8f31c0ad10a749062f335e92af7a0e915af3 SHA512 00357383e469d0a78ed4d4a5ad00cc773ffaca20d0d9a6482d5fdfdd4c98fdbad1a833c9f92dbc7265f2a067bd0499a21da1f37265884bf4e98e25f9b66687ca WHIRLPOOL 64b5a37377a942c8d0d0503595db7c7b69713ac5eae390a7c530d257476d3d7f17f4bf4fffe4706e6786dd82fb9aa2ded0759b9ede9570d66643c713e8a8101e
DIST unv-pak6.pk3 11771918 SHA256 03012ab219815220270147bb11c9ce5bf64dccce71d15d53bfee4c52a97a8228 SHA512 aaf658cb4850e1f9f6b527ef9430b293e557a8892ac450ad8c64a2a548478887190f101e56efaa133000192de85404b472249a162d8dff51bf1dba96e8426cad WHIRLPOOL 7c8ed010d41bc8531ed601d007c8251ce8712e1a5989a3d32f72c4684411bd4453e6cf18810f41004be634bee3a3a72df020453dbcc32678d15e0c1c40dbe240
+DIST unv-pak7.pk3 10565691 SHA256 ebeb0d2c66b7790ed473de03e0d4afefd1df3b4d4f280925258d258b4259086e SHA512 edada46a3fa623103530d02e498c1217b1d8ea92b0fa3772ecec32ab3c6ed42a7f4f877908a7f82f21e0a6917977403ddb04b040135635654cd690362ccd9ce7 WHIRLPOOL 35b080e8385f525bbf57d23bf26a288c310e248360f62d302ad2c881bfb0fbfc2be30ca8b0a6066f5e4d95f80d028ce0d708d0d2b322529006c3e01892c57dab
DIST unvanquished-data-0.5.0.zip 465972703 SHA256 1b0e2a9f945c4893baf57f5e8c5565086087fdf723297a1a1ed018ab8b6971f9 SHA512 10ae677b225f4ddc00c87d18c009feda0d75357b09e0a48bc4bc7af097f95fd38d7c01c384ef6f380bf88a30a7c6c42d1473bddf5d060497d2066a742c05b22a WHIRLPOOL 5b113a3ab6c2ff1db05248978953b77107bd04ea36ee216f228df3883295a4c4288ca2bcdb447093820dac2b485f161ad48391b8a0d53435c02fcd42a6beb091
DIST unvanquished-data-0.5.1.zip 481384444 SHA256 711546f54b7cb77826af01d1f8417fbec229fda672f9bcc9e28850bf97586d01 SHA512 da0e67ceb9c1a3dfbe67fa4f5c18d372c9ba108f9c128bbaa11973321c2cd1f5784952f878abb203243efd20bff43243591e279a079d7a4b105d2ad3134b9aeb WHIRLPOOL b6aad217e1fdce0d1f792742c5343ee43099f175554551535d8f7c74ad9a1e89e8a792f08dae2d76d7c0b01d4baf39cfea64a51d4a353b9b97f227b143ed163e
DIST vms-0.6.0.pk3 522621 SHA256 fcd0cfcd7b7f257ed16acb45b25f148590582c06113027d14772a7095f44dbf7 SHA512 43ebf2c736f71c65a8bc235fd8461cf0cd4e2a4b63e8a0d54bc830f6dc436e959e4d8e643e159016c46d9c6ffcbdfdf8924ee345b73de658b4de493527e5b51c WHIRLPOOL a3870181a85610bea89f4bdf7eeae2d4218be220dbc3045c01a06452dccc3f4aab9c929fbca6220c03b25b940156958108aae48dfd3201641675f59b52766f47
DIST vms-0.7.0.pk3 523843 SHA256 8a2c9ac7772af160f530eca44a40d43e35a8c82cab431c87b35ba91c66b2480d SHA512 a8ae84152d1910b60c19d761a8de02e195781c5970a3e2844dafadece79e9c6e1e4d10f843beae6aa7668850f91653f6fd90cc5957092f088e7f373cbb4503bd WHIRLPOOL ef24b306468146a84b39a854005d7ac5aeaa36f5b883e3f9351e228704c34f4aa506b092aef2c358eae878e9f2ddde53b11e144fdd011e08b44681cce78fc081
+DIST vms-0.8.0.pk3 524408 SHA256 bd7350bbcf879d2a926f6ff575f8cf24b6ef55c785ea31864f5ea7c5ac1daf48 SHA512 3c7368ef18b97d6d09f26c825d53ff6b6517926fc2b22a8fa8d7f6bb7bdf07b54839a59e84ad6e637498e2010c06149e21a3309fb1cebafcab9ed916e36a7617 WHIRLPOOL 6c738958e7dffd929bb88433d232f5faef1df6cb382691ca3efc8b56a66a98515d0eaf44e47d221b67d2a4f2ed5f017fdeb4a5fb3939bc46a82f87da4bf597c1
EBUILD unvanquished-data-0.4.0.ebuild 516 SHA256 1c81a2336af78d4c601393f7330e2b2f46f79da1786971ed546bbc3b09d453fb SHA512 eea27c343b38395638b9e7536999a6e29961cc5eb545ef070ecf36198e1cf2b70fdcee2c3e3e6f667b76effa0b0d4b6202730d631085a7649966173b13b150c4 WHIRLPOOL 01eb9a5a42e9a3457f2d6fe9521e2a3a662015aff83fedc2e0d26e43c72904e5c22fd611ea5f96a496a143ef24326cb9d6913aff96bdb320d468e576a0d535c5
EBUILD unvanquished-data-0.5.0.ebuild 528 SHA256 ff139146eb80ce3808beffbf8bbe72d4096bb715a6806e5a4024110a5978d889 SHA512 4ba4c0dbc8417cb2276c0e3f426d36aceba026a267ce4e0785a89c606bf3e0b428f9a7b5ddea7538ce4f59a9ac9f568f5c5c7bde01551a9661c8a45b723c7571 WHIRLPOOL 7eaba7d1a6603e1d0bf53f7fc45128c885c7d5836f3b5882181c03613caf1219a7c50a09ff7a35df5a327e33b3ef9597740b21aa573e8326cb8c9ff2a77fb176
EBUILD unvanquished-data-0.5.1.ebuild 528 SHA256 ff139146eb80ce3808beffbf8bbe72d4096bb715a6806e5a4024110a5978d889 SHA512 4ba4c0dbc8417cb2276c0e3f426d36aceba026a267ce4e0785a89c606bf3e0b428f9a7b5ddea7538ce4f59a9ac9f568f5c5c7bde01551a9661c8a45b723c7571 WHIRLPOOL 7eaba7d1a6603e1d0bf53f7fc45128c885c7d5836f3b5882181c03613caf1219a7c50a09ff7a35df5a327e33b3ef9597740b21aa573e8326cb8c9ff2a77fb176
EBUILD unvanquished-data-0.6.0.ebuild 852 SHA256 23356f2aa18ba576fc5133b2f8fbc66d5b48d250117e56f588e82c537fafba7e SHA512 6c934932e2e1a13cbc7d65a8e4fb6e52a2e063debd991237ca70ed41ac41130a546aa5f0ad7eb2945d59215e4501ba4e9e73e56989c9088171655f5e29f58d59 WHIRLPOOL b1ef06ac2cc1b0306993b3bf875afbc8ccf84de9601b9b7663e2ba51ba127e5bb06e728c281e453ef76ff1afefa20ef206d5bdfc9794e26372508bd3357f5c4a
EBUILD unvanquished-data-0.7.0.ebuild 1022 SHA256 a130e62fc7e06ea1d49b488a3a45dc843cc1d669f0466fa810cbb91de7096ec5 SHA512 f10b040b32f005aa5a70583ad7713b43fc2b69ceb9ce8b5ecde5fb5c0c3963c8c7438be391b7dd70299328dc71721f448aacfb0b83c7148a427c43ee9372e6a6 WHIRLPOOL 69130a881bbb6886b96a1b7cb840432aca8ebd5e9d18c46106e9378b9a5e0664383c0f446e3005a174c6167b7c536253f5b8677d9dfb24ebe62521b32ccf5feb
+EBUILD unvanquished-data-0.8.0.ebuild 1073 SHA256 0d63269317dfd93703eb1ba67e100f8b311d05487017b01b3969d30187c8420c SHA512 8934a10f38f4d8fb712f7696837bbcda81e2a682c17058324a0c10144080c701db55da5563b58ac83b353b804fd2a5a08a2d3b17fe94efc9b29b7e98d52bd4f0 WHIRLPOOL 73ee229c9ee3cb5a208fa38a3d16d8813eab02e173338d7bfb6b14e8c89af75c8e6597e97590e3eebf8e4609ddd8f8cb3a4f63b0a8c965a74ea131858f29af84
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit games
+
+MY_PN="Unvanquished"
+
+DESCRIPTION="Datafiles and maps for unvanquished"
+HOMEPAGE="http://unvanquished.net/"
+SRC_URI="mirror://sourceforge/${PN%-data}/${MY_PN}_0.5.1.zip -> ${PN}-0.5.1.zip
+ mirror://sourceforge/${PN%-data}/vms-0.8.0.pk3
+ mirror://sourceforge/${PN%-data}/map-plat23-b6.pk3
+ mirror://sourceforge/${PN%-data}/map-parpax-b03.pk3
+ mirror://sourceforge/${PN%-data}/pak5.pk3 -> unv-pak5.pk3
+ mirror://sourceforge/${PN%-data}/pak6.pk3 -> unv-pak6.pk3
+ mirror://sourceforge/${PN%-data}/pak7.pk3 -> unv-pak7.pk3"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/Unvanquished
+
+src_install() {
+ insinto "${GAMES_DATADIR}"/${PN%-data}/main
+ doins main/*.pk3
+ rm "${D}${GAMES_DATADIR}"/${PN%-data}/main/vms-0.5.1.pk3 || die
+ doins "${DISTDIR}"/{vms-0.8.0,map-plat23-b6,map-parpax-b03}.pk3
+
+ for i in 5 6 7 ; do
+ newins "${DISTDIR}"/unv-pak${i}.pk3 pak${i}.pk3
+ done
+
+ prepgamesdirs
+}
@@ -5,6 +5,8 @@ AUX unvanquished-0.5.0-cmake.patch 8675 SHA256 2b792f6a9c9235e5f99430dd76702c5ce
AUX unvanquished-0.5.1-cmake.patch 8675 SHA256 2b792f6a9c9235e5f99430dd76702c5cefc31c81e03dce240585a6402ce4bf20 SHA512 4f7ca3c8fda64881f5196ef50e816cbd0849f7460761ac8a0bda31c377515c9ae3c81ccbb45e80ba18adaf0d59967eddfbf74d8ac2a80becb38d98c237e250c5 WHIRLPOOL f5dead231daa5a55e9d7a27e482fccb5347dbf170301d14af4b84a775e7fc630d42dbdfb29da49a368a214056fe60e94aab7334303d58d3f9483205c66b7d610
AUX unvanquished-0.6.0-cmake.patch 8423 SHA256 ea81e3ea0d97789ded9835fa1a694bc28e6d879a81b2b5a63553ba7432ebebc5 SHA512 93b36402a620d6d9dec0ffc69e9daa91b09ab8ab0967c47a323e3f7cad1df71ce05faef2352b5996e4456eee3a2683fe8034689fbe255910ad1804dbc8d0e451 WHIRLPOOL 2ad5931dd85a780693e9ec23354c036cfbd397d16ac873b52359b292ada44cae5f65199d83b9ff57332abb530559945b6cfe29d7cae2a8efea0cca9b68f89d4a
AUX unvanquished-0.7.0-cmake.patch 7201 SHA256 f1b7a780b22a4a8642615c80547a286b9e6c7fc5d33a4562ea748b95520315a9 SHA512 e6686d61375b43df56bcb1517701b88354f519f1df9a28a880fc5923146a60cff18fe124f4c3c33b6c17854f3fcd4133eb3a2c750a24bacbb0a82c5c3cbfe371 WHIRLPOOL 01cd42bc64bddaf0c94174176b5f941551da02bc101885412217b41d09c33ab13301140ac214764f066196a6fa2c3a4f66f2542212385b48e4b08831d74b7dc3
+AUX unvanquished-0.8.0-FHS.patch 4796 SHA256 77ea1dc31b95d13c8619a1b532a64a271fb0613215d6e511de096b66d9f73cb2 SHA512 98d7efc6f3bd5bb1b189a72da2b642b335603c0ce3b500dedfee91dd8106750604780dc8d0a74c50e2811c6689e4b46dcf385d510d938cb50a6e6349812e3056 WHIRLPOOL 1465cf2dc145a53214dd38d2c985b3a93b584d0889227b8963651f05e867a75bbef27469314d557de00c00c499eec64edf72f4b88024c33f9811c3d4cecffc13
+AUX unvanquished-0.8.0-cmake.patch 7228 SHA256 0395c0ba4ac74c90ebd96f5d6f403c2ea3af0cd571eebcb4c0a2606a9371ddea SHA512 54a455db22d7340759fd2cc6968cfe4aee279d4e08241e4fe18e9f228c86ff274ca2449ffa7d5807794091ecfef9a4074296e99c96e507a728687b44138d66b6 WHIRLPOOL 02ec37f02b750b60d42d8915d266ac7d8295bf5797276f84701c0776b467d9c6e71601268b229279769cf23f32640d0ff5fb52b74166a480688e37925a1e4769
AUX unvanquished-server.confd 436 SHA256 9e4d07c6adb1a7de16f0f2bcac00e53cd69d7e277eea24d93b6023080ab3028a SHA512 29ae3fe32b6133e8e62794b23b370f8130389bc1f561796301a7d85f5fad5b6edee1cabda32707d9e2c40319b4038b1b90a8961d63b3549d379f6e9c34145666 WHIRLPOOL c20bd36a5a1a6682471e30dcfa41749fe1555af94b7da3a153b47c1b036d04ed5d3e95a9f2813349ba9b66936cb4b28707d28f554fca9822cb31606bb35bdafd
AUX unvanquished-server.initd 1015 SHA256 42e35e91e9df7eef8409dd2304f2b395900ebb86ac4fd064310431b127e25183 SHA512 8a59364dbd104ef07de0503aa08433c26e1caf4f5e96b7eb802fb6108b8401bed93de1c85789d337c9582bdb67de47b8a0b6793dee1b41dd4550fbaef81911eb WHIRLPOOL b067bc448691b3dc70c8806ba803c7fa8ec437405c6ba4d6b90bc976d968ff60532767024b9f5a2a401ad965267108507f32f14e31dee8269519c69580519e32
AUX unvanquished-server.sh 484 SHA256 ebcf6409d0407a9b908dd5e57d830a65fc1492e17e06cba2d06f32c0210db30c SHA512 40e1baa5c3853360389ec32034fb489a93e1f66f8691fd2f3c1b147e9fd8c3aa98c6d5a10ba529b6d3fde41af57baaed12a6352ca9ede883535705f26e2dddc7 WHIRLPOOL 85ada7e2cae61cfb04a9c538e2f8e5f89937e2e1397e2bb97795e7ff305143493b1bda8f50018f8c4768d4e02f9a97a80d848a79b1dd26b2020d3e2c0cd23b05
@@ -14,9 +16,11 @@ DIST unvanquished-0.5.0.tar.gz 61927410 SHA256 d073029c78b3d2513637f4ae6db408300
DIST unvanquished-0.5.1.tar.gz 61926936 SHA256 e414b66a6d604187b465ceb930fc82446213bc9532a5839c6dc3b63bc30115e5 SHA512 d58bf6d6b9ab59bd52d738ebdeae0e47331fee4a33e9b5e244122339e24fdb9bab233f56dcb4a986ad31f1029a7c3cc5d7e3bef068801c617a377e32aa06607a WHIRLPOOL 5031d610a5bc1d6881cb34ed62829ff8dead32cda232cbd637353e2ee96efae1b00522a8e094d7fd56a5948ea3b3c54ec439c53540c95d3849c3f9a163b5d31a
DIST unvanquished-0.6.0.tar.gz 46166606 SHA256 b12e0cc08c422c7bab937d20b92e9dfc02eedf01ece3ed8debc60b608ecada70 SHA512 059a39b7e5db955d00d04e371bfaae8784a95bcfec75bb7af74eb862c4f08f69d366aafb740ba95c4a113c80e42aa2c75c1c20d2cebcc98f3666eb3ca4eaf9b4 WHIRLPOOL d490764b7fba176a72ffa15a24f78ffd563c3fc2dd2fc7b9dcadcd935d87fb6c2f6e6559547af62d2615fa29b938deb7cd0e9f3850d6ddbfec0201bec810a913
DIST unvanquished-0.7.0.tar.gz 46164233 SHA256 15b97da6863588adfb3bd092d951431551d3ee1cd6c83cf2ccbec1652c1aefb0 SHA512 c6f0be9e08301c568fcac69dffaa7bda03eaec98fdd71d8b16901cd2ed578e770523764e43af2ae84daee0c730522d6ab5034d57d8eb5715984e1c44550c18b4 WHIRLPOOL ef755bd96340ff817607f85270cbfd997cb271d750edaf0ecb175f7349beeb54aa5b1745df526e81cc85003caba7c8d7335fd1ebc934660432bfbcfccae0beed
+DIST unvanquished-0.8.0.tar.gz 46194966 SHA256 102addb6bc781520f01448e77a98eb22f615b18f0218c65f20239c91b584b960 SHA512 576ac54ff7612c4495f5853692e37c330d33c24697f0ca1f0bd1c43321c695dea15036bb2f9fbd0ef6754b625747f7ecd2cdd7b5cd1d0dff89a209820cd022cf WHIRLPOOL 23f2178190fe80392b2e60f53be892a862a3e3e5de3f8f3881aa53aba9bbb236c1b87fb95c1164f8e9cb2862d57810b174f1b1e362c149b76dc202213fac6ebd
EBUILD unvanquished-0.4.0-r2.ebuild 4453 SHA256 56d38162ab52aa15a2c5c049b247361caff518f7e3500bca1ade99ce79605421 SHA512 aa5c978da7ebbf4e4815c7c5f9b7391bfe6ad24ec78a666dafe76fc40026db54e4c3d3d2c9e3a8ca950bfc4e96847480f5459d7f3cf6d4d1555d79c865e0c640 WHIRLPOOL 6fe88d601dc5c379470b474d2cacdbf4633f9318ee007e1fc27ff5105b12321144754c017d4d5c1f7180334965450cd032513f0d3dcb6a61a7c366f7e0998911
EBUILD unvanquished-0.5.0.ebuild 4603 SHA256 754cdfbe4a0f488a210d19435f86d79e755a7dd0ef923df634bd3a84ecd1d065 SHA512 37ac68a20b547b9d93350fd3a81905042bcf1baf06a0d646e7ab8b94137c5bc4da67a7a2bc5ff4c1621c313cb247da295f0d7b6a6aff84f376e3d66f686c8e7e WHIRLPOOL fe0e91d853a17da16303e5848f44bc7420ac4d33020e00f895f1c48530b0623ce7dce805e66d7d9445331b2280a9162470a2b8271599df11093af65bb1291394
EBUILD unvanquished-0.5.1.ebuild 4603 SHA256 754cdfbe4a0f488a210d19435f86d79e755a7dd0ef923df634bd3a84ecd1d065 SHA512 37ac68a20b547b9d93350fd3a81905042bcf1baf06a0d646e7ab8b94137c5bc4da67a7a2bc5ff4c1621c313cb247da295f0d7b6a6aff84f376e3d66f686c8e7e WHIRLPOOL fe0e91d853a17da16303e5848f44bc7420ac4d33020e00f895f1c48530b0623ce7dce805e66d7d9445331b2280a9162470a2b8271599df11093af65bb1291394
EBUILD unvanquished-0.6.0.ebuild 4587 SHA256 d57a26653ca64589c514438a352efd8272da7141282b4fc4597142d9762886c7 SHA512 e7e50bcd4eaeca51fd43dfbfd151dd480001d1ebb7096c61dd6e725ed2192ffb379b2ed23db951e713154faab35072059ca8f6c1f03d3c0dea4515a24378e178 WHIRLPOOL 85661c11895ac55a9e2ce6fe1cd7daaccf5712a9170f8904ab5f17ed74815a82b862c63bdae83d48c1a70be252a56eae9fdd3fa9c419856e36a68eae9f645666
EBUILD unvanquished-0.7.0.ebuild 4587 SHA256 d57a26653ca64589c514438a352efd8272da7141282b4fc4597142d9762886c7 SHA512 e7e50bcd4eaeca51fd43dfbfd151dd480001d1ebb7096c61dd6e725ed2192ffb379b2ed23db951e713154faab35072059ca8f6c1f03d3c0dea4515a24378e178 WHIRLPOOL 85661c11895ac55a9e2ce6fe1cd7daaccf5712a9170f8904ab5f17ed74815a82b862c63bdae83d48c1a70be252a56eae9fdd3fa9c419856e36a68eae9f645666
+EBUILD unvanquished-0.8.0.ebuild 4644 SHA256 f5c8e0ba75bec2a5198f0708b5833ad87894fd2aa236a820f11ab7cc82ec4d3b SHA512 59e960478dbc615c09cd03820359468b81613811abd3a155e5ecd3b162855fc56b40f7b3d30714619ba6c25931e8daa3cc68f971947ef7394f613cbeb4d1cdd7 WHIRLPOOL 287d771478bda5a27ea03a7e8c52fde93886d99374c591d2973f31481956ad399210dbf0b6d19479d0beca4f3fa5906a1be99fd032331488c9aad9e634f2ede0
MISC metadata.xml 1274 SHA256 0c06bb947598d5a8992e596eb95fcfc481bfff7473e3f2b3160d404bbf0c2b07 SHA512 92ab78129bab4084bd2737af44bba13a218b619533c1000357ce533f510ca0edaec1475bdcf39c37290c9f8b98f4eb498ea4ff2353824ff8ec1dddd57cbd9bd7 WHIRLPOOL b629ee3de7f6cad00bd89ee93112e0cdf59eda715182d5309b528b45f2ed933dd8772e50a77d4263f91f16ee324d38c6afc8a22ed81effdb7b595c405eb5e388
@@ -0,0 +1,166 @@
+From 071ad19ac9c869c96fa42bd67ebd98c308f7635e Mon Sep 17 00:00:00 2001
+From: Darren Salt <devspam@moreofthesa.me.uk>
+Date: Mon, 8 Oct 2012 04:29:57 +0100
+Subject: [PATCH] Check in fs_libpath as well as fs_basepath for the renderer
+ code.
+
+29a44f3 broke things for my .debs.
+This puts that right while retaining the intent.
+---
+ src/engine/client/cl_main.c | 67 +++++++++++++++++++++++++++----------------
+ src/engine/client/client.h | 2 +-
+ 2 files changed, 44 insertions(+), 25 deletions(-)
+
+diff --git a/src/engine/client/cl_main.c b/src/engine/client/cl_main.c
+index a32b36a..6a12854 100644
+--- a/src/engine/client/cl_main.c
++++ b/src/engine/client/cl_main.c
+@@ -4035,6 +4035,8 @@ void CL_StartHunkUsers( void )
+ char renderers[ MAX_QPATH ];
+ char *from, *to;
+
++ Com_Printf("%s", _( "----- Initializing Renderer ----\n" ));
++
+ Q_strncpyz( renderers, cl_renderer->string, sizeof( renderers ) );
+ from = renderers;
+
+@@ -4047,9 +4049,7 @@ void CL_StartHunkUsers( void )
+ *to++ = '\0';
+ }
+
+- CL_InitRef( from );
+-
+- if ( CL_InitRenderer() )
++ if ( CL_InitRef( from ) && CL_InitRenderer() )
+ {
+ cls.rendererStarted = qtrue;
+ break;
+@@ -4058,6 +4058,19 @@ void CL_StartHunkUsers( void )
+ CL_ShutdownRef();
+ from = to;
+ }
++
++ if ( !cls.rendererStarted && CL_InitRef( "GL" ) && CL_InitRenderer() )
++ {
++ cls.rendererStarted = qtrue;
++ }
++
++ if ( !cls.rendererStarted )
++ {
++ CL_ShutdownRef();
++ Com_Error( ERR_FATAL, "Couldn't load a renderer" );
++ }
++
++ Com_Printf( "-------------------------------\n" );
+ }
+ else if ( !cls.rendererStarted )
+ {
+@@ -4132,48 +4145,51 @@ int CL_ScaledMilliseconds( void )
+ RB: changed to load the renderer from a .dll
+ ============
+ */
+-void CL_InitRef( const char *renderer )
++qboolean CL_InitRef( const char *renderer )
+ {
+ refimport_t ri;
+ refexport_t *ret;
++ void *lib = NULL;
+
+ #if !defined( REF_HARD_LINKED )
+ GetRefAPI_t GetRefAPI;
+ char dllName[ MAX_OSPATH ];
++ const char varName[][16] = { "fs_libpath", "fs_basepath" };
++ int i;
+ #endif
+
+- Com_Printf("%s", _( "----- Initializing Renderer ----\n" ));
+-
+ #if !defined( REF_HARD_LINKED )
+-
+- Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "renderer%s" ARCH_STRING DLL_EXT, Cvar_VariableString( "fs_basepath" ), renderer );
+-
+- Com_Printf(_( "Loading \"%s\"…"), dllName );
+-
+- if ( ( rendererLib = Sys_LoadLibrary( dllName ) ) == 0 )
++ for ( i = 0; i < ARRAY_LEN( varName ); ++i )
+ {
+- Com_Printf(_( "failed:\n\"%s\"\n"), Sys_LibraryError() );
+-
+- //fall back to default
+- Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "rendererGL" ARCH_STRING DLL_EXT, Cvar_VariableString( "fs_basepath" ) );
++ Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "renderer%s" ARCH_STRING DLL_EXT, Cvar_VariableString( varName[ i ] ), renderer );
+
+ Com_Printf(_( "Loading \"%s\"…"), dllName );
+
+- if ( ( rendererLib = Sys_LoadLibrary( dllName ) ) == 0 )
++ lib = Sys_LoadLibrary( dllName );
++
++ if ( lib )
+ {
+- Com_Error( ERR_FATAL, "failed:\n\"%s\"", Sys_LibraryError() );
++ break;
+ }
++
++ Com_Printf(_( "failed:\n\"%s\"\n"), Sys_LibraryError() );
++ }
++
++ if ( !lib )
++ {
++ return qfalse;
+ }
+
+ Com_Printf("%s", _( "done\n" ));
+
+- GetRefAPI = Sys_LoadFunction( rendererLib, "GetRefAPI" );
++ GetRefAPI = Sys_LoadFunction( lib, "GetRefAPI" );
+
+ if ( !GetRefAPI )
+ {
+- Com_Error( ERR_FATAL, "Can't load symbol GetRefAPI: '%s'", Sys_LibraryError() );
++ Com_Printf( "Can't load symbol GetRefAPI: '%s'", Sys_LibraryError() );
++ Sys_UnloadDll( lib );
++ return qfalse;
+ }
+-
+ #endif
+
+ ri.Cmd_AddCommand = Cmd_AddCommand;
+@@ -4252,17 +4268,20 @@ void CL_InitRef( const char *renderer )
+ Com_Printf("%s", _( "Calling GetRefAPI…\n" ));
+ ret = GetRefAPI( REF_API_VERSION, &ri );
+
+- Com_Printf( "-------------------------------\n" );
+-
+ if ( !ret )
+ {
+- Com_Error( ERR_FATAL, "Couldn't initialize refresh" );
++ Com_Printf( "Couldn't initialize refresh\n" );
++ Sys_UnloadDll( lib );
++ return qfalse;
+ }
+
+ re = *ret;
+
+ // unpause so the cgame definitely gets a snapshot and renders a frame
+ Cvar_Set( "cl_paused", "0" );
++
++ rendererLib = lib; // at this point, we pass on unloading responsibility
++ return qtrue;
+ }
+
+ /*
+diff --git a/src/engine/client/client.h b/src/engine/client/client.h
+index 190d0cd..4d187fc 100644
+--- a/src/engine/client/client.h
++++ b/src/engine/client/client.h
+@@ -564,7 +564,7 @@ This file is part of the Daemon GPL Source Code (Daemon Source Code).
+ int CL_GetPingQueueCount( void );
+
+ void CL_ShutdownRef( void );
+-void CL_InitRef( const char *renderer );
++qboolean CL_InitRef( const char *renderer );
+
+ int CL_ServerStatus( char *serverAddress, char *serverStatusString, int maxLen );
+
+--
+1.7.10
Oops, something went wrong.

0 comments on commit d7b8047

Please sign in to comment.