Browse Source

add samplerate support for mpd

Waldemar Brodkorb 11 years ago
parent
commit
11261da1d9
3 changed files with 40 additions and 2 deletions
  1. 24 0
      package/libsamplerate/Makefile
  2. 15 2
      package/mpd/Makefile
  3. 1 0
      target/packages/pkg-available/mpdbox

+ 24 - 0
package/libsamplerate/Makefile

@@ -0,0 +1,24 @@
+# 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:=		libsamplerate
+PKG_VERSION:=		0.1.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c7fb25191b4e6e3628d198a66a84f47
+PKG_DESCR:=		sample rate converter for audio
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.mega-nerd.com/SRC/
+PKG_SITES:=		http://www.mega-nerd.com/SRC/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libsamplerate-install:
+	$(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsamplerate*.so* \
+		$(IDIR_LIBSAMPLERATE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

+ 15 - 2
package/mpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.17.4
-PKG_RELEASE:=		7
+PKG_RELEASE:=		8
 PKG_MD5SUM:=		ab408a61f49f215ce77ed0cf1deed6e1
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
@@ -19,7 +19,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
 PKG_FLAVOURS_MPD+=	WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
-PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL
+PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL WITH_SAMPLERATE
 
 PKGFD_WITH_ALSA:=	enable ALSA output
 PKGFS_WITH_ALSA:=	alsa-lib
@@ -94,6 +94,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_CURL),y)
 PKG_FDEPENDS+=		libcurl
 endif
 
+PKGFD_WITH_SAMPLERATE:=	enable samplerate support
+PKGFS_WITH_SAMPLERATE:=	libsamplerate
+PKGFB_WITH_SAMPLERATE:=	libsamplerate
+ifeq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),y)
+PKG_FDEPENDS+=		libsamplerate
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -190,6 +197,12 @@ else
 CONFIGURE_ARGS+=	--disable-ffmpeg
 endif
 
+ifneq (${ADK_PACKAGE_MPD_WITH_SAMPLERATE},)
+CONFIGURE_ARGS+=	--enable-lsr
+else
+CONFIGURE_ARGS+=	--disable-lsr
+endif
+
 post-install:
 	${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin

+ 1 - 0
target/packages/pkg-available/mpdbox

@@ -15,6 +15,7 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_FFMPEG
 	select ADK_PACKAGE_MPD_WITH_SHOUT
 	select ADK_PACKAGE_MPD_WITH_CURL
+	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
 	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_FFMPEG
 	select ADK_PACKAGE_FFPROBE