[oe-commits] org.oe.dev squeezeclient: Add squeeze client (from #1717 with some changes)

[rpurdie commit]

squeezeclient: Add squeeze client (from #1717 with some changes)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 40c134102c7bb4e96d009f6f0bdf0e23d7c9ddbc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=40c134102c7bb4e96d009f6f0bdf0e23d7c9ddbc
Files:
1
packages/squeezeclient
packages/squeezeclient/files
packages/squeezeclient/files/makefile.patch
packages/squeezeclient/files/runfix.patch
packages/squeezeclient/files/varinit.patch
packages/squeezeclient/squeezeslave_svn.bb
Diffs:

#
# mt diff -r0b937eda3a0ec22f59a9ad6a43602697b57732e9 -r40c134102c7bb4e96d009f6f0bdf0e23d7c9ddbc
#
# 
# 
# add_dir "packages/squeezeclient"
# 
# add_dir "packages/squeezeclient/files"
# 
# add_file "packages/squeezeclient/files/makefile.patch"
#  content [80d97528a8f54dee24470aed78a9db7c6b5e5409]
# 
# add_file "packages/squeezeclient/files/runfix.patch"
#  content [604cee302ffc3b9aada833695e24b217ec79d691]
# 
# add_file "packages/squeezeclient/files/varinit.patch"
#  content [1af102d7ffca497ac7b6cdfa38b1407bf7db42ff]
# 
# add_file "packages/squeezeclient/squeezeslave_svn.bb"
#  content [7a9d335ff3d207239f449ded7167f967c34631ce]
# 
============================================================
--- packages/squeezeclient/files/makefile.patch	80d97528a8f54dee24470aed78a9db7c6b5e5409
+++ packages/squeezeclient/files/makefile.patch	80d97528a8f54dee24470aed78a9db7c6b5e5409
@@ -0,0 +1,57 @@
+---
+ makefile.linux |   30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+Index: SlimProtoLib/makefile.linux
+===================================================================
+--- SlimProtoLib.orig/makefile.linux	2006-12-31 11:09:10.000000000 +0000
++++ SlimProtoLib/makefile.linux	2006-12-31 12:34:11.000000000 +0000
+@@ -1,6 +1,4 @@
+-CC=gcc
+-
+-CFLAGS=-Wall -Werror -DSLIMPROTO_DEBUG -g
++CFLAGS+=-Wall  -DSLIMPROTO_DEBUG -g
+ 
+ INCLUDE=-Ilib/portaudio_v18/pa_common -Ilib/portaudio_v18/pablio -Ilib/portmixer/px_common -Isrc
+ 
+@@ -20,24 +18,30 @@ SQUEEZESLAVEFILES:=src/squeezeslave/sque
+ 
+ all : bin/squeezeslave
+ 
+-lib/libportaudio.a: $(PORTAUDIOFILES:.c=.o)
+-	ar cru lib/libportaudio.a $^
+-	ranlib lib/libportaudio.a
++LIBVERSION:=3.0.0
+ 
+-lib/libslimproto.a: $(SLIMPROTOFILES:.c=.o)
+-	ar cru lib/libslimproto.a $^
+-	ranlib lib/libslimproto.a
++lib/libportaudio.so.$(LIBVERSION): $(PORTAUDIOFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libportaudio.so 
+ 
+-bin/squeezeslave : $(SQUEEZESLAVEFILES:.c=.o) $(PORTMIXERFILES:.c=.o) lib/libslimproto.a lib/libportaudio.a
+-	${CC} -o bin/squeezeslave $^ /usr/local/lib/libmad.a /usr/local/lib/libFLAC.a /usr/lib/libvorbisfile.a /usr/lib/libvorbis.a /usr/lib/libogg.a -lpthread -lm
++lib/libslimproto.so.$(LIBVERSION): $(SLIMPROTOFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libslimproto.so
+ 
++lib/libportmixer.so.$(LIBVERSION): $(PORTMIXERFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libportmixer.so
++
++bin/squeezeslave: $(SQUEEZESLAVEFILES:.c=.o) lib/libportaudio.so.$(LIBVERSION) lib/libportmixer.so.$(LIBVERSION) lib/libslimproto.so.$(LIBVERSION)
++	${CC} -o bin/squeezeslave $(LDFLAGS) $(LDFLAGS) $^ -Llib -lmad -lFLAC -lvorbisfile -lvorbis -logg -lpthread -lm -lslimproto -lportaudio -lportmixer
+ 
+ clean:
+ 	@{ for FILE in $(PORTAUDIOFILES:.c=.o) \
+ 	               $(SLIMPROTOFILES:.c=.o) \
+ 	               $(SQUEEZESLAVEFILES:.c=.o) \
+-	               lib/libportaudio.a \
+-	               lib/libslimproto.a \
++	               lib/libportaudio*.so \
++	               lib/libportmixer*.so \
++	               lib/libslimproto*.so \
+ 	               bin/squeezeslave; do \
+ 	  test -e $$FILE && echo $$FILE || true; \
+ 	  test -e $$FILE && $(RM) $$FILE 2>/dev/null || true; \
============================================================
--- packages/squeezeclient/files/runfix.patch	604cee302ffc3b9aada833695e24b217ec79d691
+++ packages/squeezeclient/files/runfix.patch	604cee302ffc3b9aada833695e24b217ec79d691
@@ -0,0 +1,17 @@
+---
+ src/squeezeslave/squeezeslave.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SlimProtoLib/src/squeezeslave/squeezeslave.c
+===================================================================
+--- SlimProtoLib.orig/src/squeezeslave/squeezeslave.c	2006-12-31 11:09:09.000000000 +0000
++++ SlimProtoLib/src/squeezeslave/squeezeslave.c	2006-12-31 13:44:04.000000000 +0000
+@@ -41,7 +41,7 @@ char macaddress[6] = { 1, 1, 1, 1, 1, 1 
+ int main(int argc, char *argv[]) {
+ 	char *slimserver_address = "127.0.0.1";
+ 	int output_device_id = -1;
+-	char c;
++	int c;
+ 	int i;
+ 	
+ 	while (1) {
============================================================
--- packages/squeezeclient/files/varinit.patch	1af102d7ffca497ac7b6cdfa38b1407bf7db42ff
+++ packages/squeezeclient/files/varinit.patch	1af102d7ffca497ac7b6cdfa38b1407bf7db42ff
@@ -0,0 +1,17 @@
+---
+ src/slimaudio/slimaudio_http.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SlimProtoLib/src/slimaudio/slimaudio_http.c
+===================================================================
+--- SlimProtoLib.orig/src/slimaudio/slimaudio_http.c	2006-12-31 11:09:09.000000000 +0000
++++ SlimProtoLib/src/slimaudio/slimaudio_http.c	2006-12-31 11:16:37.000000000 +0000
+@@ -91,7 +91,7 @@ int slimaudio_http_close(slimaudio_t *au
+ static void *http_thread(void *ptr) {
+ 	slimaudio_t *audio = (slimaudio_t *) ptr;
+ #ifdef SLIMPROTO_DEBUG				
+-	int last_state;
++	int last_state=0;
+ #endif
+ 
+ 	pthread_mutex_lock(&audio->http_mutex);
============================================================
--- packages/squeezeclient/squeezeslave_svn.bb	7a9d335ff3d207239f449ded7167f967c34631ce
+++ packages/squeezeclient/squeezeslave_svn.bb	7a9d335ff3d207239f449ded7167f967c34631ce
@@ -0,0 +1,31 @@
+SECTION = "console/multimedia"
+DESCRIPTION = "command line audio playback client for SlimServer"
+LICENSE = "GPL"
+DEPENDS += "libmad flac libvorbis"
+PV = "3.0+svn-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \
+           file://varinit.patch;patch=1 \
+           file://runfix.patch;patch=1 \
+           file://makefile.patch;patch=1"
+
+
+S = "${WORKDIR}/softsqueeze/SlimProtoLib"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+inherit autotools
+
+do_compile() {
+        oe_runmake LDFLAGS=${TARGET_LDFLAGS} -f makefile.linux
+}
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -m 0755 bin/squeezeslave ${D}/${bindir}
+    	oe_libinstall -C lib -so libslimproto ${D}${libdir}
+    	oe_libinstall -C lib -so libportaudio ${D}${libdir}
+    	oe_libinstall -C lib -so libportmixer ${D}${libdir}
+}
+