pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio audio: Remove daapd, successor forked-daapd
details: https://anonhg.NetBSD.org/pkgsrc/rev/4f7db9de6e6c
branches: trunk
changeset: 441383:4f7db9de6e6c
user: nia <nia%pkgsrc.org@localhost>
date: Mon Nov 02 14:04:41 2020 +0000
description:
audio: Remove daapd, successor forked-daapd
diffstat:
audio/Makefile | 3 +-
audio/daapd/DESCR | 6 -
audio/daapd/Makefile | 51 ------------
audio/daapd/PLIST | 4 -
audio/daapd/distinfo | 16 ---
audio/daapd/files/daapd.sh | 18 ----
audio/daapd/patches/patch-aa | 63 ---------------
audio/daapd/patches/patch-ac | 111 ---------------------------
audio/daapd/patches/patch-ad | 32 -------
audio/daapd/patches/patch-ae | 54 -------------
audio/daapd/patches/patch-af | 39 ---------
audio/daapd/patches/patch-ag | 13 ---
audio/daapd/patches/patch-daapd.cc | 12 --
audio/daapd/patches/patch-libhttpd_configure | 17 ----
audio/daapd/patches/patch-types.h | 40 ---------
audio/daapd/patches/patch-util.cc | 12 --
16 files changed, 1 insertions(+), 490 deletions(-)
diffs (truncated from 565 to 300 lines):
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/Makefile
--- a/audio/Makefile Mon Nov 02 14:02:14 2020 +0000
+++ b/audio/Makefile Mon Nov 02 14:04:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.616 2020/11/02 14:00:47 nia Exp $
+# $NetBSD: Makefile,v 1.617 2020/11/02 14:04:41 nia Exp $
#
COMMENT= Audio tools
@@ -62,7 +62,6 @@
SUBDIR+= csound5-manual
SUBDIR+= csound6
SUBDIR+= csound6-manual
-SUBDIR+= daapd
SUBDIR+= dap
SUBDIR+= darkice
SUBDIR+= deforaos-mixer
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/DESCR
--- a/audio/daapd/DESCR Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Server for DAAP, the digital audio access protocol
-Copyright deleet 2003, Alexander Oberdorster
-
-daapd scans a directory for mp3 files and makes them available via the Apple
-proprietary protocol DAAP. DAAP clients can browse the directory and retrieve
-individual files, either by streaming or by downloading them.
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/Makefile
--- a/audio/daapd/Makefile Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2020/11/02 10:34:48 nia Exp $
-
-DISTNAME= daapd-0.2.4b
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= nathanw%NetBSD.org@localhost
-HOMEPAGE= http://www.deleet.de/projekte/daap/daapd/
-COMMENT= Server for DAA protocol (iTunes)
-LICENSE= gnu-gpl-v2
-
-MAKE_JOBS_SAFE= no
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-MAKE_FILE= makefile
-
-RCD_SCRIPTS= daapd
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES= ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf
-
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= daapd.8 daapd.cc
-SUBST_SED.paths= -e 's,/etc/,${PKG_SYSCONFDIR}/,g'
-
-INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8 ${EGDIR}
-
-post-extract:
- for FILE in `${FIND} ${WRKSRC}/daaplib -type f -print`; do \
- ${TR} -d \\r <$${FILE} >$${FILE}.new; \
- ${MV} $${FILE}.new $${FILE}; \
- done
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/daapd ${DESTDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/daapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${DESTDIR}${EGDIR}/daapd.conf
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../net/howl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/PLIST
--- a/audio/daapd/PLIST Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:04:57 jperkin Exp $
-bin/daapd
-man/man8/daapd.8
-share/examples/daapd/daapd.conf
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/distinfo
--- a/audio/daapd/distinfo Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.26 2020/03/26 21:51:24 joerg Exp $
-
-SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b
-RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369
-SHA512 (daapd-0.2.4b.tgz) = dfead46eb71122906b6e9165ae79a4bfcadbb18b5969b619bb9a7e1f7795b01d0a36c1efc9dae5d5d97eeb000cdddc2c128a408f55be3916b397e026357da8e6
-Size (daapd-0.2.4b.tgz) = 205476 bytes
-SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d
-SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f
-SHA1 (patch-ad) = 4b132fc143d3b29ff2235eacb5c2eaa438cd816c
-SHA1 (patch-ae) = 3433d7e944999e10690ccdda1d49d3c711671446
-SHA1 (patch-af) = 84086c0ee508c07e3cec07a723e07270be667c56
-SHA1 (patch-ag) = cf0dc389fb2a031883f52c348d8303dd36b33818
-SHA1 (patch-daapd.cc) = 9107fc35ca6eb8a9841f986342781769bc29a9d2
-SHA1 (patch-libhttpd_configure) = 91a7a942a078bda76582cbdf0cc1d3ae8b7029cb
-SHA1 (patch-types.h) = b609e6e47c2dc14bb3013d75f44c6bedeae8aff5
-SHA1 (patch-util.cc) = 18f0158016f56d9253459b2efe6ed528bac750c0
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/files/daapd.sh
--- a/audio/daapd/files/daapd.sh Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: daapd.sh,v 1.5 2006/01/01 18:34:13 tron Exp $
-#
-
-# PROVIDE: daapd
-# REQUIRE: DAEMON LOGIN howl
-
-. /etc/rc.subr
-
-name="daapd"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/daapd.conf"
-command_args="</dev/null >/dev/null 2>&1 &"
-
-load_rc_config $name
-run_rc_command "$1"
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/patches/patch-aa
--- a/audio/daapd/patches/patch-aa Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2006/04/23 18:25:27 tonio Exp $
-
---- makefile.orig 2006-03-05 14:39:37.000000000 +0100
-+++ makefile
-@@ -2,28 +2,28 @@
-
- HOWL_ENABLE = 1
- ZLIB_ENABLE = 1
--MPEG4_ENABLE = 0
-+MPEG4_ENABLE = $(WITH_FAAD)
-
-
- # no need to touch anything below this line
- # -----------------------------------------
-
--CC = g++
-+CC = $(CXX)
- MAKE = $(MAKE_COMMAND)
- TARGET = daapd
- DEPS = daaplib_ libhttpd_
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o
- LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
--LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L/usr/local/lib
--INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include
--DEPLOY = /usr/local
--CFLAGS = -Wall -Wno-multichar
-+LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L$(PREFIX)/lib $(LDFLAGS)
-+INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I$(PREFIX)/include
-+DEPLOY = $(PREFIX)
-+CFLAGS += -Wall -Wno-multichar
-
- # HOWL
- ifeq ($(HOWL_ENABLE),1)
-- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
-+ HOWLDIRS := $(sort $(wildcard $(PREFIX)/include/howl*) )
- ifeq ($(words $(HOWLDIRS) ), 0)
--$(error howl not found in /usr/local/include. Install howl or disable it in the makefile)
-+$(error howl not found in $(PREFIX)/include. Install howl or disable it in the makefile)
- endif
- HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
- INCPATH := $(INCPATH) -I$(HOWLRECENT)
-@@ -46,11 +46,7 @@ ifneq ($(shell $(CC) -E -dM - < /dev/nul
- LIBS := $(LIBS) -lsocket -lnsl
- endif
-
--ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __FreeBSD__),)
-- LIBS := $(LIBS) -pthread
--else
-- LIBS := $(LIBS) -lpthread
--endif
-+LIBS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __sgi__),)
- LIBS := $(LIBS) /usr/lib/snprintf.o
-@@ -80,8 +76,6 @@ clean:
- rm $(OBJS) $(TARGET)
-
- install: $(DEPS) $(TARGET)
-- cd libhttpd && $(MAKE) install
-- cd daaplib/src && $(MAKE) install
- cp $(TARGET) $(DEPLOY)/bin
- chmod a+rx $(DEPLOY)/bin/$(TARGET)
- cp $(TARGET).8 $(DEPLOY)/man/man8
diff -r 5f6680dd844d -r 4f7db9de6e6c audio/daapd/patches/patch-ac
--- a/audio/daapd/patches/patch-ac Mon Nov 02 14:02:14 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/03 02:18:15 tron Exp $
-
---- libhttpd/src/select.h.orig 2006-03-05 14:00:38.000000000 +0000
-+++ libhttpd/src/select.h 2006-07-03 03:10:45.000000000 +0100
-@@ -81,7 +81,7 @@
- c++;
- }
-
-- return 0;
-+ return c;
- }
-
-
-@@ -154,7 +154,7 @@
-
- void erase( const int fDesc ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- clientList.erase(c);
- close(fDesc);
- }
-@@ -162,14 +162,14 @@
-
- void finish( const int fDesc ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- c->finished = true;
- }
- }
-
- void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) != 0) {
-+ if ((c = locateFDesc(fDesc)) != clientList.end()) {
- strncpy(address, c->address, HTTP_IP_ADDR_LEN);
- }
- }
-@@ -180,7 +180,7 @@
-
- int readBuf(const int fDesc, char *destBuf, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 0;
- }
-@@ -192,7 +192,7 @@
-
- int readLine(const int fDesc, char *destBuf, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 0;
- }
-@@ -217,7 +217,7 @@
- int handleWrite(int socket) {
- int bytesWritten;
- ClientIterator c;
-- if ((c = locateFDesc(socket)) == 0) {
-+ if ((c = locateFDesc(socket)) == clientList.end()) {
- // printf("unknown client id %d\n", socket);
- return 2;
- }
-@@ -260,7 +260,7 @@
- return 1;
- } else {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- // printf("unknown client id %d\n", fDesc);
- return 2;
- }
-@@ -304,7 +304,7 @@
-
- void doWrite(const int fDesc, const char* string, const uint len) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- //printf("unknown client id %d\n", fDesc);
- return;
- }
-@@ -318,7 +318,7 @@
-
- void doWrite(const int fDesc, const char* string) {
- ClientIterator c;
-- if ((c = locateFDesc(fDesc)) == 0) {
-+ if ((c = locateFDesc(fDesc)) == clientList.end()) {
- //printf("unknown client id %d\n", fDesc);
- return;
- }
-@@ -351,7 +351,7 @@
-
- void queueFile(const int socket, const int pendingFile ) {
- ClientIterator c;
Home |
Main Index |
Thread Index |
Old Index