From patchwork Wed Jul 9 08:08:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Svend Aage Vedstesen X-Patchwork-Id: 368124 X-Patchwork-Delegate: chbs@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 1279D140095 for ; Wed, 9 Jul 2014 18:09:16 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 242153FECF for ; Wed, 9 Jul 2014 10:09:14 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 561DE3F8B3 for ; Wed, 9 Jul 2014 10:09:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=3358; q=dns/txt; s=ironport1; t=1404893352; x=1436429352; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O5mjmpgAzqDkNrL/IWVB0XCt0hHggAXx8MAHEEtXbrs=; b=P79uxYnLGbo+PnWOAK4o9didOTRew98bfNKS2XsS7z7QVP0bcK+04T7T 3dBMPs3CpsxYCYfUe8mkwjM4LKJfHrjPP6yDZeZOLvDK0ATDPOQGzCwyW eL3HX4iEobrCSHyhb3PmMAKnOH6gLdWTO4Eb5b6l+lM18qVYs/H2zW3xK M=; X-IronPort-AV: E=Sophos;i="5.01,630,1400018400"; d="scan'208";a="4893604" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 09 Jul 2014 10:09:11 +0200 Received: from svav-VirtualBox.prevas.se (172.16.11.7) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 9 Jul 2014 10:09:11 +0200 From: Svend Aage Vedstesen To: Subject: [PATCH 02/15] qtbase: Fix xcb platform error (xrandr patch) Date: Wed, 9 Jul 2014 10:08:44 +0200 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.11.7] X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen --- .../qt-everywhere-opensource-5.1.1-randr.patch | 32 ++++++++++++++++++++++ recipes/qt5/qtbase_5.1.1.oe | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 recipes/qt5/qtbase-5.1.1/qt-everywhere-opensource-5.1.1-randr.patch diff --git a/recipes/qt5/qtbase-5.1.1/qt-everywhere-opensource-5.1.1-randr.patch b/recipes/qt5/qtbase-5.1.1/qt-everywhere-opensource-5.1.1-randr.patch new file mode 100644 index 0000000..e97a56c --- /dev/null +++ b/recipes/qt5/qtbase-5.1.1/qt-everywhere-opensource-5.1.1-randr.patch @@ -0,0 +1,32 @@ +--- qtbase-opensource-src-5.1.1/src/plugins/platforms/xcb/qxcbconnection.cpp.orig 2014-02-11 14:32:53.679463750 +0100 ++++ qtbase-opensource-src-5.1.1/src/plugins/platforms/xcb/qxcbconnection.cpp 2014-02-11 14:34:18.391462522 +0100 +@@ -142,23 +142,23 @@ + xcb_generic_error_t *error = NULL; + xcb_randr_get_output_primary_cookie_t primaryCookie = + xcb_randr_get_output_primary(xcb_connection(), xcbScreen->root); +- xcb_randr_get_screen_resources_current_cookie_t resourcesCookie = +- xcb_randr_get_screen_resources_current(xcb_connection(), xcbScreen->root); ++ xcb_randr_get_screen_resources_cookie_t resourcesCookie = ++ xcb_randr_get_screen_resources(xcb_connection(), xcbScreen->root); + xcb_randr_get_output_primary_reply_t *primary = + xcb_randr_get_output_primary_reply(xcb_connection(), primaryCookie, &error); + if (!primary || error) { + qWarning("QXcbConnection: Failed to get the primary output of the screen"); + free(error); + } else { +- xcb_randr_get_screen_resources_current_reply_t *resources = +- xcb_randr_get_screen_resources_current_reply(xcb_connection(), resourcesCookie, &error); ++ xcb_randr_get_screen_resources_reply_t *resources = ++ xcb_randr_get_screen_resources_reply(xcb_connection(), resourcesCookie, &error); + if (!resources || error) { + qWarning("QXcbConnection: Failed to get the screen resources"); + free(error); + } else { + xcb_timestamp_t timestamp = resources->config_timestamp; +- outputCount = xcb_randr_get_screen_resources_current_outputs_length(resources); +- xcb_randr_output_t *outputs = xcb_randr_get_screen_resources_current_outputs(resources); ++ outputCount = xcb_randr_get_screen_resources_outputs_length(resources); ++ xcb_randr_output_t *outputs = xcb_randr_get_screen_resources_outputs(resources); + + for (int i = 0; i < outputCount; i++) { + xcb_randr_get_output_info_reply_t *output = diff --git a/recipes/qt5/qtbase_5.1.1.oe b/recipes/qt5/qtbase_5.1.1.oe index 0f5acf7..26c1cfc 100644 --- a/recipes/qt5/qtbase_5.1.1.oe +++ b/recipes/qt5/qtbase_5.1.1.oe @@ -2,3 +2,5 @@ require qt5-${PV}.inc require ${PN}.inc SRC_URI += "file://qeglfshooks_imx5.cpp" + +SRC_URI += "file://qt-everywhere-opensource-5.1.1-randr.patch"