summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2020-01-12 14:59:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:08 +0000
commit6239efc725f4ace274f506da49531ae16b472e81 (patch)
tree6cc0b2d882f7646bc08a5f9334a26d91de1004bb /meta
parentc14cf3abb28d9ea4a1e59277ebf9464a4ce0b6b0 (diff)
downloadpoky-6239efc725f4ace274f506da49531ae16b472e81.tar.gz
gstreamer: Remove unused common files and patches
gst-plugins-package.inc gstreamer1.0-plugins.inc got replaced by gstreamer1.0-plugins-packaging.inc and gstreamer1.0-plugins-common.inc, respectively. (From OE-Core rev: 238080ed896ea817a23aab2f25c246832ab9c7b3) Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch40
-rw-r--r--meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch69
-rw-r--r--meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch47
-rw-r--r--meta/recipes-multimedia/gstreamer/files/run-ptest3
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc56
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc41
6 files changed, 0 insertions, 256 deletions
diff --git a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
deleted file mode 100644
index 1b7f115083..0000000000
--- a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 24 Nov 2015 16:46:27 +0200
4Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
5 PKG_CONFIG_SYSROOT_DIR
6
7We can't use our tweaked introspection.m4 from gobject-introspection tarball
8because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
9is later supplied to g-ir-scanner.
10
11Upstream-Status: Pending [review on oe-core list]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
14---
15 common/m4/introspection.m4 | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
17
18diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
19index 162be57..933f979 100644
20--- a/common/m4/introspection.m4
21+++ b/common/m4/introspection.m4
22@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
23 INTROSPECTION_GIRDIR=
24 INTROSPECTION_TYPELIBDIR=
25 if test "x$found_introspection" = "xyes"; then
26- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
27- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
28- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
29+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
30+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
31+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
32 INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
33 INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
34 INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
35 INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
36- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
37+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
38 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
39 fi
40 AC_SUBST(INTROSPECTION_SCANNER)
diff --git a/meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch b/meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch
deleted file mode 100644
index d02d869410..0000000000
--- a/meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From d61414bc17cf2df019510c2908048c4cabf5cf09 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 27 Feb 2018 09:27:01 +0800
4Subject: [PATCH] add targets for test installation
5
6Targets to make sure tests can be installed and then run on
7the target.
8
9Upstream-Status: Inappropriate [specific to oe setup]
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12
13---
14 tests/check/Makefile.am | 27 ++++++++++++++++++++-------
15 1 file changed, 20 insertions(+), 7 deletions(-)
16
17diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
18index 13b916d..a66786d 100644
19--- a/tests/check/Makefile.am
20+++ b/tests/check/Makefile.am
21@@ -8,11 +8,7 @@ REGISTRY_ENVIRONMENT = \
22 GST_REGISTRY=$(CHECK_REGISTRY)
23
24 AM_TESTS_ENVIRONMENT += \
25- GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
26- $(REGISTRY_ENVIRONMENT) \
27- GST_PLUGIN_SCANNER_1_0=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
28- GST_PLUGIN_SYSTEM_PATH_1_0= \
29- GST_PLUGIN_PATH_1_0=$(top_builddir)/plugins
30+ GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"
31
32 plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
33
34@@ -178,6 +174,23 @@ noinst_PROGRAMS =
35
36 TESTS = $(check_PROGRAMS)
37
38+install-ptest: $(TESTS)
39+ @$(INSTALL) -d $(DESTDIR)
40+ @for dir in `find -maxdepth 1 -type d`; do \
41+ if [ -x $$dir/.libs ]; then \
42+ $(INSTALL) -d $(DESTDIR)/$$dir; \
43+ $(INSTALL_PROGRAM) $$dir/.libs/* $(DESTDIR)/$$dir/; \
44+ fi \
45+ done
46+
47+runtests:
48+ @for b in $(TESTS); do \
49+ if [ -x $$b ]; then \
50+ $(AM_TESTS_ENVIRONMENT) $(SHELL) test-driver --test-name "$$b" \
51+ --log-file $$b.log --trs-file $$b.trs $$b; \
52+ fi \
53+ done
54+
55 noinst_HEADERS = \
56 gst/capslist.h \
57 gst/struct_arm.h \
58@@ -221,9 +234,9 @@ gst_gstprintf_LDADD = \
59 $(LDADD)
60
61 elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
62- -DTESTFILE=\"$(top_srcdir)/configure.ac\"
63+ -DTESTFILE=\"Makefile\"
64 elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
65- -DTESTFILE=\"$(top_srcdir)/configure.ac\"
66+ -DTESTFILE=\"Makefile\"
67
68 libs_controller_LDADD = \
69 $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
diff --git a/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch b/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
deleted file mode 100644
index d86c78d793..0000000000
--- a/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 7018ca1c4bf26c8317e7fcd2e7e4e648195f42ca Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 20 Dec 2017 13:03:03 +0000
4Subject: [PATCH] gstreamer: use a patch instead of sed to fix gtk-doc
5
6Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient
7binaries instead of libtool wrapper or running them directly.
8
9Also substitute a bogus plugin scanner, as trying to run the real one is causing
10issues during build on x86_64.
11
12Upstream-Status: Inappropriate
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14
15---
16 common/gtk-doc.mak | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/common/gtk-doc.mak b/common/gtk-doc.mak
20index 3f83491..e5cb0d1 100644
21--- a/common/gtk-doc.mak
22+++ b/common/gtk-doc.mak
23@@ -6,11 +6,11 @@
24 if GTK_DOC_USE_LIBTOOL
25 GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
26 GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
27-GTKDOC_RUN = $(LIBTOOL) --mode=execute
28+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
29 else
30 GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
31 GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
32-GTKDOC_RUN =
33+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
34 endif
35
36 # We set GPATH here; this gives us semantics for GNU make
37@@ -101,6 +101,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
38 GST_PLUGIN_PATH_1_0= \
39 GST_REGISTRY_1_0=doc-registry.xml \
40 $(GTKDOC_EXTRA_ENVIRONMENT) \
41+ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \
42 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" \
43 CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \
44 LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
45--
462.15.1
47
diff --git a/meta/recipes-multimedia/gstreamer/files/run-ptest b/meta/recipes-multimedia/gstreamer/files/run-ptest
deleted file mode 100644
index 473d0b67a7..0000000000
--- a/meta/recipes-multimedia/gstreamer/files/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3make -k runtests
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
deleted file mode 100644
index 6781e98c31..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ /dev/null
@@ -1,56 +0,0 @@
1PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
2PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
3
4python split_gstreamer10_packages () {
5 gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
6 postinst = d.getVar('plugin_postinst')
7 glibdir = d.getVar('libdir')
8
9 do_split_packages(d, glibdir, r'^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
10 do_split_packages(d, gst_libdir, r'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
11 do_split_packages(d, glibdir+'/girepository-1.0', r'Gst(.*)-1.0\.typelib$', d.expand('${PN}-%s-typelib'), 'GStreamer typelib file for %s', postinst=postinst, extra_depends='')
12 do_split_packages(d, gst_libdir, r'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends='${PN}-dev')
13 do_split_packages(d, gst_libdir, r'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends='${PN}-staticdev')
14}
15
16python set_metapkg_rdepends () {
17 import os
18 import oe.utils
19
20 pn = d.getVar('PN')
21 metapkg = pn + '-meta'
22 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
23 d.setVar('FILES_' + metapkg, "")
24 blacklist = [ pn, pn + '-meta' ]
25 metapkg_rdepends = []
26 pkgdest = d.getVar('PKGDEST')
27 for pkg in oe.utils.packages_filter_out_system(d):
28 if pkg not in blacklist and pkg not in metapkg_rdepends:
29 # See if the package is empty by looking at the contents of its PKGDEST subdirectory.
30 # If this subdirectory is empty, then the package is.
31 # Empty packages do not get added to the meta package's RDEPENDS
32 pkgdir = os.path.join(pkgdest, pkg)
33 if os.path.exists(pkgdir):
34 dir_contents = os.listdir(pkgdir) or []
35 else:
36 dir_contents = []
37 is_empty = len(dir_contents) == 0
38 if not is_empty:
39 metapkg_rdepends.append(pkg)
40 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
41 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
42}
43
44# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
45# so we need them even when empty (like in gst-plugins-good case)
46ALLOW_EMPTY_${PN} = "1"
47ALLOW_EMPTY_${PN}-dev = "1"
48ALLOW_EMPTY_${PN}-staticdev = "1"
49
50PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
51
52FILES_${PN} = ""
53FILES_${PN}-apps = "${bindir}"
54FILES_${PN}-glib = "${datadir}/glib-2.0"
55
56RRECOMMENDS_${PN} += "${PN}-meta"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
deleted file mode 100644
index bc24b05fec..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ /dev/null
@@ -1,41 +0,0 @@
1SUMMARY = "Plugins for the GStreamer multimedia framework 1.x"
2HOMEPAGE = "http://gstreamer.freedesktop.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
4SECTION = "multimedia"
5
6DEPENDS = "gstreamer1.0 glib-2.0-native"
7
8SRC_URI_append = " file://gtk-doc-tweaks.patch"
9
10inherit autotools pkgconfig upstream-version-is-even gtk-doc
11
12acpaths = "-I ${S}/common/m4 -I ${S}/m4"
13
14LIBV = "1.0"
15require gst-plugins-package.inc
16
17# Orc enables runtime JIT compilation of data processing routines from Orc
18# bytecode to SIMD instructions for various architectures (currently SSE, MMX,
19# MIPS, Altivec and NEON are supported).
20
21GSTREAMER_ORC ?= "orc"
22
23PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
24PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc orc-native"
25PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind"
26
27export ORCC = "${STAGING_DIR_NATIVE}${bindir}/orcc"
28
29EXTRA_OECONF = " \
30 --disable-examples \
31"
32
33delete_pkg_m4_file() {
34 # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
35 rm "${S}/common/m4/pkg.m4" || true
36 rm -f "${S}/common/m4/gtk-doc.m4"
37}
38
39do_configure[prefuncs] += " delete_pkg_m4_file"
40
41PACKAGES_DYNAMIC = "^${PN}-.*"