From patchwork Thu Jun 6 12:28:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeremy Rosen X-Patchwork-Id: 249399 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 D1EF72C00A0 for ; Thu, 6 Jun 2013 22:33:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 923F9317A2; Thu, 6 Jun 2013 12:32:58 +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 aGPIN2uuxEp8; Thu, 6 Jun 2013 12:32:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D2B6331779; Thu, 6 Jun 2013 12:32:55 +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 AEFFA8F753 for ; Thu, 6 Jun 2013 12:33:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 894C78CEC8 for ; Thu, 6 Jun 2013 12:32:54 +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 wOIQ44YtBhr4 for ; Thu, 6 Jun 2013 12:32:49 +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 B5AA68CA2A for ; Thu, 6 Jun 2013 12:32:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra3.corp.accelance.fr (Postfix) with ESMTP id 497E064C75 for ; Thu, 6 Jun 2013 14:32:47 +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 YrGy2+41axdG; Thu, 6 Jun 2013 14:32:45 +0200 (CEST) Received: from pcrosen.daviel.openwide.fr. (unknown [193.56.60.161]) by zimbra3.corp.accelance.fr (Postfix) with ESMTPSA id 7396064BD8; Thu, 6 Jun 2013 14:32:45 +0200 (CEST) From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= To: buildroot@busybox.net Date: Thu, 6 Jun 2013 14:28:46 +0200 Message-Id: <1370521726-17125-1-git-send-email-jeremy.rosen@openwide.fr> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] 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 --- .../pulseaudio-compat-with-json-c-0.11.patch | 26 -------------------- package/multimedia/pulseaudio/pulseaudio.mk | 2 +- 2 files changed, 1 insertion(+), 27 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 529f5dd..8c1773b 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -3,7 +3,7 @@ # pulseaudio # ################################################################################ -PULSEAUDIO_VERSION = 3.0 +PULSEAUDIO_VERSION = 4.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_CONF_OPT = \