diff options
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 4 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 9 |
2 files changed, 5 insertions, 8 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 index 2cab87f9ec8..2d2413d661b 100644 --- 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 @@ -18,6 +18,9 @@ diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 index 162be57..217a6ae 100644 --- a/common/m4/introspection.m4 +++ b/common/m4/introspection.m4 +@ -9 +9 @@ dnl +-# serial 1 ++# serial 1.1.1 @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], INTROSPECTION_GIRDIR= INTROSPECTION_TYPELIBDIR= @@ -39,4 +42,3 @@ index 162be57..217a6ae 100644 AC_SUBST(INTROSPECTION_SCANNER) -- 2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 3f6d4c37038..9973d6cdaeb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc @@ -7,7 +7,7 @@ DEPENDS = "gstreamer1.0 glib-2.0-native" inherit autotools pkgconfig upstream-version-is-even gobject-introspection gtk-doc -acpaths = "-I ${S}/common/m4 -I ${S}/m4" +acpaths = "-I ${S}/m4 -I ${S}/common/m4" LIBV = "1.0" require gst-plugins-package.inc @@ -28,11 +28,6 @@ EXTRA_OECONF = " \ --disable-examples \ " -delete_pkg_m4_file() { - # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection - rm "${S}/common/m4/pkg.m4" || true - rm -f "${S}/common/m4/gtk-doc.m4" -} # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, # but its own custom ones, which we have to patch here @@ -46,6 +41,6 @@ patch_gtk_doc_makefiles() { ${S}/common/gtk-doc*mak } -do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles" +do_configure[prefuncs] += " patch_gtk_doc_makefiles" PACKAGES_DYNAMIC = "^${PN}-.*" |