From patchwork Fri Jan 5 14:39:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 856066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="vun685B5"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCnQ34nkvz9s7c for ; Sat, 6 Jan 2018 01:40:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A4B6330A69; Fri, 5 Jan 2018 14:40:09 +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 J7saV5FKtS5F; Fri, 5 Jan 2018 14:40:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B009630A54; Fri, 5 Jan 2018 14:40:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 672A01BFF0C for ; Fri, 5 Jan 2018 14:40:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6367E30A53 for ; Fri, 5 Jan 2018 14:40:05 +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 uw2lKLi+RYia for ; Fri, 5 Jan 2018 14:40:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by silver.osuosl.org (Postfix) with ESMTPS id A013930A64 for ; Fri, 5 Jan 2018 14:40:03 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id c19so5354209lfg.3 for ; Fri, 05 Jan 2018 06:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B/6eurqTQHjljkPsAIxbzPnao/RoDJtek2iOiMYsxm4=; b=vun685B5FCVcT444MzqbOefeojwf4+pPhT3SyliYFDNnO7NCAeQkLLFLdSx8piCi4c hxPHZZaz7fXzEScatb7SRnT0KhiR4riK/Uc6WiPSp27Bumu2d1VATbwvOmQirDPaAc1M xwBRXNtdHsA8cLYIectWlEcpP5w4xgwGEbbFCWU235lcOwTXPuEutlBJAmTp4206BBPZ wdn3tb2J16G8FFGsY/DCcr0KIiwJq957WjscS1pZ2J7UUfh6/8KPfSKujr1GxQXfcHsZ 8gJ+OT2pe14D2RXsfLW7z2XnV5l7ewG6iQ8N/8ixPdX+PuAIPc13ltg7RfKKiw/kBuMX ttpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B/6eurqTQHjljkPsAIxbzPnao/RoDJtek2iOiMYsxm4=; b=sAwIDukZGrD+uZ8ms4DJJncNtNQPt5rWwNCKyAQAHl0hUp+dbZRk5XnGFM1RYdrECs ODKYqcVu3zDHxKpUsDnw69Jr++SvB8RAtmbKOgFY+4J42EjzJt/AiysbSkNdroLFjNJo T/hKOhWjXYQFbg5amncpK7S+Hem+NL5PJv11UXbYl8Oo0dh5zrl25se7SWrMFwqAWTGZ Wzw1PNmvjOGWukbyJSM3KVgR6iCEB85lPewzFxbQOo1G0UOybAyjWKtfzGFAMxAvjg4X l0ZvofwqilPXf96L+ljBPqs+pb/wVOpUYwBozt9eCQt8zUTU7KO98oE9x0oM2LUq0/EI d55A== X-Gm-Message-State: AKwxytf12tFVmQA9l+ygx0IJmJv7b5j1qJJjPuqql05EHS6+5GqkBKFH s6DPAuQe8qtNJG9k3LNYIDT+el53 X-Google-Smtp-Source: ACJfBotbKidhD4d1V9p871zK9+4HPI4tlqJL0B0MONB1qWDJtsXaamAiQ9yaLJ7Voo7ISpNpGsDb1Q== X-Received: by 10.46.72.26 with SMTP id v26mr1822375lja.80.1515163201571; Fri, 05 Jan 2018 06:40:01 -0800 (PST) Received: from t450s.lan (89-92-157-126.hfc.dyn.abo.bbox.fr. [89.92.157.126]) by smtp.googlemail.com with ESMTPSA id i1sm1035158lji.22.2018.01.05.06.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 06:40:00 -0800 (PST) From: Gary Bisson To: buildroot@buildroot.org Date: Fri, 5 Jan 2018 15:39:38 +0100 Message-Id: <20180105143947.26934-7-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180105143947.26934-1-gary.bisson@boundarydevices.com> References: <20180105143947.26934-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 06/15] xdriver_xf86-video-imx-viv: bump to version 6.2.2.p0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, Bernd Kuhls , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?q?er?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The following xorg.conf was used in order to force the use of the vivante module: https://github.com/Freescale/meta-freescale/blob/master/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf Note that the X server must be started with the "noreset" option to avoid crashes when closing X apps. Tested with: # X -noreset & # cd /usr/share/examples/viv_samples/vdk/ # DISPLAY=:0 ./tutorial7 Note that this package patch is removed as now upstream: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante/commit/?id=70ebd67c Cc: Jérôme Pouiller Cc: Bernd Kuhls Signed-off-by: Gary Bisson --- ...001-Stop-using-Git-to-write-local-version.patch | 90 ---------------------- package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 7 ++ .../xdriver_xf86-video-imx-viv.hash | 2 +- .../xdriver_xf86-video-imx-viv.mk | 10 +-- 4 files changed, 13 insertions(+), 96 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch b/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch deleted file mode 100644 index 2117e725cd..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Wed, 2 Dec 2015 13:36:25 +0000 -Subject: [PATCH] Stop using Git to write local version -Organization: O.S. Systems Software LTDA. - -The standard version does not use a Git repository so we should not -use Git to identify the commit of the build as it can end getting the -version from a wrong repository and can be misleading. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador -[Downloaded from -https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch] -Signed-off-by: Andrew Webster ---- - EXA/src/makefile.tc | 6 +++--- - FslExt/src/makefile.tc | 6 +++--- - util/autohdmi/makefile.tc | 6 +++--- - util/pandisplay/makefile.tc | 6 +++--- - 4 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/EXA/src/makefile.tc b/EXA/src/makefile.tc -index 0b9a9e6..ec6e68d 100644 ---- a/EXA/src/makefile.tc -+++ b/EXA/src/makefile.tc -@@ -52,8 +52,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/FslExt/src/makefile.tc b/FslExt/src/makefile.tc -index 0b9a9e6..ec6e68d 100644 ---- a/FslExt/src/makefile.tc -+++ b/FslExt/src/makefile.tc -@@ -52,8 +52,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/util/autohdmi/makefile.tc b/util/autohdmi/makefile.tc -index c9de0a6..d0a468c 100644 ---- a/util/autohdmi/makefile.tc -+++ b/util/autohdmi/makefile.tc -@@ -64,8 +64,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/util/pandisplay/makefile.tc b/util/pandisplay/makefile.tc -index 28732b9..bf54c20 100644 ---- a/util/pandisplay/makefile.tc -+++ b/util/pandisplay/makefile.tc -@@ -64,8 +64,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - --- -2.1.4 - diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in index c3746a100f..5a0257305c 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV bool "xf86-video-imx-viv" depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + depends on BR2_PACKAGE_IMX_GPU_G2D depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri select BR2_PACKAGE_MESA3D_DRI_DRIVER @@ -32,3 +33,9 @@ comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" depends on BR2_arm depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 depends on BR2_TOOLCHAIN_HAS_SYNC_1 + +comment "xf86-video-imx-viv depends on imx-gpu-g2d" + depends on BR2_arm + depends on !BR2_PACKAGE_IMX_GPU_G2D + depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index 7d7da84e6b..be41cb091b 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1 +1 @@ -sha256 3eed38193e31bb5ba8d2c817bd9b4f6e2fe7540d2cab36de9098cb4f11946a9f xserver-xorg-video-imx-viv-5.0.11.p8.6.tar.gz +sha256 61b3a7a22f80d1cbc797c329615e1699f3906c9261de7eabcf0de2bf2399de55 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk index b31d98fbf4..222d74ac4b 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p8.6 -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE) -XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz -XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \ +XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga +XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante +XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git +XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ xproto_xproto xproto_xf86driproto libdrm XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT @@ -17,7 +17,7 @@ XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \ BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \ - CFLAGS="$(TARGET_CFLAGS) -I$(@D)/DRI_1.10.4/src" + CFLAGS="$(TARGET_CFLAGS)" endef define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS