Browse Source

update and fix musl compile

Waldemar Brodkorb 11 years ago
parent
commit
6d0e8b6533
2 changed files with 4 additions and 20 deletions
  1. 4 4
      package/mpd/Makefile
  2. 0 16
      package/mpd/patches/patch-src_output_alsa_plugin_c

+ 4 - 4
package/mpd/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
-PKG_VERSION:=		0.17.4
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		ab408a61f49f215ce77ed0cf1deed6e1
+PKG_VERSION:=		0.17.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b68be330deeb23989c08a9fefd9fcdeb
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		glib libstdcxx
@@ -105,8 +105,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 TARGET_CFLAGS+=		-std=gnu99
-XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-httpd-output \
 			--disable-jack \

+ 0 - 16
package/mpd/patches/patch-src_output_alsa_plugin_c

@@ -1,16 +0,0 @@
-* will be better solved in mpd 1.16.4
-
---- mpd-0.16.2.orig/src/output/alsa_plugin.c	2011-03-19 01:41:53.000000000 +0100
-+++ mpd-0.16.2/src/output/alsa_plugin.c	2011-05-14 13:44:14.000000000 +0200
-@@ -646,8 +646,9 @@ alsa_play(void *data, const void *chunk,
- 	while (true) {
- 		snd_pcm_sframes_t ret = ad->writei(ad->pcm, chunk, size);
- 		if (ret > 0) {
--			ad->period_position = (ad->period_position + ret)
--				% ad->period_frames;
-+			// SIGFPE!
-+			//ad->period_position = (ad->period_position + ret)
-+			//	% ad->period_frames;
- 			return ret * ad->frame_size;
- 		}
-