Kaleb Elwert avatar Kaleb Elwert committed 12de6d3

update to pianobar - synced with main tree

Comments (0)

Files changed (3)

media-sound/pianobar/Manifest

-EBUILD pianobar-9999.ebuild 987 RMD160 bd4c8e1e1ec7bdd07918b303010740b2b7b7c2d5 SHA1 94f762c9844c34b320eb9375926af8ce7d57ad15 SHA256 27ceaed5ca440c19e5104f2edb0569889f7e98f63a1479b463f7863703cda6e7
+AUX pianobar-tests.patch 799 RMD160 33d3b455f251e1169e6f16fe10b8b8e0b74f0ec1 SHA1 a0405801bb369116fecdf25f8f93f6a2f57936ec SHA256 6879787ab9e4c9fe8fca764345fc2b42d1b3b7dba1ace54d26efda8a08c24eb8
+EBUILD pianobar-9999.ebuild 1064 RMD160 0ab5187ee9563a1b7c31046eaec517098bf344a2 SHA1 77c58e1c87ebda1fbb028aa733d22ce87a5e35fc SHA256 8451b665501a7a2eb878885e5741cd1e9a8b7e537d0411a2edf7c459b29d9cb8
 MISC metadata.xml 337 RMD160 6a62fe59144a79357d1735d001fc3c364e48bd9f SHA1 905766575ae9abdc4d128c6bc6595f2a2eeef9a6 SHA256 bd46c06a653035278c75d4d324191bac19ab9e56ffcbe7a548ade44a625b5be4

media-sound/pianobar/files/pianobar-tests.patch

+--- pianobar-2011.07.09/Makefile.orig
++++ pianobar-2011.07.09/Makefile
+@@ -55,10 +55,12 @@
+ 
+ LIBWAITRESS_DIR=src/libwaitress
+ LIBWAITRESS_SRC=${LIBWAITRESS_DIR}/waitress.c
++LIBWAITRESS_TSRC=${LIBWAITRESS_DIR}/waitress-test.c
+ LIBWAITRESS_HDR=\
+ 		${LIBWAITRESS_DIR}/config.h \
+ 		${LIBWAITRESS_DIR}/waitress.h
+ LIBWAITRESS_OBJ=${LIBWAITRESS_SRC:.c=.o}
++LIBWAITRESS_TOBJ=${LIBWAITRESS_TSRC:.c=.o}
+ LIBWAITRESS_RELOBJ=${LIBWAITRESS_SRC:.c=.lo}
+ LIBWAITRESS_INCLUDE=${LIBWAITRESS_DIR}
+ 
+@@ -130,8 +132,8 @@
+ debug: CFLAGS=-Wall -pedantic -ggdb
+ 
+ waitress-test: CFLAGS+= -DTEST
+-waitress-test: ${LIBWAITRESS_OBJ}
+-	${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} -o waitress-test
++waitress-test: ${LIBWAITRESS_TOBJ}
++	${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} -o waitress-test
+ 
+ test: waitress-test
+ 	./waitress-test

media-sound/pianobar/pianobar-9999.ebuild

 
 EAPI=4
 
-inherit git-2
+inherit git-2 toolchain-funcs flag-o-matic eutils
 
-DESCRIPTION="A free, MIT-licensed replacement for pandora's flash player."
-HOMEPAGE="http://uint16.ath.cx/software/pandora_client.en.html"
-SRC_URI=""
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
 EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa esd pulseaudio +mad +faad"
+IUSE="aac +mp3"
 
 DEPEND="media-libs/libao
-	net-misc/curl
-	faad? ( media-libs/faad2 )
-	mad? ( media-libs/libmad )
-	dev-libs/libxml2"
+	aac? ( media-libs/faad2 )
+	mp3? ( media-libs/libmad )"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mp3 aac )"
 
 src_prepare() {
-	sed -i -e 's/^PREFIX.*/PREFIX\:=\/usr/g' Makefile
+	epatch "${FILESDIR}/${PN}-tests.patch"
 }
 
 src_compile() {
-	local make_opts=""
-	use mad || make_opts="$make_opts DISABLE_MAD=1"
-	use faad || make_opts="$make_opts DISABLE_FAAD=1"
+	local myconf=""
+	! use aac && myconf+=" DISABLE_FAAD=1"
+	! use mp3 && myconf+=" DISABLE_MAD=1"
 
-	emake ${make_opts}
+	append-cflags -std=c99
+	tc-export CC
+	emake ${myconf}
+}
+
+src_test() {
+	cp src/libwaitress/waitress.c src/libwaitress/waitress-test.c
+	emake test
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README INSTALL
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc ChangeLog README
+
 	docinto contrib
-	dodoc contrib/*
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.