media-libs/libfishsound: dropped obsolete 1.0.0-r3

Bug: https://bugs.gentoo.org/954614
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

5 files changed, 0 insertions, 234 deletions

diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index 1db19ff2d476..aa8066e95a78 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,2 +1 @@
-DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
 DIST libfishsound-1.0.1.tar.gz 665239 BLAKE2B b8b45e29c4de9a9fa3241a53c56e0bc0c38463947d226205b1be10daaec051946324a70695b77e6f04bbc1fa623b16b9ac7c3c323d61e559e89755581bdbe02a SHA512 1a456208d7206fb50779fb9be693422b08a73a52a627162ff7151db573587a1c76d77df3ccfee43bc10723f3d5eb3977040e819fc2f2d402b47963357be03db7
diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-c99.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-c99.patch
deleted file mode 100644
index d010eb75ac0b..000000000000
--- a/media-libs/libfishsound/files/libfishsound-1.0.0-c99.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/883393
-https://gitlab.xiph.org/xiph/libfishsound/-/merge_requests/1
-
-From 8eb391d772cb3c3dbfb68b2216e095af705b0229 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Stegh=C3=B6fer?= <martin@steghoefer.eu>
-Date: Wed, 22 Oct 2014 22:03:15 +0200
-Subject: [PATCH] Fix incompatible flac callback types.
-
-Bug-Debian: https://bugs.debian.org/766394
-
-Starting from libflac 1.1.3 the flac API uses "size_t" as parameter type for the number of bytes in all callback functions.
---- a/src/libfishsound/flac.c
-+++ b/src/libfishsound/flac.c
-@@ -56,6 +56,13 @@
- 
- #define BITS_PER_SAMPLE 24
- 
-+#if defined(HAVE_FLAC_1_1_3)
-+#  define flac_callback_bytes_type size_t
-+#else
-+#  define flac_callback_bytes_type unsigned int
-+#endif
-+
-+
- typedef struct _FishSoundFlacInfo {
-   FLAC__StreamDecoder *fsd;
-   FLAC__StreamEncoder *fse;
-@@ -106,7 +113,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize)
- #if FS_DECODE
- static FLAC__StreamDecoderReadStatus
- fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
--                      FLAC__byte buffer[], unsigned int *bytes,
-+                      FLAC__byte buffer[], flac_callback_bytes_type *bytes,
-                       void *client_data)
- {
-   FishSound* fsound = (FishSound*)client_data;
-@@ -121,7 +128,7 @@ fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
-   }
- 
-   memcpy(buffer, fi->buffer, fi->bufferlength);
--  *bytes = (unsigned int)fi->bufferlength;
-+  *bytes = (flac_callback_bytes_type)fi->bufferlength;
-   fi->bufferlength = 0;
-   return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
-@@ -346,7 +353,7 @@ dec_err:
- #if FS_ENCODE
- static FLAC__StreamEncoderWriteStatus
- fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
--                           const FLAC__byte buffer[], unsigned bytes,
-+                           const FLAC__byte buffer[], flac_callback_bytes_type bytes,
-                            unsigned samples, unsigned current_frame,
-                            void *client_data)
- {
-@@ -354,7 +361,7 @@ fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
-   FishSoundFlacInfo *fi = fsound->codec_data;
- 
-   debug_printf(1, "IN");
--  debug_printf(1, "bytes: %d, samples: %d", bytes, samples);
-+  debug_printf(1, "bytes: %lld, samples: %d", (long long) bytes, samples);
- 
-   if (fsound->callback.encoded) {
-     FishSoundEncoded encoded = (FishSoundEncoded) fsound->callback.encoded;
--- 
-GitLab
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
deleted file mode 100644
index 2d9f6ebdeffa..000000000000
--- a/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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/files/libfishsound-1.0.0-pc.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
deleted file mode 100644
index fae476bf8e26..000000000000
--- a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This will avoid including -I/usr/include/FLAC in `pkg-config --cflags fishsound` since
-FLAC/assert.h will collide with system assert.h.
-
---- a/fishsound.pc.in
-+++ b/fishsound.pc.in
-@@ -5,7 +5,6 @@
- 
- Name: fishsound
- Description: Encode and decode Vorbis, Speex, FLAC audio
--Requires: @fishsound_pkgdeps@
- Version: @VERSION@
- Libs: -L${libdir} -lfishsound
- Libs.private: @VORBIS_LIBS@ @SPEEX_LIBS@ @FLAC_LIBS@
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
deleted file mode 100644
index 18d959853c9e..000000000000
--- a/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 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
-	"${FILESDIR}"/${PN}-1.0.0-c99.patch
-	"${FILESDIR}"/${PN}-1.0.0-oggz-interop.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
-}