summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Remmet <j.remmet@phytec.de>2020-06-17 12:20:37 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2020-06-24 10:25:02 +0200
commite102a2bb7bedbb1d9bc4ffadaf327c372608726a (patch)
tree19e36878c12b299c2ca4166b11eb7d4755ef2fa5
parent037da2bd5ecc263f3162a7ec93fa2e80b38aa65e (diff)
downloadmeta-phytec-e102a2bb7bedbb1d9bc4ffadaf327c372608726a.tar.bz2
meta-phytec-e102a2bb7bedbb1d9bc4ffadaf327c372608726a.zip
recipes-graphics: mesa: remove upstreamed patch
patch is upstream now in mesa-2-20.0. Remove it to fix build. Signed-off-by: Jan Remmet <j.remmet@phytec.de> Reviewed-by: Norbert Wesp <n.wesp@phytec.de>
-rw-r--r--recipes-graphics/mesa/mesa/0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch40
-rw-r--r--recipes-graphics/mesa/mesa_%.bbappend4
2 files changed, 0 insertions, 44 deletions
diff --git a/recipes-graphics/mesa/mesa/0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch b/recipes-graphics/mesa/mesa/0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch
deleted file mode 100644
index e649325..0000000
--- a/recipes-graphics/mesa/mesa/0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8a69b020965f3dbcc509493d44c9122555da0c0d Mon Sep 17 00:00:00 2001
-From: Norbert Wesp <n.wesp@phytec.de>
-Date: Fri, 27 Mar 2020 10:08:58 +0100
-Subject: [zeus+] kmsro: move entry points from etnaviv to kmsro
-
-These drivers are kmsro drivers so they should be part of the kmsro #if
-
-This fixes missing imx_drm driver when building with only freedreno+kmsro
-
-Signed-off-by: Jonathan Marek <jonathan@marek.ca>
-Reviewed-by: Eric Anholt <eric@anholt.net>
-
-%% original patch: 0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch
----
- src/gallium/targets/dri/target.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
-index bae2f1ed002..f42be53906d 100644
---- a/src/gallium/targets/dri/target.c
-+++ b/src/gallium/targets/dri/target.c
-@@ -85,7 +85,6 @@ DEFINE_LOADER_DRM_ENTRYPOINT(panfrost)
-
- #if defined(GALLIUM_ETNAVIV)
- DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm)
--DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm)
- DEFINE_LOADER_DRM_ENTRYPOINT(etnaviv)
- #endif
-
-@@ -106,6 +105,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(rockchip)
- DEFINE_LOADER_DRM_ENTRYPOINT(st7586)
- DEFINE_LOADER_DRM_ENTRYPOINT(st7735r)
- DEFINE_LOADER_DRM_ENTRYPOINT(sun4i_drm)
-+DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm)
- #endif
-
- #if defined(GALLIUM_LIMA)
---
-2.17.1
-
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 29ff972..29431ca 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,9 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
- file://0001-kmsro-move-entry-points-from-etnaviv-to-kmsro.patch \
-"
-
PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
PACKAGECONFIG[kmsro] = ""