summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rwxr-xr-xpackage/mxml/Makefile4
-rw-r--r--package/pcsc-lite/Makefile2
-rw-r--r--package/perl/files/config.sh.arm.eglibc8
-rw-r--r--package/pulseaudio/Makefile10
-rw-r--r--package/pulseaudio/files/daemon.conf20
-rw-r--r--package/pulseaudio/files/pulseaudio.init12
-rw-r--r--package/pulseaudio/files/pulseaudio.postinst2
-rw-r--r--package/pulseaudio/files/system.pa22
-rw-r--r--package/squeezelite/Makefile9
-rw-r--r--package/squeezelite/files/squeezelite.init26
-rw-r--r--package/squeezelite/files/squeezelite.postinst4
11 files changed, 88 insertions, 31 deletions
diff --git a/package/mxml/Makefile b/package/mxml/Makefile
index afba8d1c1..e79299700 100755
--- a/package/mxml/Makefile
+++ b/package/mxml/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 68977789ae64985dddbd1a1a1652642e
PKG_DESCR:= lightweight XML library
PKG_SECTION:= libs
-PKG_URL:= http://www.minixml.org/
-PKG_SITES:= http://ftp.easysw.com/pub/mxml/2.6/
+PKG_URL:= http://www.msweet.org/projects.php?Z3
+PKG_SITES:= http://www.msweet.org/files/project3/
PKG_LIBNAME:= libmxml
PKG_OPTS:= dev
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index bc54b608b..1dc2bc527 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= crypto
PKG_DEPENDS:= libusb libusb-compat libpthread
PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://pcsclite.alioth.debian.org/
-PKG_SITES:= http://alioth.debian.org/frs/download.php/file/3598/
+PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/perl/files/config.sh.arm.eglibc b/package/perl/files/config.sh.arm.eglibc
index 0aacd4d3d..d96ced6ea 100644
--- a/package/perl/files/config.sh.arm.eglibc
+++ b/package/perl/files/config.sh.arm.eglibc
@@ -788,12 +788,12 @@ lib_ext='.a'
libc=''
libperl='libperl.a'
libpth='%%LIBDIRS%%'
-libs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+libs='-ldl -lm -lcrypt -lutil -lc'
libsdirs='%%LIBDIRS%%'
-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
#libsfound=' /lib/libnsl.so /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so'
libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
libswanted_uselargefiles=''
line=''
lint=''
@@ -879,7 +879,7 @@ perl='perl'
perl_patchlevel=''
perl_static_inline='static __inline__'
perladmin='root@openadk.nonet'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-ldl -lm -lcrypt -lutil -lc'
perlpath='/usr/bin/perl'
pg='pg'
phostname='hostname'
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 578d382e2..f1cf961e1 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= pulseaudio
PKG_VERSION:= 4.0
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3
PKG_DESCR:= a sound system for POSIX OSes
PKG_SECTION:= multimedia
@@ -46,7 +46,8 @@ CONFIGURE_ARGS+= --disable-systemd \
--disable-hal-compat \
--enable-samplerate \
--enable-alsa \
- --with-speex
+ --with-speex \
+ --with-access-group=audio
pulseaudio-install:
$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse
@@ -64,5 +65,10 @@ pulseaudio-install:
$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
$(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \
$(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+ # pa uses $HOME from root user otherwise
+ mv $(IDIR_PULSEAUDIO)/usr/bin/pacmd $(IDIR_PULSEAUDIO)/usr/bin/pacmd.bin
+ echo "#!/bin/sh" > $(IDIR_PULSEAUDIO)/usr/bin/pacmd
+ echo 'PULSE_RUNTIME_PATH=/var/run/pulse pacmd.bin "$$@"' >> $(IDIR_PULSEAUDIO)/usr/bin/pacmd
+ chmod 755 $(IDIR_PULSEAUDIO)/usr/bin/pacmd
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf
index cfb58724d..760e5299f 100644
--- a/package/pulseaudio/files/daemon.conf
+++ b/package/pulseaudio/files/daemon.conf
@@ -1,4 +1,4 @@
-daemonize = yes
+daemonize = no
allow-module-loading = no
allow-exit = no
use-pid-file = yes
@@ -8,19 +8,15 @@ fail = yes
system-instance = yes
enable-shm = no
realtime-scheduling = yes
-realtime-priority = 5
+realtime-priority = 9
resample-method = src-sinc-fastest
exit-idle-time = -1
load-default-script-file = yes
default-script-file = /etc/pulse/system.pa
-log-target = syslog
-log-level = error
+log-target = stderr
+log-level = 1
log-time = yes
-; default-sample-format = s16le
-; default-sample-rate = 44100
-; alternate-sample-rate = 48000
-; default-sample-channels = 2
-; default-channel-map = front-left,front-right
-
-; default-fragments = 4
-; default-fragment-size-msec = 25
+default-sample-rate = 44100
+resample-method = src-sinc-fastest
+default-fragments = 10
+default-fragment-size-msec = 10
diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init
index f928e3fe6..584a42350 100644
--- a/package/pulseaudio/files/pulseaudio.init
+++ b/package/pulseaudio/files/pulseaudio.init
@@ -10,13 +10,17 @@ autostart)
exec sh $0 start
;;
start)
+ # check group membership
+ id pulse | grep audio >/dev/null 2>&1
+ if [ $? -ne 0 ];then
+ echo "pulse user must be in group audio."
+ exit 1
+ fi
if [ ! -d /var/run/pulse ]; then
mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse
fi
- if [ ! -d /var/lib/pulse ]; then
- mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse
- fi
- /usr/bin/pulseaudio $pulseaudio_flags
+ chown pulse /etc/pulse
+ env PULSE_STATE_PATH=/etc/pulse/state /usr/bin/pulseaudio $pulseaudio_flags
;;
stop)
kill $(pgrep -f /usr/bin/pulseaudio)
diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst
index 0ec666ee5..e1ef8dfd1 100644
--- a/package/pulseaudio/files/pulseaudio.postinst
+++ b/package/pulseaudio/files/pulseaudio.postinst
@@ -4,4 +4,4 @@ add_rcconf pulseaudio pulseaudio NO
gid=$(get_next_gid)
add_user pulse $(get_next_uid) $gid /var/run/pulse
add_group pulse $gid
-add_rcconf pulseaudio_flags pulseaudio_flags ""
+add_rcconf pulseaudio_flags pulseaudio_flags "-D --log-target=syslog"
diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa
index 035f4a6db..693db412b 100644
--- a/package/pulseaudio/files/system.pa
+++ b/package/pulseaudio/files/system.pa
@@ -22,6 +22,24 @@ load-module module-always-sink
### Enable positioned event sounds
load-module module-position-event-sounds
-load-module module-null-sink sink_name=rtp format=s16be channels=2
-load-module module-rtp-send source=rtp.monitor destination=224.0.0.56
+# pacmd communication
+load-module module-cli-protocol-unix socket=/var/run/pulse/cli
+
+# configure as a rtp sender
+#load-module module-null-sink sink_name=rtp format=s16be channels=2
+#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56
+
+# configure as a rtp receiver and sender
+#load-module module-null-sink sink_name=rtp format=s16be channels=2
+#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 loop=1
+#load-module module-alsa-sink device=hw:0,0 sink_name=alsa
+#load-module module-rtp-recv sap_address=224.0.0.56 sink=alsa
+
+# configure combine-sink (echo in the same room)
+#load-module module-alsa-sink device=hw:0,0 sink_name=alsa
+#load-module module-combine-sink slaves=rtp,alsa
+
+# configure as a rtp receiver
+load-module module-rtp-recv sap_address=224.0.0.56
+load-module module-alsa-sink device=hw:0,0
diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile
index ec06e3d04..f200cfee4 100644
--- a/package/squeezelite/Makefile
+++ b/package/squeezelite/Makefile
@@ -5,16 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= squeezelite
PKG_VERSION:= 1.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7605af4d64291495645f88575a564475
PKG_DESCR:= headless squeezebox emulator
PKG_SECTION:= multimedia
PKG_DEPENDS:= libflac alsa-lib libvorbis libmad
-PKG_DEPENDS+= libpthread librt
-PKG_BUILDDEP:= alsa-lib
+PKG_DEPENDS+= libpthread librt libfaad2
+PKG_BUILDDEP:= alsa-lib libmad flac libvorbis mpg123
+PKG_BUILDDEP+= faad2
PKG_URL:= http://code.google.com/p/squeezelite/
PKG_SITES:= http://openadk.org/distfiles/
+PKG_LIBC_DEPENDS:= eglibc glibc musl
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SQUEEZELITE,squeezelite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/squeezelite/files/squeezelite.init b/package/squeezelite/files/squeezelite.init
new file mode 100644
index 000000000..933b81ab5
--- /dev/null
+++ b/package/squeezelite/files/squeezelite.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+#PKG squeezelite
+#INIT 60
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${squeezelite:-NO}" = x"NO" && exit 0
+ exec sh $0 start
+ ;;
+start)
+ /usr/bin/squeezelite $squeezelite_flags
+ ;;
+stop)
+ kill $(pgrep -f /usr/bin/squeezelite)
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "usage: $0 {start | stop | restart}"
+ exit 1
+esac
+exit $?
diff --git a/package/squeezelite/files/squeezelite.postinst b/package/squeezelite/files/squeezelite.postinst
new file mode 100644
index 000000000..e5d9c91ee
--- /dev/null
+++ b/package/squeezelite/files/squeezelite.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf squeezelite squeezelite NO
+add_rcconf squeezelite_flags squeezelite_flags "-z -a 160:5:0:0 -s 10.0.0.1"