diff options
| -rw-r--r-- | package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch | 26 | ||||
| -rw-r--r-- | package/multimedia/pulseaudio/pulseaudio.mk | 6 |
2 files changed, 32 insertions, 0 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 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 <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 16df85555..aa67592d2 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -32,6 +32,12 @@ 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 + ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # The optional webrtc echo canceller is written in C++, causing auto* to want # to link module-echo-cancel.so with CXX even if webrtc ISN'T used. |