[meta-freescale] [meta-fsl-arm][PATCH v3 3/4] xf86-video-imxfb-vivante: Update graphics to 5.0.11-p8.3 version
Tom Hochstein
tom.hochstein at nxp.com
Wed Apr 6 05:12:33 PDT 2016
Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
.../xorg-driver/xf86-video-imxfb-vivante.inc | 4 +-
.../Remove-dix-internal-header-usage.patch | 31 --------
.../Stop-using-Git-to-write-local-version.patch | 87 ----------------------
....bb => xf86-video-imxfb-vivante_5.0.11.p8.3.bb} | 9 +--
4 files changed, 5 insertions(+), 126 deletions(-)
delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Remove-dix-internal-header-usage.patch
delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_5.0.11.p7.4.bb => xf86-video-imxfb-vivante_5.0.11.p8.3.bb} (33%)
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
index aa37555..95a69d5 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
@@ -10,7 +10,7 @@ inherit autotools-brokensep update-rc.d pkgconfig
DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv pixman"
-LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
+LIC_FILES_CHKSUM = "file://EXA/src/vivante_fbdev/vivante.h;endline=26;md5=ecb1a30055169dfee70ba94b6eb1e151"
SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
file://rc.autohdmi"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Remove-dix-internal-header-usage.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Remove-dix-internal-header-usage.patch
deleted file mode 100644
index f146ba3..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Remove-dix-internal-header-usage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 80c419dddf6483873503d90694c4b4ae34ffa5e4 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio at ossystems.com.br>
-Date: Wed, 2 Dec 2015 13:50:57 +0000
-Subject: [PATCH] Remove 'dix' internal header usage
-Organization: O.S. Systems Software LTDA.
-
-The 'swaprep.h' is an internal Xorg header and is not being installed
-anymore. The swap features are provided by the 'misc.h' header now.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
----
- EXA/src/vivante_extension/vivante_ext.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/EXA/src/vivante_extension/vivante_ext.c b/EXA/src/vivante_extension/vivante_ext.c
-index 0d1085b..1ffbb1b 100644
---- a/EXA/src/vivante_extension/vivante_ext.c
-+++ b/EXA/src/vivante_extension/vivante_ext.c
-@@ -40,7 +40,6 @@
- #include "cursorstr.h"
- #include "scrnintstr.h"
- #include "servermd.h"
--#include "swaprep.h"
- #include "drm.h"
- #include "xf86Module.h"
- #include "globals.h"
---
-2.1.4
-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
deleted file mode 100644
index f541e5c..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio at ossystems.com.br>
-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 <otavio at ossystems.com.br>
----
- 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/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.3.bb
similarity index 33%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb
rename to recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.3.bb
index 4c8af46..1f0cfab 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.3.bb
@@ -1,11 +1,8 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
require xf86-video-imxfb-vivante.inc
-SRC_URI += "file://Stop-using-Git-to-write-local-version.patch \
- file://Remove-dix-internal-header-usage.patch"
-
-SRC_URI[md5sum] = "6e2d8ee518e9eef8421e9dcdc1ea79c3"
-SRC_URI[sha256sum] = "3effaf42bde64da8fad2dfe0dcef12d1cfbbbe189511dbd4612442129fd832cc"
+SRC_URI[md5sum] = "457b39733b34009754c36224dfd25ea1"
+SRC_URI[sha256sum] = "00b4925819601461c0aa293a25024709410ab8d669accfa71ffd3177ff3cdeb2"
--
1.9.1
More information about the meta-freescale
mailing list