meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch

   1 From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Tue, 24 Nov 2015 16:46:27 +0200
   4 Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
   5  PKG_CONFIG_SYSROOT_DIR
   6
   7 We can't use our tweaked introspection.m4 from gobject-introspection tarball
   8 because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
   9 is later supplied to g-ir-scanner.
  10
  11 Upstream-Status: Pending [review on oe-core list]
  12 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  13 ---
  14  common/m4/introspection.m4 | 12 ++++++------
  15  1 file changed, 6 insertions(+), 6 deletions(-)
  16
  17 diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
  18 index 162be57..217a6ae 100644
  19 --- a/common/m4/introspection.m4
  20 +++ b/common/m4/introspection.m4
  21 @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
  22      INTROSPECTION_GIRDIR=
  23      INTROSPECTION_TYPELIBDIR=
  24      if test "x$found_introspection" = "xyes"; then
  25 -       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  26 -       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  27 -       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  28 +       INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  29 +       INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  30 +       INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  31         INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
  32         INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  33         INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
  34         INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
  35 -       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  36 +       INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  37         INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
  38      fi
  39      AC_SUBST(INTROSPECTION_SCANNER)
  40 --
  41 2.6.2
  42