|
1 Ultimately, this should be resolved by using Makefile.introspection. |
|
2 |
|
3 The patch below a simpler fix that does the minimum necessary to make |
|
4 introspection builds work. |
|
5 |
|
6 XXX file upstream bug |
|
7 |
|
8 --- clutter-gst-2.0.14/build/autotools/introspection.m4 2014-10-19 04:41:57.000000000 -0700 |
|
9 +++ clutter-gst-2.0.14/build/autotools/introspection.m4 2015-06-02 12:37:14.807600738 -0700 |
|
10 @@ -49,12 +49,14 @@ |
|
11 AC_MSG_RESULT([$found_introspection]) |
|
12 |
|
13 INTROSPECTION_SCANNER= |
|
14 + INTROSPECTION_SCANNER_ENV= |
|
15 INTROSPECTION_COMPILER= |
|
16 INTROSPECTION_GENERATE= |
|
17 INTROSPECTION_GIRDIR= |
|
18 INTROSPECTION_TYPELIBDIR= |
|
19 if test "x$found_introspection" = "xyes"; then |
|
20 INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
|
21 + INTROSPECTION_SCANNER_ENV='CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"' |
|
22 INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
|
23 INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
|
24 INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
|
25 @@ -64,6 +66,7 @@ |
|
26 INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
|
27 fi |
|
28 AC_SUBST(INTROSPECTION_SCANNER) |
|
29 + AC_SUBST(INTROSPECTION_SCANNER_ENV) |
|
30 AC_SUBST(INTROSPECTION_COMPILER) |
|
31 AC_SUBST(INTROSPECTION_GENERATE) |
|
32 AC_SUBST(INTROSPECTION_GIRDIR) |
|
33 --- clutter-gst-2.0.14/clutter-gst/Makefile.am 2015-01-25 07:02:49.000000000 -0800 |
|
34 +++ clutter-gst-2.0.14/clutter-gst/Makefile.am 2015-06-26 13:57:36.932028090 -0700 |
|
35 @@ -124,6 +124,7 @@ |
|
36 ClutterGst-@[email protected]: $(INTROSPECTION_SCANNER) libclutter-gst-@[email protected] |
|
37 $(QUIET_GEN) \ |
|
38 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no DISPLAY="" \ |
|
39 + $(INTROSPECTION_SCANNER_ENV) \ |
|
40 $(INTROSPECTION_SCANNER) -v \ |
|
41 --namespace ClutterGst --nsversion=@CLUTTER_GST_API_VERSION@ \ |
|
42 $(INCLUDES) \ |