From 2c1a1bb1cd9fd2bd46f2d32f98a8ffc6b536b983 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 May 2013 07:14:25 +0000 Subject: pulseaudio: link against json-c Add an upstream patch that makes Pulseaudio link against json-c instead of json, so that it works with json-c 0.11, and doesn't cause problems with libjson has been also installed in the system. Note that this fix has been merged in Pulseaudio after the 3.0 release, so we will have to keep this patch around when bumping to 3.0. Fixes http://autobuild.buildroot.org/results/91ffd3196092c48b88f59adb12741b3f93064dea/build-end.log Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../pulseaudio-compat-with-json-c-0.11.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch (limited to 'package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch') 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 new file mode 100644 index 000000000..86efdfdb3 --- /dev/null +++ b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch @@ -0,0 +1,26 @@ +From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +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 -- cgit v1.2.3