From patchwork Thu Dec 12 03:11:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 300499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 2F02F2C012B for ; Thu, 12 Dec 2013 14:11:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8B9A293CE4; Thu, 12 Dec 2013 03:11:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HraIOV+Ao7tQ; Thu, 12 Dec 2013 03:11:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DD00A8AA26; Thu, 12 Dec 2013 03:11:51 +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 0B02B1CE878 for ; Thu, 12 Dec 2013 03:11:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0590A8C015 for ; Thu, 12 Dec 2013 03:11:50 +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 AV7roUuMbutD for ; Thu, 12 Dec 2013 03:11:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8CBA88BFF6 for ; Thu, 12 Dec 2013 03:11:49 +0000 (UTC) Received: by mail-pd0-f178.google.com with SMTP id y10so10764663pdj.9 for ; Wed, 11 Dec 2013 19:11:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; bh=liNOf9x+m/Jm8mJlPCvarY9Det9N2lWtqoiTqcF6KRI=; b=X9KR7T+C7BhVtficFz2FYRQtPoyzpmgUxU2Zu7C4hJmRJIfaQT9lth7bkZk4uETNXI kblGJYw/wv0U0HCTJITz6NZVTBHdem0SuXYN5gmp06cuSTjX3dgml8f0NnCwXg2pTTp/ Ifc+XI5Q+mWtOpwdBzPEC2O0W4PpTkUpQldqOQfN1OMupxU9+5gOVQ/t/1w3/ZXYAHLq 64Xsi68MrB0p0dpoJ8uQv4TYHnD6PQFvGsJa8KCFbsqHu7L53pwdLAvyTXLvBPfhM63c nadml/fXsGcSulJlscF+cd3RkTEMsZGDagY+HdDsebi4fFeY9vmquw/8tCeDgNGN3Xk2 EN2Q== X-Gm-Message-State: ALoCoQlVQXLJoq5Q7AphCPSDtNpnH0lrgucpY5vA4jFifgU5mwTRL+yGfP9LhdsBlBhtVblLtsww X-Received: by 10.68.195.70 with SMTP id ic6mr7407845pbc.112.1386817909332; Wed, 11 Dec 2013 19:11:49 -0800 (PST) Received: from [192.168.0.102] (218-164-103-173.dynamic.hinet.net. [218.164.103.173]) by mx.google.com with ESMTPSA id nw11sm46370807pab.13.2013.12.11.19.11.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Dec 2013 19:11:48 -0800 (PST) Message-ID: <1386817905.23825.2.camel@phoenix> From: Axel Lin To: Peter Korsgaard Date: Thu, 12 Dec 2013 11:11:45 +0800 In-Reply-To: <1386817822.23825.0.camel@phoenix> References: <1386817822.23825.0.camel@phoenix> X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Cc: buildroot@busybox.net Subject: [Buildroot] [RESEND][PATCH v2 2/2] spice: bump to version 0.12.4 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 According to the ChangeLog, spice needs glib2 since 0.12.2. Thus add libglib2 dependency to fix build error if !BR2_PACKAGE_LIBGLIB2. Also add a patch to fix trivial build error. Signed-off-by: Axel Lin --- v2: Address Baruch's comment to copy libglib2 dependencies here. Also add a patch to fix build error when BR2_PACKAGE_SPICE_TUNNEL is enabled. The patch is already merged upstream. This is a resend, it was post on http://lists.busybox.net/pipermail/buildroot/2013-October/080806.html package/spice/Config.in | 6 +++++ ...0001-fix-missing-monitor_latency-argument.patch | 28 ++++++++++++++++++++++ package/spice/spice.mk | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 package/spice/spice-0001-fix-missing-monitor_latency-argument.patch diff --git a/package/spice/Config.in b/package/spice/Config.in index e9fd639..a0c321c 100644 --- a/package/spice/Config.in +++ b/package/spice/Config.in @@ -1,3 +1,6 @@ +comment "spice server needs a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + comment "spice server depends on python (for pyparsing)" depends on BR2_i386 || BR2_x86_64 depends on !BR2_PACKAGE_PYTHON @@ -6,9 +9,12 @@ config BR2_PACKAGE_SPICE bool "spice server" depends on BR2_i386 || BR2_x86_64 depends on BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_CELT051 select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_PYTHON_PYPARSING diff --git a/package/spice/spice-0001-fix-missing-monitor_latency-argument.patch b/package/spice/spice-0001-fix-missing-monitor_latency-argument.patch new file mode 100644 index 0000000..e14dd2c --- /dev/null +++ b/package/spice/spice-0001-fix-missing-monitor_latency-argument.patch @@ -0,0 +1,28 @@ +From 0d3767853ca179ce04a9b312d7a30d33d1266a3b Mon Sep 17 00:00:00 2001 +From: Axel Lin +Date: Thu, 10 Oct 2013 12:36:40 +0800 +Subject: [PATCH] red_tunnel_worker: Fix build error due to missing monitor_latency argument + +Fix missing monitor_latency argument in red_channel_client_create call. + +Signed-off-by: Axel Lin +--- + server/red_tunnel_worker.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c +index 97dcafd..6781d73 100644 +--- a/server/red_tunnel_worker.c ++++ b/server/red_tunnel_worker.c +@@ -3417,7 +3417,7 @@ static void handle_tunnel_channel_link(RedChannel *channel, RedClient *client, + } + + tcc = (TunnelChannelClient*)red_channel_client_create(sizeof(TunnelChannelClient), +- channel, client, stream, ++ channel, client, stream, FALSE, + 0, NULL, 0, NULL); + if (!tcc) { + return; +-- +1.8.1.2 + diff --git a/package/spice/spice.mk b/package/spice/spice.mk index a016da6..c23b67e 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.12.0 +SPICE_VERSION = 0.12.4 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/ SPICE_LICENSE = LGPLv2.1+