From 9991a3f978ecac7777f8e8705ffac1fdfb9bbb5b Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Mon, 30 May 2011 08:59:51 +0200 Subject: [PATCH] forked-daapd-0.16.ebuild copied from https://github.com/saintdev/forked-daapd-overlay --- media-sound/forked-daapd/Manifest | 10 +- .../files/forked-daapd-0.12-configure.patch | 56 ++++++++++ .../files/forked-daapd-0.12-libevent.patch | 100 ++++++++++++++++++ .../forked-daapd/files/forked-daapd.init | 27 ----- .../forked-daapd/files/forked-daapd.init.d | 46 ++++++++ .../forked-daapd/forked-daapd-0.11.ebuild | 79 -------------- .../forked-daapd/forked-daapd-0.12.ebuild | 80 -------------- .../forked-daapd/forked-daapd-0.16.ebuild | 79 ++++++++++++++ 8 files changed, 286 insertions(+), 191 deletions(-) create mode 100644 media-sound/forked-daapd/files/forked-daapd-0.12-configure.patch create mode 100644 media-sound/forked-daapd/files/forked-daapd-0.12-libevent.patch delete mode 100755 media-sound/forked-daapd/files/forked-daapd.init create mode 100644 media-sound/forked-daapd/files/forked-daapd.init.d delete mode 100644 media-sound/forked-daapd/forked-daapd-0.11.ebuild delete mode 100644 media-sound/forked-daapd/forked-daapd-0.12.ebuild create mode 100644 media-sound/forked-daapd/forked-daapd-0.16.ebuild diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest index 060cf3c..d106f23 100644 --- a/media-sound/forked-daapd/Manifest +++ b/media-sound/forked-daapd/Manifest @@ -1,5 +1,5 @@ -AUX forked-daapd.init 699 RMD160 10e7fce793399466b9c7d5007af5645b44a2ce82 SHA1 6ac6b9335f0214998e5c05b5e31bc216363d98bf SHA256 9628b3fa5633585b730d08b956c79c4366d4d78204e53e2fea105b3f407b8960 -DIST forked-daapd-0.12.tar.gz 583714 RMD160 ac59e948064bb9c65cbc1c40abb6cf2a4178edfc SHA1 b5b6827b38f356b3b081b5b408cbdc919a5ae49c SHA256 54e4a445b80647973f99fc1ba1db1ec2090b0116951a8c8d434b1e7d4514b8ea -DIST forked-daapd.git;a=snapshot;h=e3fb8f00cf4192a5e44c46c973964ea937bf4759;sf=tgz 140353 RMD160 a352b71defdcc3eb543568bc95e5d3434cb37447 SHA1 b385de41d38aa33161315df2eed466a9b518a24e SHA256 bfcd406d8b35d8fd47b534d24b0f76f658e41d4de61bea76eb9c561f2eff19f4 -EBUILD forked-daapd-0.11.ebuild 1714 RMD160 e7be85c0c15d6a0b71f6bdce768290727d6eb848 SHA1 619c2f42e357d65ce516094bb40dcbf5c805eca9 SHA256 aa664a83985121ed9cb30c70d5ea25530505d91ee1b49ac0a6a1d70f495bf87f -EBUILD forked-daapd-0.12.ebuild 1710 RMD160 f3173a140d3e227a20d668d070a2d23c59c1b736 SHA1 c52ebdd3ec026005fb9e66a4107fd9213cb060e6 SHA256 ee7dd055e5c07eff3b47e69164b0e68762f16dd7b3ddc370016698fe4561ac82 +AUX forked-daapd-0.12-configure.patch 1979 RMD160 16bbc89a5cc24707ef48d7c5f2d256c714229c6a SHA1 00446622462c2ee140ed4c105fcdaa9665566620 SHA256 7219d73fd80737c80d797f172787a85bc929ea31080a1fb943e9013ae66d1a67 +AUX forked-daapd-0.12-libevent.patch 1920 RMD160 27954e9e44f7e4f846f68ee5556dbf78a1b236b1 SHA1 e1118ad1d752e06b76ce3225dd446044e09b4f97 SHA256 331873f0a4bc43b2201a952a9e8c60698c57c0cbe553947776a173ec2ff03259 +AUX forked-daapd.init.d 1275 RMD160 62adf7e4d7ff84725d2f10cbcc140f80eb4095e7 SHA1 9326a2400f8ae76131a25246e396dd00662ca474 SHA256 6861f37fea94e8b36638a4c15856f449593e389dc4bff6aa1f65db7d1beea5de +DIST forked-daapd-0.16.tar.gz 625910 RMD160 ccd55c08b2857e39bb68bd28cefa92e5f7212527 SHA1 5478cce18cc0b3aad204f4bcbe1f58530d08fa1d SHA256 005ffa56ae15a6800bff8a8d7d5558d9b41e4503daef0338f242d7434b752d4c +EBUILD forked-daapd-0.16.ebuild 2029 RMD160 63400b6a81f717692c764a7f110059fa5ceedf84 SHA1 94728eaa3ec7dfd47dcb3b65ef37ea38980ae597 SHA256 a773ec02e177c70374cd59546aec521fb4d824778cfb94aabfda91fcc72d565d diff --git a/media-sound/forked-daapd/files/forked-daapd-0.12-configure.patch b/media-sound/forked-daapd/files/forked-daapd-0.12-configure.patch new file mode 100644 index 0000000..6be911f --- /dev/null +++ b/media-sound/forked-daapd/files/forked-daapd-0.12-configure.patch @@ -0,0 +1,56 @@ +--- 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 diff --git a/media-sound/forked-daapd/files/forked-daapd-0.12-libevent.patch b/media-sound/forked-daapd/files/forked-daapd-0.12-libevent.patch new file mode 100644 index 0000000..4b78488 --- /dev/null +++ b/media-sound/forked-daapd/files/forked-daapd-0.12-libevent.patch @@ -0,0 +1,100 @@ +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 +- + #ifdef _EVENT_HAVE_SYS_PARAM_H + #include + #endif +@@ -71,17 +69,17 @@ + #endif + #include + #include ++ ++#undef timeout_pending ++#undef timeout_initialized ++ ++#include + #ifdef _EVENT_HAVE_UNISTD_H + #include + #endif + #ifdef _EVENT_HAVE_FCNTL_H + #include + #endif +- +-#undef timeout_pending +-#undef timeout_initialized +- +-#include + #include "evhttp.h" + #include + #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 +- +-#ifdef _EVENT_HAVE_SYS_PARAM_H +-#include +-#endif +-#ifdef _EVENT_HAVE_SYS_TYPES_H +-#include +-#endif +- +-#ifdef _EVENT_HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef _EVENT_HAVE_SYS_IOCCOM_H +-#include +-#endif + + #ifndef WIN32 + #include +@@ -74,6 +59,26 @@ + #endif + #include + #include ++ ++#undef timeout_pending ++#undef timeout_initialized ++ ++#include ++ ++#ifdef _EVENT_HAVE_SYS_PARAM_H ++#include ++#endif ++#ifdef _EVENT_HAVE_SYS_TYPES_H ++#include ++#endif ++ ++#ifdef _EVENT_HAVE_SYS_TIME_H ++#include ++#endif ++#ifdef _EVENT_HAVE_SYS_IOCCOM_H ++#include ++#endif ++ + #ifdef _EVENT_HAVE_UNISTD_H + #include + #endif +@@ -81,10 +86,6 @@ + #include + #endif + +-#undef timeout_pending +-#undef timeout_initialized +- +-#include + #include "evrtsp.h" + #include + /* #define USE_DEBUG */ diff --git a/media-sound/forked-daapd/files/forked-daapd.init b/media-sound/forked-daapd/files/forked-daapd.init deleted file mode 100755 index 0e1e724..0000000 --- a/media-sound/forked-daapd/files/forked-daapd.init +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/forked-daapd/files/forked-daapd.init.2,v 1.4 2010/01/25 16:27:26 patrick Exp $ -# - -PIDFILE="/var/run/forked-daapd.pid" -CONFFILE="/etc/forked-daapd.conf" - -depend() { - need net avahi-daemon -} - -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} -} diff --git a/media-sound/forked-daapd/files/forked-daapd.init.d b/media-sound/forked-daapd/files/forked-daapd.init.d new file mode 100644 index 0000000..6501bce --- /dev/null +++ b/media-sound/forked-daapd/files/forked-daapd.init.d @@ -0,0 +1,46 @@ +#!/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., then it will load /etc/forked-daapd.d/.conf as config +# file. +# Remember to give them different logs and cache directories. +# +# The main instance (with no ) 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} + +} diff --git a/media-sound/forked-daapd/forked-daapd-0.11.ebuild b/media-sound/forked-daapd/forked-daapd-0.11.ebuild deleted file mode 100644 index ada1d4f..0000000 --- a/media-sound/forked-daapd/forked-daapd-0.11.ebuild +++ /dev/null @@ -1,79 +0,0 @@ - -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $ - -inherit eutils flag-o-matic multilib autotools - -COMMIT="e3fb8f00cf4192a5e44c46c973964ea937bf4759" - -SRC_URI="http://git.debian.org/?p=users/jblache/forked-daapd.git;a=snapshot;h=${COMMIT};sf=tgz" -RESTRICT="mirror" -EAPI='2' - -DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" -HOMEPAGE="http://www.jblache.org/projects/daapd/index.html" - -user='daapd' -group=${user} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="itunes flac" - -DEPEND="sys-libs/zlib - =dev-libs/antlr-c-3* - dev-java/antlr:3 - dev-libs/confuse - >=dev-libs/libevent-1.4 - >=dev-db/sqlite-3.5[unlock-notify] - >=dev-libs/libgcrypt-1.2.0 - >=net-dns/avahi-0.6.24[dbus] - media-video/ffmpeg - dev-libs/mini-xml - sys-libs/libavl - vorbis? ( media-libs/libvorbis ) - flac? ( media-libs/flac ) - musepack? ( media-libs/taglib ) - itunes? ( app-pda/libplist )" - -pkg_setup() { - ebegin "Creating nginx user and group" - enewgroup ${group} - enewuser ${user} -1 -1 -1 ${group} - eend ${?} -} - -src_unpack() { - mkdir -p ${S} - cd ${S} - cat ${DISTDIR}/${A} | tar xz --strip=1 -} - -src_prepare() { - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - econf \ - $(use_enable flac) \ - $(use_enable itunes) \ - || die "configure failed" - emake || die "make failed" - - cp ${FILESDIR}/${PN}.init ${WORKDIR}/initd -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - - newinitd ${WORKDIR}/initd ${PN} - - keepdir /var/cache/forked-daapd - fowners ${user}:${group} /var/cache/forked-daapd - - dodoc AUTHORS ChangeLog NEWS README -} - diff --git a/media-sound/forked-daapd/forked-daapd-0.12.ebuild b/media-sound/forked-daapd/forked-daapd-0.12.ebuild deleted file mode 100644 index ebda8ee..0000000 --- a/media-sound/forked-daapd/forked-daapd-0.12.ebuild +++ /dev/null @@ -1,80 +0,0 @@ - -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $ - -inherit eutils flag-o-matic multilib autotools - -COMMIT="e3fb8f00cf4192a5e44c46c973964ea937bf4759" - -SRC_URI="http://alioth.debian.org/~jblache/forked-daapd/${P}.tar.gz" -RESTRICT="mirror" -EAPI='2' - -DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" -HOMEPAGE="http://www.jblache.org/projects/daapd/index.html" - -user='daapd' -group=${user} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="itunes flac" - -DEPEND="sys-libs/zlib - =dev-libs/antlr-c-3* - dev-java/antlr:3 - dev-libs/confuse - >=dev-libs/libevent-1.4 - >=dev-db/sqlite-3.5[unlock-notify] - >=dev-libs/libgcrypt-1.2.0 - >=net-dns/avahi-0.6.24[dbus] - media-video/ffmpeg - dev-libs/mini-xml - sys-libs/libavl - dev-libs/libunistring - vorbis? ( media-libs/libvorbis ) - flac? ( media-libs/flac ) - musepack? ( media-libs/taglib ) - itunes? ( app-pda/libplist )" - -pkg_setup() { - ebegin "Creating nginx user and group" - enewgroup ${group} - enewuser ${user} -1 -1 -1 ${group} - eend ${?} -} - -src_unpack() { - mkdir -p ${S} - cd ${S} - cat ${DISTDIR}/${A} | tar xz --strip=1 -} - -src_prepare() { - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - econf \ - $(use_enable flac) \ - $(use_enable itunes) \ - || die "configure failed" - emake || die "make failed" - - cp ${FILESDIR}/${PN}.init ${WORKDIR}/initd -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - - newinitd ${WORKDIR}/initd ${PN} - - keepdir /var/cache/forked-daapd - fowners ${user}:${group} /var/cache/forked-daapd - - dodoc AUTHORS ChangeLog NEWS README -} - diff --git a/media-sound/forked-daapd/forked-daapd-0.16.ebuild b/media-sound/forked-daapd/forked-daapd-0.16.ebuild new file mode 100644 index 0000000..4aa5dea --- /dev/null +++ b/media-sound/forked-daapd/forked-daapd-0.16.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="DAAP and RSP media server. It is a complete rewrite of mt-daapd (Firefly Media Server)." +HOMEPAGE="http://www.technologeek.org/projects/daapd/index.html" +SRC_URI="http://alioth.debian.org/~jblache/forked-daapd/${PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="flac itunes musepack" + +RDEPEND="itunes? ( >=app-pda/libplist-0.16 ) + dev-db/sqlite:3[unlock-notify,threadsafe] + >=dev-java/antlr-c-3.1.3 + >=dev-libs/avl-0.3.5 + dev-libs/confuse + dev-libs/libevent + dev-libs/libgcrypt + >=dev-libs/libunistring-0.9.3 + dev-libs/mini-xml + media-libs/alsa-lib + flac? ( media-libs/flac ) + musepack? ( media-libs/taglib ) + >=net-dns/avahi-0.6.24 + >=sys-libs/zlib-1.2.5-r2 + virtual/ffmpeg" + +DEPEND="${RDEPEND} + dev-java/antlr:3 + dev-util/gperf + dev-util/pkgconfig" + +RESTRICT="primaryuri" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.12-configure.patch + epatch "${FILESDIR}"/${PN}-0.12-libevent.patch + eautoreconf +} + +src_configure() { + econf $(use_enable flac) \ + $(use_enable itunes)\ + $(use_enable musepack) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + + newinitd "${FILESDIR}/${PN}.init.d" ${PN} || die + keepdir /etc/forked.daapd.d /var/cache/forked-daapd || die + mv "${D}/etc/forked-daapd.conf" "${D}/etc/forked.daapd.d/" || die + + dodoc AUTHORS ChangeLog README NEWS || die +} + +pkg_preinst() { + enewgroup daapd + enewuser daapd -1 -1 /dev/null daapd + fowners -R daapd:daapd /etc/forked.daapd.d + fowners -R daapd:daapd /var/cache/forked-daapd + fperms -R 0700 /etc/forked.daapd.d + fperms -R 0700 /var/cache/forked-daapd +} +pkg_postinst() { + einfo + elog "If you want to start more than one ${PN} service, symlink" + elog "/etc/init.d/${PN} to /etc/init.d/${PN}., and it will" + elog "load the data from /etc/${PN}.d/.conf." + elog "Make sure that you have different cache directories for them." + einfo +} +