diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/mt-daapd | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/mt-daapd')
-rw-r--r-- | media-sound/mt-daapd/Manifest | 1 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch | 20 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch | 140 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch | 50 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch | 15 | ||||
-rw-r--r-- | media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch | 18 | ||||
-rwxr-xr-x | media-sound/mt-daapd/files/mt-daapd.init.2 | 46 | ||||
-rw-r--r-- | media-sound/mt-daapd/metadata.xml | 8 | ||||
-rw-r--r-- | media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild | 76 |
9 files changed, 374 insertions, 0 deletions
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest new file mode 100644 index 000000000000..9f5dd0d4e39d --- /dev/null +++ b/media-sound/mt-daapd/Manifest @@ -0,0 +1 @@ +DIST mt-daapd-0.2.4.2.tar.gz 436513 SHA256 50d89f77bdc3fd0ca408d52cabff528224fcc7319acc3b9456db0e3164a3b6cf diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch new file mode 100644 index 000000000000..482b25c13779 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch @@ -0,0 +1,20 @@ +diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c +--- mt-daapd-0.2.3/src/mp3-scanner.c 2005-02-05 18:22:47.000000000 -0300 ++++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c 2006-01-03 16:39:50.000000000 -0300 +@@ -1663,14 +1663,14 @@ + /* now check for an XING header */ + if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) { + DPRINTF(E_DBG,L_SCAN,"Found Xing header\n"); +- xing_flags=*((int*)&buffer[index+fi.xing_offset+4+4]); ++ memcpy (&xing_flags, &buffer[index+fi.xing_offset+4+4], sizeof(int)); + xing_flags=ntohs(xing_flags); + + DPRINTF(E_DBG,L_SCAN,"Xing Flags: %02X\n",xing_flags); + + if(xing_flags & 0x1) { + /* Frames field is valid... */ +- fi.number_of_frames=*((int*)&buffer[index+fi.xing_offset+4+8]); ++ memcpy (&fi.number_of_frames, &buffer[index+fi.xing_offset+4+8], sizeof(int)); + fi.number_of_frames=ntohs(fi.number_of_frames); + } + } diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch new file mode 100644 index 000000000000..a4c5a176ada4 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch @@ -0,0 +1,140 @@ +diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in +--- mt-daapd-0.2.4.1.orig/configure.in 2007-10-22 02:50:24.000000000 +0300 ++++ mt-daapd-0.2.4.1/configure.in 2007-10-28 23:31:43.000000000 +0200 +@@ -20,8 +20,9 @@ + CPPFLAGS="${CPPFLAGS} -g" + + dnl fix freebsd's broken (?) libpthread +-AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [ +- AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ]) ++AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [ ++ AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ]) ++AC_SUBST(THREAD_LIBS) + + AC_ARG_ENABLE(debug,[ --enable-debug Enable debugging features], + CPPFLAGS="${CPPFLAGS} -Wall") +@@ -35,26 +36,29 @@ + esac ]) + + AC_ARG_ENABLE(efence,[ --enable-efence Enable electric fence], +- LDFLAGS="${LDFLAGS} -lefence") ++ EFENCE_LIBS="-lefence") ++AC_SUBST(EFENCE_LIBS) + AC_ARG_ENABLE(nslu2,[ --enable-nslu2 Build for NSLU2/uNSLUng], + CFLAGS="${CFLAGS} -DNSLU2") + + AC_ARG_ENABLE(howl,[ --enable-howl Use howl 0.9.2 or later], + [ case "${enableval}" in +- yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl"; ++ yes) rend_howl=true; rend_posix=false; rend_avahi=false; HOWL_LIBS="-lhowl"; + CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";; + no) rend_howl=false;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);; + esac ]) ++AC_SUBST(HOWL_LIBS) + + AC_ARG_ENABLE(avahi,[ --enable-avahi Use avahi 0.6 or later], + [ case "${enableval}" in + yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]); +- rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS"; ++ rend_avahi=true; rend_howl=false; rend_posix=false; + CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";; + no) rend_avahi=false;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);; + esac ]) ++AC_SUBST(AVAHI_LIBS) + + AC_ARG_ENABLE(oggvorbis,[ --enable-oggvorbis Enable Ogg/Vorbis support], + use_oggvorbis=true; +@@ -82,7 +86,7 @@ + CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2" + CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME" + CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" +- LDFLAGS="$LDFLAGS -lnsl -lsocket";; ++ EXTRA_LIBS="$EXTRA_LIBS -lnsl -lsocket";; + *freebsd*) + CPPFLAGS="$CPPFLAGS -DFREEBSD";; + *linux*) +@@ -98,6 +102,8 @@ + AM_CONDITIONAL(COND_REND_POSIX,false);; + esac + ++AC_SUBST(EXTRA_LIBS) ++ + dnl Checks for libraries. + AC_ARG_WITH(static-libs, + [--with-static-libs[[=DIR]] use static libs in DIR],[ +@@ -154,12 +160,13 @@ + AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit) + + if test "$STATIC_LIBS" != "no"; then +- LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a" ++ GDBM_LIBS="${STATIC_LIBS}/libgdbm.a" + echo "Adding static libgdbm" + else +- LDFLAGS="${LDFLAGS} -lgdbm" ++ GDBM_LIBS="-lgdbm" + echo "Adding dynamic libgdbm" + fi ++AC_SUBST(GDBM_LIBS) + + AC_CHECK_HEADERS(id3tag.h,, [ + AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])]) +@@ -170,12 +177,14 @@ + AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit) + + if test "$STATIC_LIBS" != "no"; then +- LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz" ++ ID3_LIBS="${STATIC_LIBS}/libid3tag.a -lz" + echo "Adding static libid3tag" + else +- LDFLAGS="${LDFLAGS} -lid3tag -lz" ++ ID3_LIBS="-lid3tag -lz" + echo "Adding dynamic libid3tag" + fi ++AC_SUBST([ID3_LIBS]) ++ + CFLAGS=$oldcflags + + if test x$use_oggvorbis = xtrue; then +@@ -184,22 +193,23 @@ + AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit) + + if test x"$STATIC_LIBS" != x"no"; then +- LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a" ++ OGG_LIBS="${STATIC_LIBS}/libogg.a" + echo "Adding static libogg" + else +- LDFLAGS="${LDFLAGS} -logg" ++ OGG_LIBS="-logg" + echo "Adding dynamic libogg" + fi ++ AC_SUBST(OGG_LIBS) + + AC_CHECK_HEADERS(vorbis/codec.h,, [ + AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])]) + AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit) + + if test x"$STATIC_LIBS" != x"no"; then +- LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a" ++ OGG_LIBS="${OGG_LIBS} ${STATIC_LIBS}/libvorbis.a" + echo "Adding static libvorbis" + else +- LDFLAGS="${LDFLAGS} -lvorbis" ++ OGG_LIBS="${OGG_LIBS} -lvorbis" + echo "Adding dynamic libvorbis" + fi + fi +diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am +--- mt-daapd-0.2.4.1.orig/src/Makefile.am 2007-10-22 03:32:27.000000000 +0300 ++++ mt-daapd-0.2.4.1/src/Makefile.am 2007-10-28 23:31:33.000000000 +0200 +@@ -34,6 +34,9 @@ + redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \ + $(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC) + ++mt_daapd_LDADD = $(GDBM_LIBS) $(ID3_LIBS) $(OGG_LIBS) $(THREAD_LIBS) \ ++ $(EFENCE_LIBS) $(HOWL_LIBS) $(AVAHI_LIBS) $(EXTRA_LIBS) ++ + EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \ + mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \ + rend-howl.c rend-posix.c rend-osx.c db-memory.c \ diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch new file mode 100644 index 000000000000..5976316e5bf2 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch @@ -0,0 +1,50 @@ +diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c +--- mt-daapd-0.2.4.1.orig/src/main.c 2007-10-22 02:27:57.000000000 +0300 ++++ mt-daapd-0.2.4.1/src/main.c 2007-10-28 23:54:29.000000000 +0200 +@@ -551,6 +551,7 @@ + printf(" -m Disable mDNS\n"); + printf(" -c <file> Use configfile specified\n"); + printf(" -p Parse playlist file\n"); ++ printf(" -P <file> Write the PID to specified file\n"); + printf(" -f Run in foreground\n"); + printf(" -y Yes, go ahead and run as non-root user\n"); + printf("\n\n"); +@@ -708,6 +709,7 @@ + int main(int argc, char *argv[]) { + int option; + char *configfile=DEFAULT_CONFIGFILE; ++ char *pidfile=PIDFILE; + WSCONFIG ws_config; + WSHANDLE server; + int parseonly=0; +@@ -726,7 +728,7 @@ + config.use_mdns=1; + err_debuglevel=1; + +- while((option=getopt(argc,argv,"D:d:c:mpfry")) != -1) { ++ while((option=getopt(argc,argv,"D:d:c:mpP:fry")) != -1) { + switch(option) { + case 'd': + err_debuglevel=atoi(optarg); +@@ -754,6 +756,10 @@ + foreground=1; + break; + ++ case 'P': ++ pidfile=optarg; ++ break; ++ + case 'r': + reload=1; + break; +@@ -803,8 +809,8 @@ + + /* open the pidfile, so it can be written once we detach */ + if((!foreground) && (!force_non_root)) { +- if(-1 == (pid_fd = open(PIDFILE,O_CREAT | O_WRONLY | O_TRUNC, 0644))) +- DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",PIDFILE,strerror(errno)); ++ if(-1 == (pid_fd = open(pidfile,O_CREAT | O_WRONLY | O_TRUNC, 0644))) ++ DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",pidfile,strerror(errno)); + + if(0 == (pid_fp = fdopen(pid_fd, "w"))) + DPRINTF(E_FATAL,L_MAIN,"fdopen: %s\n",strerror(errno)); diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch new file mode 100644 index 000000000000..a81483db6a11 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch @@ -0,0 +1,15 @@ +--- configure.in.orig 2008-07-06 23:57:08.000000000 +0200 ++++ configure.in 2008-07-06 23:57:46.000000000 +0200 +@@ -17,10 +17,12 @@ + rend_posix=true + + STATIC_LIBS=no + CPPFLAGS="${CPPFLAGS} -g" + ++AM_MAINTAINER_MODE ++ + dnl fix freebsd's broken (?) libpthread + AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [ + AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ]) + AC_SUBST(THREAD_LIBS) + diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch new file mode 100644 index 000000000000..714f34142ac2 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch @@ -0,0 +1,18 @@ +--- configure.in.orig 2009-03-11 08:15:14.000000000 -0500 ++++ configure.in 2009-03-11 08:25:36.000000000 -0500 +@@ -63,9 +63,14 @@ + AC_SUBST(AVAHI_LIBS) + + AC_ARG_ENABLE(oggvorbis,[ --enable-oggvorbis Enable Ogg/Vorbis support], ++ [ case "${enableval}" in ++ yes) + use_oggvorbis=true; + # LDFLAGS="${LDFLAGS} -logg -lvorbis"; +- CPPFLAGS="${CPPFLAGS} -DOGGVORBIS") ++ CPPFLAGS="${CPPFLAGS} -DOGGVORBIS" ++ esac ++ ] ++ ) + + AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue) + AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue) diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2 new file mode 100755 index 000000000000..4f6c37ce400d --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd.init.2 @@ -0,0 +1,46 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# Somehow based on init.d file shipped with mt-daapd itself. +# +# You can run multiple copies of this service just symlinking them to +# mt-daapd.<name>, then it will load /etc/mt-daapd.d/<name>.conf as config +# file. +# Remember to give them different logs and cache directories. +# +# The main instance (with no <name>) uses /etc/mt-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} != "mt-daapd" ]]; then + PIDFILE="/var/run/mt-daapd.${CONF}.pid" + CONFFILE="/etc/mt-daapd.d/${CONF}.conf" +else + PIDFILE="/var/run/mt-daapd.pid" + CONFFILE="/etc/mt-daapd.conf" +fi + +depend() { + need net + #USEHOWL need mDNSResponderPosix +} + +start() { + ebegin "Starting mt-daapd DAAP server" + start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ + --exec /usr/sbin/mt-daapd -- -P ${PIDFILE} -c ${CONFFILE} + eend $? +} + +stop() { + ebegin "Stopping mt-daapd DAAP server" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2 + eend $? + + rm -f ${PIDFILE} +} diff --git a/media-sound/mt-daapd/metadata.xml b/media-sound/mt-daapd/metadata.xml new file mode 100644 index 000000000000..ca0aef2e58a7 --- /dev/null +++ b/media-sound/mt-daapd/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sound</herd> + <upstream> + <remote-id type="sourceforge">mt-daapd</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild new file mode 100644 index 000000000000..358f7ecd26d0 --- /dev/null +++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 +inherit autotools eutils + +DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" +HOMEPAGE="http://www.mt-daapd.org" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux" +IUSE="vorbis" + +RDEPEND="media-libs/libid3tag + sys-libs/gdbm + net-dns/avahi[dbus] + vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + cp "${FILESDIR}"/${PN}.init.2 initd + + sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd + + epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \ + "${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \ + "${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \ + "${FILESDIR}"/${P}-maintainer-mode.patch \ + "${FILESDIR}"/${P}-oggvorbis.patch + eautoreconf +} + +src_configure() { + econf $(use_enable vorbis oggvorbis) \ + --disable-maintainer-mode \ + --enable-avahi \ + --disable-mdns +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + + insinto /etc + newins contrib/mt-daapd.conf mt-daapd.conf.example + doins contrib/mt-daapd.playlist + + newinitd initd ${PN} + + keepdir /var/cache/mt-daapd /etc/mt-daapd.d + dodoc AUTHORS ChangeLog CREDITS NEWS README TODO +} + +pkg_postinst() { + einfo + elog "You have to configure your mt-daapd.conf following" + elog "/etc/mt-daapd.conf.example file." + einfo + + if use vorbis; then + einfo + elog "You need to edit you extensions list in /etc/mt-daapd.conf" + elog "if you want your mt-daapd to serve ogg files." + einfo + fi + + einfo + elog "If you want to start more than one ${PN} service, symlink" + elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will" + elog "load the data from /etc/${PN}.d/<name>.conf." + elog "Make sure that you have different cache directories for them." + einfo +} |