|
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 --- gst-plugins-base-1.4.5/gst-libs/gst/allocators/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
34 +++ gst-plugins-base-1.4.5/gst-libs/gst/allocators/Makefile.am 2015-06-04 17:12:54.478315566 -0700 |
|
35 @@ -25,6 +25,7 @@ |
|
36 GstAllocators-@[email protected]: $(INTROSPECTION_SCANNER) libgstallocators-@[email protected] |
|
37 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
38 GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ |
|
39 + $(INTROSPECTION_SCANNER_ENV) \ |
|
40 $(INTROSPECTION_SCANNER) -v --namespace GstAllocators \ |
|
41 --nsversion=@GST_API_VERSION@ \ |
|
42 --strip-prefix=Gst \ |
|
43 --- gst-plugins-base-1.4.5/gst-libs/gst/app/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
44 +++ gst-plugins-base-1.4.5/gst-libs/gst/app/Makefile.am 2015-06-04 17:13:35.116624781 -0700 |
|
45 @@ -40,6 +40,7 @@ |
|
46 GstApp-@[email protected]: $(INTROSPECTION_SCANNER) libgstapp-@[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 GstApp \ |
|
51 --nsversion=@GST_API_VERSION@ \ |
|
52 --strip-prefix=Gst \ |
|
53 --- gst-plugins-base-1.4.5/gst-libs/gst/audio/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
54 +++ gst-plugins-base-1.4.5/gst-libs/gst/audio/Makefile.am 2015-06-04 17:12:46.980135146 -0700 |
|
55 @@ -86,6 +86,7 @@ |
|
56 GstAudio-@[email protected]: $(INTROSPECTION_SCANNER) libgstaudio-@[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 GstAudio \ |
|
61 --nsversion=@GST_API_VERSION@ \ |
|
62 --warn-all \ |
|
63 --- gst-plugins-base-1.4.5/gst-libs/gst/fft/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
64 +++ gst-plugins-base-1.4.5/gst-libs/gst/fft/Makefile.am 2015-06-04 17:12:59.675367891 -0700 |
|
65 @@ -54,6 +54,7 @@ |
|
66 GstFft-@[email protected]: $(INTROSPECTION_SCANNER) libgstfft-@[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 GstFft \ |
|
71 --nsversion=@GST_API_VERSION@ \ |
|
72 --strip-prefix=Gst \ |
|
73 --- gst-plugins-base-1.4.5/gst-libs/gst/pbutils/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
74 +++ gst-plugins-base-1.4.5/gst-libs/gst/pbutils/Makefile.am 2015-06-04 17:13:07.699023960 -0700 |
|
75 @@ -72,6 +72,7 @@ |
|
76 GstPbutils-@[email protected]: $(INTROSPECTION_SCANNER) libgstpbutils-@[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 GstPbutils \ |
|
81 --nsversion=@GST_API_VERSION@ \ |
|
82 --strip-prefix=Gst \ |
|
83 --- gst-plugins-base-1.4.5/gst-libs/gst/riff/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
84 +++ gst-plugins-base-1.4.5/gst-libs/gst/riff/Makefile.am 2015-06-04 17:13:21.587895211 -0700 |
|
85 @@ -29,6 +29,7 @@ |
|
86 GstRiff-@[email protected]: $(INTROSPECTION_SCANNER) libgstriff-@[email protected] |
|
87 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
88 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
89 + $(INTROSPECTION_SCANNER_ENV) \ |
|
90 $(INTROSPECTION_SCANNER) -v --namespace GstRiff \ |
|
91 --nsversion=@GST_API_VERSION@ \ |
|
92 --strip-prefix=Gst \ |
|
93 --- gst-plugins-base-1.4.5/gst-libs/gst/rtp/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
94 +++ gst-plugins-base-1.4.5/gst-libs/gst/rtp/Makefile.am 2015-06-04 17:13:24.116265594 -0700 |
|
95 @@ -33,6 +33,7 @@ |
|
96 GstRtp-@[email protected]: $(INTROSPECTION_SCANNER) libgstrtp-@[email protected] |
|
97 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
98 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
99 + $(INTROSPECTION_SCANNER_ENV) \ |
|
100 $(INTROSPECTION_SCANNER) -v --namespace GstRtp \ |
|
101 --nsversion=@GST_API_VERSION@ \ |
|
102 --strip-prefix=Gst \ |
|
103 --- gst-plugins-base-1.4.5/gst-libs/gst/rtsp/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
104 +++ gst-plugins-base-1.4.5/gst-libs/gst/rtsp/Makefile.am 2015-06-04 17:13:31.284296511 -0700 |
|
105 @@ -59,6 +59,7 @@ |
|
106 GstRtsp-@[email protected]: $(INTROSPECTION_SCANNER) libgstrtsp-@[email protected] |
|
107 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
108 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
109 + $(INTROSPECTION_SCANNER_ENV) \ |
|
110 $(INTROSPECTION_SCANNER) -v --namespace GstRtsp \ |
|
111 --nsversion=@GST_API_VERSION@ \ |
|
112 --strip-prefix=Gst \ |
|
113 --- gst-plugins-base-1.4.5/gst-libs/gst/sdp/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
114 +++ gst-plugins-base-1.4.5/gst-libs/gst/sdp/Makefile.am 2015-06-04 17:13:12.307563102 -0700 |
|
115 @@ -22,6 +22,7 @@ |
|
116 GstSdp-@[email protected]: $(INTROSPECTION_SCANNER) libgstsdp-@[email protected] |
|
117 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
118 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
119 + $(INTROSPECTION_SCANNER_ENV) \ |
|
120 $(INTROSPECTION_SCANNER) -v --namespace GstSdp \ |
|
121 --nsversion=@GST_API_VERSION@ \ |
|
122 --strip-prefix=Gst \ |
|
123 --- gst-plugins-base-1.4.5/gst-libs/gst/tag/Makefile.am 2014-10-19 04:41:04.000000000 -0700 |
|
124 +++ gst-plugins-base-1.4.5/gst-libs/gst/tag/Makefile.am 2015-06-04 17:13:42.713830718 -0700 |
|
125 @@ -32,6 +32,7 @@ |
|
126 GstTag-@[email protected]: $(INTROSPECTION_SCANNER) libgsttag-@[email protected] |
|
127 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
128 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
129 + $(INTROSPECTION_SCANNER_ENV) \ |
|
130 $(INTROSPECTION_SCANNER) -v --namespace GstTag \ |
|
131 --nsversion=@GST_API_VERSION@ \ |
|
132 --strip-prefix=Gst \ |
|
133 --- gst-plugins-base-1.4.5/gst-libs/gst/video/Makefile.am 2014-10-19 04:42:54.000000000 -0700 |
|
134 +++ gst-plugins-base-1.4.5/gst-libs/gst/video/Makefile.am 2015-06-04 17:13:17.312722219 -0700 |
|
135 @@ -88,6 +88,7 @@ |
|
136 GstVideo-@[email protected]: $(INTROSPECTION_SCANNER) libgstvideo-@[email protected] |
|
137 $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ |
|
138 GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ |
|
139 + $(INTROSPECTION_SCANNER_ENV) \ |
|
140 $(INTROSPECTION_SCANNER) -v --namespace GstVideo \ |
|
141 --nsversion=@GST_API_VERSION@ \ |
|
142 --strip-prefix=Gst \ |
|
143 |