diff options
| author | Jeremy Rosen <jeremy.rosen@openwide.fr> | 2013-06-10 09:56:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-10 14:34:50 +0200 |
| commit | a9bd6a4e8cd0152abd65aca0e1c46d917cf0fde7 (patch) | |
| tree | 0360127f77becdef9fda549b3ecf01ab7f740dc1 | |
| parent | 0df82bc193b40b70194fb7a10b34797eab8b942a (diff) | |
| download | buildroot-novena-a9bd6a4e8cd0152abd65aca0e1c46d917cf0fde7.tar.gz buildroot-novena-a9bd6a4e8cd0152abd65aca0e1c46d917cf0fde7.zip | |
pulseaudio : bump to version 4.0
removes a patch that was integrated upstream
Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch | 26 | ||||
| -rw-r--r-- | package/multimedia/pulseaudio/pulseaudio.mk | 15 |
2 files changed, 3 insertions, 38 deletions
diff --git a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch deleted file mode 100644 index 86efdfdb3..000000000 --- a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001 -From: Arun Raghavan <arun.raghavan@collabora.co.uk> -Date: Sat, 27 Apr 2013 03:27:05 +0000 -Subject: build-sys: json-c changed everything :( - -json-c 0.11 ships a pkg-config file with a different name, and changes -the name of its library as well. ---- -(limited to 'configure.ac') - -diff --git a/configure.ac b/configure.ac -index c8161a4..b1bd21a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1]) - - #### json parsing #### - --PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ]) -+PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [], -+ [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])]) - AC_SUBST(LIBJSON_CFLAGS) - AC_SUBST(LIBJSON_LIBS) - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index c789fc8bb..b90017420 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -4,9 +4,11 @@ # ################################################################################ -PULSEAUDIO_VERSION = 3.0 +PULSEAUDIO_VERSION = 4.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES +PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file) +PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL PULSEAUDIO_CONF_OPT = \ --localstatedir=/var \ --disable-default-build-tests \ @@ -21,7 +23,6 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ - $(if $(BR2_PACKAGE_LIBGTK2),libgtk2) \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_DBUS),dbus) \ $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \ @@ -31,11 +32,6 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) -# One patch touches configure.ac. We unconditionnally need libglib2 -# because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal -# dependency can be removed once the patch is removed. -PULSEAUDIO_AUTORECONF = YES -PULSEAUDIO_DEPENDENCIES += libglib2 ifeq ($(BR2_PACKAGE_ORC),y) PULSEAUDIO_DEPENDENCIES += orc @@ -66,11 +62,6 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) PULSEAUDIO_CONF_OPT += --disable-alsa endif -# gtk support needs x backend -ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG),yy) -PULSEAUDIO_CONF_OPT += --disable-gtk2 -endif - ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy) PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst |