From patchwork Mon Jun 10 07:56:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeremy Rosen X-Patchwork-Id: 250187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B43802C00A4 for ; Mon, 10 Jun 2013 18:00:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A0E0E316A5; Mon, 10 Jun 2013 08:00:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SEtTNMJC+pu0; Mon, 10 Jun 2013 08:00:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9DB4720155; Mon, 10 Jun 2013 08:00:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3A6888F7B5 for ; Mon, 10 Jun 2013 08:00:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1EA7B8C70A for ; Mon, 10 Jun 2013 08:00:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ocJEVHPcK4QY for ; Mon, 10 Jun 2013 08:00:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from zimbra3.corp.accelance.fr (zimbra3.corp.accelance.fr [213.162.49.233]) by whitealder.osuosl.org (Postfix) with ESMTP id 46A2F8CA7E for ; Mon, 10 Jun 2013 08:00:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra3.corp.accelance.fr (Postfix) with ESMTP id 0DFEA64DB0 for ; Mon, 10 Jun 2013 10:00:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra3.corp.accelance.fr Received: from zimbra3.corp.accelance.fr ([127.0.0.1]) by localhost (zimbra3.corp.accelance.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oHSArDBezJzc; Mon, 10 Jun 2013 10:00:27 +0200 (CEST) Received: from pcrosen.daviel.openwide.fr. (unknown [193.56.60.161]) by zimbra3.corp.accelance.fr (Postfix) with ESMTPSA id 57D8D64872; Mon, 10 Jun 2013 10:00:27 +0200 (CEST) From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= To: buildroot@busybox.net Date: Mon, 10 Jun 2013 09:56:14 +0200 Message-Id: <1370850974-7849-1-git-send-email-jeremy.rosen@openwide.fr> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] pulseaudio : bump to version 4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net removes a patch that was integrated upstream Signed-off-by: Jérémy Rosen --- v2 : add license information remove dependency on gtk2 since upstream only supports gtk3 --- .../pulseaudio-compat-with-json-c-0.11.patch | 26 -------------------- package/multimedia/pulseaudio/pulseaudio.mk | 15 +++-------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 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 deleted file mode 100644 index 86efdfd..0000000 --- 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 -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 c789fc8..24a4ef4 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