From ddb723e7897f896eac1444e5980aa54cbc853a86 Mon Sep 17 00:00:00 2001 From: grepwood Date: Mon, 1 Apr 2024 09:52:44 +0200 Subject: [PATCH] Fixed all pkgcheck warnings for games-fps/darkplaces and games-fps/quake15 --- games-fps/darkplaces/Manifest | 4 ---- .../darkplaces-20240226_pre20240226.ebuild | 2 +- games-fps/darkplaces/metadata.xml | 3 +++ games-fps/quake15/Manifest | 5 ----- games-fps/quake15/metadata.xml | 3 +++ games-fps/quake15/quake15-0_beta2-r1.ebuild | 17 ++++++++++------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest index 3aade29..05536c9 100644 --- a/games-fps/darkplaces/Manifest +++ b/games-fps/darkplaces/Manifest @@ -1,7 +1,3 @@ -AUX 0020-make-sse-selectable.patch 3394 BLAKE2B 990a132a4181dd753a9db58a49d1b7223be513f6ee5d269b00c91cbe0194f121fb86957f83fa63981a258198442af68c14eb8a12dc3121d6a81feada16a78c35 SHA512 d2061012747445053e074399c440b4aca8ab38beb4497f748de5f74e4c1369bb7a016c7606d772d17a1d62bf18629e28bd7c4b56fa9107c90ff2a755a125312f -AUX 0030-builddate-template.patch 478 BLAKE2B 41ada1253f2ecff2c10ef8db510e9cf362b529898c333bf68fbb01031bb44eb253b86845d6e0086937e5a5069dceb91fd7a60688206c1aa62c8f9d48988f15c0 SHA512 c90396c0cc29b78c386dc5eb5d766a81a9b9ccfe1ab852442af6ebf938cc0be6f5f32c8b19d83edeae1cf8b417ee88d112255401aad63c39a9576ecaa927d425 DIST darkplacesenginesource-95ed24831ca8dcbf6ae8f886733c35ce2ad83272.tar.gz 4614280 BLAKE2B 933aa4dcbc262c8f62c12de8402f2b8e31063a89fde1901ba3378646be51b78b7f5f657ec26d52d1ecfd5f88b62677b912f82ce915e44a8d63819f16ab0235da SHA512 c5b8a1299c02e9eef59bbe36cbcb36005cedd9948f97597474cc05ce5ffdd33729825733877b9bac86cf7792d96cf80b6795281381c11eb84879b7823c5c5979 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 -EBUILD darkplaces-20240226_pre20240226.ebuild 4908 BLAKE2B c3f7fff800fbb37c661699d62f7bf8388725bb6fcb0333ad2420fa1d7463b892830748df799cebe2055304b7d69379a73d24d9722fe84c108c76b9c2a88f39e5 SHA512 eda3a46d966217c46517f3beae53bee1490b5660540e68d04c0e20c1b77465a24c37e29a98b9772a5b9efbbb406d7e69bbd33f15183515d8dcb54738e6956188 -MISC metadata.xml 580 BLAKE2B 4415a644b98a15aa79d3b9ecf075444bf73cdf8f78d413b91eb4687722ff0d4411405f7d9ce1da6c3b4748340c456ae0bb8721c5b7025ee69fd0de288924bdf1 SHA512 f22ef40165ee9b84cfedcb475df467c89509153f6e4c593006f3314adb99057ea6587affd279ed432f57a0a7ac83f50d6dcaad07152b3c805266bb9475f1d16d diff --git a/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild b/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild index ed2cdde..ad2ae81 100644 --- a/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild +++ b/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild @@ -39,7 +39,7 @@ RDEPEND=" dev-libs/d0_blind_id dev-games/ode net-misc/curl - virtual/jpeg:0 + media-libs/libjpeg-turbo sys-libs/zlib media-libs/libpng cdinstall? ( games-fps/quake1-data ) diff --git a/games-fps/darkplaces/metadata.xml b/games-fps/darkplaces/metadata.xml index 61890b7..1ef1f36 100644 --- a/games-fps/darkplaces/metadata.xml +++ b/games-fps/darkplaces/metadata.xml @@ -11,4 +11,7 @@ Install and setup the updated light maps Install and setup the updated textures + + DarkPlacesEngine/darkplaces + diff --git a/games-fps/quake15/Manifest b/games-fps/quake15/Manifest index 86e9806..c415d33 100644 --- a/games-fps/quake15/Manifest +++ b/games-fps/quake15/Manifest @@ -1,9 +1,4 @@ -AUX 0010-fix-dpsoftras-alignment.patch 2277 BLAKE2B faf0e732c70163a36a9b7ba8636487d2427844243bea8112b25433ee6480f9116ca50e346f9b6c442f4267539b7b5d21a926340a38d3aa122f304e234585d53c SHA512 bbb91271d50a619ad1569e560c0bcc3ef92c812c80fe2855fbcf29fa555511f880b50ede5ebf25faa031706dbd9634a3da0fd8b9738db7b8f6b28686ebc81d97 -AUX 0020-do-not-assume-sse2-is-available-just-because-sse-is-available.patch 13189 BLAKE2B 591f381b3207c607146aeeba9361fe4514a065dfe0ab6989b6e78634009b25068e0da7cf4a94f8f40764ca3c056ee9550d33907f466e2f405ce3c4cabeb2e5a9 SHA512 b548b613a3cf2795821308a9c6ca0d56bcd2b3ea64ac9c9678ee183196d67c37bfc68212e461b6f30b366cdf26e2240b6aa31429ad27b395010cb52a74686f60 -AUX 0030-builddate-template.patch 477 BLAKE2B 7b427ab38d9113602e19a8b6b64b4bf0de35bf88118d15bdf3058d3c6d320b0ca26be8272152f90f4324da6eb5f6135707d17d9df1119d896383da4a03c33db9 SHA512 3e94bc7ae346fe908b85fe67982aae1f987312cb91bc560f742cb336a459ad6ac5245e257d303ae3ead3f90eb9280a799ba40ea630e771fb94752b670ded7989 -AUX 0040-enforce-quake15.patch 1314 BLAKE2B 2232061e0b722c00dc12bf9ec3704fad20f8221eae176a311372ea1fd9f9ca263c264f23e7657d839d2cbe865d77ece4f98ab34a98cccd7ca84446cc38ef6119 SHA512 f043dd2450252b1ef54a53794dcf32c2c1ecc3dc5a1ac0f7d171173ba851265a86441053469378f8f901819928c0762941dd19b3cfc21b5cb012fe4318a638a3 DIST Q15_PublicBeta1.7z 412650697 BLAKE2B f9f6ce082ec42d67e0d001b363b25ea53d05d433863e74454420f3f98f64cff7188a700343685ef6d2f3649de703ce52c18144ce982fdf34c8b7aca9bc18bfd2 SHA512 2ae9f2dc3a95331985621bde1d27187c009b66aa807e44125c2a0f019c4e3eada5578ea4cc1ef7aed2844390a4a7eda20c8eedde7d9c084635bf65dbf4908c27 DIST Q15_patch2.7z 4045889 BLAKE2B f5bf7d7dc02758da7dd1969bd748c5861e8d47c102d5d4a823dda979e1404a7264147b477f751d649681fbb015f2d0777a13c09903458b7f92fdd742072b8279 SHA512 07f9a59202c2195af067a789b6075cdcdf2070953faae7460820ddb112a6d5aaec9015ce181ec4e9731280d36d8f13c7c8af63450d66eb7b287b8ed6261b8ba1 DIST darkplacesenginesource20170829_beta1.tar.gz 2063047 BLAKE2B c3d4a49a6f11f7d6458c0f94da05547abfe9b975d2d2810e9d06d6077dae293da7e547482d92fa58612a59acce592abfe8e1ac3f55ba05bad43436e46737981b SHA512 618ddda15f80c04d3d46499504213326a2b82f591e8f633e62ac988b2e525e8c5f310f12ea91a48f8ea0c8f02375568acad28a5558311b802f6a0e45eaf592f3 DIST lmp2tga.c 7006 BLAKE2B bb88766db283a5effa44ddd439da63d6966b3b76e806b0c907fcc5461a00f9c9f780f30aa4bd59d5688c3a267427a737f078961d00f7ff796d0fb28dfcf756dd SHA512 3c7d596de4d191876d9b336be83e1b28edf1e0e6bc79e1dcfad3c071a9c504af789b5f82c225fd546d94253a34da4dde7807fb8775d7052bac7b820a21d22cb2 -EBUILD quake15-0_beta2-r1.ebuild 6882 BLAKE2B 9b8c5f713ce9925aadd0b26294ca421cfbf7716dd9b4a1c64bded4497c8e5642bd10d7c4f8960dabd11eb011f369076737d215992ad3f7e103282e9a89cdf5ac SHA512 681f3b686b8f295556a719ed62a70ffafef9b5e2920a59c91168d48c4b7d0b3f9cb47761b20a9e105f1bad9000e2f0cd3376e51d33b7d5e3dcbee5b89a4fae65 diff --git a/games-fps/quake15/metadata.xml b/games-fps/quake15/metadata.xml index 6070ae2..eb234e2 100644 --- a/games-fps/quake15/metadata.xml +++ b/games-fps/quake15/metadata.xml @@ -9,4 +9,7 @@ Adds support for video capture with media-libs/libtheora Install and setup the updated textures + + DarkPlacesEngine/darkplaces + diff --git a/games-fps/quake15/quake15-0_beta2-r1.ebuild b/games-fps/quake15/quake15-0_beta2-r1.ebuild index 3c60be1..0a716a8 100644 --- a/games-fps/quake15/quake15-0_beta2-r1.ebuild +++ b/games-fps/quake15/quake15-0_beta2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic unpacker desktop wrapper +inherit flag-o-matic unpacker desktop # This is the only known version of the engine to work with this mod ENGINE_PV="20170829_beta1" @@ -60,7 +60,7 @@ RDEPEND=" dev-libs/d0_blind_id dev-games/ode net-misc/curl - virtual/jpeg:0 + media-libs/libjpeg-turbo sys-libs/zlib media-libs/libpng cdinstall? ( games-fps/quake1-data ) @@ -184,7 +184,8 @@ src_compile() { DP_SSE2=${sse2_enabled} \ FORCEGAME=quake15" # If neither OSS or ALSA are selected, then SDL must be selected. - # However, SDL is a backend for both graphics and sound - so not having ALSA or OSS is only an option, if OpenGL is not. + # However, SDL is a backend for both graphics and sound - so not + # having ALSA or OSS is only an option, if OpenGL is not. local sound_api="NULL" if use oss; then sound_api="OSS" @@ -200,7 +201,7 @@ src_compile() { fi ln -s /usr/share/quake1/id1 id1 # Only compile a maximum of 1 client - cd ${WORKDIR}/engine + pushd "${WORKDIR}/engine" local compile_client=false if use sdl; then compile_client=true @@ -212,12 +213,14 @@ src_compile() { if use dedicated; then emake ${opts} "sv-${type}" fi + popd if ${compile_client}; then - cd ${WORKDIR} + pushd "${WORKDIR}" unzip -j quake15/q15.pk3 gfx/qplaque.lmp - gcc ${DISTDIR}/lmp2tga.c -o lmp2tga + gcc "${DISTDIR}/lmp2tga.c" -o lmp2tga ./lmp2tga qplaque.lmp - convert qplaque.tga -gravity North -chop 0x112 ${WORKDIR}/engine/${PN}.png + convert qplaque.tga -gravity North -chop 0x112 "${WORKDIR}/engine/${PN}.png" + popd fi }