1 Ultimately, this should be resolved by a proper fix for this upstream bug: |
|
2 |
|
3 726571 should use Makefile.introspection |
|
4 |
|
5 The patch below a simpler fix that does the minimum necessary to make |
|
6 introspection builds work. |
|
7 |
|
8 --- gstreamer-1.4.5/common/m4/introspection.m4 2014-10-19 04:41:57.000000000 -0700 |
|
9 +++ gstreamer-1.4.5/common/m4/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 --- gstreamer-1.4.5/gst/Makefile.am 2014-10-19 04:41:00.000000000 -0700 |
|
34 +++ gstreamer-1.4.5/gst/Makefile.am 2015-06-02 12:56:24.258153713 -0700 |
|
35 @@ -288,6 +288,7 @@ |
|
36 |
|
37 Gst-@[email protected]: $(INTROSPECTION_SCANNER) libgstreamer-@[email protected] |
|
38 $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
39 + $(INTROSPECTION_SCANNER_ENV) \ |
|
40 $(INTROSPECTION_SCANNER) -v --namespace Gst \ |
|
41 --nsversion=@GST_API_VERSION@ \ |
|
42 --warn-all \ |
|
43 --- gstreamer-1.4.5/libs/gst/base/Makefile.am 2014-10-19 04:41:00.000000000 -0700 |
|
44 +++ gstreamer-1.4.5/libs/gst/base/Makefile.am 2015-06-02 12:57:13.922191032 -0700 |
|
45 @@ -78,6 +78,7 @@ |
|
46 GstBase-@[email protected]: $(INTROSPECTION_SCANNER) libgstbase-@[email protected] |
|
47 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
48 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
49 + $(INTROSPECTION_SCANNER_ENV) \ |
|
50 $(INTROSPECTION_SCANNER) -v --namespace GstBase \ |
|
51 --nsversion=@GST_API_VERSION@ \ |
|
52 --warn-all \ |
|
53 --- gstreamer-1.4.5/libs/gst/check/Makefile.am 2014-10-19 04:41:47.000000000 -0700 |
|
54 +++ gstreamer-1.4.5/libs/gst/check/Makefile.am 2015-06-02 12:56:45.804941977 -0700 |
|
55 @@ -141,6 +141,7 @@ |
|
56 GstCheck-@[email protected]: $(INTROSPECTION_SCANNER) libgstcheck-@[email protected] |
|
57 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
58 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
59 + $(INTROSPECTION_SCANNER_ENV) \ |
|
60 $(INTROSPECTION_SCANNER) -v --namespace GstCheck \ |
|
61 --nsversion=@GST_API_VERSION@ \ |
|
62 --strip-prefix=Gst \ |
|
63 --- gstreamer-1.4.5/libs/gst/controller/Makefile.am 2014-10-19 04:41:00.000000000 -0700 |
|
64 +++ gstreamer-1.4.5/libs/gst/controller/Makefile.am 2015-06-02 12:56:54.306083740 -0700 |
|
65 @@ -50,6 +50,7 @@ |
|
66 GstController-@[email protected]: $(INTROSPECTION_SCANNER) libgstcontroller-@[email protected] |
|
67 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
68 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
69 + $(INTROSPECTION_SCANNER_ENV) \ |
|
70 $(INTROSPECTION_SCANNER) -v --namespace GstController \ |
|
71 --nsversion=@GST_API_VERSION@ \ |
|
72 --warn-all \ |
|
73 --- gstreamer-1.4.5/libs/gst/net/Makefile.am 2014-10-19 04:41:00.000000000 -0700 |
|
74 +++ gstreamer-1.4.5/libs/gst/net/Makefile.am 2015-06-02 12:57:07.788011768 -0700 |
|
75 @@ -49,6 +49,7 @@ |
|
76 GstNet-@[email protected]: $(INTROSPECTION_SCANNER) libgstnet-@[email protected] |
|
77 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
78 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
79 + $(INTROSPECTION_SCANNER_ENV) \ |
|
80 $(INTROSPECTION_SCANNER) -v --namespace GstNet \ |
|
81 --strip-prefix=Gst \ |
|
82 --warn-all \ |
|