diff options
| author |   haarp <main.haarp@gmail.com> | 2023-07-30 21:08:12 +0200 |
|---|---|---|
| committer | haarp <main.haarp@gmail.com> | 2023-07-30 21:12:35 +0200 |
| commit | 16c98d64adaeb38acb96e16868adfe713f7ac619 (patch) | |
| tree | 7e4bc41edad963439c33e4bb292c8c65bfc69fad /games-fps/zandronum | |
| parent | Update xed (diff) | |
| download | haarp-16c98d64adaeb38acb96e16868adfe713f7ac619.tar.gz haarp-16c98d64adaeb38acb96e16868adfe713f7ac619.tar.bz2 haarp-16c98d64adaeb38acb96e16868adfe713f7ac619.zip | |
Changes to Zandronum/fmod:
- Removed fluidsynth dependency. It never worked with the newer fluidsynth in Gentoo anyway
- Added missing media-libs/glew dependency
- Fixed a bug when Zandronum was reinstalled (doom directory brightmaps)
- Updated to "newer" fmod, so it should merge now.
Adapted the fmod ebuild to work by Haelwenn (lanodan) Monnier from lanodanOverlay :)
fmod libs are now installed in /usr. This is technically wrong because they're not built. but eh...
Signed-off-by: haarp <main.haarp@gmail.com>
Diffstat (limited to 'games-fps/zandronum')
| -rw-r--r-- | games-fps/zandronum/Manifest | 2 | ||||
| -rw-r--r-- | games-fps/zandronum/zandronum-3.1.ebuild | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/games-fps/zandronum/Manifest b/games-fps/zandronum/Manifest index 58e248f..090879c 100644 --- a/games-fps/zandronum/Manifest +++ b/games-fps/zandronum/Manifest @@ -1,4 +1,4 @@ AUX remove-revision-check.patch 703 BLAKE2B 1cc95c281fd6c1fd76425f24a899276e7bdad8919a4ba3dce15b9fb9c97dacaebbfb3f7df633583a37ff31854e6a9054398b12e28f8a1c8045f8aa0bf4bfb966 SHA512 8d5f22549a5cc994243c7adcc59376e57c52cac504fa4f5119e05f4286ca5c207856dff863b1f431e074db1ee5417f629d64e6bc352fe3e589dbac62a4f0eadb DIST zandronum-3.1.tar.gz 6791285 BLAKE2B a5046e001f500f12dd52e3a4800e307f0d7493abc491f09d748cb71d36374e77748cf5c493eb9406436dcc5d2043832b6d78992c95a18dfb4676c2edb31e48ee SHA512 3beed719e0383722024217b19ab1b8d4b6ff4bf5e8546e09593b645c2b87e6b45f298f2f0b853f6748ee4d1cb0bd8c49aa8e6c5b87e402d89b22ea44945ef998 -EBUILD zandronum-3.1.ebuild 4203 BLAKE2B 20826d98ca847c07eaf25b152669f2c6b176f534cd427b724dbbf05b1c38847dd1aa929f815d9cd4fddaf82b545ac2aa9c0e75dec9b9fc1f0413a1af750f0d91 SHA512 5bb76d75ce8a91186a2261775c94a0810ec37b535c0f828be8a49cfb1c0fedeae5869b865f1c8b896a88bdd6c60c7cd555413c5c5f15d80309ee318242d5e96e +EBUILD zandronum-3.1.ebuild 4096 BLAKE2B 7a7a418ce0797ed3f6d4e97861a5eb568949b61cca7c110cdf3a9ff7df7c387a37cb24677a0d5618d446599d98b72ae78b4a7425290cd3a5c654ed5872a899bb SHA512 6b170dadb3663b8c3826a84be513df46442a514a1f469d65d7e6319ef55c60dd91290e209403ceb168b0413d23ee86d48e3b626e6a233c310db756d6788b535a MISC metadata.xml 315 BLAKE2B d774a34d761497e43beb2078fc93e107b12d591b05e2439e2caaa7d1b11831151b9be6a7acf745d38ab726a887a8a4793dce11de9ec6b435e5df1db4227e748d SHA512 0e1da3132a25e09577a6861dea211f8ae941b6f4d1adbdc4b9a16c9b5bb1f9c8c96f6272a304d1b0b0a80c85965e72511203296e4f4622d1c0ba1d687f9854d2 diff --git a/games-fps/zandronum/zandronum-3.1.ebuild b/games-fps/zandronum/zandronum-3.1.ebuild index 84fc7f3..cf4aee8 100644 --- a/games-fps/zandronum/zandronum-3.1.ebuild +++ b/games-fps/zandronum/zandronum-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,8 +25,9 @@ REQUIRED_USE="|| ( dedicated opengl ) RDEPEND="gtk? ( x11-libs/gtk+:2 ) timidity? ( media-sound/timidity++ ) - opengl? ( media-libs/fmod:1 + opengl? ( media-libs/fmod media-libs/game-music-emu + media-libs/glew media-libs/libsdl[opengl] virtual/glu virtual/jpeg @@ -37,7 +38,6 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 ) system-sqlite? ( dev-db/sqlite ) app-arch/bzip2 dev-libs/openssl:0 - media-sound/fluidsynth sys-libs/zlib" DEPEND="${RDEPEND} @@ -70,8 +70,6 @@ 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)" @@ -125,7 +123,7 @@ pkg_postinst() { # 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 + cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" 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" |