Browse Source

Update MPD to 0.17.6, refresh patches, add myself as pkg maintainer, pkg update copyright

Add some new options and fix BUILD_NLS (full language support) failures

Signed-off-by: Ted Hess <thess@kitschensync.net>
lilik-openwrt-22.03
thess 11 years ago
committed by Ted Hess
parent
commit
13aa784f69
4 changed files with 62 additions and 24 deletions
  1. +17
    -19
      sound/mpd/Makefile
  2. +5
    -5
      sound/mpd/patches/100-compile-fixes.patch
  3. +16
    -0
      sound/mpd/patches/200-allow-float-samples-ffmpeg.patch
  4. +24
    -0
      sound/mpd/patches/210-support_raw_pcm_streams.patch

+ 17
- 19
sound/mpd/Makefile View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2011 OpenWrt.org
# Copyright (C) 2007-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.16.8
PKG_RELEASE:=2
PKG_VERSION:=0.17.6
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.16/
PKG_MD5SUM:=b412a9d0b3457bea1bb87904a8f80c04
PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.17/
PKG_MD5SUM:=0a42ed81ff298c12e22c16be31097e4c
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -31,8 +32,8 @@ define Package/mpd/Default
CATEGORY:=Sound CATEGORY:=Sound
TITLE:=Music Player Daemon TITLE:=Music Player Daemon
URL:=http://www.musicpd.org/ URL:=http://www.musicpd.org/
DEPENDS:= +glib2 +libcurl +libpthread \
+libflac +BUILD_PATENTED:libmad +libvorbisidec
DEPENDS:= +glib2 +libcurl +libpthread $(ICONV_DEPENDS) \
+libflac +BUILD_PATENTED:libmad +libvorbisidec
endef endef
define Package/mpd/Default/description define Package/mpd/Default/description
@ -42,14 +43,13 @@ define Package/mpd/Default/description
gmpc (gnome), phpmp (php), etc... gmpc (gnome), phpmp (php), etc...
endef endef
define Package/mpd-full define Package/mpd-full
$(call Package/mpd/Default) $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= \ DEPENDS+= \
+AUDIO_SUPPORT:alsa-lib \ +AUDIO_SUPPORT:alsa-lib \
+libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \ +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \
+libmms +libogg +libshout +libsndfile +libvorbis
+libmms +libogg +libsndfile +libvorbis
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@ -65,7 +65,6 @@ define Package/mpd-full/conffiles
/etc/mpd.conf /etc/mpd.conf
endef endef
define Package/mpd-mini define Package/mpd-mini
$(call Package/mpd/Default) $(call Package/mpd/Default)
TITLE+= (mini) TITLE+= (mini)
@ -84,7 +83,6 @@ define Package/mpd-mini/conffiles
/etc/mpd.conf /etc/mpd.conf
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
$(call autoconf_bool,CONFIG_IPV6,ipv6) \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
--disable-debug \ --disable-debug \
@ -95,11 +93,11 @@ CONFIGURE_ARGS += \
\ \
--disable-ao \ --disable-ao \
--disable-bzip2 \ --disable-bzip2 \
--disable-cue \
--enable-cue \
--disable-ffado \ --disable-ffado \
--disable-fluidsynth \ --disable-fluidsynth \
--disable-gme \ --disable-gme \
--disable-inotify \
--enable-inotify \
--disable-iso9660 \ --disable-iso9660 \
--disable-jack \ --disable-jack \
--disable-lame-encoder \ --disable-lame-encoder \
@ -116,11 +114,11 @@ CONFIGURE_ARGS += \
--disable-solaris-output \ --disable-solaris-output \
--disable-sqlite \ --disable-sqlite \
--disable-twolame-encoder \ --disable-twolame-encoder \
--disable-wave-encoder \
--enable-wave-encoder \
--disable-wavpack \ --disable-wavpack \
--disable-wildmidi \ --disable-wildmidi \
--disable-zzip \ --disable-zzip \
--with-zeroconf=no \
--with-zeroconf=auto \
\ \
--enable-curl \ --enable-curl \
--enable-flac \ --enable-flac \
@ -137,7 +135,7 @@ CONFIGURE_VARS += \
$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
TARGET_CFLAGS += -std=gnu99 TARGET_CFLAGS += -std=gnu99
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
# use gcc instead of g++ to avoid unnecessary linking against libstdc++ # use gcc instead of g++ to avoid unnecessary linking against libstdc++
TARGET_CXX:=$(TARGET_CC) TARGET_CXX:=$(TARGET_CC)
@ -156,12 +154,12 @@ ifeq ($(BUILD_VARIANT),full)
--enable-oggflac \ --enable-oggflac \
--enable-pipe-output \ --enable-pipe-output \
--enable-recorder-output \ --enable-recorder-output \
--enable-shout \
--disable-shout \
--enable-sndfile \ --enable-sndfile \
--enable-vorbis \ --enable-vorbis \
--enable-vorbis-encoder \
--disable-vorbis-encoder \
--with-faad="$(STAGING_DIR)/usr" \ --with-faad="$(STAGING_DIR)/usr" \
--with-tremor=no \
--with-tremor=yes \
endif endif


