4 files changed, 106 insertions, 51 deletions
diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index 0bf5ecd909dd..b384db5d6f34 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,6 +1,6 @@
 AUX libfishsound-1.0.0-c99.patch 2443 BLAKE2B feb353da9bb2ea2afa87c8153eb41e7228eb1fee612d5bdfc4c494e5bb5c45409500b06b2f1ca054307056e03365f3117c2a067b9e549e70fb86149d62e2be4b SHA512 d329084bc313943873fbc7e26893e3a4a68b71713ef7e3d1fc454030e78e06e4e8c8e67e2ede7dbb59ede578006a46dccd7b0bef04f71f2b9c0e17a995c9af5a
+AUX libfishsound-1.0.0-oggz-interop.patch 4451 BLAKE2B b19fd3883e13827d8c6a3a3dd441acfffe682a98de02efab6597fc297964085aaa652536cb7afd36095d3474d8a9d22260c65381fbe54a71fbe4f4b45bb8b2e6 SHA512 827d734ef7f0bf264ab0c3ee65293ff79d83c4da7e3fc6e427e20e3f423454f5b0a68d695ec3c9529740f4c8f4cf1753e7aeccebca21bc8254b6d7205a0291ac
 AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e
 DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
-EBUILD libfishsound-1.0.0-r1.ebuild 1032 BLAKE2B ff5e7d72437f40cddb70ae1b594adbbe2cb0f670e8ebe576581e98abc2a3d4e4a81f76f71214ae0925d988eb3e50dd856a288861e6924e7c6e2ffe2fb3912214 SHA512 513e4edaf38566bc12b408817515ffd2eeacf00d4a85f0859e3ebc2a2341de0054567989a0a374597817b01eee8188ff6263a588e3c02b674d6c0e25f4fa7012
-EBUILD libfishsound-1.0.0-r2.ebuild 1071 BLAKE2B 17ef73a95276a55dcd0020ced48c0b4e9bf6f906e23bb9561202a5f227bd91756b0abf207c120b9b0b350fc83eda972c6212da23d36843a38e8ddbdc02f54faa SHA512 d427820d96c13d7ff5940bb78a23f9e5c42daa3fba4879f977c84f92e2ecfdae964c3fc2bb6bce0daef0f17cabb7e96276d580b2680d321390c8503bc6cbfaa5
+EBUILD libfishsound-1.0.0-r3.ebuild 1117 BLAKE2B 8371fa35f97bc218411b6ab605e738f3c7bbab58e0e0d62b9ac61b53035e8f9e861f651d3d483e50a81e3a9dd3c930bf1e466f9484e27fa18203085fb6b42693 SHA512 bdcd02015dfd84519de5886f97302b578df8a62e562c2d0eea8552511077dd3ea7efd4e2666754c4f3cb626fe2f5d3bd1280d289fc1df846ea5d78792048c0e8
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch
new file mode 100644
index 000000000000..2d9f6ebdeffa
--- /dev/null
+++ b/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch
@@ -0,0 +1,102 @@
+Upstream commit https://gitlab.xiph.org/xiph/libfishsound/-/commit/e1ee9862e89b362ac49cf66f1485d91a75cffe9f
+https://bugs.gentoo.org/929253
+From e1ee9862e89b362ac49cf66f1485d91a75cffe9f Mon Sep 17 00:00:00 2001
+From: Petter Reinholdtsen <pere@hungry.com>
+Date: Sat, 8 Feb 2025 20:22:51 +0100
+Subject: [PATCH] Use correct oggz argument type in examples.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The examples using oggz must use oggz_package as the
+second argument to read_package for the callback to be acceptable by
+oggz_set_read_callback().  Adjust the method signature to use
+oggz_package and extract the required ogg_package members from this
+one to avoid compiler message like this:
+
+fishsound-identify.c: In function ‘main’:
+fishsound-identify.c:101:37: warning: passing argument 3 of ‘oggz_set_read_callback’ from incompatible pointer type [-Wincompatible-pointer-types]
+  101 |   oggz_set_read_callback (oggz, -1, read_packet, NULL);
+      |                                     ^~~~~~~~~~~
+      |                                     |
+      |                                     int (*)(OGGZ *, ogg_packet *, long int,  void *) {aka int (*)(void *, ogg_packet *, long int,  void *)}
+In file included from /usr/include/oggz/oggz.h:576,
+                 from fishsound-identify.c:39:
+/usr/include/oggz/oggz_read.h:109:44: note: expected ‘OggzReadPacket’ {aka ‘int (*)(void *, oggz_packet *, long int,  void *)’} but argument is of type ‘int (*)(OGGZ *, ogg_packet *, long int,  void *)’ {aka ‘int (*)(void *, ogg_packet *, long int,  void *)’}
+  109 |                             OggzReadPacket read_packet, void * user_data);
+      |                             ~~~~~~~~~~~~~~~^~~~~~~~~~~
+
+Fixes #13
+---
+ src/examples/fishsound-decenc.c   | 3 ++-
+ src/examples/fishsound-decode.c   | 3 ++-
+ src/examples/fishsound-identify.c | 4 ++--
+ src/examples/fishsound-info.c     | 3 ++-
+ 4 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/examples/fishsound-decenc.c b/src/examples/fishsound-decenc.c
+index 96261ad..f9e8674 100644
+--- a/src/examples/fishsound-decenc.c
++++ b/src/examples/fishsound-decenc.c
+@@ -129,9 +129,10 @@ decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+   FS_DecEnc * ed = (FS_DecEnc *) user_data;
++  ogg_packet *op = &ozp->op;
+   
+   fish_sound_prepare_truncation (ed->decoder, op->granulepos, op->e_o_s);
+   fish_sound_decode (ed->decoder, op->packet, op->bytes);
+diff --git a/src/examples/fishsound-decode.c b/src/examples/fishsound-decode.c
+index d9c178d..9c61d0a 100644
+--- a/src/examples/fishsound-decode.c
++++ b/src/examples/fishsound-decode.c
+@@ -82,9 +82,10 @@ decoded_float (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+   FishSound * fsound = (FishSound *)user_data;
++  ogg_packet *op = &ozp->op;
+ 
+   /* If we have not yet selected an audio track to decode, then try
+    * to identify this one. If it is a known audio codec, then remember its
+diff --git a/src/examples/fishsound-identify.c b/src/examples/fishsound-identify.c
+index c5ff943..5a89e34 100644
+--- a/src/examples/fishsound-identify.c
++++ b/src/examples/fishsound-identify.c
+@@ -60,9 +60,9 @@ dump_identity (unsigned char * buf, long bytes)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+-
++  ogg_packet *op = &ozp->op;
+   if (op->bytes < 8) {
+     printf ("too short\n");
+   } else {
+diff --git a/src/examples/fishsound-info.c b/src/examples/fishsound-info.c
+index 65138a1..d119d33 100644
+--- a/src/examples/fishsound-info.c
++++ b/src/examples/fishsound-info.c
+@@ -76,8 +76,9 @@ decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
++  ogg_packet *op = &ozp->op;
+   FishSound * fsound = (FishSound *)user_data;
+ 
+   if (op->e_o_s) {
+-- 
+GitLab
+
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
deleted file mode 100644
index ab35ecbfcc2e..000000000000
--- a/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Simple programming interface to decode and encode audio with vorbis or speex"
-HOMEPAGE="https://www.xiph.org/fishsound/"
-SRC_URI="https://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flac speex"
-
-RDEPEND="
-	media-libs/libogg
-	media-libs/libvorbis
-	flac? ( media-libs/flac:= )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# bug #395153
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-pc.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:doxygen:doxygen-dummy:' \
-		configure || die
-}
-
-src_configure() {
-	local myconf="--disable-static"
-	use flac || myconf="${myconf} --disable-flac"
-	use speex || myconf="${myconf} --disable-speex"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir="${D}/usr/share/doc/${PF}" install
-	dodoc AUTHORS ChangeLog README
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
index 71fd52981ae6..18d959853c9e 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${P}-pc.patch
 	"${FILESDIR}"/${PN}-1.0.0-c99.patch
+	"${FILESDIR}"/${PN}-1.0.0-oggz-interop.patch
 )
 
 src_prepare() {