Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 16 insertions, 19 deletions

diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 602444248..63ce6faf5 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.22
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f7180316188552ee1e6759a03f1fe98d
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		utils
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index f18dbf62a..bd4ff3be2 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf amixer
-
+add_rcconf amixer_volume amixer_volume "75%"
+add_rcconf amixer_mixer amixer_mixer "Master"
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index d7f388892..7f5f37177 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -10,14 +10,11 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	amixer set Master on
-	amixer set PCM on
-	amixer set Master 75%
-	amixer set PCM 75%
+	amixer set $amixer_mixer on
+	amixer set $amixer_mixer $amixer_volume
 	;;
 stop)
-	amixer set Master off
-	amixer set PCM off
+	amixer set $amixer_mixer off
 	;;
 restart)
 	sh $0 stop
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 3920f2ebc..e28d38008 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -25,7 +25,7 @@ PKG_BUILDDEP+=		faad2
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
 PKG_DEPENDS+=		libvorbis libogg
-PKG_BUILDDEP+=		libvorbis
+PKG_BUILDDEP+=		libvorbis libogg
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
 PKG_DEPENDS+=		libvorbisidec
diff --git a/package/php/Makefile b/package/php/Makefile
index 34281b4ac..be047a14a 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -48,6 +48,7 @@ PKG_DESCR_FCGI:=	PHP for FastCGI usage
 
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FCGI},${PKG_SECTION}))
 
@@ -189,8 +190,8 @@ CONFIGURE_ENV+=		LIBS="-ldl"
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
 
 do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
-	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc/
+	${INSTALL_DIR} $(IDIR_PHP)/etc
+	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc/
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
diff --git a/package/php/files/php.ini b/package/php/files/php.ini
index ae16d0b61..e6fb3c5fa 100644
--- a/package/php/files/php.ini
+++ b/package/php/files/php.ini
@@ -200,11 +200,6 @@ variables_order = "EGPCS"
 ; to possible security problems, if the code is not very well thought of.
 register_globals = Off
 
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = On
-
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
@@ -216,9 +211,6 @@ post_max_size = 8M
 ; Magic quotes
 ;
 
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
-
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off
 
diff --git a/target/foxg20/files/etc/mdev.conf b/target/foxg20/files/etc/mdev.conf
index 178ba51e8..f7902c89f 100644
--- a/target/foxg20/files/etc/mdev.conf
+++ b/target/foxg20/files/etc/mdev.conf
@@ -7,4 +7,10 @@ tty 0:0 666
 ttyS* 0:0 640
 device-mapper 0:0 660 @mkdir /dev/mapper
 tun 0:0 660 >net/tun
+audio root:audio 660 >snd/audio
+dsp root:audio 660 >snd/dsp
+timer root:audio 660 >snd/timer
+controlC0 root:audio 660 >snd/controlC0
+pcmC0D0c root:audio 660 >snd/pcmC0D0c
+pcmC0D0p root:audio 660 >snd/pcmC0D0p
 .* 0:0 644 @/lib/mdev/init