diff options
| author |   Arun Raghavan <ford_prefect@gentoo.org> | 2013-04-27 03:56:05 +0000 |
|---|---|---|
| committer | Arun Raghavan <ford_prefect@gentoo.org> | 2013-04-27 03:56:05 +0000 |
| commit | 77c747661e616568192278199ebcea25d8f095ff (patch) | |
| tree | 30630f9b1567c7de5dad67bf1ffd5b0600dec407 /media-sound/pulseaudio/files | |
| parent | Beta channel bump. (diff) | |
| download | gentoo-2-77c747661e616568192278199ebcea25d8f095ff.tar.gz gentoo-2-77c747661e616568192278199ebcea25d8f095ff.tar.bz2 gentoo-2-77c747661e616568192278199ebcea25d8f095ff.zip | |
Fix compilation with json-c 0.11 (bug #467280).
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 29C3E2EC)
Diffstat (limited to 'media-sound/pulseaudio/files')
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch b/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch new file mode 100644 index 000000000000..e0b027b20df5 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch @@ -0,0 +1,28 @@ +From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan <arun.raghavan@collabora.co.uk> +Date: Sat, 27 Apr 2013 08:57:05 +0530 +Subject: [PATCH] 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. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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) + +-- +1.8.1.2 + |