From patchwork Wed Oct 9 21:44:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 282079 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 237C42C00F8 for ; Thu, 10 Oct 2013 08:45:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CA5AD32BF5; Wed, 9 Oct 2013 21:45:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qia4pTMAUdRL; Wed, 9 Oct 2013 21:45:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A958232CC9; Wed, 9 Oct 2013 21:45:00 +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 752B71CE710 for ; Wed, 9 Oct 2013 21:44:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 723A28BBB2 for ; Wed, 9 Oct 2013 21:44:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R+PFjOpVTf5i for ; Wed, 9 Oct 2013 21:44:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7BC908B9DC for ; Wed, 9 Oct 2013 21:44:44 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id w61so1542336wes.38 for ; Wed, 09 Oct 2013 14:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=YhvsWopQSQPf/7m3rv5ryrmxd1BKFtAlQy6hd2BcoDM=; b=KDI9H8cTTRjLuHXsOATNRxJ87hxwY3vH+iuaZilL57NUn1VEIWGi0vN6oaks2lEvAE ROGTQi1rvvqwvtChAStPCuDA4/MmttgnNcXAwVum3HrW2IJLg5YAmUnBaskEkd3s1oZL sv8bIfyur/0oLk9NNQBNg/ezPubE2sN0IXW2ukamCG9dW+vaO4gMwUcqru3PCS8JDnof YsucSDiuM43aWwiNkSoVZ4KVklaP9RNVr9YNAcm0jpfTeXbC26bXyxRgUKR5GM65GN05 CowIxT3/6SfpIvGj1HArgsggGzCe8ylWRJx1i5aHOC62t21qohv827HAw2ygim887kq2 p5Lg== X-Received: by 10.180.185.101 with SMTP id fb5mr4618832wic.11.1381355083101; Wed, 09 Oct 2013 14:44:43 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id om10sm19214300wic.5.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Oct 2013 14:44:42 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Wed, 9 Oct 2013 23:44:23 +0200 Message-Id: X-Mailer: git-send-email 1.8.1.2 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , Peter Korsgaard , "Yann E. MORIN" Subject: [Buildroot] [PATCH 7/9] package/rpi-userland: add patch to remove faulty assert() 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" While porting wayland/weston to run on the RPi, I always tripped on this assert. Thinking there was an issue with weston, I poked the weston guys on IRC about the issue. 'daniels' on irc.freenode.net/#wayland suggested removing the assert altogether, as that's what they had pushed upstream in their wayland pull-request: https://github.com/raspberrypi/userland/pull/92 Turns out they forgot to include this in their pull-request, but that they were using a patched rpi-userland without that assert. And indeed, without that assert, weston runs on the RPi. :-) Signed-off-by: "Yann E. MORIN" --- The weston guys will probably push this upstream soon. If not, then I'll take the burden to do it. --- .../rpi-userland-002-remove-faulty-assert.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch diff --git a/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch new file mode 100644 index 0000000..c23c43a --- /dev/null +++ b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch @@ -0,0 +1,21 @@ +interface: remove faulty assert() to make weston happy at runtime + +This was removed after a discussion on IRC with the weston guys +('daniels' on irc.freenode.net/#wayland). + +Signed-off-by: "Yann E. MORIN" +--- +Upstream status: no, will be pushed by weston guys later. +If not, I'll do it. + +diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c +--- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-04 17:43:44.000000000 +0200 ++++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-08 22:28:51.611433539 +0200 +@@ -1187,7 +1187,6 @@ + continue; + + if(dispmanx_client.update_callback ) { +- vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]); + dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param); + } + }