diff options
author | haarp <main.haarp@gmail.com> | 2022-08-09 22:38:25 +0200 |
---|---|---|
committer | haarp <main.haarp@gmail.com> | 2022-08-09 22:38:25 +0200 |
commit | dd3d1a3313df008afeb0922e00d4807249863c4e (patch) | |
tree | 9646b29f41c5787d32cb7e634b6bbc88809435c5 | |
parent | Migrate Doomseeker to cmake.eclass (diff) | |
download | haarp-dd3d1a3313df008afeb0922e00d4807249863c4e.tar.gz haarp-dd3d1a3313df008afeb0922e00d4807249863c4e.tar.bz2 haarp-dd3d1a3313df008afeb0922e00d4807249863c4e.zip |
Migrate Zandronum to cmake.eclass
Signed-off-by: haarp <main.haarp@gmail.com>
-rw-r--r-- | games-fps/zandronum/Manifest | 4 | ||||
-rw-r--r-- | games-fps/zandronum/zandronum-3.0.1.ebuild | 137 | ||||
-rw-r--r-- | games-fps/zandronum/zandronum-3.1.ebuild | 17 |
3 files changed, 10 insertions, 148 deletions
diff --git a/games-fps/zandronum/Manifest b/games-fps/zandronum/Manifest index b9b82dc..58e248f 100644 --- a/games-fps/zandronum/Manifest +++ b/games-fps/zandronum/Manifest @@ -1,6 +1,4 @@ AUX remove-revision-check.patch 703 BLAKE2B 1cc95c281fd6c1fd76425f24a899276e7bdad8919a4ba3dce15b9fb9c97dacaebbfb3f7df633583a37ff31854e6a9054398b12e28f8a1c8045f8aa0bf4bfb966 SHA512 8d5f22549a5cc994243c7adcc59376e57c52cac504fa4f5119e05f4286ca5c207856dff863b1f431e074db1ee5417f629d64e6bc352fe3e589dbac62a4f0eadb DIST zandronum-3.1.tar.gz 6791285 BLAKE2B a5046e001f500f12dd52e3a4800e307f0d7493abc491f09d748cb71d36374e77748cf5c493eb9406436dcc5d2043832b6d78992c95a18dfb4676c2edb31e48ee SHA512 3beed719e0383722024217b19ab1b8d4b6ff4bf5e8546e09593b645c2b87e6b45f298f2f0b853f6748ee4d1cb0bd8c49aa8e6c5b87e402d89b22ea44945ef998 -DIST zandronum-stable-10af17.tar.gz 6659250 BLAKE2B dbfb979830c06bf35ee5d4bbffd35c90acfb3e5d14351dc30dab4c36a46545a23720cfdd90b2367b84e91e7d36f9cc3377e6ab74b1dd5d2cea91419106752e57 SHA512 22c6cc2b23e5fda9b712c5783262be4f0914863b492294b66a5cffabc69d8fe74bb2813e2957b33b636014e58d8939ec20fe43eee3b7b73800e9dfd7dcd6211f -EBUILD zandronum-3.0.1.ebuild 4211 BLAKE2B 6212aa58c0b41579df3a4108fef4f4fcf62c641fe6196c3f0ce4bccff280c46e71efbcb32a54fccbc326aae6b286d9c6c61c7f976f4bfc41fbdca75b6c3a0301 SHA512 9ec0c5dcb70933cc3c96865914eff9537ba89272b06f3edafbca62e8160f87c0f3a62e84bb8a63c8396d52198c72426677f69828448d4bebb6452984e585c265 -EBUILD zandronum-3.1.ebuild 4267 BLAKE2B 31a6a23fffb856ba5e8bb7866075383ac3b174066480a03870fae16ab45c53830d2c9ddb7f2a692146eae275b0ca34e997ca799ade378ea4dd49aab5cdcef667 SHA512 5bba8a87bb9af1fc866194d140135cc00f26378efc975525e0864d0bd4c8678cb51ad0998d240069cc37bfc39909ba862cedf9edf1aacc6a663cebb2d5b2b3c0 +EBUILD zandronum-3.1.ebuild 4203 BLAKE2B 20826d98ca847c07eaf25b152669f2c6b176f534cd427b724dbbf05b1c38847dd1aa929f815d9cd4fddaf82b545ac2aa9c0e75dec9b9fc1f0413a1af750f0d91 SHA512 5bb76d75ce8a91186a2261775c94a0810ec37b535c0f828be8a49cfb1c0fedeae5869b865f1c8b896a88bdd6c60c7cd555413c5c5f15d80309ee318242d5e96e MISC metadata.xml 315 BLAKE2B d774a34d761497e43beb2078fc93e107b12d591b05e2439e2caaa7d1b11831151b9be6a7acf745d38ab726a887a8a4793dce11de9ec6b435e5df1db4227e748d SHA512 0e1da3132a25e09577a6861dea211f8ae941b6f4d1adbdc4b9a16c9b5bb1f9c8c96f6272a304d1b0b0a80c85965e72511203296e4f4622d1c0ba1d687f9854d2 diff --git a/games-fps/zandronum/zandronum-3.0.1.ebuild b/games-fps/zandronum/zandronum-3.0.1.ebuild deleted file mode 100644 index 9e15546..0000000 --- a/games-fps/zandronum/zandronum-3.0.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 # compiles broken unlinked binaries on EAPI=7?? - -inherit cmake-utils desktop - -MY_COMMIT="10af17" # check tags: https://osdn.net/projects/zandronum/scm/hg/zandronum-stable/tags -MY_COMMIT_UTC_TIMESTAMP="1504266050" - -DESCRIPTION="OpenGL ZDoom port with Client/Server multiplayer" -HOMEPAGE="https://zandronum.com/" -SRC_URI="https://osdn.dl.osdn.net/scmarchive/g/${PN}/hg/${PN}-stable/${MY_COMMIT:0:2}/${MY_COMMIT:2}/${PN}-stable-${MY_COMMIT}.tar.gz" - -LICENSE="Sleepycat" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_mmx dedicated +gtk +opengl system-dumb system-geoip +system-sqlite timidity" - -REQUIRED_USE="|| ( dedicated opengl ) - gtk? ( opengl ) - timidity? ( opengl )" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - timidity? ( media-sound/timidity++ ) - opengl? ( media-libs/fmod:1 - media-libs/game-music-emu - media-libs/libsdl[opengl] - virtual/glu - virtual/jpeg - virtual/opengl - ) - system-dumb? ( >=media-libs/dumb-2 ) - system-geoip? ( dev-libs/geoip ) - system-sqlite? ( dev-db/sqlite ) - app-arch/bzip2 - dev-libs/openssl:0 - media-sound/fluidsynth - sys-libs/zlib" - -DEPEND="${RDEPEND} - cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )" - -S="${WORKDIR}/${PN}-stable-${MY_COMMIT}" - -src_prepare() { - # Normally Mercurial would generate gitinfo.h for NETGAMEVERSION - # let's do it without Mercurial - # NOTE: not currently used for 3.0.1 as compatibility with 3.0 is hardcoded - eapply "${FILESDIR}/remove-revision-check.patch" - echo "#define HG_REVISION_NUMBER ${MY_COMMIT_UTC_TIMESTAMP}" > src/gitinfo.h - echo "#define HG_REVISION_HASH_STRING \"0\"" >> src/gitinfo.h - echo "#define HG_TIME \"\"" >> src/gitinfo.h - - # Use system libs - # (lzma can't be system-libbed as the Gentoo ebuild provides no sources) - for lib in dumb geoip sqlite; do - use system-$lib && sed -i -e "/add_subdirectory( $lib )/Id" CMakeLists.txt - done - - # Use default data path - sed -i -e "s:/usr/local/share/:/usr/share/doom/:" src/sdl/i_system.h || die - - # Fix building with gcc-5 - use system-dumb || sed -i -e 's/ restrict/ _restrict/g' dumb/include/dumb.h dumb/src/it/*.c || die - - cmake-utils_src_prepare -} - -src_configure() { - mycmakeargs=( - -DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc/ - -DFMOD_LIBRARY=/opt/fmodex/api/lib/libfmodex.so - -DFORCE_INTERNAL_GME="OFF" - -DNO_ASM="$(usex cpu_flags_x86_mmx OFF ON)" - -DNO_GTK="$(usex gtk OFF ON)" - ) - - # Can't build both client and server at once... so separate them - if use opengl; then - BUILD_DIR="${WORKDIR}/${P}_client" - cmake-utils_src_configure - fi - if use dedicated; then - BUILD_DIR="${WORKDIR}/${P}_server" - mycmakeargs+=(-DSERVERONLY=1) - cmake-utils_src_configure - fi -} - -src_compile() { - if use opengl; then - BUILD_DIR="${WORKDIR}/${P}_client" - cmake-utils_src_make - fi - if use dedicated; then - BUILD_DIR="${WORKDIR}/${P}_server" - cmake-utils_src_make - fi -} - -src_install() { - dodoc docs/{commands,zandronum*}.txt docs/console.{css,html} - - cd "${BUILD_DIR}" - insinto "/usr/share/doom" - doins *.pk3 - - if use opengl; then - dobin "${WORKDIR}/${P}_client/${PN}" - doicon "${S}/src/win32/zandronum.ico" - make_desktop_entry "${PN}" "Zandronum" "${PN}.ico" "Game;ActionGame;" - fi - if use dedicated; then - dobin "${WORKDIR}/${P}_server/${PN}-server" - fi - - # don't install this now - rm "${D}/usr/share/doom/brightmaps.pk3" -} -pkg_postinst() { - # install here to avoid collisions with games-fps/gzdoom - # hacky, i know. should've listened to juippis :) please don't hit me. - # note: brightmaps.pk3 NEEDS TO KEEP ITS NAME to not break online play - # on servers that mistakenly add it as a required pwad. - cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" || die - - ewarn "For parity with the gzdoom ebuild, the data path has been changed yet again!" - ewarn "It is ${EPREFIX}/usr/share/doom - copy/link wad files there or in \$HOME/.config/zandronum" - ewarn "If after an upgrade the game complains about not finding zandronum.pk3," - ewarn "edit the [*Search.Directories] sections in \$HOME/.config/zandronum/zandronum.ini." - - if use opengl; then - elog - elog "To play online, install games-util/doomseeker" - fi -} diff --git a/games-fps/zandronum/zandronum-3.1.ebuild b/games-fps/zandronum/zandronum-3.1.ebuild index 2274409..84fc7f3 100644 --- a/games-fps/zandronum/zandronum-3.1.ebuild +++ b/games-fps/zandronum/zandronum-3.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 # compiles broken unlinked binaries on EAPI=7?? +EAPI=8 -inherit cmake-utils desktop +inherit cmake desktop # look for "changed the version string" tag/commit: https://osdn.net/projects/zandronum/scm/hg/zandronum-stable/ MY_COMMIT="4178904d769879e6c2919fb647ee6dd2736399e9" @@ -65,7 +65,7 @@ src_prepare() { # Fix building with gcc-5 use system-dumb || sed -i -e 's/ restrict/ _restrict/g' dumb/include/dumb.h dumb/src/it/*.c || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -75,28 +75,29 @@ src_configure() { -DFORCE_INTERNAL_GME="OFF" -DNO_ASM="$(usex cpu_flags_x86_mmx OFF ON)" -DNO_GTK="$(usex gtk OFF ON)" + -DBUILD_SHARED_LIBS=OFF ) # Can't build both client and server at once... so separate them if use opengl; then BUILD_DIR="${WORKDIR}/${P}_client" - cmake-utils_src_configure + cmake_src_configure fi if use dedicated; then BUILD_DIR="${WORKDIR}/${P}_server" mycmakeargs+=(-DSERVERONLY=1) - cmake-utils_src_configure + cmake_src_configure fi } src_compile() { if use opengl; then BUILD_DIR="${WORKDIR}/${P}_client" - cmake-utils_src_make + cmake_build fi if use dedicated; then BUILD_DIR="${WORKDIR}/${P}_server" - cmake-utils_src_make + cmake_build fi } |