This patch brings in the following changes: * vpe: Rename testcase to v4l2-m2m * Add support for DSS WB device * Makefile changes to fix library linking issues
Signed-off-by: Karthik Ramanan <[email protected]> --- .../0001-Makefile-fix-library-linking-issues.patch | 60 ---------------------- .../glsdk-example-apps/glsdk-example-apps.bb | 5 +- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/glsdk-example-apps/files/0001-Makefile-fix-library-linking-issues.patch diff --git a/meta-arago-extras/recipes-graphics/glsdk-example-apps/files/0001-Makefile-fix-library-linking-issues.patch b/meta-arago-extras/recipes-graphics/glsdk-example-apps/files/0001-Makefile-fix-library-linking-issues.patch deleted file mode 100644 index b7e8971..0000000 --- a/meta-arago-extras/recipes-graphics/glsdk-example-apps/files/0001-Makefile-fix-library-linking-issues.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ecba95bde41a91d72aecf569c853a766a6ffd2aa Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Sun, 26 Mar 2017 13:39:47 -0400 -Subject: [PATCH] Makefile: fix library linking issues - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - cpuload-plugins/Makefile.am | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/cpuload-plugins/Makefile.am b/cpuload-plugins/Makefile.am -index 9c0bc1a..3df7b22 100644 ---- a/cpuload-plugins/Makefile.am -+++ b/cpuload-plugins/Makefile.am -@@ -6,13 +6,12 @@ mpuload_CFLAGS = \ - mpuload_SOURCES = mpuload.c - - rprocinfo_CFLAGS = -O0 -g @DRM_CFLAGS@ @DCE_CFLAGS@ --rprocinfo_LDFLAGS = @DCE_LIBS@ -lpthread -+rprocinfo_LDADD = @DCE_LIBS@ -lpthread - rprocinfo_SOURCES = rprocinfo.c - --pvrscope_CXXFLAGS = -I. -lrt -lm -lpthread -ldl -+pvrscope_CXXFLAGS = -I. -+pvrscope_LDADD = $(top_srcdir)/cpuload-plugins/libPVRScopeDeveloper.a -lrt -lm -lpthread -ldl - pvrscope_SOURCES = pvrscope.cpp --LIBS = $(top_srcdir)/cpuload-plugins/libPVRScopeDeveloper.a -- - - # Specify any libraries that need to be built here. Follow the convention - # libxxx.a otherwise autotools will complain about non-canonical names. -@@ -26,17 +25,15 @@ include_HEADERS= - ## - - read32k_driver_SOURCES= read32k_driver.c --read32k_driver_LDADD = libread32k.a -+read32k_driver_LDADD = libread32k.a -lm - read32k_driver_CFLAGS = -I. --read32k_driver_LDFLAGS= -lm - - readproc_SOURCES = readproc.c --readproc_LDFLAGS = -lm -+readproc_LDADD = -lm - - waitforweston_SOURCES = waitforweston.c --waitforweston_LDADD = libread32k.a -+waitforweston_LDADD = libread32k.a -lm @DRM_LIBS@ -lpthread -lrt @WAYLAND_LIBS@ @UDEV_LIBS@ - waitforweston_CFLAGS = -I. @DRM_CFLAGS@ --waitforweston_LDFLAGS = @DRM_LIBS@ -lpthread -lrt -lm @WAYLAND_LIBS@ @UDEV_LIBS@ - - ## - # Libraries -@@ -45,4 +42,3 @@ waitforweston_LDFLAGS = @DRM_LIBS@ -lpthread -lrt -lm @WAYLAND_LIBS@ @UDEV_LIBS@ - libread32k_a_SOURCES = read32k.c - libread32k_a_CFLAGS = -I. - include_HEADERS+=./read32k.h -- --- -2.7.4 - diff --git a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb index 81a6c3f..3ce8a76 100644 --- a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb +++ b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb @@ -12,12 +12,11 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig SRC_URI = "git://git.ti.com/glsdk/example-applications.git;protocol=git \ - file://0001-Makefile-fix-library-linking-issues.patch \ " -SRCREV="f7562ecf76c559972205d7faaa3b50bdb43de238" +SRCREV="491b3129a5c5267d72aba8878b50731f27356d3a" -PR = "r49" +PR = "r50" do_install_append () { install -d ${D}${sysconfdir}/glsdkstatcoll -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
