removing old ebulds of forked-daapd, mt-daap and shairport.

This commit is contained in:
Micha Glave
2013-10-23 14:47:06 +02:00
parent e57ec6b5ed
commit b38b7b5a5c
16 changed files with 2 additions and 954 deletions

View File

@@ -1,56 +0,0 @@
--- configure.in.orig 2010-05-02 11:21:07.000000000 +0200
+++ configure.in 2010-08-09 23:19:31.000000000 +0200
@@ -45,21 +45,15 @@
AC_SYS_LARGEFILE
AC_TYPE_OFF_T
-AC_ARG_ENABLE(flac, AC_HELP_STRING([--enable-flac], [Enable FLAC support]),
- use_flac=true;
- CPPFLAGS="${CPPFLAGS} -DFLAC")
-
-AC_ARG_ENABLE(musepack, AC_HELP_STRING([--enable-musepack], [Enable Musepack support]),
- use_musepack=true;
- CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
-
-AC_ARG_ENABLE(itunes, AC_HELP_STRING([--enable-itunes], [Enable iTunes library support]),
- use_itunes=true;
- CPPFLAGS="${CPPFLAGS} -DITUNES")
-
-AM_CONDITIONAL(COND_FLAC, test x$use_flac = xtrue)
-AM_CONDITIONAL(COND_MUSEPACK, test x$use_musepack = xtrue)
-AM_CONDITIONAL(COND_ITUNES, test x$use_itunes = xtrue)
+AC_ARG_ENABLE(flac, AC_HELP_STRING([--enable-flac], [Enable FLAC support]))
+
+AC_ARG_ENABLE(musepack, AC_HELP_STRING([--enable-musepack], [Enable Musepack support]))
+
+AC_ARG_ENABLE(itunes, AC_HELP_STRING([--enable-itunes], [Enable iTunes library support]))
+
+AM_CONDITIONAL(COND_FLAC, test x$enable_flac = xtrue)
+AM_CONDITIONAL(COND_MUSEPACK, test x$enable_musepack = xtrue)
+AM_CONDITIONAL(COND_ITUNES, test x$enable_itunes = xtrue)
dnl Checks for libraries.
PKG_CHECK_MODULES(CONFUSE, [ libconfuse ])
@@ -108,16 +102,19 @@
AM_PATH_LIBGCRYPT([], , AC_MSG_ERROR([libgcrypt not found]))
-if test x$use_flac = xtrue; then
+if test x$enable_flac = xtrue; then
PKG_CHECK_MODULES(FLAC, [ flac ])
+ CPPFLAGS="${CPPFLAGS} -DFLAC"
fi
-if test x$use_musepack = xtrue; then
+if test x$enable_musepack = xtrue; then
PKG_CHECK_MODULES(TAGLIB, [ taglib_c ])
+ CPPFLAGS="${CPPFLAGS} -DMUSEPACK"
fi
-if test x$use_itunes = xtrue; then
+if test x$enable_itunes = xtrue; then
PKG_CHECK_MODULES(LIBPLIST, [ libplist >= 0.16 ])
+ CPPFLAGS="${CPPFLAGS} -DITUNES"
fi
case "$host" in

View File

@@ -1,100 +0,0 @@
diff --git a/src/evhttp/http.c b/src/evhttp/http.c
index 6774a32..09ac677 100644
--- a/src/evhttp/http.c
+++ b/src/evhttp/http.c
@@ -25,8 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <event-config.h>
-
#ifdef _EVENT_HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
@@ -71,17 +69,17 @@
#endif
#include <signal.h>
#include <time.h>
+
+#undef timeout_pending
+#undef timeout_initialized
+
+#include <event.h>
#ifdef _EVENT_HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef _EVENT_HAVE_FCNTL_H
#include <fcntl.h>
#endif
-
-#undef timeout_pending
-#undef timeout_initialized
-
-#include <event.h>
#include "evhttp.h"
#include <evutil.h>
#include "log.h"
diff --git a/src/evrtsp/rtsp.c b/src/evrtsp/rtsp.c
index 242dbe4..dc6ef10 100644
--- a/src/evrtsp/rtsp.c
+++ b/src/evrtsp/rtsp.c
@@ -28,21 +28,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <event-config.h>
-
-#ifdef _EVENT_HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef _EVENT_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef _EVENT_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef _EVENT_HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
#ifndef WIN32
#include <sys/resource.h>
@@ -74,6 +59,26 @@
#endif
#include <signal.h>
#include <time.h>
+
+#undef timeout_pending
+#undef timeout_initialized
+
+#include <event.h>
+
+#ifdef _EVENT_HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef _EVENT_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef _EVENT_HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef _EVENT_HAVE_SYS_IOCCOM_H
+#include <sys/ioccom.h>
+#endif
+
#ifdef _EVENT_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -81,10 +86,6 @@
#include <fcntl.h>
#endif
-#undef timeout_pending
-#undef timeout_initialized
-
-#include <event.h>
#include "evrtsp.h"
#include <evutil.h>
/* #define USE_DEBUG */

View File

@@ -1,46 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Based on mt-daapd init.d file created for gentoo
#
# You can run multiple copies of this service just symlinking them to
# forked-daapd.<name>, then it will load /etc/forked-daapd.d/<name>.conf as config
# file.
# Remember to give them different logs and cache directories.
#
# The main instance (with no <name>) uses /etc/forked-daapd.conf
# Check for OpenRC/Baselayout 2 -- see bug #230917
if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then
myservice=$RC_SVCNAME
fi
CONF="${myservice##*.}"
if [[ -n ${CONF} && ${myservice} != "forked-daapd" ]]; then
PIDFILE="/var/run/forked-daapd.${CONF}.pid"
CONFFILE="/etc/forked-daapd.d/${CONF}.conf"
else
PIDFILE="/var/run/forked-daapd.pid"
CONFFILE="/etc/forked-daapd.conf"
fi
depend() {
need net
#USEHOWL need mDNSResponderPosix
}
start() {
ebegin "Starting forked-daapd DAAP server"
start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
--exec /usr/sbin/forked-daapd -- -P ${PIDFILE} -c ${CONFFILE}
eend $?
}
stop() {
ebegin "Stopping forked-daapd DAAP server"
start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2
eend $?
rm -f ${PIDFILE}
}