From e31358b57662bb44613874e6cb5d5569309910af Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 10:42:59 +0100 Subject: add minimal example configs --- package/pulseaudio/Makefile | 24 +++++++++---------- package/pulseaudio/files/client.conf | 2 ++ package/pulseaudio/files/daemon.conf | 26 +++++++++++++++++++++ package/pulseaudio/files/pulseaudio.postinst | 2 +- package/pulseaudio/files/system.pa | 27 ++++++++++++++++++++++ .../patches/patch-src_pulsecore_native-common_h | 11 +++++++++ 6 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 package/pulseaudio/files/client.conf create mode 100644 package/pulseaudio/files/daemon.conf create mode 100644 package/pulseaudio/files/system.pa create mode 100644 package/pulseaudio/patches/patch-src_pulsecore_native-common_h diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index eba650096..dbf4ca570 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -5,16 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pulseaudio PKG_VERSION:= 4.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 PKG_DESCR:= a sound system for POSIX OSes PKG_SECTION:= multimedia -PKG_DEPENDS:= libltdl json-c libsndfile libudev libspeex libncurses -PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile dbus +PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses +PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate -PKG_BUILDDEP:= libtool json-c libsndfile eudev speex libsndfile -PKG_BUILDDEP+= flac libvorbis libogg util-linux dbus ncurses alsa-lib -PKG_BUILDDEP+= libsamplerate +PKG_BUILDDEP:= libtool json-c libsndfile speex libsamplerate +PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ PKG_OPTS:= dev @@ -37,22 +36,21 @@ CONFIGURE_ARGS+= --disable-systemd \ --disable-openssl \ --disable-orc \ --disable-libwrap \ - --disable-oss \ + --disable-oss-wrapper \ + --disable-oss-output \ --disable-esound \ --disable-jack \ --disable-gconf \ + --disable-udev \ + --disable-dbus \ + --disable-hal-compat \ --enable-samplerate \ --enable-alsa \ - --enable-dbus \ - --enable-udev \ --with-speex pulseaudio-install: - $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/dbus-1 - $(CP) $(WRKINST)/etc/dbus-1/* \ - $(IDIR_PULSEAUDIO)/etc/dbus-1 $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse - $(CP) $(WRKINST)/etc/pulse/* \ + $(CP) ./files/*.{conf,pa} \ $(IDIR_PULSEAUDIO)/etc/pulse $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ diff --git a/package/pulseaudio/files/client.conf b/package/pulseaudio/files/client.conf new file mode 100644 index 000000000..8e4fa9f29 --- /dev/null +++ b/package/pulseaudio/files/client.conf @@ -0,0 +1,2 @@ +autospawn = no +cookie-file = /var/run/pulse/cookie diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf new file mode 100644 index 000000000..cfb58724d --- /dev/null +++ b/package/pulseaudio/files/daemon.conf @@ -0,0 +1,26 @@ +daemonize = yes +allow-module-loading = no +allow-exit = no +use-pid-file = yes +high-priority = yes +nice-level = -11 +fail = yes +system-instance = yes +enable-shm = no +realtime-scheduling = yes +realtime-priority = 5 +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-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 diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst index b339de93f..0ec666ee5 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 "-D --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false" +add_rcconf pulseaudio_flags pulseaudio_flags "" diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa new file mode 100644 index 000000000..035f4a6db --- /dev/null +++ b/package/pulseaudio/files/system.pa @@ -0,0 +1,27 @@ +#!/usr/bin/pulseaudio -nF + +load-module module-native-protocol-unix + +### Automatically restore the volume of streams and devices +load-module module-stream-restore +load-module module-device-restore + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +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 + diff --git a/package/pulseaudio/patches/patch-src_pulsecore_native-common_h b/package/pulseaudio/patches/patch-src_pulsecore_native-common_h new file mode 100644 index 000000000..9502a370e --- /dev/null +++ b/package/pulseaudio/patches/patch-src_pulsecore_native-common_h @@ -0,0 +1,11 @@ +--- pulseaudio-4.0.orig/src/pulsecore/native-common.h 2012-09-26 13:27:01.000000000 +0200 ++++ pulseaudio-4.0/src/pulsecore/native-common.h 2014-01-21 12:19:09.178012326 +0100 +@@ -180,7 +180,7 @@ enum { + }; + + #define PA_NATIVE_COOKIE_LENGTH 256 +-#define PA_NATIVE_COOKIE_FILE ".config/pulse/cookie" ++#define PA_NATIVE_COOKIE_FILE "cookie" + #define PA_NATIVE_COOKIE_FILE_FALLBACK ".pulse-cookie" + + #define PA_NATIVE_DEFAULT_PORT 4713 -- cgit v1.2.3 From 3ddc55dee12ba398dd691922766120da0950562a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 11:23:12 +0100 Subject: fix compile and dependencies --- package/libsamplerate/Makefile | 4 +++- package/mpd/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile index a8f8d04ce..5c73458d1 100644 --- a/package/libsamplerate/Makefile +++ b/package/libsamplerate/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libsamplerate PKG_VERSION:= 0.1.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1c7fb25191b4e6e3628d198a66a84f47 PKG_DESCR:= sample rate converter for audio PKG_SECTION:= libs @@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-sndfile + libsamplerate-install: $(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib $(CP) $(WRKINST)/usr/lib/libsamplerate*.so* \ diff --git a/package/mpd/Makefile b/package/mpd/Makefile index da3e2e334..589aa14b4 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia -PKG_DEPENDS:= glib libstdcxx libgcc libiconv -PKG_FDEPENDS:= glib libstdcxx libgcc libiconv -PKG_BUILDDEP:= glib +PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient +PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient +PKG_BUILDDEP:= glib libmpdclient PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_NEED_CXX:= 1 -- cgit v1.2.3 From 53d5800eb6fb9431f61c2e0941efcd1a20ce2b4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 12:13:26 +0100 Subject: higher timeout for slow proxies --- mk/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/vars.mk b/mk/vars.mk index e217a9dca..617316e29 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -218,7 +218,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=10 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe -- cgit v1.2.3 From 1de32ab616744add3f1748084610e7a5b3d654cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 15:23:44 +0100 Subject: fix dependencies --- package/libXt/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 32b4483d0..2e8664483 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -10,8 +10,9 @@ PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb -PKG_BUILDDEP:= autotool util-macros-host libXt-host -PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros +PKG_BUILDDEP:= autotool util-macros-host libICE-host libSM-host +PKG_BUILDDEP+= libXt-host +PKG_BUILDDEP+= libSM libX11 kbproto util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxt PKG_OPTS:= dev -- cgit v1.2.3 From 34d49891c4660e4285d9755e2e35b481b8b277b5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 17:14:27 +0100 Subject: fix more host dependencies --- package/libXtst/Makefile | 3 ++- package/openjdk7/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 75ec95913..70c7f3393 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -9,7 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b PKG_DESCR:= Xtst library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= recordproto-host recordproto libXi libXi-host libXtst-host +PKG_BUILDDEP:= recordproto-host libXi-host libXtst-host +PKG_BUILDDEP+= recordproto libXi PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst PKG_OPTS:= dev diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 292ae8553..584fda165 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host -PKG_BUILDDEP+= xineramaproto-host libXinerama-host libXtst-host freetype-host +PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host-compile libXi-host-compile libXtst-host freetype-host PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host PKG_BUILDDEP+= classpath-host jamvm-host ant-host openjdk7-host PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -- cgit v1.2.3 From 9569e02806499bf0ff1e47949f9f2877025e1e91 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 17:17:17 +0100 Subject: oops --- package/openjdk7/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 584fda165..60615faca 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host -PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host-compile libXi-host-compile libXtst-host freetype-host +PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host PKG_BUILDDEP+= classpath-host jamvm-host ant-host openjdk7-host PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -- cgit v1.2.3 From 03cc85f5bcf21b524a7bf198a48aedce1e1706ea Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 17:41:31 +0100 Subject: add squeezelite player --- package/squeezelite/Makefile | 30 ++++++++++++++++++++++++++++++ package/squeezelite/patches/patch-Makefile | 11 +++++++++++ 2 files changed, 41 insertions(+) create mode 100644 package/squeezelite/Makefile create mode 100644 package/squeezelite/patches/patch-Makefile diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile new file mode 100644 index 000000000..ec06e3d04 --- /dev/null +++ b/package/squeezelite/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= squeezelite +PKG_VERSION:= 1.5 +PKG_RELEASE:= 1 +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_URL:= http://code.google.com/p/squeezelite/ +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SQUEEZELITE,squeezelite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +squeezelite-install: + $(INSTALL_DIR) $(IDIR_SQUEEZELITE)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/squeezelite \ + $(IDIR_SQUEEZELITE)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squeezelite/patches/patch-Makefile b/package/squeezelite/patches/patch-Makefile new file mode 100644 index 000000000..388c8ab31 --- /dev/null +++ b/package/squeezelite/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- squeezelite-1.5.orig/Makefile 2014-01-24 11:24:16.000000000 +0100 ++++ squeezelite-1.5/Makefile 2014-01-24 17:37:36.841831508 +0100 +@@ -1,6 +1,7 @@ + # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... + CFLAGS ?= -Wall -fPIC -O2 $(OPTS) +-LDFLAGS ?= -lasound -lpthread -lm -lrt ++LDFLAGS ?= ++LDFLAGS += -lasound -lpthread -lm -lrt + EXECUTABLE ?= squeezelite + + # passing one or more of these in $(OPTS) enables optional feature inclusion -- cgit v1.2.3