From: Denys Dmytriyenko <[email protected]> Remove gstreamer1.0-plugins-dsp66 component as deprecated and not maintained.
This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../packagegroup-arago-gst-sdk-target.bb | 5 - .../packagegroups/packagegroup-arago-gst.bb | 5 - ...-use-of-CPP-CXX-and-other-standard-v.patch | 91 ------------------- ...e.ac-stop-using-export-symbols-regex.patch | 32 ------- .../gstreamer1.0-plugins-dsp66_git.bb | 50 ---------- 5 files changed, 183 deletions(-) delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb index 845cc7ff..fd749711 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb @@ -14,13 +14,8 @@ GSTREAMER_DEPS = " \ gstreamer1.0-libav-dev \ " -GSTREAMER_DSP = " \ - ${@['','gstreamer1.0-plugins-dsp66-dev'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" - # gstreamer1.0-plugins-hevc-dev GSTREAMER_DEPS:append:dra7xx = " \ - ${GSTREAMER_DSP} \ " RDEPENDS:${PN} = " \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb index e8a639bd..3bc3bfc1 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb @@ -17,13 +17,8 @@ GSTREAMER_DEPS = " \ gstreamer1.0-libav \ " -GSTREAMER_DSP = " \ - ${@['','gstreamer1.0-plugins-dsp66'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" - # gstreamer1.0-plugins-hevc GSTREAMER_DEPS:append:dra7xx = " \ - ${GSTREAMER_DSP} \ " GSTREAMER_ACCEL_MM = "" diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch deleted file mode 100644 index 8048de93..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 145964aa34bc2cbf1499de6e14de80a7c2d7e935 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Sun, 26 Mar 2017 15:12:44 -0400 -Subject: [PATCH] Makefile: correct use of CPP/CXX and other standard variables - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - src/kernels/make.inc | 16 +++++++--------- - src/kernels/oclconv/Makefile | 7 +++---- - 2 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/src/kernels/make.inc b/src/kernels/make.inc -index 797e64b..f1475a3 100644 ---- a/src/kernels/make.inc -+++ b/src/kernels/make.inc -@@ -4,7 +4,6 @@ DSP_INCLUDE += -I$(TARGET_ROOTDIR)/usr/share/ti/opencl - TI_IMGLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-imglib-c66x-tree - TI_VLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-vlib-c66x-tree - --CPP = g++ - CL6X = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE) - CLOCL = clocl - -@@ -16,9 +15,9 @@ UNAME_M :=$(shell uname -m) - # If TI_OCL_INSTALL is set, setup make from that location - # ---------------------------------------------------------------------------- - ifneq ($(TI_OCL_INSTALL),) -- CPP = g++ -- CPP_FLAGS += -I$(TI_OCL_INSTALL)/usr/include -- LD_FLAGS += -L$(TI_OCL_INSTALL)/usr/lib -+ CXX = g++ -+ CXXFLAGS += -I$(TI_OCL_INSTALL)/usr/include -+ LDFLAGS += -L$(TI_OCL_INSTALL)/usr/lib - LIBS += -lbfd - - # ---------------------------------------------------------------------------- -@@ -38,20 +37,19 @@ else ifneq (,$(findstring 86, $(UNAME_M))) - - # gcc ARM cross compiler will not, by default, search the host's - # /usr/include. Explicitly specify here to find dependent vendor headers -- cross: override CPP = arm-linux-gnueabihf-g++ -- cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include -+ cross: CXXFLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include - - # If cross-compilineg, provide path to dependent ARM libraries on the - # target filesystem -- cross: LD_FLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib -+ cross: LDFLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib - endif - - %.o: %.cpp -- @$(CPP) -c $(CPP_FLAGS) $< -+ @$(CXX) -c $(CXXFLAGS) $< - @echo Compiling $< - - %.o: %.c -- @$(CPP) -c $(CPP_FLAGS) $< -+ @$(CXX) -c $(CXXFLAGS) $< - @echo Compiling $< - - %.obj: %.c -diff --git a/src/kernels/oclconv/Makefile b/src/kernels/oclconv/Makefile -index e271670..c3774f8 100644 ---- a/src/kernels/oclconv/Makefile -+++ b/src/kernels/oclconv/Makefile -@@ -1,12 +1,12 @@ - EXE = liboclconv.so --CPP_FLAGS = -O3 -shared -fPIC -L. -+CXXFLAGS = -O3 -shared -fPIC -L. - CLOCL_FLAGS = - include ../make.inc - - all: ${EXE} - --$(EXE): oclconv.o -- @$(CPP) $(CPP_FLAGS) oclconv.o $(LD_FLAGS) $(LIBS) -o $@ -+$(EXE): oclconv.o -+ @$(CXX) $(CXXFLAGS) oclconv.o $(LDFLAGS) $(LIBS) -o $@ - - oclconv.o: conv.dsp_h - -@@ -16,4 +16,3 @@ conv.dsp_h: conv.cl ${TI_IMGLIB_DIR}/lib/imglib.ae66 ${TI_VLIB_DIR}/packages/ti/ - - install: - mkdir -p ${DESTDIR}/usr/lib && install -m 755 ${EXE} ${DESTDIR}/usr/lib/. -- --- -2.7.4 - diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch deleted file mode 100644 index e3df61ac..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0fcda9d85c96d5c39dffe21d3bdf01a038b911c9 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Tue, 22 Jan 2019 20:39:15 -0500 -Subject: [PATCH] configure.ac: stop using -export-symbols-regex - -The old regex is no longer correct for GStreamer 1.14. - -Bug-Debian: https://bugs.debian.org/894642 - -Upstream-Status: Inappropriate [arago specific] - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fee3161..8159c60 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,7 @@ fi - AC_SUBST(plugindir) - - dnl set proper LDFLAGS for plugins --GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" -+GST_PLUGIN_LDFLAGS="-module -avoid-version $GST_ALL_LDFLAGS" - AC_SUBST(GST_PLUGIN_LDFLAGS) - - AC_CONFIG_FILES([Makefile src/Makefile]) --- -2.7.4 - diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb deleted file mode 100644 index d92efb9b..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "GStreamer elements to use the TI DSP C66 in multimedia applications" -HOMEPAGE = "https://git.ti.com/processor-sdk/gst-plugin-dsp66"; -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=2827f94fc0a1adeff4d9702e97ce2979" - -SRC_URI = "git://git.ti.com/git/processor-sdk/gst-plugin-dsp66.git;protocol=https;branch=master \ - file://0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch \ - file://0001-configure.ac-stop-using-export-symbols-regex.patch \ -" -SRCREV = "0abedafadbed693592804f23482a9447d81b2dbf" - -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE = "dra7xx" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base opencl ti-cgt6x-native clocl-native imglib-c66x vlib-c66x gettext-native" - -inherit autotools-brokensep pkgconfig gettext -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl" - -PR = "r1" - -RDEPENDS:${PN} += "opencl-runtime" - -EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -do_configure() { - cd ${S} - chmod +x autogen.sh - ./autogen.sh --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --prefix=/usr -} - -EXTRA_OECONF += "--enable-maintainer-mode" -EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'" - -FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" -FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" - -FILES:${PN} += "${libdir}/*.so" -FILES:${PN}-dbg += "${libdir}/.debug" -FILES:${PN}-dev += "${libdir}/*.la" -FILES_SOLIBSDEV = "" - -INSANE_SKIP:${PN} = "ldflags" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15522): https://lists.yoctoproject.org/g/meta-arago/message/15522 Mute This Topic: https://lists.yoctoproject.org/mt/108110201/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
