From patchwork Tue Mar 19 19:29:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 229201 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 6C24E2C0097 for ; Wed, 20 Mar 2013 06:32:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EB77AA0249; Tue, 19 Mar 2013 19:32:16 +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 cs7E3+1ccpxz; Tue, 19 Mar 2013 19:32:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B48A1A025F; Tue, 19 Mar 2013 19:31:42 +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 2960E8F74B for ; Tue, 19 Mar 2013 19:30:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BFF018CFA6 for ; Tue, 19 Mar 2013 19:30:44 +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 QvxgFHBjCEZL for ; Tue, 19 Mar 2013 19:30:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by whitealder.osuosl.org (Postfix) with ESMTP id 69DFE8D003 for ; Tue, 19 Mar 2013 19:30:33 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 4DB03224E; Tue, 19 Mar 2013 20:30:31 +0100 (CET) Received: from localhost (unknown [37.160.38.137]) by mail.free-electrons.com (Postfix) with ESMTPSA id 27F18828; Tue, 19 Mar 2013 20:30:29 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 19 Mar 2013 20:29:40 +0100 Message-Id: <1363721394-14973-8-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363721394-14973-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1363721394-14973-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH v4 07/21] qt5base: add rPi EGL glue code 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: Floris Bos When the rpi-userland package is selected, assume we are targetting the Raspberry Pi, and add the right platform glue code when building the Qt5 EGLFS plugin. Signed-off-by: Floris Bos Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base-mkspecs-files.patch | 5 ++++- package/qt5/qt5base/qt5base.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch index a86d0b1..d5827f6 100644 --- a/package/qt5/qt5base/qt5base-mkspecs-files.patch +++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch @@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,38 @@ +@@ -0,0 +1,41 @@ +MAKEFILE_GENERATOR = UNIX +CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib @@ -49,6 +49,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf + +QMAKE_LIBS += -lrt -lpthread -ldl + ++# device specific glue code ++EGLFS_PLATFORM_HOOKS_SOURCES = ++ +# Sanity check +deviceSanityCheckCompiler() + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ac63e98..3b4c007 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -75,6 +75,10 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs QT5BASE_DEPENDENCIES += libgles libegl +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ + $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +endif else QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs endif @@ -125,6 +129,8 @@ define QT5BASE_CONFIGURE_CMDS $(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS)) $(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS)) $(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS)) + $(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \ + $(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)) (cd $(@D); \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \