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>

6 files changed, 55 insertions, 81 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"
diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
index cba6981..0193817 100644
--- a/media-libs/fmod/Manifest
+++ b/media-libs/fmod/Manifest
@@ -1,4 +1,2 @@
-DIST fmodapi43802linux.tar.gz 21992247 BLAKE2B e0bb112ca47649390c7aba33a1cd75cb7b13c9a2d4cc5eb5c9a6bad02af9ae4958bdd8d458bd4fcc76eb42f5e09f8f989206c971bd7cbcb05359aaeab392fe38 SHA512 6a3f0f62acc71e24e48f8aaa03270d95ce09ace6d37f75a40452c84788b06f4cd6889772e9a6c00fc4799020c046905a9185d08900bc3b573a28b42cbb7f45b5
-DIST fmodapi43802linux64.tar.gz 22282269 BLAKE2B 733b3531f9e107332ab2c91e07f39363810f748e72fdbdcc865b87d86bee766859c01eb2357b5169cb79cad490d6186227d481335a1114968a1cbe2ab6e33ae6 SHA512 95b8688bbf54e19c2471f508d7ed9fbb93f6c88eaadc090813b02a86082e15dc7578220a40ae2b39358f8a4dfcacb4cb78823f4577f5ce9bc3d53af2f591d558
-EBUILD fmod-4.38.02-r1.ebuild 1625 BLAKE2B bb423435c8fb0705b0a1661d09826856be4f0cca75db1988fae145239926adc07713a240798cbdc58a68e1e48655fab518a016417d9479aadb475ad41229ac72 SHA512 b3169a443a27a4ae95df198ee6e3aa6ffcc409e817d4c5e0a7ed259eef11a39f36df70b809675aadfce94f3d82df588449af61b3f3a106adec5c6bfc9d8741d8
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+DIST fmodapi44464linux.tar.gz 25520093 BLAKE2B 4a702aed24c1a42d35462341290a1c71717e208229c640931c06b9d80580f4e5f0b984ab2c7ee024defc1dc7b9d0e21bd13c1148a2814e1e3bb3aea0f8409f6a SHA512 af365f82eea8b7e38bb8c3910470b28626ac58d46ae8122bbdaf51b5339810504cd0f541334c5e989180b3a6b2ecdcf7bc82c00ce3ef1f6af5278df20a20d611
+EBUILD fmod-4.44.64.ebuild 1018 BLAKE2B 9e8a3a0738a48648db3ad59f362c36d23372f00e9df262424161e10306c2fd2530a793109befc5cb2dfa8491a5b5fa3dddd37bc6a4119a08b1635f911210d66a SHA512 84c648997f9aff2e3db9b3ac265f9acdf79a5a66c8b42e40c17877f9a87998e5e15a97c9dac3b5b93aff6405262bec264f2d1c6c6c527782334e47786a46b09b
diff --git a/media-libs/fmod/fmod-4.38.02-r1.ebuild b/media-libs/fmod/fmod-4.38.02-r1.ebuild
deleted file mode 100644
index dedc2b0..0000000
--- a/media-libs/fmod/fmod-4.38.02-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit versionator
-
-MY_P=fmodapi$(delete_all_version_separators)linux
-
-DESCRIPTION="music and sound effects library, and a sound processing system"
-HOMEPAGE="https://www.fmod.org"
-SRC_URI="x86? (
-		https://www.fmod.org/index.php/release/version/${MY_P}.tar.gz
-		https://erppc.net/~haarp/distfiles/${MY_P}.tar.gz
-	)
-	amd64? (
-		https://www.fmod.org/index.php/release/version/${MY_P}64.tar.gz
-		https://erppc.net/~haarp/distfiles/${MY_P}64.tar.gz
-	)"
-
-LICENSE="BSD BSD-2 fmod"
-SLOT="1"
-KEYWORDS="amd64 ~x86"
-IUSE="examples"
-
-RESTRICT="strip test"
-
-QA_PREBUILT="*"
-
-src_compile() { :; }
-src_install() {
-	dodir /opt/fmodex
-
-	local fbits=""
-	use amd64 && fbits="64"
-
-	local fsource="${WORKDIR}/${MY_P}${fbits}"
-
-	cd "${fsource}"/api/lib
-
-	cp -f libfmodex${fbits}-${PV}.so libfmodex.so.${PV} || die
-	ln -sf libfmodex.so.${PV} libfmodex.so || die
-	ln -sf libfmodex.so.${PV} libfmodex.so.4 || die
-
-	cp -f libfmodexL${fbits}-${PV}.so libfmodexL.so.${PV} || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so.4 || die
-
-	cp -dpR "${fsource}"/* "${D}"/opt/fmodex || die
-
-	dosym /opt/fmodex/api/inc /usr/include/fmodex || die
-
-	use examples || rm -rf "${D}"/opt/fmodex/{,fmoddesignerapi}/examples
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins "${fsource}"/documentation/*.pdf
-	dodoc "${fsource}"/{documentation/*.txt,fmoddesignerapi/*.TXT}
-	rm -rf "${D}"/opt/fmodex/{documentation,fmoddesignerapi/*.TXT}
-
-	echo LDPATH="/opt/fmodex/api/lib" > "${T}"/65fmodex
-	doenvd "${T}"/65fmodex
-}
diff --git a/media-libs/fmod/fmod-4.44.64.ebuild b/media-libs/fmod/fmod-4.44.64.ebuild
new file mode 100644
index 0000000..623a3d0
--- /dev/null
+++ b/media-libs/fmod/fmod-4.44.64.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 1- '')
+
+DESCRIPTION="Libraries of the fmodex audio engine"
+HOMEPAGE="https://zdoom.org/files/fmod/ https://www.fmod.com/"
+SRC_URI="https://zdoom.org/files/fmod/fmodapi${MY_PV}linux.tar.gz"
+S="${WORKDIR}/fmodapi${MY_PV}linux"
+
+# Ogg Vorbis: BSD
+# Android: BSD-2
+LICENSE="BSD BSD-2 fmod"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="strip test"
+
+QA_PREBUILT="*"
+
+src_compile() { :; }
+
+src_install() {
+	cd "${S}/api/lib/" || die
+	for lib in libfmodex libfmodexL
+	do
+		dolib.so ${lib}64-${PV}.so
+		dolib.so ${lib}64.so
+		dolib.so ${lib}-${PV}.so
+		dolib.so ${lib}.so
+	done
+
+	cd "${S}/fmoddesignerapi/api/lib/" || die
+	for lib in libfmodevent libfmodeventL libfmodeventnet libfmodeventnetL
+	do
+		dolib.so ${lib}64-${PV}.so
+		dolib.so ${lib}64.so
+		dolib.so ${lib}-${PV}.so
+		dolib.so ${lib}.so
+	done
+
+	cd "${S}/api/inc/" || die
+	doheader *
+	cd "${S}/fmoddesignerapi/api/inc/" || die
+	doheader *
+}
diff --git a/media-libs/fmod/metadata.xml b/media-libs/fmod/metadata.xml
deleted file mode 100644
index c870d0e..0000000
--- a/media-libs/fmod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>