+ 5
- 5
sound/mpd/patches/100-compile-fixes.patch View File

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -8803,6 +8803,7 @@ fi
@@ -9821,6 +9821,7 @@ fi
# Check whether --with-faad was given. # Check whether --with-faad was given.
if test "${with_faad+set}" = set; then : if test "${with_faad+set}" = set; then :
withval=$with_faad; withval=$with_faad;
@ -10,8 +10,8 @@
fi fi
--- a/src/input/file_input_plugin.c --- a/src/input/file_input_plugin.c
+++ b/src/input/file_input_plugin.c +++ b/src/input/file_input_plugin.c
@@ -79,10 +79,6 @@ input_file_open(const char *filename, GE
return false;
@@ -82,10 +82,6 @@ input_file_open(const char *filename,
return NULL;
} }
-#ifdef POSIX_FADV_SEQUENTIAL -#ifdef POSIX_FADV_SEQUENTIAL
@ -19,5 +19,5 @@
-#endif -#endif
- -
fis = g_new(struct file_input_stream, 1); fis = g_new(struct file_input_stream, 1);
input_stream_init(&fis->base, &input_plugin_file, filename);
input_stream_init(&fis->base, &input_plugin_file, filename,
mutex, cond);

+ 16
- 0
sound/mpd/patches/200-allow-float-samples-ffmpeg.patch View File

@ -0,0 +1,16 @@
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -370,6 +370,13 @@
#endif
return SAMPLE_FORMAT_S32;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
+ case AV_SAMPLE_FMT_FLT:
+#else
+ case SAMPLE_FMT_FLOAT:
+#endif
+ return SAMPLE_FORMAT_FLOAT;
+
default:
g_warning("Unsupported libavcodec SampleFormat value: %d",
codec_context->sample_fmt);

+ 24
- 0
sound/mpd/patches/210-support_raw_pcm_streams.patch View File

@ -0,0 +1,24 @@
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -387,6 +387,13 @@ ffmpeg_probe(struct decoder *decoder, st
unsigned char *buffer = g_malloc(BUFFER_SIZE);
size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE);
+
+ if ((nbytes > 0) && (nbytes < 1024))
+ {
+ // Gobble some more data if header is small
+ nbytes += decoder_read(decoder, is, buffer + nbytes, BUFFER_SIZE - nbytes);
+ }
+
if (nbytes <= PADDING ||
!input_stream_lock_seek(is, 0, SEEK_SET, NULL)) {
g_free(buffer);
@@ -683,6 +690,7 @@ static const char *const ffmpeg_mime_typ
"audio/qcelp",
"audio/vorbis",
"audio/vorbis+ogg",
+ "audio/wav",
"audio/x-8svx",
"audio/x-16sv",
"audio/x-aac",

Loading…
Cancel
Save