Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-sound/daapd
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-05 08:49:45 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-05 08:49:45 +0000
commite8ce3713485b7335acc182af12ade1a53d23908d (patch)
treee5761c1f60b83df200427447fe3fce6a51393713 /media-sound/daapd
parentStable on x86 and ppc; bug #66274. (diff)
downloadhistorical-e8ce3713485b7335acc182af12ade1a53d23908d.tar.gz
historical-e8ce3713485b7335acc182af12ade1a53d23908d.tar.bz2
historical-e8ce3713485b7335acc182af12ade1a53d23908d.zip
Version bump closes bug #66364. Added ~amd64.
Diffstat (limited to 'media-sound/daapd')
-rw-r--r--media-sound/daapd/ChangeLog8
-rw-r--r--media-sound/daapd/Manifest19
-rw-r--r--media-sound/daapd/daapd-0.2.3b.ebuild12
-rw-r--r--media-sound/daapd/daapd-0.2.3d.ebuild61
-rw-r--r--media-sound/daapd/files/daapd-0.2.3d-gentoo.patch43
-rw-r--r--media-sound/daapd/files/daapd.init.d3
-rw-r--r--media-sound/daapd/files/digest-daapd-0.2.3d1
7 files changed, 136 insertions, 11 deletions
diff --git a/media-sound/daapd/ChangeLog b/media-sound/daapd/ChangeLog
index 9d3bc0d5a646..86564bfaf350 100644
--- a/media-sound/daapd/ChangeLog
+++ b/media-sound/daapd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/daapd
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.6 2004/08/28 22:32:18 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.7 2004/10/05 08:49:45 eradicator Exp $
+
+*daapd-0.2.3d (05 Oct 2004)
+
+ 05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/daapd-0.2.3d-gentoo.patch, files/daapd.init.d, +daapd-0.2.3b.ebuild:
+ Version bump closes bug #66364. Added ~amd64.
29 Aug 2004; David Holm <dholm@gentoo.org> daapd-0.2.3b.ebuild:
Added to ~ppc.
diff --git a/media-sound/daapd/Manifest b/media-sound/daapd/Manifest
index 65bacd9b7892..eb371bef126b 100644
--- a/media-sound/daapd/Manifest
+++ b/media-sound/daapd/Manifest
@@ -1,12 +1,25 @@
-MD5 e62a43c68f4163f415f2c8984f946acd ChangeLog 1414
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 930ab8747282832850cf476d00aad168 ChangeLog 1633
MD5 a536a4ad7975642df2a610dc11163dde daapd-0.2.1d.ebuild 1277
MD5 67fa7232a65762eb47d8773c5fb33811 metadata.xml 592
-MD5 92a717f8cffbe9ed0edc41ee7641b2b1 daapd-0.2.3b.ebuild 1484
+MD5 eb70a6530ad16b705eea4b7f95a56163 daapd-0.2.3b.ebuild 1381
+MD5 fb83dc0a500317b84678bd5f347ee948 daapd-0.2.3d.ebuild 1399
MD5 6a94f39460d57008cfec35d65b784951 files/0.2.1d-makefile-gentoo.patch 343
MD5 71d5acf0144c38a510d37e388e6f4b4d files/0.2.1d-zeroconf-gentoo.patch 5182
MD5 3beda326653c14c1fbd33c762af01e2e files/daapd.conf.d 673
-MD5 c9efc1a26641469dad49ba6fade5f8b9 files/daapd.init.d 1046
+MD5 c5e17de0906d8f26eae32f5af43b6b23 files/daapd.init.d 1067
MD5 d288598cd3334e91bb0822932d8cdd96 files/digest-daapd-0.2.1d 60
MD5 21611aa97014bae60e0714775aff9645 files/daapd-0.2.3b-gentoo.patch 1571
MD5 ab75a66a1f905fc7b49012c87d63421d files/daapd-0.2.3b-mpeg4.patch 333
MD5 8e45b744d7830e3e53e207ded8ef84f8 files/digest-daapd-0.2.3b 61
+MD5 f1be018e61557e7ca897f2f1078b13b4 files/daapd-0.2.3d-gentoo.patch 1569
+MD5 c25c564a55bdc585c844929ca710971a files/digest-daapd-0.2.3d 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYmBCArHZZzCEUG0RAqdnAJ0VGQYejzB1t0LgA5G1XKMfwdPOswCfVJW/
+Y6S5Q+1pSBqusV2/BtMZL20=
+=68B/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/daapd/daapd-0.2.3b.ebuild b/media-sound/daapd/daapd-0.2.3b.ebuild
index 99863da50c50..ae5c8214cd85 100644
--- a/media-sound/daapd/daapd-0.2.3b.ebuild
+++ b/media-sound/daapd/daapd-0.2.3b.ebuild
@@ -1,23 +1,23 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.3b.ebuild,v 1.4 2004/08/28 22:32:18 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.3b.ebuild,v 1.5 2004/10/05 08:49:45 eradicator Exp $
+
+IUSE="mpeg4"
inherit flag-o-matic eutils
DESCRIPTION="daapd scans a directory for mp3 files and makes them available via the Apple proprietary protocol DAAP"
HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
SRC_URI="http://www.deleet.de/projekte/daap/daapd/${P}.tgz"
+
LICENSE="GPL-2"
SLOT="0"
-#KEYWORDS="~x86 ~amd64"
-# howl-0.9.6 does not allow this to compile, so amd64 support will still need
-# to wait...
KEYWORDS="~x86 ~ppc"
-IUSE="mpeg4"
+
DEPEND="sys-libs/zlib
=net-misc/howl-0.9.5
>=media-libs/libid3tag-0.15.0b
- mpeg4? media-libs/faad2
+ mpeg4? ( media-libs/faad2 )
>=net-libs/libhttpd-persistent-1.3p-r8
>=media-libs/daaplib-0.1.1a"
diff --git a/media-sound/daapd/daapd-0.2.3d.ebuild b/media-sound/daapd/daapd-0.2.3d.ebuild
new file mode 100644
index 000000000000..e82c01a183f6
--- /dev/null
+++ b/media-sound/daapd/daapd-0.2.3d.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.3d.ebuild,v 1.1 2004/10/05 08:49:45 eradicator Exp $
+
+IUSE="mpeg4 howl"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="daapd scans a directory for mp3 files and makes them available via the Apple proprietary protocol DAAP"
+HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
+SRC_URI="http://www.deleet.de/projekte/daap/daapd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
+DEPEND="zlib? ( sys-libs/zlib )
+ howl? ( >=net-misc/howl-0.9.6-r1 )
+ mpeg4? ( media-libs/faad2 )
+ >=media-libs/libid3tag-0.15.0b
+ >=net-libs/libhttpd-persistent-1.3p-r8
+ >=media-libs/daaplib-0.1.1a"
+
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/${P}-gentoo.patch
+
+ cd ${S}
+ if ! use zlib; then
+ sed -ie 's/ZLIB_ENABLE = 1/ZLIB_ENABLE = 0/g' makefile
+ fi
+
+ if ! use howl; then
+ sed -ie 's/HOWL_ENABLE = 1/HOWL_ENABLE = 0/g' makefile
+ fi
+
+ if ! use mpeg4; then
+ sed -ie 's/MPEG4_ENABLE = 1/MPEG4_ENABLE = 0/g' makefile
+ fi
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ dobin daapd
+
+ dodoc COPYING README* daapd-example.conf
+ doman ${PN}.8
+
+ insinto /etc
+ newins daapd-example.conf daapd.conf
+
+ insinto /etc/conf.d
+ newins ${FILESDIR}/daapd.conf.d daapd || die
+
+ exeinto /etc/init.d
+ newexe ${FILESDIR}/daapd.init.d daapd || die
+}
+
diff --git a/media-sound/daapd/files/daapd-0.2.3d-gentoo.patch b/media-sound/daapd/files/daapd-0.2.3d-gentoo.patch
new file mode 100644
index 000000000000..e26472737ecc
--- /dev/null
+++ b/media-sound/daapd/files/daapd-0.2.3d-gentoo.patch
@@ -0,0 +1,43 @@
+diff -urN daapd-0.2.3d/makefile daapd-0.2.3d.patched/makefile
+--- daapd-0.2.3d/makefile 2004-09-08 03:17:58.000000000 +0200
++++ daapd-0.2.3d.patched/makefile 2004-10-05 00:33:44.729241904 +0200
+@@ -11,19 +11,19 @@
+ CC = g++
+ MAKE = $(MAKE_COMMAND)
+ TARGET = daapd
+-DEPS = daaplib_ libhttpd_
++DEPS =
+ OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
+ LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread
+-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
++LIBPATH = -L. -L/usr/lib
++INCPATH = -I. -I/usr/include
++DEPLOY = /usr
+ CFLAGS = -Wall -Wno-multichar
+
+ # HOWL
+ ifeq ($(HOWL_ENABLE),1)
+- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
++ HOWLDIRS := $(sort $(wildcard /usr/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 /usr/include. Install howl or disable it in the makefile)
+ endif
+ HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
+ INCPATH := $(INCPATH) -I$(HOWLRECENT)
+diff -urN daapd-0.2.3d/types.h daapd-0.2.3d.patched/types.h
+--- daapd-0.2.3d/types.h 2004-09-08 03:17:59.000000000 +0200
++++ daapd-0.2.3d.patched/types.h 2004-10-05 00:48:31.871375800 +0200
+@@ -20,6 +20,10 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#ifndef UINT64_TO_DOUBLE
++#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
++#endif
++
+ #ifndef DAAP_TYPES_H
+ #define DAAP_TYPES_H
+
diff --git a/media-sound/daapd/files/daapd.init.d b/media-sound/daapd/files/daapd.init.d
index f53ed3662301..3e88b53bbe24 100644
--- a/media-sound/daapd/files/daapd.init.d
+++ b/media-sound/daapd/files/daapd.init.d
@@ -1,10 +1,11 @@
#!/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/daapd/files/daapd.init.d,v 1.2 2004/07/14 22:46:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/files/daapd.init.d,v 1.3 2004/10/05 08:49:45 eradicator Exp $
depend() {
need net
+ use mDNSResponder
}
checkconfig() {
diff --git a/media-sound/daapd/files/digest-daapd-0.2.3d b/media-sound/daapd/files/digest-daapd-0.2.3d
new file mode 100644
index 000000000000..f658a534e071
--- /dev/null
+++ b/media-sound/daapd/files/digest-daapd-0.2.3d
@@ -0,0 +1 @@
+MD5 9cdf2e94b93001610f9f211866d94901 daapd-0.2.3d.tgz 202317