diff options
| author | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/multimedia | |
| parent | Kickoff 2012.08 cycle (diff) | |
| parent | nfs-utils: bump to version 1.2.6 (diff) | |
| download | buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.xz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/mpg123/mpg123.mk | 4 | ||||
| -rw-r--r-- | package/multimedia/pulseaudio/pulseaudio.mk | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 65523f32b..793812f8f 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -4,9 +4,9 @@ # ############################################################# -MPG123_VERSION = 1.13.8 +MPG123_VERSION = 1.14.2 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 -MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123 +MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias MPG123_INSTALL_STAGING = YES diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index eefc497f7..175adfa4c 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -4,14 +4,15 @@ # ################################################################################ -PULSEAUDIO_VERSION = 1.1 +PULSEAUDIO_VERSION = 2.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_CONF_OPT = \ --localstatedir=/var \ --disable-default-build-tests \ --disable-legacy-runtime-dir \ - --disable-legacy-database-entry-format + --disable-legacy-database-entry-format \ + $(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages) PULSEAUDIO_DEPENDENCIES = \ host-pkg-config libtool json-c libsndfile speex host-intltool \ @@ -27,7 +28,9 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_UDEV),udev) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW),fftw) \ - $(if $(BR2_PACKAGE_ORC),orc) + $(if $(BR2_PACKAGE_ORC),orc) \ + $(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \ + $(if $(BR2_PACKAGE_SYSTEMD),systemd) # pulseaudio alsa backend needs pcm/mixer apis ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) |