commit: 20b0e8564561e5ab693984cc7fddfc958bec4b26 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Feb 2 16:37:37 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Feb 2 16:39:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b0e856
media-sound/daudio: Remove last-rited pkg Closes: https://bugs.gentoo.org/875152 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-sound/daudio/Manifest | 1 - media-sound/daudio/daudio-0.3-r1.ebuild | 44 ---------- media-sound/daudio/files/daudio-0.3-makefile.patch | 50 ----------- .../daudio/files/daudio-0.3-musl-stdint.patch | 82 ------------------ .../daudio-0.3-qa-implicit-declarations.patch | 98 ---------------------- media-sound/daudio/files/daudio.rc | 19 ----- media-sound/daudio/metadata.xml | 11 --- profiles/package.mask | 6 -- 8 files changed, 311 deletions(-) diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest deleted file mode 100644 index 533e9b99b184..000000000000 --- a/media-sound/daudio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST daudio-0.3.tar.gz 76683 BLAKE2B da8c674be38224153af26b6a690a0fe23c4d24e90422260799657ff80242d2c8baaa2de85603d68e8daf6e880335fe84dc7467f10571590814b647aa65f88e9b SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild deleted file mode 100644 index 4c1b0fe4036f..000000000000 --- a/media-sound/daudio/daudio-0.3-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Distributed audio on the local network" -HOMEPAGE="https://daudio.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -# -sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon -KEYWORDS="amd64 ~ppc -sparc x86" - -DEPEND=">=media-libs/libmad-0.15.0b-r1" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-makefile.patch" - "${FILESDIR}/${P}-qa-implicit-declarations.patch" - "${FILESDIR}/${P}-musl-stdint.patch" -) - -src_prepare() { - # fix #570582 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - - tc-export CC - default -} - -src_compile() { - emake -C client - emake -C server - emake -C streamer -} - -src_install() { - dobin client/daudioc server/daudiod streamer/dstreamer - newinitd "${FILESDIR}"/daudio.rc daudio - dodoc doc/* -} diff --git a/media-sound/daudio/files/daudio-0.3-makefile.patch b/media-sound/daudio/files/daudio-0.3-makefile.patch deleted file mode 100644 index 28f1215f7c94..000000000000 --- a/media-sound/daudio/files/daudio-0.3-makefile.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: daudio-0.3/client/Makefile -=================================================================== ---- daudio-0.3.orig/client/Makefile -+++ daudio-0.3/client/Makefile -@@ -13,10 +13,10 @@ install: $(PROG) - install -c -m755 --owner=0 --group=0 -b -D daudioc $(PREFIX)/bin/daudioc - - debug: $(SRCS) -- gcc $(DEFINES) -DDEBUG $(INCLUDES) $(LIBS) -o $(PROG) $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -DDEBUG $(INCLUDES) -o $(PROG) $^ $(LIBS) - - $(PROG): $(SRCS) -- gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS) - - clean: - rm -f $(PROG) -Index: daudio-0.3/server/Makefile -=================================================================== ---- daudio-0.3.orig/server/Makefile -+++ daudio-0.3/server/Makefile -@@ -10,13 +10,13 @@ PREFIX = /usr/local - all: $(SBINS) - - debug: $(SRCS) -- gcc -g $(DEFINES) $(INCLUDES) $(LIBS) -o daudiod $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o daudiod $^ $(LIBS) - - install: $(SBINS) - install -c -m755 --owner=0 --group=0 -b -D daudiod $(PREFIX)/bin/daudiod - - $(SBINS): $(SRCS) -- gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS) - - clean: - rm -f $(SBINS) -Index: daudio-0.3/streamer/Makefile -=================================================================== ---- daudio-0.3.orig/streamer/Makefile -+++ daudio-0.3/streamer/Makefile -@@ -12,7 +12,7 @@ install: $(SBINS) - install -c -m755 --owner=0 --group=0 -b -D dstreamer $(PREFIX)/bin/dstreamer - - $(SBINS): $(SRCS) -- gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS) - - clean: - rm -f $(SBINS) diff --git a/media-sound/daudio/files/daudio-0.3-musl-stdint.patch b/media-sound/daudio/files/daudio-0.3-musl-stdint.patch deleted file mode 100644 index ff70b900d1f8..000000000000 --- a/media-sound/daudio/files/daudio-0.3-musl-stdint.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/715246 ---- a/client/net.c -+++ b/client/net.c -@@ -20,6 +20,7 @@ - #include <sys/socket.h> - #include <netinet/in.h> - #include <stdio.h> -+#include <stdint.h> - #include <errno.h> - #include <unistd.h> - #include <fcntl.h> -@@ -69,7 +70,7 @@ int netinit(char *hostname, int port) { - } - net_raddr.sin_family = AF_INET; - net_raddr.sin_port = htons(port); -- net_raddr.sin_addr.s_addr = *((u_int32_t *) host->h_addr); -+ net_raddr.sin_addr.s_addr = *((uint32_t *) host->h_addr); - return(s); - } - ---- a/server/bcast.c -+++ b/server/bcast.c -@@ -21,6 +21,7 @@ - #include <sys/socket.h> - #include <netinet/in.h> - #include <stdio.h> -+#include <stdint.h> - - #include "../common/port.h" - #include "timer.h" -@@ -75,11 +76,11 @@ int b_init(void) { - - addr.sin_family = AF_INET; - addr.sin_port = htons(BROADCASTPORT_D); -- addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY; -+ addr.sin_addr.s_addr = (uint32_t) INADDR_ANY; - - baddr.sin_family = AF_INET; - baddr.sin_port = htons(BROADCASTPORT_C); -- baddr.sin_addr.s_addr = (u_int32_t) INADDR_BROADCAST; -+ baddr.sin_addr.s_addr = (uint32_t) INADDR_BROADCAST; - - if(bind(b_sock, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1) - return(-1); ---- a/server/local.c -+++ b/server/local.c -@@ -21,6 +21,7 @@ - #include <unistd.h> - #include <mad.h> - #include <stdio.h> -+#include <stdint.h> - #include <string.h> - #include <errno.h> - #include <fcntl.h> -@@ -207,7 +208,7 @@ int l_init(void) { - - addr.sin_family = AF_INET; - addr.sin_port = htons(LISTENPORT); -- addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY; -+ addr.sin_addr.s_addr = (uint32_t) INADDR_ANY; - - if(bind(*s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1) - return(-1); ---- a/streamer/streamer.c -+++ b/streamer/streamer.c -@@ -25,6 +25,7 @@ - #include <sys/socket.h> - #include <unistd.h> - #include <stdio.h> -+#include <stdint.h> - #include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -129,7 +130,7 @@ int main(int argc, char *argv[]) { - } - addr.sin_family = AF_INET; - addr.sin_port = htons(LISTENPORT); -- addr.sin_addr.s_addr = (u_int32_t) htonl(INADDR_LOOPBACK); -+ addr.sin_addr.s_addr = (uint32_t) htonl(INADDR_LOOPBACK); - - if(connect(s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1) { - perror("Failed to connect to localhost:5555"); diff --git a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch deleted file mode 100644 index d60be6f64e68..000000000000 --- a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch +++ /dev/null @@ -1,98 +0,0 @@ -Fix implicit declarations, such as: - -main.c: In function ‘main’: -main.c:45:2: warning: incompatible implicit declaration of built-in function ‘exit’ - exit(1); - ^ ---- daudio-0.3/client/main.c -+++ daudio-0.3/client/main.c -@@ -22,6 +22,7 @@ - #include <sys/types.h> - #include <unistd.h> - #include <sched.h> -+#include <stdlib.h> - - int main(int argc, char **argv) { - int s; -@@ -50,7 +51,7 @@ - - /* drop priveledges */ - uid = getuid(); -- seteuid(uid); -+ if(seteuid(uid)){}; - - set_default_options(void); - ---- daudio-0.3/client/net.c -+++ daudio-0.3/client/net.c -@@ -27,6 +27,7 @@ - #include <asm/unistd.h> - #include <mad.h> - #include <pthread.h> -+#include <stdlib.h> - - #include "net.h" - #include "../common/frame.h" ---- daudio-0.3/server/local.c -+++ daudio-0.3/server/local.c -@@ -25,6 +25,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <netinet/in.h> -+#include <stdlib.h> - - #include "timer.h" - #include "data.h" -@@ -71,7 +72,7 @@ - - /* drop priveleges */ - uid = getuid(); -- seteuid(uid); -+ if(seteuid(uid)){}; - - current = bigbuf.buffer; - ---- daudio-0.3/server/main.c -+++ daudio-0.3/server/main.c -@@ -25,6 +25,7 @@ - #include <sys/types.h> - #include <unistd.h> - #include <signal.h> -+#include <stdlib.h> - - int main () { - int r; -@@ -40,19 +41,19 @@ - uid = getuid(); - r = d_init(); - if(r == -1) { -- seteuid(uid); -+ if(seteuid(uid)){}; - perror("d_init failed"); - exit(1); - } - r = b_init(); - if(r == -1) { -- seteuid(uid); -+ if(seteuid(uid)){}; - perror("b_init failed"); - exit(1); - } - r = t_init(); - /* drop priveleges */ -- seteuid(uid); -+ if(seteuid(uid)){}; - if(r == -1) { - perror("t_init failed"); - exit(1); ---- daudio-0.3/server/timer.c -+++ daudio-0.3/server/timer.c -@@ -124,7 +124,7 @@ - - /* drop priveleges */ - uid = getuid(); -- seteuid(uid); -+ if(seteuid(uid)){}; - - mytimer.it_value.tv_sec = 0; - mytimer.it_value.tv_usec = 0; diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc deleted file mode 100644 index 5f934107051a..000000000000 --- a/media-sound/daudio/files/daudio.rc +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use net -} - -start() { - ebegin "Starting daudio" - start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/daudio.pid --exec /usr/bin/daudiod - eend $? -} - -stop() { - ebegin "Stopping daudio" - start-stop-daemon --stop --quiet --pidfile /var/run/daudio.pid - eend $? -} diff --git a/media-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml deleted file mode 100644 index 969fd5f7befa..000000000000 --- a/media-sound/daudio/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>so...@gentoo.org</email> - <name>Gentoo Sound project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">daudio</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 15e2cb013110..f0cbe5ce5c16 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -188,12 +188,6 @@ sys-block/noflushd # Removal on 2024-01-30. Bug #874087. app-admin/newsyslog -# Michał Górny <mgo...@gentoo.org> (2023-12-31) -# Buggy code with a number of local patches already. Last release -# in 2003. media-sound/jack2 should be a good alternative. -# Removal on 2024-01-30. Bug #875152. -media-sound/daudio - # Andreas Sturmlechner <ast...@gentoo.org> (2023-12-25) # Masked until KF6 is unmasked. ~media-libs/mpvqt-1.0.0
