[Buildroot] [PATCH v2] pulseaudio : bump to version 4.0
Peter Korsgaard
jacmet at uclibc.org
Mon Jun 10 12:35:17 UTC 2013
>>>>> "Jérémy" == Jérémy Rosen <jeremy.rosen at openwide.fr> writes:
Jérémy> removes a patch that was integrated upstream
Jérémy> Signed-off-by: Jérémy Rosen <jeremy.rosen at openwide.fr>
Jérémy> --
Jérémy> v2 : add license information
Jérémy> remove dependency on gtk2 since upstream only supports gtk3
Jérémy> ---
Jérémy> .../pulseaudio-compat-with-json-c-0.11.patch | 26 --------------------
Jérémy> package/multimedia/pulseaudio/pulseaudio.mk | 15 +++--------
Jérémy> 2 files changed, 3 insertions(+), 38 deletions(-)
Jérémy> delete mode 100644 package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
Jérémy> 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
Jérémy> deleted file mode 100644
Jérémy> index 86efdfd..0000000
Jérémy> --- a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
Jérémy> +++ /dev/null
Jérémy> @@ -1,26 +0,0 @@
Jérémy> -From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001
Jérémy> -From: Arun Raghavan <arun.raghavan at collabora.co.uk>
Jérémy> -Date: Sat, 27 Apr 2013 03:27:05 +0000
Jérémy> -Subject: build-sys: json-c changed everything :(
Jérémy> -
Jérémy> -json-c 0.11 ships a pkg-config file with a different name, and changes
Jérémy> -the name of its library as well.
Jérémy> ----
Jérémy> -(limited to 'configure.ac')
Jérémy> -
Jérémy> -diff --git a/configure.ac b/configure.ac
Jérémy> -index c8161a4..b1bd21a 100644
Jérémy> ---- a/configure.ac
Jérémy> -+++ b/configure.ac
Jérémy> -@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
Jérémy> -
Jérémy> - #### json parsing ####
Jérémy> -
Jérémy> --PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])
Jérémy> -+PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
Jérémy> -+ [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])])
Jérémy> - AC_SUBST(LIBJSON_CFLAGS)
Jérémy> - AC_SUBST(LIBJSON_LIBS)
Jérémy> -
Jérémy> ---
Jérémy> -cgit v0.9.0.2-2-gbebe
Jérémy> diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
Jérémy> index c789fc8..24a4ef4 100644
Jérémy> --- a/package/multimedia/pulseaudio/pulseaudio.mk
Jérémy> +++ b/package/multimedia/pulseaudio/pulseaudio.mk
Jérémy> @@ -4,9 +4,11 @@
Jérémy> #
Jérémy> ################################################################################
Jérémy> -PULSEAUDIO_VERSION = 3.0
Jérémy> +PULSEAUDIO_VERSION = 4.0
Jérémy> PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
Jérémy> PULSEAUDIO_INSTALL_STAGING = YES
Jérémy> +PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
Jérémy> +PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
You have a trailing space here. Committed with that fixed, thanks.
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list