From b2dbfa629df8c24211a225044e7ea3e67d427313 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Mon, 26 Jan 2015 22:18:54 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-fps/eduke32/ChangeLog | 11 +- games-fps/eduke32/Manifest | 31 +-- .../eduke32/eduke32-20130317.3572-r1.ebuild | 216 ------------------ .../eduke32/eduke32-20130627.3905.ebuild | 216 ------------------ .../files/eduke32-20130317.3572-QA.patch | 163 ------------- .../eduke32-20130317.3572-libpng-1.6.patch | 40 ---- .../files/eduke32-20130627.3905-QA.patch | 160 ------------- 7 files changed, 10 insertions(+), 827 deletions(-) delete mode 100644 games-fps/eduke32/eduke32-20130317.3572-r1.ebuild delete mode 100644 games-fps/eduke32/eduke32-20130627.3905.ebuild delete mode 100644 games-fps/eduke32/files/eduke32-20130317.3572-QA.patch delete mode 100644 games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch delete mode 100644 games-fps/eduke32/files/eduke32-20130627.3905-QA.patch diff --git a/games-fps/eduke32/ChangeLog b/games-fps/eduke32/ChangeLog index 27966143c761..767f2cdcb5fa 100644 --- a/games-fps/eduke32/ChangeLog +++ b/games-fps/eduke32/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-fps/eduke32 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.12 2014/11/25 23:11:34 hasufell Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.13 2015/01/26 22:18:49 mr_bones_ Exp $ + + 26 Jan 2015; Michael Sterrett + -eduke32-20130317.3572-r1.ebuild, -eduke32-20130627.3905.ebuild, + -files/eduke32-20130317.3572-QA.patch, + -files/eduke32-20130317.3572-libpng-1.6.patch, + -files/eduke32-20130627.3905-QA.patch: + old 25 Nov 2014; Julian Ospald metadata.xml: drop maintainership diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index 53ed746ab058..441edda6dc07 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -1,39 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX eduke32-20130317.3572-QA.patch 4584 SHA256 539891e0b87cc1da985e5fa2ef0f0bbf7d96a45218008d757700a279f63d0a44 SHA512 6d7909685edbabd2351d3d1cc7a0ede43d52ff8c7b4723bd12d1e6bc8f35d955a96d397b3a60fb7b40fd4166f6f88a02c66147d89dc2956c17d84abcb78ec343 WHIRLPOOL 979e5fbe6da328402725a2e8d2bc4e46fecdb12c2526352f8c9f453fc5bfa43cca49c756a7c99b1ae05ee09fa31daa0413b982755013283c9d36a77abe20b484 -AUX eduke32-20130317.3572-libpng-1.6.patch 1346 SHA256 8bbf0cdd185371318f7867b185499498d6f38f0ecdcaff1fed7cd5f0c2ab8045 SHA512 7a9d2c199efaddc9bab3308a6f96020b009dfdd13066e09637bf6ff24b4a036bd639d3f6c215f2692f26fddacc8069c62c245942e7f7c31de205832ca4879053 WHIRLPOOL 8ec08e7201d8c2a5438dd0e9219e45b9f64e29e4f49ddaaf85c0a70e454efd30685c241c8264e4625c16289f267e09b547f2e9ace324d2719a04ec29637a2464 -AUX eduke32-20130627.3905-QA.patch 4456 SHA256 6d6b952a07b53e03eadd4a75f06a5b8ee501e1530945f5398a4a68aa56835697 SHA512 ab2a9706229ce6a1c2b3aa31a39ef9464fe432c15e23d1758c8e13bb5380719298432f6096d474ee6a4e8f30ac64e5c4c5c181018670622c22145a49f9c3ac9e WHIRLPOOL 020338f875f4fd685b848375d7a4fd87928b959f7b4367e4152ad384f3bc3af2b8e0b0d318d9b22de4f472fd505aea9357ff6caeacc5d5a388003c56ebdfa3a5 AUX eduke32-20131119.4169-QA.patch 4485 SHA256 6676ba6a48369e73dcb4c00443c672a2226d4bc3ca533ae353b5165c61a40ff6 SHA512 6b23e5d9de1d6fbdf32fced01e9432f1d96442c44fdb591cf3e51830b57622c5734c10c2c0de8ef6849f75697fd9394c14ce5ab16271774a7bd46bde08502c4e WHIRLPOOL 728c09a7bd1b690683384d2af3f04965985e38a45d6770bda582bde4eecea8d7c5b36338df2933566b0b6902e4328da599767a437ad5a9f66d91839784d57593 DIST duke3d_hrp_5.2.zip 709961560 SHA256 d5dc9ef4be517de1464e8ed886f2a6352402fdec2b9cf271d292a5aee82fae27 SHA512 6b80739082d01e879ee77c85d3702269a605bc5f5b9393ce2f391d50c2a14e8fd0cd274a7e3010636646c3b7725591f45f107503c04a84655621a197f5f3c69e WHIRLPOOL 03cbc7fe0b8f3f7d4eaf7e5df4d8c9537ffaa0e7a49d938f0138bf0a6c87a72ecfa30666a94ec228dc66da6e55a6632d08340edcb2c49d9c4aaa4031ab5f231c DIST duke3d_mus_3.0.zip 129992841 SHA256 6dc9eb70ee1850519b55e547a399e3f7f03ddf60a6b16b0e205edd8a05bdda4a SHA512 9b782a2b6bb006a01e7ca2a8c395fcbe0884cc7648fce03f7760d67e67e4b03d73e31fff5964a604270ffddf09df69f306147dffd115efcd738de416939060cf WHIRLPOOL dec7613bf321a8392361ed414c3cba1909adf6106ae16fe04858549d8574d696f677ac90b0a8a7ab7cf6fb31b6263223b03434536f528c7f50c8b77fd7c059d2 DIST duke3d_musopl_2.0.zip 266444907 SHA256 4f0afc46bfb5f38b1a1417a6145c0c548355cf4c4438e0330a9de704b139f1c3 SHA512 e9ae69727f84ff71bf9abffa283fda1fcaf56fd6ae6b865d12f138d64b0fca0d36fd9695b1e60a64716154055373eecd6499ebd8801a4ecb55ddc4722208eff7 WHIRLPOOL b69b76050f97785b54a1693b3f9eeb124b208cb785719c9c37a499a7af8f9cdd2362a7ce0cab81b17a3ab7f80744eadd0a286b45844dee6bf37e0f320d61148a DIST duke3d_xxx_1.33.zip 26586453 SHA256 c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534 SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf WHIRLPOOL 1e7c8a06fd8ff558a8f5a5cc37093fe055555bdfd296194935c986978b4630c225a1f5da7d54e274bd8a5258a4b518ffc2456c79f515185bfb6e403488cad125 DIST eduke32-icons.tar 102400 SHA256 efce5cddd9a55f07824f5739831b79cff2ea6e508f0b17b996316533af925842 SHA512 797f76cfc0e253ce3364e80f70b616fc004811c08519020727871addc90c7780b475ee7769398e13859f93893ccbb916bd4229a39f4c119169a69231e6fd411c WHIRLPOOL 9815abce63dcf8e865c61610f1b04915ced9b29c65cd831022f5b6f261bd55efc700b6fd5ee2741332023b85682b08d3a327998c57be33846dffdcb60eb1339b -DIST eduke32_src_20130317-3572.tar.bz2 10591673 SHA256 082b0676f184ad6fe574925f9be95e31318b9eff38a7117c9d094fb64b57967d SHA512 911c282918ae6173ced1bca3461da69ecb7c5893023dfe9a4d1261fd47b64aba1fcde9514746ae38daabf8ece7739f8e1c9257e68d929ef607bbcff030179e60 WHIRLPOOL 1642facdedd1a8824ac1d453278b3ac6d61d0dfd72210511cf1855bede570bc3111b972f7f6fe984f9aba039f28967e4e546d7e8f53be7e592ce1a8b1f19cef5 -DIST eduke32_src_20130627-3905.tar.bz2 11047453 SHA256 de177c7f064c8fb44b78d31cc4ba35c35b29525bfecee628fe3b171fe7b104c4 SHA512 16ceaf3c6949078a3fcbd66d1e0d5bf9be4ef1c1595fe93b00b7fc7de8c2f329e7f2981976aad8f417d1d6977b30f6176d5f399714771499aeae229db390f483 WHIRLPOOL b83504536ad6dfc70588116b7b91102a0623d149d47b7747dcd5b8b15aa0782a7f28fd757bb63a7a4dd5f2a9468f631b8242f9ec41b637d098aba24019a52a23 DIST eduke32_src_20131119-4169.tar.xz 12228040 SHA256 1aaeadb7b8ac68d6a7e3b0cc568875df6a2b319cc7626c6a4d38cb69fa5f162e SHA512 6ab7babc18c80e111603b9b731f37963f3bfe2ee753a2e383d58a21e77ad5a561cf95f5392adcf76259e6ded2dcd5eb5d0fc484edf65ec6887a746c4f422f292 WHIRLPOOL 576e0f0e73b383fe221ef5db8b54889bf3e8271e361a0af41fd1a914d8a9be3711a9b536d668790013f8fcd0ea3c11b31b47bf333e685bbf853f48152e2fc194 -EBUILD eduke32-20130317.3572-r1.ebuild 6465 SHA256 61296578601dbc0beea59cbd67ef57360f19db91318f88479a1635688739011e SHA512 adfc89ecc91ebd4fc149d8f9788744a18a0788b345b7bc657bd52cb7edf2e264313a38bbd4b2a2864f35d286d5cdaf2c4be5c5722c615cd7502e0088db4d21fa WHIRLPOOL 91a38c3daddba853d4a4f2fee67b7765f4c301d2a6df75b2a634601f431ec92a1737b2555bd3194593e39aa9e7225f4fe66d49b22d76e203f9face6f3ccec722 -EBUILD eduke32-20130627.3905.ebuild 6458 SHA256 8d98136327ca9095f63094df09ef066f9eef871238e43419db8bd606a2cf3c2e SHA512 67f96ff03443136f53576d1dfb1f4179257838cd28d9413b2d3944f3ea29e2ca8396e12fb279a84e521819ab9e0fbbf1cd553ebf9a882eaa082fbdd961c3a1db WHIRLPOOL bbc87a799b6095e028268bd5764f28741f1ee100021ef9fb674fa4c559195317138ec42af49c095a11f3876e0beb1ab79877db89a6af8c5fcc5bded18a8354f4 EBUILD eduke32-20131119.4169.ebuild 6487 SHA256 429d27aa7bf85257cb392cabde0703563d05748350c45199fd396cb7a5e242b9 SHA512 adc1cd0bfc8472d3f5e8084e34894457095b01ee78bf3e739025ad85ff4acab76594d866ffd6a36b60bd35b22e0e1e66727d64a1c47cc7e71e1d6bc913018a05 WHIRLPOOL d1001d8813176c7bb2f12c584029a2c4c3fbfd6e0546ce464b64d608a52eecbca8c307a2b3f396e2462f58dbfb4e62ece95997f0e6e4e2baad1c5e831a685c27 -MISC ChangeLog 2279 SHA256 f86cd7e92b91cab890de2cdc37f6cc261f23e553067049f284653b3c07897300 SHA512 bedc6cf5e3e907f92ab74a668879d0dda5bc65cda6347f4bc88458fb13b0488e4455fec3ba8ecb97c9029db457c3f8fc8f8129f8476b2527c59ab419313a61c4 WHIRLPOOL 1e47abe34a9534dfd87a30a5ce92b5bba66df3af2ddaf7f1c88b0f516eb724ffe1bc3d43271b24a1271ca2055d18001c8371bc50ce0a1f30a2ba501a71cd8d7b +MISC ChangeLog 2540 SHA256 532544bca48d70a84fc23f55e7530d97caeee36d1a270ccc53cf89f51c1280d6 SHA512 cfbdaada15d3ae4a94af4b794feddc351c007068f41490be7cfdfba66f20ccfcee940eb4187a8a363b4413d9060b7ebff9cdd224e6609f22e44285f1758332ac WHIRLPOOL 3a22af3c7ad97c734367fcd1a55936f03f72cd26e239560998d04ea62eefdc8fb9463c6190ad035990dababafeab750f8015d1a691103b0cb94d2fc65aa1af8c MISC metadata.xml 926 SHA256 22661e8164b4ef9df07f756adbc1a615872b725e247a859289623875deece842 SHA512 09cc057fa38c77847486befbba91e0bb35884065fd17ad9ba7fcbfe2f399745122870b17546c050e7fa519d31a9a7134adc8838af1bc8c5466976ae931bc4e90 WHIRLPOOL d51e994b814bdbae08cbd900c96d10fd916bb9f0f40c714e1cd429d4303a3fcbaf79823598e0f1ee1fd8b17ba20c9f4ec4cd0089edb3b580112f605955b22c71 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCABmBQJUdQynXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgI6sQAKGRjpHsGOp9ZFuW0H4X1WqG -kVtq1JvK0hxZFkPVVOYD4gYRStnwl3bcGJS/IQB8hsa1eAZtN5+qK2QPpYrFZvWL -Ew7WXH5ZYjDTrdLVPwdAjirywOSwmj40LLKPYQjd3TDBg0PbLJn/9p4knd4AHyf9 -Qw8PFrmeZrjvv6nPIBODla9xoBjXXny4nApxQ2sCHVoi+0q7088Rlme12+dXJPlh -PgSNWl8sG7++qZ0i+JYZOk330B5SXYKc4uSEtDsofKix49wk0GW3RfYtFArtLthX -8sTytVJ65kr6hFqAMWO9+V5GMguECy0+xlDBo6Sj/vBvWA6wMvx8rkeiDv40ytZU -2+arMSB4izi8vd2A3IOYQa13Wt3Q1g5szk5HpGEn4UkUlbgsHCphf6LxJ2CiLqgM -qmTLAseDs9EovgJXIjuQfO3qh19Di1ezL8x7vXC/zCR64z1Wndis6U0CF1hFBMHm -Sw+SqczK9Rbpb22W35T0EiSHSC9UGBJa7fjZqSmNQytYKDIo2+JxjUNYQxWUbESx -bWv+cQDaEZgKMup3myclTgMXnB4ybb9bi79hcrAjEYhRa91aEvp1eOdbCSrUL4Tk -MIIuZr9TN8G3PcQeyZhELkrXbpxBBASzPEZIDkG0l6vicwh2F0U0W4u7neCMuQZC -dw9sDoKpKPUDXU55aflx -=8LnP ------END PGP SIGNATURE----- diff --git a/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild b/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild deleted file mode 100644 index 97858cb44aca..000000000000 --- a/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild,v 1.3 2013/04/11 14:16:54 hasufell Exp $ - -# TODO/FIXME: -# lunatic broken -# lunatic? ( >=dev-lang/luajit-2.0.0_beta10:2 ) -# $(usex lunatic "LUNATIC=1" "LUNATIC=0") -# -# extras? ( games-fps/${PN}-extras ) - -EAPI=5 - -inherit eutils gnome2-utils games - -MY_PV=${PV%.*} -MY_BUILD=${PV#*.} - -# extensions -MY_HRP=5.2 -MY_SC55=3.0 -MY_OPL=2.0 -MY_XXX=1.33 - -DESCRIPTION="Port of Duke Nukem 3D for SDL" -HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/" -SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar - textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_${MY_HRP}.zip ) - sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_${MY_SC55}.zip ) - opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_${MY_OPL}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_${MY_XXX}.zip )" - -LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx" -REQUIRED_USE="vpx? ( opengl ) - textures? ( opengl ) - offensive? ( textures ) - ?? ( opl-musicpack sc55-musicpack )" - -RDEPEND="media-libs/flac - media-libs/libogg - media-libs/libsdl[X,joystick,opengl?,video] - media-libs/libvorbis - media-libs/sdl-mixer[timidity] - sys-libs/zlib - gtk? ( x11-libs/gtk+:2 ) - opengl? ( virtual/glu - virtual/opengl ) - png? ( media-libs/libpng:0= - sys-libs/zlib ) - vpx? ( media-libs/libvpx )" -DEPEND="${RDEPEND} - app-arch/unzip - x86? ( dev-lang/nasm )" -PDEPEND="cdinstall? ( games-fps/duke3d-data ) - demo? ( games-fps/duke3d-demodata )" - -S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD} - -src_unpack() { - unpack ${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 eduke32-icons.tar - - if use textures; then - unzip -q "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip "hrp_readme.txt" \ - || die "unzip hrp readme" - if use offensive; then - unzip -q "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip "xxx_readme.txt" \ - || die "unzip xxx readme" - fi - fi - if use opl-musicpack; then - unzip -q "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip "readme.txt" \ - || die "unzip musopl readme" - mv readme.txt musopl_readme.txt || die "mv musopl_readme" - elif use sc55-musicpack; then - unzip -q "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip "music_readme.txt" \ - || die "unzip mus readme" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch \ - "${FILESDIR}"/${P}-libpng-1.6.patch - - # Point eduke32 to data files in shared duke3d folder. - # Multiple search paths can be defined, so that with the default configuration as of - # the 20130128 release, this adds /usr/share/games/duke3d in ADDITION to - # /usr/share/games/eduke32 so that eduke32 and duke3d's base data can be kept separate. - # also redirect log file so it's not always written in $PWD - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - -e "s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \ - source/astub.c || die "sed astub.c path update failed" - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - -e "s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \ - source/game.c || die "sed game.c path update failed" -} - -src_compile() { - local MY_OPTS=( - AS=$(type -P nasm) - ARCH= - SYSARCH= - LTO=0 - PRETTY_OUTPUT=0 - RELEASE=1 - LUNATIC=0 - STRIP=touch - LINKED_GTK=1 - CPLUSPLUS=0 - $(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1") - $(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0") - $(usex x86 "NOASM=0" "NOASM=1") - $(usex server "NETCODE=1" "NETCODE=0") - $(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0") - $(usex png "USE_LIBPNG=1" "USE_LIBPNG=0") - $(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0") - ) - - emake ${MY_OPTS[@]} - - if use tools; then - emake -C build ${MY_OPTS[@]} - fi -} - -src_install() { - local ARGS - - newgamesbin ${PN} ${PN}.bin - dogamesbin mapster32 - - if use tools; then - dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map} - dodoc build/doc/*.txt - fi - - insinto "${GAMES_DATADIR}/${PN}" - # Install optional components - if use textures; then - newins "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip duke3d_hrp.zip - dodoc "${WORKDIR}"/hrp_readme.txt - ARGS+=" -g duke3d_hrp.zip" - - if use offensive; then - newins "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip duke3d_xxx.zip - dodoc "${WORKDIR}"/xxx_readme.txt - ARGS+=" -g duke3d_xxx.zip" - fi - fi - - if use opl-musicpack; then - newins "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip duke3d_musopl.zip - dodoc "${WORKDIR}"/musopl_readme.txt - ARGS+=" -g duke3d_musopl.zip" - elif use sc55-musicpack; then - newins "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip duke3d_mus.zip - dodoc "${WORKDIR}"/music_readme.txt - ARGS+=" -g duke3d_mus.zip" - fi - - # Install game data - doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg} - use samples && doins -r package/samples - - local i - for i in 16 32 128 256 ; do - newicon -s ${i} "${WORKDIR}"/${PN}_${i}x${i}x32.png ${PN}.png - newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png - done - - games_make_wrapper "${PN}" "${GAMES_BINDIR}/${PN}.bin ${ARGS}" - make_desktop_entry ${PN} EDuke32 ${PN} - make_desktop_entry mapster32 Mapster32 mapster32 - - dodoc build/buildlic.txt - - dodir "${GAMES_LOGDIR}" - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - use cdinstall || use demo || { - elog "Note: You must also install the game data files, either manually or with" - elog "games-fps/duke3d-demodata or games-fps/duke3d-data before playing." - } - - einfo - elog "${PN} reads data files from ${GAMES_DATADIR}/duke3d" - einfo - - [[ -e ${ROOT}/${GAMES_LOGDIR} ]] || mkdir -p "${ROOT}/${GAMES_LOGDIR}" - touch "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - touch "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/mapster32.log -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/eduke32/eduke32-20130627.3905.ebuild b/games-fps/eduke32/eduke32-20130627.3905.ebuild deleted file mode 100644 index 25645339d2d0..000000000000 --- a/games-fps/eduke32/eduke32-20130627.3905.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130627.3905.ebuild,v 1.1 2013/06/28 00:07:21 hasufell Exp $ - -# TODO/FIXME: -# lunatic broken -# lunatic? ( >=dev-lang/luajit-2.0.0_beta10:2 ) -# $(usex lunatic "LUNATIC=1" "LUNATIC=0") -# -# extras? ( games-fps/${PN}-extras ) - -EAPI=5 - -inherit eutils gnome2-utils games - -MY_PV=${PV%.*} -MY_BUILD=${PV#*.} - -# extensions -MY_HRP=5.2 -MY_SC55=3.0 -MY_OPL=2.0 -MY_XXX=1.33 - -DESCRIPTION="Port of Duke Nukem 3D for SDL" -HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/" -SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar - textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_${MY_HRP}.zip ) - sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_${MY_SC55}.zip ) - opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_${MY_OPL}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_${MY_XXX}.zip )" - -LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx" -REQUIRED_USE="vpx? ( opengl ) - textures? ( opengl ) - offensive? ( textures ) - ?? ( opl-musicpack sc55-musicpack )" - -RDEPEND="media-libs/flac - media-libs/libogg - media-libs/libsdl[X,joystick,opengl?,video] - media-libs/libvorbis - media-libs/sdl-mixer[timidity] - sys-libs/zlib - gtk? ( x11-libs/gtk+:2 ) - opengl? ( virtual/glu - virtual/opengl ) - png? ( media-libs/libpng:0= - sys-libs/zlib ) - vpx? ( media-libs/libvpx )" -DEPEND="${RDEPEND} - app-arch/unzip - x86? ( dev-lang/nasm )" -PDEPEND="cdinstall? ( games-fps/duke3d-data ) - demo? ( games-fps/duke3d-demodata )" - -S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD} - -src_unpack() { - unpack ${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 eduke32-icons.tar - - if use textures; then - unzip -q "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip "hrp_readme.txt" \ - || die "unzip hrp readme" - if use offensive; then - unzip -q "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip "xxx_readme.txt" \ - || die "unzip xxx readme" - fi - fi - if use opl-musicpack; then - unzip -q "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip "readme.txt" \ - || die "unzip musopl readme" - mv readme.txt musopl_readme.txt || die "mv musopl_readme" - elif use sc55-musicpack; then - unzip -q "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip "music_readme.txt" \ - || die "unzip mus readme" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch - - # Point eduke32 to data files in shared duke3d folder. - # Multiple search paths can be defined, so that with the default configuration as of - # the 20130128 release, this adds /usr/share/games/duke3d in ADDITION to - # /usr/share/games/eduke32 so that eduke32 and duke3d's base data can be kept separate. - # also redirect log file so it's not always written in $PWD - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - source/common.c || die "sed common.c path update failed" - sed -i \ - -e "/OSD_SetLogFile/s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \ - source/astub.c || die "sed astub.c path update failed" - sed -i \ - -e "/OSD_SetLogFile/s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \ - source/game.c || die "sed game.c path update failed" -} - -src_compile() { - local MY_OPTS=( - AS=$(type -P nasm) - ARCH= - SYSARCH= - LTO=0 - PRETTY_OUTPUT=0 - RELEASE=1 - LUNATIC=0 - STRIP=touch - LINKED_GTK=1 - CPLUSPLUS=0 - $(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1") - $(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0") - $(usex x86 "NOASM=0" "NOASM=1") - $(usex server "NETCODE=1" "NETCODE=0") - $(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0") - $(usex png "USE_LIBPNG=1" "USE_LIBPNG=0") - $(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0") - ) - - emake ${MY_OPTS[@]} - - if use tools; then - emake -C build ${MY_OPTS[@]} - fi -} - -src_install() { - local ARGS - - newgamesbin ${PN} ${PN}.bin - dogamesbin mapster32 - - if use tools; then - dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map} - dodoc build/doc/*.txt - fi - - insinto "${GAMES_DATADIR}/${PN}" - # Install optional components - if use textures; then - newins "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip duke3d_hrp.zip - dodoc "${WORKDIR}"/hrp_readme.txt - ARGS+=" -g duke3d_hrp.zip" - - if use offensive; then - newins "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip duke3d_xxx.zip - dodoc "${WORKDIR}"/xxx_readme.txt - ARGS+=" -g duke3d_xxx.zip" - fi - fi - - if use opl-musicpack; then - newins "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip duke3d_musopl.zip - dodoc "${WORKDIR}"/musopl_readme.txt - ARGS+=" -g duke3d_musopl.zip" - elif use sc55-musicpack; then - newins "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip duke3d_mus.zip - dodoc "${WORKDIR}"/music_readme.txt - ARGS+=" -g duke3d_mus.zip" - fi - - # Install game data - doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg} - use samples && doins -r package/samples - - local i - for i in 16 32 128 256 ; do - newicon -s ${i} "${WORKDIR}"/${PN}_${i}x${i}x32.png ${PN}.png - newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png - done - - games_make_wrapper "${PN}" "${GAMES_BINDIR}/${PN}.bin ${ARGS}" - make_desktop_entry ${PN} EDuke32 ${PN} - make_desktop_entry mapster32 Mapster32 mapster32 - - dodoc build/buildlic.txt - - dodir "${GAMES_LOGDIR}" - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - use cdinstall || use demo || { - elog "Note: You must also install the game data files, either manually or with" - elog "games-fps/duke3d-demodata or games-fps/duke3d-data before playing." - } - - einfo - elog "${PN} reads data files from ${GAMES_DATADIR}/duke3d" - einfo - - [[ -e ${ROOT}/${GAMES_LOGDIR} ]] || mkdir -p "${ROOT}/${GAMES_LOGDIR}" - touch "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - touch "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/mapster32.log -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch b/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch deleted file mode 100644 index 06f8b87fdc4f..000000000000 --- a/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Julian Ospald -Date: Sat Feb 2 01:16:21 UTC 2013 -Subject: build system - - respect CC/CXX etc and CFLAGS/CXXFLAGS/LDFLAGS - ---- eduke32_20130201-3453/Makefile -+++ eduke32_20130201-3453/Makefile -@@ -308,10 +308,10 @@ - endif - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - - ifeq ($(PRETTY_OUTPUT),1) ---- eduke32_20130201-3453/Makefile.common -+++ eduke32_20130201-3453/Makefile.common -@@ -8,13 +8,14 @@ - PRETTY_OUTPUT ?= 1 - - # Tools --CC=gcc --CXX=g++ --AS=nasm --AR=ar --RC=windres --RANLIB=ranlib --STRIP=strip -+CC ?= gcc -+CXX ?= g++ -+AS ?= nasm -+AR ?= ar -+RC ?= windres -+RANLIB ?= ranlib -+STRIP ?= strip -+PKG_CONFIG ?= pkgconfig - - L_CC=$(CC) - L_CXX=$(CXX) -@@ -152,7 +153,6 @@ - # FORCEWARNINGS - 1 = do not disable any compiler warnings within the source - # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system - # EFENCE - 1 = compile with Electric Fence for malloc() debugging --# OPTLEVEL - 0..3 = GCC optimization strategy - # LTO - 1 = enable link-time optimization, for GCC 4.5 and up - # - CPLUSPLUS?=0 -@@ -163,7 +163,6 @@ - FORCEWARNINGS?=0 - EFENCE?=0 - DMALLOC?=0 --OPTLEVEL?=2 - PROFILER?=0 - MUDFLAP?=0 - -@@ -269,11 +268,9 @@ - - # compiler flags etc. - BASECFLAGS= --BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement --BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing --BASEASFLAGS=-s #-g --BASELDFLAGS= -- -+BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement -+BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing -+BASELDFLAGS = $(LDFLAGS) - - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) - ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 1))) -@@ -293,20 +290,8 @@ - endif - - --ifneq ($(RELEASE)$(DEBUGANYWAY),10) -- # debug build or DEBUGANYWAY=1 --> -g flag -- ifneq (0,$(CLANG)) -- debug=-g -- else ifeq ($(PLATFORM), WII) -- debug=-g -- else -- debug=-ggdb -- endif --endif -- - ifneq (0,$(RELEASE)) - # Debugging disabled -- debug+= -O$(OPTLEVEL) - ifeq (0,$(CLANG)) - debug+= -funswitch-loops - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \< 4))) -@@ -328,9 +313,6 @@ - debug+= -DUSING_LTO -flto - endif - else -- # Debugging enabled -- debug+= -O0 -- - ifeq (0,$(DEBUGANYWAY)) - debug+= -DDEBUGGINGAIDS - else -@@ -411,7 +393,7 @@ - - #### Lunatic development, do not touch! - LUNATIC=0 --LUAJIT=luajit -+LUAJIT=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0) - - # for LJ headers: - LUAJIT_WIN_SRC:= g:/mod/luajit-2.0/src -@@ -424,7 +406,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC) - else -- BASECOMMONFLAGS+= -I/usr/local/include/luajit-2.0 -+ BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0) - endif - BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC - -@@ -436,7 +418,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASELIBS+= -lluajit - else -- BASELIBS+= -lluajit-5.1 -+ BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0) - endif - endif - ---- eduke32_20130201-3453/build/Makefile -+++ eduke32_20130201-3453/build/Makefile -@@ -166,13 +166,15 @@ - OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS) - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - -+ifeq ($(PRETTY_OUTPUT),1) - .SILENT: -+endif - .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib - - # TARGETS -@@ -265,7 +267,7 @@ - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) -- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi -+ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi diff --git a/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch b/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch deleted file mode 100644 index c9eb6448fa38..000000000000 --- a/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Julian Ospald -Date: Thu Apr 11 13:31:20 UTC 2013 -Subject: fix compatibility with libpng-1.6 - ---- eduke32_20130317-3572/build/src/engine.c -+++ eduke32_20130317-3572/build/src/engine.c -@@ -8,6 +8,9 @@ - - #define ENGINE - -+#if (PNG_LIBPNG_VER > 10599) -+# include -+#endif - #include "compat.h" - #include "build.h" - #include "pragmas.h" -@@ -16112,7 +16115,11 @@ static int32_t screencapture_png(const c - png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_VALUE_NONE); - - if (!HICOLOR) -+ #if (PNG_LIBPNG_VER > 10599) -+ palette = (png_colorp)png_malloc(png_ptr, 256*sizeof(png_color)); -+ #else - palette = (png_colorp)png_malloc(png_ptr, 256*png_sizeof(png_color)); -+ #endif - - if (palette) - { -@@ -16129,7 +16136,11 @@ static int32_t screencapture_png(const c - // png_set_gAMA(png_ptr, info_ptr, vid_gamma); // 1.0/vid_gamma ? - // png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_SATURATION); // hm... - -+ #if (PNG_LIBPNG_VER > 10599) -+ text = (png_textp)png_malloc(png_ptr, 2*sizeof(png_text)); -+ #else - text = (png_textp)png_malloc(png_ptr, 2*png_sizeof(png_text)); -+ #endif - text[0].compression = PNG_TEXT_COMPRESSION_NONE; - text[0].key = "Title"; - text[0].text = (png_charp)(editstatus ? "Mapster32 screenshot" : "EDuke32 screenshot"); diff --git a/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch b/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch deleted file mode 100644 index 1c73fb63b33a..000000000000 --- a/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch +++ /dev/null @@ -1,160 +0,0 @@ -From: Julian Ospald -Date: Sat Feb 2 01:16:21 UTC 2013 -Subject: build system - - respect CC/CXX etc and CFLAGS/CXXFLAGS/LDFLAGS - ---- eduke32_20130201-3453/Makefile -+++ eduke32_20130201-3453/Makefile -@@ -311,10 +311,10 @@ - endif - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - - ifeq ($(PRETTY_OUTPUT),1) ---- eduke32_20130201-3453/Makefile.common -+++ eduke32_20130201-3453/Makefile.common -@@ -8,13 +8,14 @@ - PRETTY_OUTPUT ?= 1 - - # Tools --CC=gcc --CXX=g++ --AS=nasm --AR=ar --RC=windres --RANLIB=ranlib --STRIP=strip -+CC ?= gcc -+CXX ?= g++ -+AS ?= nasm -+AR ?= ar -+RC ?= windres -+RANLIB ?= ranlib -+STRIP ?= strip -+PKG_CONFIG ?= pkgconfig - - L_CC=$(CC) - L_CXX=$(CXX) -@@ -152,7 +153,6 @@ - # FORCEWARNINGS - 1 = do not disable any compiler warnings within the source - # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system - # EFENCE - 1 = compile with Electric Fence for malloc() debugging --# OPTLEVEL - 0..3 = GCC optimization strategy - # LTO - 1 = enable link-time optimization, for GCC 4.5 and up - # - CPLUSPLUS?=0 -@@ -166,13 +166,6 @@ - PROFILER?=0 - MUDFLAP?=0 - --# Select the default optimization level for release and debug builds. --ifeq ($(RELEASE),0) -- OPTLEVEL?=0 --else -- OPTLEVEL?=2 --endif -- - ifeq ($(RELEASE),0) - override STRIP= - endif -@@ -275,11 +268,9 @@ - - # compiler flags etc. - BASECFLAGS= --BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement --BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings --BASEASFLAGS=-s #-g --BASELDFLAGS= -- -+BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement -+BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing -+BASELDFLAGS = $(LDFLAGS) - - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) - ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 1))) -@@ -305,20 +296,6 @@ - BASELIBS+= -lvpx - endif - -- --ifneq ($(RELEASE)$(DEBUGANYWAY),10) -- # debug build or DEBUGANYWAY=1 --> -g flag -- ifneq (0,$(CLANG)) -- debug=-g -- else ifeq ($(PLATFORM), WII) -- debug=-g -- else -- debug=-ggdb -- endif --endif -- --debug+= -O$(OPTLEVEL) -- - ifneq (0,$(RELEASE)) - # Debugging disabled - ifeq (0,$(CLANG)) -@@ -424,7 +401,7 @@ - - #### Lunatic development, do not touch! - LUNATIC=0 --LUAJIT=luajit -+LUAJIT=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0) - - # for LJ headers: - LUAJIT_WIN_SRC:= g:/mod/luajit-2.0/src -@@ -437,7 +414,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC) - else -- BASECOMMONFLAGS+= -I/usr/local/include/luajit-2.0 -+ BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0) - endif - BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC - -@@ -453,7 +430,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASELIBS+= -lluajit - else -- BASELIBS+= -lluajit-5.1 -+ BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0) - endif - endif - ---- eduke32_20130201-3453/build/Makefile -+++ eduke32_20130201-3453/build/Makefile -@@ -167,13 +167,15 @@ - OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS) - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - --.SILENT: -+ifeq ($(PRETTY_OUTPUT),1) -+ .SILENT: -+endif - .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib - - # TARGETS -@@ -266,7 +268,7 @@ - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) -- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi -+ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi -- 2.26.2