This reverts commit 76bfc363e14d70d0a04404ab9ab8d9bd18841c5c. The required patch has been upstreamed. --- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 ------------------- .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch deleted file mode 100644 index 4774425f..00000000 --- a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001 -From: Eric Ruei <[email protected]> -Date: Mon, 28 Oct 2019 09:43:47 -0400 -Subject: [PATCH] util: Makefile.am: update LDFLAGS for Mesa-based EGL - -- replace pvr_wlegl with wayland-egl - -Upstream-Status: Pending -Signed-off-by: Eric Ruei <[email protected]> ---- - util/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - mode change 100644 => 100755 util/Makefile.am - -diff --git a/util/Makefile.am b/util/Makefile.am -old mode 100644 -new mode 100755 -index 2bfcb5e..fdeb877 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -37,7 +37,7 @@ endif - if ENABLE_WAYLAND - libutil_la_SOURCES += display-wayland.c wayland-drm-protocol.c viewporter-protocol.c - libutil_la_CFLAGS = @DRM_CFLAGS@ --libutil_la_LDFLAGS = -lwayland-client -lwayland-cursor -ldrm -ldrm_omap -lpthread -lpvr_wlegl -lavcodec -+libutil_la_LDFLAGS = -lwayland-client -lwayland-cursor -ldrm -ldrm_omap -lpthread -lwayland-egl -lavcodec - - endif - --- -2.17.1 - diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb index bb166b74..079663e7 100644 --- a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap-a15|ti43x" inherit autotools pkgconfig -PR = "r29" +PR = "r28" SRCREV = "20338b9f575ffe9c18c12bbed41c16069d27ccf4" EXTRA_OEMAKE = "CC="${CC}"" @@ -17,7 +17,6 @@ TARGET_CC_ARCH += "${LDFLAGS}" SRC_URI = "git://git.ti.com/glsdk/omapdrmtest.git;protocol=git \ file://0001-Makefile.am-lblah-flags-belong-to-LDADD-not-LDFLAGS.patch \ - file://0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch \ " S = "${WORKDIR}/git" -- 2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
