diff options
author | Rogerio Nunes <rogerio.nunes@freescale.com> | 2013-07-09 23:29:48 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-07-10 09:10:44 -0300 |
commit | 0c7944c182bde2677041178fbaafeb1f707cc722 (patch) | |
tree | 01eb2309e3e534a00074b0cd1c2013a70cc37f00 /recipes-multimedia | |
parent | f3e77348d6d361c465b304b87c03bb9fc3cc0336 (diff) | |
download | meta-fsl-arm-0c7944c182bde2677041178fbaafeb1f707cc722.tar.gz |
gst-plugins-gl: Upgrade to IMX_MMCODEC_3.0.35_4.0.0
Change-Id: I95602c3e0d8036df29c7be089f36011801cde40f
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
Diffstat (limited to 'recipes-multimedia')
3 files changed, 2440 insertions, 28590 deletions
diff --git a/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch b/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch deleted file mode 100644 index dec7bfe..0000000 --- a/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch +++ /dev/null | |||
@@ -1,28588 +0,0 @@ | |||
1 | From cd4d8e46207f5151357030f3e785b1e58c968a9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
3 | Date: Fri, 25 Jan 2013 09:46:07 -0500 | ||
4 | Subject: freescale mx6 release 1.1.0 | ||
5 | |||
6 | Updates to the Yocto/Poky package based on GStreamer release 0.10.3 to | ||
7 | match the Freescale BSP version 1.1.0 archive for i.MX6. | ||
8 | |||
9 | Some generated files present in the Freescale release have been | ||
10 | purposely left out. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
15 | --- | ||
16 | BUGS | 3 + | ||
17 | CMakeLists.txt | 113 ++ | ||
18 | GNUmakefile.gnustep | 37 + | ||
19 | Makefile.in | 89 +- | ||
20 | aclocal.m4 | 109 +- | ||
21 | autoregen.sh | 2 + | ||
22 | cmake/modules/FindATK.cmake | 11 + | ||
23 | cmake/modules/FindCairo.cmake | 11 + | ||
24 | cmake/modules/FindGTK2.cmake.off | 44 + | ||
25 | cmake/modules/FindGlew.cmake | 17 + | ||
26 | cmake/modules/FindGlib2.cmake | 43 + | ||
27 | cmake/modules/FindGstreamer.cmake | 130 ++ | ||
28 | cmake/modules/FindLibIconv.cmake | 11 + | ||
29 | cmake/modules/FindLibXml2.cmake.off | 11 + | ||
30 | cmake/modules/FindLibpng.cmake.off | 17 + | ||
31 | cmake/modules/FindOpenGL.cmake.off | 30 + | ||
32 | cmake/modules/FindZlib.cmake.off | 17 + | ||
33 | common/Makefile.in | 41 +- | ||
34 | common/check.mak | 9 +- | ||
35 | common/gen-changelog.py | 99 + | ||
36 | common/gst-glib-gen.mak | 45 + | ||
37 | common/gtk-doc-plugins.mak | 5 +- | ||
38 | common/hooks/post-receive.hook | 290 +++ | ||
39 | common/hooks/pre-commit.hook | 77 + | ||
40 | common/hooks/pre-receive.hook | 95 + | ||
41 | common/m4/Makefile.am | 1 - | ||
42 | common/m4/Makefile.in | 42 +- | ||
43 | common/m4/as-compiler-flag.m4 | 32 + | ||
44 | common/m4/gst-arch.m4 | 41 +- | ||
45 | common/m4/gst-args.m4 | 26 +- | ||
46 | common/m4/gst-check.m4 | 32 + | ||
47 | common/m4/gst-error.m4 | 85 + | ||
48 | common/m4/gst-feature.m4 | 3 +- | ||
49 | common/m4/gst.m4 | 5 + | ||
50 | common/update-common | 82 + | ||
51 | compile | 195 +- | ||
52 | config.guess | 49 +- | ||
53 | config.h.in | 37 +- | ||
54 | config.sub | 65 +- | ||
55 | configure | 2097 +++++++++++++------- | ||
56 | configure.ac | 86 +- | ||
57 | depcomp | 74 +- | ||
58 | docs/DEBUGGING | 73 + | ||
59 | docs/Makefile.in | 41 +- | ||
60 | docs/libs/Makefile.am | 2 +- | ||
61 | docs/libs/Makefile.in | 44 +- | ||
62 | docs/plugins/Makefile.in | 47 +- | ||
63 | docs/plugins/inspect/plugin-libvisual-gl.xml | 4 +- | ||
64 | docs/plugins/inspect/plugin-opengl.xml | 4 +- | ||
65 | ext/CMakeLists.txt | 1 + | ||
66 | ext/Makefile.in | 41 +- | ||
67 | ext/libvisual/CMakeLists.txt | 15 + | ||
68 | ext/libvisual/Makefile.in | 81 +- | ||
69 | gst-libs/CMakeLists.txt | 1 + | ||
70 | gst-libs/Makefile.in | 41 +- | ||
71 | gst-libs/gst/CMakeLists.txt | 1 + | ||
72 | gst-libs/gst/Makefile.in | 41 +- | ||
73 | gst-libs/gst/gl/CMakeLists.txt | 86 + | ||
74 | gst-libs/gst/gl/GNUmakefile.gnustep | 27 + | ||
75 | gst-libs/gst/gl/Makefile.am | 14 + | ||
76 | gst-libs/gst/gl/Makefile.in | 210 +- | ||
77 | gst-libs/gst/gl/gstgldisplay.c | 96 +- | ||
78 | gst-libs/gst/gl/gstgldisplay.h | 5 + | ||
79 | gst-libs/gst/gl/gstglshader.h | 4 + | ||
80 | gst-libs/gst/gl/gstglshadervariables.c | 4 + | ||
81 | gst-libs/gst/gl/gstglvivante.c | 218 ++ | ||
82 | gst-libs/gst/gl/gstglvivante.h | 41 + | ||
83 | gst-libs/gst/gl/gstglwindow.h | 4 + | ||
84 | gst-libs/gst/gl/gstglwindow_fbES2.c | 709 +++++++ | ||
85 | gst-libs/gst/gl/gstglwindow_x11ES2.c | 12 +- | ||
86 | gst/CMakeLists.txt | 1 + | ||
87 | gst/Makefile.in | 41 +- | ||
88 | gst/gl/BUGS | 3 + | ||
89 | gst/gl/CMakeLists.txt | 72 + | ||
90 | gst/gl/GNUmakefile.gnustep | 45 + | ||
91 | gst/gl/Makefile.in | 256 ++- | ||
92 | gst/gl/effects/GNUmakefile.gnustep | 38 + | ||
93 | gst/gl/gstglbumper.c | 3 +- | ||
94 | gst/gl/gstglimagesink.c | 98 +- | ||
95 | gst/gl/gstglimagesink.h | 2 + | ||
96 | gst/gl/gstglupload.c | 22 +- | ||
97 | install-sh | 29 +- | ||
98 | ltmain.sh | 95 +- | ||
99 | m4/Makefile.in | 41 +- | ||
100 | m4/codeset.m4 | 21 + | ||
101 | m4/glibc2.m4 | 30 + | ||
102 | m4/glibc21.m4 | 30 + | ||
103 | m4/intdiv0.m4 | 84 + | ||
104 | m4/intl.m4 | 285 +++ | ||
105 | m4/intldir.m4 | 19 + | ||
106 | m4/intmax.m4 | 33 + | ||
107 | m4/inttypes-pri.m4 | 36 + | ||
108 | m4/inttypes_h.m4 | 26 + | ||
109 | m4/lcmessage.m4 | 30 + | ||
110 | m4/libtool.m4 | 264 +-- | ||
111 | m4/lock.m4 | 316 +++ | ||
112 | m4/longlong.m4 | 109 + | ||
113 | m4/ltoptions.m4 | 19 +- | ||
114 | m4/ltversion.m4 | 10 +- | ||
115 | m4/printf-posix.m4 | 44 + | ||
116 | m4/size_max.m4 | 68 + | ||
117 | m4/stdint_h.m4 | 26 + | ||
118 | m4/uintmax_t.m4 | 30 + | ||
119 | m4/visibility.m4 | 52 + | ||
120 | m4/wchar_t.m4 | 20 + | ||
121 | m4/wint_t.m4 | 28 + | ||
122 | m4/xsize.m4 | 13 + | ||
123 | missing | 53 +- | ||
124 | pkgconfig/Makefile.in | 51 +- | ||
125 | po/Makefile.in.in.orig | 429 ++++ | ||
126 | po/Makevars.template | 41 + | ||
127 | po/gst-plugins-gl-0.10.pot | 21 - | ||
128 | stamp-h.in | 1 + | ||
129 | tests/Makefile.in | 41 +- | ||
130 | tests/check/Makefile.in | 115 +- | ||
131 | tests/examples/Makefile.in | 41 +- | ||
132 | tests/examples/clutter/Makefile.in | 104 +- | ||
133 | tests/examples/clutter/cluttershare.cbp | 77 + | ||
134 | tests/examples/cocoa/Makefile.in | 41 +- | ||
135 | .../cocoa/videoxoverlay/GNUmakefile.gnustep | 35 + | ||
136 | tests/examples/cocoa/videoxoverlay/Makefile.am | 2 +- | ||
137 | tests/examples/cocoa/videoxoverlay/Makefile.in | 82 +- | ||
138 | tests/examples/generic/Makefile.in | 41 +- | ||
139 | tests/examples/generic/cube/Makefile.in | 80 +- | ||
140 | tests/examples/generic/cube/cube.vcproj | 202 ++ | ||
141 | tests/examples/generic/cubeyuv/Makefile.in | 80 +- | ||
142 | tests/examples/generic/cubeyuv/cubeyuv.vcproj | 202 ++ | ||
143 | tests/examples/generic/doublecube/Makefile.in | 80 +- | ||
144 | .../examples/generic/doublecube/doublecube.vcproj | 202 ++ | ||
145 | tests/examples/generic/generic.sln | 38 + | ||
146 | tests/examples/generic/recordgraphic/Makefile | 47 + | ||
147 | tests/examples/generic/recordgraphic/main.cpp | 280 +++ | ||
148 | .../generic/recordgraphic/recordgraphic.vcproj | 202 ++ | ||
149 | tests/examples/gtk/Makefile.in | 75 +- | ||
150 | tests/examples/gtk/filternoxoverlay/Makefile.in | 80 +- | ||
151 | .../gtk/filternoxoverlay/filternoxoverlay.vcproj | 202 ++ | ||
152 | tests/examples/gtk/filterxoverlay/Makefile.in | 80 +- | ||
153 | .../gtk/filterxoverlay/filterxoverlay.vcproj | 210 ++ | ||
154 | tests/examples/gtk/fxtest/Makefile.in | 92 +- | ||
155 | tests/examples/gtk/fxtest/fxtest.vcproj | 210 ++ | ||
156 | tests/examples/gtk/gtk.sln | 50 + | ||
157 | tests/examples/gtk/gtkxoverlay/Makefile.in | 80 +- | ||
158 | tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj | 210 ++ | ||
159 | tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj | 210 ++ | ||
160 | tests/examples/gtk/switchxoverlay/Makefile.in | 80 +- | ||
161 | .../gtk/switchxoverlay/switchxoverlay.vcproj | 210 ++ | ||
162 | tests/examples/qt/Makefile.in | 41 +- | ||
163 | tests/examples/qt/mousexoverlay/gstthread.cpp | 67 + | ||
164 | tests/examples/qt/mousexoverlay/gstthread.h | 56 + | ||
165 | tests/examples/qt/mousexoverlay/main.cpp | 39 + | ||
166 | tests/examples/qt/mousexoverlay/mousexoverlay.pri | 10 + | ||
167 | tests/examples/qt/mousexoverlay/mousexoverlay.pro | 56 + | ||
168 | tests/examples/qt/mousexoverlay/mousexoverlay.sln | 26 + | ||
169 | .../examples/qt/mousexoverlay/mousexoverlay.vcproj | 321 +++ | ||
170 | tests/examples/qt/mousexoverlay/pipeline.cpp | 334 ++++ | ||
171 | tests/examples/qt/mousexoverlay/pipeline.h | 72 + | ||
172 | tests/examples/qt/mousexoverlay/qrenderer.cpp | 58 + | ||
173 | tests/examples/qt/mousexoverlay/qrenderer.h | 47 + | ||
174 | tests/examples/qt/qglwidgetxoverlay/gstthread.cpp | 62 + | ||
175 | tests/examples/qt/qglwidgetxoverlay/gstthread.h | 55 + | ||
176 | tests/examples/qt/qglwidgetxoverlay/main.cpp | 39 + | ||
177 | tests/examples/qt/qglwidgetxoverlay/pipeline.cpp | 332 ++++ | ||
178 | tests/examples/qt/qglwidgetxoverlay/pipeline.h | 70 + | ||
179 | .../examples/qt/qglwidgetxoverlay/qglrenderer.cpp | 52 + | ||
180 | tests/examples/qt/qglwidgetxoverlay/qglrenderer.h | 45 + | ||
181 | .../qt/qglwidgetxoverlay/qglwidgetxoverlay.pri | 10 + | ||
182 | .../qt/qglwidgetxoverlay/qglwidgetxoverlay.pro | 57 + | ||
183 | .../qt/qglwidgetxoverlay/qglwidgetxoverlay.sln | 26 + | ||
184 | .../qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj | 320 +++ | ||
185 | tests/examples/qt/qglwtextureshare/AsyncQueue.h | 77 + | ||
186 | .../examples/qt/qglwtextureshare/GstGLBufferDef.h | 40 + | ||
187 | tests/examples/qt/qglwtextureshare/README | 29 + | ||
188 | tests/examples/qt/qglwtextureshare/cocoa_utils.mm | 26 + | ||
189 | tests/examples/qt/qglwtextureshare/glcontextid.h | 64 + | ||
190 | tests/examples/qt/qglwtextureshare/gstthread.cpp | 66 + | ||
191 | tests/examples/qt/qglwtextureshare/gstthread.h | 56 + | ||
192 | tests/examples/qt/qglwtextureshare/main.cpp | 36 + | ||
193 | tests/examples/qt/qglwtextureshare/pipeline.cpp | 222 +++ | ||
194 | tests/examples/qt/qglwtextureshare/pipeline.h | 68 + | ||
195 | tests/examples/qt/qglwtextureshare/qglrenderer.cpp | 214 ++ | ||
196 | tests/examples/qt/qglwtextureshare/qglrenderer.h | 59 + | ||
197 | .../qt/qglwtextureshare/qglwtextureshare.pro | 81 + | ||
198 | tests/examples/qt/videoxoverlay/gstthread.cpp | 64 + | ||
199 | tests/examples/qt/videoxoverlay/gstthread.h | 55 + | ||
200 | tests/examples/qt/videoxoverlay/main.cpp | 40 + | ||
201 | tests/examples/qt/videoxoverlay/pipeline.cpp | 271 +++ | ||
202 | tests/examples/qt/videoxoverlay/pipeline.h | 66 + | ||
203 | tests/examples/qt/videoxoverlay/qrenderer.cpp | 57 + | ||
204 | tests/examples/qt/videoxoverlay/qrenderer.h | 48 + | ||
205 | tests/examples/qt/videoxoverlay/videoxoverlay.pri | 10 + | ||
206 | tests/examples/qt/videoxoverlay/videoxoverlay.pro | 53 + | ||
207 | tests/examples/qt/videoxoverlay/videoxoverlay.sln | 26 + | ||
208 | .../examples/qt/videoxoverlay/videoxoverlay.vcproj | 320 +++ | ||
209 | tests/examples/sdl/Makefile.in | 80 +- | ||
210 | tests/examples/sdl/sdl.sln | 20 + | ||
211 | tests/examples/sdl/sdlshare.vcproj | 199 ++ | ||
212 | tests/icles/Makefile.in | 41 +- | ||
213 | tests/pipelines | 79 + | ||
214 | unix/codeblocks/gstopengl/gstopengl.cbp | 236 +++ | ||
215 | unixES/codeblocks/gstopengl.cbp | 137 ++ | ||
216 | win32/codeblock/gstopengl.cbp | 242 +++ | ||
217 | win32/common/config.h | 232 +++ | ||
218 | win32/vs9/libgstopengl.vcproj | 508 +++++ | ||
219 | winCE/common/config.h | 226 +++ | ||
220 | winCE/common/config.h.in | 226 +++ | ||
221 | winCE/vs9/libgstopengl.vcproj | 336 ++++ | ||
222 | 206 files changed, 16992 insertions(+), 2704 deletions(-) | ||
223 | create mode 100644 BUGS | ||
224 | create mode 100644 CMakeLists.txt | ||
225 | create mode 100644 GNUmakefile.gnustep | ||
226 | create mode 100644 autoregen.sh | ||
227 | create mode 100644 cmake/modules/FindATK.cmake | ||
228 | create mode 100644 cmake/modules/FindCairo.cmake | ||
229 | create mode 100644 cmake/modules/FindGTK2.cmake.off | ||
230 | create mode 100644 cmake/modules/FindGlew.cmake | ||
231 | create mode 100644 cmake/modules/FindGlib2.cmake | ||
232 | create mode 100644 cmake/modules/FindGstreamer.cmake | ||
233 | create mode 100644 cmake/modules/FindLibIconv.cmake | ||
234 | create mode 100644 cmake/modules/FindLibXml2.cmake.off | ||
235 | create mode 100644 cmake/modules/FindLibpng.cmake.off | ||
236 | create mode 100644 cmake/modules/FindOpenGL.cmake.off | ||
237 | create mode 100644 cmake/modules/FindZlib.cmake.off | ||
238 | create mode 100644 common/gen-changelog.py | ||
239 | create mode 100644 common/gst-glib-gen.mak | ||
240 | create mode 100644 common/hooks/post-receive.hook | ||
241 | create mode 100644 common/hooks/pre-commit.hook | ||
242 | create mode 100644 common/hooks/pre-receive.hook | ||
243 | create mode 100644 common/update-common | ||
244 | create mode 100644 docs/DEBUGGING | ||
245 | create mode 100644 ext/CMakeLists.txt | ||
246 | create mode 100644 ext/libvisual/CMakeLists.txt | ||
247 | create mode 100644 gst-libs/CMakeLists.txt | ||
248 | create mode 100644 gst-libs/gst/CMakeLists.txt | ||
249 | create mode 100644 gst-libs/gst/gl/CMakeLists.txt | ||
250 | create mode 100644 gst-libs/gst/gl/GNUmakefile.gnustep | ||
251 | create mode 100644 gst-libs/gst/gl/gstglvivante.c | ||
252 | create mode 100644 gst-libs/gst/gl/gstglvivante.h | ||
253 | create mode 100644 gst-libs/gst/gl/gstglwindow_fbES2.c | ||
254 | create mode 100644 gst/CMakeLists.txt | ||
255 | create mode 100644 gst/gl/BUGS | ||
256 | create mode 100644 gst/gl/CMakeLists.txt | ||
257 | create mode 100644 gst/gl/GNUmakefile.gnustep | ||
258 | create mode 100644 gst/gl/effects/GNUmakefile.gnustep | ||
259 | create mode 100644 m4/codeset.m4 | ||
260 | create mode 100644 m4/glibc2.m4 | ||
261 | create mode 100644 m4/glibc21.m4 | ||
262 | create mode 100644 m4/intdiv0.m4 | ||
263 | create mode 100644 m4/intl.m4 | ||
264 | create mode 100644 m4/intldir.m4 | ||
265 | create mode 100644 m4/intmax.m4 | ||
266 | create mode 100644 m4/inttypes-pri.m4 | ||
267 | create mode 100644 m4/inttypes_h.m4 | ||
268 | create mode 100644 m4/lcmessage.m4 | ||
269 | create mode 100644 m4/lock.m4 | ||
270 | create mode 100644 m4/longlong.m4 | ||
271 | create mode 100644 m4/printf-posix.m4 | ||
272 | create mode 100644 m4/size_max.m4 | ||
273 | create mode 100644 m4/stdint_h.m4 | ||
274 | create mode 100644 m4/uintmax_t.m4 | ||
275 | create mode 100644 m4/visibility.m4 | ||
276 | create mode 100644 m4/wchar_t.m4 | ||
277 | create mode 100644 m4/wint_t.m4 | ||
278 | create mode 100644 m4/xsize.m4 | ||
279 | create mode 100644 po/Makefile.in.in.orig | ||
280 | create mode 100644 po/Makevars.template | ||
281 | delete mode 100644 po/gst-plugins-gl-0.10.pot | ||
282 | create mode 100644 stamp-h.in | ||
283 | create mode 100644 tests/examples/clutter/cluttershare.cbp | ||
284 | create mode 100644 tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep | ||
285 | create mode 100644 tests/examples/generic/cube/cube.vcproj | ||
286 | create mode 100644 tests/examples/generic/cubeyuv/cubeyuv.vcproj | ||
287 | create mode 100644 tests/examples/generic/doublecube/doublecube.vcproj | ||
288 | create mode 100644 tests/examples/generic/generic.sln | ||
289 | create mode 100644 tests/examples/generic/recordgraphic/Makefile | ||
290 | create mode 100644 tests/examples/generic/recordgraphic/main.cpp | ||
291 | create mode 100644 tests/examples/generic/recordgraphic/recordgraphic.vcproj | ||
292 | create mode 100644 tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj | ||
293 | create mode 100644 tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj | ||
294 | create mode 100644 tests/examples/gtk/fxtest/fxtest.vcproj | ||
295 | create mode 100644 tests/examples/gtk/gtk.sln | ||
296 | create mode 100644 tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj | ||
297 | create mode 100644 tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj | ||
298 | create mode 100644 tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj | ||
299 | create mode 100644 tests/examples/qt/mousexoverlay/gstthread.cpp | ||
300 | create mode 100644 tests/examples/qt/mousexoverlay/gstthread.h | ||
301 | create mode 100644 tests/examples/qt/mousexoverlay/main.cpp | ||
302 | create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.pri | ||
303 | create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.pro | ||
304 | create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.sln | ||
305 | create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.vcproj | ||
306 | create mode 100644 tests/examples/qt/mousexoverlay/pipeline.cpp | ||
307 | create mode 100644 tests/examples/qt/mousexoverlay/pipeline.h | ||
308 | create mode 100644 tests/examples/qt/mousexoverlay/qrenderer.cpp | ||
309 | create mode 100644 tests/examples/qt/mousexoverlay/qrenderer.h | ||
310 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/gstthread.cpp | ||
311 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/gstthread.h | ||
312 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/main.cpp | ||
313 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/pipeline.cpp | ||
314 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/pipeline.h | ||
315 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp | ||
316 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglrenderer.h | ||
317 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri | ||
318 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro | ||
319 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln | ||
320 | create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj | ||
321 | create mode 100644 tests/examples/qt/qglwtextureshare/AsyncQueue.h | ||
322 | create mode 100644 tests/examples/qt/qglwtextureshare/GstGLBufferDef.h | ||
323 | create mode 100644 tests/examples/qt/qglwtextureshare/README | ||
324 | create mode 100644 tests/examples/qt/qglwtextureshare/cocoa_utils.mm | ||
325 | create mode 100644 tests/examples/qt/qglwtextureshare/glcontextid.h | ||
326 | create mode 100644 tests/examples/qt/qglwtextureshare/gstthread.cpp | ||
327 | create mode 100644 tests/examples/qt/qglwtextureshare/gstthread.h | ||
328 | create mode 100644 tests/examples/qt/qglwtextureshare/main.cpp | ||
329 | create mode 100644 tests/examples/qt/qglwtextureshare/pipeline.cpp | ||
330 | create mode 100644 tests/examples/qt/qglwtextureshare/pipeline.h | ||
331 | create mode 100644 tests/examples/qt/qglwtextureshare/qglrenderer.cpp | ||
332 | create mode 100644 tests/examples/qt/qglwtextureshare/qglrenderer.h | ||
333 | create mode 100644 tests/examples/qt/qglwtextureshare/qglwtextureshare.pro | ||
334 | create mode 100644 tests/examples/qt/videoxoverlay/gstthread.cpp | ||
335 | create mode 100644 tests/examples/qt/videoxoverlay/gstthread.h | ||
336 | create mode 100644 tests/examples/qt/videoxoverlay/main.cpp | ||
337 | create mode 100644 tests/examples/qt/videoxoverlay/pipeline.cpp | ||
338 | create mode 100644 tests/examples/qt/videoxoverlay/pipeline.h | ||
339 | create mode 100644 tests/examples/qt/videoxoverlay/qrenderer.cpp | ||
340 | create mode 100644 tests/examples/qt/videoxoverlay/qrenderer.h | ||
341 | create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.pri | ||
342 | create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.pro | ||
343 | create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.sln | ||
344 | create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.vcproj | ||
345 | create mode 100644 tests/examples/sdl/sdl.sln | ||
346 | create mode 100644 tests/examples/sdl/sdlshare.vcproj | ||
347 | create mode 100644 tests/pipelines | ||
348 | create mode 100644 unix/codeblocks/gstopengl/gstopengl.cbp | ||
349 | create mode 100644 unixES/codeblocks/gstopengl.cbp | ||
350 | create mode 100644 win32/codeblock/gstopengl.cbp | ||
351 | create mode 100644 win32/common/config.h | ||
352 | create mode 100644 win32/vs9/libgstopengl.vcproj | ||
353 | create mode 100644 winCE/common/config.h | ||
354 | create mode 100644 winCE/common/config.h.in | ||
355 | create mode 100644 winCE/vs9/libgstopengl.vcproj | ||
356 | |||
357 | diff --git a/BUGS b/BUGS | ||
358 | new file mode 100644 | ||
359 | index 0000000..37d1a26 | ||
360 | --- /dev/null | ||
361 | +++ b/BUGS | ||
362 | @@ -0,0 +1,3 @@ | ||
363 | +-- | ||
364 | + | ||
365 | +-- | ||
366 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
367 | new file mode 100644 | ||
368 | index 0000000..e633e59 | ||
369 | --- /dev/null | ||
370 | +++ b/CMakeLists.txt | ||
371 | @@ -0,0 +1,113 @@ | ||
372 | +cmake_minimum_required(VERSION "2.8.0") | ||
373 | + | ||
374 | +# TODO: use pkg-config | ||
375 | +# --- | ||
376 | +# INCLUDE(FindPkgConfig) | ||
377 | +# pkg_check_modules(GLIB2 glib-2.0) | ||
378 | +# pkg_check_modules(GSTREAMER gstreamer-0.10) | ||
379 | +# --- | ||
380 | + | ||
381 | +list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) | ||
382 | + | ||
383 | +project (GST-PLUGINS-GL) | ||
384 | + | ||
385 | +if (WIN32) | ||
386 | + set(OSSBUILD_SDK_DIR $ENV{OSSBUILD_GSTREAMER_SDK_DIR}) | ||
387 | + if (OSSBUILD_SDK_DIR) | ||
388 | + set(OSSBUILD_SDK_INCLUDE_DIR ${OSSBUILD_SDK_DIR}/include) | ||
389 | + #set(CMAKE_PREFIX_PATH ${OSSBUILD_SDK_DIR}) | ||
390 | + set(CMAKE_INCLUDE_PATH ${OSSBUILD_SDK_INCLUDE_DIR}) | ||
391 | + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/glib-2.0) | ||
392 | + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/gstreamer-0.10) | ||
393 | + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/libxml2) | ||
394 | + endif (OSSBUILD_SDK_DIR) | ||
395 | + set(OSSBUILD_DIR $ENV{OSSBUILD_GSTREAMER_DIR}) | ||
396 | + if (OSSBUILD_DIR) | ||
397 | + #set(ENV{GSTREAMER_DIR} ${OSSBUILD_DIR}) | ||
398 | + set(CMAKE_LIBRARY_PATH ${OSSBUILD_DIR}/bin) | ||
399 | + set(JPEG_NAMES jpeg-8) | ||
400 | + #set(FREETYPE_NAMES freetype-6) | ||
401 | + message(STATUS ${CMAKE_LIBRARY_PATH}) | ||
402 | + endif (OSSBUILD_DIR) | ||
403 | +endif (WIN32) | ||
404 | + | ||
405 | +# built-in | ||
406 | +find_package(OpenGL REQUIRED) | ||
407 | +find_package(GTK2 REQUIRED) | ||
408 | +find_package(Glib2 REQUIRED) | ||
409 | +find_package(LibXml2 REQUIRED) | ||
410 | +find_package(JPEG REQUIRED) | ||
411 | +find_package(PNG REQUIRED) | ||
412 | +find_package(ZLIB REQUIRED) | ||
413 | + | ||
414 | +# home made | ||
415 | +find_package(Glib2 REQUIRED) | ||
416 | +find_package(Gstreamer REQUIRED) | ||
417 | +find_package(Glew REQUIRED) | ||
418 | +find_package(LibIconv REQUIRED) | ||
419 | +find_package(ATK REQUIRED) | ||
420 | +find_package(Cairo REQUIRED) | ||
421 | + | ||
422 | +function(check_package name LEVEL) | ||
423 | + if (${name}_FOUND) | ||
424 | + message(STATUS "Found ${name}... YES") | ||
425 | + else (${name}_FOUND) | ||
426 | + message(STATUS "Found ${name}... NO") | ||
427 | + if (LEVEL) | ||
428 | + if (WIN32) | ||
429 | + message(FATAL_ERROR "You should set the env variable ${name}_DIR") | ||
430 | + else (WIN32) | ||
431 | + message(FATAL_ERROR "You should install ${name} dev package") | ||
432 | + endif (WIN32) | ||
433 | + endif (LEVEL) | ||
434 | + endif (${name}_FOUND) | ||
435 | +endfunction(check_package) | ||
436 | + | ||
437 | +# required packages | ||
438 | +check_package(GLIB2 1) | ||
439 | +check_package(GSTREAMER 1) | ||
440 | +check_package(OPENGL 1) | ||
441 | +check_package(GLEW 1) | ||
442 | +check_package(PNG 1) | ||
443 | +if (WIN32) | ||
444 | +check_package(ZLIB 1) | ||
445 | +endif (WIN32) | ||
446 | + | ||
447 | +# conditionnal required packages | ||
448 | +INCLUDE (CheckIncludeFiles) | ||
449 | +CHECK_INCLUDE_FILES (${GSTREAMER_DIR}/include/gst/gstconfig.h GST_USING_BINARY_REGISTRY) | ||
450 | +if (NOT GST_USING_BINARY_REGISTRY) | ||
451 | +check_package(LIBXML2 1) | ||
452 | +check_package(LIBICONV 1) | ||
453 | +endif (NOT GST_USING_BINARY_REGISTRY) | ||
454 | + | ||
455 | +# optionnal packages | ||
456 | +check_package(GTK2 0) | ||
457 | +check_package(ATK 0) | ||
458 | +check_package(CAIRO 0) | ||
459 | + | ||
460 | +# debug | ||
461 | +#message("****" ${GLIB2_INCLUDE_DIR}) | ||
462 | +#message("****" ${GLIB2_LIBRARIES}) | ||
463 | +#message("****" ${LIBXML2_INCLUDE_DIR}) | ||
464 | +#message("****" ${LIBICONV_INCLUDE_DIR}) | ||
465 | +#message("****" ${GSTREAMER_INCLUDE_DIR}) | ||
466 | +#message("****" ${GSTREAMER_LIBRARIES}) | ||
467 | +#message("****" ${OPENGL_INCLUDE_DIR}) | ||
468 | +#message("****" ${OPENGL_LIBRARIES}) | ||
469 | +#message("****" ${GLEW_INCLUDE_DIR}) | ||
470 | +#message("****" ${GLEW_LIBRARY}) | ||
471 | +#message("****" ${PNG_INCLUDE_DIR}) | ||
472 | +#message("****" ${PNG_LIBRARY}) | ||
473 | +#message("****" ${GTK2_INCLUDE_DIR}) | ||
474 | +#message("****" ${GTK2_LIBRARIES}) | ||
475 | +#message("****" ${ATK_INCLUDE_DIR}) | ||
476 | +#message("****" ${CAIRO_INCLUDE_DIR}) | ||
477 | + | ||
478 | +add_subdirectory (gst-libs) | ||
479 | +add_subdirectory (gst) | ||
480 | + | ||
481 | +#add_dependencies(gstgl) | ||
482 | + | ||
483 | +#FIXME: generate config.h | ||
484 | +add_definitions(-DHAVE_CONFIG_H) | ||
485 | diff --git a/GNUmakefile.gnustep b/GNUmakefile.gnustep | ||
486 | new file mode 100644 | ||
487 | index 0000000..2e45c73 | ||
488 | --- /dev/null | ||
489 | +++ b/GNUmakefile.gnustep | ||
490 | @@ -0,0 +1,37 @@ | ||
491 | +export MAKEFILE_NAME = GNUmakefile.gnustep | ||
492 | + | ||
493 | +include $(GNUSTEP_MAKEFILES)/common.make | ||
494 | + | ||
495 | +LIBRARY_NAME = libgstopengl | ||
496 | + | ||
497 | +libgstopengl_VERSION = 1.0.0 | ||
498 | + | ||
499 | +libgstopengl_SUBPROJECTS = gst-libs/gst/gl gst/gl gst/gl/effects | ||
500 | + | ||
501 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
502 | + libgstopengl_LIB_DIRS += \ | ||
503 | + -LC:/gstreamer/bin | ||
504 | +endif | ||
505 | + | ||
506 | +libgstopengl_TOOL_LIBS = \ | ||
507 | + -lglib-2.0-0 \ | ||
508 | + -lgobject-2.0-0 \ | ||
509 | + -lgmodule-2.0-0 \ | ||
510 | + -lgthread-2.0-0 \ | ||
511 | + -lgstreamer-0.10 \ | ||
512 | + -lgstbase-0.10 \ | ||
513 | + -lgstvideo-0.10 \ | ||
514 | + -lgstinterfaces-0.10 \ | ||
515 | + -lgstcontroller-0.10 \ | ||
516 | + -lpng \ | ||
517 | + -lz | ||
518 | + | ||
519 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
520 | + libgstopengl_TOOL_LIBS += \ | ||
521 | + -lglu32 \ | ||
522 | + -lopengl32 \ | ||
523 | + -lglew32 \ | ||
524 | + -lgdi32 | ||
525 | +endif | ||
526 | + | ||
527 | +include $(GNUSTEP_MAKEFILES)/library.make | ||
528 | diff --git a/Makefile.in b/Makefile.in | ||
529 | index 9a1fefa..14dc690 100644 | ||
530 | --- a/Makefile.in | ||
531 | +++ b/Makefile.in | ||
532 | @@ -1,9 +1,9 @@ | ||
533 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
534 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
535 | # @configure_input@ | ||
536 | |||
537 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
538 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
539 | -# Foundation, Inc. | ||
540 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
541 | +# Inc. | ||
542 | # This Makefile.in is free software; the Free Software Foundation | ||
543 | # gives unlimited permission to copy and/or distribute it, | ||
544 | # with or without modifications, as long as this notice is preserved. | ||
545 | @@ -44,6 +44,7 @@ PRE_UNINSTALL = : | ||
546 | POST_UNINSTALL = : | ||
547 | build_triplet = @build@ | ||
548 | host_triplet = @host@ | ||
549 | +target_triplet = @target@ | ||
550 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | ||
551 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | ||
552 | $(srcdir)/gst-plugins-gl.spec.in \ | ||
553 | @@ -60,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
554 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
555 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
556 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
557 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
558 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
559 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
560 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
561 | @@ -95,11 +95,11 @@ mkinstalldirs = $(install_sh) -d | ||
562 | CONFIG_HEADER = config.h | ||
563 | CONFIG_CLEAN_FILES = gst-plugins-gl.spec win32/common/config.h | ||
564 | CONFIG_CLEAN_VPATH_FILES = | ||
565 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
566 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
567 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
568 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
569 | am__v_GEN_0 = @echo " GEN " $@; | ||
570 | -AM_V_at = $(am__v_at_@AM_V@) | ||
571 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
572 | +AM_V_at = $(am__v_at_$(V)) | ||
573 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
574 | am__v_at_0 = @ | ||
575 | SOURCES = | ||
576 | DIST_SOURCES = | ||
577 | @@ -121,11 +121,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
578 | distdir = $(PACKAGE)-$(VERSION) | ||
579 | top_distdir = $(distdir) | ||
580 | am__remove_distdir = \ | ||
581 | - if test -d "$(distdir)"; then \ | ||
582 | - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
583 | - && rm -rf "$(distdir)" \ | ||
584 | - || { sleep 5 && rm -rf "$(distdir)"; }; \ | ||
585 | - else :; fi | ||
586 | + { test ! -d "$(distdir)" \ | ||
587 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
588 | + && rm -fr "$(distdir)"; }; } | ||
589 | am__relativize = \ | ||
590 | dir0=`pwd`; \ | ||
591 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
592 | @@ -154,8 +152,6 @@ am__relativize = \ | ||
593 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 | ||
594 | GZIP_ENV = --best | ||
595 | distuninstallcheck_listfiles = find . -type f -print | ||
596 | -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
597 | - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
598 | distcleancheck_listfiles = find . -type f -print | ||
599 | ACLOCAL = @ACLOCAL@ | ||
600 | ACLOCAL_AMFLAGS = -I m4 -I common/m4 | ||
601 | @@ -203,6 +199,7 @@ ECHO_T = @ECHO_T@ | ||
602 | EGREP = @EGREP@ | ||
603 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
604 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
605 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
606 | EXEEXT = @EXEEXT@ | ||
607 | FFLAGS = @FFLAGS@ | ||
608 | FGREP = @FGREP@ | ||
609 | @@ -234,6 +231,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
610 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
611 | GST_CURRENT = @GST_CURRENT@ | ||
612 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
613 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
614 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
615 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
616 | GST_LIBS = @GST_LIBS@ | ||
617 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
618 | @@ -241,8 +240,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
619 | GST_LICENSE = @GST_LICENSE@ | ||
620 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
621 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
622 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
623 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
624 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
625 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
626 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
627 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
628 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
629 | @@ -315,7 +316,7 @@ NM = @NM@ | ||
630 | NMEDIT = @NMEDIT@ | ||
631 | OBJC = @OBJC@ | ||
632 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
633 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
634 | +OBJCFLAGS = @OBJCFLAGS@ | ||
635 | OBJDUMP = @OBJDUMP@ | ||
636 | OBJEXT = @OBJEXT@ | ||
637 | OPENGL_ES2 = @OPENGL_ES2@ | ||
638 | @@ -360,6 +361,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
639 | VERSION = @VERSION@ | ||
640 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
641 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
642 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
643 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
644 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
645 | XGETTEXT = @XGETTEXT@ | ||
646 | @@ -425,7 +427,11 @@ sbindir = @sbindir@ | ||
647 | sharedstatedir = @sharedstatedir@ | ||
648 | srcdir = @srcdir@ | ||
649 | sysconfdir = @sysconfdir@ | ||
650 | +target = @target@ | ||
651 | target_alias = @target_alias@ | ||
652 | +target_cpu = @target_cpu@ | ||
653 | +target_os = @target_os@ | ||
654 | +target_vendor = @target_vendor@ | ||
655 | top_build_prefix = @top_build_prefix@ | ||
656 | top_builddir = @top_builddir@ | ||
657 | top_srcdir = @top_srcdir@ | ||
658 | @@ -488,7 +494,7 @@ all: config.h | ||
659 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | ||
660 | |||
661 | .SUFFIXES: | ||
662 | -am--refresh: Makefile | ||
663 | +am--refresh: | ||
664 | @: | ||
665 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/win32.mak $(top_srcdir)/common/release.mak $(top_srcdir)/common/po.mak $(top_srcdir)/common/coverage/lcov.mak $(top_srcdir)/common/cruft.mak $(am__configure_deps) | ||
666 | @for dep in $?; do \ | ||
667 | @@ -513,7 +519,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
668 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
669 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
670 | esac; | ||
671 | -$(top_srcdir)/common/win32.mak $(top_srcdir)/common/release.mak $(top_srcdir)/common/po.mak $(top_srcdir)/common/coverage/lcov.mak $(top_srcdir)/common/cruft.mak: | ||
672 | |||
673 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
674 | $(SHELL) ./config.status --recheck | ||
675 | @@ -525,8 +530,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
676 | $(am__aclocal_m4_deps): | ||
677 | |||
678 | config.h: stamp-h1 | ||
679 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi | ||
680 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi | ||
681 | + @if test ! -f $@; then \ | ||
682 | + rm -f stamp-h1; \ | ||
683 | + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | ||
684 | + else :; fi | ||
685 | |||
686 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | ||
687 | @rm -f stamp-h1 | ||
688 | @@ -761,11 +768,7 @@ dist-gzip: distdir | ||
689 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||
690 | $(am__remove_distdir) | ||
691 | dist-bzip2: distdir | ||
692 | - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | ||
693 | - $(am__remove_distdir) | ||
694 | - | ||
695 | -dist-lzip: distdir | ||
696 | - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz | ||
697 | + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | ||
698 | $(am__remove_distdir) | ||
699 | |||
700 | dist-lzma: distdir | ||
701 | @@ -773,7 +776,7 @@ dist-lzma: distdir | ||
702 | $(am__remove_distdir) | ||
703 | |||
704 | dist-xz: distdir | ||
705 | - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | ||
706 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | ||
707 | $(am__remove_distdir) | ||
708 | |||
709 | dist-tarZ: distdir | ||
710 | @@ -791,7 +794,7 @@ dist-zip: distdir | ||
711 | |||
712 | dist dist-all: distdir | ||
713 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||
714 | - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | ||
715 | + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | ||
716 | $(am__remove_distdir) | ||
717 | |||
718 | # This target untars the dist file and tries a VPATH configuration. Then | ||
719 | @@ -805,8 +808,6 @@ distcheck: dist | ||
720 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | ||
721 | *.tar.lzma*) \ | ||
722 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | ||
723 | - *.tar.lz*) \ | ||
724 | - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ | ||
725 | *.tar.xz*) \ | ||
726 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | ||
727 | *.tar.Z*) \ | ||
728 | @@ -827,7 +828,6 @@ distcheck: dist | ||
729 | && am__cwd=`pwd` \ | ||
730 | && $(am__cd) $(distdir)/_build \ | ||
731 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | ||
732 | - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | ||
733 | $(DISTCHECK_CONFIGURE_FLAGS) \ | ||
734 | && $(MAKE) $(AM_MAKEFLAGS) \ | ||
735 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | ||
736 | @@ -856,16 +856,8 @@ distcheck: dist | ||
737 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | ||
738 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | ||
739 | distuninstallcheck: | ||
740 | - @test -n '$(distuninstallcheck_dir)' || { \ | ||
741 | - echo 'ERROR: trying to run $@ with an empty' \ | ||
742 | - '$$(distuninstallcheck_dir)' >&2; \ | ||
743 | - exit 1; \ | ||
744 | - }; \ | ||
745 | - $(am__cd) '$(distuninstallcheck_dir)' || { \ | ||
746 | - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ | ||
747 | - exit 1; \ | ||
748 | - }; \ | ||
749 | - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ | ||
750 | + @$(am__cd) '$(distuninstallcheck_dir)' \ | ||
751 | + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | ||
752 | || { echo "ERROR: files left after uninstall:" ; \ | ||
753 | if test -n "$(DESTDIR)"; then \ | ||
754 | echo " (check DESTDIR support)"; \ | ||
755 | @@ -896,15 +888,10 @@ install-am: all-am | ||
756 | |||
757 | installcheck: installcheck-recursive | ||
758 | install-strip: | ||
759 | - if test -z '$(STRIP)'; then \ | ||
760 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
761 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
762 | - install; \ | ||
763 | - else \ | ||
764 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
765 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
766 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
767 | - fi | ||
768 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
769 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
770 | + `test -z '$(STRIP)' || \ | ||
771 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
772 | mostlyclean-generic: | ||
773 | |||
774 | clean-generic: | ||
775 | @@ -993,8 +980,8 @@ uninstall-am: | ||
776 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
777 | all all-am all-local am--refresh check check-am clean \ | ||
778 | clean-generic clean-libtool ctags ctags-recursive dist \ | ||
779 | - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ | ||
780 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ | ||
781 | + dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ | ||
782 | + dist-tarZ dist-xz dist-zip distcheck distclean \ | ||
783 | distclean-generic distclean-hdr distclean-libtool \ | ||
784 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ | ||
785 | dvi-am html html-am info info-am install install-am \ | ||
786 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
787 | index ed8b8b0..0a6549d 100644 | ||
788 | --- a/aclocal.m4 | ||
789 | +++ b/aclocal.m4 | ||
790 | @@ -1,8 +1,7 @@ | ||
791 | -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- | ||
792 | +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- | ||
793 | |||
794 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | ||
795 | -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, | ||
796 | -# Inc. | ||
797 | +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
798 | # This file is free software; the Free Software Foundation | ||
799 | # gives unlimited permission to copy and/or distribute it, | ||
800 | # with or without modifications, as long as this notice is preserved. | ||
801 | @@ -20,15 +19,12 @@ You have another version of autoconf. It may work, but is not guaranteed to. | ||
802 | If you have problems, you may need to regenerate the build system entirely. | ||
803 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | ||
804 | |||
805 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software | ||
806 | -# Foundation, Inc. | ||
807 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
808 | # | ||
809 | # This file is free software; the Free Software Foundation | ||
810 | # gives unlimited permission to copy and/or distribute it, | ||
811 | # with or without modifications, as long as this notice is preserved. | ||
812 | |||
813 | -# serial 1 | ||
814 | - | ||
815 | # AM_AUTOMAKE_VERSION(VERSION) | ||
816 | # ---------------------------- | ||
817 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | ||
818 | @@ -38,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
819 | [am__api_version='1.11' | ||
820 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
821 | dnl require some minimum version. Point them to the right macro. | ||
822 | -m4_if([$1], [1.11.3], [], | ||
823 | +m4_if([$1], [1.11.1], [], | ||
824 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
825 | ]) | ||
826 | |||
827 | @@ -54,21 +50,19 @@ m4_define([_AM_AUTOCONF_VERSION], []) | ||
828 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
829 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
830 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
831 | -[AM_AUTOMAKE_VERSION([1.11.3])dnl | ||
832 | +[AM_AUTOMAKE_VERSION([1.11.1])dnl | ||
833 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
834 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
835 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
836 | |||
837 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | ||
838 | |||
839 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. | ||
840 | +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | ||
841 | # | ||
842 | # This file is free software; the Free Software Foundation | ||
843 | # gives unlimited permission to copy and/or distribute it, | ||
844 | # with or without modifications, as long as this notice is preserved. | ||
845 | |||
846 | -# serial 1 | ||
847 | - | ||
848 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | ||
849 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | ||
850 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. | ||
851 | @@ -150,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE( | ||
852 | Usually this means the macro was only invoked conditionally.]]) | ||
853 | fi])]) | ||
854 | |||
855 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, | ||
856 | -# 2010, 2011 Free Software Foundation, Inc. | ||
857 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | ||
858 | +# Free Software Foundation, Inc. | ||
859 | # | ||
860 | # This file is free software; the Free Software Foundation | ||
861 | # gives unlimited permission to copy and/or distribute it, | ||
862 | # with or without modifications, as long as this notice is preserved. | ||
863 | |||
864 | -# serial 12 | ||
865 | +# serial 10 | ||
866 | |||
867 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | ||
868 | # written in clear, in which case automake, when reading aclocal.m4, | ||
869 | @@ -197,7 +191,6 @@ AC_CACHE_CHECK([dependency style of $depcc], | ||
870 | # instance it was reported that on HP-UX the gcc test will end up | ||
871 | # making a dummy file named `D' -- because `-MD' means `put the output | ||
872 | # in D'. | ||
873 | - rm -rf conftest.dir | ||
874 | mkdir conftest.dir | ||
875 | # Copy depcomp to subdir because otherwise we won't find it if we're | ||
876 | # using a relative directory. | ||
877 | @@ -262,7 +255,7 @@ AC_CACHE_CHECK([dependency style of $depcc], | ||
878 | break | ||
879 | fi | ||
880 | ;; | ||
881 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
882 | + msvisualcpp | msvcmsys) | ||
883 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
884 | # not run yet. These depmodes are late enough in the game, and | ||
885 | # so weak that their functioning should not be impacted. | ||
886 | @@ -327,13 +320,10 @@ AC_DEFUN([AM_DEP_TRACK], | ||
887 | if test "x$enable_dependency_tracking" != xno; then | ||
888 | am_depcomp="$ac_aux_dir/depcomp" | ||
889 | AMDEPBACKSLASH='\' | ||
890 | - am__nodep='_no' | ||
891 | fi | ||
892 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | ||
893 | AC_SUBST([AMDEPBACKSLASH])dnl | ||
894 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | ||
895 | -AC_SUBST([am__nodep])dnl | ||
896 | -_AM_SUBST_NOTMAKE([am__nodep])dnl | ||
897 | ]) | ||
898 | |||
899 | # Generate code to set up dependency tracking. -*- Autoconf -*- | ||
900 | @@ -567,15 +557,12 @@ for _am_header in $config_headers :; do | ||
901 | done | ||
902 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
903 | |||
904 | -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, | ||
905 | -# Inc. | ||
906 | +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | ||
907 | # | ||
908 | # This file is free software; the Free Software Foundation | ||
909 | # gives unlimited permission to copy and/or distribute it, | ||
910 | # with or without modifications, as long as this notice is preserved. | ||
911 | |||
912 | -# serial 1 | ||
913 | - | ||
914 | # AM_PROG_INSTALL_SH | ||
915 | # ------------------ | ||
916 | # Define $install_sh. | ||
917 | @@ -615,8 +602,8 @@ AC_SUBST([am__leading_dot])]) | ||
918 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
919 | # From Jim Meyering | ||
920 | |||
921 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, | ||
922 | -# 2011 Free Software Foundation, Inc. | ||
923 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | ||
924 | +# Free Software Foundation, Inc. | ||
925 | # | ||
926 | # This file is free software; the Free Software Foundation | ||
927 | # gives unlimited permission to copy and/or distribute it, | ||
928 | @@ -636,7 +623,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], | ||
929 | [disable], [m4_define([am_maintainer_other], [enable])], | ||
930 | [m4_define([am_maintainer_other], [enable]) | ||
931 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | ||
932 | -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
933 | +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) | ||
934 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed | ||
935 | AC_ARG_ENABLE([maintainer-mode], | ||
936 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | ||
937 | @@ -782,15 +769,12 @@ else | ||
938 | fi | ||
939 | ]) | ||
940 | |||
941 | -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, | ||
942 | -# Inc. | ||
943 | +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
944 | # | ||
945 | # This file is free software; the Free Software Foundation | ||
946 | # gives unlimited permission to copy and/or distribute it, | ||
947 | # with or without modifications, as long as this notice is preserved. | ||
948 | |||
949 | -# serial 1 | ||
950 | - | ||
951 | # AM_PROG_MKDIR_P | ||
952 | # --------------- | ||
953 | # Check for `mkdir -p'. | ||
954 | @@ -813,14 +797,13 @@ esac | ||
955 | |||
956 | # Helper functions for option handling. -*- Autoconf -*- | ||
957 | |||
958 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software | ||
959 | -# Foundation, Inc. | ||
960 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. | ||
961 | # | ||
962 | # This file is free software; the Free Software Foundation | ||
963 | # gives unlimited permission to copy and/or distribute it, | ||
964 | # with or without modifications, as long as this notice is preserved. | ||
965 | |||
966 | -# serial 5 | ||
967 | +# serial 4 | ||
968 | |||
969 | # _AM_MANGLE_OPTION(NAME) | ||
970 | # ----------------------- | ||
971 | @@ -828,13 +811,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], | ||
972 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | ||
973 | |||
974 | # _AM_SET_OPTION(NAME) | ||
975 | -# -------------------- | ||
976 | +# ------------------------------ | ||
977 | # Set option NAME. Presently that only means defining a flag for this option. | ||
978 | AC_DEFUN([_AM_SET_OPTION], | ||
979 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | ||
980 | |||
981 | # _AM_SET_OPTIONS(OPTIONS) | ||
982 | -# ------------------------ | ||
983 | +# ---------------------------------- | ||
984 | # OPTIONS is a space-separated list of Automake options. | ||
985 | AC_DEFUN([_AM_SET_OPTIONS], | ||
986 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | ||
987 | @@ -910,13 +893,13 @@ Check your system clock]) | ||
988 | fi | ||
989 | AC_MSG_RESULT(yes)]) | ||
990 | |||
991 | -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. | ||
992 | +# Copyright (C) 2009 Free Software Foundation, Inc. | ||
993 | # | ||
994 | # This file is free software; the Free Software Foundation | ||
995 | # gives unlimited permission to copy and/or distribute it, | ||
996 | # with or without modifications, as long as this notice is preserved. | ||
997 | |||
998 | -# serial 2 | ||
999 | +# serial 1 | ||
1000 | |||
1001 | # AM_SILENT_RULES([DEFAULT]) | ||
1002 | # -------------------------- | ||
1003 | @@ -931,50 +914,18 @@ yes) AM_DEFAULT_VERBOSITY=0;; | ||
1004 | no) AM_DEFAULT_VERBOSITY=1;; | ||
1005 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; | ||
1006 | esac | ||
1007 | -dnl | ||
1008 | -dnl A few `make' implementations (e.g., NonStop OS and NextStep) | ||
1009 | -dnl do not support nested variable expansions. | ||
1010 | -dnl See automake bug#9928 and bug#10237. | ||
1011 | -am_make=${MAKE-make} | ||
1012 | -AC_CACHE_CHECK([whether $am_make supports nested variables], | ||
1013 | - [am_cv_make_support_nested_variables], | ||
1014 | - [if AS_ECHO([['TRUE=$(BAR$(V)) | ||
1015 | -BAR0=false | ||
1016 | -BAR1=true | ||
1017 | -V=1 | ||
1018 | -am__doit: | ||
1019 | - @$(TRUE) | ||
1020 | -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then | ||
1021 | - am_cv_make_support_nested_variables=yes | ||
1022 | -else | ||
1023 | - am_cv_make_support_nested_variables=no | ||
1024 | -fi]) | ||
1025 | -if test $am_cv_make_support_nested_variables = yes; then | ||
1026 | - dnl Using `$V' instead of `$(V)' breaks IRIX make. | ||
1027 | - AM_V='$(V)' | ||
1028 | - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
1029 | -else | ||
1030 | - AM_V=$AM_DEFAULT_VERBOSITY | ||
1031 | - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1032 | -fi | ||
1033 | -AC_SUBST([AM_V])dnl | ||
1034 | -AM_SUBST_NOTMAKE([AM_V])dnl | ||
1035 | -AC_SUBST([AM_DEFAULT_V])dnl | ||
1036 | -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | ||
1037 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | ||
1038 | AM_BACKSLASH='\' | ||
1039 | AC_SUBST([AM_BACKSLASH])dnl | ||
1040 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
1041 | ]) | ||
1042 | |||
1043 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. | ||
1044 | +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | ||
1045 | # | ||
1046 | # This file is free software; the Free Software Foundation | ||
1047 | # gives unlimited permission to copy and/or distribute it, | ||
1048 | # with or without modifications, as long as this notice is preserved. | ||
1049 | |||
1050 | -# serial 1 | ||
1051 | - | ||
1052 | # AM_PROG_INSTALL_STRIP | ||
1053 | # --------------------- | ||
1054 | # One issue with vendor `install' (even GNU) is that you can't | ||
1055 | @@ -997,13 +948,13 @@ fi | ||
1056 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
1057 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
1058 | |||
1059 | -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. | ||
1060 | +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. | ||
1061 | # | ||
1062 | # This file is free software; the Free Software Foundation | ||
1063 | # gives unlimited permission to copy and/or distribute it, | ||
1064 | # with or without modifications, as long as this notice is preserved. | ||
1065 | |||
1066 | -# serial 3 | ||
1067 | +# serial 2 | ||
1068 | |||
1069 | # _AM_SUBST_NOTMAKE(VARIABLE) | ||
1070 | # --------------------------- | ||
1071 | @@ -1012,13 +963,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
1072 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | ||
1073 | |||
1074 | # AM_SUBST_NOTMAKE(VARIABLE) | ||
1075 | -# -------------------------- | ||
1076 | +# --------------------------- | ||
1077 | # Public sister of _AM_SUBST_NOTMAKE. | ||
1078 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
1079 | |||
1080 | # Check how to create a tarball. -*- Autoconf -*- | ||
1081 | |||
1082 | -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. | ||
1083 | +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. | ||
1084 | # | ||
1085 | # This file is free software; the Free Software Foundation | ||
1086 | # gives unlimited permission to copy and/or distribute it, | ||
1087 | @@ -1040,11 +991,10 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
1088 | # a tarball read from stdin. | ||
1089 | # $(am__untar) < result.tar | ||
1090 | AC_DEFUN([_AM_PROG_TAR], | ||
1091 | -[# Always define AMTAR for backward compatibility. Yes, it's still used | ||
1092 | -# in the wild :-( We should find a proper way to deprecate it ... | ||
1093 | -AC_SUBST([AMTAR], ['$${TAR-tar}']) | ||
1094 | +[# Always define AMTAR for backward compatibility. | ||
1095 | +AM_MISSING_PROG([AMTAR], [tar]) | ||
1096 | m4_if([$1], [v7], | ||
1097 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | ||
1098 | + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | ||
1099 | [m4_case([$1], [ustar],, [pax],, | ||
1100 | [m4_fatal([Unknown tar format])]) | ||
1101 | AC_MSG_CHECKING([how to create a $1 tar archive]) | ||
1102 | @@ -1117,7 +1067,6 @@ m4_include([common/m4/as-ac-expand.m4]) | ||
1103 | m4_include([common/m4/as-auto-alt.m4]) | ||
1104 | m4_include([common/m4/as-compiler-flag.m4]) | ||
1105 | m4_include([common/m4/as-libtool.m4]) | ||
1106 | -m4_include([common/m4/as-objc.m4]) | ||
1107 | m4_include([common/m4/as-python.m4]) | ||
1108 | m4_include([common/m4/as-scrub-include.m4]) | ||
1109 | m4_include([common/m4/as-version.m4]) | ||
1110 | diff --git a/autoregen.sh b/autoregen.sh | ||
1111 | new file mode 100644 | ||
1112 | index 0000000..c67a299 | ||
1113 | --- /dev/null | ||
1114 | +++ b/autoregen.sh | ||
1115 | @@ -0,0 +1,2 @@ | ||
1116 | +#!/bin/sh | ||
1117 | +./autogen.sh $@ | ||
1118 | diff --git a/cmake/modules/FindATK.cmake b/cmake/modules/FindATK.cmake | ||
1119 | new file mode 100644 | ||
1120 | index 0000000..762e144 | ||
1121 | --- /dev/null | ||
1122 | +++ b/cmake/modules/FindATK.cmake | ||
1123 | @@ -0,0 +1,11 @@ | ||
1124 | +FILE(TO_CMAKE_PATH "$ENV{ATK_DIR}" TRY1_DIR) | ||
1125 | +FILE(TO_CMAKE_PATH "${ATK_DIR}" TRY2_DIR) | ||
1126 | +FILE(GLOB ATK_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1127 | + | ||
1128 | +FIND_PATH(ATK_INCLUDE_DIR atk/atk.h | ||
1129 | + PATHS ${ATK_DIR}/include /usr/local/include/atk-1.0 /usr/include/atk-1.0 | ||
1130 | + ENV INCLUDE DOC "Directory containing atk/atk.h include file") | ||
1131 | + | ||
1132 | +IF (ATK_INCLUDE_DIR) | ||
1133 | + SET(ATK_FOUND TRUE) | ||
1134 | +ENDIF (ATK_INCLUDE_DIR) | ||
1135 | diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake | ||
1136 | new file mode 100644 | ||
1137 | index 0000000..9ad0be4 | ||
1138 | --- /dev/null | ||
1139 | +++ b/cmake/modules/FindCairo.cmake | ||
1140 | @@ -0,0 +1,11 @@ | ||
1141 | +FILE(TO_CMAKE_PATH "$ENV{CAIRO_DIR}" TRY1_DIR) | ||
1142 | +FILE(TO_CMAKE_PATH "${CAIRO_DIR}" TRY2_DIR) | ||
1143 | +FILE(GLOB CAIRO_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1144 | + | ||
1145 | +FIND_PATH(CAIRO_INCLUDE_DIR cairo.h | ||
1146 | + PATHS ${CAIRO_DIR}/include /usr/local/include/cairo /usr/include/cairo | ||
1147 | + ENV INCLUDE DOC "Directory containing cairo.h include file") | ||
1148 | + | ||
1149 | +IF (CAIRO_INCLUDE_DIR) | ||
1150 | + SET(CAIRO_FOUND TRUE) | ||
1151 | +ENDIF (CAIRO_INCLUDE_DIR) | ||
1152 | diff --git a/cmake/modules/FindGTK2.cmake.off b/cmake/modules/FindGTK2.cmake.off | ||
1153 | new file mode 100644 | ||
1154 | index 0000000..58e8af4 | ||
1155 | --- /dev/null | ||
1156 | +++ b/cmake/modules/FindGTK2.cmake.off | ||
1157 | @@ -0,0 +1,44 @@ | ||
1158 | +FILE(TO_CMAKE_PATH "$ENV{GTK2_DIR}" TRY1_DIR) | ||
1159 | +FILE(TO_CMAKE_PATH "${GTK2_DIR}" TRY2_DIR) | ||
1160 | +FILE(GLOB GTK_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1161 | + | ||
1162 | +FIND_PATH(GTK_gtk_2_INCLUDE_DIR gtk/gtk.h | ||
1163 | + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 | ||
1164 | + ENV INCLUDE DOC "Directory containing gtk/gtk.h include file") | ||
1165 | + | ||
1166 | +FIND_PATH(GTK_gdk_2_INCLUDE_DIR gdk/gdk.h | ||
1167 | + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 | ||
1168 | + ENV INCLUDE DOC "Directory containing gdk/gdk.h include file") | ||
1169 | + | ||
1170 | +FIND_PATH(GTK_gdkconfig_2_INCLUDE_DIR gdkconfig.h | ||
1171 | + PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 /usr/lib/gtk-2.0/include /usr/local/lib/gtk-2.0/include | ||
1172 | + ENV INCLUDE DOC "Directory containing gdkconfig.h include file") | ||
1173 | + | ||
1174 | +FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 | ||
1175 | + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1176 | + ENV LIB | ||
1177 | + DOC "gdk_pixbuf library to link with" | ||
1178 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1179 | + | ||
1180 | +FIND_LIBRARY(GTK_gdk_2_LIBRARY NAMES gdk-win32-2.0 gdk-x11-2.0 | ||
1181 | + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib | ||
1182 | + ENV LIB | ||
1183 | + DOC "gdk2 library to link with" | ||
1184 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1185 | + | ||
1186 | +FIND_LIBRARY(GTK_gtk_2_LIBRARY NAMES gtk-win32-2.0 gtk-x11-2.0 | ||
1187 | + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib | ||
1188 | + ENV LIB | ||
1189 | + DOC "gtk2 library to link with" | ||
1190 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1191 | + | ||
1192 | + | ||
1193 | +IF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND | ||
1194 | + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) | ||
1195 | + SET(GTK2_INCLUDE_DIR ${GTK_gtk_2_INCLUDE_DIR} ${GTK_gdk_2_INCLUDE_DIR} ${GTK_gdkconfig_2_INCLUDE_DIR}) | ||
1196 | + list(REMOVE_DUPLICATES GTK2_INCLUDE_DIR) | ||
1197 | + SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_2_LIBRARY} ${GTK_gtk_2_LIBRARY}) | ||
1198 | + list(REMOVE_DUPLICATES GTK2_LIBRARIES) | ||
1199 | + SET(GTK2_FOUND TRUE) | ||
1200 | +ENDIF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND | ||
1201 | + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) | ||
1202 | diff --git a/cmake/modules/FindGlew.cmake b/cmake/modules/FindGlew.cmake | ||
1203 | new file mode 100644 | ||
1204 | index 0000000..463d705 | ||
1205 | --- /dev/null | ||
1206 | +++ b/cmake/modules/FindGlew.cmake | ||
1207 | @@ -0,0 +1,17 @@ | ||
1208 | +FILE(TO_CMAKE_PATH "$ENV{GLEW_DIR}" TRY1_DIR) | ||
1209 | +FILE(TO_CMAKE_PATH "${GLEW_DIR}" TRY2_DIR) | ||
1210 | +FILE(GLOB GLEW_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1211 | + | ||
1212 | +FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h | ||
1213 | + PATHS ${GLEW_DIR}/include /usr/local/include /usr/include | ||
1214 | + ENV INCLUDE DOC "Directory containing GL/glew.h include file") | ||
1215 | + | ||
1216 | +FIND_LIBRARY(GLEW_LIBRARY NAMES glew32 GLEW glew32s | ||
1217 | + PATHS ${GLEW_DIR}/bin ${GLEW_DIR}/win32/bin ${GLEW_DIR}/lib ${GLEW_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1218 | + ENV LIB | ||
1219 | + DOC "glew library to link with" | ||
1220 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1221 | + | ||
1222 | +IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) | ||
1223 | + SET(GLEW_FOUND TRUE) | ||
1224 | +ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) | ||
1225 | diff --git a/cmake/modules/FindGlib2.cmake b/cmake/modules/FindGlib2.cmake | ||
1226 | new file mode 100644 | ||
1227 | index 0000000..eaad1a8 | ||
1228 | --- /dev/null | ||
1229 | +++ b/cmake/modules/FindGlib2.cmake | ||
1230 | @@ -0,0 +1,43 @@ | ||
1231 | +FILE(TO_CMAKE_PATH "$ENV{GLIB2_DIR}" TRY1_DIR) | ||
1232 | +FILE(TO_CMAKE_PATH "${GLIB2_DIR}" TRY2_DIR) | ||
1233 | +FILE(GLOB GLIB2_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1234 | + | ||
1235 | +FIND_PATH(GLIB_glib_2_INCLUDE_DIR glib.h | ||
1236 | + PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 /usr/local/include/glib-2.0 /usr/include/glib-2.0 /opt/local/include/glib-2.0 | ||
1237 | + ENV INCLUDE DOC "Directory containing glib.h include file") | ||
1238 | + | ||
1239 | +FIND_PATH(GLIB_glibconfig_2_INCLUDE_DIR glibconfig.h | ||
1240 | + PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 ${GLIB2_DIR}/lib/include ${GLIB2_DIR}/lib/glib-2.0/include /usr/lib/i386-linux-gnu/glib-2.0/include /usr/local/include/glib-2.0 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/local/lib/glib-2.0/include /opt/local/lib/glib-2.0/include | ||
1241 | + ENV INCLUDE DOC "Directory containing glibconfig.h include file") | ||
1242 | + | ||
1243 | +FIND_LIBRARY(GLIB_glib_2_LIBRARY NAMES glib-2.0 glib-2.0-0 | ||
1244 | + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib | ||
1245 | + ENV LIB | ||
1246 | + DOC "glib library to link with" | ||
1247 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1248 | + | ||
1249 | +FIND_LIBRARY(GLIB_gmodule_2_LIBRARY NAMES gmodule-2.0 gmodule-2.0-0 | ||
1250 | + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib | ||
1251 | + ENV LIB | ||
1252 | + DOC "gmodule library to link with" | ||
1253 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1254 | + | ||
1255 | +FIND_LIBRARY(GLIB_gobject_2_LIBRARY NAMES gobject-2.0 gobject-2.0-0 | ||
1256 | + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib | ||
1257 | + ENV LIB | ||
1258 | + DOC "gobject library to link with" | ||
1259 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1260 | + | ||
1261 | +FIND_LIBRARY(GLIB_gthread_2_LIBRARY NAMES gthread-2.0 gthread-2.0-0 | ||
1262 | + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib | ||
1263 | + ENV LIB | ||
1264 | + DOC "gthread library to link with" | ||
1265 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1266 | + | ||
1267 | +IF (GLIB_glib_2_INCLUDE_DIR AND GLIB_glibconfig_2_INCLUDE_DIR AND GLIB_glib_2_LIBRARY AND GLIB_gmodule_2_LIBRARY AND GLIB_gobject_2_LIBRARY AND GLIB_gthread_2_LIBRARY) | ||
1268 | + SET(GLIB2_INCLUDE_DIR ${GLIB_glib_2_INCLUDE_DIR} ${GLIB_glibconfig_2_INCLUDE_DIR}) | ||
1269 | + list(REMOVE_DUPLICATES GLIB2_INCLUDE_DIR) | ||
1270 | + SET(GLIB2_LIBRARIES ${GLIB_glib_2_LIBRARY} ${GLIB_gmodule_2_LIBRARY} ${GLIB_gobject_2_LIBRARY} ${GLIB_gthread_2_LIBRARY}) | ||
1271 | + list(REMOVE_DUPLICATES GLIB2_LIBRARIES) | ||
1272 | + SET(GLIB2_FOUND TRUE) | ||
1273 | +ENDIF (GLIB_glib_2_INCLUDE_DIR AND GLIB_glibconfig_2_INCLUDE_DIR AND GLIB_glib_2_LIBRARY AND GLIB_gmodule_2_LIBRARY AND GLIB_gobject_2_LIBRARY AND GLIB_gthread_2_LIBRARY) | ||
1274 | diff --git a/cmake/modules/FindGstreamer.cmake b/cmake/modules/FindGstreamer.cmake | ||
1275 | new file mode 100644 | ||
1276 | index 0000000..d60fb68 | ||
1277 | --- /dev/null | ||
1278 | +++ b/cmake/modules/FindGstreamer.cmake | ||
1279 | @@ -0,0 +1,130 @@ | ||
1280 | +FILE(TO_CMAKE_PATH "$ENV{GSTREAMER_DIR}" TRY1_DIR) | ||
1281 | +FILE(TO_CMAKE_PATH "${GSTREAMER_DIR}" TRY2_DIR) | ||
1282 | +FILE(GLOB GSTREAMER_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1283 | + | ||
1284 | +FIND_PATH(GSTREAMER_gst_INCLUDE_DIR gst/gst.h | ||
1285 | + PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/include/gstreamer-0.10 /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 | ||
1286 | + ENV INCLUDE DOC "Directory containing gst/gst.h include file") | ||
1287 | + | ||
1288 | +FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h | ||
1289 | + PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include ${GSTREAMER_DIR}/include/gstreamer-0.10 /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 /usr/local/lib/include/gstreamer-0.10 /usr/lib/include/gstreamer-0.10 | ||
1290 | + ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") | ||
1291 | + | ||
1292 | +FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-0.10 libgstaudio-0.10 gstaudio | ||
1293 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1294 | + ENV LIB | ||
1295 | + DOC "gstaudio library to link with" | ||
1296 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1297 | + | ||
1298 | +FIND_LIBRARY(GSTREAMER_gstbase_LIBRARY NAMES gstbase-0.10 libgstbase-0.10 gstbase | ||
1299 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1300 | + ENV LIB | ||
1301 | + DOC "gstbase library to link with" | ||
1302 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1303 | + | ||
1304 | +FIND_LIBRARY(GLIB_gstcdda_LIBRARY NAMES gstcdda-0.10 libgstcdda-0.10 gstcdda | ||
1305 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1306 | + ENV LIB | ||
1307 | + DOC "gstcdda library to link with" | ||
1308 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1309 | + | ||
1310 | +FIND_LIBRARY(GSTREAMER_gstcontroller_LIBRARY NAMES gstcontroller-0.10 libgstcontroller-0.10 gstcontroller | ||
1311 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1312 | + ENV LIB | ||
1313 | + DOC "gstcontroller library to link with" | ||
1314 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1315 | + | ||
1316 | +FIND_LIBRARY(GSTREAMER_gstdataprotocol_LIBRARY NAMES gstdataprotocol-0.10 libgstdataprotocol-0.10 gstdataprotocol | ||
1317 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1318 | + ENV LIB | ||
1319 | + DOC "gstdataprotocol library to link with" | ||
1320 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1321 | + | ||
1322 | +FIND_LIBRARY(GSTREAMER_gstinterfaces_LIBRARY NAMES gstinterfaces-0.10 libgstinterfaces-0.10 gstinterfaces | ||
1323 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1324 | + ENV LIB | ||
1325 | + DOC "gstinterfaces library to link with" | ||
1326 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1327 | + | ||
1328 | +FIND_LIBRARY(GSTREAMER_gstnet_LIBRARY NAMES gstnet-0.10 libgstnet-0.10 gstnet | ||
1329 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1330 | + ENV LIB | ||
1331 | + DOC "gstnet library to link with" | ||
1332 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1333 | + | ||
1334 | +FIND_LIBRARY(GSTREAMER_gstnetbuffer_LIBRARY NAMES gstnetbuffer-0.10 libgstnetbuffer-0.10 gstnetbuffer | ||
1335 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1336 | + ENV LIB | ||
1337 | + DOC "gstnetbuffer library to link with" | ||
1338 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1339 | + | ||
1340 | +FIND_LIBRARY(GSTREAMER_gstpbutils_LIBRARY NAMES gstpbutils-0.10 libgstpbutils-0.10 gstpbutils | ||
1341 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1342 | + ENV LIB | ||
1343 | + DOC "gstpbutils library to link with" | ||
1344 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1345 | + | ||
1346 | +FIND_LIBRARY(GSTREAMER_gstreamer_LIBRARY NAMES gstreamer-0.10 libgstreamer-0.10 gstreamer | ||
1347 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1348 | + ENV LIB | ||
1349 | + DOC "gstreamer library to link with" | ||
1350 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1351 | + | ||
1352 | +FIND_LIBRARY(GSTREAMER_gstriff_LIBRARY NAMES gstriff-0.10 libgstriff-0.10 gstriff | ||
1353 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1354 | + ENV LIB | ||
1355 | + DOC "gstriff library to link with" | ||
1356 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1357 | + | ||
1358 | +FIND_LIBRARY(GSTREAMER_gstrtp_LIBRARY NAMES gstrtp-0.10 libgstrtp-0.10 gstrtp | ||
1359 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1360 | + ENV LIB | ||
1361 | + DOC "gstrtp library to link with" | ||
1362 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1363 | + | ||
1364 | +FIND_LIBRARY(GSTREAMER_gstrtsp_LIBRARY NAMES gstrtsp-0.10 libgstrtsp-0.10 gstrtsp | ||
1365 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1366 | + ENV LIB | ||
1367 | + DOC "gstrtsp library to link with" | ||
1368 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1369 | + | ||
1370 | +FIND_LIBRARY(GSTREAMER_gstsdp_LIBRARY NAMES gstsdp-0.10 libgstsdp-0.10 | ||
1371 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1372 | + ENV LIB | ||
1373 | + DOC "gstsdp library to link with" | ||
1374 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1375 | + | ||
1376 | +FIND_LIBRARY(GSTREAMER_gsttag_LIBRARY NAMES gsttag-0.10 libgsttag-0.10 gsttag | ||
1377 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1378 | + ENV LIB | ||
1379 | + DOC "gsttag library to link with" | ||
1380 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1381 | + | ||
1382 | +FIND_LIBRARY(GSTREAMER_gstvideo_LIBRARY NAMES gstvideo-0.10 libgstvideo-0.10 gstvideo | ||
1383 | + PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1384 | + ENV LIB | ||
1385 | + DOC "gstvideo library to link with" | ||
1386 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1387 | + | ||
1388 | + | ||
1389 | +IF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND | ||
1390 | + GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND | ||
1391 | + GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND | ||
1392 | + GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND | ||
1393 | + GSTREAMER_gstriff_LIBRARY AND GSTREAMER_gstrtp_LIBRARY AND GSTREAMER_gstrtsp_LIBRARY AND GSTREAMER_gstsdp_LIBRARY AND | ||
1394 | + GSTREAMER_gsttag_LIBRARY AND GSTREAMER_gstvideo_LIBRARY) | ||
1395 | + SET(GSTREAMER_INCLUDE_DIR ${GSTREAMER_gst_INCLUDE_DIR} ${GSTREAMER_gstconfig_INCLUDE_DIR}) | ||
1396 | + list(REMOVE_DUPLICATES GSTREAMER_INCLUDE_DIR) | ||
1397 | + SET(GSTREAMER_LIBRARIES ${GSTREAMER_gstaudio_LIBRARY} ${GSTREAMER_gstbase_LIBRARY} | ||
1398 | + ${GSTREAMER_gstcontroller_LIBRARY} ${GSTREAMER_gstdataprotocol_LIBRARY} ${GSTREAMER_gstinterfaces_LIBRARY} | ||
1399 | + ${GSTREAMER_gstnet_LIBRARY} ${GSTREAMER_gstnetbuffer_LIBRARY} ${GSTREAMER_gstpbutils_LIBRARY} | ||
1400 | + ${GSTREAMER_gstreamer_LIBRARY} ${GSTREAMER_gstriff_LIBRARY} ${GSTREAMER_gstrtp_LIBRARY} | ||
1401 | + ${GSTREAMER_gstrtsp_LIBRARY} ${GSTREAMER_gstsdp_LIBRARY} ${GSTREAMER_gsttag_LIBRARY} ${GSTREAMER_gstvideo_LIBRARY}) | ||
1402 | + list(REMOVE_DUPLICATES GSTREAMER_LIBRARIES) | ||
1403 | + SET(GSTREAMER_FOUND TRUE) | ||
1404 | +ENDIF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND | ||
1405 | + GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND | ||
1406 | + GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND | ||
1407 | + GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND | ||
1408 | + GSTREAMER_gstriff_LIBRARY AND GSTREAMER_gstrtp_LIBRARY AND GSTREAMER_gstrtsp_LIBRARY AND GSTREAMER_gstsdp_LIBRARY AND | ||
1409 | + GSTREAMER_gsttag_LIBRARY AND GSTREAMER_gstvideo_LIBRARY) | ||
1410 | diff --git a/cmake/modules/FindLibIconv.cmake b/cmake/modules/FindLibIconv.cmake | ||
1411 | new file mode 100644 | ||
1412 | index 0000000..0934202 | ||
1413 | --- /dev/null | ||
1414 | +++ b/cmake/modules/FindLibIconv.cmake | ||
1415 | @@ -0,0 +1,11 @@ | ||
1416 | +FILE(TO_CMAKE_PATH "$ENV{LIBICONV_DIR}" TRY1_DIR) | ||
1417 | +FILE(TO_CMAKE_PATH "${LIBICONV_DIR}" TRY2_DIR) | ||
1418 | +FILE(GLOB LIBICONV_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1419 | + | ||
1420 | +FIND_PATH(LIBICONV_INCLUDE_DIR iconv.h | ||
1421 | + PATHS ${LIBICONV_DIR}/include /usr/local/include /usr/include | ||
1422 | + ENV INCLUDE DOC "Directory containing iconv.h include file") | ||
1423 | + | ||
1424 | +IF (LIBICONV_INCLUDE_DIR) | ||
1425 | + SET(LIBICONV_FOUND TRUE) | ||
1426 | +ENDIF (LIBICONV_INCLUDE_DIR) | ||
1427 | diff --git a/cmake/modules/FindLibXml2.cmake.off b/cmake/modules/FindLibXml2.cmake.off | ||
1428 | new file mode 100644 | ||
1429 | index 0000000..399f5a2 | ||
1430 | --- /dev/null | ||
1431 | +++ b/cmake/modules/FindLibXml2.cmake.off | ||
1432 | @@ -0,0 +1,11 @@ | ||
1433 | +FILE(TO_CMAKE_PATH "$ENV{LIBXML2_DIR}" TRY1_DIR) | ||
1434 | +FILE(TO_CMAKE_PATH "${LIBXML2_DIR}" TRY2_DIR) | ||
1435 | +FILE(GLOB LIBXML2_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1436 | + | ||
1437 | +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/parser.h | ||
1438 | + PATHS ${LIBXML2_DIR}/include ${LIBXML2_DIR}/include/libxml2 /usr/local/include/libxml2 /usr/include/libxml2 | ||
1439 | + ENV INCLUDE DOC "Directory containing libxml/parser.h include file") | ||
1440 | + | ||
1441 | +IF (LIBXML2_INCLUDE_DIR) | ||
1442 | + SET(LIBXML2_FOUND TRUE) | ||
1443 | +ENDIF (LIBXML2_INCLUDE_DIR) | ||
1444 | diff --git a/cmake/modules/FindLibpng.cmake.off b/cmake/modules/FindLibpng.cmake.off | ||
1445 | new file mode 100644 | ||
1446 | index 0000000..648db97 | ||
1447 | --- /dev/null | ||
1448 | +++ b/cmake/modules/FindLibpng.cmake.off | ||
1449 | @@ -0,0 +1,17 @@ | ||
1450 | +FILE(TO_CMAKE_PATH "$ENV{PNG_DIR}" TRY1_DIR) | ||
1451 | +FILE(TO_CMAKE_PATH "${PNG_DIR}" TRY2_DIR) | ||
1452 | +FILE(GLOB PNG_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1453 | + | ||
1454 | +FIND_PATH(PNG_INCLUDE_DIR png.h | ||
1455 | + PATHS ${PNG_DIR}/include /usr/local/include /usr/include | ||
1456 | + ENV INCLUDE DOC "Directory containing png.h include file") | ||
1457 | + | ||
1458 | +FIND_LIBRARY(PNG_LIBRARY NAMES png12 png | ||
1459 | + PATHS ${PNG_DIR}/bin ${PNG_DIR}/win32/bin ${PNG_DIR}/lib ${PNG_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1460 | + ENV LIB | ||
1461 | + DOC "png library to link with" | ||
1462 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1463 | + | ||
1464 | +IF (PNG_INCLUDE_DIR AND PNG_LIBRARY) | ||
1465 | + SET(PNG_FOUND TRUE) | ||
1466 | +ENDIF (PNG_INCLUDE_DIR AND PNG_LIBRARY) | ||
1467 | diff --git a/cmake/modules/FindOpenGL.cmake.off b/cmake/modules/FindOpenGL.cmake.off | ||
1468 | new file mode 100644 | ||
1469 | index 0000000..3dc7dd2 | ||
1470 | --- /dev/null | ||
1471 | +++ b/cmake/modules/FindOpenGL.cmake.off | ||
1472 | @@ -0,0 +1,30 @@ | ||
1473 | +FILE(TO_CMAKE_PATH "$ENV{OPENGL_DIR}" TRY1_DIR) | ||
1474 | +FILE(TO_CMAKE_PATH "${OPENGL_DIR}" TRY2_DIR) | ||
1475 | +FILE(GLOB OPENGL_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1476 | + | ||
1477 | +FIND_PATH(OPENGL_gl_INCLUDE_DIR GL/gl.h | ||
1478 | + PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include | ||
1479 | + ENV INCLUDE DOC "Directory containing GL/gl.h include file") | ||
1480 | + | ||
1481 | +FIND_PATH(OPENGL_glu_INCLUDE_DIR GL/glu.h | ||
1482 | + PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include | ||
1483 | + ENV INCLUDE DOC "Directory containing GL/glu.h include file") | ||
1484 | + | ||
1485 | +FIND_LIBRARY(OPENGL_gl_LIBRARY NAMES opengl32 GL | ||
1486 | + PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1487 | + ENV LIB | ||
1488 | + DOC "gl library to link with" | ||
1489 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1490 | + | ||
1491 | +FIND_LIBRARY(OPENGL_glu_LIBRARY NAMES glu32 GLU | ||
1492 | + PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1493 | + ENV LIB | ||
1494 | + DOC "glu library to link with" | ||
1495 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1496 | + | ||
1497 | +IF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) | ||
1498 | + SET(OPENGL_INCLUDE_DIR ${OPENGL_gl_INCLUDE_DIR} ${OPENGL_glu_INCLUDE_DIR}) | ||
1499 | + list(REMOVE_DUPLICATES OPENGL_INCLUDE_DIR) | ||
1500 | + SET(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) | ||
1501 | + list(REMOVE_DUPLICATES OPENGL_LIBRARIES) | ||
1502 | +ENDIF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) | ||
1503 | diff --git a/cmake/modules/FindZlib.cmake.off b/cmake/modules/FindZlib.cmake.off | ||
1504 | new file mode 100644 | ||
1505 | index 0000000..e604b44 | ||
1506 | --- /dev/null | ||
1507 | +++ b/cmake/modules/FindZlib.cmake.off | ||
1508 | @@ -0,0 +1,17 @@ | ||
1509 | +FILE(TO_CMAKE_PATH "$ENV{ZLIB_DIR}" TRY1_DIR) | ||
1510 | +FILE(TO_CMAKE_PATH "${ZLIB_DIR}" TRY2_DIR) | ||
1511 | +FILE(GLOB ZLIB_DIR ${TRY1_DIR} ${TRY2_DIR}) | ||
1512 | + | ||
1513 | +FIND_PATH(ZLIB_INCLUDE_DIR zlib.h | ||
1514 | + PATHS ${ZLIB_DIR}/include /usr/local/include /usr/include | ||
1515 | + ENV INCLUDE DOC "Directory containing zlib.h include file") | ||
1516 | + | ||
1517 | +FIND_LIBRARY(ZLIB_LIBRARY NAMES z | ||
1518 | + PATHS ${ZLIB_DIR}/bin ${ZLIB_DIR}/win32/bin ${ZLIB_DIR}/lib ${ZLIB_DIR}/win32/lib /usr/local/lib /usr/lib | ||
1519 | + ENV LIB | ||
1520 | + DOC "zlib library to link with" | ||
1521 | + NO_SYSTEM_ENVIRONMENT_PATH) | ||
1522 | + | ||
1523 | +IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) | ||
1524 | + SET(ZLIB_FOUND TRUE) | ||
1525 | +ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) | ||
1526 | diff --git a/common/Makefile.in b/common/Makefile.in | ||
1527 | index 2142d0f..b4544c2 100644 | ||
1528 | --- a/common/Makefile.in | ||
1529 | +++ b/common/Makefile.in | ||
1530 | @@ -1,9 +1,9 @@ | ||
1531 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
1532 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
1533 | # @configure_input@ | ||
1534 | |||
1535 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
1536 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
1537 | -# Foundation, Inc. | ||
1538 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
1539 | +# Inc. | ||
1540 | # This Makefile.in is free software; the Free Software Foundation | ||
1541 | # gives unlimited permission to copy and/or distribute it, | ||
1542 | # with or without modifications, as long as this notice is preserved. | ||
1543 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
1544 | POST_UNINSTALL = : | ||
1545 | build_triplet = @build@ | ||
1546 | host_triplet = @host@ | ||
1547 | +target_triplet = @target@ | ||
1548 | subdir = common | ||
1549 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog | ||
1550 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
1551 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
1552 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
1553 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
1554 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
1555 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
1556 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
1557 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
1558 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
1559 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
1560 | CONFIG_HEADER = $(top_builddir)/config.h | ||
1561 | CONFIG_CLEAN_FILES = | ||
1562 | CONFIG_CLEAN_VPATH_FILES = | ||
1563 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
1564 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
1565 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
1566 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
1567 | am__v_GEN_0 = @echo " GEN " $@; | ||
1568 | -AM_V_at = $(am__v_at_@AM_V@) | ||
1569 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
1570 | +AM_V_at = $(am__v_at_$(V)) | ||
1571 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
1572 | am__v_at_0 = @ | ||
1573 | SOURCES = | ||
1574 | DIST_SOURCES = | ||
1575 | @@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ | ||
1576 | EGREP = @EGREP@ | ||
1577 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
1578 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
1579 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
1580 | EXEEXT = @EXEEXT@ | ||
1581 | FFLAGS = @FFLAGS@ | ||
1582 | FGREP = @FGREP@ | ||
1583 | @@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
1584 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
1585 | GST_CURRENT = @GST_CURRENT@ | ||
1586 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
1587 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
1588 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
1589 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
1590 | GST_LIBS = @GST_LIBS@ | ||
1591 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
1592 | @@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
1593 | GST_LICENSE = @GST_LICENSE@ | ||
1594 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
1595 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
1596 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
1597 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
1598 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
1599 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
1600 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
1601 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
1602 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
1603 | @@ -280,7 +285,7 @@ NM = @NM@ | ||
1604 | NMEDIT = @NMEDIT@ | ||
1605 | OBJC = @OBJC@ | ||
1606 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
1607 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
1608 | +OBJCFLAGS = @OBJCFLAGS@ | ||
1609 | OBJDUMP = @OBJDUMP@ | ||
1610 | OBJEXT = @OBJEXT@ | ||
1611 | OPENGL_ES2 = @OPENGL_ES2@ | ||
1612 | @@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
1613 | VERSION = @VERSION@ | ||
1614 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
1615 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
1616 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
1617 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
1618 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
1619 | XGETTEXT = @XGETTEXT@ | ||
1620 | @@ -390,7 +396,11 @@ sbindir = @sbindir@ | ||
1621 | sharedstatedir = @sharedstatedir@ | ||
1622 | srcdir = @srcdir@ | ||
1623 | sysconfdir = @sysconfdir@ | ||
1624 | +target = @target@ | ||
1625 | target_alias = @target_alias@ | ||
1626 | +target_cpu = @target_cpu@ | ||
1627 | +target_os = @target_os@ | ||
1628 | +target_vendor = @target_vendor@ | ||
1629 | top_build_prefix = @top_build_prefix@ | ||
1630 | top_builddir = @top_builddir@ | ||
1631 | top_srcdir = @top_srcdir@ | ||
1632 | @@ -664,15 +674,10 @@ install-am: all-am | ||
1633 | |||
1634 | installcheck: installcheck-recursive | ||
1635 | install-strip: | ||
1636 | - if test -z '$(STRIP)'; then \ | ||
1637 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
1638 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
1639 | - install; \ | ||
1640 | - else \ | ||
1641 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
1642 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
1643 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
1644 | - fi | ||
1645 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
1646 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
1647 | + `test -z '$(STRIP)' || \ | ||
1648 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
1649 | mostlyclean-generic: | ||
1650 | |||
1651 | clean-generic: | ||
1652 | diff --git a/common/check.mak b/common/check.mak | ||
1653 | index 30487f1..bc44620 100644 | ||
1654 | --- a/common/check.mak | ||
1655 | +++ b/common/check.mak | ||
1656 | @@ -24,6 +24,12 @@ LOOPS = 10 | ||
1657 | CK_DEFAULT_TIMEOUT=20 \ | ||
1658 | $* | ||
1659 | |||
1660 | +# just like 'check', but don't run it again if it fails (useful for debugging) | ||
1661 | +%.check-norepeat: % | ||
1662 | + @$(TESTS_ENVIRONMENT) \ | ||
1663 | + CK_DEFAULT_TIMEOUT=20 \ | ||
1664 | + $* | ||
1665 | + | ||
1666 | # run any given test in a loop | ||
1667 | %.torture: % | ||
1668 | @for i in `seq 1 $(LOOPS)`; do \ | ||
1669 | @@ -152,7 +158,8 @@ help: | ||
1670 | @echo | ||
1671 | @echo "make check -- run all checks" | ||
1672 | @echo "make torture -- run all checks $(LOOPS) times" | ||
1673 | - @echo "make (dir)/(test).check -- run the given check once" | ||
1674 | + @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" | ||
1675 | + @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" | ||
1676 | @echo "make (dir)/(test).forever -- run the given check forever" | ||
1677 | @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" | ||
1678 | @echo | ||
1679 | diff --git a/common/gen-changelog.py b/common/gen-changelog.py | ||
1680 | new file mode 100644 | ||
1681 | index 0000000..c79e7d3 | ||
1682 | --- /dev/null | ||
1683 | +++ b/common/gen-changelog.py | ||
1684 | @@ -0,0 +1,99 @@ | ||
1685 | +#!/usr/bin/env python | ||
1686 | + | ||
1687 | +import sys | ||
1688 | +import subprocess | ||
1689 | +import re | ||
1690 | + | ||
1691 | +# Makes a GNU-Style ChangeLog from a git repository | ||
1692 | +# Handles git-svn repositories also | ||
1693 | + | ||
1694 | +# Arguments : same as for git log | ||
1695 | +release_refs={} | ||
1696 | + | ||
1697 | +def process_commit(lines, files): | ||
1698 | + # DATE NAME | ||
1699 | + # BLANK LINE | ||
1700 | + # Subject | ||
1701 | + # BLANK LINE | ||
1702 | + # ... | ||
1703 | + # FILES | ||
1704 | + fileincommit = False | ||
1705 | + lines = [x.strip() for x in lines if x.strip() and not x.startswith('git-svn-id')] | ||
1706 | + files = [x.strip() for x in files if x.strip()] | ||
1707 | + for l in lines: | ||
1708 | + if l.startswith('* ') and ':' in l: | ||
1709 | + fileincommit = True | ||
1710 | + break | ||
1711 | + | ||
1712 | + top_line = lines[0] | ||
1713 | + print top_line.strip() | ||
1714 | |||
1715 | + if not fileincommit: | ||
1716 | + for f in files: | ||
1717 | + print '\t* %s:' % f | ||
1718 | + for l in lines[1:]: | ||
1719 | + print '\t ', l | ||
1720 | |||
1721 | + | ||
1722 | +def output_commits(): | ||
1723 | + cmd = ['git', 'log', '--pretty=format:--START-COMMIT--%H%n%ai %an <%ae>%n%n%s%n%b%n--END-COMMIT--', | ||
1724 | + '--date=short', '--name-only'] | ||
1725 | + | ||
1726 | + start_tag = find_start_tag() | ||
1727 | + | ||
1728 | + if start_tag is None: | ||
1729 | + cmd.extend(sys.argv[1:]) | ||
1730 | + else: | ||
1731 | + cmd.extend(["%s..HEAD" % (start_tag)]) | ||
1732 | + | ||
1733 | + p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) | ||
1734 | + buf = [] | ||
1735 | + files = [] | ||
1736 | + filemode = False | ||
1737 | + for lin in p.stdout.readlines(): | ||
1738 | + if lin.startswith("--START-COMMIT--"): | ||
1739 | + if buf != []: | ||
1740 | + process_commit(buf, files) | ||
1741 | + hash = lin[16:].strip() | ||
1742 | + try: | ||
1743 | + rel = release_refs[hash] | ||
1744 | + print "=== release %d.%d.%d ===\n" % (int(rel[0]), int(rel[1]), int(rel[2])) | ||
1745 | + except: | ||
1746 | + pass | ||
1747 | + buf = [] | ||
1748 | + files = [] | ||
1749 | + filemode = False | ||
1750 | + elif lin.startswith("--END-COMMIT--"): | ||
1751 | + filemode = True | ||
1752 | + elif filemode == True: | ||
1753 | + files.append(lin) | ||
1754 | + else: | ||
1755 | + buf.append(lin) | ||
1756 | + if buf != []: | ||
1757 | + process_commit(buf, files) | ||
1758 | + | ||
1759 | +def get_rel_tags(): | ||
1760 | + # Populate the release_refs dict with the tags for previous releases | ||
1761 | + reltagre = re.compile("^([a-z0-9]{40}) refs\/tags\/RELEASE-([0-9]+)[-_.]([0-9]+)[-_.]([0-9]+)") | ||
1762 | + | ||
1763 | + cmd = ['git', 'show-ref', '--tags', '--dereference'] | ||
1764 | + p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) | ||
1765 | + for lin in p.stdout.readlines(): | ||
1766 | + match = reltagre.search (lin) | ||
1767 | + if match: | ||
1768 | + (sha, maj, min, nano) = match.groups() | ||
1769 | + release_refs[sha] = (maj, min, nano) | ||
1770 | + | ||
1771 | +def find_start_tag(): | ||
1772 | + starttagre = re.compile("^([a-z0-9]{40}) refs\/tags\/CHANGELOG_START") | ||
1773 | + cmd = ['git', 'show-ref', '--tags'] | ||
1774 | + p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) | ||
1775 | + for lin in p.stdout.readlines(): | ||
1776 | + match = starttagre.search (lin) | ||
1777 | + if match: | ||
1778 | + return match.group(1) | ||
1779 | + return None | ||
1780 | + | ||
1781 | +if __name__ == "__main__": | ||
1782 | + get_rel_tags() | ||
1783 | + output_commits() | ||
1784 | diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak | ||
1785 | new file mode 100644 | ||
1786 | index 0000000..cc82bbd | ||
1787 | --- /dev/null | ||
1788 | +++ b/common/gst-glib-gen.mak | ||
1789 | @@ -0,0 +1,45 @@ | ||
1790 | +# these are the variables your Makefile.am should set | ||
1791 | +# the example is based on the colorbalance interface | ||
1792 | + | ||
1793 | +#glib_enum_headers=$(colorbalance_headers) | ||
1794 | +#glib_enum_define=GST_COLOR_BALANCE | ||
1795 | +#glib_gen_prefix=gst_color_balance | ||
1796 | +#glib_gen_basename=colorbalance | ||
1797 | + | ||
1798 | +enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") | ||
1799 | + | ||
1800 | +# these are all the rules generating the relevant files | ||
1801 | +$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list | ||
1802 | + $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \ | ||
1803 | + mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h | ||
1804 | + | ||
1805 | +$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list | ||
1806 | + $(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \ | ||
1807 | + glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \ | ||
1808 | + mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c | ||
1809 | + | ||
1810 | +$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) | ||
1811 | + $(AM_V_GEN)glib-mkenums \ | ||
1812 | + --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ | ||
1813 | + --fprod "\n/* enumerations from \"@filename@\" */\n" \ | ||
1814 | + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ | ||
1815 | + --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ | ||
1816 | + $^ > $@ | ||
1817 | + | ||
1818 | +$(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) | ||
1819 | + @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi | ||
1820 | + $(AM_V_GEN)glib-mkenums \ | ||
1821 | + --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \ | ||
1822 | + --fprod "\n/* enumerations from \"@filename@\" */" \ | ||
1823 | + --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \ | ||
1824 | + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ | ||
1825 | + --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" \ | ||
1826 | + $^ > $@ | ||
1827 | + | ||
1828 | +# a hack rule to make sure .Plo files exist because they get include'd | ||
1829 | +# from Makefile's | ||
1830 | +.deps/%-marshal.Plo: | ||
1831 | + @touch $@ | ||
1832 | + | ||
1833 | +.deps/%-enumtypes.Plo: | ||
1834 | + @touch $@ | ||
1835 | diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak | ||
1836 | index 8cc42e7..084f9ae 100644 | ||
1837 | --- a/common/gtk-doc-plugins.mak | ||
1838 | +++ b/common/gtk-doc-plugins.mak | ||
1839 | @@ -13,8 +13,7 @@ help: | ||
1840 | @echo | ||
1841 | |||
1842 | # update the stuff maintained by doc maintainers | ||
1843 | -update: | ||
1844 | - $(MAKE) scanobj-update | ||
1845 | +update: scanobj-update | ||
1846 | $(MAKE) check-outdated-docs | ||
1847 | |||
1848 | # We set GPATH here; this gives us semantics for GNU make | ||
1849 | @@ -130,7 +129,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) | ||
1850 | --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ | ||
1851 | echo " DOC Merging introspection data" && \ | ||
1852 | $(PYTHON) \ | ||
1853 | - $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ | ||
1854 | + $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ | ||
1855 | if test x"$(srcdir)" != x. ; then \ | ||
1856 | for f in $(SCANOBJ_FILES); \ | ||
1857 | do \ | ||
1858 | diff --git a/common/hooks/post-receive.hook b/common/hooks/post-receive.hook | ||
1859 | new file mode 100644 | ||
1860 | index 0000000..cf1fe56 | ||
1861 | --- /dev/null | ||
1862 | +++ b/common/hooks/post-receive.hook | ||
1863 | @@ -0,0 +1,290 @@ | ||
1864 | +#!/usr/bin/perl -w | ||
1865 | +# | ||
1866 | +# Copyright 2005 Alexandre Julliard | ||
1867 | +# | ||
1868 | +# This program is free software; you can redistribute it and/or | ||
1869 | +# modify it under the terms of the GNU General Public License as | ||
1870 | +# published by the Free Software Foundation; either version 2 of | ||
1871 | +# the License, or (at your option) any later version. | ||
1872 | + | ||
1873 | +use strict; | ||
1874 | +use open ':utf8'; | ||
1875 | +use Encode 'encode'; | ||
1876 | +use Cwd 'realpath'; | ||
1877 | + | ||
1878 | +binmode STDIN, ':utf8'; | ||
1879 | +binmode STDOUT, ':utf8'; | ||
1880 | + | ||
1881 | +sub git_config($); | ||
1882 | +sub get_repos_name(); | ||
1883 | + | ||
1884 | +# some parameters you may want to change | ||
1885 | + | ||
1886 | +# set this to something that takes "-s" | ||
1887 | +my $mailer = "/usr/bin/mail"; | ||
1888 | + | ||
1889 | +# debug mode | ||
1890 | +my $debug = 0; | ||
1891 | + | ||
1892 | +# configuration parameters | ||
1893 | + | ||
1894 | +# base URL of the gitweb repository browser | ||
1895 | +my $gitweb_url = "http://cgit.freedesktop.org/gstreamer"; | ||
1896 | + | ||
1897 | +# default repository name | ||
1898 | +my $repos_name = get_repos_name(); | ||
1899 | + | ||
1900 | +# max size of diffs in bytes | ||
1901 | +my $max_diff_size = 10000; | ||
1902 | + | ||
1903 | +# address for mail notices | ||
1904 | +my $commitlist_address = 'gstreamer-commits@lists.freedesktop.org'; | ||
1905 | +#my $commitlist_address = "bilboed"; | ||
1906 | + | ||
1907 | +# max number of individual notices before falling back to a single global notice | ||
1908 | +my $max_individual_notices = 100; | ||
1909 | + | ||
1910 | +# format an integer date + timezone as string | ||
1911 | +# algorithm taken from git's date.c | ||
1912 | +sub format_date($$) | ||
1913 | +{ | ||
1914 | + my ($time,$tz) = @_; | ||
1915 | + | ||
1916 | + if ($tz < 0) | ||
1917 | + { | ||
1918 | + my $minutes = (-$tz / 100) * 60 + (-$tz % 100); | ||
1919 | + $time -= $minutes * 60; | ||
1920 | + } | ||
1921 | + else | ||
1922 | + { | ||
1923 | + my $minutes = ($tz / 100) * 60 + ($tz % 100); | ||
1924 | + $time += $minutes * 60; | ||
1925 | + } | ||
1926 | + return gmtime($time) . sprintf " %+05d", $tz; | ||
1927 | +} | ||
1928 | + | ||
1929 | +# fetch a parameter from the git config file | ||
1930 | +sub git_config($) | ||
1931 | +{ | ||
1932 | + my ($param) = @_; | ||
1933 | + | ||
1934 | + open CONFIG, "-|" or exec "git", "config", $param; | ||
1935 | + my $ret = <CONFIG>; | ||
1936 | + chomp $ret if $ret; | ||
1937 | + close CONFIG or $ret = undef; | ||
1938 | + return $ret; | ||
1939 | +} | ||
1940 | + | ||
1941 | +# send an email notification | ||
1942 | +sub mail_notification($$$@) | ||
1943 | +{ | ||
1944 | + my ($name, $subject, $content_type, @text) = @_; | ||
1945 | + $subject = encode("MIME-Q",$subject); | ||
1946 | + if ($debug) | ||
1947 | + { | ||
1948 | + print "---------------------\n"; | ||
1949 | + print "To: $name\n"; | ||
1950 | + print "Subject: $subject\n"; | ||
1951 | + print "Content-Type: $content_type\n"; | ||
1952 | + print "\n", join("\n", @text), "\n"; | ||
1953 | + } | ||
1954 | + else | ||
1955 | + { | ||
1956 | + my $pid = open MAIL, "|-"; | ||
1957 | + return unless defined $pid; | ||
1958 | + if (!$pid) | ||
1959 | + { | ||
1960 | + exec $mailer, "-s", $subject, $name, or die "Cannot exec $mailer"; | ||
1961 | + } | ||
1962 | + print MAIL join("\n", @text), "\n"; | ||
1963 | + close MAIL; | ||
1964 | + } | ||
1965 | +} | ||
1966 | + | ||
1967 | +# get the default repository name | ||
1968 | +sub get_repos_name() | ||
1969 | +{ | ||
1970 | + my $dir = `git rev-parse --git-dir`; | ||
1971 | + chomp $dir; | ||
1972 | + my $repos = realpath($dir); | ||
1973 | + $repos =~ s/(.*?)((\.git\/)?\.git)$/$1/; | ||
1974 | + $repos =~ s/(.*)\/([^\/]+)\/?$/$2/; | ||
1975 | + return $repos; | ||
1976 | +} | ||
1977 | + | ||
1978 | +# extract the information from a commit or tag object and return a hash containing the various fields | ||
1979 | +sub get_object_info($) | ||
1980 | +{ | ||
1981 | + my $obj = shift; | ||
1982 | + my %info = (); | ||
1983 | + my @log = (); | ||
1984 | + my $do_log = 0; | ||
1985 | + | ||
1986 | + open TYPE, "-|" or exec "git", "cat-file", "-t", $obj or die "cannot run git-cat-file"; | ||
1987 | + my $type = <TYPE>; | ||
1988 | + chomp $type; | ||
1989 | + close TYPE; | ||
1990 | + | ||
1991 | + open OBJ, "-|" or exec "git", "cat-file", $type, $obj or die "cannot run git-cat-file"; | ||
1992 | + while (<OBJ>) | ||
1993 | + { | ||
1994 | + chomp; | ||
1995 | + if ($do_log) | ||
1996 | + { | ||
1997 | + last if /^-----BEGIN PGP SIGNATURE-----/; | ||
1998 | + push @log, $_; | ||
1999 | + } | ||
2000 | + elsif (/^(author|committer|tagger) ((.*)(<.*>)) (\d+) ([+-]\d+)$/) | ||
2001 | + { | ||
2002 | + $info{$1} = $2; | ||
2003 | + $info{$1 . "_name"} = $3; | ||
2004 | + $info{$1 . "_email"} = $4; | ||
2005 | + $info{$1 . "_date"} = $5; | ||
2006 | + $info{$1 . "_tz"} = $6; | ||
2007 | + } | ||
2008 | + elsif (/^tag (.*)$/) | ||
2009 | + { | ||
2010 | + $info{"tag"} = $1; | ||
2011 | + } | ||
2012 | + elsif (/^$/) { $do_log = 1; } | ||
2013 | + } | ||
2014 | + close OBJ; | ||
2015 | + | ||
2016 | + $info{"type"} = $type; | ||
2017 | + $info{"log"} = \@log; | ||
2018 | + return %info; | ||
2019 | +} | ||
2020 | + | ||
2021 | +# send a commit notice to a mailing list | ||
2022 | +sub send_commit_notice($$) | ||
2023 | +{ | ||
2024 | + my ($ref,$obj) = @_; | ||
2025 | + my %info = get_object_info($obj); | ||
2026 | + my @notice = (); | ||
2027 | + my $subject; | ||
2028 | + | ||
2029 | + printf "sending e-mail for $obj\n"; | ||
2030 | + | ||
2031 | + # TODO normal tags are not identified | ||
2032 | + if ($info{"type"} eq "tag") | ||
2033 | + { | ||
2034 | + push @notice, | ||
2035 | + "Module: $repos_name", | ||
2036 | + "Branch: $ref", | ||
2037 | + "Tag: $obj", | ||
2038 | + $gitweb_url ? "URL: $gitweb_url/tag/?id=$obj\n" : "", | ||
2039 | + "Tagger: " . $info{"tagger"}, | ||
2040 | + "Date: " . format_date($info{"tagger_date"},$info{"tagger_tz"}), | ||
2041 | + "", | ||
2042 | + join "\n", @{$info{"log"}}; | ||
2043 | + $subject = "Tag " . $info{"tag"} . ": " . ${$info{"log"}}[0]; | ||
2044 | + } | ||
2045 | + else | ||
2046 | + { | ||
2047 | + push @notice, | ||
2048 | + "Module: $repos_name", | ||
2049 | + "Branch: $ref", | ||
2050 | + "Commit: $obj", | ||
2051 | + $gitweb_url ? "URL: $gitweb_url/commit/?id=$obj\n" : "", | ||
2052 | + "Author: " . $info{"author"}, | ||
2053 | + "Date: " . format_date($info{"author_date"},$info{"author_tz"}), | ||
2054 | + "", | ||
2055 | + join "\n", @{$info{"log"}}, | ||
2056 | + "", | ||
2057 | + "---", | ||
2058 | + ""; | ||
2059 | + | ||
2060 | + open STAT, "-|" or exec "git", "diff-tree", "--stat", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; | ||
2061 | + push @notice, join("", <STAT>); | ||
2062 | + close STAT; | ||
2063 | + | ||
2064 | + open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; | ||
2065 | + my $diff = join( "", <DIFF> ); | ||
2066 | + close DIFF; | ||
2067 | + | ||
2068 | + if (($max_diff_size == -1) || (length($diff) < $max_diff_size)) | ||
2069 | + { | ||
2070 | + push @notice, $diff; | ||
2071 | + } | ||
2072 | + else | ||
2073 | + { | ||
2074 | + push @notice, "Diff: $gitweb_url/diff/?id=$obj" if $gitweb_url; | ||
2075 | + } | ||
2076 | + | ||
2077 | + if ($ref eq 'master') | ||
2078 | + { | ||
2079 | + $subject = $repos_name . ": " . ${$info{"log"}}[0]; | ||
2080 | + } | ||
2081 | + else | ||
2082 | + { | ||
2083 | + $subject = "[$ref] " . $repos_name . ": " . ${$info{"log"}}[0]; | ||
2084 | + } | ||
2085 | + } | ||
2086 | + | ||
2087 | + mail_notification($commitlist_address, $subject, "text/plain; charset=UTF-8", @notice); | ||
2088 | +} | ||
2089 | + | ||
2090 | +# send a global commit notice when there are too many commits for individual mails | ||
2091 | +sub send_global_notice($$$) | ||
2092 | +{ | ||
2093 | + my ($ref, $old_sha1, $new_sha1) = @_; | ||
2094 | + my @notice = (); | ||
2095 | + | ||
2096 | + open LIST, "-|" or exec "git", "rev-list", "--pretty", "^$old_sha1", "$new_sha1" or die "cannot exec git-rev-list"; | ||
2097 | + while (<LIST>) | ||
2098 | + { | ||
2099 | + chomp; | ||
2100 | + s/^commit /URL: $gitweb_url\/commit\/?id=/ if $gitweb_url; | ||
2101 | + push @notice, $_; | ||
2102 | + } | ||
2103 | + close LIST; | ||
2104 | + | ||
2105 | + mail_notification($commitlist_address, "New commits on branch $ref", "text/plain; charset=UTF-8", @notice); | ||
2106 | +} | ||
2107 | + | ||
2108 | +# send all the notices | ||
2109 | +sub send_all_notices($$$) | ||
2110 | +{ | ||
2111 | + my ($old_sha1, $new_sha1, $ref) = @_; | ||
2112 | + | ||
2113 | + $ref =~ s/^refs\/heads\///; | ||
2114 | + | ||
2115 | + if ($old_sha1 eq '0' x 40) # new ref | ||
2116 | + { | ||
2117 | + send_commit_notice( $ref, $new_sha1 ) if $commitlist_address; | ||
2118 | + return; | ||
2119 | + } | ||
2120 | + | ||
2121 | + my @commits = (); | ||
2122 | + | ||
2123 | + open LIST, "-|" or exec "git", "rev-list", "--topo-order", "^$old_sha1", "$new_sha1" or die "cannot exec git-rev-list"; | ||
2124 | + while (<LIST>) | ||
2125 | + { | ||
2126 | + chomp; | ||
2127 | + die "invalid commit $_" unless /^[0-9a-f]{40}$/; | ||
2128 | + unshift @commits, $_; | ||
2129 | + } | ||
2130 | + close LIST; | ||
2131 | + | ||
2132 | + if (@commits > $max_individual_notices) | ||
2133 | + { | ||
2134 | + send_global_notice( $ref, $old_sha1, $new_sha1 ) if $commitlist_address; | ||
2135 | + return; | ||
2136 | + } | ||
2137 | + | ||
2138 | + foreach my $commit (@commits) | ||
2139 | + { | ||
2140 | + send_commit_notice( $ref, $commit ) if $commitlist_address; | ||
2141 | + } | ||
2142 | +} | ||
2143 | + | ||
2144 | +# append repository path to URL | ||
2145 | +$gitweb_url .= "/$repos_name" if $gitweb_url; | ||
2146 | + | ||
2147 | +while (<>) | ||
2148 | +{ | ||
2149 | + chomp; | ||
2150 | + if (/^([0-9a-f]{40}) ([0-9a-f]{40}) (.*)$/) { send_all_notices( $1, $2, $3 ); } | ||
2151 | +} | ||
2152 | + | ||
2153 | +exit 0; | ||
2154 | diff --git a/common/hooks/pre-commit.hook b/common/hooks/pre-commit.hook | ||
2155 | new file mode 100644 | ||
2156 | index 0000000..aef1ce1 | ||
2157 | --- /dev/null | ||
2158 | +++ b/common/hooks/pre-commit.hook | ||
2159 | @@ -0,0 +1,77 @@ | ||
2160 | +#!/bin/sh | ||
2161 | +# | ||
2162 | +# Check that the code follows a consistant code style | ||
2163 | +# | ||
2164 | + | ||
2165 | +# Check for existence of indent, and error out if not present. | ||
2166 | +# On some *bsd systems the binary seems to be called gnunindent, | ||
2167 | +# so check for that first. | ||
2168 | + | ||
2169 | +version=`gnuindent --version 2>/dev/null` | ||
2170 | +if test "x$version" = "x"; then | ||
2171 | + version=`indent --version 2>/dev/null` | ||
2172 | + if test "x$version" = "x"; then | ||
2173 | + echo "GStreamer git pre-commit hook:" | ||
2174 | + echo "Did not find GNU indent, please install it before continuing." | ||
2175 | + exit 1 | ||
2176 | + fi | ||
2177 | + INDENT=indent | ||
2178 | +else | ||
2179 | + INDENT=gnuindent | ||
2180 | +fi | ||
2181 | + | ||
2182 | +case `$INDENT --version` in | ||
2183 | + GNU*) | ||
2184 | + ;; | ||
2185 | + default) | ||
2186 | + echo "GStreamer git pre-commit hook:" | ||
2187 | + echo "Did not find GNU indent, please install it before continuing." | ||
2188 | + echo "(Found $INDENT, but it doesn't seem to be GNU indent)" | ||
2189 | + exit 1 | ||
2190 | + ;; | ||
2191 | +esac | ||
2192 | + | ||
2193 | +INDENT_PARAMETERS="--braces-on-if-line \ | ||
2194 | + --case-brace-indentation0 \ | ||
2195 | + --case-indentation2 \ | ||
2196 | + --braces-after-struct-decl-line \ | ||
2197 | + --line-length80 \ | ||
2198 | + --no-tabs \ | ||
2199 | + --cuddle-else \ | ||
2200 | + --dont-line-up-parentheses \ | ||
2201 | + --continuation-indentation4 \ | ||
2202 | + --honour-newlines \ | ||
2203 | + --tab-size8 \ | ||
2204 | + --indent-level2 \ | ||
2205 | + --leave-preprocessor-space" | ||
2206 | + | ||
2207 | +echo "--Checking style--" | ||
2208 | +for file in `git diff-index --cached --name-only HEAD --diff-filter=ACMR| grep "\.c$"` ; do | ||
2209 | + # nf is the temporary checkout. This makes sure we check against the | ||
2210 | + # revision in the index (and not the checked out version). | ||
2211 | + nf=`git checkout-index --temp ${file} | cut -f 1` | ||
2212 | + newfile=`mktemp /tmp/${nf}.XXXXXX` || exit 1 | ||
2213 | + $INDENT ${INDENT_PARAMETERS} \ | ||
2214 | + $nf -o $newfile 2>> /dev/null | ||
2215 | + # FIXME: Call indent twice as it tends to do line-breaks | ||
2216 | + # different for every second call. | ||
2217 | + $INDENT ${INDENT_PARAMETERS} \ | ||
2218 | + $newfile 2>> /dev/null | ||
2219 | + diff -u -p "${nf}" "${newfile}" | ||
2220 | + r=$? | ||
2221 | + rm "${newfile}" | ||
2222 | + rm "${nf}" | ||
2223 | + if [ $r != 0 ] ; then | ||
2224 | +echo "=================================================================================================" | ||
2225 | +echo " Code style error in: $file " | ||
2226 | +echo " " | ||
2227 | +echo " Please fix before committing. Don't forget to run git add before trying to commit again. " | ||
2228 | +echo " If the whole file is to be committed, this should work (run from the top-level directory): " | ||
2229 | +echo " " | ||
2230 | +echo " gst-indent $file; git add $file; git commit" | ||
2231 | +echo " " | ||
2232 | +echo "=================================================================================================" | ||
2233 | + exit 1 | ||
2234 | + fi | ||
2235 | +done | ||
2236 | +echo "--Checking style pass--" | ||
2237 | diff --git a/common/hooks/pre-receive.hook b/common/hooks/pre-receive.hook | ||
2238 | new file mode 100644 | ||
2239 | index 0000000..7aa72e5 | ||
2240 | --- /dev/null | ||
2241 | +++ b/common/hooks/pre-receive.hook | ||
2242 | @@ -0,0 +1,95 @@ | ||
2243 | +#!/usr/bin/env python | ||
2244 | +import sys | ||
2245 | +import os | ||
2246 | +import subprocess | ||
2247 | + | ||
2248 | +# This server-side pre-receive hook is to be put and activated in all modules | ||
2249 | +# that depend on the common submodule. | ||
2250 | +# | ||
2251 | +# It will check whether any modifications to the common 'submodule file' has a | ||
2252 | +# a valid commit SHA1 that exists in the common module. | ||
2253 | + | ||
2254 | +def commit_exists(sha1, gitdir): | ||
2255 | + """Returns True if the sha1 is a valid commit in the given | ||
2256 | + git directory""" | ||
2257 | + # FIXME: We're using 'git show' for the time being, but there's a small | ||
2258 | + # risk that there might be a valid SHA1 for a non-commit object. | ||
2259 | + env = os.environ.copy() | ||
2260 | + env["GIT_DIR"] = gitdir | ||
2261 | + sub = subprocess.Popen(["git", "show", sha1], env=env, | ||
2262 | + stdout=subprocess.PIPE, | ||
2263 | + stderr=subprocess.PIPE) | ||
2264 | + while True: | ||
2265 | + res = sub.poll() | ||
2266 | + if res != None: | ||
2267 | + return res == 0 | ||
2268 | + | ||
2269 | +# location of the common git module | ||
2270 | +COMMON_GIT_DIR = "/git/gstreamer/common.git" | ||
2271 | + | ||
2272 | +pushvalid = True | ||
2273 | +error_badcommon = False | ||
2274 | +error_badcommit = False | ||
2275 | + | ||
2276 | +print "=> Checking for integrity of common submodule changes" | ||
2277 | |||
2278 | + | ||
2279 | +for line in sys.stdin.readlines(): | ||
2280 | + # ref is the ref to be modified | ||
2281 | + # old is the old commit it was pointing to | ||
2282 | + # new is the new commit it was pointing to | ||
2283 | + old, new, ref = line.split(' ', 2) | ||
2284 | + | ||
2285 | + # 1. Get the latest change to common (if there was any changes) | ||
2286 | + sub = subprocess.Popen(["git", "diff", "%s..%s" % (old, new, ), "--", "common"], | ||
2287 | + stdout=subprocess.PIPE) | ||
2288 | + stdout, stderr = sub.communicate() | ||
2289 | + if stdout != "": | ||
2290 | + # Format of submodule special files | ||
2291 | + # Subproject commit <SHA1> | ||
2292 | + | ||
2293 | + # we get a diff, therefore only grab the last line | ||
2294 | + lastline = stdout.strip().rsplit('\n',1)[-1] | ||
2295 | + if not lastline.startswith("+Subproject commit"): | ||
2296 | + # this is bad, it means the diff has changed to something completely | ||
2297 | + # different | ||
2298 | + continue | ||
2299 | + subsha1 = lastline.rsplit(' ', 1)[-1] | ||
2300 | + print " Pack wants common to point to", subsha1 | ||
2301 | + if not commit_exists(subsha1, COMMON_GIT_DIR): | ||
2302 | + print " /!\\ Commit does not exist in common git module /!\\" | ||
2303 | + print " /!\\ for ref", ref | ||
2304 | + pushvalid = False | ||
2305 | + break | ||
2306 | + | ||
2307 | + # 2. Figure out if that commit exists in the common submodule | ||
2308 | + # (use GIT_DIR to execute commands in that directory) | ||
2309 | + | ||
2310 | + # Get the commit message | ||
2311 | + sub = subprocess.Popen(["git", "log", "--format=%s", | ||
2312 | + "%s..%s" % (old, new, )], stdout=subprocess.PIPE) | ||
2313 | + stdout, stderr = sub.communicate() | ||
2314 | + if stdout != "": | ||
2315 | + for line in stdout.strip().rsplit('\n',1): | ||
2316 | + if line.startswith("!"): | ||
2317 | + error_badcommit = True | ||
2318 | + pushvalid = False | ||
2319 | + break | ||
2320 | + | ||
2321 | +if pushvalid: | ||
2322 | + print " Incoming packet valid, proceeding to actual commit" | ||
2323 | + sys.exit(0) | ||
2324 | +else: | ||
2325 | + if error_badcommit: | ||
2326 | + print " Attempting to push commits with commit messages that start" | ||
2327 | + print " with '!'. Commit messages starting with '!' are reserved" | ||
2328 | + print " for private branches to prevent the commits from accidentally" | ||
2329 | + print " getting to the main repository." | ||
2330 | + if error_badcommon: | ||
2331 | + print " Attempting to push commits containing modifications to common" | ||
2332 | + print " that have not been commited to the actuall common module." | ||
2333 | |||
2334 | + print " First push your changes to common/ before pushing the changes" | ||
2335 | + print " to the module using it." | ||
2336 | + sys.exit(-1) | ||
2337 | + | ||
2338 | diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am | ||
2339 | index 2ddb8a7..856d6e3 100644 | ||
2340 | --- a/common/m4/Makefile.am | ||
2341 | +++ b/common/m4/Makefile.am | ||
2342 | @@ -8,7 +8,6 @@ EXTRA_DIST = \ | ||
2343 | as-gcc-inline-assembly.m4 \ | ||
2344 | as-libtool.m4 \ | ||
2345 | as-libtool-tags.m4 \ | ||
2346 | - as-objc.m4 \ | ||
2347 | as-python.m4 \ | ||
2348 | as-scrub-include.m4 \ | ||
2349 | as-version.m4 \ | ||
2350 | diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in | ||
2351 | index 886deab..52fbfa3 100644 | ||
2352 | --- a/common/m4/Makefile.in | ||
2353 | +++ b/common/m4/Makefile.in | ||
2354 | @@ -1,9 +1,9 @@ | ||
2355 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
2356 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
2357 | # @configure_input@ | ||
2358 | |||
2359 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
2360 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
2361 | -# Foundation, Inc. | ||
2362 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
2363 | +# Inc. | ||
2364 | # This Makefile.in is free software; the Free Software Foundation | ||
2365 | # gives unlimited permission to copy and/or distribute it, | ||
2366 | # with or without modifications, as long as this notice is preserved. | ||
2367 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
2368 | POST_UNINSTALL = : | ||
2369 | build_triplet = @build@ | ||
2370 | host_triplet = @host@ | ||
2371 | +target_triplet = @target@ | ||
2372 | subdir = common/m4 | ||
2373 | DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
2374 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
2375 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
2376 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
2377 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
2378 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
2379 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
2380 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
2381 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
2382 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
2383 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
2384 | CONFIG_HEADER = $(top_builddir)/config.h | ||
2385 | CONFIG_CLEAN_FILES = | ||
2386 | CONFIG_CLEAN_VPATH_FILES = | ||
2387 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
2388 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
2389 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
2390 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
2391 | am__v_GEN_0 = @echo " GEN " $@; | ||
2392 | -AM_V_at = $(am__v_at_@AM_V@) | ||
2393 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
2394 | +AM_V_at = $(am__v_at_$(V)) | ||
2395 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
2396 | am__v_at_0 = @ | ||
2397 | SOURCES = | ||
2398 | DIST_SOURCES = | ||
2399 | @@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ | ||
2400 | EGREP = @EGREP@ | ||
2401 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
2402 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
2403 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
2404 | EXEEXT = @EXEEXT@ | ||
2405 | FFLAGS = @FFLAGS@ | ||
2406 | FGREP = @FGREP@ | ||
2407 | @@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
2408 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
2409 | GST_CURRENT = @GST_CURRENT@ | ||
2410 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
2411 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
2412 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
2413 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
2414 | GST_LIBS = @GST_LIBS@ | ||
2415 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
2416 | @@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
2417 | GST_LICENSE = @GST_LICENSE@ | ||
2418 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
2419 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
2420 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
2421 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
2422 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
2423 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
2424 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
2425 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
2426 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
2427 | @@ -240,7 +245,7 @@ NM = @NM@ | ||
2428 | NMEDIT = @NMEDIT@ | ||
2429 | OBJC = @OBJC@ | ||
2430 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
2431 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
2432 | +OBJCFLAGS = @OBJCFLAGS@ | ||
2433 | OBJDUMP = @OBJDUMP@ | ||
2434 | OBJEXT = @OBJEXT@ | ||
2435 | OPENGL_ES2 = @OPENGL_ES2@ | ||
2436 | @@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
2437 | VERSION = @VERSION@ | ||
2438 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
2439 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
2440 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
2441 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
2442 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
2443 | XGETTEXT = @XGETTEXT@ | ||
2444 | @@ -350,7 +356,11 @@ sbindir = @sbindir@ | ||
2445 | sharedstatedir = @sharedstatedir@ | ||
2446 | srcdir = @srcdir@ | ||
2447 | sysconfdir = @sysconfdir@ | ||
2448 | +target = @target@ | ||
2449 | target_alias = @target_alias@ | ||
2450 | +target_cpu = @target_cpu@ | ||
2451 | +target_os = @target_os@ | ||
2452 | +target_vendor = @target_vendor@ | ||
2453 | top_build_prefix = @top_build_prefix@ | ||
2454 | top_builddir = @top_builddir@ | ||
2455 | top_srcdir = @top_srcdir@ | ||
2456 | @@ -364,7 +374,6 @@ EXTRA_DIST = \ | ||
2457 | as-gcc-inline-assembly.m4 \ | ||
2458 | as-libtool.m4 \ | ||
2459 | as-libtool-tags.m4 \ | ||
2460 | - as-objc.m4 \ | ||
2461 | as-python.m4 \ | ||
2462 | as-scrub-include.m4 \ | ||
2463 | as-version.m4 \ | ||
2464 | @@ -487,15 +496,10 @@ install-am: all-am | ||
2465 | |||
2466 | installcheck: installcheck-am | ||
2467 | install-strip: | ||
2468 | - if test -z '$(STRIP)'; then \ | ||
2469 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
2470 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
2471 | - install; \ | ||
2472 | - else \ | ||
2473 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
2474 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
2475 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
2476 | - fi | ||
2477 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
2478 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
2479 | + `test -z '$(STRIP)' || \ | ||
2480 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
2481 | mostlyclean-generic: | ||
2482 | |||
2483 | clean-generic: | ||
2484 | diff --git a/common/m4/as-compiler-flag.m4 b/common/m4/as-compiler-flag.m4 | ||
2485 | index 882a4c7..8bb853a 100644 | ||
2486 | --- a/common/m4/as-compiler-flag.m4 | ||
2487 | +++ b/common/m4/as-compiler-flag.m4 | ||
2488 | @@ -62,3 +62,35 @@ AC_DEFUN([AS_CXX_COMPILER_FLAG], | ||
2489 | AC_MSG_RESULT([$flag_ok]) | ||
2490 | ]) | ||
2491 | |||
2492 | +dnl AS_OBJC_COMPILER_FLAG(CPPFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) | ||
2493 | +dnl Tries to compile with the given CPPFLAGS. | ||
2494 | +dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags, | ||
2495 | +dnl and ACTION-IF-NOT-ACCEPTED otherwise. | ||
2496 | + | ||
2497 | +AC_DEFUN([AS_OBJC_COMPILER_FLAG], | ||
2498 | +[ | ||
2499 | + AC_REQUIRE([AC_PROG_OBJC]) | ||
2500 | + | ||
2501 | + AC_MSG_CHECKING([to see if Objective C compiler understands $1]) | ||
2502 | + | ||
2503 | + save_CPPFLAGS="$CPPFLAGS" | ||
2504 | + CPPFLAGS="$CPPFLAGS $1" | ||
2505 | + | ||
2506 | + AC_LANG_PUSH([Objective C]) | ||
2507 | + | ||
2508 | + AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no]) | ||
2509 | + CPPFLAGS="$save_CPPFLAGS" | ||
2510 | + | ||
2511 | + if test "X$flag_ok" = Xyes ; then | ||
2512 | + $2 | ||
2513 | + true | ||
2514 | + else | ||
2515 | + $3 | ||
2516 | + true | ||
2517 | + fi | ||
2518 | + | ||
2519 | + AC_LANG_POP([Objective C]) | ||
2520 | + | ||
2521 | + AC_MSG_RESULT([$flag_ok]) | ||
2522 | +]) | ||
2523 | + | ||
2524 | diff --git a/common/m4/gst-arch.m4 b/common/m4/gst-arch.m4 | ||
2525 | index 2e935d2..077a20b 100644 | ||
2526 | --- a/common/m4/gst-arch.m4 | ||
2527 | +++ b/common/m4/gst-arch.m4 | ||
2528 | @@ -5,32 +5,30 @@ dnl defines HOST_CPU | ||
2529 | |||
2530 | AC_DEFUN([AG_GST_ARCH], | ||
2531 | [ | ||
2532 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables | ||
2533 | - | ||
2534 | dnl Determine CPU | ||
2535 | - case "x${host_cpu}" in | ||
2536 | + case "x${target_cpu}" in | ||
2537 | xi?86 | xk? | xi?86_64) | ||
2538 | - case $host_os in | ||
2539 | + case $target_os in | ||
2540 | solaris*) | ||
2541 | AC_CHECK_DECL([__i386], [I386_ABI="yes"], [I386_ABI="no"]) | ||
2542 | AC_CHECK_DECL([__amd64], [AMD64_ABI="yes"], [AMD64_ABI="no"]) | ||
2543 | |||
2544 | if test "x$I386_ABI" = "xyes" ; then | ||
2545 | HAVE_CPU_I386=yes | ||
2546 | - AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) | ||
2547 | + AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) | ||
2548 | fi | ||
2549 | if test "x$AMD64_ABI" = "xyes" ; then | ||
2550 | HAVE_CPU_X86_64=yes | ||
2551 | - AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) | ||
2552 | + AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) | ||
2553 | fi | ||
2554 | ;; | ||
2555 | *) | ||
2556 | HAVE_CPU_I386=yes | ||
2557 | - AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) | ||
2558 | + AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) | ||
2559 | |||
2560 | dnl FIXME could use some better detection | ||
2561 | dnl (ie CPUID) | ||
2562 | - case "x${host_cpu}" in | ||
2563 | + case "x${target_cpu}" in | ||
2564 | xi386 | xi486) ;; | ||
2565 | *) | ||
2566 | AC_DEFINE(HAVE_RDTSC, 1, [Define if RDTSC is available]) ;; | ||
2567 | @@ -40,43 +38,43 @@ AC_DEFUN([AG_GST_ARCH], | ||
2568 | ;; | ||
2569 | xpowerpc) | ||
2570 | HAVE_CPU_PPC=yes | ||
2571 | - AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the host CPU is a PowerPC]) ;; | ||
2572 | + AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PowerPC]) ;; | ||
2573 | xpowerpc64) | ||
2574 | HAVE_CPU_PPC64=yes | ||
2575 | - AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the host CPU is a 64 bit PowerPC]) ;; | ||
2576 | + AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the target CPU is a 64 bit PowerPC]) ;; | ||
2577 | xalpha*) | ||
2578 | HAVE_CPU_ALPHA=yes | ||
2579 | - AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the host CPU is an Alpha]) ;; | ||
2580 | + AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;; | ||
2581 | xarm*) | ||
2582 | HAVE_CPU_ARM=yes | ||
2583 | - AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the host CPU is an ARM]) ;; | ||
2584 | + AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;; | ||
2585 | xsparc*) | ||
2586 | HAVE_CPU_SPARC=yes | ||
2587 | - AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the host CPU is a SPARC]) ;; | ||
2588 | + AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a SPARC]) ;; | ||
2589 | xmips*) | ||
2590 | HAVE_CPU_MIPS=yes | ||
2591 | - AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the host CPU is a MIPS]) ;; | ||
2592 | + AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the target CPU is a MIPS]) ;; | ||
2593 | xhppa*) | ||
2594 | HAVE_CPU_HPPA=yes | ||
2595 | - AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the host CPU is a HPPA]) ;; | ||
2596 | + AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the target CPU is a HPPA]) ;; | ||
2597 | xs390*) | ||
2598 | HAVE_CPU_S390=yes | ||
2599 | - AC_DEFINE(HAVE_CPU_S390, 1, [Define if the host CPU is a S390]) ;; | ||
2600 | + AC_DEFINE(HAVE_CPU_S390, 1, [Define if the target CPU is a S390]) ;; | ||
2601 | xia64*) | ||
2602 | HAVE_CPU_IA64=yes | ||
2603 | - AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the host CPU is a IA64]) ;; | ||
2604 | + AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the target CPU is a IA64]) ;; | ||
2605 | xm68k*) | ||
2606 | HAVE_CPU_M68K=yes | ||
2607 | - AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the host CPU is a M68K]) ;; | ||
2608 | + AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the target CPU is a M68K]) ;; | ||
2609 | xx86_64) | ||
2610 | HAVE_CPU_X86_64=yes | ||
2611 | - AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) ;; | ||
2612 | + AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) ;; | ||
2613 | xcris) | ||
2614 | HAVE_CPU_CRIS=yes | ||
2615 | - AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the host CPU is a CRIS]) ;; | ||
2616 | + AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the target CPU is a CRIS]) ;; | ||
2617 | xcrisv32) | ||
2618 | HAVE_CPU_CRISV32=yes | ||
2619 | - AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the host CPU is a CRISv32]) ;; | ||
2620 | + AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the target CPU is a CRISv32]) ;; | ||
2621 | esac | ||
2622 | |||
2623 | dnl Determine endianness | ||
2624 | @@ -98,6 +96,7 @@ AC_DEFUN([AG_GST_ARCH], | ||
2625 | AM_CONDITIONAL(HAVE_CPU_CRISV32, test "x$HAVE_CPU_CRISV32" = "xyes") | ||
2626 | |||
2627 | AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu", [the host CPU]) | ||
2628 | + AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu", [the target CPU]) | ||
2629 | ]) | ||
2630 | |||
2631 | dnl check if unaligned memory access works correctly | ||
2632 | diff --git a/common/m4/gst-args.m4 b/common/m4/gst-args.m4 | ||
2633 | index 030e7ac..e011ed4 100644 | ||
2634 | --- a/common/m4/gst-args.m4 | ||
2635 | +++ b/common/m4/gst-args.m4 | ||
2636 | @@ -19,6 +19,7 @@ dnl AG_GST_ARG_ENABLE_EXTERNAL | ||
2637 | dnl AG_GST_ARG_ENABLE_EXPERIMENTAL | ||
2638 | dnl AG_GST_ARG_ENABLE_BROKEN | ||
2639 | |||
2640 | +dnl AG_GST_ARG_DISABLE_FATAL_WARNINGS | ||
2641 | AC_DEFUN([AG_GST_ARG_DEBUG], | ||
2642 | [ | ||
2643 | dnl debugging stuff | ||
2644 | @@ -110,13 +111,13 @@ AC_DEFUN([AG_GST_ARG_GCOV], | ||
2645 | dnl if gcov is used, we do not want default -O2 CFLAGS | ||
2646 | if test "x$GST_GCOV_ENABLED" = "xyes" | ||
2647 | then | ||
2648 | - CFLAGS="-O0" | ||
2649 | + CFLAGS="$CFLAGS -O0" | ||
2650 | AC_SUBST(CFLAGS) | ||
2651 | - CXXFLAGS="-O0" | ||
2652 | + CXXFLAGS="$CXXFLAGS -O0" | ||
2653 | AC_SUBST(CXXFLAGS) | ||
2654 | - FFLAGS="-O0" | ||
2655 | + FFLAGS="$FFLAGS -O0" | ||
2656 | AC_SUBST(FFLAGS) | ||
2657 | - CCASFLAGS="-O0" | ||
2658 | + CCASFLAGS="$CCASFLAGS -O0" | ||
2659 | AC_SUBST(CCASFLAGS) | ||
2660 | AC_MSG_NOTICE([gcov enabled, setting CFLAGS and friends to $CFLAGS]) | ||
2661 | fi | ||
2662 | @@ -325,3 +326,20 @@ AC_DEFUN([AG_GST_ARG_ENABLE_BROKEN], | ||
2663 | AC_MSG_NOTICE([not building broken plug-ins]) | ||
2664 | ]) | ||
2665 | ]) | ||
2666 | + | ||
2667 | +dnl allow people (or build tools) to override default behaviour | ||
2668 | +dnl for fatal compiler warnings | ||
2669 | +AC_DEFUN([AG_GST_ARG_DISABLE_FATAL_WARNINGS], | ||
2670 | +[ | ||
2671 | + AC_ARG_ENABLE(fatal-warnings, | ||
2672 | + AC_HELP_STRING([--disable-fatal-warnings], | ||
2673 | + [Don't turn compiler warnings into fatal errors]), | ||
2674 | + [ | ||
2675 | + case "${enableval}" in | ||
2676 | + yes) FATAL_WARNINGS=yes ;; | ||
2677 | + no) FATAL_WARNINGS=no ;; | ||
2678 | + *) AC_MSG_ERROR(bad value ${enableval} for --disable-fatal-warnings) ;; | ||
2679 | + esac | ||
2680 | + ], | ||
2681 | + [FATAL_WARNINGS=$GST_GIT]) dnl Default value | ||
2682 | +]) | ||
2683 | diff --git a/common/m4/gst-check.m4 b/common/m4/gst-check.m4 | ||
2684 | index 3fd3acf..f3f39b4 100644 | ||
2685 | --- a/common/m4/gst-check.m4 | ||
2686 | +++ b/common/m4/gst-check.m4 | ||
2687 | @@ -117,6 +117,38 @@ AC_DEFUN([AG_GST_CHECK_GST_CHECK], | ||
2688 | ]) | ||
2689 | |||
2690 | dnl =========================================================================== | ||
2691 | +dnl AG_GST_CHECK_UNINSTALLED_SETUP([ACTION-IF-UNINSTALLED], [ACTION-IF-NOT]) | ||
2692 | +dnl | ||
2693 | +dnl ACTION-IF-UNINSTALLED (optional) extra actions to perform if the setup | ||
2694 | +dnl is an uninstalled setup | ||
2695 | +dnl ACTION-IF-NOT (optional) extra actions to perform if the setup | ||
2696 | +dnl is not an uninstalled setup | ||
2697 | +dnl =========================================================================== | ||
2698 | +AC_DEFUN([AG_GST_CHECK_UNINSTALLED_SETUP], | ||
2699 | +[ | ||
2700 | + AC_MSG_CHECKING([whether this is an uninstalled GStreamer setup]) | ||
2701 | + AC_CACHE_VAL(gst_cv_is_uninstalled_setup,[ | ||
2702 | + gst_cv_is_uninstalled_setup=no | ||
2703 | + if (set -u; : $GST_PLUGIN_SYSTEM_PATH) 2>/dev/null ; then | ||
2704 | + if test -z "$GST_PLUGIN_SYSTEM_PATH" \ | ||
2705 | + -a -n "$GST_PLUGIN_SCANNER" \ | ||
2706 | + -a -n "$GST_PLUGIN_PATH" \ | ||
2707 | + -a -n "$GST_REGISTRY" \ | ||
2708 | + -a -n "$DYLD_LIBRARY_PATH" \ | ||
2709 | + -a -n "$LD_LIBRARY_PATH"; then | ||
2710 | + gst_cv_is_uninstalled_setup=yes; | ||
2711 | + fi | ||
2712 | + fi | ||
2713 | + ]) | ||
2714 | + AC_MSG_RESULT($gst_cv_is_uninstalled_setup) | ||
2715 | + if test "x$gst_cv_is_uninstalled_setup" = "xyes"; then | ||
2716 | + ifelse([$1], , :, [$1]) | ||
2717 | + else | ||
2718 | + ifelse([$2], , :, [$2]) | ||
2719 | + fi | ||
2720 | +]) | ||
2721 | + | ||
2722 | +dnl =========================================================================== | ||
2723 | dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-MAJORMINOR], [MIN-VERSION], [REQUIRED]) | ||
2724 | dnl | ||
2725 | dnl Sets GST_PLUGINS_BASE_CFLAGS and GST_PLUGINS_BASE_LIBS. | ||
2726 | diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4 | ||
2727 | index f8f2364..b7f9dd3 100644 | ||
2728 | --- a/common/m4/gst-error.m4 | ||
2729 | +++ b/common/m4/gst-error.m4 | ||
2730 | @@ -196,6 +196,91 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS], | ||
2731 | AC_MSG_NOTICE([set ERROR_CXXFLAGS to $ERROR_CXXFLAGS]) | ||
2732 | ]) | ||
2733 | |||
2734 | +dnl Sets WARNING_OBJCFLAGS and ERROR_OBJCFLAGS to something the compiler | ||
2735 | +dnl will accept and AC_SUBST them so they are available in Makefile | ||
2736 | +dnl | ||
2737 | +dnl WARNING_OBJCFLAGS will contain flags to make the compiler emit more | ||
2738 | +dnl warnings. | ||
2739 | +dnl ERROR_OBJCFLAGS will contain flags to make those warnings fatal, | ||
2740 | +dnl unless ADD-WERROR is set to "no" | ||
2741 | +dnl | ||
2742 | +dnl If MORE_FLAGS is set, tries to add each of the given flags | ||
2743 | +dnl to WARNING_CFLAGS if the compiler supports them. Each flag is | ||
2744 | +dnl tested separately. | ||
2745 | +dnl | ||
2746 | +dnl These flags can be overridden at make time: | ||
2747 | +dnl make ERROR_OBJCFLAGS= | ||
2748 | +AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS], | ||
2749 | +[ | ||
2750 | + AC_REQUIRE([AC_PROG_OBJC]) | ||
2751 | + AC_REQUIRE([AS_OBJC_COMPILER_FLAG]) | ||
2752 | + | ||
2753 | + ERROR_OBJCFLAGS="" | ||
2754 | + WARNING_OBJCFLAGS="" | ||
2755 | + | ||
2756 | + dnl if we support -Wall, set it unconditionally | ||
2757 | + AS_OBJC_COMPILER_FLAG(-Wall, WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall") | ||
2758 | + | ||
2759 | + dnl if asked for, add -Werror if supported | ||
2760 | + if test "x$1" != "xno" | ||
2761 | + then | ||
2762 | + AS_OBJC_COMPILER_FLAG(-Werror, ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror") | ||
2763 | + | ||
2764 | + if test "x$ERROR_OBJCFLAGS" != "x" | ||
2765 | + then | ||
2766 | + dnl Add -fno-strict-aliasing for GLib versions before 2.19.8 | ||
2767 | + dnl as before G_LOCK and friends caused strict aliasing compiler | ||
2768 | + dnl warnings. | ||
2769 | + PKG_CHECK_EXISTS([glib-2.0 < 2.19.8], [ | ||
2770 | + AS_OBJC_COMPILER_FLAG([-fno-strict-aliasing], | ||
2771 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing") | ||
2772 | + ]) | ||
2773 | + else | ||
2774 | + dnl if -Werror isn't suported, try -errwarn=%all | ||
2775 | + AS_OBJC_COMPILER_FLAG([-errwarn=%all], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all") | ||
2776 | + if test "x$ERROR_OBJCFLAGS" != "x"; then | ||
2777 | + dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, | ||
2778 | + dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, | ||
2779 | + dnl no%E_MACRO_REDEFINED (Sun Forte case) | ||
2780 | + dnl For Forte we need disable "empty declaration" warning produced by un-needed semicolon | ||
2781 | + dnl "statement not reached" disabled because there is g_assert_not_reached () in some places | ||
2782 | + dnl "macro redefined" because of gst/gettext.h | ||
2783 | + dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? | ||
2784 | + dnl FIXME: do any of these work with the c++ compiler? if not, why | ||
2785 | + dnl do we check at all? | ||
2786 | + for f in 'no%E_EMPTY_DECLARATION' \ | ||
2787 | + 'no%E_STATEMENT_NOT_REACHED' \ | ||
2788 | + 'no%E_ARGUEMENT_MISMATCH' \ | ||
2789 | + 'no%E_MACRO_REDEFINED' \ | ||
2790 | + 'no%E_LOOP_NOT_ENTERED_AT_TOP' | ||
2791 | + do | ||
2792 | + AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f") | ||
2793 | + done | ||
2794 | + fi | ||
2795 | + fi | ||
2796 | + fi | ||
2797 | + | ||
2798 | + if test "x$2" != "x" | ||
2799 | + then | ||
2800 | + UNSUPPORTED="" | ||
2801 | + list="$2" | ||
2802 | + for each in $list | ||
2803 | + do | ||
2804 | + AS_OBJC_COMPILER_FLAG($each, | ||
2805 | + WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each", | ||
2806 | + UNSUPPORTED="$UNSUPPORTED $each") | ||
2807 | + done | ||
2808 | + if test "X$UNSUPPORTED" != X ; then | ||
2809 | + AC_MSG_NOTICE([unsupported compiler flags: $UNSUPPORTED]) | ||
2810 | + fi | ||
2811 | + fi | ||
2812 | + | ||
2813 | + AC_SUBST(WARNING_OBJCFLAGS) | ||
2814 | + AC_SUBST(ERROR_OBJCFLAGS) | ||
2815 | + AC_MSG_NOTICE([set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS]) | ||
2816 | + AC_MSG_NOTICE([set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS]) | ||
2817 | +]) | ||
2818 | + | ||
2819 | dnl Sets the default error level for debugging messages | ||
2820 | AC_DEFUN([AG_GST_SET_LEVEL_DEFAULT], | ||
2821 | [ | ||
2822 | diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4 | ||
2823 | index c072c79..cff7f30 100644 | ||
2824 | --- a/common/m4/gst-feature.m4 | ||
2825 | +++ b/common/m4/gst-feature.m4 | ||
2826 | @@ -232,10 +232,11 @@ AC_DEFUN([AG_GST_CHECK_GST_DEBUG_DISABLED], | ||
2827 | save_CFLAGS="$CFLAGS" | ||
2828 | CFLAGS="$GST_CFLAGS $CFLAGS" | ||
2829 | AC_COMPILE_IFELSE([ | ||
2830 | + AC_LANG_SOURCE([[ | ||
2831 | #include <gst/gstconfig.h> | ||
2832 | #ifdef GST_DISABLE_GST_DEBUG | ||
2833 | #error "debugging disabled, make compiler fail" | ||
2834 | - #endif], [ debug_system_enabled=yes], [debug_system_enabled=no]) | ||
2835 | + #endif]])], [ debug_system_enabled=yes], [debug_system_enabled=no]) | ||
2836 | CFLAGS="$save_CFLAGS" | ||
2837 | AC_LANG_POP([C]) | ||
2838 | |||
2839 | diff --git a/common/m4/gst.m4 b/common/m4/gst.m4 | ||
2840 | index ddfde51..d4c53cb 100644 | ||
2841 | --- a/common/m4/gst.m4 | ||
2842 | +++ b/common/m4/gst.m4 | ||
2843 | @@ -3,10 +3,15 @@ dnl sets up use of GStreamer configure.ac macros | ||
2844 | dnl all GStreamer autoconf macros are prefixed | ||
2845 | dnl with AG_GST_ for public macros | ||
2846 | dnl with _AG_GST_ for private macros | ||
2847 | +dnl | ||
2848 | +dnl We call AC_CANONICAL_TARGET and AC_CANONICAL_HOST so that | ||
2849 | +dnl it is valid before AC_ARG_PROGRAM is called | ||
2850 | |||
2851 | AC_DEFUN([AG_GST_INIT], | ||
2852 | [ | ||
2853 | m4_pattern_forbid(^_?AG_GST_) | ||
2854 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables | ||
2855 | + AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables | ||
2856 | ]) | ||
2857 | |||
2858 | dnl AG_GST_PKG_CONFIG_PATH | ||
2859 | diff --git a/common/update-common b/common/update-common | ||
2860 | new file mode 100644 | ||
2861 | index 0000000..bb7dcef | ||
2862 | --- /dev/null | ||
2863 | +++ b/common/update-common | ||
2864 | @@ -0,0 +1,82 @@ | ||
2865 | +#!/bin/bash | ||
2866 | +# | ||
2867 | +# This script will update all the modules listed below so that | ||
2868 | +# common points to master in the common module. | ||
2869 | +# | ||
2870 | +# If you have many of the GStreamer modules checked out in a particular | ||
2871 | +# directory, it's best to run this script from that directory. For | ||
2872 | +# example, I check everything out in ~/gst, so this file is | ||
2873 | +# ~/gst/common/update-common. To do an update, I do | ||
2874 | +# 'cd ~/gst ; ./common/update-common'. This will automatically use | ||
2875 | +# the refs in your existing checkout when cloning the temporary | ||
2876 | +# checkout. Alternatively, you can use the reference variable below. | ||
2877 | +# | ||
2878 | + | ||
2879 | +# Set this variable to point to any directory containing existing | ||
2880 | +# git # checkouts, and git will pull objects from there, decreasing | ||
2881 | +# network usage. | ||
2882 | +BRANCH=0.10 | ||
2883 | +reference=~/gst | ||
2884 | +PUSHURL=ssh://git.freedesktop.org/git/gstreamer | ||
2885 | + | ||
2886 | +set -e | ||
2887 | +set -x | ||
2888 | + | ||
2889 | +modules="gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad \ | ||
2890 | + gst-plugins-ugly gst-ffmpeg gst-python \ | ||
2891 | + gnonlin gst-plugins-gl gst-rtsp-server gst-editing-services" | ||
2892 | + | ||
2893 | +topdir=`pwd` | ||
2894 | +dir=`mktemp -d $topdir/common-update-XXXXXX` | ||
2895 | + | ||
2896 | +for module in $modules | ||
2897 | +do | ||
2898 | + cd $dir | ||
2899 | + if test -e $reference/$module/.git ; then | ||
2900 | + pushd $reference/$module | ||
2901 | + PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'` | ||
2902 | + popd | ||
2903 | + git clone --reference $reference/$module/.git --shared ssh://git.freedesktop.org/git/gstreamer/$module | ||
2904 | + elif test -e $topdir/$module/.git ; then | ||
2905 | + pushd $topdir/$module | ||
2906 | + PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'` | ||
2907 | + popd | ||
2908 | + git clone --reference $topdir/$module/.git --shared $PUSHURL/$module | ||
2909 | + else | ||
2910 | + git clone $PUSHURL/$module | ||
2911 | + fi | ||
2912 | + cd $dir/$module | ||
2913 | + | ||
2914 | + # ignore modules that don't have such a branch | ||
2915 | + if ! git show-ref origin/$BRANCH >/dev/null; then | ||
2916 | + continue; | ||
2917 | + fi | ||
2918 | + | ||
2919 | + git checkout -b $BRANCH origin/$BRANCH | ||
2920 | + git submodule init | ||
2921 | + git submodule update | ||
2922 | + cd $dir/$module/common | ||
2923 | + ref_from=`git log --pretty=format:%h -n 1 HEAD` | ||
2924 | + git checkout -b $BRANCH origin/$BRANCH | ||
2925 | + git pull origin | ||
2926 | + ref_to=`git log --pretty=format:%h -n 1 HEAD` | ||
2927 | + echo updating common from $ref_from to $ref_to | ||
2928 | + if [ "$ref_from" != "$ref_to" ] ; then | ||
2929 | + cd $dir/$module | ||
2930 | + git add common | ||
2931 | + git commit -m "Automatic update of common submodule | ||
2932 | + | ||
2933 | +From $ref_from to $ref_to" | ||
2934 | + fi | ||
2935 | + cd $dir | ||
2936 | +done | ||
2937 | + | ||
2938 | +for module in $modules | ||
2939 | +do | ||
2940 | + cd $dir/$module | ||
2941 | + if git show-ref origin/$BRANCH >/dev/null; then | ||
2942 | + git push origin $BRANCH | ||
2943 | + fi | ||
2944 | +done | ||
2945 | + | ||
2946 | +rm -rf $dir | ||
2947 | diff --git a/compile b/compile | ||
2948 | index b1f4749..c0096a7 100755 | ||
2949 | --- a/compile | ||
2950 | +++ b/compile | ||
2951 | @@ -1,10 +1,10 @@ | ||
2952 | #! /bin/sh | ||
2953 | -# Wrapper for compilers which do not understand '-c -o'. | ||
2954 | +# Wrapper for compilers which do not understand `-c -o'. | ||
2955 | |||
2956 | -scriptversion=2012-01-04.17; # UTC | ||
2957 | +scriptversion=2009-10-06.20; # UTC | ||
2958 | |||
2959 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free | ||
2960 | -# Software Foundation, Inc. | ||
2961 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software | ||
2962 | +# Foundation, Inc. | ||
2963 | # Written by Tom Tromey <tromey@cygnus.com>. | ||
2964 | # | ||
2965 | # This program is free software; you can redistribute it and/or modify | ||
2966 | @@ -29,186 +29,21 @@ scriptversion=2012-01-04.17; # UTC | ||
2967 | # bugs to <bug-automake@gnu.org> or send patches to | ||
2968 | # <automake-patches@gnu.org>. | ||
2969 | |||
2970 | -nl=' | ||
2971 | -' | ||
2972 | - | ||
2973 | -# We need space, tab and new line, in precisely that order. Quoting is | ||
2974 | -# there to prevent tools from complaining about whitespace usage. | ||
2975 | -IFS=" "" $nl" | ||
2976 | - | ||
2977 | -file_conv= | ||
2978 | - | ||
2979 | -# func_file_conv build_file lazy | ||
2980 | -# Convert a $build file to $host form and store it in $file | ||
2981 | -# Currently only supports Windows hosts. If the determined conversion | ||
2982 | -# type is listed in (the comma separated) LAZY, no conversion will | ||
2983 | -# take place. | ||
2984 | -func_file_conv () | ||
2985 | -{ | ||
2986 | - file=$1 | ||
2987 | - case $file in | ||
2988 | - / | /[!/]*) # absolute file, and not a UNC file | ||
2989 | - if test -z "$file_conv"; then | ||
2990 | - # lazily determine how to convert abs files | ||
2991 | - case `uname -s` in | ||
2992 | - MINGW*) | ||
2993 | - file_conv=mingw | ||
2994 | - ;; | ||
2995 | - CYGWIN*) | ||
2996 | - file_conv=cygwin | ||
2997 | - ;; | ||
2998 | - *) | ||
2999 | - file_conv=wine | ||
3000 | - ;; | ||
3001 | - esac | ||
3002 | - fi | ||
3003 | - case $file_conv/,$2, in | ||
3004 | - *,$file_conv,*) | ||
3005 | - ;; | ||
3006 | - mingw/*) | ||
3007 | - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` | ||
3008 | - ;; | ||
3009 | - cygwin/*) | ||
3010 | - file=`cygpath -m "$file" || echo "$file"` | ||
3011 | - ;; | ||
3012 | - wine/*) | ||
3013 | - file=`winepath -w "$file" || echo "$file"` | ||
3014 | - ;; | ||
3015 | - esac | ||
3016 | - ;; | ||
3017 | - esac | ||
3018 | -} | ||
3019 | - | ||
3020 | -# func_cl_wrapper cl arg... | ||
3021 | -# Adjust compile command to suit cl | ||
3022 | -func_cl_wrapper () | ||
3023 | -{ | ||
3024 | - # Assume a capable shell | ||
3025 | - lib_path= | ||
3026 | - shared=: | ||
3027 | - linker_opts= | ||
3028 | - for arg | ||
3029 | - do | ||
3030 | - if test -n "$eat"; then | ||
3031 | - eat= | ||
3032 | - else | ||
3033 | - case $1 in | ||
3034 | - -o) | ||
3035 | - # configure might choose to run compile as 'compile cc -o foo foo.c'. | ||
3036 | - eat=1 | ||
3037 | - case $2 in | ||
3038 | - *.o | *.[oO][bB][jJ]) | ||
3039 | - func_file_conv "$2" | ||
3040 | - set x "$@" -Fo"$file" | ||
3041 | - shift | ||
3042 | - ;; | ||
3043 | - *) | ||
3044 | - func_file_conv "$2" | ||
3045 | - set x "$@" -Fe"$file" | ||
3046 | - shift | ||
3047 | - ;; | ||
3048 | - esac | ||
3049 | - ;; | ||
3050 | - -I*) | ||
3051 | - func_file_conv "${1#-I}" mingw | ||
3052 | - set x "$@" -I"$file" | ||
3053 | - shift | ||
3054 | - ;; | ||
3055 | - -l*) | ||
3056 | - lib=${1#-l} | ||
3057 | - found=no | ||
3058 | - save_IFS=$IFS | ||
3059 | - IFS=';' | ||
3060 | - for dir in $lib_path $LIB | ||
3061 | - do | ||
3062 | - IFS=$save_IFS | ||
3063 | - if $shared && test -f "$dir/$lib.dll.lib"; then | ||
3064 | - found=yes | ||
3065 | - set x "$@" "$dir/$lib.dll.lib" | ||
3066 | - break | ||
3067 | - fi | ||
3068 | - if test -f "$dir/$lib.lib"; then | ||
3069 | - found=yes | ||
3070 | - set x "$@" "$dir/$lib.lib" | ||
3071 | - break | ||
3072 | - fi | ||
3073 | - done | ||
3074 | - IFS=$save_IFS | ||
3075 | - | ||
3076 | - test "$found" != yes && set x "$@" "$lib.lib" | ||
3077 | - shift | ||
3078 | - ;; | ||
3079 | - -L*) | ||
3080 | - func_file_conv "${1#-L}" | ||
3081 | - if test -z "$lib_path"; then | ||
3082 | - lib_path=$file | ||
3083 | - else | ||
3084 | - lib_path="$lib_path;$file" | ||
3085 | - fi | ||
3086 | - linker_opts="$linker_opts -LIBPATH:$file" | ||
3087 | - ;; | ||
3088 | - -static) | ||
3089 | - shared=false | ||
3090 | - ;; | ||
3091 | - -Wl,*) | ||
3092 | - arg=${1#-Wl,} | ||
3093 | - save_ifs="$IFS"; IFS=',' | ||
3094 | - for flag in $arg; do | ||
3095 | - IFS="$save_ifs" | ||
3096 | - linker_opts="$linker_opts $flag" | ||
3097 | - done | ||
3098 | - IFS="$save_ifs" | ||
3099 | - ;; | ||
3100 | - -Xlinker) | ||
3101 | - eat=1 | ||
3102 | - linker_opts="$linker_opts $2" | ||
3103 | - ;; | ||
3104 | - -*) | ||
3105 | - set x "$@" "$1" | ||
3106 | - shift | ||
3107 | - ;; | ||
3108 | - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) | ||
3109 | - func_file_conv "$1" | ||
3110 | - set x "$@" -Tp"$file" | ||
3111 | - shift | ||
3112 | - ;; | ||
3113 | - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) | ||
3114 | - func_file_conv "$1" mingw | ||
3115 | - set x "$@" "$file" | ||
3116 | - shift | ||
3117 | - ;; | ||
3118 | - *) | ||
3119 | - set x "$@" "$1" | ||
3120 | - shift | ||
3121 | - ;; | ||
3122 | - esac | ||
3123 | - fi | ||
3124 | - shift | ||
3125 | - done | ||
3126 | - if test -n "$linker_opts"; then | ||
3127 | - linker_opts="-link$linker_opts" | ||
3128 | - fi | ||
3129 | - exec "$@" $linker_opts | ||
3130 | - exit 1 | ||
3131 | -} | ||
3132 | - | ||
3133 | -eat= | ||
3134 | - | ||
3135 | case $1 in | ||
3136 | '') | ||
3137 | - echo "$0: No command. Try '$0 --help' for more information." 1>&2 | ||
3138 | + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 | ||
3139 | exit 1; | ||
3140 | ;; | ||
3141 | -h | --h*) | ||
3142 | cat <<\EOF | ||
3143 | Usage: compile [--help] [--version] PROGRAM [ARGS] | ||
3144 | |||
3145 | -Wrapper for compilers which do not understand '-c -o'. | ||
3146 | -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining | ||
3147 | +Wrapper for compilers which do not understand `-c -o'. | ||
3148 | +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining | ||
3149 | arguments, and rename the output as expected. | ||
3150 | |||
3151 | If you are trying to build a whole package this is not the | ||
3152 | -right script to run: please start by reading the file 'INSTALL'. | ||
3153 | +right script to run: please start by reading the file `INSTALL'. | ||
3154 | |||
3155 | Report bugs to <bug-automake@gnu.org>. | ||
3156 | EOF | ||
3157 | @@ -218,13 +53,11 @@ EOF | ||
3158 | echo "compile $scriptversion" | ||
3159 | exit $? | ||
3160 | ;; | ||
3161 | - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) | ||
3162 | - func_cl_wrapper "$@" # Doesn't return... | ||
3163 | - ;; | ||
3164 | esac | ||
3165 | |||
3166 | ofile= | ||
3167 | cfile= | ||
3168 | +eat= | ||
3169 | |||
3170 | for arg | ||
3171 | do | ||
3172 | @@ -233,8 +66,8 @@ do | ||
3173 | else | ||
3174 | case $1 in | ||
3175 | -o) | ||
3176 | - # configure might choose to run compile as 'compile cc -o foo foo.c'. | ||
3177 | - # So we strip '-o arg' only if arg is an object. | ||
3178 | + # configure might choose to run compile as `compile cc -o foo foo.c'. | ||
3179 | + # So we strip `-o arg' only if arg is an object. | ||
3180 | eat=1 | ||
3181 | case $2 in | ||
3182 | *.o | *.obj) | ||
3183 | @@ -261,10 +94,10 @@ do | ||
3184 | done | ||
3185 | |||
3186 | if test -z "$ofile" || test -z "$cfile"; then | ||
3187 | - # If no '-o' option was seen then we might have been invoked from a | ||
3188 | + # If no `-o' option was seen then we might have been invoked from a | ||
3189 | # pattern rule where we don't need one. That is ok -- this is a | ||
3190 | # normal compilation that the losing compiler can handle. If no | ||
3191 | - # '.c' file was seen then we are probably linking. That is also | ||
3192 | + # `.c' file was seen then we are probably linking. That is also | ||
3193 | # ok. | ||
3194 | exec "$@" | ||
3195 | fi | ||
3196 | @@ -273,7 +106,7 @@ fi | ||
3197 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` | ||
3198 | |||
3199 | # Create the lock directory. | ||
3200 | -# Note: use '[/\\:.-]' here to ensure that we don't use the same name | ||
3201 | +# Note: use `[/\\:.-]' here to ensure that we don't use the same name | ||
3202 | # that we are using for the .o file. Also, base the name on the expected | ||
3203 | # object file name, since that is what matters with a parallel build. | ||
3204 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d | ||
3205 | diff --git a/config.guess b/config.guess | ||
3206 | index d622a44..40eaed4 100755 | ||
3207 | --- a/config.guess | ||
3208 | +++ b/config.guess | ||
3209 | @@ -2,9 +2,9 @@ | ||
3210 | # Attempt to guess a canonical system name. | ||
3211 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | ||
3212 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | ||
3213 | -# 2011, 2012 Free Software Foundation, Inc. | ||
3214 | +# 2011 Free Software Foundation, Inc. | ||
3215 | |||
3216 | -timestamp='2012-02-10' | ||
3217 | +timestamp='2011-05-11' | ||
3218 | |||
3219 | # This file is free software; you can redistribute it and/or modify it | ||
3220 | # under the terms of the GNU General Public License as published by | ||
3221 | @@ -17,7 +17,9 @@ timestamp='2012-02-10' | ||
3222 | # General Public License for more details. | ||
3223 | # | ||
3224 | # You should have received a copy of the GNU General Public License | ||
3225 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
3226 | +# along with this program; if not, write to the Free Software | ||
3227 | +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
3228 | +# 02110-1301, USA. | ||
3229 | # | ||
3230 | # As a special exception to the GNU General Public License, if you | ||
3231 | # distribute this file as part of a program that contains a | ||
3232 | @@ -55,8 +57,8 @@ GNU config.guess ($timestamp) | ||
3233 | |||
3234 | Originally written by Per Bothner. | ||
3235 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | ||
3236 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 | ||
3237 | -Free Software Foundation, Inc. | ||
3238 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free | ||
3239 | +Software Foundation, Inc. | ||
3240 | |||
3241 | This is free software; see the source for copying conditions. There is NO | ||
3242 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | ||
3243 | @@ -143,7 +145,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | ||
3244 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | ||
3245 | *:NetBSD:*:*) | ||
3246 | # NetBSD (nbsd) targets should (where applicable) match one or | ||
3247 | - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, | ||
3248 | + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, | ||
3249 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently | ||
3250 | # switched to ELF, *-*-netbsd* would select the old | ||
3251 | # object file format. This provides both forward | ||
3252 | @@ -790,12 +792,13 @@ EOF | ||
3253 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | ||
3254 | exit ;; | ||
3255 | *:FreeBSD:*:*) | ||
3256 | - UNAME_PROCESSOR=`/usr/bin/uname -p` | ||
3257 | - case ${UNAME_PROCESSOR} in | ||
3258 | + case ${UNAME_MACHINE} in | ||
3259 | + pc98) | ||
3260 | + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
3261 | amd64) | ||
3262 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
3263 | *) | ||
3264 | - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
3265 | + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
3266 | esac | ||
3267 | exit ;; | ||
3268 | i*:CYGWIN*:*) | ||
3269 | @@ -804,9 +807,6 @@ EOF | ||
3270 | *:MINGW*:*) | ||
3271 | echo ${UNAME_MACHINE}-pc-mingw32 | ||
3272 | exit ;; | ||
3273 | - i*:MSYS*:*) | ||
3274 | - echo ${UNAME_MACHINE}-pc-msys | ||
3275 | - exit ;; | ||
3276 | i*:windows32*:*) | ||
3277 | # uname -m includes "-pc" on this system. | ||
3278 | echo ${UNAME_MACHINE}-mingw32 | ||
3279 | @@ -861,13 +861,6 @@ EOF | ||
3280 | i*86:Minix:*:*) | ||
3281 | echo ${UNAME_MACHINE}-pc-minix | ||
3282 | exit ;; | ||
3283 | - aarch64:Linux:*:*) | ||
3284 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3285 | - exit ;; | ||
3286 | - aarch64_be:Linux:*:*) | ||
3287 | - UNAME_MACHINE=aarch64_be | ||
3288 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3289 | - exit ;; | ||
3290 | alpha:Linux:*:*) | ||
3291 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
3292 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
3293 | @@ -902,16 +895,13 @@ EOF | ||
3294 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3295 | exit ;; | ||
3296 | cris:Linux:*:*) | ||
3297 | - echo ${UNAME_MACHINE}-axis-linux-gnu | ||
3298 | + echo cris-axis-linux-gnu | ||
3299 | exit ;; | ||
3300 | crisv32:Linux:*:*) | ||
3301 | - echo ${UNAME_MACHINE}-axis-linux-gnu | ||
3302 | + echo crisv32-axis-linux-gnu | ||
3303 | exit ;; | ||
3304 | frv:Linux:*:*) | ||
3305 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3306 | - exit ;; | ||
3307 | - hexagon:Linux:*:*) | ||
3308 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3309 | + echo frv-unknown-linux-gnu | ||
3310 | exit ;; | ||
3311 | i*86:Linux:*:*) | ||
3312 | LIBC=gnu | ||
3313 | @@ -953,7 +943,7 @@ EOF | ||
3314 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
3315 | ;; | ||
3316 | or32:Linux:*:*) | ||
3317 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3318 | + echo or32-unknown-linux-gnu | ||
3319 | exit ;; | ||
3320 | padre:Linux:*:*) | ||
3321 | echo sparc-unknown-linux-gnu | ||
3322 | @@ -988,13 +978,13 @@ EOF | ||
3323 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3324 | exit ;; | ||
3325 | tile*:Linux:*:*) | ||
3326 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3327 | + echo ${UNAME_MACHINE}-tilera-linux-gnu | ||
3328 | exit ;; | ||
3329 | vax:Linux:*:*) | ||
3330 | echo ${UNAME_MACHINE}-dec-linux-gnu | ||
3331 | exit ;; | ||
3332 | x86_64:Linux:*:*) | ||
3333 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3334 | + echo x86_64-unknown-linux-gnu | ||
3335 | exit ;; | ||
3336 | xtensa*:Linux:*:*) | ||
3337 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
3338 | @@ -1325,9 +1315,6 @@ EOF | ||
3339 | i*86:AROS:*:*) | ||
3340 | echo ${UNAME_MACHINE}-pc-aros | ||
3341 | exit ;; | ||
3342 | - x86_64:VMkernel:*:*) | ||
3343 | - echo ${UNAME_MACHINE}-unknown-esx | ||
3344 | - exit ;; | ||
3345 | esac | ||
3346 | |||
3347 | #echo '(No uname command or uname output not recognized.)' 1>&2 | ||
3348 | diff --git a/config.h.in b/config.h.in | ||
3349 | index 135edc1..dd61833 100644 | ||
3350 | --- a/config.h.in | ||
3351 | +++ b/config.h.in | ||
3352 | @@ -25,6 +25,9 @@ | ||
3353 | /* gettext package name */ | ||
3354 | #undef GETTEXT_PACKAGE | ||
3355 | |||
3356 | +/* Use Vivante GPU */ | ||
3357 | +#undef GPU_VIVANTE | ||
3358 | + | ||
3359 | /* macro to use to show function name */ | ||
3360 | #undef GST_FUNCTION | ||
3361 | |||
3362 | @@ -54,46 +57,46 @@ | ||
3363 | the CoreFoundation framework. */ | ||
3364 | #undef HAVE_CFPREFERENCESCOPYAPPVALUE | ||
3365 | |||
3366 | -/* Define if the host CPU is an Alpha */ | ||
3367 | +/* Define if the target CPU is an Alpha */ | ||
3368 | #undef HAVE_CPU_ALPHA | ||
3369 | |||
3370 | -/* Define if the host CPU is an ARM */ | ||
3371 | +/* Define if the target CPU is an ARM */ | ||
3372 | #undef HAVE_CPU_ARM | ||
3373 | |||
3374 | -/* Define if the host CPU is a CRIS */ | ||
3375 | +/* Define if the target CPU is a CRIS */ | ||
3376 | #undef HAVE_CPU_CRIS | ||
3377 | |||
3378 | -/* Define if the host CPU is a CRISv32 */ | ||
3379 | +/* Define if the target CPU is a CRISv32 */ | ||
3380 | #undef HAVE_CPU_CRISV32 | ||
3381 | |||
3382 | -/* Define if the host CPU is a HPPA */ | ||
3383 | +/* Define if the target CPU is a HPPA */ | ||
3384 | #undef HAVE_CPU_HPPA | ||
3385 | |||
3386 | -/* Define if the host CPU is an x86 */ | ||
3387 | +/* Define if the target CPU is an x86 */ | ||
3388 | #undef HAVE_CPU_I386 | ||
3389 | |||
3390 | -/* Define if the host CPU is a IA64 */ | ||
3391 | +/* Define if the target CPU is a IA64 */ | ||
3392 | #undef HAVE_CPU_IA64 | ||
3393 | |||
3394 | -/* Define if the host CPU is a M68K */ | ||
3395 | +/* Define if the target CPU is a M68K */ | ||
3396 | #undef HAVE_CPU_M68K | ||
3397 | |||
3398 | -/* Define if the host CPU is a MIPS */ | ||
3399 | +/* Define if the target CPU is a MIPS */ | ||
3400 | #undef HAVE_CPU_MIPS | ||
3401 | |||
3402 | -/* Define if the host CPU is a PowerPC */ | ||
3403 | +/* Define if the target CPU is a PowerPC */ | ||
3404 | #undef HAVE_CPU_PPC | ||
3405 | |||
3406 | -/* Define if the host CPU is a 64 bit PowerPC */ | ||
3407 | +/* Define if the target CPU is a 64 bit PowerPC */ | ||
3408 | #undef HAVE_CPU_PPC64 | ||
3409 | |||
3410 | -/* Define if the host CPU is a S390 */ | ||
3411 | +/* Define if the target CPU is a S390 */ | ||
3412 | #undef HAVE_CPU_S390 | ||
3413 | |||
3414 | -/* Define if the host CPU is a SPARC */ | ||
3415 | +/* Define if the target CPU is a SPARC */ | ||
3416 | #undef HAVE_CPU_SPARC | ||
3417 | |||
3418 | -/* Define if the host CPU is a x86_64 */ | ||
3419 | +/* Define if the target CPU is a x86_64 */ | ||
3420 | #undef HAVE_CPU_X86_64 | ||
3421 | |||
3422 | /* Define if the GNU dcgettext() function is already present or preinstalled. | ||
3423 | @@ -103,6 +106,9 @@ | ||
3424 | /* Define to 1 if you have the <dlfcn.h> header file. */ | ||
3425 | #undef HAVE_DLFCN_H | ||
3426 | |||
3427 | +/* Define to 1 if you have the <EGL/eglvivante.h> header file. */ | ||
3428 | +#undef HAVE_EGL_EGLVIVANTE_H | ||
3429 | + | ||
3430 | /* Define to 1 if you have the <EGL/egl.h> header file. */ | ||
3431 | #undef HAVE_EGL_EGL_H | ||
3432 | |||
3433 | @@ -221,6 +227,9 @@ | ||
3434 | /* Define to 1 if you have the ANSI C header files. */ | ||
3435 | #undef STDC_HEADERS | ||
3436 | |||
3437 | +/* the target CPU */ | ||
3438 | +#undef TARGET_CPU | ||
3439 | + | ||
3440 | /* Version number of package */ | ||
3441 | #undef VERSION | ||
3442 | |||
3443 | diff --git a/config.sub b/config.sub | ||
3444 | index c894da4..30fdca8 100755 | ||
3445 | --- a/config.sub | ||
3446 | +++ b/config.sub | ||
3447 | @@ -2,9 +2,9 @@ | ||
3448 | # Configuration validation subroutine script. | ||
3449 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | ||
3450 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | ||
3451 | -# 2011, 2012 Free Software Foundation, Inc. | ||
3452 | +# 2011 Free Software Foundation, Inc. | ||
3453 | |||
3454 | -timestamp='2012-02-10' | ||
3455 | +timestamp='2011-03-23' | ||
3456 | |||
3457 | # This file is (in principle) common to ALL GNU software. | ||
3458 | # The presence of a machine in this file suggests that SOME GNU software | ||
3459 | @@ -21,7 +21,9 @@ timestamp='2012-02-10' | ||
3460 | # GNU General Public License for more details. | ||
3461 | # | ||
3462 | # You should have received a copy of the GNU General Public License | ||
3463 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
3464 | +# along with this program; if not, write to the Free Software | ||
3465 | +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
3466 | +# 02110-1301, USA. | ||
3467 | # | ||
3468 | # As a special exception to the GNU General Public License, if you | ||
3469 | # distribute this file as part of a program that contains a | ||
3470 | @@ -74,8 +76,8 @@ version="\ | ||
3471 | GNU config.sub ($timestamp) | ||
3472 | |||
3473 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | ||
3474 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 | ||
3475 | -Free Software Foundation, Inc. | ||
3476 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free | ||
3477 | +Software Foundation, Inc. | ||
3478 | |||
3479 | This is free software; see the source for copying conditions. There is NO | ||
3480 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | ||
3481 | @@ -130,10 +132,6 @@ case $maybe_os in | ||
3482 | os=-$maybe_os | ||
3483 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | ||
3484 | ;; | ||
3485 | - android-linux) | ||
3486 | - os=-linux-android | ||
3487 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
3488 | - ;; | ||
3489 | *) | ||
3490 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | ||
3491 | if [ $basic_machine != $1 ] | ||
3492 | @@ -249,22 +247,17 @@ case $basic_machine in | ||
3493 | # Some are omitted here because they have special meanings below. | ||
3494 | 1750a | 580 \ | ||
3495 | | a29k \ | ||
3496 | - | aarch64 | aarch64_be \ | ||
3497 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
3498 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
3499 | | am33_2.0 \ | ||
3500 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | ||
3501 | - | be32 | be64 \ | ||
3502 | | bfin \ | ||
3503 | | c4x | clipper \ | ||
3504 | | d10v | d30v | dlx | dsp16xx \ | ||
3505 | - | epiphany \ | ||
3506 | | fido | fr30 | frv \ | ||
3507 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | ||
3508 | - | hexagon \ | ||
3509 | | i370 | i860 | i960 | ia64 \ | ||
3510 | | ip2k | iq2000 \ | ||
3511 | - | le32 | le64 \ | ||
3512 | | lm32 \ | ||
3513 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | ||
3514 | | maxq | mb | microblaze | mcore | mep | metag \ | ||
3515 | @@ -298,7 +291,7 @@ case $basic_machine in | ||
3516 | | pdp10 | pdp11 | pj | pjl \ | ||
3517 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | ||
3518 | | pyramid \ | ||
3519 | - | rl78 | rx \ | ||
3520 | + | rx \ | ||
3521 | | score \ | ||
3522 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | ||
3523 | | sh64 | sh64le \ | ||
3524 | @@ -307,7 +300,7 @@ case $basic_machine in | ||
3525 | | spu \ | ||
3526 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ||
3527 | | ubicom32 \ | ||
3528 | - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | ||
3529 | + | v850 | v850e \ | ||
3530 | | we32k \ | ||
3531 | | x86 | xc16x | xstormy16 | xtensa \ | ||
3532 | | z8k | z80) | ||
3533 | @@ -322,7 +315,8 @@ case $basic_machine in | ||
3534 | c6x) | ||
3535 | basic_machine=tic6x-unknown | ||
3536 | ;; | ||
3537 | - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) | ||
3538 | + m6811 | m68hc11 | m6812 | m68hc12 | picochip) | ||
3539 | + # Motorola 68HC11/12. | ||
3540 | basic_machine=$basic_machine-unknown | ||
3541 | os=-none | ||
3542 | ;; | ||
3543 | @@ -335,10 +329,7 @@ case $basic_machine in | ||
3544 | strongarm | thumb | xscale) | ||
3545 | basic_machine=arm-unknown | ||
3546 | ;; | ||
3547 | - xgate) | ||
3548 | - basic_machine=$basic_machine-unknown | ||
3549 | - os=-none | ||
3550 | - ;; | ||
3551 | + | ||
3552 | xscaleeb) | ||
3553 | basic_machine=armeb-unknown | ||
3554 | ;; | ||
3555 | @@ -361,13 +352,11 @@ case $basic_machine in | ||
3556 | # Recognize the basic CPU types with company name. | ||
3557 | 580-* \ | ||
3558 | | a29k-* \ | ||
3559 | - | aarch64-* | aarch64_be-* \ | ||
3560 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
3561 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
3562 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | ||
3563 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | ||
3564 | | avr-* | avr32-* \ | ||
3565 | - | be32-* | be64-* \ | ||
3566 | | bfin-* | bs2000-* \ | ||
3567 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ | ||
3568 | | clipper-* | craynv-* | cydra-* \ | ||
3569 | @@ -376,10 +365,8 @@ case $basic_machine in | ||
3570 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | ||
3571 | | h8300-* | h8500-* \ | ||
3572 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | ||
3573 | - | hexagon-* \ | ||
3574 | | i*86-* | i860-* | i960-* | ia64-* \ | ||
3575 | | ip2k-* | iq2000-* \ | ||
3576 | - | le32-* | le64-* \ | ||
3577 | | lm32-* \ | ||
3578 | | m32c-* | m32r-* | m32rle-* \ | ||
3579 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | ||
3580 | @@ -413,7 +400,7 @@ case $basic_machine in | ||
3581 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | ||
3582 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | ||
3583 | | pyramid-* \ | ||
3584 | - | rl78-* | romp-* | rs6000-* | rx-* \ | ||
3585 | + | romp-* | rs6000-* | rx-* \ | ||
3586 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | ||
3587 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | ||
3588 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | ||
3589 | @@ -421,11 +408,10 @@ case $basic_machine in | ||
3590 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | ||
3591 | | tahoe-* \ | ||
3592 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | ||
3593 | - | tile*-* \ | ||
3594 | + | tile-* | tilegx-* \ | ||
3595 | | tron-* \ | ||
3596 | | ubicom32-* \ | ||
3597 | - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | ||
3598 | - | vax-* \ | ||
3599 | + | v850-* | v850e-* | vax-* \ | ||
3600 | | we32k-* \ | ||
3601 | | x86-* | x86_64-* | xc16x-* | xps100-* \ | ||
3602 | | xstormy16-* | xtensa*-* \ | ||
3603 | @@ -725,6 +711,7 @@ case $basic_machine in | ||
3604 | i370-ibm* | ibm*) | ||
3605 | basic_machine=i370-ibm | ||
3606 | ;; | ||
3607 | +# I'm not sure what "Sysv32" means. Should this be sysv3.2? | ||
3608 | i*86v32) | ||
3609 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | ||
3610 | os=-sysv32 | ||
3611 | @@ -821,18 +808,10 @@ case $basic_machine in | ||
3612 | ms1-*) | ||
3613 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | ||
3614 | ;; | ||
3615 | - msys) | ||
3616 | - basic_machine=i386-pc | ||
3617 | - os=-msys | ||
3618 | - ;; | ||
3619 | mvs) | ||
3620 | basic_machine=i370-ibm | ||
3621 | os=-mvs | ||
3622 | ;; | ||
3623 | - nacl) | ||
3624 | - basic_machine=le32-unknown | ||
3625 | - os=-nacl | ||
3626 | - ;; | ||
3627 | ncr3000) | ||
3628 | basic_machine=i486-ncr | ||
3629 | os=-sysv4 | ||
3630 | @@ -1141,8 +1120,13 @@ case $basic_machine in | ||
3631 | basic_machine=t90-cray | ||
3632 | os=-unicos | ||
3633 | ;; | ||
3634 | + # This must be matched before tile*. | ||
3635 | + tilegx*) | ||
3636 | + basic_machine=tilegx-unknown | ||
3637 | + os=-linux-gnu | ||
3638 | + ;; | ||
3639 | tile*) | ||
3640 | - basic_machine=$basic_machine-unknown | ||
3641 | + basic_machine=tile-unknown | ||
3642 | os=-linux-gnu | ||
3643 | ;; | ||
3644 | tx39) | ||
3645 | @@ -1352,7 +1336,7 @@ case $os in | ||
3646 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | ||
3647 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | ||
3648 | | -chorusos* | -chorusrdb* | -cegcc* \ | ||
3649 | - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | ||
3650 | + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | ||
3651 | | -mingw32* | -linux-gnu* | -linux-android* \ | ||
3652 | | -linux-newlib* | -linux-uclibc* \ | ||
3653 | | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
3654 | @@ -1564,6 +1548,9 @@ case $basic_machine in | ||
3655 | ;; | ||
3656 | m68000-sun) | ||
3657 | os=-sunos3 | ||
3658 | + # This also exists in the configure program, but was not the | ||
3659 | + # default. | ||
3660 | + # os=-sunos4 | ||
3661 | ;; | ||
3662 | m68*-cisco) | ||
3663 | os=-aout | ||
3664 | diff --git a/configure b/configure | ||
3665 | index 254ec9c..7e4f461 100755 | ||
3666 | --- a/configure | ||
3667 | +++ b/configure | ||
3668 | @@ -1,6 +1,6 @@ | ||
3669 | #! /bin/sh | ||
3670 | # Guess values for system-dependent variables and create Makefiles. | ||
3671 | -# Generated by GNU Autoconf 2.68 for GStreamer OpenGL Plug-ins 0.10.3. | ||
3672 | +# Generated by GNU Autoconf 2.68 for GStreamer OpenGL Plug-ins 0.10.3.1. | ||
3673 | # | ||
3674 | # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. | ||
3675 | # | ||
3676 | @@ -571,8 +571,8 @@ MAKEFLAGS= | ||
3677 | # Identity of this package. | ||
3678 | PACKAGE_NAME='GStreamer OpenGL Plug-ins' | ||
3679 | PACKAGE_TARNAME='gst-plugins-gl' | ||
3680 | -PACKAGE_VERSION='0.10.3' | ||
3681 | -PACKAGE_STRING='GStreamer OpenGL Plug-ins 0.10.3' | ||
3682 | +PACKAGE_VERSION='0.10.3.1' | ||
3683 | +PACKAGE_STRING='GStreamer OpenGL Plug-ins 0.10.3.1' | ||
3684 | PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' | ||
3685 | PACKAGE_URL='' | ||
3686 | |||
3687 | @@ -621,8 +621,10 @@ LIBOBJS | ||
3688 | GST_PLUGIN_LDFLAGS | ||
3689 | GST_LIB_LDFLAGS | ||
3690 | GST_ALL_LDFLAGS | ||
3691 | +GST_OBJCFLAGS | ||
3692 | GST_CXXFLAGS | ||
3693 | GST_PLUGINS_GL_CFLAGS | ||
3694 | +GST_OPTION_OBJCFLAGS | ||
3695 | GST_OPTION_CXXFLAGS | ||
3696 | GST_OPTION_CFLAGS | ||
3697 | DEPRECATED_CFLAGS | ||
3698 | @@ -639,6 +641,8 @@ DEFAULT_VIDEOSINK | ||
3699 | DEFAULT_AUDIOSRC | ||
3700 | DEFAULT_AUDIOSINK | ||
3701 | GST_LEVEL_DEFAULT | ||
3702 | +ERROR_OBJCFLAGS | ||
3703 | +WARNING_OBJCFLAGS | ||
3704 | ERROR_CXXFLAGS | ||
3705 | WARNING_CXXFLAGS | ||
3706 | ERROR_CFLAGS | ||
3707 | @@ -698,6 +702,10 @@ HAVE_PNG_TRUE | ||
3708 | HAVE_PNG | ||
3709 | LIBPNG_LIBS | ||
3710 | LIBPNG_CFLAGS | ||
3711 | +GST_FSL_LIBS | ||
3712 | +GST_FSL_CFLAGS | ||
3713 | +USE_VIVANTE_FALSE | ||
3714 | +USE_VIVANTE_TRUE | ||
3715 | GSTPB_PREFIX | ||
3716 | GST_PREFIX | ||
3717 | GLIB_PREFIX | ||
3718 | @@ -723,6 +731,8 @@ GL_BACKEND_WIN32_FALSE | ||
3719 | GL_BACKEND_WIN32_TRUE | ||
3720 | GL_BACKEND_COCOA_FALSE | ||
3721 | GL_BACKEND_COCOA_TRUE | ||
3722 | +GL_BACKEND_FBES2_FALSE | ||
3723 | +GL_BACKEND_FBES2_TRUE | ||
3724 | GL_BACKEND_X11ES2_FALSE | ||
3725 | GL_BACKEND_X11ES2_TRUE | ||
3726 | GL_BACKEND_X11_FALSE | ||
3727 | @@ -730,11 +740,11 @@ GL_BACKEND_X11_TRUE | ||
3728 | OPENGL_ES2 | ||
3729 | GL_BACKEND | ||
3730 | GL_LIBS | ||
3731 | -HAVE_GLES2 | ||
3732 | -HAVE_EGL | ||
3733 | HAVE_GLEW | ||
3734 | HAVE_GLU | ||
3735 | HAVE_GL | ||
3736 | +HAVE_GLES2 | ||
3737 | +HAVE_EGL | ||
3738 | HAVE_X | ||
3739 | X_EXTRA_LIBS | ||
3740 | X_LIBS | ||
3741 | @@ -844,8 +854,8 @@ ACLOCAL_AMFLAGS | ||
3742 | am__fastdepOBJC_FALSE | ||
3743 | am__fastdepOBJC_TRUE | ||
3744 | OBJCDEPMODE | ||
3745 | -OBJC_LDFLAGS | ||
3746 | ac_ct_OBJC | ||
3747 | +OBJCFLAGS | ||
3748 | OBJC | ||
3749 | CPP | ||
3750 | OTOOL64 | ||
3751 | @@ -869,7 +879,6 @@ SED | ||
3752 | am__fastdepCC_FALSE | ||
3753 | am__fastdepCC_TRUE | ||
3754 | CCDEPMODE | ||
3755 | -am__nodep | ||
3756 | AMDEPBACKSLASH | ||
3757 | AMDEP_FALSE | ||
3758 | AMDEP_TRUE | ||
3759 | @@ -895,16 +904,6 @@ GST_CURRENT | ||
3760 | GST_MAJORMINOR | ||
3761 | AM_BACKSLASH | ||
3762 | AM_DEFAULT_VERBOSITY | ||
3763 | -AM_DEFAULT_V | ||
3764 | -AM_V | ||
3765 | -host_os | ||
3766 | -host_vendor | ||
3767 | -host_cpu | ||
3768 | -host | ||
3769 | -build_os | ||
3770 | -build_vendor | ||
3771 | -build_cpu | ||
3772 | -build | ||
3773 | MAINT | ||
3774 | MAINTAINER_MODE_FALSE | ||
3775 | MAINTAINER_MODE_TRUE | ||
3776 | @@ -936,6 +935,18 @@ am__isrc | ||
3777 | INSTALL_DATA | ||
3778 | INSTALL_SCRIPT | ||
3779 | INSTALL_PROGRAM | ||
3780 | +target_os | ||
3781 | +target_vendor | ||
3782 | +target_cpu | ||
3783 | +target | ||
3784 | +host_os | ||
3785 | +host_vendor | ||
3786 | +host_cpu | ||
3787 | +host | ||
3788 | +build_os | ||
3789 | +build_vendor | ||
3790 | +build_cpu | ||
3791 | +build | ||
3792 | target_alias | ||
3793 | host_alias | ||
3794 | build_alias | ||
3795 | @@ -995,6 +1006,7 @@ enable_nls | ||
3796 | enable_rpath | ||
3797 | with_libiconv_prefix | ||
3798 | with_libintl_prefix | ||
3799 | +enable_fatal_warnings | ||
3800 | enable_debug | ||
3801 | enable_profiling | ||
3802 | enable_valgrind | ||
3803 | @@ -1029,6 +1041,8 @@ LDFLAGS | ||
3804 | LIBS | ||
3805 | CPPFLAGS | ||
3806 | CPP | ||
3807 | +OBJC | ||
3808 | +OBJCFLAGS | ||
3809 | PKG_CONFIG | ||
3810 | VALGRIND_CFLAGS | ||
3811 | VALGRIND_LIBS | ||
3812 | @@ -1611,7 +1625,7 @@ if test "$ac_init_help" = "long"; then | ||
3813 | # Omit some internal or obsolete options to make the list less imposing. | ||
3814 | # This message is too long to be a string in the A/UX 3.1 sh. | ||
3815 | cat <<_ACEOF | ||
3816 | -\`configure' configures GStreamer OpenGL Plug-ins 0.10.3 to adapt to many kinds of systems. | ||
3817 | +\`configure' configures GStreamer OpenGL Plug-ins 0.10.3.1 to adapt to many kinds of systems. | ||
3818 | |||
3819 | Usage: $0 [OPTION]... [VAR=VALUE]... | ||
3820 | |||
3821 | @@ -1680,12 +1694,13 @@ X features: | ||
3822 | System types: | ||
3823 | --build=BUILD configure for building on BUILD [guessed] | ||
3824 | --host=HOST cross-compile to build programs to run on HOST [BUILD] | ||
3825 | + --target=TARGET configure for building compilers for TARGET [HOST] | ||
3826 | _ACEOF | ||
3827 | fi | ||
3828 | |||
3829 | if test -n "$ac_init_help"; then | ||
3830 | case $ac_init_help in | ||
3831 | - short | recursive ) echo "Configuration of GStreamer OpenGL Plug-ins 0.10.3:";; | ||
3832 | + short | recursive ) echo "Configuration of GStreamer OpenGL Plug-ins 0.10.3.1:";; | ||
3833 | esac | ||
3834 | cat <<\_ACEOF | ||
3835 | |||
3836 | @@ -1706,6 +1721,8 @@ Optional Features: | ||
3837 | --disable-libtool-lock avoid locking (might break parallel builds) | ||
3838 | --disable-nls do not use Native Language Support | ||
3839 | --disable-rpath do not hardcode runtime library paths | ||
3840 | + --disable-fatal-warnings | ||
3841 | + Don't turn compiler warnings into fatal errors | ||
3842 | --disable-debug disable addition of -g debugging info | ||
3843 | --enable-profiling adds -pg to compiler commandline, for profiling | ||
3844 | --disable-valgrind disable run-time valgrind detection | ||
3845 | @@ -1725,7 +1742,7 @@ Optional Features: | ||
3846 | Optional Packages: | ||
3847 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | ||
3848 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | ||
3849 | - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | ||
3850 | + --with-pic try to use only PIC/non-PIC objects [default=use | ||
3851 | both] | ||
3852 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
3853 | --with-sysroot=DIR Search for dependent libraries within DIR | ||
3854 | @@ -1769,6 +1786,8 @@ Some influential environment variables: | ||
3855 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | ||
3856 | you have headers in a nonstandard directory <include dir> | ||
3857 | CPP C preprocessor | ||
3858 | + OBJC Objective C compiler command | ||
3859 | + OBJCFLAGS Objective C compiler flags | ||
3860 | PKG_CONFIG path to pkg-config utility | ||
3861 | VALGRIND_CFLAGS | ||
3862 | C compiler flags for VALGRIND, overriding pkg-config | ||
3863 | @@ -1902,7 +1921,7 @@ fi | ||
3864 | test -n "$ac_init_help" && exit $ac_status | ||
3865 | if $ac_init_version; then | ||
3866 | cat <<\_ACEOF | ||
3867 | -GStreamer OpenGL Plug-ins configure 0.10.3 | ||
3868 | +GStreamer OpenGL Plug-ins configure 0.10.3.1 | ||
3869 | generated by GNU Autoconf 2.68 | ||
3870 | |||
3871 | Copyright (C) 2010 Free Software Foundation, Inc. | ||
3872 | @@ -2177,6 +2196,44 @@ $as_echo "$ac_res" >&6; } | ||
3873 | |||
3874 | } # ac_fn_c_check_func | ||
3875 | |||
3876 | +# ac_fn_objc_try_compile LINENO | ||
3877 | +# ----------------------------- | ||
3878 | +# Try to compile conftest.$ac_ext, and return whether this succeeded. | ||
3879 | +ac_fn_objc_try_compile () | ||
3880 | +{ | ||
3881 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3882 | + rm -f conftest.$ac_objext | ||
3883 | + if { { ac_try="$ac_compile" | ||
3884 | +case "(($ac_try" in | ||
3885 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3886 | + *) ac_try_echo=$ac_try;; | ||
3887 | +esac | ||
3888 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3889 | +$as_echo "$ac_try_echo"; } >&5 | ||
3890 | + (eval "$ac_compile") 2>conftest.err | ||
3891 | + ac_status=$? | ||
3892 | + if test -s conftest.err; then | ||
3893 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
3894 | + cat conftest.er1 >&5 | ||
3895 | + mv -f conftest.er1 conftest.err | ||
3896 | + fi | ||
3897 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3898 | + test $ac_status = 0; } && { | ||
3899 | + test -z "$ac_objc_werror_flag" || | ||
3900 | + test ! -s conftest.err | ||
3901 | + } && test -s conftest.$ac_objext; then : | ||
3902 | + ac_retval=0 | ||
3903 | +else | ||
3904 | + $as_echo "$as_me: failed program was:" >&5 | ||
3905 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3906 | + | ||
3907 | + ac_retval=1 | ||
3908 | +fi | ||
3909 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | ||
3910 | + as_fn_set_status $ac_retval | ||
3911 | + | ||
3912 | +} # ac_fn_objc_try_compile | ||
3913 | + | ||
3914 | # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES | ||
3915 | # -------------------------------------------- | ||
3916 | # Tries to find the compile-time value of EXPR in a program that includes | ||
3917 | @@ -2616,7 +2673,7 @@ cat >config.log <<_ACEOF | ||
3918 | This file contains any messages produced by compilers while | ||
3919 | running configure, to aid debugging if configure makes a mistake. | ||
3920 | |||
3921 | -It was created by GStreamer OpenGL Plug-ins $as_me 0.10.3, which was | ||
3922 | +It was created by GStreamer OpenGL Plug-ins $as_me 0.10.3.1, which was | ||
3923 | generated by GNU Autoconf 2.68. Invocation command line was | ||
3924 | |||
3925 | $ $0 $@ | ||
3926 | @@ -2966,12 +3023,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
3927 | |||
3928 | |||
3929 | |||
3930 | - | ||
3931 | - | ||
3932 | - | ||
3933 | - | ||
3934 | -am__api_version='1.11' | ||
3935 | - | ||
3936 | ac_aux_dir= | ||
3937 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | ||
3938 | if test -f "$ac_dir/install-sh"; then | ||
3939 | @@ -3001,6 +3052,122 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. | ||
3940 | ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | ||
3941 | |||
3942 | |||
3943 | +# Make sure we can run config.sub. | ||
3944 | +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
3945 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | ||
3946 | + | ||
3947 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | ||
3948 | +$as_echo_n "checking build system type... " >&6; } | ||
3949 | +if ${ac_cv_build+:} false; then : | ||
3950 | + $as_echo_n "(cached) " >&6 | ||
3951 | +else | ||
3952 | + ac_build_alias=$build_alias | ||
3953 | +test "x$ac_build_alias" = x && | ||
3954 | + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
3955 | +test "x$ac_build_alias" = x && | ||
3956 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 | ||
3957 | +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
3958 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | ||
3959 | + | ||
3960 | +fi | ||
3961 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | ||
3962 | +$as_echo "$ac_cv_build" >&6; } | ||
3963 | +case $ac_cv_build in | ||
3964 | +*-*-*) ;; | ||
3965 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; | ||
3966 | +esac | ||
3967 | +build=$ac_cv_build | ||
3968 | +ac_save_IFS=$IFS; IFS='-' | ||
3969 | +set x $ac_cv_build | ||
3970 | +shift | ||
3971 | +build_cpu=$1 | ||
3972 | +build_vendor=$2 | ||
3973 | +shift; shift | ||
3974 | +# Remember, the first character of IFS is used to create $*, | ||
3975 | +# except with old shells: | ||
3976 | +build_os=$* | ||
3977 | +IFS=$ac_save_IFS | ||
3978 | +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
3979 | + | ||
3980 | + | ||
3981 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 | ||
3982 | +$as_echo_n "checking host system type... " >&6; } | ||
3983 | +if ${ac_cv_host+:} false; then : | ||
3984 | + $as_echo_n "(cached) " >&6 | ||
3985 | +else | ||
3986 | + if test "x$host_alias" = x; then | ||
3987 | + ac_cv_host=$ac_cv_build | ||
3988 | +else | ||
3989 | + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
3990 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | ||
3991 | +fi | ||
3992 | + | ||
3993 | +fi | ||
3994 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 | ||
3995 | +$as_echo "$ac_cv_host" >&6; } | ||
3996 | +case $ac_cv_host in | ||
3997 | +*-*-*) ;; | ||
3998 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; | ||
3999 | +esac | ||
4000 | +host=$ac_cv_host | ||
4001 | +ac_save_IFS=$IFS; IFS='-' | ||
4002 | +set x $ac_cv_host | ||
4003 | +shift | ||
4004 | +host_cpu=$1 | ||
4005 | +host_vendor=$2 | ||
4006 | +shift; shift | ||
4007 | +# Remember, the first character of IFS is used to create $*, | ||
4008 | +# except with old shells: | ||
4009 | +host_os=$* | ||
4010 | +IFS=$ac_save_IFS | ||
4011 | +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
4012 | + | ||
4013 | + | ||
4014 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 | ||
4015 | +$as_echo_n "checking target system type... " >&6; } | ||
4016 | +if ${ac_cv_target+:} false; then : | ||
4017 | + $as_echo_n "(cached) " >&6 | ||
4018 | +else | ||
4019 | + if test "x$target_alias" = x; then | ||
4020 | + ac_cv_target=$ac_cv_host | ||
4021 | +else | ||
4022 | + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || | ||
4023 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 | ||
4024 | +fi | ||
4025 | + | ||
4026 | +fi | ||
4027 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 | ||
4028 | +$as_echo "$ac_cv_target" >&6; } | ||
4029 | +case $ac_cv_target in | ||
4030 | +*-*-*) ;; | ||
4031 | +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; | ||
4032 | +esac | ||
4033 | +target=$ac_cv_target | ||
4034 | +ac_save_IFS=$IFS; IFS='-' | ||
4035 | +set x $ac_cv_target | ||
4036 | +shift | ||
4037 | +target_cpu=$1 | ||
4038 | +target_vendor=$2 | ||
4039 | +shift; shift | ||
4040 | +# Remember, the first character of IFS is used to create $*, | ||
4041 | +# except with old shells: | ||
4042 | +target_os=$* | ||
4043 | +IFS=$ac_save_IFS | ||
4044 | +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac | ||
4045 | + | ||
4046 | + | ||
4047 | +# The aliases save the names the user supplied, while $host etc. | ||
4048 | +# will get canonicalized. | ||
4049 | +test -n "$target_alias" && | ||
4050 | + test "$program_prefix$program_suffix$program_transform_name" = \ | ||
4051 | + NONENONEs,x,x, && | ||
4052 | + program_prefix=${target_alias}- | ||
4053 | + | ||
4054 | + | ||
4055 | + | ||
4056 | + | ||
4057 | +am__api_version='1.11' | ||
4058 | + | ||
4059 | # Find a good install program. We prefer a C program (faster), | ||
4060 | # so one script is as good as another. But avoid the broken or | ||
4061 | # incompatible versions: | ||
4062 | @@ -3437,7 +3604,7 @@ fi | ||
4063 | |||
4064 | # Define the identity of the package. | ||
4065 | PACKAGE='gst-plugins-gl' | ||
4066 | - VERSION='0.10.3' | ||
4067 | + VERSION='0.10.3.1' | ||
4068 | |||
4069 | |||
4070 | cat >>confdefs.h <<_ACEOF | ||
4071 | @@ -3467,11 +3634,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
4072 | |||
4073 | # We need awk for the "check" target. The system "awk" is bad on | ||
4074 | # some platforms. | ||
4075 | -# Always define AMTAR for backward compatibility. Yes, it's still used | ||
4076 | -# in the wild :-( We should find a proper way to deprecate it ... | ||
4077 | -AMTAR='$${TAR-tar}' | ||
4078 | +# Always define AMTAR for backward compatibility. | ||
4079 | + | ||
4080 | +AMTAR=${AMTAR-"${am_missing_run}tar"} | ||
4081 | |||
4082 | -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | ||
4083 | +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | ||
4084 | |||
4085 | |||
4086 | |||
4087 | @@ -3479,9 +3646,9 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | ||
4088 | |||
4089 | |||
4090 | |||
4091 | - PACKAGE_VERSION_MAJOR=$(echo 0.10.3 | cut -d'.' -f1) | ||
4092 | - PACKAGE_VERSION_MINOR=$(echo 0.10.3 | cut -d'.' -f2) | ||
4093 | - PACKAGE_VERSION_MICRO=$(echo 0.10.3 | cut -d'.' -f3) | ||
4094 | + PACKAGE_VERSION_MAJOR=$(echo 0.10.3.1 | cut -d'.' -f1) | ||
4095 | + PACKAGE_VERSION_MINOR=$(echo 0.10.3.1 | cut -d'.' -f2) | ||
4096 | + PACKAGE_VERSION_MICRO=$(echo 0.10.3.1 | cut -d'.' -f3) | ||
4097 | |||
4098 | |||
4099 | |||
4100 | @@ -3492,7 +3659,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | ||
4101 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 | ||
4102 | $as_echo_n "checking nano version... " >&6; } | ||
4103 | |||
4104 | - NANO=$(echo 0.10.3 | cut -d'.' -f4) | ||
4105 | + NANO=$(echo 0.10.3.1 | cut -d'.' -f4) | ||
4106 | |||
4107 | if test x"$NANO" = x || test "x$NANO" = "x0" ; then | ||
4108 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 | ||
4109 | @@ -3546,76 +3713,6 @@ fi | ||
4110 | |||
4111 | |||
4112 | |||
4113 | -# Make sure we can run config.sub. | ||
4114 | -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
4115 | - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | ||
4116 | - | ||
4117 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | ||
4118 | -$as_echo_n "checking build system type... " >&6; } | ||
4119 | -if ${ac_cv_build+:} false; then : | ||
4120 | - $as_echo_n "(cached) " >&6 | ||
4121 | -else | ||
4122 | - ac_build_alias=$build_alias | ||
4123 | -test "x$ac_build_alias" = x && | ||
4124 | - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
4125 | -test "x$ac_build_alias" = x && | ||
4126 | - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 | ||
4127 | -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
4128 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | ||
4129 | - | ||
4130 | -fi | ||
4131 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | ||
4132 | -$as_echo "$ac_cv_build" >&6; } | ||
4133 | -case $ac_cv_build in | ||
4134 | -*-*-*) ;; | ||
4135 | -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; | ||
4136 | -esac | ||
4137 | -build=$ac_cv_build | ||
4138 | -ac_save_IFS=$IFS; IFS='-' | ||
4139 | -set x $ac_cv_build | ||
4140 | -shift | ||
4141 | -build_cpu=$1 | ||
4142 | -build_vendor=$2 | ||
4143 | -shift; shift | ||
4144 | -# Remember, the first character of IFS is used to create $*, | ||
4145 | -# except with old shells: | ||
4146 | -build_os=$* | ||
4147 | -IFS=$ac_save_IFS | ||
4148 | -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
4149 | - | ||
4150 | - | ||
4151 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 | ||
4152 | -$as_echo_n "checking host system type... " >&6; } | ||
4153 | -if ${ac_cv_host+:} false; then : | ||
4154 | - $as_echo_n "(cached) " >&6 | ||
4155 | -else | ||
4156 | - if test "x$host_alias" = x; then | ||
4157 | - ac_cv_host=$ac_cv_build | ||
4158 | -else | ||
4159 | - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
4160 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | ||
4161 | -fi | ||
4162 | - | ||
4163 | -fi | ||
4164 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 | ||
4165 | -$as_echo "$ac_cv_host" >&6; } | ||
4166 | -case $ac_cv_host in | ||
4167 | -*-*-*) ;; | ||
4168 | -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; | ||
4169 | -esac | ||
4170 | -host=$ac_cv_host | ||
4171 | -ac_save_IFS=$IFS; IFS='-' | ||
4172 | -set x $ac_cv_host | ||
4173 | -shift | ||
4174 | -host_cpu=$1 | ||
4175 | -host_vendor=$2 | ||
4176 | -shift; shift | ||
4177 | -# Remember, the first character of IFS is used to create $*, | ||
4178 | -# except with old shells: | ||
4179 | -host_os=$* | ||
4180 | -IFS=$ac_save_IFS | ||
4181 | -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
4182 | - | ||
4183 | |||
4184 | |||
4185 | # Check whether --enable-silent-rules was given. | ||
4186 | @@ -3628,33 +3725,6 @@ yes) AM_DEFAULT_VERBOSITY=0;; | ||
4187 | no) AM_DEFAULT_VERBOSITY=1;; | ||
4188 | *) AM_DEFAULT_VERBOSITY=0;; | ||
4189 | esac | ||
4190 | -am_make=${MAKE-make} | ||
4191 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 | ||
4192 | -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } | ||
4193 | -if ${am_cv_make_support_nested_variables+:} false; then : | ||
4194 | - $as_echo_n "(cached) " >&6 | ||
4195 | -else | ||
4196 | - if $as_echo 'TRUE=$(BAR$(V)) | ||
4197 | -BAR0=false | ||
4198 | -BAR1=true | ||
4199 | -V=1 | ||
4200 | -am__doit: | ||
4201 | - @$(TRUE) | ||
4202 | -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then | ||
4203 | - am_cv_make_support_nested_variables=yes | ||
4204 | -else | ||
4205 | - am_cv_make_support_nested_variables=no | ||
4206 | -fi | ||
4207 | -fi | ||
4208 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 | ||
4209 | -$as_echo "$am_cv_make_support_nested_variables" >&6; } | ||
4210 | -if test $am_cv_make_support_nested_variables = yes; then | ||
4211 | - AM_V='$(V)' | ||
4212 | - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
4213 | -else | ||
4214 | - AM_V=$AM_DEFAULT_VERBOSITY | ||
4215 | - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
4216 | -fi | ||
4217 | AM_BACKSLASH='\' | ||
4218 | |||
4219 | |||
4220 | @@ -3997,8 +4067,8 @@ esac | ||
4221 | |||
4222 | |||
4223 | |||
4224 | -macro_version='2.4.2' | ||
4225 | -macro_revision='1.3337' | ||
4226 | +macro_version='2.4' | ||
4227 | +macro_revision='1.3293' | ||
4228 | |||
4229 | |||
4230 | |||
4231 | @@ -4135,7 +4205,6 @@ fi | ||
4232 | if test "x$enable_dependency_tracking" != xno; then | ||
4233 | am_depcomp="$ac_aux_dir/depcomp" | ||
4234 | AMDEPBACKSLASH='\' | ||
4235 | - am__nodep='_no' | ||
4236 | fi | ||
4237 | if test "x$enable_dependency_tracking" != xno; then | ||
4238 | AMDEP_TRUE= | ||
4239 | @@ -4949,7 +5018,6 @@ else | ||
4240 | # instance it was reported that on HP-UX the gcc test will end up | ||
4241 | # making a dummy file named `D' -- because `-MD' means `put the output | ||
4242 | # in D'. | ||
4243 | - rm -rf conftest.dir | ||
4244 | mkdir conftest.dir | ||
4245 | # Copy depcomp to subdir because otherwise we won't find it if we're | ||
4246 | # using a relative directory. | ||
4247 | @@ -5009,7 +5077,7 @@ else | ||
4248 | break | ||
4249 | fi | ||
4250 | ;; | ||
4251 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
4252 | + msvisualcpp | msvcmsys) | ||
4253 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
4254 | # not run yet. These depmodes are late enough in the game, and | ||
4255 | # so weak that their functioning should not be impacted. | ||
4256 | @@ -5753,11 +5821,6 @@ else | ||
4257 | lt_cv_sys_max_cmd_len=196608 | ||
4258 | ;; | ||
4259 | |||
4260 | - os2*) | ||
4261 | - # The test takes a long time on OS/2. | ||
4262 | - lt_cv_sys_max_cmd_len=8192 | ||
4263 | - ;; | ||
4264 | - | ||
4265 | osf*) | ||
4266 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | ||
4267 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | ||
4268 | @@ -5797,7 +5860,7 @@ else | ||
4269 | # If test is not a shell built-in, we'll probably end up computing a | ||
4270 | # maximum length that is only half of the actual maximum length, but | ||
4271 | # we can't tell. | ||
4272 | - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ | ||
4273 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | ||
4274 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | ||
4275 | test $i != 17 # 1/2 MB should be enough | ||
4276 | do | ||
4277 | @@ -6223,7 +6286,7 @@ irix5* | irix6* | nonstopux*) | ||
4278 | lt_cv_deplibs_check_method=pass_all | ||
4279 | ;; | ||
4280 | |||
4281 | -# This must be glibc/ELF. | ||
4282 | +# This must be Linux ELF. | ||
4283 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | ||
4284 | lt_cv_deplibs_check_method=pass_all | ||
4285 | ;; | ||
4286 | @@ -6861,13 +6924,13 @@ old_postuninstall_cmds= | ||
4287 | if test -n "$RANLIB"; then | ||
4288 | case $host_os in | ||
4289 | openbsd*) | ||
4290 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | ||
4291 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | ||
4292 | ;; | ||
4293 | *) | ||
4294 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | ||
4295 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | ||
4296 | ;; | ||
4297 | esac | ||
4298 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | ||
4299 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | ||
4300 | fi | ||
4301 | |||
4302 | case $host_os in | ||
4303 | @@ -7014,7 +7077,6 @@ for ac_symprfx in "" "_"; do | ||
4304 | # which start with @ or ?. | ||
4305 | lt_cv_sys_global_symbol_pipe="$AWK '"\ | ||
4306 | " {last_section=section; section=\$ 3};"\ | ||
4307 | -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
4308 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | ||
4309 | " \$ 0!~/External *\|/{next};"\ | ||
4310 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | ||
4311 | @@ -7403,7 +7465,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } | ||
4312 | CFLAGS="$SAVE_CFLAGS" | ||
4313 | fi | ||
4314 | ;; | ||
4315 | -*-*solaris*) | ||
4316 | +sparc*-*solaris*) | ||
4317 | # Find out which ABI we are using. | ||
4318 | echo 'int i;' > conftest.$ac_ext | ||
4319 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
4320 | @@ -7414,20 +7476,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } | ||
4321 | case `/usr/bin/file conftest.o` in | ||
4322 | *64-bit*) | ||
4323 | case $lt_cv_prog_gnu_ld in | ||
4324 | - yes*) | ||
4325 | - case $host in | ||
4326 | - i?86-*-solaris*) | ||
4327 | - LD="${LD-ld} -m elf_x86_64" | ||
4328 | - ;; | ||
4329 | - sparc*-*-solaris*) | ||
4330 | - LD="${LD-ld} -m elf64_sparc" | ||
4331 | - ;; | ||
4332 | - esac | ||
4333 | - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
4334 | - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
4335 | - LD="${LD-ld}_sol2" | ||
4336 | - fi | ||
4337 | - ;; | ||
4338 | + yes*) LD="${LD-ld} -m elf64_sparc" ;; | ||
4339 | *) | ||
4340 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | ||
4341 | LD="${LD-ld} -64" | ||
4342 | @@ -8067,13 +8116,7 @@ else | ||
4343 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | ||
4344 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | ||
4345 | _lt_result=$? | ||
4346 | - # If there is a non-empty error log, and "single_module" | ||
4347 | - # appears in it, assume the flag caused a linker warning | ||
4348 | - if test -s conftest.err && $GREP single_module conftest.err; then | ||
4349 | - cat conftest.err >&5 | ||
4350 | - # Otherwise, if the output was created with a 0 exit code from | ||
4351 | - # the compiler, it worked. | ||
4352 | - elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
4353 | + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | ||
4354 | lt_cv_apple_cc_single_mod=yes | ||
4355 | else | ||
4356 | cat conftest.err >&5 | ||
4357 | @@ -8084,7 +8127,6 @@ else | ||
4358 | fi | ||
4359 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | ||
4360 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | ||
4361 | - | ||
4362 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | ||
4363 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | ||
4364 | if ${lt_cv_ld_exported_symbols_list+:} false; then : | ||
4365 | @@ -8117,7 +8159,6 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
4366 | fi | ||
4367 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | ||
4368 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | ||
4369 | - | ||
4370 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | ||
4371 | $as_echo_n "checking for -force_load linker flag... " >&6; } | ||
4372 | if ${lt_cv_ld_force_load+:} false; then : | ||
4373 | @@ -8139,9 +8180,7 @@ _LT_EOF | ||
4374 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | ||
4375 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
4376 | _lt_result=$? | ||
4377 | - if test -s conftest.err && $GREP force_load conftest.err; then | ||
4378 | - cat conftest.err >&5 | ||
4379 | - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
4380 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | ||
4381 | lt_cv_ld_force_load=yes | ||
4382 | else | ||
4383 | cat conftest.err >&5 | ||
4384 | @@ -8542,22 +8581,7 @@ fi | ||
4385 | |||
4386 | # Check whether --with-pic was given. | ||
4387 | if test "${with_pic+set}" = set; then : | ||
4388 | - withval=$with_pic; lt_p=${PACKAGE-default} | ||
4389 | - case $withval in | ||
4390 | - yes|no) pic_mode=$withval ;; | ||
4391 | - *) | ||
4392 | - pic_mode=default | ||
4393 | - # Look at the argument we got. We use all the common list separators. | ||
4394 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
4395 | - for lt_pkg in $withval; do | ||
4396 | - IFS="$lt_save_ifs" | ||
4397 | - if test "X$lt_pkg" = "X$lt_p"; then | ||
4398 | - pic_mode=yes | ||
4399 | - fi | ||
4400 | - done | ||
4401 | - IFS="$lt_save_ifs" | ||
4402 | - ;; | ||
4403 | - esac | ||
4404 | + withval=$with_pic; pic_mode="$withval" | ||
4405 | else | ||
4406 | pic_mode=default | ||
4407 | fi | ||
4408 | @@ -8635,10 +8659,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
4409 | |||
4410 | |||
4411 | |||
4412 | - | ||
4413 | - | ||
4414 | - | ||
4415 | - | ||
4416 | test -z "$LN_S" && LN_S="ln -s" | ||
4417 | |||
4418 | |||
4419 | @@ -9098,9 +9118,7 @@ lt_prog_compiler_static= | ||
4420 | case $cc_basename in | ||
4421 | nvcc*) # Cuda Compiler Driver 2.2 | ||
4422 | lt_prog_compiler_wl='-Xlinker ' | ||
4423 | - if test -n "$lt_prog_compiler_pic"; then | ||
4424 | - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | ||
4425 | - fi | ||
4426 | + lt_prog_compiler_pic='-Xcompiler -fPIC' | ||
4427 | ;; | ||
4428 | esac | ||
4429 | else | ||
4430 | @@ -9191,33 +9209,18 @@ lt_prog_compiler_static= | ||
4431 | ;; | ||
4432 | *) | ||
4433 | case `$CC -V 2>&1 | sed 5q` in | ||
4434 | - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) | ||
4435 | + *Sun\ F* | *Sun*Fortran*) | ||
4436 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
4437 | lt_prog_compiler_pic='-KPIC' | ||
4438 | lt_prog_compiler_static='-Bstatic' | ||
4439 | lt_prog_compiler_wl='' | ||
4440 | ;; | ||
4441 | - *Sun\ F* | *Sun*Fortran*) | ||
4442 | - lt_prog_compiler_pic='-KPIC' | ||
4443 | - lt_prog_compiler_static='-Bstatic' | ||
4444 | - lt_prog_compiler_wl='-Qoption ld ' | ||
4445 | - ;; | ||
4446 | *Sun\ C*) | ||
4447 | # Sun C 5.9 | ||
4448 | lt_prog_compiler_pic='-KPIC' | ||
4449 | lt_prog_compiler_static='-Bstatic' | ||
4450 | lt_prog_compiler_wl='-Wl,' | ||
4451 | ;; | ||
4452 | - *Intel*\ [CF]*Compiler*) | ||
4453 | - lt_prog_compiler_wl='-Wl,' | ||
4454 | - lt_prog_compiler_pic='-fPIC' | ||
4455 | - lt_prog_compiler_static='-static' | ||
4456 | - ;; | ||
4457 | - *Portland\ Group*) | ||
4458 | - lt_prog_compiler_wl='-Wl,' | ||
4459 | - lt_prog_compiler_pic='-fpic' | ||
4460 | - lt_prog_compiler_static='-Bstatic' | ||
4461 | - ;; | ||
4462 | esac | ||
4463 | ;; | ||
4464 | esac | ||
4465 | @@ -9579,6 +9582,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
4466 | hardcode_direct=no | ||
4467 | hardcode_direct_absolute=no | ||
4468 | hardcode_libdir_flag_spec= | ||
4469 | + hardcode_libdir_flag_spec_ld= | ||
4470 | hardcode_libdir_separator= | ||
4471 | hardcode_minus_L=no | ||
4472 | hardcode_shlibpath_var=unsupported | ||
4473 | @@ -9831,7 +9835,8 @@ _LT_EOF | ||
4474 | xlf* | bgf* | bgxlf* | mpixlf*) | ||
4475 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | ||
4476 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
4477 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
4478 | + hardcode_libdir_flag_spec= | ||
4479 | + hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
4480 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
4481 | if test "x$supports_anon_versioning" = xyes; then | ||
4482 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
4483 | @@ -10211,7 +10216,6 @@ fi | ||
4484 | # The linker will not automatically build a static lib if we build a DLL. | ||
4485 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
4486 | enable_shared_with_static_runtimes=yes | ||
4487 | - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
4488 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
4489 | # Don't use ranlib | ||
4490 | old_postinstall_cmds='chmod 644 $oldlib' | ||
4491 | @@ -10257,7 +10261,6 @@ fi | ||
4492 | hardcode_shlibpath_var=unsupported | ||
4493 | if test "$lt_cv_ld_force_load" = "yes"; then | ||
4494 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | ||
4495 | - | ||
4496 | else | ||
4497 | whole_archive_flag_spec='' | ||
4498 | fi | ||
4499 | @@ -10286,6 +10289,10 @@ fi | ||
4500 | hardcode_shlibpath_var=no | ||
4501 | ;; | ||
4502 | |||
4503 | + freebsd1*) | ||
4504 | + ld_shlibs=no | ||
4505 | + ;; | ||
4506 | + | ||
4507 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | ||
4508 | # support. Future versions do this automatically, but an explicit c++rt0.o | ||
4509 | # does not break anything, and helps significantly (at the cost of a little | ||
4510 | @@ -10298,7 +10305,7 @@ fi | ||
4511 | ;; | ||
4512 | |||
4513 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | ||
4514 | - freebsd2.*) | ||
4515 | + freebsd2*) | ||
4516 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | ||
4517 | hardcode_direct=yes | ||
4518 | hardcode_minus_L=yes | ||
4519 | @@ -10337,6 +10344,7 @@ fi | ||
4520 | fi | ||
4521 | if test "$with_gnu_ld" = no; then | ||
4522 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | ||
4523 | + hardcode_libdir_flag_spec_ld='+b $libdir' | ||
4524 | hardcode_libdir_separator=: | ||
4525 | hardcode_direct=yes | ||
4526 | hardcode_direct_absolute=yes | ||
4527 | @@ -10960,6 +10968,11 @@ esac | ||
4528 | |||
4529 | |||
4530 | |||
4531 | + | ||
4532 | + | ||
4533 | + | ||
4534 | + | ||
4535 | + | ||
4536 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | ||
4537 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | ||
4538 | |||
4539 | @@ -11049,7 +11062,7 @@ need_version=unknown | ||
4540 | |||
4541 | case $host_os in | ||
4542 | aix3*) | ||
4543 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4544 | + version_type=linux | ||
4545 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | ||
4546 | shlibpath_var=LIBPATH | ||
4547 | |||
4548 | @@ -11058,7 +11071,7 @@ aix3*) | ||
4549 | ;; | ||
4550 | |||
4551 | aix[4-9]*) | ||
4552 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4553 | + version_type=linux | ||
4554 | need_lib_prefix=no | ||
4555 | need_version=no | ||
4556 | hardcode_into_libs=yes | ||
4557 | @@ -11123,7 +11136,7 @@ beos*) | ||
4558 | ;; | ||
4559 | |||
4560 | bsdi[45]*) | ||
4561 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4562 | + version_type=linux | ||
4563 | need_version=no | ||
4564 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4565 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4566 | @@ -11262,7 +11275,7 @@ darwin* | rhapsody*) | ||
4567 | ;; | ||
4568 | |||
4569 | dgux*) | ||
4570 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4571 | + version_type=linux | ||
4572 | need_lib_prefix=no | ||
4573 | need_version=no | ||
4574 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | ||
4575 | @@ -11270,6 +11283,10 @@ dgux*) | ||
4576 | shlibpath_var=LD_LIBRARY_PATH | ||
4577 | ;; | ||
4578 | |||
4579 | +freebsd1*) | ||
4580 | + dynamic_linker=no | ||
4581 | + ;; | ||
4582 | + | ||
4583 | freebsd* | dragonfly*) | ||
4584 | # DragonFly does not have aout. When/if they implement a new | ||
4585 | # versioning mechanism, adjust this. | ||
4586 | @@ -11277,7 +11294,7 @@ freebsd* | dragonfly*) | ||
4587 | objformat=`/usr/bin/objformat` | ||
4588 | else | ||
4589 | case $host_os in | ||
4590 | - freebsd[23].*) objformat=aout ;; | ||
4591 | + freebsd[123]*) objformat=aout ;; | ||
4592 | *) objformat=elf ;; | ||
4593 | esac | ||
4594 | fi | ||
4595 | @@ -11295,7 +11312,7 @@ freebsd* | dragonfly*) | ||
4596 | esac | ||
4597 | shlibpath_var=LD_LIBRARY_PATH | ||
4598 | case $host_os in | ||
4599 | - freebsd2.*) | ||
4600 | + freebsd2*) | ||
4601 | shlibpath_overrides_runpath=yes | ||
4602 | ;; | ||
4603 | freebsd3.[01]* | freebsdelf3.[01]*) | ||
4604 | @@ -11315,7 +11332,7 @@ freebsd* | dragonfly*) | ||
4605 | ;; | ||
4606 | |||
4607 | gnu*) | ||
4608 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4609 | + version_type=linux | ||
4610 | need_lib_prefix=no | ||
4611 | need_version=no | ||
4612 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
4613 | @@ -11326,7 +11343,7 @@ gnu*) | ||
4614 | ;; | ||
4615 | |||
4616 | haiku*) | ||
4617 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4618 | + version_type=linux | ||
4619 | need_lib_prefix=no | ||
4620 | need_version=no | ||
4621 | dynamic_linker="$host_os runtime_loader" | ||
4622 | @@ -11387,7 +11404,7 @@ hpux9* | hpux10* | hpux11*) | ||
4623 | ;; | ||
4624 | |||
4625 | interix[3-9]*) | ||
4626 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4627 | + version_type=linux | ||
4628 | need_lib_prefix=no | ||
4629 | need_version=no | ||
4630 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
4631 | @@ -11403,7 +11420,7 @@ irix5* | irix6* | nonstopux*) | ||
4632 | nonstopux*) version_type=nonstopux ;; | ||
4633 | *) | ||
4634 | if test "$lt_cv_prog_gnu_ld" = yes; then | ||
4635 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4636 | + version_type=linux | ||
4637 | else | ||
4638 | version_type=irix | ||
4639 | fi ;; | ||
4640 | @@ -11440,9 +11457,9 @@ linux*oldld* | linux*aout* | linux*coff*) | ||
4641 | dynamic_linker=no | ||
4642 | ;; | ||
4643 | |||
4644 | -# This must be glibc/ELF. | ||
4645 | +# This must be Linux ELF. | ||
4646 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | ||
4647 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4648 | + version_type=linux | ||
4649 | need_lib_prefix=no | ||
4650 | need_version=no | ||
4651 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4652 | @@ -11536,7 +11553,7 @@ netbsd*) | ||
4653 | ;; | ||
4654 | |||
4655 | newsos6) | ||
4656 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4657 | + version_type=linux | ||
4658 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4659 | shlibpath_var=LD_LIBRARY_PATH | ||
4660 | shlibpath_overrides_runpath=yes | ||
4661 | @@ -11605,7 +11622,7 @@ rdos*) | ||
4662 | ;; | ||
4663 | |||
4664 | solaris*) | ||
4665 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4666 | + version_type=linux | ||
4667 | need_lib_prefix=no | ||
4668 | need_version=no | ||
4669 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4670 | @@ -11630,7 +11647,7 @@ sunos4*) | ||
4671 | ;; | ||
4672 | |||
4673 | sysv4 | sysv4.3*) | ||
4674 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4675 | + version_type=linux | ||
4676 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4677 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4678 | shlibpath_var=LD_LIBRARY_PATH | ||
4679 | @@ -11654,7 +11671,7 @@ sysv4 | sysv4.3*) | ||
4680 | |||
4681 | sysv4*MP*) | ||
4682 | if test -d /usr/nec ;then | ||
4683 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4684 | + version_type=linux | ||
4685 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | ||
4686 | soname_spec='$libname${shared_ext}.$major' | ||
4687 | shlibpath_var=LD_LIBRARY_PATH | ||
4688 | @@ -11685,7 +11702,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
4689 | |||
4690 | tpf*) | ||
4691 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | ||
4692 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4693 | + version_type=linux | ||
4694 | need_lib_prefix=no | ||
4695 | need_version=no | ||
4696 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4697 | @@ -11695,7 +11712,7 @@ tpf*) | ||
4698 | ;; | ||
4699 | |||
4700 | uts4*) | ||
4701 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
4702 | + version_type=linux | ||
4703 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
4704 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4705 | shlibpath_var=LD_LIBRARY_PATH | ||
4706 | @@ -12477,8 +12494,6 @@ CC="$lt_save_CC" | ||
4707 | |||
4708 | |||
4709 | |||
4710 | - | ||
4711 | - | ||
4712 | ac_config_commands="$ac_config_commands libtool" | ||
4713 | |||
4714 | |||
4715 | @@ -12487,9 +12502,13 @@ CC="$lt_save_CC" | ||
4716 | # Only expand once: | ||
4717 | |||
4718 | |||
4719 | - | ||
4720 | +ac_ext=m | ||
4721 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
4722 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
4723 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
4724 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
4725 | if test -n "$ac_tool_prefix"; then | ||
4726 | - for ac_prog in objcc objc gcc cc CC | ||
4727 | + for ac_prog in gcc objcc objc cc CC | ||
4728 | do | ||
4729 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4730 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4731 | @@ -12533,7 +12552,7 @@ fi | ||
4732 | fi | ||
4733 | if test -z "$OBJC"; then | ||
4734 | ac_ct_OBJC=$OBJC | ||
4735 | - for ac_prog in objcc objc gcc cc CC | ||
4736 | + for ac_prog in gcc objcc objc cc CC | ||
4737 | do | ||
4738 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4739 | set dummy $ac_prog; ac_word=$2 | ||
4740 | @@ -12576,7 +12595,7 @@ fi | ||
4741 | done | ||
4742 | |||
4743 | if test "x$ac_ct_OBJC" = x; then | ||
4744 | - OBJC="none" | ||
4745 | + OBJC="gcc" | ||
4746 | else | ||
4747 | case $cross_compiling:$ac_tool_warned in | ||
4748 | yes:) | ||
4749 | @@ -12588,175 +12607,151 @@ esac | ||
4750 | fi | ||
4751 | fi | ||
4752 | |||
4753 | +# Provide some information about the compiler. | ||
4754 | +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5 | ||
4755 | +set X $ac_compile | ||
4756 | +ac_compiler=$2 | ||
4757 | +for ac_option in --version -v -V -qversion; do | ||
4758 | + { { ac_try="$ac_compiler $ac_option >&5" | ||
4759 | +case "(($ac_try" in | ||
4760 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4761 | + *) ac_try_echo=$ac_try;; | ||
4762 | +esac | ||
4763 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
4764 | +$as_echo "$ac_try_echo"; } >&5 | ||
4765 | + (eval "$ac_compiler $ac_option >&5") 2>conftest.err | ||
4766 | + ac_status=$? | ||
4767 | + if test -s conftest.err; then | ||
4768 | + sed '10a\ | ||
4769 | +... rest of stderr output deleted ... | ||
4770 | + 10q' conftest.err >conftest.er1 | ||
4771 | + cat conftest.er1 >&5 | ||
4772 | + fi | ||
4773 | + rm -f conftest.er1 conftest.err | ||
4774 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4775 | + test $ac_status = 0; } | ||
4776 | +done | ||
4777 | |||
4778 | -OBJC_LDFLAGS="-lobjc" | ||
4779 | - | ||
4780 | -if test "x$OBJC" != xnone ; then | ||
4781 | - | ||
4782 | -depcc="$OBJC" am_compiler_list='gcc3 gcc' | ||
4783 | - | ||
4784 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | ||
4785 | -$as_echo_n "checking dependency style of $depcc... " >&6; } | ||
4786 | -if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : | ||
4787 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 | ||
4788 | +$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } | ||
4789 | +if ${ac_cv_objc_compiler_gnu+:} false; then : | ||
4790 | $as_echo_n "(cached) " >&6 | ||
4791 | else | ||
4792 | - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | ||
4793 | - # We make a subdir and do the tests there. Otherwise we can end up | ||
4794 | - # making bogus files that we don't know about and never remove. For | ||
4795 | - # instance it was reported that on HP-UX the gcc test will end up | ||
4796 | - # making a dummy file named `D' -- because `-MD' means `put the output | ||
4797 | - # in D'. | ||
4798 | - rm -rf conftest.dir | ||
4799 | - mkdir conftest.dir | ||
4800 | - # Copy depcomp to subdir because otherwise we won't find it if we're | ||
4801 | - # using a relative directory. | ||
4802 | - cp "$am_depcomp" conftest.dir | ||
4803 | - cd conftest.dir | ||
4804 | - # We will build objects and dependencies in a subdirectory because | ||
4805 | - # it helps to detect inapplicable dependency modes. For instance | ||
4806 | - # both Tru64's cc and ICC support -MD to output dependencies as a | ||
4807 | - # side effect of compilation, but ICC will put the dependencies in | ||
4808 | - # the current directory while Tru64 will put them in the object | ||
4809 | - # directory. | ||
4810 | - mkdir sub | ||
4811 | - | ||
4812 | - am_cv_OBJC_dependencies_compiler_type=none | ||
4813 | - if test "$am_compiler_list" = ""; then | ||
4814 | - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` | ||
4815 | - fi | ||
4816 | - am__universal=false | ||
4817 | - | ||
4818 | - | ||
4819 | - for depmode in $am_compiler_list; do | ||
4820 | - # Setup a source with many dependencies, because some compilers | ||
4821 | - # like to wrap large dependency lists on column 80 (with \), and | ||
4822 | - # we should not choose a depcomp mode which is confused by this. | ||
4823 | - # | ||
4824 | - # We need to recreate these files for each test, as the compiler may | ||
4825 | - # overwrite some of them when testing with obscure command lines. | ||
4826 | - # This happens at least with the AIX C compiler. | ||
4827 | - : > sub/conftest.c | ||
4828 | - for i in 1 2 3 4 5 6; do | ||
4829 | - echo '#include "conftst'$i'.h"' >> sub/conftest.c | ||
4830 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | ||
4831 | - # Solaris 8's {/usr,}/bin/sh. | ||
4832 | - touch sub/conftst$i.h | ||
4833 | - done | ||
4834 | - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | ||
4835 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4836 | +/* end confdefs.h. */ | ||
4837 | |||
4838 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
4839 | - # mode. It turns out that the SunPro C++ compiler does not properly | ||
4840 | - # handle `-M -o', and we need to detect this. Also, some Intel | ||
4841 | - # versions had trouble with output in subdirs | ||
4842 | - am__obj=sub/conftest.${OBJEXT-o} | ||
4843 | - am__minus_obj="-o $am__obj" | ||
4844 | - case $depmode in | ||
4845 | - gcc) | ||
4846 | - # This depmode causes a compiler race in universal mode. | ||
4847 | - test "$am__universal" = false || continue | ||
4848 | - ;; | ||
4849 | - nosideeffect) | ||
4850 | - # after this tag, mechanisms are not by side-effect, so they'll | ||
4851 | - # only be used when explicitly requested | ||
4852 | - if test "x$enable_dependency_tracking" = xyes; then | ||
4853 | - continue | ||
4854 | - else | ||
4855 | - break | ||
4856 | - fi | ||
4857 | - ;; | ||
4858 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
4859 | - # This compiler won't grok `-c -o', but also, the minuso test has | ||
4860 | - # not run yet. These depmodes are late enough in the game, and | ||
4861 | - # so weak that their functioning should not be impacted. | ||
4862 | - am__obj=conftest.${OBJEXT-o} | ||
4863 | - am__minus_obj= | ||
4864 | - ;; | ||
4865 | - none) break ;; | ||
4866 | - esac | ||
4867 | - if depmode=$depmode \ | ||
4868 | - source=sub/conftest.c object=$am__obj \ | ||
4869 | - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | ||
4870 | - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ | ||
4871 | - >/dev/null 2>conftest.err && | ||
4872 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | ||
4873 | - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | ||
4874 | - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && | ||
4875 | - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | ||
4876 | - # icc doesn't choke on unknown options, it will just issue warnings | ||
4877 | - # or remarks (even with -Werror). So we grep stderr for any message | ||
4878 | - # that says an option was ignored or not supported. | ||
4879 | - # When given -MP, icc 7.0 and 7.1 complain thusly: | ||
4880 | - # icc: Command line warning: ignoring option '-M'; no argument required | ||
4881 | - # The diagnosis changed in icc 8.0: | ||
4882 | - # icc: Command line remark: option '-MP' not supported | ||
4883 | - if (grep 'ignoring option' conftest.err || | ||
4884 | - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else | ||
4885 | - am_cv_OBJC_dependencies_compiler_type=$depmode | ||
4886 | - break | ||
4887 | - fi | ||
4888 | - fi | ||
4889 | - done | ||
4890 | +int | ||
4891 | +main () | ||
4892 | +{ | ||
4893 | +#ifndef __GNUC__ | ||
4894 | + choke me | ||
4895 | +#endif | ||
4896 | |||
4897 | - cd .. | ||
4898 | - rm -rf conftest.dir | ||
4899 | + ; | ||
4900 | + return 0; | ||
4901 | +} | ||
4902 | +_ACEOF | ||
4903 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
4904 | + ac_compiler_gnu=yes | ||
4905 | else | ||
4906 | - am_cv_OBJC_dependencies_compiler_type=none | ||
4907 | + ac_compiler_gnu=no | ||
4908 | fi | ||
4909 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4910 | +ac_cv_objc_compiler_gnu=$ac_compiler_gnu | ||
4911 | |||
4912 | fi | ||
4913 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 | ||
4914 | -$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } | ||
4915 | -OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type | ||
4916 | - | ||
4917 | - if | ||
4918 | - test "x$enable_dependency_tracking" != xno \ | ||
4919 | - && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then | ||
4920 | - am__fastdepOBJC_TRUE= | ||
4921 | - am__fastdepOBJC_FALSE='#' | ||
4922 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5 | ||
4923 | +$as_echo "$ac_cv_objc_compiler_gnu" >&6; } | ||
4924 | +if test $ac_compiler_gnu = yes; then | ||
4925 | + GOBJC=yes | ||
4926 | else | ||
4927 | - am__fastdepOBJC_TRUE='#' | ||
4928 | - am__fastdepOBJC_FALSE= | ||
4929 | + GOBJC= | ||
4930 | fi | ||
4931 | +ac_test_OBJCFLAGS=${OBJCFLAGS+set} | ||
4932 | +ac_save_OBJCFLAGS=$OBJCFLAGS | ||
4933 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 | ||
4934 | +$as_echo_n "checking whether $OBJC accepts -g... " >&6; } | ||
4935 | +if ${ac_cv_prog_objc_g+:} false; then : | ||
4936 | + $as_echo_n "(cached) " >&6 | ||
4937 | +else | ||
4938 | + ac_save_objc_werror_flag=$ac_objc_werror_flag | ||
4939 | + ac_objc_werror_flag=yes | ||
4940 | + ac_cv_prog_objc_g=no | ||
4941 | + OBJCFLAGS="-g" | ||
4942 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4943 | +/* end confdefs.h. */ | ||
4944 | |||
4945 | - | ||
4946 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Objective C compiler works" >&5 | ||
4947 | -$as_echo_n "checking if Objective C compiler works... " >&6; } | ||
4948 | - cat >>conftest.m <<EOF | ||
4949 | -#include <objc/Object.h> | ||
4950 | -@interface Moo:Object | ||
4951 | +int | ||
4952 | +main () | ||
4953 | { | ||
4954 | + | ||
4955 | + ; | ||
4956 | + return 0; | ||
4957 | } | ||
4958 | -- moo; | ||
4959 | -int main(); | ||
4960 | -@end | ||
4961 | +_ACEOF | ||
4962 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
4963 | + ac_cv_prog_objc_g=yes | ||
4964 | +else | ||
4965 | + OBJCFLAGS="" | ||
4966 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4967 | +/* end confdefs.h. */ | ||
4968 | |||
4969 | -@implementation Moo | ||
4970 | -- moo | ||
4971 | +int | ||
4972 | +main () | ||
4973 | { | ||
4974 | - exit(0); | ||
4975 | + | ||
4976 | + ; | ||
4977 | + return 0; | ||
4978 | } | ||
4979 | +_ACEOF | ||
4980 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
4981 | + | ||
4982 | +else | ||
4983 | + ac_objc_werror_flag=$ac_save_objc_werror_flag | ||
4984 | + OBJCFLAGS="-g" | ||
4985 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4986 | +/* end confdefs.h. */ | ||
4987 | |||
4988 | -int main() | ||
4989 | +int | ||
4990 | +main () | ||
4991 | { | ||
4992 | - id moo; | ||
4993 | - moo = [Moo new]; | ||
4994 | - [moo moo]; | ||
4995 | - return 1; | ||
4996 | + | ||
4997 | + ; | ||
4998 | + return 0; | ||
4999 | } | ||
5000 | -@end | ||
5001 | -EOF | ||
5002 | - ${OBJC} conftest.m ${OBJC_LDFLAGS} >&5 2>&5 | ||
5003 | - if test -f a.out -o -f a.exe ; then | ||
5004 | - result=yes | ||
5005 | +_ACEOF | ||
5006 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
5007 | + ac_cv_prog_objc_g=yes | ||
5008 | +fi | ||
5009 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5010 | +fi | ||
5011 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5012 | +fi | ||
5013 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5014 | + ac_objc_werror_flag=$ac_save_objc_werror_flag | ||
5015 | +fi | ||
5016 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5 | ||
5017 | +$as_echo "$ac_cv_prog_objc_g" >&6; } | ||
5018 | +if test "$ac_test_OBJCFLAGS" = set; then | ||
5019 | + OBJCFLAGS=$ac_save_OBJCFLAGS | ||
5020 | +elif test $ac_cv_prog_objc_g = yes; then | ||
5021 | + if test "$GOBJC" = yes; then | ||
5022 | + OBJCFLAGS="-g -O2" | ||
5023 | else | ||
5024 | - result=no | ||
5025 | - echo failed program is: >&5 | ||
5026 | - cat conftest.m >&5 | ||
5027 | + OBJCFLAGS="-g" | ||
5028 | fi | ||
5029 | - rm -f conftest.m a.out a.exe | ||
5030 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 | ||
5031 | -$as_echo "$result" >&6; } | ||
5032 | else | ||
5033 | + if test "$GOBJC" = yes; then | ||
5034 | + OBJCFLAGS="-O2" | ||
5035 | + else | ||
5036 | + OBJCFLAGS= | ||
5037 | + fi | ||
5038 | +fi | ||
5039 | +ac_ext=c | ||
5040 | +ac_cpp='$CPP $CPPFLAGS' | ||
5041 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
5042 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
5043 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
5044 | |||
5045 | depcc="$OBJC" am_compiler_list='gcc3 gcc' | ||
5046 | |||
5047 | @@ -12771,7 +12766,6 @@ else | ||
5048 | # instance it was reported that on HP-UX the gcc test will end up | ||
5049 | # making a dummy file named `D' -- because `-MD' means `put the output | ||
5050 | # in D'. | ||
5051 | - rm -rf conftest.dir | ||
5052 | mkdir conftest.dir | ||
5053 | # Copy depcomp to subdir because otherwise we won't find it if we're | ||
5054 | # using a relative directory. | ||
5055 | @@ -12829,7 +12823,7 @@ else | ||
5056 | break | ||
5057 | fi | ||
5058 | ;; | ||
5059 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
5060 | + msvisualcpp | msvcmsys) | ||
5061 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
5062 | # not run yet. These depmodes are late enough in the game, and | ||
5063 | # so weak that their functioning should not be impacted. | ||
5064 | @@ -12884,9 +12878,6 @@ else | ||
5065 | fi | ||
5066 | |||
5067 | |||
5068 | -fi | ||
5069 | - | ||
5070 | - | ||
5071 | |||
5072 | GST_REQ=0.10.35 | ||
5073 | GSTPB_REQ=0.10.35 | ||
5074 | @@ -14907,6 +14898,21 @@ _ACEOF | ||
5075 | |||
5076 | |||
5077 | |||
5078 | + # Check whether --enable-fatal-warnings was given. | ||
5079 | +if test "${enable_fatal_warnings+set}" = set; then : | ||
5080 | + enableval=$enable_fatal_warnings; | ||
5081 | + case "${enableval}" in | ||
5082 | + yes) FATAL_WARNINGS=yes ;; | ||
5083 | + no) FATAL_WARNINGS=no ;; | ||
5084 | + *) as_fn_error $? "bad value ${enableval} for --disable-fatal-warnings" "$LINENO" 5 ;; | ||
5085 | + esac | ||
5086 | + | ||
5087 | +else | ||
5088 | + FATAL_WARNINGS=$GST_GIT | ||
5089 | +fi | ||
5090 | + | ||
5091 | + | ||
5092 | + | ||
5093 | # Check whether --enable-debug was given. | ||
5094 | if test "${enable_debug+set}" = set; then : | ||
5095 | enableval=$enable_debug; | ||
5096 | @@ -15246,13 +15252,13 @@ _ACEOF | ||
5097 | |||
5098 | if test "x$GST_GCOV_ENABLED" = "xyes" | ||
5099 | then | ||
5100 | - CFLAGS="-O0" | ||
5101 | + CFLAGS="$CFLAGS -O0" | ||
5102 | |||
5103 | - CXXFLAGS="-O0" | ||
5104 | + CXXFLAGS="$CXXFLAGS -O0" | ||
5105 | |||
5106 | - FFLAGS="-O0" | ||
5107 | + FFLAGS="$FFLAGS -O0" | ||
5108 | |||
5109 | - CCASFLAGS="-O0" | ||
5110 | + CCASFLAGS="$CCASFLAGS -O0" | ||
5111 | |||
5112 | { $as_echo "$as_me:${as_lineno-$LINENO}: gcov enabled, setting CFLAGS and friends to $CFLAGS" >&5 | ||
5113 | $as_echo "$as_me: gcov enabled, setting CFLAGS and friends to $CFLAGS" >&6;} | ||
5114 | @@ -15521,10 +15527,9 @@ _ACEOF | ||
5115 | |||
5116 | |||
5117 | |||
5118 | - | ||
5119 | - case "x${host_cpu}" in | ||
5120 | + case "x${target_cpu}" in | ||
5121 | xi?86 | xk? | xi?86_64) | ||
5122 | - case $host_os in | ||
5123 | + case $target_os in | ||
5124 | solaris*) | ||
5125 | ac_fn_c_check_decl "$LINENO" "__i386" "ac_cv_have_decl___i386" "$ac_includes_default" | ||
5126 | if test "x$ac_cv_have_decl___i386" = xyes; then : | ||
5127 | @@ -15560,7 +15565,7 @@ $as_echo "#define HAVE_CPU_X86_64 1" >>confdefs.h | ||
5128 | $as_echo "#define HAVE_CPU_I386 1" >>confdefs.h | ||
5129 | |||
5130 | |||
5131 | - case "x${host_cpu}" in | ||
5132 | + case "x${target_cpu}" in | ||
5133 | xi386 | xi486) ;; | ||
5134 | *) | ||
5135 | |||
5136 | @@ -15981,6 +15986,11 @@ cat >>confdefs.h <<_ACEOF | ||
5137 | _ACEOF | ||
5138 | |||
5139 | |||
5140 | +cat >>confdefs.h <<_ACEOF | ||
5141 | +#define TARGET_CPU "$target_cpu" | ||
5142 | +_ACEOF | ||
5143 | + | ||
5144 | + | ||
5145 | |||
5146 | # Check whether --enable-largefile was given. | ||
5147 | if test "${enable_largefile+set}" = set; then : | ||
5148 | @@ -16735,7 +16745,6 @@ else | ||
5149 | # instance it was reported that on HP-UX the gcc test will end up | ||
5150 | # making a dummy file named `D' -- because `-MD' means `put the output | ||
5151 | # in D'. | ||
5152 | - rm -rf conftest.dir | ||
5153 | mkdir conftest.dir | ||
5154 | # Copy depcomp to subdir because otherwise we won't find it if we're | ||
5155 | # using a relative directory. | ||
5156 | @@ -16795,7 +16804,7 @@ else | ||
5157 | break | ||
5158 | fi | ||
5159 | ;; | ||
5160 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
5161 | + msvisualcpp | msvcmsys) | ||
5162 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
5163 | # not run yet. These depmodes are late enough in the game, and | ||
5164 | # so weak that their functioning should not be impacted. | ||
5165 | @@ -17413,7 +17422,6 @@ else | ||
5166 | # instance it was reported that on HP-UX the gcc test will end up | ||
5167 | # making a dummy file named `D' -- because `-MD' means `put the output | ||
5168 | # in D'. | ||
5169 | - rm -rf conftest.dir | ||
5170 | mkdir conftest.dir | ||
5171 | # Copy depcomp to subdir because otherwise we won't find it if we're | ||
5172 | # using a relative directory. | ||
5173 | @@ -17473,7 +17481,7 @@ else | ||
5174 | break | ||
5175 | fi | ||
5176 | ;; | ||
5177 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | ||
5178 | + msvisualcpp | msvcmsys) | ||
5179 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
5180 | # not run yet. These depmodes are late enough in the game, and | ||
5181 | # so weak that their functioning should not be impacted. | ||
5182 | @@ -17693,6 +17701,7 @@ export_dynamic_flag_spec_CXX= | ||
5183 | hardcode_direct_CXX=no | ||
5184 | hardcode_direct_absolute_CXX=no | ||
5185 | hardcode_libdir_flag_spec_CXX= | ||
5186 | +hardcode_libdir_flag_spec_ld_CXX= | ||
5187 | hardcode_libdir_separator_CXX= | ||
5188 | hardcode_minus_L_CXX=no | ||
5189 | hardcode_shlibpath_var_CXX=unsupported | ||
5190 | @@ -18276,7 +18285,6 @@ fi | ||
5191 | hardcode_shlibpath_var_CXX=unsupported | ||
5192 | if test "$lt_cv_ld_force_load" = "yes"; then | ||
5193 | whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | ||
5194 | - | ||
5195 | else | ||
5196 | whole_archive_flag_spec_CXX='' | ||
5197 | fi | ||
5198 | @@ -18321,7 +18329,7 @@ fi | ||
5199 | esac | ||
5200 | ;; | ||
5201 | |||
5202 | - freebsd2.*) | ||
5203 | + freebsd[12]*) | ||
5204 | # C++ shared libraries reported to be fairly broken before | ||
5205 | # switch to ELF | ||
5206 | ld_shlibs_CXX=no | ||
5207 | @@ -18997,7 +19005,6 @@ _lt_libdeps_save_CFLAGS=$CFLAGS | ||
5208 | case "$CC $CFLAGS " in #( | ||
5209 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
5210 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
5211 | -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
5212 | esac | ||
5213 | |||
5214 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
5215 | @@ -19787,9 +19794,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
5216 | ;; | ||
5217 | cygwin* | mingw* | cegcc*) | ||
5218 | case $cc_basename in | ||
5219 | - cl*) | ||
5220 | - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
5221 | - ;; | ||
5222 | + cl*) ;; | ||
5223 | *) | ||
5224 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
5225 | exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
5226 | @@ -19945,6 +19950,8 @@ esac | ||
5227 | |||
5228 | |||
5229 | |||
5230 | + | ||
5231 | + | ||
5232 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | ||
5233 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | ||
5234 | |||
5235 | @@ -19970,7 +19977,7 @@ need_version=unknown | ||
5236 | |||
5237 | case $host_os in | ||
5238 | aix3*) | ||
5239 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5240 | + version_type=linux | ||
5241 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | ||
5242 | shlibpath_var=LIBPATH | ||
5243 | |||
5244 | @@ -19979,7 +19986,7 @@ aix3*) | ||
5245 | ;; | ||
5246 | |||
5247 | aix[4-9]*) | ||
5248 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5249 | + version_type=linux | ||
5250 | need_lib_prefix=no | ||
5251 | need_version=no | ||
5252 | hardcode_into_libs=yes | ||
5253 | @@ -20044,7 +20051,7 @@ beos*) | ||
5254 | ;; | ||
5255 | |||
5256 | bsdi[45]*) | ||
5257 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5258 | + version_type=linux | ||
5259 | need_version=no | ||
5260 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5261 | soname_spec='${libname}${release}${shared_ext}$major' | ||
5262 | @@ -20181,7 +20188,7 @@ darwin* | rhapsody*) | ||
5263 | ;; | ||
5264 | |||
5265 | dgux*) | ||
5266 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5267 | + version_type=linux | ||
5268 | need_lib_prefix=no | ||
5269 | need_version=no | ||
5270 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | ||
5271 | @@ -20189,6 +20196,10 @@ dgux*) | ||
5272 | shlibpath_var=LD_LIBRARY_PATH | ||
5273 | ;; | ||
5274 | |||
5275 | +freebsd1*) | ||
5276 | + dynamic_linker=no | ||
5277 | + ;; | ||
5278 | + | ||
5279 | freebsd* | dragonfly*) | ||
5280 | # DragonFly does not have aout. When/if they implement a new | ||
5281 | # versioning mechanism, adjust this. | ||
5282 | @@ -20196,7 +20207,7 @@ freebsd* | dragonfly*) | ||
5283 | objformat=`/usr/bin/objformat` | ||
5284 | else | ||
5285 | case $host_os in | ||
5286 | - freebsd[23].*) objformat=aout ;; | ||
5287 | + freebsd[123]*) objformat=aout ;; | ||
5288 | *) objformat=elf ;; | ||
5289 | esac | ||
5290 | fi | ||
5291 | @@ -20214,7 +20225,7 @@ freebsd* | dragonfly*) | ||
5292 | esac | ||
5293 | shlibpath_var=LD_LIBRARY_PATH | ||
5294 | case $host_os in | ||
5295 | - freebsd2.*) | ||
5296 | + freebsd2*) | ||
5297 | shlibpath_overrides_runpath=yes | ||
5298 | ;; | ||
5299 | freebsd3.[01]* | freebsdelf3.[01]*) | ||
5300 | @@ -20234,7 +20245,7 @@ freebsd* | dragonfly*) | ||
5301 | ;; | ||
5302 | |||
5303 | gnu*) | ||
5304 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5305 | + version_type=linux | ||
5306 | need_lib_prefix=no | ||
5307 | need_version=no | ||
5308 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
5309 | @@ -20245,7 +20256,7 @@ gnu*) | ||
5310 | ;; | ||
5311 | |||
5312 | haiku*) | ||
5313 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5314 | + version_type=linux | ||
5315 | need_lib_prefix=no | ||
5316 | need_version=no | ||
5317 | dynamic_linker="$host_os runtime_loader" | ||
5318 | @@ -20306,7 +20317,7 @@ hpux9* | hpux10* | hpux11*) | ||
5319 | ;; | ||
5320 | |||
5321 | interix[3-9]*) | ||
5322 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5323 | + version_type=linux | ||
5324 | need_lib_prefix=no | ||
5325 | need_version=no | ||
5326 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
5327 | @@ -20322,7 +20333,7 @@ irix5* | irix6* | nonstopux*) | ||
5328 | nonstopux*) version_type=nonstopux ;; | ||
5329 | *) | ||
5330 | if test "$lt_cv_prog_gnu_ld" = yes; then | ||
5331 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5332 | + version_type=linux | ||
5333 | else | ||
5334 | version_type=irix | ||
5335 | fi ;; | ||
5336 | @@ -20359,9 +20370,9 @@ linux*oldld* | linux*aout* | linux*coff*) | ||
5337 | dynamic_linker=no | ||
5338 | ;; | ||
5339 | |||
5340 | -# This must be glibc/ELF. | ||
5341 | +# This must be Linux ELF. | ||
5342 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | ||
5343 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5344 | + version_type=linux | ||
5345 | need_lib_prefix=no | ||
5346 | need_version=no | ||
5347 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5348 | @@ -20455,7 +20466,7 @@ netbsd*) | ||
5349 | ;; | ||
5350 | |||
5351 | newsos6) | ||
5352 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5353 | + version_type=linux | ||
5354 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5355 | shlibpath_var=LD_LIBRARY_PATH | ||
5356 | shlibpath_overrides_runpath=yes | ||
5357 | @@ -20524,7 +20535,7 @@ rdos*) | ||
5358 | ;; | ||
5359 | |||
5360 | solaris*) | ||
5361 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5362 | + version_type=linux | ||
5363 | need_lib_prefix=no | ||
5364 | need_version=no | ||
5365 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5366 | @@ -20549,7 +20560,7 @@ sunos4*) | ||
5367 | ;; | ||
5368 | |||
5369 | sysv4 | sysv4.3*) | ||
5370 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5371 | + version_type=linux | ||
5372 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5373 | soname_spec='${libname}${release}${shared_ext}$major' | ||
5374 | shlibpath_var=LD_LIBRARY_PATH | ||
5375 | @@ -20573,7 +20584,7 @@ sysv4 | sysv4.3*) | ||
5376 | |||
5377 | sysv4*MP*) | ||
5378 | if test -d /usr/nec ;then | ||
5379 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5380 | + version_type=linux | ||
5381 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | ||
5382 | soname_spec='$libname${shared_ext}.$major' | ||
5383 | shlibpath_var=LD_LIBRARY_PATH | ||
5384 | @@ -20604,7 +20615,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
5385 | |||
5386 | tpf*) | ||
5387 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | ||
5388 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5389 | + version_type=linux | ||
5390 | need_lib_prefix=no | ||
5391 | need_version=no | ||
5392 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5393 | @@ -20614,7 +20625,7 @@ tpf*) | ||
5394 | ;; | ||
5395 | |||
5396 | uts4*) | ||
5397 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
5398 | + version_type=linux | ||
5399 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
5400 | soname_spec='${libname}${release}${shared_ext}$major' | ||
5401 | shlibpath_var=LD_LIBRARY_PATH | ||
5402 | @@ -21724,7 +21735,7 @@ _ACEOF | ||
5403 | |||
5404 | |||
5405 | |||
5406 | - GLIB_REQ=2.6 | ||
5407 | + GLIB_REQ=2.22 | ||
5408 | if test "x$GLIB_REQ" = "x" | ||
5409 | then | ||
5410 | as_fn_error $? "Please specify a required version for GLib 2.0" "$LINENO" 5 | ||
5411 | @@ -21895,7 +21906,57 @@ fi | ||
5412 | echo host is $host | ||
5413 | case $host in | ||
5414 | *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) | ||
5415 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 | ||
5416 | + save_CPPFLAGS="$CPPFLAGS" | ||
5417 | + save_LIBS="$LIBS" | ||
5418 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fbGetDisplay in -lEGL" >&5 | ||
5419 | +$as_echo_n "checking for fbGetDisplay in -lEGL... " >&6; } | ||
5420 | +if ${ac_cv_lib_EGL_fbGetDisplay+:} false; then : | ||
5421 | + $as_echo_n "(cached) " >&6 | ||
5422 | +else | ||
5423 | + ac_check_lib_save_LIBS=$LIBS | ||
5424 | +LIBS="-lEGL $LIBS" | ||
5425 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5426 | +/* end confdefs.h. */ | ||
5427 | + | ||
5428 | +/* Override any GCC internal prototype to avoid an error. | ||
5429 | + Use char because int might match the return type of a GCC | ||
5430 | + builtin and then its argument prototype would still apply. */ | ||
5431 | +#ifdef __cplusplus | ||
5432 | +extern "C" | ||
5433 | +#endif | ||
5434 | +char fbGetDisplay (); | ||
5435 | +int | ||
5436 | +main () | ||
5437 | +{ | ||
5438 | +return fbGetDisplay (); | ||
5439 | + ; | ||
5440 | + return 0; | ||
5441 | +} | ||
5442 | +_ACEOF | ||
5443 | +if ac_fn_c_try_link "$LINENO"; then : | ||
5444 | + ac_cv_lib_EGL_fbGetDisplay=yes | ||
5445 | +else | ||
5446 | + ac_cv_lib_EGL_fbGetDisplay=no | ||
5447 | +fi | ||
5448 | +rm -f core conftest.err conftest.$ac_objext \ | ||
5449 | + conftest$ac_exeext conftest.$ac_ext | ||
5450 | +LIBS=$ac_check_lib_save_LIBS | ||
5451 | +fi | ||
5452 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_fbGetDisplay" >&5 | ||
5453 | +$as_echo "$ac_cv_lib_EGL_fbGetDisplay" >&6; } | ||
5454 | +if test "x$ac_cv_lib_EGL_fbGetDisplay" = xyes; then : | ||
5455 | + HAVE_EGL_FB=yes | ||
5456 | +else | ||
5457 | + HAVE_EGL_FB=no | ||
5458 | +fi | ||
5459 | + | ||
5460 | + if test "x$HAVE_EGL_FB" = "xyes"; then | ||
5461 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
5462 | + GL_BACKEND=fbES2 | ||
5463 | + GL_TYPE=gles | ||
5464 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" | ||
5465 | + else | ||
5466 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 | ||
5467 | $as_echo_n "checking for X... " >&6; } | ||
5468 | |||
5469 | |||
5470 | @@ -22608,12 +22669,159 @@ $as_echo "$as_me: cannot find X11 development files" >&6;} | ||
5471 | CFLAGS="$ac_cflags_save" | ||
5472 | CPPFLAGS="$ac_cppflags_save" | ||
5473 | |||
5474 | - save_CPPFLAGS="$CPPFLAGS" | ||
5475 | - save_LIBS="$LIBS" | ||
5476 | - CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
5477 | - LIBS="$LIBS $X_LIBS" | ||
5478 | - #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
5479 | - for ac_header in GL/gl.h | ||
5480 | + CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" | ||
5481 | + LIBS="$LIBS $X_LIBS" | ||
5482 | + for ac_header in EGL/egl.h | ||
5483 | +do : | ||
5484 | + ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" | ||
5485 | +if test "x$ac_cv_header_EGL_egl_h" = xyes; then : | ||
5486 | + cat >>confdefs.h <<_ACEOF | ||
5487 | +#define HAVE_EGL_EGL_H 1 | ||
5488 | +_ACEOF | ||
5489 | + HAVE_EGL=yes | ||
5490 | +else | ||
5491 | + HAVE_EGL=no | ||
5492 | +fi | ||
5493 | + | ||
5494 | +done | ||
5495 | + | ||
5496 | + if test "x$HAVE_EGL" = "xyes"; then | ||
5497 | + | ||
5498 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -lEGL" >&5 | ||
5499 | +$as_echo_n "checking for eglGetError in -lEGL... " >&6; } | ||
5500 | +if ${ac_cv_lib_EGL_eglGetError+:} false; then : | ||
5501 | + $as_echo_n "(cached) " >&6 | ||
5502 | +else | ||
5503 | + ac_check_lib_save_LIBS=$LIBS | ||
5504 | +LIBS="-lEGL $LIBS" | ||
5505 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5506 | +/* end confdefs.h. */ | ||
5507 | + | ||
5508 | +/* Override any GCC internal prototype to avoid an error. | ||
5509 | + Use char because int might match the return type of a GCC | ||
5510 | + builtin and then its argument prototype would still apply. */ | ||
5511 | +#ifdef __cplusplus | ||
5512 | +extern "C" | ||
5513 | +#endif | ||
5514 | +char eglGetError (); | ||
5515 | +int | ||
5516 | +main () | ||
5517 | +{ | ||
5518 | +return eglGetError (); | ||
5519 | + ; | ||
5520 | + return 0; | ||
5521 | +} | ||
5522 | +_ACEOF | ||
5523 | +if ac_fn_c_try_link "$LINENO"; then : | ||
5524 | + ac_cv_lib_EGL_eglGetError=yes | ||
5525 | +else | ||
5526 | + ac_cv_lib_EGL_eglGetError=no | ||
5527 | +fi | ||
5528 | +rm -f core conftest.err conftest.$ac_objext \ | ||
5529 | + conftest$ac_exeext conftest.$ac_ext | ||
5530 | +LIBS=$ac_check_lib_save_LIBS | ||
5531 | +fi | ||
5532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglGetError" >&5 | ||
5533 | +$as_echo "$ac_cv_lib_EGL_eglGetError" >&6; } | ||
5534 | +if test "x$ac_cv_lib_EGL_eglGetError" = xyes; then : | ||
5535 | + HAVE_EGL=yes | ||
5536 | +else | ||
5537 | + HAVE_EGL=no | ||
5538 | +fi | ||
5539 | + | ||
5540 | + if test "x$HAVE_EGL" = "xyes"; then | ||
5541 | + ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" | ||
5542 | +if test "x$ac_cv_header_EGL_egl_h" = xyes; then : | ||
5543 | + : | ||
5544 | +else | ||
5545 | + HAVE_EGL=no | ||
5546 | +fi | ||
5547 | + | ||
5548 | + | ||
5549 | + if test "x$HAVE_EGL" = "xyes"; then | ||
5550 | + : | ||
5551 | + else | ||
5552 | + as_fn_error $? "EGL is required" "$LINENO" 5 | ||
5553 | + fi | ||
5554 | + else | ||
5555 | + as_fn_error $? "EGL is required" "$LINENO" 5 | ||
5556 | + fi | ||
5557 | + | ||
5558 | + | ||
5559 | + | ||
5560 | + s_LIBS="$LIBS" | ||
5561 | + LIBS="-lEGL $LIBS" | ||
5562 | + | ||
5563 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGLESv2" >&5 | ||
5564 | +$as_echo_n "checking for glTexImage2D in -lGLESv2... " >&6; } | ||
5565 | +if ${ac_cv_lib_GLESv2_glTexImage2D+:} false; then : | ||
5566 | + $as_echo_n "(cached) " >&6 | ||
5567 | +else | ||
5568 | + ac_check_lib_save_LIBS=$LIBS | ||
5569 | +LIBS="-lGLESv2 $LIBS" | ||
5570 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5571 | +/* end confdefs.h. */ | ||
5572 | + | ||
5573 | +/* Override any GCC internal prototype to avoid an error. | ||
5574 | + Use char because int might match the return type of a GCC | ||
5575 | + builtin and then its argument prototype would still apply. */ | ||
5576 | +#ifdef __cplusplus | ||
5577 | +extern "C" | ||
5578 | +#endif | ||
5579 | +char glTexImage2D (); | ||
5580 | +int | ||
5581 | +main () | ||
5582 | +{ | ||
5583 | +return glTexImage2D (); | ||
5584 | + ; | ||
5585 | + return 0; | ||
5586 | +} | ||
5587 | +_ACEOF | ||
5588 | +if ac_fn_c_try_link "$LINENO"; then : | ||
5589 | + ac_cv_lib_GLESv2_glTexImage2D=yes | ||
5590 | +else | ||
5591 | + ac_cv_lib_GLESv2_glTexImage2D=no | ||
5592 | +fi | ||
5593 | +rm -f core conftest.err conftest.$ac_objext \ | ||
5594 | + conftest$ac_exeext conftest.$ac_ext | ||
5595 | +LIBS=$ac_check_lib_save_LIBS | ||
5596 | +fi | ||
5597 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glTexImage2D" >&5 | ||
5598 | +$as_echo "$ac_cv_lib_GLESv2_glTexImage2D" >&6; } | ||
5599 | +if test "x$ac_cv_lib_GLESv2_glTexImage2D" = xyes; then : | ||
5600 | + HAVE_GLES2=yes | ||
5601 | +else | ||
5602 | + HAVE_GLES2=no | ||
5603 | +fi | ||
5604 | + | ||
5605 | + if test "x$HAVE_GLES2" = "xyes"; then | ||
5606 | + ac_fn_c_check_header_mongrel "$LINENO" "GLES2/gl2.h" "ac_cv_header_GLES2_gl2_h" "$ac_includes_default" | ||
5607 | +if test "x$ac_cv_header_GLES2_gl2_h" = xyes; then : | ||
5608 | + : | ||
5609 | +else | ||
5610 | + HAVE_GLES2=no | ||
5611 | +fi | ||
5612 | + | ||
5613 | + | ||
5614 | + if test "x$HAVE_GLES2" = "xyes"; then | ||
5615 | + : | ||
5616 | + else | ||
5617 | + as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 | ||
5618 | + fi | ||
5619 | + else | ||
5620 | + as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 | ||
5621 | + fi | ||
5622 | + | ||
5623 | + | ||
5624 | + | ||
5625 | + LIBS="$s_LIBS" | ||
5626 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
5627 | + GL_BACKEND=x11ES2 | ||
5628 | + GL_TYPE=gles | ||
5629 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX" | ||
5630 | + else | ||
5631 | + #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
5632 | + for ac_header in GL/gl.h | ||
5633 | do : | ||
5634 | ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" | ||
5635 | if test "x$ac_cv_header_GL_gl_h" = xyes; then : | ||
5636 | @@ -22627,7 +22835,7 @@ fi | ||
5637 | |||
5638 | done | ||
5639 | |||
5640 | - if test "x$HAVE_GL" = "xyes"; then | ||
5641 | + if test "x$HAVE_GL" = "xyes"; then | ||
5642 | |||
5643 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGL" >&5 | ||
5644 | $as_echo_n "checking for glTexImage2D in -lGL... " >&6; } | ||
5645 | @@ -22817,33 +23025,28 @@ fi | ||
5646 | |||
5647 | |||
5648 | |||
5649 | - GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
5650 | - GL_BACKEND=x11 | ||
5651 | - GL_TYPE=gl | ||
5652 | - else | ||
5653 | - for ac_header in EGL/egl.h | ||
5654 | -do : | ||
5655 | - ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" | ||
5656 | -if test "x$ac_cv_header_EGL_egl_h" = xyes; then : | ||
5657 | - cat >>confdefs.h <<_ACEOF | ||
5658 | -#define HAVE_EGL_EGL_H 1 | ||
5659 | -_ACEOF | ||
5660 | - HAVE_EGL=yes | ||
5661 | -else | ||
5662 | - HAVE_EGL=no | ||
5663 | -fi | ||
5664 | - | ||
5665 | -done | ||
5666 | - | ||
5667 | - if test "x$HAVE_EGL" = "xyes"; then | ||
5668 | + GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
5669 | + GL_BACKEND=x11 | ||
5670 | + GL_TYPE=gl | ||
5671 | + else | ||
5672 | + as_fn_error $? "GL or EGL is required, consider installing libgl1-mesa-dev" "$LINENO" 5 | ||
5673 | + fi | ||
5674 | + fi | ||
5675 | + fi | ||
5676 | + CPPFLAGS="$save_CPPFLAGS" | ||
5677 | + LIBS="$save_LIBS" | ||
5678 | + ;; | ||
5679 | + *-darwin*) | ||
5680 | + save_CPPFLAGS="$CPPFLAGS" | ||
5681 | + save_LIBS="$LIBS" | ||
5682 | |||
5683 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -lEGL" >&5 | ||
5684 | -$as_echo_n "checking for eglGetError in -lEGL... " >&6; } | ||
5685 | -if ${ac_cv_lib_EGL_eglGetError+:} false; then : | ||
5686 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lGLEW" >&5 | ||
5687 | +$as_echo_n "checking for glewInit in -lGLEW... " >&6; } | ||
5688 | +if ${ac_cv_lib_GLEW_glewInit+:} false; then : | ||
5689 | $as_echo_n "(cached) " >&6 | ||
5690 | else | ||
5691 | ac_check_lib_save_LIBS=$LIBS | ||
5692 | -LIBS="-lEGL $LIBS" | ||
5693 | +LIBS="-lGLEW $LIBS" | ||
5694 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5695 | /* end confdefs.h. */ | ||
5696 | |||
5697 | @@ -22853,169 +23056,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5698 | #ifdef __cplusplus | ||
5699 | extern "C" | ||
5700 | #endif | ||
5701 | -char eglGetError (); | ||
5702 | +char glewInit (); | ||
5703 | int | ||
5704 | main () | ||
5705 | { | ||
5706 | -return eglGetError (); | ||
5707 | +return glewInit (); | ||
5708 | ; | ||
5709 | return 0; | ||
5710 | } | ||
5711 | _ACEOF | ||
5712 | if ac_fn_c_try_link "$LINENO"; then : | ||
5713 | - ac_cv_lib_EGL_eglGetError=yes | ||
5714 | + ac_cv_lib_GLEW_glewInit=yes | ||
5715 | else | ||
5716 | - ac_cv_lib_EGL_eglGetError=no | ||
5717 | + ac_cv_lib_GLEW_glewInit=no | ||
5718 | fi | ||
5719 | rm -f core conftest.err conftest.$ac_objext \ | ||
5720 | conftest$ac_exeext conftest.$ac_ext | ||
5721 | LIBS=$ac_check_lib_save_LIBS | ||
5722 | fi | ||
5723 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglGetError" >&5 | ||
5724 | -$as_echo "$ac_cv_lib_EGL_eglGetError" >&6; } | ||
5725 | -if test "x$ac_cv_lib_EGL_eglGetError" = xyes; then : | ||
5726 | - HAVE_EGL=yes | ||
5727 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLEW_glewInit" >&5 | ||
5728 | +$as_echo "$ac_cv_lib_GLEW_glewInit" >&6; } | ||
5729 | +if test "x$ac_cv_lib_GLEW_glewInit" = xyes; then : | ||
5730 | + HAVE_GLEW=yes | ||
5731 | else | ||
5732 | - HAVE_EGL=no | ||
5733 | -fi | ||
5734 | - | ||
5735 | - if test "x$HAVE_EGL" = "xyes"; then | ||
5736 | - ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" | ||
5737 | -if test "x$ac_cv_header_EGL_egl_h" = xyes; then : | ||
5738 | - : | ||
5739 | -else | ||
5740 | - HAVE_EGL=no | ||
5741 | -fi | ||
5742 | - | ||
5743 | - | ||
5744 | - if test "x$HAVE_EGL" = "xyes"; then | ||
5745 | - : | ||
5746 | - else | ||
5747 | - as_fn_error $? "EGL is required" "$LINENO" 5 | ||
5748 | - fi | ||
5749 | - else | ||
5750 | - as_fn_error $? "EGL is required" "$LINENO" 5 | ||
5751 | - fi | ||
5752 | - | ||
5753 | - | ||
5754 | - | ||
5755 | - | ||
5756 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGLESv2" >&5 | ||
5757 | -$as_echo_n "checking for glTexImage2D in -lGLESv2... " >&6; } | ||
5758 | -if ${ac_cv_lib_GLESv2_glTexImage2D+:} false; then : | ||
5759 | - $as_echo_n "(cached) " >&6 | ||
5760 | -else | ||
5761 | - ac_check_lib_save_LIBS=$LIBS | ||
5762 | -LIBS="-lGLESv2 $LIBS" | ||
5763 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5764 | -/* end confdefs.h. */ | ||
5765 | - | ||
5766 | -/* Override any GCC internal prototype to avoid an error. | ||
5767 | - Use char because int might match the return type of a GCC | ||
5768 | - builtin and then its argument prototype would still apply. */ | ||
5769 | -#ifdef __cplusplus | ||
5770 | -extern "C" | ||
5771 | -#endif | ||
5772 | -char glTexImage2D (); | ||
5773 | -int | ||
5774 | -main () | ||
5775 | -{ | ||
5776 | -return glTexImage2D (); | ||
5777 | - ; | ||
5778 | - return 0; | ||
5779 | -} | ||
5780 | -_ACEOF | ||
5781 | -if ac_fn_c_try_link "$LINENO"; then : | ||
5782 | - ac_cv_lib_GLESv2_glTexImage2D=yes | ||
5783 | -else | ||
5784 | - ac_cv_lib_GLESv2_glTexImage2D=no | ||
5785 | -fi | ||
5786 | -rm -f core conftest.err conftest.$ac_objext \ | ||
5787 | - conftest$ac_exeext conftest.$ac_ext | ||
5788 | -LIBS=$ac_check_lib_save_LIBS | ||
5789 | -fi | ||
5790 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glTexImage2D" >&5 | ||
5791 | -$as_echo "$ac_cv_lib_GLESv2_glTexImage2D" >&6; } | ||
5792 | -if test "x$ac_cv_lib_GLESv2_glTexImage2D" = xyes; then : | ||
5793 | - HAVE_GLES2=yes | ||
5794 | -else | ||
5795 | - HAVE_GLES2=no | ||
5796 | -fi | ||
5797 | - | ||
5798 | - if test "x$HAVE_GLES2" = "xyes"; then | ||
5799 | - ac_fn_c_check_header_mongrel "$LINENO" "GLES2/gl2.h" "ac_cv_header_GLES2_gl2_h" "$ac_includes_default" | ||
5800 | -if test "x$ac_cv_header_GLES2_gl2_h" = xyes; then : | ||
5801 | - : | ||
5802 | -else | ||
5803 | - HAVE_GLES2=no | ||
5804 | -fi | ||
5805 | - | ||
5806 | - | ||
5807 | - if test "x$HAVE_GLES2" = "xyes"; then | ||
5808 | - : | ||
5809 | - else | ||
5810 | - as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 | ||
5811 | - fi | ||
5812 | - else | ||
5813 | - as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 | ||
5814 | - fi | ||
5815 | - | ||
5816 | - | ||
5817 | - | ||
5818 | - GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" | ||
5819 | - GL_BACKEND=x11ES2 | ||
5820 | - GL_TYPE=gles | ||
5821 | - else | ||
5822 | - as_fn_error $? "GL or EGL is required, consider installing libgl1-mesa-dev" "$LINENO" 5 | ||
5823 | - fi | ||
5824 | - fi | ||
5825 | - CPPFLAGS="$save_CPPFLAGS" | ||
5826 | - LIBS="$save_LIBS" | ||
5827 | - ;; | ||
5828 | - *-darwin*) | ||
5829 | - save_CPPFLAGS="$CPPFLAGS" | ||
5830 | - save_LIBS="$LIBS" | ||
5831 | - | ||
5832 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lGLEW" >&5 | ||
5833 | -$as_echo_n "checking for glewInit in -lGLEW... " >&6; } | ||
5834 | -if ${ac_cv_lib_GLEW_glewInit+:} false; then : | ||
5835 | - $as_echo_n "(cached) " >&6 | ||
5836 | -else | ||
5837 | - ac_check_lib_save_LIBS=$LIBS | ||
5838 | -LIBS="-lGLEW $LIBS" | ||
5839 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5840 | -/* end confdefs.h. */ | ||
5841 | - | ||
5842 | -/* Override any GCC internal prototype to avoid an error. | ||
5843 | - Use char because int might match the return type of a GCC | ||
5844 | - builtin and then its argument prototype would still apply. */ | ||
5845 | -#ifdef __cplusplus | ||
5846 | -extern "C" | ||
5847 | -#endif | ||
5848 | -char glewInit (); | ||
5849 | -int | ||
5850 | -main () | ||
5851 | -{ | ||
5852 | -return glewInit (); | ||
5853 | - ; | ||
5854 | - return 0; | ||
5855 | -} | ||
5856 | -_ACEOF | ||
5857 | -if ac_fn_c_try_link "$LINENO"; then : | ||
5858 | - ac_cv_lib_GLEW_glewInit=yes | ||
5859 | -else | ||
5860 | - ac_cv_lib_GLEW_glewInit=no | ||
5861 | -fi | ||
5862 | -rm -f core conftest.err conftest.$ac_objext \ | ||
5863 | - conftest$ac_exeext conftest.$ac_ext | ||
5864 | -LIBS=$ac_check_lib_save_LIBS | ||
5865 | -fi | ||
5866 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLEW_glewInit" >&5 | ||
5867 | -$as_echo "$ac_cv_lib_GLEW_glewInit" >&6; } | ||
5868 | -if test "x$ac_cv_lib_GLEW_glewInit" = xyes; then : | ||
5869 | - HAVE_GLEW=yes | ||
5870 | -else | ||
5871 | - HAVE_GLEW=no | ||
5872 | + HAVE_GLEW=no | ||
5873 | fi | ||
5874 | |||
5875 | if test "x$HAVE_GLEW" = "xyes"; then | ||
5876 | @@ -23271,6 +23335,14 @@ else | ||
5877 | GL_BACKEND_X11ES2_FALSE= | ||
5878 | fi | ||
5879 | |||
5880 | + if test "x$GL_BACKEND" = "xfbES2"; then | ||
5881 | + GL_BACKEND_FBES2_TRUE= | ||
5882 | + GL_BACKEND_FBES2_FALSE='#' | ||
5883 | +else | ||
5884 | + GL_BACKEND_FBES2_TRUE='#' | ||
5885 | + GL_BACKEND_FBES2_FALSE= | ||
5886 | +fi | ||
5887 | + | ||
5888 | if test "x$GL_BACKEND" = "xcocoa"; then | ||
5889 | GL_BACKEND_COCOA_TRUE= | ||
5890 | GL_BACKEND_COCOA_FALSE='#' | ||
5891 | @@ -23855,6 +23927,40 @@ GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMI | ||
5892 | |||
5893 | |||
5894 | |||
5895 | +GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" | ||
5896 | +GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" | ||
5897 | +for ac_header in EGL/eglvivante.h | ||
5898 | +do : | ||
5899 | + ac_fn_c_check_header_mongrel "$LINENO" "EGL/eglvivante.h" "ac_cv_header_EGL_eglvivante_h" "$ac_includes_default" | ||
5900 | +if test "x$ac_cv_header_EGL_eglvivante_h" = xyes; then : | ||
5901 | + cat >>confdefs.h <<_ACEOF | ||
5902 | +#define HAVE_EGL_EGLVIVANTE_H 1 | ||
5903 | +_ACEOF | ||
5904 | + HAVE_VIVANTE=yes | ||
5905 | +else | ||
5906 | + HAVE_VIVANTE=no | ||
5907 | +fi | ||
5908 | + | ||
5909 | +done | ||
5910 | + | ||
5911 | +if test "x$HAVE_VIVANTE" = "xyes"; then | ||
5912 | + if test "x$GST_FSL_CFLAGS" = "x"; then | ||
5913 | + as_fn_error $? "gstreamer-fsl is required" "$LINENO" 5 | ||
5914 | + fi | ||
5915 | + | ||
5916 | +$as_echo "#define GPU_VIVANTE 1" >>confdefs.h | ||
5917 | + | ||
5918 | +fi | ||
5919 | + if test "x$HAVE_VIVANTE" = "xyes"; then | ||
5920 | + USE_VIVANTE_TRUE= | ||
5921 | + USE_VIVANTE_FALSE='#' | ||
5922 | +else | ||
5923 | + USE_VIVANTE_TRUE='#' | ||
5924 | + USE_VIVANTE_FALSE= | ||
5925 | +fi | ||
5926 | + | ||
5927 | + | ||
5928 | + | ||
5929 | |||
5930 | |||
5931 | pkg_failed=no | ||
5932 | @@ -23996,8 +24102,6 @@ else | ||
5933 | HAVE_JPEG="no" | ||
5934 | fi | ||
5935 | |||
5936 | -JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
5937 | -LIBS="$OLD_LIBS" | ||
5938 | if test x$HAVE_JPEG != xyes; then | ||
5939 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_set_defaults in -ljpeg" >&5 | ||
5940 | $as_echo_n "checking for jpeg_set_defaults in -ljpeg... " >&6; } | ||
5941 | @@ -24041,10 +24145,15 @@ else | ||
5942 | HAVE_JPEG="no" | ||
5943 | fi | ||
5944 | |||
5945 | - JPEG_LIBS="-ljpeg" | ||
5946 | + if test x$HAVE_JPEG = xyes; then | ||
5947 | + JPEG_LIBS="-ljpeg" | ||
5948 | |||
5949 | $as_echo "#define HAVE_JPEG 1 " >>confdefs.h | ||
5950 | |||
5951 | + fi | ||
5952 | +else | ||
5953 | + JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
5954 | + LIBS="$OLD_LIBS" | ||
5955 | fi | ||
5956 | |||
5957 | |||
5958 | @@ -25115,7 +25224,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5959 | $as_echo "$flag_ok" >&6; } | ||
5960 | |||
5961 | |||
5962 | - if test "x$GST_GIT" != "xno" | ||
5963 | + if test "x$FATAL_WARNINGS" != "xno" | ||
5964 | then | ||
5965 | |||
5966 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 | ||
5967 | @@ -25192,11 +25301,406 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5968 | 'no%E_LOOP_NOT_ENTERED_AT_TOP' | ||
5969 | do | ||
5970 | |||
5971 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all,$f" >&5 | ||
5972 | -$as_echo_n "checking to see if compiler understands -errwarn=%all,$f... " >&6; } | ||
5973 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all,$f" >&5 | ||
5974 | +$as_echo_n "checking to see if compiler understands -errwarn=%all,$f... " >&6; } | ||
5975 | + | ||
5976 | + save_CFLAGS="$CFLAGS" | ||
5977 | + CFLAGS="$CFLAGS -errwarn=%all,$f" | ||
5978 | + | ||
5979 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5980 | +/* end confdefs.h. */ | ||
5981 | + | ||
5982 | +int | ||
5983 | +main () | ||
5984 | +{ | ||
5985 | + | ||
5986 | + ; | ||
5987 | + return 0; | ||
5988 | +} | ||
5989 | +_ACEOF | ||
5990 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5991 | + flag_ok=yes | ||
5992 | +else | ||
5993 | + flag_ok=no | ||
5994 | +fi | ||
5995 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5996 | + CFLAGS="$save_CFLAGS" | ||
5997 | + | ||
5998 | + if test "X$flag_ok" = Xyes ; then | ||
5999 | + | ||
6000 | + ERROR_CFLAGS="$ERROR_CFLAGS,$f" | ||
6001 | + | ||
6002 | + true | ||
6003 | + else | ||
6004 | + | ||
6005 | + true | ||
6006 | + fi | ||
6007 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6008 | +$as_echo "$flag_ok" >&6; } | ||
6009 | + | ||
6010 | + done | ||
6011 | + | ||
6012 | + true | ||
6013 | + else | ||
6014 | + | ||
6015 | + true | ||
6016 | + fi | ||
6017 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6018 | +$as_echo "$flag_ok" >&6; } | ||
6019 | + | ||
6020 | + else | ||
6021 | + if test -n "$PKG_CONFIG" && \ | ||
6022 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 | ||
6023 | + ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 | ||
6024 | + ac_status=$? | ||
6025 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
6026 | + test $ac_status = 0; }; then | ||
6027 | + | ||
6028 | + | ||
6029 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fno-strict-aliasing" >&5 | ||
6030 | +$as_echo_n "checking to see if compiler understands -fno-strict-aliasing... " >&6; } | ||
6031 | + | ||
6032 | + save_CFLAGS="$CFLAGS" | ||
6033 | + CFLAGS="$CFLAGS -fno-strict-aliasing" | ||
6034 | + | ||
6035 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6036 | +/* end confdefs.h. */ | ||
6037 | + | ||
6038 | +int | ||
6039 | +main () | ||
6040 | +{ | ||
6041 | + | ||
6042 | + ; | ||
6043 | + return 0; | ||
6044 | +} | ||
6045 | +_ACEOF | ||
6046 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
6047 | + flag_ok=yes | ||
6048 | +else | ||
6049 | + flag_ok=no | ||
6050 | +fi | ||
6051 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6052 | + CFLAGS="$save_CFLAGS" | ||
6053 | + | ||
6054 | + if test "X$flag_ok" = Xyes ; then | ||
6055 | + ERROR_CFLAGS="$ERROR_CFLAGS -fno-strict-aliasing" | ||
6056 | + true | ||
6057 | + else | ||
6058 | + | ||
6059 | + true | ||
6060 | + fi | ||
6061 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6062 | +$as_echo "$flag_ok" >&6; } | ||
6063 | + | ||
6064 | + | ||
6065 | +fi | ||
6066 | + fi | ||
6067 | + fi | ||
6068 | + | ||
6069 | + if test "x" != "x" | ||
6070 | + then | ||
6071 | + UNSUPPORTED="" | ||
6072 | + list="" | ||
6073 | + for each in $list | ||
6074 | + do | ||
6075 | + | ||
6076 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands $each" >&5 | ||
6077 | +$as_echo_n "checking to see if compiler understands $each... " >&6; } | ||
6078 | + | ||
6079 | + save_CFLAGS="$CFLAGS" | ||
6080 | + CFLAGS="$CFLAGS $each" | ||
6081 | + | ||
6082 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6083 | +/* end confdefs.h. */ | ||
6084 | + | ||
6085 | +int | ||
6086 | +main () | ||
6087 | +{ | ||
6088 | + | ||
6089 | + ; | ||
6090 | + return 0; | ||
6091 | +} | ||
6092 | +_ACEOF | ||
6093 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
6094 | + flag_ok=yes | ||
6095 | +else | ||
6096 | + flag_ok=no | ||
6097 | +fi | ||
6098 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6099 | + CFLAGS="$save_CFLAGS" | ||
6100 | + | ||
6101 | + if test "X$flag_ok" = Xyes ; then | ||
6102 | + WARNING_CFLAGS="$WARNING_CFLAGS $each" | ||
6103 | + true | ||
6104 | + else | ||
6105 | + UNSUPPORTED="$UNSUPPORTED $each" | ||
6106 | + true | ||
6107 | + fi | ||
6108 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6109 | +$as_echo "$flag_ok" >&6; } | ||
6110 | + | ||
6111 | + done | ||
6112 | + if test "X$UNSUPPORTED" != X ; then | ||
6113 | + { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 | ||
6114 | +$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} | ||
6115 | + fi | ||
6116 | + fi | ||
6117 | + | ||
6118 | + | ||
6119 | + | ||
6120 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CFLAGS to $WARNING_CFLAGS" >&5 | ||
6121 | +$as_echo "$as_me: set WARNING_CFLAGS to $WARNING_CFLAGS" >&6;} | ||
6122 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CFLAGS to $ERROR_CFLAGS" >&5 | ||
6123 | +$as_echo "$as_me: set ERROR_CFLAGS to $ERROR_CFLAGS" >&6;} | ||
6124 | + | ||
6125 | + | ||
6126 | + | ||
6127 | + | ||
6128 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands " >&5 | ||
6129 | +$as_echo_n "checking to see if c++ compiler understands ... " >&6; } | ||
6130 | + | ||
6131 | + save_CPPFLAGS="$CPPFLAGS" | ||
6132 | + CPPFLAGS="$CPPFLAGS " | ||
6133 | + | ||
6134 | + ac_ext=cpp | ||
6135 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6136 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6137 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6138 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6139 | + | ||
6140 | + | ||
6141 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6142 | +/* end confdefs.h. */ | ||
6143 | + | ||
6144 | +int | ||
6145 | +main () | ||
6146 | +{ | ||
6147 | + | ||
6148 | + ; | ||
6149 | + return 0; | ||
6150 | +} | ||
6151 | +_ACEOF | ||
6152 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6153 | + flag_ok=yes | ||
6154 | +else | ||
6155 | + flag_ok=no | ||
6156 | +fi | ||
6157 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6158 | + CPPFLAGS="$save_CPPFLAGS" | ||
6159 | + | ||
6160 | + if test "X$flag_ok" = Xyes ; then | ||
6161 | + | ||
6162 | + true | ||
6163 | + else | ||
6164 | + | ||
6165 | + true | ||
6166 | + fi | ||
6167 | + | ||
6168 | + ac_ext=c | ||
6169 | +ac_cpp='$CPP $CPPFLAGS' | ||
6170 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6171 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6172 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6173 | + | ||
6174 | + | ||
6175 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6176 | +$as_echo "$flag_ok" >&6; } | ||
6177 | + | ||
6178 | + | ||
6179 | + | ||
6180 | + | ||
6181 | + | ||
6182 | + ERROR_CXXFLAGS="" | ||
6183 | + WARNING_CXXFLAGS="" | ||
6184 | + | ||
6185 | + | ||
6186 | + | ||
6187 | + | ||
6188 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wall" >&5 | ||
6189 | +$as_echo_n "checking to see if c++ compiler understands -Wall... " >&6; } | ||
6190 | + | ||
6191 | + save_CPPFLAGS="$CPPFLAGS" | ||
6192 | + CPPFLAGS="$CPPFLAGS -Wall" | ||
6193 | + | ||
6194 | + ac_ext=cpp | ||
6195 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6196 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6197 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6198 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6199 | + | ||
6200 | + | ||
6201 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6202 | +/* end confdefs.h. */ | ||
6203 | + | ||
6204 | +int | ||
6205 | +main () | ||
6206 | +{ | ||
6207 | + | ||
6208 | + ; | ||
6209 | + return 0; | ||
6210 | +} | ||
6211 | +_ACEOF | ||
6212 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6213 | + flag_ok=yes | ||
6214 | +else | ||
6215 | + flag_ok=no | ||
6216 | +fi | ||
6217 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6218 | + CPPFLAGS="$save_CPPFLAGS" | ||
6219 | + | ||
6220 | + if test "X$flag_ok" = Xyes ; then | ||
6221 | + WARNING_CXXFLAGS="$WARNING_CXXFLAGS -Wall" | ||
6222 | + true | ||
6223 | + else | ||
6224 | + | ||
6225 | + true | ||
6226 | + fi | ||
6227 | + | ||
6228 | + ac_ext=c | ||
6229 | +ac_cpp='$CPP $CPPFLAGS' | ||
6230 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6231 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6232 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6233 | + | ||
6234 | + | ||
6235 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6236 | +$as_echo "$flag_ok" >&6; } | ||
6237 | + | ||
6238 | + | ||
6239 | + if test "x$FATAL_WARNINGS" != "xno" | ||
6240 | + then | ||
6241 | + | ||
6242 | + | ||
6243 | + | ||
6244 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Werror" >&5 | ||
6245 | +$as_echo_n "checking to see if c++ compiler understands -Werror... " >&6; } | ||
6246 | + | ||
6247 | + save_CPPFLAGS="$CPPFLAGS" | ||
6248 | + CPPFLAGS="$CPPFLAGS -Werror" | ||
6249 | + | ||
6250 | + ac_ext=cpp | ||
6251 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6252 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6253 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6254 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6255 | + | ||
6256 | + | ||
6257 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6258 | +/* end confdefs.h. */ | ||
6259 | + | ||
6260 | +int | ||
6261 | +main () | ||
6262 | +{ | ||
6263 | + | ||
6264 | + ; | ||
6265 | + return 0; | ||
6266 | +} | ||
6267 | +_ACEOF | ||
6268 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6269 | + flag_ok=yes | ||
6270 | +else | ||
6271 | + flag_ok=no | ||
6272 | +fi | ||
6273 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6274 | + CPPFLAGS="$save_CPPFLAGS" | ||
6275 | + | ||
6276 | + if test "X$flag_ok" = Xyes ; then | ||
6277 | + ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror" | ||
6278 | + true | ||
6279 | + else | ||
6280 | + | ||
6281 | + true | ||
6282 | + fi | ||
6283 | + | ||
6284 | + ac_ext=c | ||
6285 | +ac_cpp='$CPP $CPPFLAGS' | ||
6286 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6287 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6288 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6289 | + | ||
6290 | + | ||
6291 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6292 | +$as_echo "$flag_ok" >&6; } | ||
6293 | + | ||
6294 | + | ||
6295 | + if test "x$ERROR_CXXFLAGS" != "x" | ||
6296 | + then | ||
6297 | + | ||
6298 | + | ||
6299 | + | ||
6300 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wno-non-virtual-dtor" >&5 | ||
6301 | +$as_echo_n "checking to see if c++ compiler understands -Wno-non-virtual-dtor... " >&6; } | ||
6302 | + | ||
6303 | + save_CPPFLAGS="$CPPFLAGS" | ||
6304 | + CPPFLAGS="$CPPFLAGS -Wno-non-virtual-dtor" | ||
6305 | + | ||
6306 | + ac_ext=cpp | ||
6307 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6308 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6309 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6310 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6311 | + | ||
6312 | + | ||
6313 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6314 | +/* end confdefs.h. */ | ||
6315 | + | ||
6316 | +int | ||
6317 | +main () | ||
6318 | +{ | ||
6319 | + | ||
6320 | + ; | ||
6321 | + return 0; | ||
6322 | +} | ||
6323 | +_ACEOF | ||
6324 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6325 | + flag_ok=yes | ||
6326 | +else | ||
6327 | + flag_ok=no | ||
6328 | +fi | ||
6329 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6330 | + CPPFLAGS="$save_CPPFLAGS" | ||
6331 | + | ||
6332 | + if test "X$flag_ok" = Xyes ; then | ||
6333 | + ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wno-non-virtual-dtor" | ||
6334 | + true | ||
6335 | + else | ||
6336 | + | ||
6337 | + true | ||
6338 | + fi | ||
6339 | + | ||
6340 | + ac_ext=c | ||
6341 | +ac_cpp='$CPP $CPPFLAGS' | ||
6342 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6343 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6344 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6345 | + | ||
6346 | + | ||
6347 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6348 | +$as_echo "$flag_ok" >&6; } | ||
6349 | + | ||
6350 | + | ||
6351 | + if test -n "$PKG_CONFIG" && \ | ||
6352 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 | ||
6353 | + ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 | ||
6354 | + ac_status=$? | ||
6355 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
6356 | + test $ac_status = 0; }; then | ||
6357 | + | ||
6358 | + | ||
6359 | + | ||
6360 | + | ||
6361 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -fno-strict-aliasing" >&5 | ||
6362 | +$as_echo_n "checking to see if c++ compiler understands -fno-strict-aliasing... " >&6; } | ||
6363 | + | ||
6364 | + save_CPPFLAGS="$CPPFLAGS" | ||
6365 | + CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" | ||
6366 | + | ||
6367 | + ac_ext=cpp | ||
6368 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6369 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6370 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6371 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6372 | |||
6373 | - save_CFLAGS="$CFLAGS" | ||
6374 | - CFLAGS="$CFLAGS -errwarn=%all,$f" | ||
6375 | |||
6376 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6377 | /* end confdefs.h. */ | ||
6378 | @@ -25209,50 +25713,50 @@ main () | ||
6379 | return 0; | ||
6380 | } | ||
6381 | _ACEOF | ||
6382 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6383 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6384 | flag_ok=yes | ||
6385 | else | ||
6386 | flag_ok=no | ||
6387 | fi | ||
6388 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6389 | - CFLAGS="$save_CFLAGS" | ||
6390 | + CPPFLAGS="$save_CPPFLAGS" | ||
6391 | |||
6392 | if test "X$flag_ok" = Xyes ; then | ||
6393 | - | ||
6394 | - ERROR_CFLAGS="$ERROR_CFLAGS,$f" | ||
6395 | - | ||
6396 | + ERROR_CXXFLAGS="$ERROR_CXXFLAGS -fno-strict-aliasing" | ||
6397 | true | ||
6398 | else | ||
6399 | |||
6400 | true | ||
6401 | fi | ||
6402 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6403 | -$as_echo "$flag_ok" >&6; } | ||
6404 | |||
6405 | - done | ||
6406 | + ac_ext=c | ||
6407 | +ac_cpp='$CPP $CPPFLAGS' | ||
6408 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6409 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6410 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6411 | |||
6412 | - true | ||
6413 | - else | ||
6414 | |||
6415 | - true | ||
6416 | - fi | ||
6417 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6418 | $as_echo "$flag_ok" >&6; } | ||
6419 | |||
6420 | + | ||
6421 | +fi | ||
6422 | else | ||
6423 | - if test -n "$PKG_CONFIG" && \ | ||
6424 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 | ||
6425 | - ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 | ||
6426 | - ac_status=$? | ||
6427 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
6428 | - test $ac_status = 0; }; then | ||
6429 | |||
6430 | |||
6431 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fno-strict-aliasing" >&5 | ||
6432 | -$as_echo_n "checking to see if compiler understands -fno-strict-aliasing... " >&6; } | ||
6433 | |||
6434 | - save_CFLAGS="$CFLAGS" | ||
6435 | - CFLAGS="$CFLAGS -fno-strict-aliasing" | ||
6436 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all" >&5 | ||
6437 | +$as_echo_n "checking to see if c++ compiler understands -errwarn=%all... " >&6; } | ||
6438 | + | ||
6439 | + save_CPPFLAGS="$CPPFLAGS" | ||
6440 | + CPPFLAGS="$CPPFLAGS -errwarn=%all" | ||
6441 | + | ||
6442 | + ac_ext=cpp | ||
6443 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6444 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6445 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6446 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6447 | + | ||
6448 | |||
6449 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6450 | /* end confdefs.h. */ | ||
6451 | @@ -25265,41 +25769,54 @@ main () | ||
6452 | return 0; | ||
6453 | } | ||
6454 | _ACEOF | ||
6455 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6456 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6457 | flag_ok=yes | ||
6458 | else | ||
6459 | flag_ok=no | ||
6460 | fi | ||
6461 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6462 | - CFLAGS="$save_CFLAGS" | ||
6463 | + CPPFLAGS="$save_CPPFLAGS" | ||
6464 | |||
6465 | if test "X$flag_ok" = Xyes ; then | ||
6466 | - ERROR_CFLAGS="$ERROR_CFLAGS -fno-strict-aliasing" | ||
6467 | + ERROR_CXXFLAGS="$ERROR_CXXFLAGS -errwarn=%all" | ||
6468 | true | ||
6469 | else | ||
6470 | |||
6471 | true | ||
6472 | fi | ||
6473 | + | ||
6474 | + ac_ext=c | ||
6475 | +ac_cpp='$CPP $CPPFLAGS' | ||
6476 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6477 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6478 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6479 | + | ||
6480 | + | ||
6481 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6482 | $as_echo "$flag_ok" >&6; } | ||
6483 | |||
6484 | + if test "x$ERROR_CXXFLAGS" != "x"; then | ||
6485 | + for f in 'no%E_EMPTY_DECLARATION' \ | ||
6486 | + 'no%E_STATEMENT_NOT_REACHED' \ | ||
6487 | + 'no%E_ARGUEMENT_MISMATCH' \ | ||
6488 | + 'no%E_MACRO_REDEFINED' \ | ||
6489 | + 'no%E_LOOP_NOT_ENTERED_AT_TOP' | ||
6490 | + do | ||
6491 | |||
6492 | -fi | ||
6493 | - fi | ||
6494 | - fi | ||
6495 | |||
6496 | - if test "x" != "x" | ||
6497 | - then | ||
6498 | - UNSUPPORTED="" | ||
6499 | - list="" | ||
6500 | - for each in $list | ||
6501 | - do | ||
6502 | |||
6503 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands $each" >&5 | ||
6504 | -$as_echo_n "checking to see if compiler understands $each... " >&6; } | ||
6505 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all,$f" >&5 | ||
6506 | +$as_echo_n "checking to see if c++ compiler understands -errwarn=%all,$f... " >&6; } | ||
6507 | + | ||
6508 | + save_CPPFLAGS="$CPPFLAGS" | ||
6509 | + CPPFLAGS="$CPPFLAGS -errwarn=%all,$f" | ||
6510 | + | ||
6511 | + ac_ext=cpp | ||
6512 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
6513 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6514 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6515 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6516 | |||
6517 | - save_CFLAGS="$CFLAGS" | ||
6518 | - CFLAGS="$CFLAGS $each" | ||
6519 | |||
6520 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6521 | /* end confdefs.h. */ | ||
6522 | @@ -25312,46 +25829,51 @@ main () | ||
6523 | return 0; | ||
6524 | } | ||
6525 | _ACEOF | ||
6526 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6527 | +if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6528 | flag_ok=yes | ||
6529 | else | ||
6530 | flag_ok=no | ||
6531 | fi | ||
6532 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6533 | - CFLAGS="$save_CFLAGS" | ||
6534 | + CPPFLAGS="$save_CPPFLAGS" | ||
6535 | |||
6536 | if test "X$flag_ok" = Xyes ; then | ||
6537 | - WARNING_CFLAGS="$WARNING_CFLAGS $each" | ||
6538 | + ERROR_CXXFLAGS="$ERROR_CXXFLAGS | ||
6539 | true | ||
6540 | else | ||
6541 | - UNSUPPORTED="$UNSUPPORTED $each" | ||
6542 | + $f" | ||
6543 | true | ||
6544 | fi | ||
6545 | + | ||
6546 | + ac_ext=c | ||
6547 | +ac_cpp='$CPP $CPPFLAGS' | ||
6548 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6549 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6550 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6551 | + | ||
6552 | + | ||
6553 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6554 | $as_echo "$flag_ok" >&6; } | ||
6555 | |||
6556 | - done | ||
6557 | - if test "X$UNSUPPORTED" != X ; then | ||
6558 | - { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 | ||
6559 | -$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} | ||
6560 | + done | ||
6561 | + fi | ||
6562 | fi | ||
6563 | fi | ||
6564 | |||
6565 | - | ||
6566 | - | ||
6567 | - { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CFLAGS to $WARNING_CFLAGS" >&5 | ||
6568 | -$as_echo "$as_me: set WARNING_CFLAGS to $WARNING_CFLAGS" >&6;} | ||
6569 | - { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CFLAGS to $ERROR_CFLAGS" >&5 | ||
6570 | -$as_echo "$as_me: set ERROR_CFLAGS to $ERROR_CFLAGS" >&6;} | ||
6571 | - | ||
6572 | + if test "x" != "x" | ||
6573 | + then | ||
6574 | + UNSUPPORTED="" | ||
6575 | + list="" | ||
6576 | + for each in $list | ||
6577 | + do | ||
6578 | |||
6579 | |||
6580 | |||
6581 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands " >&5 | ||
6582 | -$as_echo_n "checking to see if c++ compiler understands ... " >&6; } | ||
6583 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands $each" >&5 | ||
6584 | +$as_echo_n "checking to see if c++ compiler understands $each... " >&6; } | ||
6585 | |||
6586 | save_CPPFLAGS="$CPPFLAGS" | ||
6587 | - CPPFLAGS="$CPPFLAGS " | ||
6588 | + CPPFLAGS="$CPPFLAGS $each" | ||
6589 | |||
6590 | ac_ext=cpp | ||
6591 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
6592 | @@ -25380,10 +25902,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6593 | CPPFLAGS="$save_CPPFLAGS" | ||
6594 | |||
6595 | if test "X$flag_ok" = Xyes ; then | ||
6596 | - | ||
6597 | + WARNING_CXXFLAGS="$WARNING_CXXFLAGS $each" | ||
6598 | true | ||
6599 | else | ||
6600 | - | ||
6601 | + UNSUPPORTED="$UNSUPPORTED $each" | ||
6602 | true | ||
6603 | fi | ||
6604 | |||
6605 | @@ -25397,27 +25919,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6606 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6607 | $as_echo "$flag_ok" >&6; } | ||
6608 | |||
6609 | + done | ||
6610 | + if test "X$UNSUPPORTED" != X ; then | ||
6611 | + { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 | ||
6612 | +$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} | ||
6613 | + fi | ||
6614 | + fi | ||
6615 | |||
6616 | |||
6617 | |||
6618 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&5 | ||
6619 | +$as_echo "$as_me: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&6;} | ||
6620 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&5 | ||
6621 | +$as_echo "$as_me: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&6;} | ||
6622 | |||
6623 | - ERROR_CXXFLAGS="" | ||
6624 | - WARNING_CXXFLAGS="" | ||
6625 | |||
6626 | |||
6627 | |||
6628 | |||
6629 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wall" >&5 | ||
6630 | -$as_echo_n "checking to see if c++ compiler understands -Wall... " >&6; } | ||
6631 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands " >&5 | ||
6632 | +$as_echo_n "checking to see if Objective C compiler understands ... " >&6; } | ||
6633 | |||
6634 | save_CPPFLAGS="$CPPFLAGS" | ||
6635 | - CPPFLAGS="$CPPFLAGS -Wall" | ||
6636 | + CPPFLAGS="$CPPFLAGS " | ||
6637 | |||
6638 | - ac_ext=cpp | ||
6639 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6640 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6641 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6642 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6643 | + ac_ext=m | ||
6644 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6645 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6646 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6647 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6648 | |||
6649 | |||
6650 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6651 | @@ -25431,7 +25961,7 @@ main () | ||
6652 | return 0; | ||
6653 | } | ||
6654 | _ACEOF | ||
6655 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6656 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6657 | flag_ok=yes | ||
6658 | else | ||
6659 | flag_ok=no | ||
6660 | @@ -25440,7 +25970,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6661 | CPPFLAGS="$save_CPPFLAGS" | ||
6662 | |||
6663 | if test "X$flag_ok" = Xyes ; then | ||
6664 | - WARNING_CXXFLAGS="$WARNING_CXXFLAGS -Wall" | ||
6665 | + | ||
6666 | true | ||
6667 | else | ||
6668 | |||
6669 | @@ -25458,22 +25988,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6670 | $as_echo "$flag_ok" >&6; } | ||
6671 | |||
6672 | |||
6673 | - if test "x$GST_GIT" != "xno" | ||
6674 | - then | ||
6675 | |||
6676 | |||
6677 | |||
6678 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Werror" >&5 | ||
6679 | -$as_echo_n "checking to see if c++ compiler understands -Werror... " >&6; } | ||
6680 | + ERROR_OBJCFLAGS="" | ||
6681 | + WARNING_OBJCFLAGS="" | ||
6682 | + | ||
6683 | + | ||
6684 | + | ||
6685 | + | ||
6686 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -Wall" >&5 | ||
6687 | +$as_echo_n "checking to see if Objective C compiler understands -Wall... " >&6; } | ||
6688 | |||
6689 | save_CPPFLAGS="$CPPFLAGS" | ||
6690 | - CPPFLAGS="$CPPFLAGS -Werror" | ||
6691 | + CPPFLAGS="$CPPFLAGS -Wall" | ||
6692 | |||
6693 | - ac_ext=cpp | ||
6694 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6695 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6696 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6697 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6698 | + ac_ext=m | ||
6699 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6700 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6701 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6702 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6703 | |||
6704 | |||
6705 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6706 | @@ -25487,7 +26021,7 @@ main () | ||
6707 | return 0; | ||
6708 | } | ||
6709 | _ACEOF | ||
6710 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6711 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6712 | flag_ok=yes | ||
6713 | else | ||
6714 | flag_ok=no | ||
6715 | @@ -25496,7 +26030,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6716 | CPPFLAGS="$save_CPPFLAGS" | ||
6717 | |||
6718 | if test "X$flag_ok" = Xyes ; then | ||
6719 | - ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror" | ||
6720 | + WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall" | ||
6721 | true | ||
6722 | else | ||
6723 | |||
6724 | @@ -25514,22 +26048,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6725 | $as_echo "$flag_ok" >&6; } | ||
6726 | |||
6727 | |||
6728 | - if test "x$ERROR_CXXFLAGS" != "x" | ||
6729 | - then | ||
6730 | + if test "x$FATAL_WARNINGS" != "xno" | ||
6731 | + then | ||
6732 | |||
6733 | |||
6734 | |||
6735 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wno-non-virtual-dtor" >&5 | ||
6736 | -$as_echo_n "checking to see if c++ compiler understands -Wno-non-virtual-dtor... " >&6; } | ||
6737 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -Werror" >&5 | ||
6738 | +$as_echo_n "checking to see if Objective C compiler understands -Werror... " >&6; } | ||
6739 | |||
6740 | save_CPPFLAGS="$CPPFLAGS" | ||
6741 | - CPPFLAGS="$CPPFLAGS -Wno-non-virtual-dtor" | ||
6742 | + CPPFLAGS="$CPPFLAGS -Werror" | ||
6743 | |||
6744 | - ac_ext=cpp | ||
6745 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6746 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6747 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6748 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6749 | + ac_ext=m | ||
6750 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6751 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6752 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6753 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6754 | |||
6755 | |||
6756 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6757 | @@ -25543,7 +26077,7 @@ main () | ||
6758 | return 0; | ||
6759 | } | ||
6760 | _ACEOF | ||
6761 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6762 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6763 | flag_ok=yes | ||
6764 | else | ||
6765 | flag_ok=no | ||
6766 | @@ -25552,7 +26086,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6767 | CPPFLAGS="$save_CPPFLAGS" | ||
6768 | |||
6769 | if test "X$flag_ok" = Xyes ; then | ||
6770 | - ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wno-non-virtual-dtor" | ||
6771 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror" | ||
6772 | true | ||
6773 | else | ||
6774 | |||
6775 | @@ -25570,6 +26104,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6776 | $as_echo "$flag_ok" >&6; } | ||
6777 | |||
6778 | |||
6779 | + if test "x$ERROR_OBJCFLAGS" != "x" | ||
6780 | + then | ||
6781 | if test -n "$PKG_CONFIG" && \ | ||
6782 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 | ||
6783 | ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 | ||
6784 | @@ -25580,17 +26116,17 @@ $as_echo "$flag_ok" >&6; } | ||
6785 | |||
6786 | |||
6787 | |||
6788 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -fno-strict-aliasing" >&5 | ||
6789 | -$as_echo_n "checking to see if c++ compiler understands -fno-strict-aliasing... " >&6; } | ||
6790 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -fno-strict-aliasing" >&5 | ||
6791 | +$as_echo_n "checking to see if Objective C compiler understands -fno-strict-aliasing... " >&6; } | ||
6792 | |||
6793 | save_CPPFLAGS="$CPPFLAGS" | ||
6794 | CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" | ||
6795 | |||
6796 | - ac_ext=cpp | ||
6797 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6798 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6799 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6800 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6801 | + ac_ext=m | ||
6802 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6803 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6804 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6805 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6806 | |||
6807 | |||
6808 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6809 | @@ -25604,7 +26140,7 @@ main () | ||
6810 | return 0; | ||
6811 | } | ||
6812 | _ACEOF | ||
6813 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6814 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6815 | flag_ok=yes | ||
6816 | else | ||
6817 | flag_ok=no | ||
6818 | @@ -25613,7 +26149,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6819 | CPPFLAGS="$save_CPPFLAGS" | ||
6820 | |||
6821 | if test "X$flag_ok" = Xyes ; then | ||
6822 | - ERROR_CXXFLAGS="$ERROR_CXXFLAGS -fno-strict-aliasing" | ||
6823 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing" | ||
6824 | true | ||
6825 | else | ||
6826 | |||
6827 | @@ -25636,17 +26172,17 @@ fi | ||
6828 | |||
6829 | |||
6830 | |||
6831 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all" >&5 | ||
6832 | -$as_echo_n "checking to see if c++ compiler understands -errwarn=%all... " >&6; } | ||
6833 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -errwarn=%all" >&5 | ||
6834 | +$as_echo_n "checking to see if Objective C compiler understands -errwarn=%all... " >&6; } | ||
6835 | |||
6836 | save_CPPFLAGS="$CPPFLAGS" | ||
6837 | CPPFLAGS="$CPPFLAGS -errwarn=%all" | ||
6838 | |||
6839 | - ac_ext=cpp | ||
6840 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6841 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6842 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6843 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6844 | + ac_ext=m | ||
6845 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6846 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6847 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6848 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6849 | |||
6850 | |||
6851 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6852 | @@ -25660,7 +26196,7 @@ main () | ||
6853 | return 0; | ||
6854 | } | ||
6855 | _ACEOF | ||
6856 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6857 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6858 | flag_ok=yes | ||
6859 | else | ||
6860 | flag_ok=no | ||
6861 | @@ -25669,7 +26205,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6862 | CPPFLAGS="$save_CPPFLAGS" | ||
6863 | |||
6864 | if test "X$flag_ok" = Xyes ; then | ||
6865 | - ERROR_CXXFLAGS="$ERROR_CXXFLAGS -errwarn=%all" | ||
6866 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all" | ||
6867 | true | ||
6868 | else | ||
6869 | |||
6870 | @@ -25686,7 +26222,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
6871 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 | ||
6872 | $as_echo "$flag_ok" >&6; } | ||
6873 | |||
6874 | - if test "x$ERROR_CXXFLAGS" != "x"; then | ||
6875 | + if test "x$ERROR_OBJCFLAGS" != "x"; then | ||
6876 | for f in 'no%E_EMPTY_DECLARATION' \ | ||
6877 | 'no%E_STATEMENT_NOT_REACHED' \ | ||
6878 | 'no%E_ARGUEMENT_MISMATCH' \ | ||
6879 | @@ -25696,17 +26232,17 @@ $as_echo "$flag_ok" >&6; } | ||
6880 | |||
6881 | |||
6882 | |||
6883 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all,$f" >&5 | ||
6884 | -$as_echo_n "checking to see if c++ compiler understands -errwarn=%all,$f... " >&6; } | ||
6885 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -errwarn=%all,$f" >&5 | ||
6886 | +$as_echo_n "checking to see if Objective C compiler understands -errwarn=%all,$f... " >&6; } | ||
6887 | |||
6888 | save_CPPFLAGS="$CPPFLAGS" | ||
6889 | CPPFLAGS="$CPPFLAGS -errwarn=%all,$f" | ||
6890 | |||
6891 | - ac_ext=cpp | ||
6892 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6893 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6894 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6895 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6896 | + ac_ext=m | ||
6897 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6898 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6899 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6900 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6901 | |||
6902 | |||
6903 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6904 | @@ -25720,7 +26256,7 @@ main () | ||
6905 | return 0; | ||
6906 | } | ||
6907 | _ACEOF | ||
6908 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6909 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6910 | flag_ok=yes | ||
6911 | else | ||
6912 | flag_ok=no | ||
6913 | @@ -25729,7 +26265,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6914 | CPPFLAGS="$save_CPPFLAGS" | ||
6915 | |||
6916 | if test "X$flag_ok" = Xyes ; then | ||
6917 | - ERROR_CXXFLAGS="$ERROR_CXXFLAGS | ||
6918 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS | ||
6919 | true | ||
6920 | else | ||
6921 | $f" | ||
6922 | @@ -25751,26 +26287,34 @@ $as_echo "$flag_ok" >&6; } | ||
6923 | fi | ||
6924 | fi | ||
6925 | |||
6926 | - if test "x" != "x" | ||
6927 | + if test "x | ||
6928 | + -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls | ||
6929 | + -Wwrite-strings -Wold-style-definition | ||
6930 | + -Winit-self -Wmissing-include-dirs -Wno-multichar | ||
6931 | + -Wnested-externs $NO_WARNINGS" != "x" | ||
6932 | then | ||
6933 | UNSUPPORTED="" | ||
6934 | - list="" | ||
6935 | + list=" | ||
6936 | + -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls | ||
6937 | + -Wwrite-strings -Wold-style-definition | ||
6938 | + -Winit-self -Wmissing-include-dirs -Wno-multichar | ||
6939 | + -Wnested-externs $NO_WARNINGS" | ||
6940 | for each in $list | ||
6941 | do | ||
6942 | |||
6943 | |||
6944 | |||
6945 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands $each" >&5 | ||
6946 | -$as_echo_n "checking to see if c++ compiler understands $each... " >&6; } | ||
6947 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands $each" >&5 | ||
6948 | +$as_echo_n "checking to see if Objective C compiler understands $each... " >&6; } | ||
6949 | |||
6950 | save_CPPFLAGS="$CPPFLAGS" | ||
6951 | CPPFLAGS="$CPPFLAGS $each" | ||
6952 | |||
6953 | - ac_ext=cpp | ||
6954 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
6955 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6956 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6957 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
6958 | + ac_ext=m | ||
6959 | +ac_cpp='$OBJCPP $CPPFLAGS' | ||
6960 | +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
6961 | +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
6962 | +ac_compiler_gnu=$ac_cv_objc_compiler_gnu | ||
6963 | |||
6964 | |||
6965 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6966 | @@ -25784,7 +26328,7 @@ main () | ||
6967 | return 0; | ||
6968 | } | ||
6969 | _ACEOF | ||
6970 | -if ac_fn_cxx_try_compile "$LINENO"; then : | ||
6971 | +if ac_fn_objc_try_compile "$LINENO"; then : | ||
6972 | flag_ok=yes | ||
6973 | else | ||
6974 | flag_ok=no | ||
6975 | @@ -25793,7 +26337,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6976 | CPPFLAGS="$save_CPPFLAGS" | ||
6977 | |||
6978 | if test "X$flag_ok" = Xyes ; then | ||
6979 | - WARNING_CXXFLAGS="$WARNING_CXXFLAGS $each" | ||
6980 | + WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each" | ||
6981 | true | ||
6982 | else | ||
6983 | UNSUPPORTED="$UNSUPPORTED $each" | ||
6984 | @@ -25819,10 +26363,10 @@ $as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} | ||
6985 | |||
6986 | |||
6987 | |||
6988 | - { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&5 | ||
6989 | -$as_echo "$as_me: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&6;} | ||
6990 | - { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&5 | ||
6991 | -$as_echo "$as_me: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&6;} | ||
6992 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS" >&5 | ||
6993 | +$as_echo "$as_me: set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS" >&6;} | ||
6994 | + { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS" >&5 | ||
6995 | +$as_echo "$as_me: set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS" >&6;} | ||
6996 | |||
6997 | |||
6998 | |||
6999 | @@ -26253,6 +26797,8 @@ fi | ||
7000 | |||
7001 | GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7002 | GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7003 | +GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7004 | + | ||
7005 | |||
7006 | |||
7007 | |||
7008 | @@ -26261,11 +26807,13 @@ GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$ | ||
7009 | GST_PLUGINS_GL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs" | ||
7010 | |||
7011 | |||
7012 | +GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" | ||
7013 | GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" | ||
7014 | GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" | ||
7015 | |||
7016 | |||
7017 | |||
7018 | + | ||
7019 | GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" | ||
7020 | |||
7021 | |||
7022 | @@ -26414,10 +26962,6 @@ if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then | ||
7023 | as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. | ||
7024 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7025 | fi | ||
7026 | -if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then | ||
7027 | - as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. | ||
7028 | -Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7029 | -fi | ||
7030 | if test -z "${GST_GCOV_ENABLED_TRUE}" && test -z "${GST_GCOV_ENABLED_FALSE}"; then | ||
7031 | as_fn_error $? "conditional \"GST_GCOV_ENABLED\" was never defined. | ||
7032 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7033 | @@ -26523,6 +27067,10 @@ if test -z "${GL_BACKEND_X11ES2_TRUE}" && test -z "${GL_BACKEND_X11ES2_FALSE}"; | ||
7034 | as_fn_error $? "conditional \"GL_BACKEND_X11ES2\" was never defined. | ||
7035 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7036 | fi | ||
7037 | +if test -z "${GL_BACKEND_FBES2_TRUE}" && test -z "${GL_BACKEND_FBES2_FALSE}"; then | ||
7038 | + as_fn_error $? "conditional \"GL_BACKEND_FBES2\" was never defined. | ||
7039 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7040 | +fi | ||
7041 | if test -z "${GL_BACKEND_COCOA_TRUE}" && test -z "${GL_BACKEND_COCOA_FALSE}"; then | ||
7042 | as_fn_error $? "conditional \"GL_BACKEND_COCOA\" was never defined. | ||
7043 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7044 | @@ -26539,6 +27087,10 @@ if test -z "${HAVE_GST_CHECK_TRUE}" && test -z "${HAVE_GST_CHECK_FALSE}"; then | ||
7045 | as_fn_error $? "conditional \"HAVE_GST_CHECK\" was never defined. | ||
7046 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7047 | fi | ||
7048 | +if test -z "${USE_VIVANTE_TRUE}" && test -z "${USE_VIVANTE_FALSE}"; then | ||
7049 | + as_fn_error $? "conditional \"USE_VIVANTE\" was never defined. | ||
7050 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7051 | +fi | ||
7052 | if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then | ||
7053 | as_fn_error $? "conditional \"HAVE_PNG\" was never defined. | ||
7054 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
7055 | @@ -27000,7 +27552,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
7056 | # report actual input values of CONFIG_FILES etc. instead of their | ||
7057 | # values after options handling. | ||
7058 | ac_log=" | ||
7059 | -This file was extended by GStreamer OpenGL Plug-ins $as_me 0.10.3, which was | ||
7060 | +This file was extended by GStreamer OpenGL Plug-ins $as_me 0.10.3.1, which was | ||
7061 | generated by GNU Autoconf 2.68. Invocation command line was | ||
7062 | |||
7063 | CONFIG_FILES = $CONFIG_FILES | ||
7064 | @@ -27066,7 +27618,7 @@ _ACEOF | ||
7065 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
7066 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | ||
7067 | ac_cs_version="\\ | ||
7068 | -GStreamer OpenGL Plug-ins config.status 0.10.3 | ||
7069 | +GStreamer OpenGL Plug-ins config.status 0.10.3.1 | ||
7070 | configured by $0, generated by GNU Autoconf 2.68, | ||
7071 | with options \\"\$ac_cs_config\\" | ||
7072 | |||
7073 | @@ -27206,7 +27758,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' | ||
7074 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' | ||
7075 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' | ||
7076 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' | ||
7077 | -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' | ||
7078 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | ||
7079 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | ||
7080 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | ||
7081 | @@ -27287,6 +27838,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' | ||
7082 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | ||
7083 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | ||
7084 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | ||
7085 | +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | ||
7086 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | ||
7087 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | ||
7088 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | ||
7089 | @@ -27358,6 +27910,7 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' | ||
7090 | allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' | ||
7091 | no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' | ||
7092 | hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' | ||
7093 | +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' | ||
7094 | hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' | ||
7095 | hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' | ||
7096 | hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' | ||
7097 | @@ -27399,7 +27952,6 @@ DLLTOOL \ | ||
7098 | OBJDUMP \ | ||
7099 | SHELL \ | ||
7100 | ECHO \ | ||
7101 | -PATH_SEPARATOR \ | ||
7102 | SED \ | ||
7103 | GREP \ | ||
7104 | EGREP \ | ||
7105 | @@ -27448,6 +28000,7 @@ with_gnu_ld \ | ||
7106 | allow_undefined_flag \ | ||
7107 | no_undefined_flag \ | ||
7108 | hardcode_libdir_flag_spec \ | ||
7109 | +hardcode_libdir_flag_spec_ld \ | ||
7110 | hardcode_libdir_separator \ | ||
7111 | exclude_expsyms \ | ||
7112 | include_expsyms \ | ||
7113 | @@ -27481,6 +28034,7 @@ with_gnu_ld_CXX \ | ||
7114 | allow_undefined_flag_CXX \ | ||
7115 | no_undefined_flag_CXX \ | ||
7116 | hardcode_libdir_flag_spec_CXX \ | ||
7117 | +hardcode_libdir_flag_spec_ld_CXX \ | ||
7118 | hardcode_libdir_separator_CXX \ | ||
7119 | exclude_expsyms_CXX \ | ||
7120 | include_expsyms_CXX \ | ||
7121 | @@ -28334,8 +28888,8 @@ $as_echo X"$file" | | ||
7122 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
7123 | # | ||
7124 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
7125 | -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
7126 | -# Foundation, Inc. | ||
7127 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
7128 | +# Inc. | ||
7129 | # Written by Gordon Matzigkeit, 1996 | ||
7130 | # | ||
7131 | # This file is part of GNU Libtool. | ||
7132 | @@ -28398,9 +28952,6 @@ SHELL=$lt_SHELL | ||
7133 | # An echo program that protects backslashes. | ||
7134 | ECHO=$lt_ECHO | ||
7135 | |||
7136 | -# The PATH separator for the build system. | ||
7137 | -PATH_SEPARATOR=$lt_PATH_SEPARATOR | ||
7138 | - | ||
7139 | # The host system. | ||
7140 | host_alias=$host_alias | ||
7141 | host=$host | ||
7142 | @@ -28696,6 +29247,10 @@ no_undefined_flag=$lt_no_undefined_flag | ||
7143 | # This must work even if \$libdir does not exist | ||
7144 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | ||
7145 | |||
7146 | +# If ld is used when linking, flag to hardcode \$libdir into a binary | ||
7147 | +# during linking. This must work even if \$libdir does not exist. | ||
7148 | +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | ||
7149 | + | ||
7150 | # Whether we need a single "-rpath" flag with a separated argument. | ||
7151 | hardcode_libdir_separator=$lt_hardcode_libdir_separator | ||
7152 | |||
7153 | @@ -29038,6 +29593,10 @@ no_undefined_flag=$lt_no_undefined_flag_CXX | ||
7154 | # This must work even if \$libdir does not exist | ||
7155 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX | ||
7156 | |||
7157 | +# If ld is used when linking, flag to hardcode \$libdir into a binary | ||
7158 | +# during linking. This must work even if \$libdir does not exist. | ||
7159 | +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX | ||
7160 | + | ||
7161 | # Whether we need a single "-rpath" flag with a separated argument. | ||
7162 | hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX | ||
7163 | |||
7164 | diff --git a/configure.ac b/configure.ac | ||
7165 | index 6a4efe0..fa277fa 100644 | ||
7166 | --- a/configure.ac | ||
7167 | +++ b/configure.ac | ||
7168 | @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file | ||
7169 | dnl initialize autoconf | ||
7170 | dnl releases only do -Wall, git and prerelease does -Werror too | ||
7171 | dnl use a three digit version number for releases, and four for git/prerelease | ||
7172 | -AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3, | ||
7173 | +AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3.1, | ||
7174 | http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, | ||
7175 | gst-plugins-gl) | ||
7176 | |||
7177 | @@ -61,7 +61,7 @@ dnl AS_LIBTOOL_TAGS | ||
7178 | |||
7179 | AC_LIBTOOL_WIN32_DLL | ||
7180 | AM_PROG_LIBTOOL | ||
7181 | -AS_PROG_OBJC | ||
7182 | +AC_PROG_OBJC | ||
7183 | |||
7184 | dnl *** required versions of GStreamer stuff *** | ||
7185 | GST_REQ=0.10.35 | ||
7186 | @@ -83,6 +83,8 @@ AG_GST_GETTEXT([gst-plugins-gl-$GST_MAJORMINOR]) | ||
7187 | |||
7188 | dnl *** check for arguments to configure *** | ||
7189 | |||
7190 | +AG_GST_ARG_DISABLE_FATAL_WARNINGS | ||
7191 | + | ||
7192 | AG_GST_ARG_DEBUG | ||
7193 | AG_GST_ARG_PROFILING | ||
7194 | AG_GST_ARG_VALGRIND | ||
7195 | @@ -160,36 +162,48 @@ AG_GST_CHECK_FUNCTION | ||
7196 | dnl *** checks for dependency libraries *** | ||
7197 | |||
7198 | dnl GLib is required | ||
7199 | -AG_GST_GLIB_CHECK([2.6]) | ||
7200 | +AG_GST_GLIB_CHECK([2.22]) | ||
7201 | |||
7202 | #dnl Check for OpenGL, GLU and GLEW | ||
7203 | echo host is $host | ||
7204 | case $host in | ||
7205 | *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) | ||
7206 | - AG_GST_CHECK_X | ||
7207 | save_CPPFLAGS="$CPPFLAGS" | ||
7208 | save_LIBS="$LIBS" | ||
7209 | - CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
7210 | - LIBS="$LIBS $X_LIBS" | ||
7211 | - #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
7212 | - AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) | ||
7213 | - if test "x$HAVE_GL" = "xyes"; then | ||
7214 | - AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) | ||
7215 | - AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) | ||
7216 | - AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) | ||
7217 | - GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
7218 | - GL_BACKEND=x11 | ||
7219 | - GL_TYPE=gl | ||
7220 | + AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_EGL_FB=yes, HAVE_EGL_FB=no) | ||
7221 | + if test "x$HAVE_EGL_FB" = "xyes"; then | ||
7222 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
7223 | + GL_BACKEND=fbES2 | ||
7224 | + GL_TYPE=gles | ||
7225 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" | ||
7226 | else | ||
7227 | + AG_GST_CHECK_X | ||
7228 | + CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" | ||
7229 | + LIBS="$LIBS $X_LIBS" | ||
7230 | AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no]) | ||
7231 | if test "x$HAVE_EGL" = "xyes"; then | ||
7232 | AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required])) | ||
7233 | + s_LIBS="$LIBS" | ||
7234 | + LIBS="-lEGL $LIBS" | ||
7235 | AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required])) | ||
7236 | - GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" | ||
7237 | + LIBS="$s_LIBS" | ||
7238 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
7239 | GL_BACKEND=x11ES2 | ||
7240 | GL_TYPE=gles | ||
7241 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX" | ||
7242 | else | ||
7243 | - AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) | ||
7244 | + #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
7245 | + AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) | ||
7246 | + if test "x$HAVE_GL" = "xyes"; then | ||
7247 | + AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) | ||
7248 | + AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) | ||
7249 | + AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) | ||
7250 | + GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
7251 | + GL_BACKEND=x11 | ||
7252 | + GL_TYPE=gl | ||
7253 | + else | ||
7254 | + AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) | ||
7255 | + fi | ||
7256 | fi | ||
7257 | fi | ||
7258 | CPPFLAGS="$save_CPPFLAGS" | ||
7259 | @@ -230,6 +244,7 @@ AC_SUBST(GL_BACKEND) | ||
7260 | AC_SUBST(OPENGL_ES2) | ||
7261 | AM_CONDITIONAL(GL_BACKEND_X11, test "x$GL_BACKEND" = "xx11") | ||
7262 | AM_CONDITIONAL(GL_BACKEND_X11ES2, test "x$GL_BACKEND" = "xx11ES2") | ||
7263 | +AM_CONDITIONAL(GL_BACKEND_FBES2, test "x$GL_BACKEND" = "xfbES2") | ||
7264 | AM_CONDITIONAL(GL_BACKEND_COCOA, test "x$GL_BACKEND" = "xcocoa") | ||
7265 | AM_CONDITIONAL(GL_BACKEND_WIN32, test "x$GL_BACKEND" = "xwin32") | ||
7266 | AM_CONDITIONAL(GL_IS_OPENGL, test "x$GL_TYPE" = "xgl") | ||
7267 | @@ -251,6 +266,18 @@ AC_SUBST(GLIB_PREFIX) | ||
7268 | AC_SUBST(GST_PREFIX) | ||
7269 | AC_SUBST(GSTPB_PREFIX) | ||
7270 | |||
7271 | +GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" | ||
7272 | +GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" | ||
7273 | +AC_CHECK_HEADERS([EGL/eglvivante.h], HAVE_VIVANTE=[yes], HAVE_VIVANTE=[no]) | ||
7274 | +if test "x$HAVE_VIVANTE" = "xyes"; then | ||
7275 | + if test "x$GST_FSL_CFLAGS" = "x"; then | ||
7276 | + AC_MSG_ERROR([gstreamer-fsl is required]) | ||
7277 | + fi | ||
7278 | + AC_DEFINE(GPU_VIVANTE, [1], [Use Vivante GPU]) | ||
7279 | +fi | ||
7280 | +AM_CONDITIONAL(USE_VIVANTE, test "x$HAVE_VIVANTE" = "xyes") | ||
7281 | +AC_SUBST(GST_FSL_CFLAGS) | ||
7282 | +AC_SUBST(GST_FSL_LIBS) | ||
7283 | |||
7284 | dnl libpng is optional | ||
7285 | PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no) | ||
7286 | @@ -269,12 +296,15 @@ if test x$with_jpeg_mmx != x; then | ||
7287 | LIBS="$LIBS -L$with_jpeg_mmx" | ||
7288 | fi | ||
7289 | AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") | ||
7290 | -JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
7291 | -LIBS="$OLD_LIBS" | ||
7292 | if test x$HAVE_JPEG != xyes; then | ||
7293 | AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") | ||
7294 | - JPEG_LIBS="-ljpeg" | ||
7295 | - AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) | ||
7296 | + if test x$HAVE_JPEG = xyes; then | ||
7297 | + JPEG_LIBS="-ljpeg" | ||
7298 | + AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) | ||
7299 | + fi | ||
7300 | +else | ||
7301 | + JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
7302 | + LIBS="$OLD_LIBS" | ||
7303 | fi | ||
7304 | AC_SUBST(HAVE_JPEG) | ||
7305 | AC_SUBST(JPEG_LIBS) | ||
7306 | @@ -383,8 +413,14 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], | ||
7307 | [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) | ||
7308 | |||
7309 | dnl define an ERROR_CFLAGS Makefile variable | ||
7310 | -AG_GST_SET_ERROR_CFLAGS($GST_GIT) | ||
7311 | -AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) | ||
7312 | +AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS) | ||
7313 | +AG_GST_SET_ERROR_CXXFLAGS($FATAL_WARNINGS) | ||
7314 | +dnl define an ERROR_OBJCFLAGS Makefile variable | ||
7315 | +AG_GST_SET_ERROR_OBJCFLAGS($FATAL_WARNINGS, [ | ||
7316 | + -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls | ||
7317 | + -Wwrite-strings -Wold-style-definition | ||
7318 | + -Winit-self -Wmissing-include-dirs -Wno-multichar | ||
7319 | + -Wnested-externs $NO_WARNINGS]) | ||
7320 | |||
7321 | dnl define correct level for debugging messages | ||
7322 | AG_GST_SET_LEVEL_DEFAULT($GST_GIT) | ||
7323 | @@ -460,8 +496,10 @@ AC_SUBST(DEPRECATED_CFLAGS) | ||
7324 | dnl every flag in GST_OPTION_CFLAGS can be overridden at make time | ||
7325 | GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7326 | GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7327 | +GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
7328 | AC_SUBST(GST_OPTION_CFLAGS) | ||
7329 | AC_SUBST(GST_OPTION_CXXFLAGS) | ||
7330 | +AC_SUBST(GST_OPTION_OBJCFLAGS) | ||
7331 | |||
7332 | dnl our libraries need to be versioned correctly | ||
7333 | AC_SUBST(GST_LT_LDFLAGS) | ||
7334 | @@ -474,10 +512,12 @@ AC_SUBST(GST_PLUGINS_GL_CFLAGS) | ||
7335 | |||
7336 | dnl FIXME: do we want to rename to GST_ALL_* ? | ||
7337 | dnl add GST_OPTION_CFLAGS, but overridable | ||
7338 | +GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" | ||
7339 | GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" | ||
7340 | GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" | ||
7341 | AC_SUBST(GST_CFLAGS) | ||
7342 | AC_SUBST(GST_CXXFLAGS) | ||
7343 | +AC_SUBST(GST_OBJCFLAGS) | ||
7344 | |||
7345 | dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage | ||
7346 | GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" | ||
7347 | diff --git a/depcomp b/depcomp | ||
7348 | index bd0ac08..df8eea7 100755 | ||
7349 | --- a/depcomp | ||
7350 | +++ b/depcomp | ||
7351 | @@ -1,10 +1,10 @@ | ||
7352 | #! /bin/sh | ||
7353 | # depcomp - compile a program generating dependencies as side-effects | ||
7354 | |||
7355 | -scriptversion=2011-12-04.11; # UTC | ||
7356 | +scriptversion=2009-04-28.21; # UTC | ||
7357 | |||
7358 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, | ||
7359 | -# 2011 Free Software Foundation, Inc. | ||
7360 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free | ||
7361 | +# Software Foundation, Inc. | ||
7362 | |||
7363 | # This program is free software; you can redistribute it and/or modify | ||
7364 | # it under the terms of the GNU General Public License as published by | ||
7365 | @@ -44,7 +44,7 @@ Environment variables: | ||
7366 | object Object file output by `PROGRAMS ARGS'. | ||
7367 | DEPDIR directory where to store dependencies. | ||
7368 | depfile Dependency file to output. | ||
7369 | - tmpdepfile Temporary file to use when outputting dependencies. | ||
7370 | + tmpdepfile Temporary file to use when outputing dependencies. | ||
7371 | libtool Whether libtool is used (yes/no). | ||
7372 | |||
7373 | Report bugs to <bug-automake@gnu.org>. | ||
7374 | @@ -90,18 +90,10 @@ if test "$depmode" = msvcmsys; then | ||
7375 | # This is just like msvisualcpp but w/o cygpath translation. | ||
7376 | # Just convert the backslash-escaped backslashes to single forward | ||
7377 | # slashes to satisfy depend.m4 | ||
7378 | - cygpath_u='sed s,\\\\,/,g' | ||
7379 | + cygpath_u="sed s,\\\\\\\\,/,g" | ||
7380 | depmode=msvisualcpp | ||
7381 | fi | ||
7382 | |||
7383 | -if test "$depmode" = msvc7msys; then | ||
7384 | - # This is just like msvc7 but w/o cygpath translation. | ||
7385 | - # Just convert the backslash-escaped backslashes to single forward | ||
7386 | - # slashes to satisfy depend.m4 | ||
7387 | - cygpath_u='sed s,\\\\,/,g' | ||
7388 | - depmode=msvc7 | ||
7389 | -fi | ||
7390 | - | ||
7391 | case "$depmode" in | ||
7392 | gcc3) | ||
7393 | ## gcc 3 implements dependency tracking that does exactly what | ||
7394 | @@ -166,12 +158,10 @@ gcc) | ||
7395 | ' < "$tmpdepfile" | | ||
7396 | ## Some versions of gcc put a space before the `:'. On the theory | ||
7397 | ## that the space means something, we add a space to the output as | ||
7398 | -## well. hp depmode also adds that space, but also prefixes the VPATH | ||
7399 | -## to the object. Take care to not repeat it in the output. | ||
7400 | +## well. | ||
7401 | ## Some versions of the HPUX 10.20 sed can't process this invocation | ||
7402 | ## correctly. Breaking it into two sed invocations is a workaround. | ||
7403 | - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ | ||
7404 | - | sed -e 's/$/ :/' >> "$depfile" | ||
7405 | + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" | ||
7406 | rm -f "$tmpdepfile" | ||
7407 | ;; | ||
7408 | |||
7409 | @@ -415,52 +405,6 @@ tru64) | ||
7410 | rm -f "$tmpdepfile" | ||
7411 | ;; | ||
7412 | |||
7413 | -msvc7) | ||
7414 | - if test "$libtool" = yes; then | ||
7415 | - showIncludes=-Wc,-showIncludes | ||
7416 | - else | ||
7417 | - showIncludes=-showIncludes | ||
7418 | - fi | ||
7419 | - "$@" $showIncludes > "$tmpdepfile" | ||
7420 | - stat=$? | ||
7421 | - grep -v '^Note: including file: ' "$tmpdepfile" | ||
7422 | - if test "$stat" = 0; then : | ||
7423 | - else | ||
7424 | - rm -f "$tmpdepfile" | ||
7425 | - exit $stat | ||
7426 | - fi | ||
7427 | - rm -f "$depfile" | ||
7428 | - echo "$object : \\" > "$depfile" | ||
7429 | - # The first sed program below extracts the file names and escapes | ||
7430 | - # backslashes for cygpath. The second sed program outputs the file | ||
7431 | - # name when reading, but also accumulates all include files in the | ||
7432 | - # hold buffer in order to output them again at the end. This only | ||
7433 | - # works with sed implementations that can handle large buffers. | ||
7434 | - sed < "$tmpdepfile" -n ' | ||
7435 | -/^Note: including file: *\(.*\)/ { | ||
7436 | - s//\1/ | ||
7437 | - s/\\/\\\\/g | ||
7438 | - p | ||
7439 | -}' | $cygpath_u | sort -u | sed -n ' | ||
7440 | -s/ /\\ /g | ||
7441 | -s/\(.*\)/ \1 \\/p | ||
7442 | -s/.\(.*\) \\/\1:/ | ||
7443 | -H | ||
7444 | -$ { | ||
7445 | - s/.*/ / | ||
7446 | - G | ||
7447 | - p | ||
7448 | -}' >> "$depfile" | ||
7449 | - rm -f "$tmpdepfile" | ||
7450 | - ;; | ||
7451 | - | ||
7452 | -msvc7msys) | ||
7453 | - # This case exists only to let depend.m4 do its work. It works by | ||
7454 | - # looking at the text of this script. This case will never be run, | ||
7455 | - # since it is checked for above. | ||
7456 | - exit 1 | ||
7457 | - ;; | ||
7458 | - | ||
7459 | #nosideeffect) | ||
7460 | # This comment above is used by automake to tell side-effect | ||
7461 | # dependency tracking mechanisms from slower ones. | ||
7462 | @@ -559,9 +503,7 @@ makedepend) | ||
7463 | touch "$tmpdepfile" | ||
7464 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" | ||
7465 | rm -f "$depfile" | ||
7466 | - # makedepend may prepend the VPATH from the source file name to the object. | ||
7467 | - # No need to regex-escape $object, excess matching of '.' is harmless. | ||
7468 | - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" | ||
7469 | + cat < "$tmpdepfile" > "$depfile" | ||
7470 | sed '1,2d' "$tmpdepfile" | tr ' ' ' | ||
7471 | ' | \ | ||
7472 | ## Some versions of the HPUX 10.20 sed can't process this invocation | ||
7473 | diff --git a/docs/DEBUGGING b/docs/DEBUGGING | ||
7474 | new file mode 100644 | ||
7475 | index 0000000..b304341 | ||
7476 | --- /dev/null | ||
7477 | +++ b/docs/DEBUGGING | ||
7478 | @@ -0,0 +1,73 @@ | ||
7479 | + | ||
7480 | +===== | ||
7481 | +Notes | ||
7482 | +===== | ||
7483 | + | ||
7484 | +First on win32, if you are using msvc, you should check the glibconfig.h file: | ||
7485 | +About line 130, you should have: | ||
7486 | + | ||
7487 | +#else /* _MSC_VER */ | ||
7488 | +/* varargs macros available since msvc8 (vs2005) */ | ||
7489 | +# if _MSC_VER >= 1400 | ||
7490 | +# define G_HAVE_ISO_VARARGS 1 | ||
7491 | +# define __func__ __FUNCTION__ | ||
7492 | +# endif | ||
7493 | +#endif /* not _MSC_VER */ | ||
7494 | + | ||
7495 | + | ||
7496 | +==================== | ||
7497 | +OpenGL context infos | ||
7498 | +==================== | ||
7499 | + | ||
7500 | +#gst-launch-0.10 --gst-debug=gldisplay:N pipeline | ||
7501 | +#N=1: errors | ||
7502 | +#N=2: errors warnings | ||
7503 | +#N=3: errors warnings infos | ||
7504 | +#N=4: errors warnings infos | ||
7505 | +#N=5: errors warnings infos logs | ||
7506 | + | ||
7507 | +gst-launch-0.10 --gst-debug=gldisplay:3 videotestsrc ! glimagesink | ||
7508 | + | ||
7509 | + | ||
7510 | +======= | ||
7511 | +Shaders | ||
7512 | +======= | ||
7513 | + | ||
7514 | +win32: | ||
7515 | +set GST_GL_SHADER_DEBUG=1 (or something else because setting it to 0 is NOT like to not setting it at all) | ||
7516 | +gst-launch-0.10 videotestsrc ! glimagesink | ||
7517 | +when you are done, just type "set GST_GL_SHADER_DEBUG=" to unset it. | ||
7518 | + | ||
7519 | +unix: | ||
7520 | +(Probably bash-specific, check your shell docs to know how to do it) | ||
7521 | + | ||
7522 | +export GST_GL_SHADER_DEBUG=1 | ||
7523 | +gst-launch-0.10 videotestsrc ! glimagesink | ||
7524 | +when you are done, just type "export -n GST_GL_SHADER_DEBUG" to unset it. | ||
7525 | + | ||
7526 | +or just prepend your app with GST_GL_SHADER_DEBUG=1 (no need to unset): | ||
7527 | +GST_GL_SHADER_DEBUG=1 gst-launch-0.10 videotestsrc ! glimagesink | ||
7528 | +Note: the "1" value is completely arbitrary, what matters here is whether the | ||
7529 | +environment variable is set or not. | ||
7530 | + | ||
7531 | + | ||
7532 | +=========== | ||
7533 | +gl elements | ||
7534 | +=========== | ||
7535 | + | ||
7536 | +gst-launch-0.10 --gst-debug=gleffects:3 videotestsrc ! glupload ! gleffects effect=8 ! glimagesink | ||
7537 | +gst-launch-0.10 --gst-debug=gleffects:3,gldisplay:3 videotestsrc ! glupload ! gleffects effect=8 ! glimagesink | ||
7538 | +GST_DEBUG=gl*:5 gst-launch-0.10 videotestsrc ! glupload ! glimagesink | ||
7539 | + | ||
7540 | +Look at "Running GStreamer Application" section in the GStreamer Core | ||
7541 | +Reference Manual if you want more details about GStreamer debugging. | ||
7542 | + | ||
7543 | + | ||
7544 | +======== | ||
7545 | +Remarks: | ||
7546 | +======== | ||
7547 | + | ||
7548 | +If you are not already mind irreversible, or if you are still looking for a dev environment | ||
7549 | +then you should try CodeBlocks which is available on both linux and windows, or vs8(9) on windows. | ||
7550 | +Indeed, nowadays ponctual debug traces, like printf and others (I mean not definitive traces like GST_DEBUG), | ||
7551 | +are forbidden. They have been replaced by break points which are useable only through a good IDE. | ||
7552 | diff --git a/docs/Makefile.in b/docs/Makefile.in | ||
7553 | index f6fde64..31dd279 100644 | ||
7554 | --- a/docs/Makefile.in | ||
7555 | +++ b/docs/Makefile.in | ||
7556 | @@ -1,9 +1,9 @@ | ||
7557 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
7558 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
7559 | # @configure_input@ | ||
7560 | |||
7561 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
7562 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
7563 | -# Foundation, Inc. | ||
7564 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
7565 | +# Inc. | ||
7566 | # This Makefile.in is free software; the Free Software Foundation | ||
7567 | # gives unlimited permission to copy and/or distribute it, | ||
7568 | # with or without modifications, as long as this notice is preserved. | ||
7569 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
7570 | POST_UNINSTALL = : | ||
7571 | build_triplet = @build@ | ||
7572 | host_triplet = @host@ | ||
7573 | +target_triplet = @target@ | ||
7574 | subdir = docs | ||
7575 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
7576 | $(srcdir)/version.entities.in | ||
7577 | @@ -41,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
7578 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
7579 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
7580 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
7581 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
7582 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
7583 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
7584 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
7585 | @@ -74,11 +74,11 @@ mkinstalldirs = $(install_sh) -d | ||
7586 | CONFIG_HEADER = $(top_builddir)/config.h | ||
7587 | CONFIG_CLEAN_FILES = version.entities | ||
7588 | CONFIG_CLEAN_VPATH_FILES = | ||
7589 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
7590 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
7591 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
7592 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
7593 | am__v_GEN_0 = @echo " GEN " $@; | ||
7594 | -AM_V_at = $(am__v_at_@AM_V@) | ||
7595 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
7596 | +AM_V_at = $(am__v_at_$(V)) | ||
7597 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
7598 | am__v_at_0 = @ | ||
7599 | SOURCES = | ||
7600 | DIST_SOURCES = | ||
7601 | @@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ | ||
7602 | EGREP = @EGREP@ | ||
7603 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
7604 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
7605 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
7606 | EXEEXT = @EXEEXT@ | ||
7607 | FFLAGS = @FFLAGS@ | ||
7608 | FGREP = @FGREP@ | ||
7609 | @@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
7610 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
7611 | GST_CURRENT = @GST_CURRENT@ | ||
7612 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
7613 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
7614 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
7615 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
7616 | GST_LIBS = @GST_LIBS@ | ||
7617 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
7618 | @@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
7619 | GST_LICENSE = @GST_LICENSE@ | ||
7620 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
7621 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
7622 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
7623 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
7624 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
7625 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
7626 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
7627 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
7628 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
7629 | @@ -281,7 +286,7 @@ NM = @NM@ | ||
7630 | NMEDIT = @NMEDIT@ | ||
7631 | OBJC = @OBJC@ | ||
7632 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
7633 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
7634 | +OBJCFLAGS = @OBJCFLAGS@ | ||
7635 | OBJDUMP = @OBJDUMP@ | ||
7636 | OBJEXT = @OBJEXT@ | ||
7637 | OPENGL_ES2 = @OPENGL_ES2@ | ||
7638 | @@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
7639 | VERSION = @VERSION@ | ||
7640 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
7641 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
7642 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
7643 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
7644 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
7645 | XGETTEXT = @XGETTEXT@ | ||
7646 | @@ -391,7 +397,11 @@ sbindir = @sbindir@ | ||
7647 | sharedstatedir = @sharedstatedir@ | ||
7648 | srcdir = @srcdir@ | ||
7649 | sysconfdir = @sysconfdir@ | ||
7650 | +target = @target@ | ||
7651 | target_alias = @target_alias@ | ||
7652 | +target_cpu = @target_cpu@ | ||
7653 | +target_os = @target_os@ | ||
7654 | +target_vendor = @target_vendor@ | ||
7655 | top_build_prefix = @top_build_prefix@ | ||
7656 | top_builddir = @top_builddir@ | ||
7657 | top_srcdir = @top_srcdir@ | ||
7658 | @@ -646,15 +656,10 @@ install-am: all-am | ||
7659 | |||
7660 | installcheck: installcheck-recursive | ||
7661 | install-strip: | ||
7662 | - if test -z '$(STRIP)'; then \ | ||
7663 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7664 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7665 | - install; \ | ||
7666 | - else \ | ||
7667 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7668 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7669 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
7670 | - fi | ||
7671 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7672 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7673 | + `test -z '$(STRIP)' || \ | ||
7674 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
7675 | mostlyclean-generic: | ||
7676 | |||
7677 | clean-generic: | ||
7678 | diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am | ||
7679 | index defa340..18016cf 100644 | ||
7680 | --- a/docs/libs/Makefile.am | ||
7681 | +++ b/docs/libs/Makefile.am | ||
7682 | @@ -50,7 +50,7 @@ extra_files = | ||
7683 | # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib | ||
7684 | # contains GtkObjects/GObjects and you want to document signals and properties. | ||
7685 | GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ | ||
7686 | - -I$(top_srcdir)/gst-libs/gst/gl | ||
7687 | + -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX | ||
7688 | GTKDOC_LIBS = \ | ||
7689 | $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ | ||
7690 | $(GST_BASE_LIBS) | ||
7691 | diff --git a/docs/libs/Makefile.in b/docs/libs/Makefile.in | ||
7692 | index 6100d92..1ce1693 100644 | ||
7693 | --- a/docs/libs/Makefile.in | ||
7694 | +++ b/docs/libs/Makefile.in | ||
7695 | @@ -1,9 +1,9 @@ | ||
7696 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
7697 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
7698 | # @configure_input@ | ||
7699 | |||
7700 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
7701 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
7702 | -# Foundation, Inc. | ||
7703 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
7704 | +# Inc. | ||
7705 | # This Makefile.in is free software; the Free Software Foundation | ||
7706 | # gives unlimited permission to copy and/or distribute it, | ||
7707 | # with or without modifications, as long as this notice is preserved. | ||
7708 | @@ -52,6 +52,7 @@ PRE_UNINSTALL = : | ||
7709 | POST_UNINSTALL = : | ||
7710 | build_triplet = @build@ | ||
7711 | host_triplet = @host@ | ||
7712 | +target_triplet = @target@ | ||
7713 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
7714 | $(top_srcdir)/common/gtk-doc.mak \ | ||
7715 | $(top_srcdir)/common/upload-doc.mak | ||
7716 | @@ -61,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
7717 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
7718 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
7719 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
7720 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
7721 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
7722 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
7723 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
7724 | @@ -94,11 +94,11 @@ mkinstalldirs = $(install_sh) -d | ||
7725 | CONFIG_HEADER = $(top_builddir)/config.h | ||
7726 | CONFIG_CLEAN_FILES = | ||
7727 | CONFIG_CLEAN_VPATH_FILES = | ||
7728 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
7729 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
7730 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
7731 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
7732 | am__v_GEN_0 = @echo " GEN " $@; | ||
7733 | -AM_V_at = $(am__v_at_@AM_V@) | ||
7734 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
7735 | +AM_V_at = $(am__v_at_$(V)) | ||
7736 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
7737 | am__v_at_0 = @ | ||
7738 | SOURCES = | ||
7739 | DIST_SOURCES = | ||
7740 | @@ -149,6 +149,7 @@ ECHO_T = @ECHO_T@ | ||
7741 | EGREP = @EGREP@ | ||
7742 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
7743 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
7744 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
7745 | EXEEXT = @EXEEXT@ | ||
7746 | FFLAGS = @FFLAGS@ | ||
7747 | FGREP = @FGREP@ | ||
7748 | @@ -180,6 +181,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
7749 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
7750 | GST_CURRENT = @GST_CURRENT@ | ||
7751 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
7752 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
7753 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
7754 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
7755 | GST_LIBS = @GST_LIBS@ | ||
7756 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
7757 | @@ -187,8 +190,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
7758 | GST_LICENSE = @GST_LICENSE@ | ||
7759 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
7760 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
7761 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
7762 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
7763 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
7764 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
7765 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
7766 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
7767 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
7768 | @@ -261,7 +266,7 @@ NM = @NM@ | ||
7769 | NMEDIT = @NMEDIT@ | ||
7770 | OBJC = @OBJC@ | ||
7771 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
7772 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
7773 | +OBJCFLAGS = @OBJCFLAGS@ | ||
7774 | OBJDUMP = @OBJDUMP@ | ||
7775 | OBJEXT = @OBJEXT@ | ||
7776 | OPENGL_ES2 = @OPENGL_ES2@ | ||
7777 | @@ -306,6 +311,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
7778 | VERSION = @VERSION@ | ||
7779 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
7780 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
7781 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
7782 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
7783 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
7784 | XGETTEXT = @XGETTEXT@ | ||
7785 | @@ -371,7 +377,11 @@ sbindir = @sbindir@ | ||
7786 | sharedstatedir = @sharedstatedir@ | ||
7787 | srcdir = @srcdir@ | ||
7788 | sysconfdir = @sysconfdir@ | ||
7789 | +target = @target@ | ||
7790 | target_alias = @target_alias@ | ||
7791 | +target_cpu = @target_cpu@ | ||
7792 | +target_os = @target_os@ | ||
7793 | +target_vendor = @target_vendor@ | ||
7794 | top_build_prefix = @top_build_prefix@ | ||
7795 | top_builddir = @top_builddir@ | ||
7796 | top_srcdir = @top_srcdir@ | ||
7797 | @@ -430,7 +440,7 @@ extra_files = | ||
7798 | # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib | ||
7799 | # contains GtkObjects/GObjects and you want to document signals and properties. | ||
7800 | GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ | ||
7801 | - -I$(top_srcdir)/gst-libs/gst/gl | ||
7802 | + -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX | ||
7803 | |||
7804 | GTKDOC_LIBS = \ | ||
7805 | $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ | ||
7806 | @@ -508,7 +518,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
7807 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
7808 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
7809 | esac; | ||
7810 | -$(top_srcdir)/common/upload-doc.mak $(top_srcdir)/common/gtk-doc.mak: | ||
7811 | |||
7812 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
7813 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
7814 | @@ -578,15 +587,10 @@ install-am: all-am | ||
7815 | |||
7816 | installcheck: installcheck-am | ||
7817 | install-strip: | ||
7818 | - if test -z '$(STRIP)'; then \ | ||
7819 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7820 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7821 | - install; \ | ||
7822 | - else \ | ||
7823 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7824 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7825 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
7826 | - fi | ||
7827 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7828 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7829 | + `test -z '$(STRIP)' || \ | ||
7830 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
7831 | mostlyclean-generic: | ||
7832 | |||
7833 | clean-generic: | ||
7834 | diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in | ||
7835 | index 19e065d..929edba 100644 | ||
7836 | --- a/docs/plugins/Makefile.in | ||
7837 | +++ b/docs/plugins/Makefile.in | ||
7838 | @@ -1,9 +1,9 @@ | ||
7839 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
7840 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
7841 | # @configure_input@ | ||
7842 | |||
7843 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
7844 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
7845 | -# Foundation, Inc. | ||
7846 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
7847 | +# Inc. | ||
7848 | # This Makefile.in is free software; the Free Software Foundation | ||
7849 | # gives unlimited permission to copy and/or distribute it, | ||
7850 | # with or without modifications, as long as this notice is preserved. | ||
7851 | @@ -50,6 +50,7 @@ PRE_UNINSTALL = : | ||
7852 | POST_UNINSTALL = : | ||
7853 | build_triplet = @build@ | ||
7854 | host_triplet = @host@ | ||
7855 | +target_triplet = @target@ | ||
7856 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
7857 | $(top_srcdir)/common/gtk-doc-plugins.mak \ | ||
7858 | $(top_srcdir)/common/upload-doc.mak | ||
7859 | @@ -59,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
7860 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
7861 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
7862 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
7863 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
7864 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
7865 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
7866 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
7867 | @@ -92,11 +92,11 @@ mkinstalldirs = $(install_sh) -d | ||
7868 | CONFIG_HEADER = $(top_builddir)/config.h | ||
7869 | CONFIG_CLEAN_FILES = | ||
7870 | CONFIG_CLEAN_VPATH_FILES = | ||
7871 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
7872 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
7873 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
7874 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
7875 | am__v_GEN_0 = @echo " GEN " $@; | ||
7876 | -AM_V_at = $(am__v_at_@AM_V@) | ||
7877 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
7878 | +AM_V_at = $(am__v_at_$(V)) | ||
7879 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
7880 | am__v_at_0 = @ | ||
7881 | SOURCES = | ||
7882 | DIST_SOURCES = | ||
7883 | @@ -147,6 +147,7 @@ ECHO_T = @ECHO_T@ | ||
7884 | EGREP = @EGREP@ | ||
7885 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
7886 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
7887 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
7888 | EXEEXT = @EXEEXT@ | ||
7889 | FFLAGS = @FFLAGS@ | ||
7890 | FGREP = @FGREP@ | ||
7891 | @@ -178,6 +179,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
7892 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
7893 | GST_CURRENT = @GST_CURRENT@ | ||
7894 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
7895 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
7896 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
7897 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
7898 | GST_LIBS = @GST_LIBS@ | ||
7899 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
7900 | @@ -185,8 +188,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
7901 | GST_LICENSE = @GST_LICENSE@ | ||
7902 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
7903 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
7904 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
7905 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
7906 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
7907 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
7908 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
7909 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
7910 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
7911 | @@ -259,7 +264,7 @@ NM = @NM@ | ||
7912 | NMEDIT = @NMEDIT@ | ||
7913 | OBJC = @OBJC@ | ||
7914 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
7915 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
7916 | +OBJCFLAGS = @OBJCFLAGS@ | ||
7917 | OBJDUMP = @OBJDUMP@ | ||
7918 | OBJEXT = @OBJEXT@ | ||
7919 | OPENGL_ES2 = @OPENGL_ES2@ | ||
7920 | @@ -304,6 +309,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
7921 | VERSION = @VERSION@ | ||
7922 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
7923 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
7924 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
7925 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
7926 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
7927 | XGETTEXT = @XGETTEXT@ | ||
7928 | @@ -369,7 +375,11 @@ sbindir = @sbindir@ | ||
7929 | sharedstatedir = @sharedstatedir@ | ||
7930 | srcdir = @srcdir@ | ||
7931 | sysconfdir = @sysconfdir@ | ||
7932 | +target = @target@ | ||
7933 | target_alias = @target_alias@ | ||
7934 | +target_cpu = @target_cpu@ | ||
7935 | +target_os = @target_os@ | ||
7936 | +target_vendor = @target_vendor@ | ||
7937 | top_build_prefix = @top_build_prefix@ | ||
7938 | top_builddir = @top_builddir@ | ||
7939 | top_srcdir = @top_srcdir@ | ||
7940 | @@ -572,7 +582,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
7941 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
7942 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
7943 | esac; | ||
7944 | -$(top_srcdir)/common/upload-doc.mak $(top_srcdir)/common/gtk-doc-plugins.mak: | ||
7945 | |||
7946 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
7947 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
7948 | @@ -642,15 +651,10 @@ install-am: all-am | ||
7949 | |||
7950 | installcheck: installcheck-am | ||
7951 | install-strip: | ||
7952 | - if test -z '$(STRIP)'; then \ | ||
7953 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7954 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7955 | - install; \ | ||
7956 | - else \ | ||
7957 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7958 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7959 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
7960 | - fi | ||
7961 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
7962 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
7963 | + `test -z '$(STRIP)' || \ | ||
7964 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
7965 | mostlyclean-generic: | ||
7966 | |||
7967 | clean-generic: | ||
7968 | @@ -810,8 +814,7 @@ help: | ||
7969 | @echo | ||
7970 | |||
7971 | # update the stuff maintained by doc maintainers | ||
7972 | -update: | ||
7973 | - $(MAKE) scanobj-update | ||
7974 | +update: scanobj-update | ||
7975 | $(MAKE) check-outdated-docs | ||
7976 | |||
7977 | @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp | ||
7978 | @@ -845,7 +848,7 @@ update: | ||
7979 | @ENABLE_GTK_DOC_TRUE@ --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ | ||
7980 | @ENABLE_GTK_DOC_TRUE@ echo " DOC Merging introspection data" && \ | ||
7981 | @ENABLE_GTK_DOC_TRUE@ $(PYTHON) \ | ||
7982 | -@ENABLE_GTK_DOC_TRUE@ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ | ||
7983 | +@ENABLE_GTK_DOC_TRUE@ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ | ||
7984 | @ENABLE_GTK_DOC_TRUE@ if test x"$(srcdir)" != x. ; then \ | ||
7985 | @ENABLE_GTK_DOC_TRUE@ for f in $(SCANOBJ_FILES); \ | ||
7986 | @ENABLE_GTK_DOC_TRUE@ do \ | ||
7987 | diff --git a/docs/plugins/inspect/plugin-libvisual-gl.xml b/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
7988 | index da5a3d5..477c811 100644 | ||
7989 | --- a/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
7990 | +++ b/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
7991 | @@ -3,10 +3,10 @@ | ||
7992 | <description>libvisual-gl visualization plugins</description> | ||
7993 | <filename>../../ext/libvisual/.libs/libgstlibvisualgl.so</filename> | ||
7994 | <basename>libgstlibvisualgl.so</basename> | ||
7995 | - <version>0.10.3</version> | ||
7996 | + <version>0.10.3.1</version> | ||
7997 | <license>LGPL</license> | ||
7998 | <source>gst-plugins-gl</source> | ||
7999 | - <package>GStreamer OpenGL Plug-ins source release</package> | ||
8000 | + <package>GStreamer OpenGL Plug-ins git</package> | ||
8001 | <origin>Unknown package origin</origin> | ||
8002 | <elements> | ||
8003 | <element> | ||
8004 | diff --git a/docs/plugins/inspect/plugin-opengl.xml b/docs/plugins/inspect/plugin-opengl.xml | ||
8005 | index dbfa9fb..9b7b663 100644 | ||
8006 | --- a/docs/plugins/inspect/plugin-opengl.xml | ||
8007 | +++ b/docs/plugins/inspect/plugin-opengl.xml | ||
8008 | @@ -3,10 +3,10 @@ | ||
8009 | <description>OpenGL plugin</description> | ||
8010 | <filename>../../gst/gl/.libs/libgstopengl.so</filename> | ||
8011 | <basename>libgstopengl.so</basename> | ||
8012 | - <version>0.10.3</version> | ||
8013 | + <version>0.10.3.1</version> | ||
8014 | <license>LGPL</license> | ||
8015 | <source>gst-plugins-gl</source> | ||
8016 | - <package>GStreamer OpenGL Plug-ins source release</package> | ||
8017 | + <package>GStreamer OpenGL Plug-ins git</package> | ||
8018 | <origin>Unknown package origin</origin> | ||
8019 | <elements> | ||
8020 | <element> | ||
8021 | diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt | ||
8022 | new file mode 100644 | ||
8023 | index 0000000..63569a6 | ||
8024 | --- /dev/null | ||
8025 | +++ b/ext/CMakeLists.txt | ||
8026 | @@ -0,0 +1 @@ | ||
8027 | +add_subdirectory (libvisual) | ||
8028 | diff --git a/ext/Makefile.in b/ext/Makefile.in | ||
8029 | index f6594db..4f27867 100644 | ||
8030 | --- a/ext/Makefile.in | ||
8031 | +++ b/ext/Makefile.in | ||
8032 | @@ -1,9 +1,9 @@ | ||
8033 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
8034 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
8035 | # @configure_input@ | ||
8036 | |||
8037 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
8038 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
8039 | -# Foundation, Inc. | ||
8040 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
8041 | +# Inc. | ||
8042 | # This Makefile.in is free software; the Free Software Foundation | ||
8043 | # gives unlimited permission to copy and/or distribute it, | ||
8044 | # with or without modifications, as long as this notice is preserved. | ||
8045 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
8046 | POST_UNINSTALL = : | ||
8047 | build_triplet = @build@ | ||
8048 | host_triplet = @host@ | ||
8049 | +target_triplet = @target@ | ||
8050 | subdir = ext | ||
8051 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
8052 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
8053 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
8054 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
8055 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
8056 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
8057 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
8058 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
8059 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
8060 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
8061 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
8062 | CONFIG_HEADER = $(top_builddir)/config.h | ||
8063 | CONFIG_CLEAN_FILES = | ||
8064 | CONFIG_CLEAN_VPATH_FILES = | ||
8065 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
8066 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
8067 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
8068 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
8069 | am__v_GEN_0 = @echo " GEN " $@; | ||
8070 | -AM_V_at = $(am__v_at_@AM_V@) | ||
8071 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
8072 | +AM_V_at = $(am__v_at_$(V)) | ||
8073 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
8074 | am__v_at_0 = @ | ||
8075 | SOURCES = | ||
8076 | DIST_SOURCES = | ||
8077 | @@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ | ||
8078 | EGREP = @EGREP@ | ||
8079 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
8080 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
8081 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
8082 | EXEEXT = @EXEEXT@ | ||
8083 | FFLAGS = @FFLAGS@ | ||
8084 | FGREP = @FGREP@ | ||
8085 | @@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
8086 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
8087 | GST_CURRENT = @GST_CURRENT@ | ||
8088 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
8089 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
8090 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
8091 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
8092 | GST_LIBS = @GST_LIBS@ | ||
8093 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
8094 | @@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
8095 | GST_LICENSE = @GST_LICENSE@ | ||
8096 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
8097 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
8098 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
8099 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
8100 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
8101 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
8102 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
8103 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
8104 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
8105 | @@ -279,7 +284,7 @@ NM = @NM@ | ||
8106 | NMEDIT = @NMEDIT@ | ||
8107 | OBJC = @OBJC@ | ||
8108 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
8109 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
8110 | +OBJCFLAGS = @OBJCFLAGS@ | ||
8111 | OBJDUMP = @OBJDUMP@ | ||
8112 | OBJEXT = @OBJEXT@ | ||
8113 | OPENGL_ES2 = @OPENGL_ES2@ | ||
8114 | @@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
8115 | VERSION = @VERSION@ | ||
8116 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
8117 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
8118 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
8119 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
8120 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
8121 | XGETTEXT = @XGETTEXT@ | ||
8122 | @@ -389,7 +395,11 @@ sbindir = @sbindir@ | ||
8123 | sharedstatedir = @sharedstatedir@ | ||
8124 | srcdir = @srcdir@ | ||
8125 | sysconfdir = @sysconfdir@ | ||
8126 | +target = @target@ | ||
8127 | target_alias = @target_alias@ | ||
8128 | +target_cpu = @target_cpu@ | ||
8129 | +target_os = @target_os@ | ||
8130 | +target_vendor = @target_vendor@ | ||
8131 | top_build_prefix = @top_build_prefix@ | ||
8132 | top_builddir = @top_builddir@ | ||
8133 | top_srcdir = @top_srcdir@ | ||
8134 | @@ -649,15 +659,10 @@ install-am: all-am | ||
8135 | |||
8136 | installcheck: installcheck-recursive | ||
8137 | install-strip: | ||
8138 | - if test -z '$(STRIP)'; then \ | ||
8139 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8140 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8141 | - install; \ | ||
8142 | - else \ | ||
8143 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8144 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8145 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
8146 | - fi | ||
8147 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8148 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8149 | + `test -z '$(STRIP)' || \ | ||
8150 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
8151 | mostlyclean-generic: | ||
8152 | |||
8153 | clean-generic: | ||
8154 | diff --git a/ext/libvisual/CMakeLists.txt b/ext/libvisual/CMakeLists.txt | ||
8155 | new file mode 100644 | ||
8156 | index 0000000..490ed89 | ||
8157 | --- /dev/null | ||
8158 | +++ b/ext/libvisual/CMakeLists.txt | ||
8159 | @@ -0,0 +1,15 @@ | ||
8160 | +add_definitions(-DHAVE_CONFIG_H) | ||
8161 | + | ||
8162 | +include_directories(AFTER | ||
8163 | + ${GSTREAMER_INCLUDE_DIR} | ||
8164 | + ${GLIB2_INCLUDE_DIR} | ||
8165 | + ../../gst-libs/gst/gl | ||
8166 | + ../../gst-libs | ||
8167 | + ../.. | ||
8168 | + .) | ||
8169 | + | ||
8170 | +add_library (gstlibvisualgl SHARED | ||
8171 | + visual-gl.c) | ||
8172 | + | ||
8173 | +target_link_libraries(gstlibvisualgl | ||
8174 | + general gstgl) | ||
8175 | diff --git a/ext/libvisual/Makefile.in b/ext/libvisual/Makefile.in | ||
8176 | index 56391ed..699e758 100644 | ||
8177 | --- a/ext/libvisual/Makefile.in | ||
8178 | +++ b/ext/libvisual/Makefile.in | ||
8179 | @@ -1,9 +1,9 @@ | ||
8180 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
8181 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
8182 | # @configure_input@ | ||
8183 | |||
8184 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
8185 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
8186 | -# Foundation, Inc. | ||
8187 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
8188 | +# Inc. | ||
8189 | # This Makefile.in is free software; the Free Software Foundation | ||
8190 | # gives unlimited permission to copy and/or distribute it, | ||
8191 | # with or without modifications, as long as this notice is preserved. | ||
8192 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
8193 | POST_UNINSTALL = : | ||
8194 | build_triplet = @build@ | ||
8195 | host_triplet = @host@ | ||
8196 | +target_triplet = @target@ | ||
8197 | subdir = ext/libvisual | ||
8198 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
8199 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
8200 | @@ -41,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
8201 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
8202 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
8203 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
8204 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
8205 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
8206 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
8207 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
8208 | @@ -95,12 +95,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ | ||
8209 | am__base_list = \ | ||
8210 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
8211 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
8212 | -am__uninstall_files_from_dir = { \ | ||
8213 | - test -z "$$files" \ | ||
8214 | - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
8215 | - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
8216 | - $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
8217 | - } | ||
8218 | am__installdirs = "$(DESTDIR)$(plugindir)" | ||
8219 | LTLIBRARIES = $(plugin_LTLIBRARIES) | ||
8220 | am__DEPENDENCIES_1 = | ||
8221 | @@ -110,8 +104,8 @@ libgstlibvisualgl_la_DEPENDENCIES = \ | ||
8222 | $(am__DEPENDENCIES_1) | ||
8223 | am_libgstlibvisualgl_la_OBJECTS = libgstlibvisualgl_la-visual-gl.lo | ||
8224 | libgstlibvisualgl_la_OBJECTS = $(am_libgstlibvisualgl_la_OBJECTS) | ||
8225 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
8226 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
8227 | +AM_V_lt = $(am__v_lt_$(V)) | ||
8228 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
8229 | am__v_lt_0 = --silent | ||
8230 | libgstlibvisualgl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
8231 | $(libgstlibvisualgl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
8232 | @@ -127,21 +121,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
8233 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
8234 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
8235 | $(AM_CFLAGS) $(CFLAGS) | ||
8236 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
8237 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
8238 | +AM_V_CC = $(am__v_CC_$(V)) | ||
8239 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
8240 | am__v_CC_0 = @echo " CC " $@; | ||
8241 | -AM_V_at = $(am__v_at_@AM_V@) | ||
8242 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
8243 | +AM_V_at = $(am__v_at_$(V)) | ||
8244 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
8245 | am__v_at_0 = @ | ||
8246 | CCLD = $(CC) | ||
8247 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
8248 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
8249 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
8250 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
8251 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
8252 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
8253 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
8254 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
8255 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
8256 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
8257 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
8258 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
8259 | am__v_GEN_0 = @echo " GEN " $@; | ||
8260 | SOURCES = $(libgstlibvisualgl_la_SOURCES) | ||
8261 | DIST_SOURCES = $(libgstlibvisualgl_la_SOURCES) | ||
8262 | @@ -194,6 +188,7 @@ ECHO_T = @ECHO_T@ | ||
8263 | EGREP = @EGREP@ | ||
8264 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
8265 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
8266 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
8267 | EXEEXT = @EXEEXT@ | ||
8268 | FFLAGS = @FFLAGS@ | ||
8269 | FGREP = @FGREP@ | ||
8270 | @@ -225,6 +220,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
8271 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
8272 | GST_CURRENT = @GST_CURRENT@ | ||
8273 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
8274 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
8275 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
8276 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
8277 | GST_LIBS = @GST_LIBS@ | ||
8278 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
8279 | @@ -232,8 +229,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
8280 | GST_LICENSE = @GST_LICENSE@ | ||
8281 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
8282 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
8283 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
8284 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
8285 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
8286 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
8287 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
8288 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
8289 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
8290 | @@ -306,7 +305,7 @@ NM = @NM@ | ||
8291 | NMEDIT = @NMEDIT@ | ||
8292 | OBJC = @OBJC@ | ||
8293 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
8294 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
8295 | +OBJCFLAGS = @OBJCFLAGS@ | ||
8296 | OBJDUMP = @OBJDUMP@ | ||
8297 | OBJEXT = @OBJEXT@ | ||
8298 | OPENGL_ES2 = @OPENGL_ES2@ | ||
8299 | @@ -351,6 +350,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
8300 | VERSION = @VERSION@ | ||
8301 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
8302 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
8303 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
8304 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
8305 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
8306 | XGETTEXT = @XGETTEXT@ | ||
8307 | @@ -416,7 +416,11 @@ sbindir = @sbindir@ | ||
8308 | sharedstatedir = @sharedstatedir@ | ||
8309 | srcdir = @srcdir@ | ||
8310 | sysconfdir = @sysconfdir@ | ||
8311 | +target = @target@ | ||
8312 | target_alias = @target_alias@ | ||
8313 | +target_cpu = @target_cpu@ | ||
8314 | +target_os = @target_os@ | ||
8315 | +target_vendor = @target_vendor@ | ||
8316 | top_build_prefix = @top_build_prefix@ | ||
8317 | top_builddir = @top_builddir@ | ||
8318 | top_srcdir = @top_srcdir@ | ||
8319 | @@ -497,7 +501,7 @@ clean-pluginLTLIBRARIES: | ||
8320 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
8321 | rm -f "$${dir}/so_locations"; \ | ||
8322 | done | ||
8323 | -libgstlibvisualgl.la: $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_DEPENDENCIES) $(EXTRA_libgstlibvisualgl_la_DEPENDENCIES) | ||
8324 | +libgstlibvisualgl.la: $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_DEPENDENCIES) | ||
8325 | $(AM_V_CCLD)$(libgstlibvisualgl_la_LINK) -rpath $(plugindir) $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_LIBADD) $(LIBS) | ||
8326 | |||
8327 | mostlyclean-compile: | ||
8328 | @@ -511,30 +515,34 @@ distclean-compile: | ||
8329 | .c.o: | ||
8330 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
8331 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
8332 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
8333 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
8334 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
8335 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
8336 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
8337 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
8338 | |||
8339 | .c.obj: | ||
8340 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
8341 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
8342 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
8343 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
8344 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
8345 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
8346 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
8347 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
8348 | |||
8349 | .c.lo: | ||
8350 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
8351 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
8352 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
8353 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
8354 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
8355 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
8356 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
8357 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
8358 | |||
8359 | libgstlibvisualgl_la-visual-gl.lo: visual-gl.c | ||
8360 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibvisualgl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibvisualgl_la_CFLAGS) $(CFLAGS) -MT libgstlibvisualgl_la-visual-gl.lo -MD -MP -MF $(DEPDIR)/libgstlibvisualgl_la-visual-gl.Tpo -c -o libgstlibvisualgl_la-visual-gl.lo `test -f 'visual-gl.c' || echo '$(srcdir)/'`visual-gl.c | ||
8361 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibvisualgl_la-visual-gl.Tpo $(DEPDIR)/libgstlibvisualgl_la-visual-gl.Plo | ||
8362 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='visual-gl.c' object='libgstlibvisualgl_la-visual-gl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
8363 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
8364 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='visual-gl.c' object='libgstlibvisualgl_la-visual-gl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
8365 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
8366 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibvisualgl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibvisualgl_la_CFLAGS) $(CFLAGS) -c -o libgstlibvisualgl_la-visual-gl.lo `test -f 'visual-gl.c' || echo '$(srcdir)/'`visual-gl.c | ||
8367 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibvisualgl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibvisualgl_la_CFLAGS) $(CFLAGS) -c -o libgstlibvisualgl_la-visual-gl.lo `test -f 'visual-gl.c' || echo '$(srcdir)/'`visual-gl.c | ||
8368 | |||
8369 | mostlyclean-libtool: | ||
8370 | -rm -f *.lo | ||
8371 | @@ -641,15 +649,10 @@ install-am: all-am | ||
8372 | |||
8373 | installcheck: installcheck-am | ||
8374 | install-strip: | ||
8375 | - if test -z '$(STRIP)'; then \ | ||
8376 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8377 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8378 | - install; \ | ||
8379 | - else \ | ||
8380 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8381 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8382 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
8383 | - fi | ||
8384 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8385 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8386 | + `test -z '$(STRIP)' || \ | ||
8387 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
8388 | mostlyclean-generic: | ||
8389 | |||
8390 | clean-generic: | ||
8391 | diff --git a/gst-libs/CMakeLists.txt b/gst-libs/CMakeLists.txt | ||
8392 | new file mode 100644 | ||
8393 | index 0000000..1049a2d | ||
8394 | --- /dev/null | ||
8395 | +++ b/gst-libs/CMakeLists.txt | ||
8396 | @@ -0,0 +1 @@ | ||
8397 | +add_subdirectory (gst) | ||
8398 | diff --git a/gst-libs/Makefile.in b/gst-libs/Makefile.in | ||
8399 | index f37923d..cb69d9d 100644 | ||
8400 | --- a/gst-libs/Makefile.in | ||
8401 | +++ b/gst-libs/Makefile.in | ||
8402 | @@ -1,9 +1,9 @@ | ||
8403 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
8404 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
8405 | # @configure_input@ | ||
8406 | |||
8407 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
8408 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
8409 | -# Foundation, Inc. | ||
8410 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
8411 | +# Inc. | ||
8412 | # This Makefile.in is free software; the Free Software Foundation | ||
8413 | # gives unlimited permission to copy and/or distribute it, | ||
8414 | # with or without modifications, as long as this notice is preserved. | ||
8415 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
8416 | POST_UNINSTALL = : | ||
8417 | build_triplet = @build@ | ||
8418 | host_triplet = @host@ | ||
8419 | +target_triplet = @target@ | ||
8420 | subdir = gst-libs | ||
8421 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
8422 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
8423 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
8424 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
8425 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
8426 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
8427 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
8428 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
8429 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
8430 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
8431 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
8432 | CONFIG_HEADER = $(top_builddir)/config.h | ||
8433 | CONFIG_CLEAN_FILES = | ||
8434 | CONFIG_CLEAN_VPATH_FILES = | ||
8435 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
8436 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
8437 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
8438 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
8439 | am__v_GEN_0 = @echo " GEN " $@; | ||
8440 | -AM_V_at = $(am__v_at_@AM_V@) | ||
8441 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
8442 | +AM_V_at = $(am__v_at_$(V)) | ||
8443 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
8444 | am__v_at_0 = @ | ||
8445 | SOURCES = | ||
8446 | DIST_SOURCES = | ||
8447 | @@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ | ||
8448 | EGREP = @EGREP@ | ||
8449 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
8450 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
8451 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
8452 | EXEEXT = @EXEEXT@ | ||
8453 | FFLAGS = @FFLAGS@ | ||
8454 | FGREP = @FGREP@ | ||
8455 | @@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
8456 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
8457 | GST_CURRENT = @GST_CURRENT@ | ||
8458 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
8459 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
8460 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
8461 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
8462 | GST_LIBS = @GST_LIBS@ | ||
8463 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
8464 | @@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
8465 | GST_LICENSE = @GST_LICENSE@ | ||
8466 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
8467 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
8468 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
8469 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
8470 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
8471 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
8472 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
8473 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
8474 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
8475 | @@ -280,7 +285,7 @@ NM = @NM@ | ||
8476 | NMEDIT = @NMEDIT@ | ||
8477 | OBJC = @OBJC@ | ||
8478 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
8479 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
8480 | +OBJCFLAGS = @OBJCFLAGS@ | ||
8481 | OBJDUMP = @OBJDUMP@ | ||
8482 | OBJEXT = @OBJEXT@ | ||
8483 | OPENGL_ES2 = @OPENGL_ES2@ | ||
8484 | @@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
8485 | VERSION = @VERSION@ | ||
8486 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
8487 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
8488 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
8489 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
8490 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
8491 | XGETTEXT = @XGETTEXT@ | ||
8492 | @@ -390,7 +396,11 @@ sbindir = @sbindir@ | ||
8493 | sharedstatedir = @sharedstatedir@ | ||
8494 | srcdir = @srcdir@ | ||
8495 | sysconfdir = @sysconfdir@ | ||
8496 | +target = @target@ | ||
8497 | target_alias = @target_alias@ | ||
8498 | +target_cpu = @target_cpu@ | ||
8499 | +target_os = @target_os@ | ||
8500 | +target_vendor = @target_vendor@ | ||
8501 | top_build_prefix = @top_build_prefix@ | ||
8502 | top_builddir = @top_builddir@ | ||
8503 | top_srcdir = @top_srcdir@ | ||
8504 | @@ -643,15 +653,10 @@ install-am: all-am | ||
8505 | |||
8506 | installcheck: installcheck-recursive | ||
8507 | install-strip: | ||
8508 | - if test -z '$(STRIP)'; then \ | ||
8509 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8510 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8511 | - install; \ | ||
8512 | - else \ | ||
8513 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8514 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8515 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
8516 | - fi | ||
8517 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8518 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8519 | + `test -z '$(STRIP)' || \ | ||
8520 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
8521 | mostlyclean-generic: | ||
8522 | |||
8523 | clean-generic: | ||
8524 | diff --git a/gst-libs/gst/CMakeLists.txt b/gst-libs/gst/CMakeLists.txt | ||
8525 | new file mode 100644 | ||
8526 | index 0000000..3300d05 | ||
8527 | --- /dev/null | ||
8528 | +++ b/gst-libs/gst/CMakeLists.txt | ||
8529 | @@ -0,0 +1 @@ | ||
8530 | +add_subdirectory (gl) | ||
8531 | diff --git a/gst-libs/gst/Makefile.in b/gst-libs/gst/Makefile.in | ||
8532 | index 09f2186..10cf980 100644 | ||
8533 | --- a/gst-libs/gst/Makefile.in | ||
8534 | +++ b/gst-libs/gst/Makefile.in | ||
8535 | @@ -1,9 +1,9 @@ | ||
8536 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
8537 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
8538 | # @configure_input@ | ||
8539 | |||
8540 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
8541 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
8542 | -# Foundation, Inc. | ||
8543 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
8544 | +# Inc. | ||
8545 | # This Makefile.in is free software; the Free Software Foundation | ||
8546 | # gives unlimited permission to copy and/or distribute it, | ||
8547 | # with or without modifications, as long as this notice is preserved. | ||
8548 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
8549 | POST_UNINSTALL = : | ||
8550 | build_triplet = @build@ | ||
8551 | host_triplet = @host@ | ||
8552 | +target_triplet = @target@ | ||
8553 | subdir = gst-libs/gst | ||
8554 | DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ | ||
8555 | $(srcdir)/Makefile.in | ||
8556 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
8557 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
8558 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
8559 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
8560 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
8561 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
8562 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
8563 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
8564 | @@ -75,11 +75,11 @@ mkinstalldirs = $(install_sh) -d | ||
8565 | CONFIG_HEADER = $(top_builddir)/config.h | ||
8566 | CONFIG_CLEAN_FILES = | ||
8567 | CONFIG_CLEAN_VPATH_FILES = | ||
8568 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
8569 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
8570 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
8571 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
8572 | am__v_GEN_0 = @echo " GEN " $@; | ||
8573 | -AM_V_at = $(am__v_at_@AM_V@) | ||
8574 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
8575 | +AM_V_at = $(am__v_at_$(V)) | ||
8576 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
8577 | am__v_at_0 = @ | ||
8578 | SOURCES = | ||
8579 | DIST_SOURCES = | ||
8580 | @@ -171,6 +171,7 @@ ECHO_T = @ECHO_T@ | ||
8581 | EGREP = @EGREP@ | ||
8582 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
8583 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
8584 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
8585 | EXEEXT = @EXEEXT@ | ||
8586 | FFLAGS = @FFLAGS@ | ||
8587 | FGREP = @FGREP@ | ||
8588 | @@ -202,6 +203,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
8589 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
8590 | GST_CURRENT = @GST_CURRENT@ | ||
8591 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
8592 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
8593 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
8594 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
8595 | GST_LIBS = @GST_LIBS@ | ||
8596 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
8597 | @@ -209,8 +212,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
8598 | GST_LICENSE = @GST_LICENSE@ | ||
8599 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
8600 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
8601 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
8602 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
8603 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
8604 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
8605 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
8606 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
8607 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
8608 | @@ -283,7 +288,7 @@ NM = @NM@ | ||
8609 | NMEDIT = @NMEDIT@ | ||
8610 | OBJC = @OBJC@ | ||
8611 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
8612 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
8613 | +OBJCFLAGS = @OBJCFLAGS@ | ||
8614 | OBJDUMP = @OBJDUMP@ | ||
8615 | OBJEXT = @OBJEXT@ | ||
8616 | OPENGL_ES2 = @OPENGL_ES2@ | ||
8617 | @@ -328,6 +333,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
8618 | VERSION = @VERSION@ | ||
8619 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
8620 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
8621 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
8622 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
8623 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
8624 | XGETTEXT = @XGETTEXT@ | ||
8625 | @@ -393,7 +399,11 @@ sbindir = @sbindir@ | ||
8626 | sharedstatedir = @sharedstatedir@ | ||
8627 | srcdir = @srcdir@ | ||
8628 | sysconfdir = @sysconfdir@ | ||
8629 | +target = @target@ | ||
8630 | target_alias = @target_alias@ | ||
8631 | +target_cpu = @target_cpu@ | ||
8632 | +target_os = @target_os@ | ||
8633 | +target_vendor = @target_vendor@ | ||
8634 | top_build_prefix = @top_build_prefix@ | ||
8635 | top_builddir = @top_builddir@ | ||
8636 | top_srcdir = @top_srcdir@ | ||
8637 | @@ -650,15 +660,10 @@ install-am: all-am | ||
8638 | |||
8639 | installcheck: installcheck-recursive | ||
8640 | install-strip: | ||
8641 | - if test -z '$(STRIP)'; then \ | ||
8642 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8643 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8644 | - install; \ | ||
8645 | - else \ | ||
8646 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8647 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8648 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
8649 | - fi | ||
8650 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
8651 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
8652 | + `test -z '$(STRIP)' || \ | ||
8653 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
8654 | mostlyclean-generic: | ||
8655 | |||
8656 | clean-generic: | ||
8657 | diff --git a/gst-libs/gst/gl/CMakeLists.txt b/gst-libs/gst/gl/CMakeLists.txt | ||
8658 | new file mode 100644 | ||
8659 | index 0000000..cbe95fe | ||
8660 | --- /dev/null | ||
8661 | +++ b/gst-libs/gst/gl/CMakeLists.txt | ||
8662 | @@ -0,0 +1,86 @@ | ||
8663 | +#FIXME: generate config.h | ||
8664 | +add_definitions(-DHAVE_CONFIG_H) | ||
8665 | + | ||
8666 | +include_directories(AFTER | ||
8667 | + . | ||
8668 | + ${GLEW_INCLUDE_DIR} | ||
8669 | + ${GSTREAMER_INCLUDE_DIR} | ||
8670 | + ${GLIB2_INCLUDE_DIR}) | ||
8671 | + | ||
8672 | +if (NOT GST_USING_BINARY_REGISTRY) | ||
8673 | +include_directories(AFTER | ||
8674 | + ${LIBXML2_INCLUDE_DIR} | ||
8675 | + ${LIBICONV_INCLUDE_DIR}) | ||
8676 | +endif (NOT GST_USING_BINARY_REGISTRY) | ||
8677 | + | ||
8678 | +if (WIN32) | ||
8679 | + | ||
8680 | +include_directories(AFTER | ||
8681 | + ../../../win32/common) | ||
8682 | + | ||
8683 | +add_library (gstgl STATIC | ||
8684 | + gstglwindow_win32.c | ||
8685 | + gstgldisplay.c | ||
8686 | + gstglbuffer.c | ||
8687 | + gstglfilter.c | ||
8688 | + gstglmixer.c | ||
8689 | + gstglshadervariables.c | ||
8690 | + gstglshader.c) | ||
8691 | + | ||
8692 | +target_link_libraries(gstgl | ||
8693 | + general ${OPENGL_LIBRARIES} | ||
8694 | + general ${GLEW_LIBRARY} | ||
8695 | + general ${GLIB2_LIBRARIES} | ||
8696 | + general ${GSTREAMER_LIBRARIES} | ||
8697 | + gdi32 | ||
8698 | + winmm) | ||
8699 | + | ||
8700 | +else (WIN32) | ||
8701 | + | ||
8702 | + if (APPLE) | ||
8703 | + | ||
8704 | + include_directories(AFTER | ||
8705 | + ../../..) | ||
8706 | + | ||
8707 | + add_library (gstgl STATIC | ||
8708 | + gstglwindow_cocoa.m | ||
8709 | + gstgldisplay.c | ||
8710 | + gstglbuffer.c | ||
8711 | + gstglfilter.c | ||
8712 | + gstglmixer.c | ||
8713 | + gstglshadervariables.c | ||
8714 | + gstglshader.c) | ||
8715 | + | ||
8716 | + target_link_libraries(gstgl | ||
8717 | + general ${OPENGL_LIBRARIES} | ||
8718 | + general ${GLEW_LIBRARY} | ||
8719 | + general ${GLIB2_LIBRARIES} | ||
8720 | + general ${GSTREAMER_LIBRARIES} | ||
8721 | + "-L/opt/local/lib" | ||
8722 | + "-lintl" | ||
8723 | + "-framework OpenGL" | ||
8724 | + "-framework Cocoa") | ||
8725 | + | ||
8726 | + else (APPLE) | ||
8727 | + | ||
8728 | + include_directories(AFTER | ||
8729 | + ../../..) | ||
8730 | + | ||
8731 | + add_library (gstgl STATIC | ||
8732 | + gstglwindow_x11.c | ||
8733 | + gstgldisplay.c | ||
8734 | + gstglbuffer.c | ||
8735 | + gstglfilter.c | ||
8736 | + gstglmixer.c | ||
8737 | + gstglshadervariables.c | ||
8738 | + gstglshader.c) | ||
8739 | + | ||
8740 | + target_link_libraries(gstgl | ||
8741 | + general ${OPENGL_LIBRARIES} | ||
8742 | + general ${GLEW_LIBRARY} | ||
8743 | + general ${GLIB2_LIBRARIES} | ||
8744 | + general ${GSTREAMER_LIBRARIES}) | ||
8745 | + | ||
8746 | + endif (APPLE) | ||
8747 | + | ||
8748 | +endif (WIN32) | ||
8749 | diff --git a/gst-libs/gst/gl/GNUmakefile.gnustep b/gst-libs/gst/gl/GNUmakefile.gnustep | ||
8750 | new file mode 100644 | ||
8751 | index 0000000..bb977f4 | ||
8752 | --- /dev/null | ||
8753 | +++ b/gst-libs/gst/gl/GNUmakefile.gnustep | ||
8754 | @@ -0,0 +1,27 @@ | ||
8755 | +include $(GNUSTEP_MAKEFILES)/common.make | ||
8756 | + | ||
8757 | +SUBPROJECT_NAME = gstlibsgstgl | ||
8758 | + | ||
8759 | +gstlibsgstgl_C_FILES = \ | ||
8760 | + gstgldisplay.c \ | ||
8761 | + gstglbuffer.c \ | ||
8762 | + gstglfilter.c \ | ||
8763 | + gstglmixer.c \ | ||
8764 | + gstglshadervariables.c \ | ||
8765 | + gstglshader.c | ||
8766 | + | ||
8767 | +gstlibsgstgl_OBJC_FILES = gstglwindow_cocoa.m | ||
8768 | + | ||
8769 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
8770 | +gstlibsgstgl_INCLUDE_DIRS = \ | ||
8771 | + -I../../../win32/common \ | ||
8772 | + -IC:/gstreamer/include/libxml2 \ | ||
8773 | + -IC:/gstreamer/include/glib-2.0 \ | ||
8774 | + -IC:/gstreamer/lib/glib-2.0/include \ | ||
8775 | + -IC:/gstreamer/include \ | ||
8776 | + -IC:/gstreamer/include/gstreamer-0.10 | ||
8777 | +endif | ||
8778 | + | ||
8779 | +gstlibsgstgl_CFLAGS = -Wall -DHAVE_CONFIG_H | ||
8780 | + | ||
8781 | +include $(GNUSTEP_MAKEFILES)/subproject.make | ||
8782 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | ||
8783 | index 2ef7afc..d55a513 100644 | ||
8784 | --- a/gst-libs/gst/gl/Makefile.am | ||
8785 | +++ b/gst-libs/gst/gl/Makefile.am | ||
8786 | @@ -4,6 +4,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la | ||
8787 | EXTRA_DIST = \ | ||
8788 | gstglwindow_x11.c \ | ||
8789 | gstglwindow_x11ES2.c \ | ||
8790 | + gstglwindow_fbES2.c \ | ||
8791 | gstglwindow_win32.c \ | ||
8792 | gstglwindow_winCE.c \ | ||
8793 | gstglwindow_cocoa.m | ||
8794 | @@ -28,6 +29,13 @@ endif | ||
8795 | if GL_BACKEND_X11ES2 | ||
8796 | libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c | ||
8797 | endif | ||
8798 | +if GL_BACKEND_FBES2 | ||
8799 | +libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_fbES2.c | ||
8800 | +endif | ||
8801 | + | ||
8802 | +if USE_VIVANTE | ||
8803 | +libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglvivante.c | ||
8804 | +endif | ||
8805 | |||
8806 | libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl | ||
8807 | libgstgl_@GST_MAJORMINOR@include_HEADERS = \ | ||
8808 | @@ -41,13 +49,19 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \ | ||
8809 | gstglshadervariables.h \ | ||
8810 | gstglshader.h | ||
8811 | |||
8812 | +if USE_VIVANTE | ||
8813 | +libgstgl_@GST_MAJORMINOR@include_HEADERS += gstglvivante.h | ||
8814 | +endif | ||
8815 | + | ||
8816 | libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ | ||
8817 | $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ | ||
8818 | + $(GST_FSL_LIBS) \ | ||
8819 | $(GST_BASE_LIBS) $(GST_LIBS) \ | ||
8820 | $(GL_LIBS) | ||
8821 | |||
8822 | libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ | ||
8823 | $(GL_CFLAGS) $(X_CFLAGS) \ | ||
8824 | + $(GST_FSL_CFLAGS) \ | ||
8825 | $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) | ||
8826 | libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ | ||
8827 | $(GL_CFLAGS) $(X_CFLAGS) \ | ||
8828 | diff --git a/gst-libs/gst/gl/Makefile.in b/gst-libs/gst/gl/Makefile.in | ||
8829 | index e38d211..3f97a17 100644 | ||
8830 | --- a/gst-libs/gst/gl/Makefile.in | ||
8831 | +++ b/gst-libs/gst/gl/Makefile.in | ||
8832 | @@ -1,9 +1,9 @@ | ||
8833 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
8834 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
8835 | # @configure_input@ | ||
8836 | |||
8837 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
8838 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
8839 | -# Foundation, Inc. | ||
8840 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
8841 | +# Inc. | ||
8842 | # This Makefile.in is free software; the Free Software Foundation | ||
8843 | # gives unlimited permission to copy and/or distribute it, | ||
8844 | # with or without modifications, as long as this notice is preserved. | ||
8845 | @@ -35,19 +35,22 @@ PRE_UNINSTALL = : | ||
8846 | POST_UNINSTALL = : | ||
8847 | build_triplet = @build@ | ||
8848 | host_triplet = @host@ | ||
8849 | +target_triplet = @target@ | ||
8850 | @GL_BACKEND_WIN32_TRUE@am__append_1 = gstglwindow_win32.c | ||
8851 | @GL_BACKEND_COCOA_TRUE@am__append_2 = gstglwindow_cocoa.m | ||
8852 | @GL_BACKEND_X11_TRUE@am__append_3 = gstglwindow_x11.c | ||
8853 | @GL_BACKEND_X11ES2_TRUE@am__append_4 = gstglwindow_x11ES2.c | ||
8854 | +@GL_BACKEND_FBES2_TRUE@am__append_5 = gstglwindow_fbES2.c | ||
8855 | +@USE_VIVANTE_TRUE@am__append_6 = gstglvivante.c | ||
8856 | +@USE_VIVANTE_TRUE@am__append_7 = gstglvivante.h | ||
8857 | subdir = gst-libs/gst/gl | ||
8858 | -DIST_COMMON = $(libgstgl_@GST_MAJORMINOR@include_HEADERS) \ | ||
8859 | +DIST_COMMON = $(am__libgstgl_@GST_MAJORMINOR@include_HEADERS_DIST) \ | ||
8860 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
8861 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
8862 | am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
8863 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
8864 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
8865 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
8866 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
8867 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
8868 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
8869 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
8870 | @@ -101,27 +104,24 @@ am__nobase_list = $(am__nobase_strip_setup); \ | ||
8871 | am__base_list = \ | ||
8872 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
8873 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
8874 | -am__uninstall_files_from_dir = { \ | ||
8875 | - test -z "$$files" \ | ||
8876 | - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
8877 | - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
8878 | - $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
8879 | - } | ||
8880 | am__installdirs = "$(DESTDIR)$(libdir)" \ | ||
8881 | "$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)" | ||
8882 | LTLIBRARIES = $(lib_LTLIBRARIES) | ||
8883 | am__DEPENDENCIES_1 = | ||
8884 | libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | ||
8885 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
8886 | - $(am__DEPENDENCIES_1) | ||
8887 | + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
8888 | am__libgstgl_@GST_MAJORMINOR@_la_SOURCES_DIST = gstgldisplay.c \ | ||
8889 | gstglbuffer.c gstglfilter.c gstglmixer.c gstglshader.c \ | ||
8890 | gstglshadervariables.c gstglwindow_win32.c gstglwindow_cocoa.m \ | ||
8891 | - gstglwindow_x11.c gstglwindow_x11ES2.c | ||
8892 | + gstglwindow_x11.c gstglwindow_x11ES2.c gstglwindow_fbES2.c \ | ||
8893 | + gstglvivante.c | ||
8894 | @GL_BACKEND_WIN32_TRUE@am__objects_1 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo | ||
8895 | @GL_BACKEND_COCOA_TRUE@am__objects_2 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo | ||
8896 | @GL_BACKEND_X11_TRUE@am__objects_3 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo | ||
8897 | @GL_BACKEND_X11ES2_TRUE@am__objects_4 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo | ||
8898 | +@GL_BACKEND_FBES2_TRUE@am__objects_5 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo | ||
8899 | +@USE_VIVANTE_TRUE@am__objects_6 = libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo | ||
8900 | am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ | ||
8901 | libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo \ | ||
8902 | libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo \ | ||
8903 | @@ -130,11 +130,11 @@ am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ | ||
8904 | libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo \ | ||
8905 | libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo \ | ||
8906 | $(am__objects_1) $(am__objects_2) $(am__objects_3) \ | ||
8907 | - $(am__objects_4) | ||
8908 | + $(am__objects_4) $(am__objects_5) $(am__objects_6) | ||
8909 | libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ | ||
8910 | $(am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS) | ||
8911 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
8912 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
8913 | +AM_V_lt = $(am__v_lt_$(V)) | ||
8914 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
8915 | am__v_lt_0 = --silent | ||
8916 | libgstgl_@GST_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \ | ||
8917 | $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
8918 | @@ -151,18 +151,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
8919 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
8920 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
8921 | $(AM_CFLAGS) $(CFLAGS) | ||
8922 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
8923 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
8924 | +AM_V_CC = $(am__v_CC_$(V)) | ||
8925 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
8926 | am__v_CC_0 = @echo " CC " $@; | ||
8927 | -AM_V_at = $(am__v_at_@AM_V@) | ||
8928 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
8929 | +AM_V_at = $(am__v_at_$(V)) | ||
8930 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
8931 | am__v_at_0 = @ | ||
8932 | CCLD = $(CC) | ||
8933 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
8934 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
8935 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
8936 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
8937 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
8938 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
8939 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
8940 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
8941 | OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
8942 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) | ||
8943 | @@ -170,21 +170,25 @@ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ | ||
8944 | $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \ | ||
8945 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
8946 | $(AM_OBJCFLAGS) $(OBJCFLAGS) | ||
8947 | -AM_V_OBJC = $(am__v_OBJC_@AM_V@) | ||
8948 | -am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@) | ||
8949 | +AM_V_OBJC = $(am__v_OBJC_$(V)) | ||
8950 | +am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY)) | ||
8951 | am__v_OBJC_0 = @echo " OBJC " $@; | ||
8952 | OBJCLD = $(OBJC) | ||
8953 | OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
8954 | --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ | ||
8955 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
8956 | -AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@) | ||
8957 | -am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@) | ||
8958 | +AM_V_OBJCLD = $(am__v_OBJCLD_$(V)) | ||
8959 | +am__v_OBJCLD_ = $(am__v_OBJCLD_$(AM_DEFAULT_VERBOSITY)) | ||
8960 | am__v_OBJCLD_0 = @echo " OBJCLD" $@; | ||
8961 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
8962 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
8963 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
8964 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
8965 | am__v_GEN_0 = @echo " GEN " $@; | ||
8966 | SOURCES = $(libgstgl_@GST_MAJORMINOR@_la_SOURCES) | ||
8967 | DIST_SOURCES = $(am__libgstgl_@GST_MAJORMINOR@_la_SOURCES_DIST) | ||
8968 | +am__libgstgl_@GST_MAJORMINOR@include_HEADERS_DIST = gstglwindow.h \ | ||
8969 | + gstgldisplay.h gstglbuffer.h gstgles2.h gstglfilter.h \ | ||
8970 | + gstglmixer.h gstglmixerpad.h gstglshadervariables.h \ | ||
8971 | + gstglshader.h gstglvivante.h | ||
8972 | HEADERS = $(libgstgl_@GST_MAJORMINOR@include_HEADERS) | ||
8973 | ETAGS = etags | ||
8974 | CTAGS = ctags | ||
8975 | @@ -235,6 +239,7 @@ ECHO_T = @ECHO_T@ | ||
8976 | EGREP = @EGREP@ | ||
8977 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
8978 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
8979 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
8980 | EXEEXT = @EXEEXT@ | ||
8981 | FFLAGS = @FFLAGS@ | ||
8982 | FGREP = @FGREP@ | ||
8983 | @@ -266,6 +271,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
8984 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
8985 | GST_CURRENT = @GST_CURRENT@ | ||
8986 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
8987 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
8988 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
8989 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
8990 | GST_LIBS = @GST_LIBS@ | ||
8991 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
8992 | @@ -273,8 +280,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
8993 | GST_LICENSE = @GST_LICENSE@ | ||
8994 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
8995 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
8996 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
8997 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
8998 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
8999 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
9000 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
9001 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
9002 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
9003 | @@ -347,7 +356,7 @@ NM = @NM@ | ||
9004 | NMEDIT = @NMEDIT@ | ||
9005 | OBJC = @OBJC@ | ||
9006 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
9007 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
9008 | +OBJCFLAGS = @OBJCFLAGS@ | ||
9009 | OBJDUMP = @OBJDUMP@ | ||
9010 | OBJEXT = @OBJEXT@ | ||
9011 | OPENGL_ES2 = @OPENGL_ES2@ | ||
9012 | @@ -392,6 +401,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
9013 | VERSION = @VERSION@ | ||
9014 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
9015 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
9016 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
9017 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
9018 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
9019 | XGETTEXT = @XGETTEXT@ | ||
9020 | @@ -457,7 +467,11 @@ sbindir = @sbindir@ | ||
9021 | sharedstatedir = @sharedstatedir@ | ||
9022 | srcdir = @srcdir@ | ||
9023 | sysconfdir = @sysconfdir@ | ||
9024 | +target = @target@ | ||
9025 | target_alias = @target_alias@ | ||
9026 | +target_cpu = @target_cpu@ | ||
9027 | +target_os = @target_os@ | ||
9028 | +target_vendor = @target_vendor@ | ||
9029 | top_build_prefix = @top_build_prefix@ | ||
9030 | top_builddir = @top_builddir@ | ||
9031 | top_srcdir = @top_srcdir@ | ||
9032 | @@ -465,6 +479,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la | ||
9033 | EXTRA_DIST = \ | ||
9034 | gstglwindow_x11.c \ | ||
9035 | gstglwindow_x11ES2.c \ | ||
9036 | + gstglwindow_fbES2.c \ | ||
9037 | gstglwindow_win32.c \ | ||
9038 | gstglwindow_winCE.c \ | ||
9039 | gstglwindow_cocoa.m | ||
9040 | @@ -472,26 +487,22 @@ EXTRA_DIST = \ | ||
9041 | libgstgl_@GST_MAJORMINOR@_la_SOURCES = gstgldisplay.c gstglbuffer.c \ | ||
9042 | gstglfilter.c gstglmixer.c gstglshader.c \ | ||
9043 | gstglshadervariables.c $(am__append_1) $(am__append_2) \ | ||
9044 | - $(am__append_3) $(am__append_4) | ||
9045 | + $(am__append_3) $(am__append_4) $(am__append_5) \ | ||
9046 | + $(am__append_6) | ||
9047 | libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl | ||
9048 | -libgstgl_@GST_MAJORMINOR@include_HEADERS = \ | ||
9049 | - gstglwindow.h \ | ||
9050 | - gstgldisplay.h \ | ||
9051 | - gstglbuffer.h \ | ||
9052 | - gstgles2.h \ | ||
9053 | - gstglfilter.h \ | ||
9054 | - gstglmixer.h \ | ||
9055 | - gstglmixerpad.h \ | ||
9056 | - gstglshadervariables.h \ | ||
9057 | - gstglshader.h | ||
9058 | - | ||
9059 | +libgstgl_@GST_MAJORMINOR@include_HEADERS = gstglwindow.h \ | ||
9060 | + gstgldisplay.h gstglbuffer.h gstgles2.h gstglfilter.h \ | ||
9061 | + gstglmixer.h gstglmixerpad.h gstglshadervariables.h \ | ||
9062 | + gstglshader.h $(am__append_7) | ||
9063 | libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ | ||
9064 | $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ | ||
9065 | + $(GST_FSL_LIBS) \ | ||
9066 | $(GST_BASE_LIBS) $(GST_LIBS) \ | ||
9067 | $(GL_LIBS) | ||
9068 | |||
9069 | libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ | ||
9070 | $(GL_CFLAGS) $(X_CFLAGS) \ | ||
9071 | + $(GST_FSL_CFLAGS) \ | ||
9072 | $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) | ||
9073 | |||
9074 | libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ | ||
9075 | @@ -568,7 +579,7 @@ clean-libLTLIBRARIES: | ||
9076 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
9077 | rm -f "$${dir}/so_locations"; \ | ||
9078 | done | ||
9079 | -libgstgl-@GST_MAJORMINOR@.la: $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) $(EXTRA_libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) | ||
9080 | +libgstgl-@GST_MAJORMINOR@.la: $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) | ||
9081 | $(AM_V_OBJCLD)$(libgstgl_@GST_MAJORMINOR@_la_LINK) -rpath $(libdir) $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_LIBADD) $(LIBS) | ||
9082 | |||
9083 | mostlyclean-compile: | ||
9084 | @@ -583,7 +594,9 @@ distclean-compile: | ||
9085 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Plo@am__quote@ | ||
9086 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Plo@am__quote@ | ||
9087 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Plo@am__quote@ | ||
9088 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Plo@am__quote@ | ||
9089 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Plo@am__quote@ | ||
9090 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Plo@am__quote@ | ||
9091 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Plo@am__quote@ | ||
9092 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Plo@am__quote@ | ||
9093 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Plo@am__quote@ | ||
9094 | @@ -591,114 +604,146 @@ distclean-compile: | ||
9095 | .c.o: | ||
9096 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
9097 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
9098 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9099 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9100 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9101 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9102 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
9103 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
9104 | |||
9105 | .c.obj: | ||
9106 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
9107 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
9108 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9109 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9110 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9111 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9112 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
9113 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
9114 | |||
9115 | .c.lo: | ||
9116 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
9117 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
9118 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
9119 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9120 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
9121 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9122 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
9123 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
9124 | |||
9125 | libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo: gstgldisplay.c | ||
9126 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo `test -f 'gstgldisplay.c' || echo '$(srcdir)/'`gstgldisplay.c | ||
9127 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.Plo | ||
9128 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldisplay.c' object='libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9129 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9130 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldisplay.c' object='libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9131 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9132 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo `test -f 'gstgldisplay.c' || echo '$(srcdir)/'`gstgldisplay.c | ||
9133 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo `test -f 'gstgldisplay.c' || echo '$(srcdir)/'`gstgldisplay.c | ||
9134 | |||
9135 | libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo: gstglbuffer.c | ||
9136 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo `test -f 'gstglbuffer.c' || echo '$(srcdir)/'`gstglbuffer.c | ||
9137 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.Plo | ||
9138 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglbuffer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9139 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9140 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglbuffer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9141 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9142 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo `test -f 'gstglbuffer.c' || echo '$(srcdir)/'`gstglbuffer.c | ||
9143 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo `test -f 'gstglbuffer.c' || echo '$(srcdir)/'`gstglbuffer.c | ||
9144 | |||
9145 | libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo: gstglfilter.c | ||
9146 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglfilter.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo `test -f 'gstglfilter.c' || echo '$(srcdir)/'`gstglfilter.c | ||
9147 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglfilter.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglfilter.Plo | ||
9148 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilter.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9149 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9150 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilter.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9151 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9152 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo `test -f 'gstglfilter.c' || echo '$(srcdir)/'`gstglfilter.c | ||
9153 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo `test -f 'gstglfilter.c' || echo '$(srcdir)/'`gstglfilter.c | ||
9154 | |||
9155 | libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo: gstglmixer.c | ||
9156 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo `test -f 'gstglmixer.c' || echo '$(srcdir)/'`gstglmixer.c | ||
9157 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Plo | ||
9158 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglmixer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9159 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9160 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglmixer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9161 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9162 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo `test -f 'gstglmixer.c' || echo '$(srcdir)/'`gstglmixer.c | ||
9163 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo `test -f 'gstglmixer.c' || echo '$(srcdir)/'`gstglmixer.c | ||
9164 | |||
9165 | libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo: gstglshader.c | ||
9166 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo `test -f 'gstglshader.c' || echo '$(srcdir)/'`gstglshader.c | ||
9167 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Plo | ||
9168 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglshader.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9169 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9170 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglshader.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9171 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9172 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo `test -f 'gstglshader.c' || echo '$(srcdir)/'`gstglshader.c | ||
9173 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo `test -f 'gstglshader.c' || echo '$(srcdir)/'`gstglshader.c | ||
9174 | |||
9175 | libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo: gstglshadervariables.c | ||
9176 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo `test -f 'gstglshadervariables.c' || echo '$(srcdir)/'`gstglshadervariables.c | ||
9177 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Plo | ||
9178 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglshadervariables.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9179 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9180 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglshadervariables.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9181 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9182 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo `test -f 'gstglshadervariables.c' || echo '$(srcdir)/'`gstglshadervariables.c | ||
9183 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo `test -f 'gstglshadervariables.c' || echo '$(srcdir)/'`gstglshadervariables.c | ||
9184 | |||
9185 | libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo: gstglwindow_win32.c | ||
9186 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo `test -f 'gstglwindow_win32.c' || echo '$(srcdir)/'`gstglwindow_win32.c | ||
9187 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Plo | ||
9188 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_win32.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9189 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9190 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_win32.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9191 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9192 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo `test -f 'gstglwindow_win32.c' || echo '$(srcdir)/'`gstglwindow_win32.c | ||
9193 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo `test -f 'gstglwindow_win32.c' || echo '$(srcdir)/'`gstglwindow_win32.c | ||
9194 | |||
9195 | libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo: gstglwindow_x11.c | ||
9196 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo `test -f 'gstglwindow_x11.c' || echo '$(srcdir)/'`gstglwindow_x11.c | ||
9197 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Plo | ||
9198 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_x11.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9199 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9200 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_x11.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9201 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9202 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo `test -f 'gstglwindow_x11.c' || echo '$(srcdir)/'`gstglwindow_x11.c | ||
9203 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo `test -f 'gstglwindow_x11.c' || echo '$(srcdir)/'`gstglwindow_x11.c | ||
9204 | |||
9205 | libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo: gstglwindow_x11ES2.c | ||
9206 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo `test -f 'gstglwindow_x11ES2.c' || echo '$(srcdir)/'`gstglwindow_x11ES2.c | ||
9207 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Plo | ||
9208 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_x11ES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9209 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9210 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_x11ES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9211 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9212 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo `test -f 'gstglwindow_x11ES2.c' || echo '$(srcdir)/'`gstglwindow_x11ES2.c | ||
9213 | + | ||
9214 | +libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo: gstglwindow_fbES2.c | ||
9215 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo `test -f 'gstglwindow_fbES2.c' || echo '$(srcdir)/'`gstglwindow_fbES2.c | ||
9216 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Plo | ||
9217 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9218 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_fbES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9219 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9220 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo `test -f 'gstglwindow_x11ES2.c' || echo '$(srcdir)/'`gstglwindow_x11ES2.c | ||
9221 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo `test -f 'gstglwindow_fbES2.c' || echo '$(srcdir)/'`gstglwindow_fbES2.c | ||
9222 | + | ||
9223 | +libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo: gstglvivante.c | ||
9224 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo `test -f 'gstglvivante.c' || echo '$(srcdir)/'`gstglvivante.c | ||
9225 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Plo | ||
9226 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
9227 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglvivante.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9228 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9229 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo `test -f 'gstglvivante.c' || echo '$(srcdir)/'`gstglvivante.c | ||
9230 | |||
9231 | .m.o: | ||
9232 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
9233 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
9234 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9235 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
9236 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9237 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9238 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< | ||
9239 | +@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $< | ||
9240 | |||
9241 | .m.obj: | ||
9242 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
9243 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
9244 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9245 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
9246 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
9247 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9248 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
9249 | +@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
9250 | |||
9251 | .m.lo: | ||
9252 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
9253 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
9254 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
9255 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
9256 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
9257 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9258 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $< | ||
9259 | +@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $< | ||
9260 | |||
9261 | libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo: gstglwindow_cocoa.m | ||
9262 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS) $(OBJCFLAGS) -MT libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo -MD -MP -MF $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Tpo -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo `test -f 'gstglwindow_cocoa.m' || echo '$(srcdir)/'`gstglwindow_cocoa.m | ||
9263 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Plo | ||
9264 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='gstglwindow_cocoa.m' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9265 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
9266 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='gstglwindow_cocoa.m' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo' libtool=yes @AMDEPBACKSLASH@ | ||
9267 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
9268 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo `test -f 'gstglwindow_cocoa.m' || echo '$(srcdir)/'`gstglwindow_cocoa.m | ||
9269 | +@am__fastdepOBJC_FALSE@ $(LIBTOOL) $(AM_V_lt) $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo `test -f 'gstglwindow_cocoa.m' || echo '$(srcdir)/'`gstglwindow_cocoa.m | ||
9270 | |||
9271 | mostlyclean-libtool: | ||
9272 | -rm -f *.lo | ||
9273 | @@ -722,7 +767,9 @@ uninstall-libgstgl_@GST_MAJORMINOR@includeHEADERS: | ||
9274 | @$(NORMAL_UNINSTALL) | ||
9275 | @list='$(libgstgl_@GST_MAJORMINOR@include_HEADERS)'; test -n "$(libgstgl_@GST_MAJORMINOR@includedir)" || list=; \ | ||
9276 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
9277 | - dir='$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)'; $(am__uninstall_files_from_dir) | ||
9278 | + test -n "$$files" || exit 0; \ | ||
9279 | + echo " ( cd '$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)' && rm -f" $$files ")"; \ | ||
9280 | + cd "$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)" && rm -f $$files | ||
9281 | |||
9282 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
9283 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
9284 | @@ -823,15 +870,10 @@ install-am: all-am | ||
9285 | |||
9286 | installcheck: installcheck-am | ||
9287 | install-strip: | ||
9288 | - if test -z '$(STRIP)'; then \ | ||
9289 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
9290 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
9291 | - install; \ | ||
9292 | - else \ | ||
9293 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
9294 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
9295 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
9296 | - fi | ||
9297 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
9298 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
9299 | + `test -z '$(STRIP)' || \ | ||
9300 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
9301 | mostlyclean-generic: | ||
9302 | |||
9303 | clean-generic: | ||
9304 | diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c | ||
9305 | index 64c6c2c..a2589cb 100644 | ||
9306 | --- a/gst-libs/gst/gl/gstgldisplay.c | ||
9307 | +++ b/gst-libs/gst/gl/gstgldisplay.c | ||
9308 | @@ -28,6 +28,9 @@ | ||
9309 | |||
9310 | #include <gst/video/gstvideosink.h> | ||
9311 | #include "gstgldisplay.h" | ||
9312 | +#ifdef GPU_VIVANTE | ||
9313 | +#include "gstglvivante.h" | ||
9314 | +#endif | ||
9315 | |||
9316 | #ifndef GLEW_VERSION_MAJOR | ||
9317 | #define GLEW_VERSION_MAJOR 4 | ||
9318 | @@ -468,6 +471,10 @@ gst_gl_display_init (GstGLDisplay * display, GstGLDisplayClass * klass) | ||
9319 | #endif | ||
9320 | |||
9321 | display->error_message = NULL; | ||
9322 | + | ||
9323 | +#ifdef GPU_VIVANTE | ||
9324 | + display->gpu_priv = gst_gl_vivante_new (); | ||
9325 | +#endif | ||
9326 | } | ||
9327 | |||
9328 | static void | ||
9329 | @@ -539,6 +546,12 @@ gst_gl_display_finalize (GObject * object) | ||
9330 | g_free (display->error_message); | ||
9331 | display->error_message = NULL; | ||
9332 | } | ||
9333 | +#ifdef GPU_VIVANTE | ||
9334 | + if (display->gpu_priv) { | ||
9335 | + gst_gl_vivante_delete (display->gpu_priv); | ||
9336 | + display->gpu_priv = NULL; | ||
9337 | + } | ||
9338 | +#endif | ||
9339 | } | ||
9340 | |||
9341 | |||
9342 | @@ -1135,6 +1148,17 @@ gst_gl_display_thread_init_upload (GstGLDisplay * display) | ||
9343 | void | ||
9344 | gst_gl_display_thread_do_upload (GstGLDisplay * display) | ||
9345 | { | ||
9346 | + if (display->gpu_priv && | ||
9347 | + display->upload_width == display->upload_data_width && | ||
9348 | + display->upload_height == display->upload_data_height) { | ||
9349 | +#ifdef GPU_VIVANTE | ||
9350 | + if (gst_gl_vivante_tex_upload (display->gpu_priv, display)) | ||
9351 | + return; | ||
9352 | +#endif | ||
9353 | + } | ||
9354 | + | ||
9355 | + GST_WARNING ("%s: Fall into non direct uploading", __func__); | ||
9356 | + | ||
9357 | gst_gl_display_thread_do_upload_fill (display); | ||
9358 | |||
9359 | switch (display->upload_video_format) { | ||
9360 | @@ -1950,14 +1974,13 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
9361 | |||
9362 | glBegin (GL_QUADS); | ||
9363 | /* gst images are top-down while opengl plane is bottom-up */ | ||
9364 | - glTexCoord2i (display->redisplay_texture_width, 0); | ||
9365 | + glTexCoord2i (1, 0); | ||
9366 | glVertex2f (1.0f, 1.0f); | ||
9367 | glTexCoord2i (0, 0); | ||
9368 | glVertex2f (-1.0f, 1.0f); | ||
9369 | - glTexCoord2i (0, display->redisplay_texture_height); | ||
9370 | + glTexCoord2i (0, 1); | ||
9371 | glVertex2f (-1.0f, -1.0f); | ||
9372 | - glTexCoord2i (display->redisplay_texture_width, | ||
9373 | - display->redisplay_texture_height); | ||
9374 | + glTexCoord2i (1, 1); | ||
9375 | glVertex2f (1.0f, -1.0f); | ||
9376 | /*glTexCoord2i (display->redisplay_texture_width, 0); | ||
9377 | glVertex2i (1, -1); | ||
9378 | @@ -1974,7 +1997,8 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
9379 | |||
9380 | #else //OPENGL_ES2 | ||
9381 | |||
9382 | - const GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, | ||
9383 | + GLfloat left, right, top, bottom; | ||
9384 | + GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, | ||
9385 | 1.0f, 0.0f, | ||
9386 | -1.0f, 1.0f, 0.0f, | ||
9387 | 0.0f, 0.0f, | ||
9388 | @@ -1986,6 +2010,17 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
9389 | |||
9390 | GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; | ||
9391 | |||
9392 | +#ifdef GPU_VIVANTE | ||
9393 | + if (display->gpu_priv) { | ||
9394 | + gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, | ||
9395 | + &bottom); | ||
9396 | + vVertices[3] = vVertices[18] = right; | ||
9397 | + vVertices[4] = vVertices[9] = bottom; | ||
9398 | + vVertices[8] = vVertices[13] = left; | ||
9399 | + vVertices[14] = vVertices[19] = top; | ||
9400 | + } | ||
9401 | +#endif | ||
9402 | + | ||
9403 | glClear (GL_COLOR_BUFFER_BIT); | ||
9404 | |||
9405 | gst_gl_shader_use (display->redisplay_shader); | ||
9406 | @@ -2067,6 +2102,9 @@ gst_gl_display_glgen_texture (GstGLDisplay * display, GLuint * pTexture, | ||
9407 | case GST_VIDEO_FORMAT_I420: | ||
9408 | case GST_VIDEO_FORMAT_YV12: | ||
9409 | case GST_VIDEO_FORMAT_AYUV: | ||
9410 | +#ifdef GPU_VIVANTE | ||
9411 | + case GST_VIDEO_FORMAT_NV12: | ||
9412 | +#endif | ||
9413 | glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, | ||
9414 | width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); | ||
9415 | break; | ||
9416 | @@ -2350,8 +2388,13 @@ gst_gl_display_init_upload (GstGLDisplay * display, GstVideoFormat video_format, | ||
9417 | display->upload_height = gl_height; | ||
9418 | display->upload_data_width = video_width; | ||
9419 | display->upload_data_height = video_height; | ||
9420 | - gst_gl_window_send_message (display->gl_window, | ||
9421 | - GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); | ||
9422 | + | ||
9423 | +#ifdef GPU_VIVANTE | ||
9424 | + if (!gst_gl_vivante_check_format (display->gpu_priv, video_format, | ||
9425 | + video_width, video_height)) | ||
9426 | +#endif | ||
9427 | + gst_gl_window_send_message (display->gl_window, | ||
9428 | + GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); | ||
9429 | isAlive = display->isAlive; | ||
9430 | gst_gl_display_unlock (display); | ||
9431 | |||
9432 | @@ -2364,6 +2407,14 @@ gboolean | ||
9433 | gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
9434 | gint data_width, gint data_height, gpointer data) | ||
9435 | { | ||
9436 | + return gst_gl_display_do_upload_with_meta (display, texture, data_width, | ||
9437 | + data_height, data, NULL); | ||
9438 | +} | ||
9439 | + | ||
9440 | +gboolean | ||
9441 | +gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, | ||
9442 | + gint data_width, gint data_height, gpointer data, gpointer meta) | ||
9443 | +{ | ||
9444 | gboolean isAlive = TRUE; | ||
9445 | |||
9446 | gst_gl_display_lock (display); | ||
9447 | @@ -2373,6 +2424,7 @@ gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
9448 | display->upload_data_width = data_width; | ||
9449 | display->upload_data_height = data_height; | ||
9450 | display->upload_data = data; | ||
9451 | + display->upload_meta = meta; | ||
9452 | gst_gl_window_send_message (display->gl_window, | ||
9453 | GST_GL_WINDOW_CB (gst_gl_display_thread_do_upload), display); | ||
9454 | isAlive = display->isAlive; | ||
9455 | @@ -2975,11 +3027,11 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
9456 | |||
9457 | #ifdef OPENGL_ES2 | ||
9458 | GLint viewport_dim[4]; | ||
9459 | - | ||
9460 | - const GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, | ||
9461 | + GLfloat left, right, top, bottom; | ||
9462 | + GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, | ||
9463 | 1.0f, 0.0f, | ||
9464 | -1.0f, -1.0f, 0.0f, | ||
9465 | - 0.0f, .0f, | ||
9466 | + 0.0f, 0.0f, | ||
9467 | -1.0f, 1.0f, 0.0f, | ||
9468 | 0.0f, 1.0f, | ||
9469 | 1.0f, 1.0f, 0.0f, | ||
9470 | @@ -2987,6 +3039,18 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
9471 | }; | ||
9472 | |||
9473 | GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; | ||
9474 | + | ||
9475 | +#ifdef GPU_VIVANTE | ||
9476 | + if (display->gpu_priv) { | ||
9477 | + gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, | ||
9478 | + &bottom); | ||
9479 | + vVertices[3] = vVertices[18] = right; | ||
9480 | + vVertices[4] = vVertices[9] = bottom; | ||
9481 | + vVertices[8] = vVertices[13] = left; | ||
9482 | + vVertices[14] = vVertices[19] = top; | ||
9483 | + } | ||
9484 | +#endif | ||
9485 | + | ||
9486 | #endif | ||
9487 | |||
9488 | glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, display->upload_fbo); | ||
9489 | @@ -3260,13 +3324,13 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
9490 | |||
9491 | #ifndef OPENGL_ES2 | ||
9492 | glBegin (GL_QUADS); | ||
9493 | - glTexCoord2i (display->upload_data_width, 0); | ||
9494 | + glTexCoord2i (1, 0); | ||
9495 | glVertex2f (1.0f, -1.0f); | ||
9496 | glTexCoord2i (0, 0); | ||
9497 | glVertex2f (-1.0f, -1.0f); | ||
9498 | - glTexCoord2i (0, display->upload_data_height); | ||
9499 | + glTexCoord2i (0, 1); | ||
9500 | glVertex2f (-1.0f, 1.0f); | ||
9501 | - glTexCoord2i (display->upload_data_width, display->upload_data_height); | ||
9502 | + glTexCoord2i (1, 1); | ||
9503 | glVertex2f (1.0f, 1.0f); | ||
9504 | glEnd (); | ||
9505 | |||
9506 | @@ -3554,11 +3618,11 @@ gst_gl_display_thread_do_download_draw_yuv (GstGLDisplay * display) | ||
9507 | glBegin (GL_QUADS); | ||
9508 | glTexCoord2i (0, 0); | ||
9509 | glVertex2f (-1.0f, -1.0f); | ||
9510 | - glTexCoord2i (width, 0); | ||
9511 | + glTexCoord2i (1, 0); | ||
9512 | glVertex2f (1.0f, -1.0f); | ||
9513 | - glTexCoord2i (width, height); | ||
9514 | + glTexCoord2i (1, 1); | ||
9515 | glVertex2f (1.0f, 1.0f); | ||
9516 | - glTexCoord2i (0, height); | ||
9517 | + glTexCoord2i (0, 1); | ||
9518 | glVertex2f (-1.0f, 1.0f); | ||
9519 | glEnd (); | ||
9520 | |||
9521 | diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h | ||
9522 | index f657e1e..31dfe26 100644 | ||
9523 | --- a/gst-libs/gst/gl/gstgldisplay.h | ||
9524 | +++ b/gst-libs/gst/gl/gstgldisplay.h | ||
9525 | @@ -229,6 +229,9 @@ struct _GstGLDisplay | ||
9526 | |||
9527 | gchar *error_message; | ||
9528 | |||
9529 | + gpointer gpu_priv; | ||
9530 | + gpointer upload_meta; | ||
9531 | + gboolean upload_buf_mapped; | ||
9532 | }; | ||
9533 | |||
9534 | |||
9535 | @@ -264,6 +267,8 @@ gboolean gst_gl_display_init_upload (GstGLDisplay * display, | ||
9536 | gint video_width, gint video_height); | ||
9537 | gboolean gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
9538 | gint data_width, gint data_height, gpointer data); | ||
9539 | +gboolean gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, | ||
9540 | + gint data_width, gint data_height, gpointer data, gpointer meta); | ||
9541 | gboolean gst_gl_display_init_download (GstGLDisplay * display, | ||
9542 | GstVideoFormat video_format, gint width, gint height); | ||
9543 | gboolean gst_gl_display_do_download (GstGLDisplay * display, GLuint texture, | ||
9544 | diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h | ||
9545 | index ddeb99c..aec69f1 100644 | ||
9546 | --- a/gst-libs/gst/gl/gstglshader.h | ||
9547 | +++ b/gst-libs/gst/gl/gstglshader.h | ||
9548 | @@ -21,6 +21,10 @@ | ||
9549 | #ifndef __GST_GL_SHADER_H__ | ||
9550 | #define __GST_GL_SHADER_H__ | ||
9551 | |||
9552 | +#ifdef HAVE_CONFIG_H | ||
9553 | +#include "config.h" | ||
9554 | +#endif | ||
9555 | + | ||
9556 | /* OpenGL 2.0 for Embedded Systems */ | ||
9557 | #ifdef OPENGL_ES2 | ||
9558 | #include <GLES2/gl2.h> | ||
9559 | diff --git a/gst-libs/gst/gl/gstglshadervariables.c b/gst-libs/gst/gl/gstglshadervariables.c | ||
9560 | index 69d5b75..be6e58c 100644 | ||
9561 | --- a/gst-libs/gst/gl/gstglshadervariables.c | ||
9562 | +++ b/gst-libs/gst/gl/gstglshadervariables.c | ||
9563 | @@ -550,6 +550,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
9564 | (float *) ret->value); | ||
9565 | break; | ||
9566 | |||
9567 | +#ifndef OPENGL_ES2 | ||
9568 | case _mat2x3: | ||
9569 | gst_gl_shader_set_uniform_matrix_2x3fv (shader, ret->name, ret->count, 0, | ||
9570 | (float *) ret->value); | ||
9571 | @@ -569,6 +570,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
9572 | gst_gl_shader_set_uniform_matrix_4x2fv (shader, ret->name, ret->count, 0, | ||
9573 | (float *) ret->value); | ||
9574 | break; | ||
9575 | +#endif | ||
9576 | |||
9577 | case _mat3: | ||
9578 | case _mat3x3: | ||
9579 | @@ -576,6 +578,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
9580 | (float *) ret->value); | ||
9581 | break; | ||
9582 | |||
9583 | +#ifndef OPENGL_ES2 | ||
9584 | case _mat3x4: | ||
9585 | gst_gl_shader_set_uniform_matrix_3x4fv (shader, ret->name, ret->count, 0, | ||
9586 | (float *) ret->value); | ||
9587 | @@ -585,6 +588,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
9588 | gst_gl_shader_set_uniform_matrix_4x3fv (shader, ret->name, ret->count, 0, | ||
9589 | (float *) ret->value); | ||
9590 | break; | ||
9591 | +#endif | ||
9592 | |||
9593 | case _mat4: | ||
9594 | case _mat4x4: | ||
9595 | diff --git a/gst-libs/gst/gl/gstglvivante.c b/gst-libs/gst/gl/gstglvivante.c | ||
9596 | new file mode 100644 | ||
9597 | index 0000000..1451a4a | ||
9598 | --- /dev/null | ||
9599 | +++ b/gst-libs/gst/gl/gstglvivante.c | ||
9600 | @@ -0,0 +1,218 @@ | ||
9601 | +/* | ||
9602 | + * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. | ||
9603 | + * | ||
9604 | + * This library is free software; you can redistribute it and/or | ||
9605 | + * modify it under the terms of the GNU Lesser General Public | ||
9606 | + * License as published by the Free Software Foundation; either | ||
9607 | + * version 2.1 of the License, or (at your option) any later version. | ||
9608 | + * | ||
9609 | + * This library is distributed in the hope that it will be useful, | ||
9610 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9611 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
9612 | + * Lesser General Public License for more details. | ||
9613 | + * | ||
9614 | + * You should have received a copy of the GNU Lesser General Public | ||
9615 | + * License along with this library; if not, write to the Free Software | ||
9616 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
9617 | + */ | ||
9618 | + | ||
9619 | +#ifdef HAVE_CONFIG_H | ||
9620 | +#include "config.h" | ||
9621 | +#endif | ||
9622 | + | ||
9623 | +#include <string.h> | ||
9624 | + | ||
9625 | +#include "gstglvivante.h" | ||
9626 | +#include <gstbufmeta.h> | ||
9627 | + | ||
9628 | +#define GL_GLEXT_PROTOTYPES | ||
9629 | +#include <GLES2/gl2ext.h> | ||
9630 | + | ||
9631 | +typedef struct | ||
9632 | +{ | ||
9633 | + gfloat sampler_left; | ||
9634 | + gfloat sampler_right; | ||
9635 | + gfloat sampler_top; | ||
9636 | + gfloat sampler_bottom; | ||
9637 | +} GstGLVivante; | ||
9638 | + | ||
9639 | +gpointer | ||
9640 | +gst_gl_vivante_new () | ||
9641 | +{ | ||
9642 | + GstGLVivante *viv = g_new (GstGLVivante, 1); | ||
9643 | + | ||
9644 | + viv->sampler_left = 0.0f; | ||
9645 | + viv->sampler_right = 1.0f; | ||
9646 | + viv->sampler_top = 1.0f; | ||
9647 | + viv->sampler_bottom = 0.0f; | ||
9648 | + | ||
9649 | + return viv; | ||
9650 | +} | ||
9651 | + | ||
9652 | +void | ||
9653 | +gst_gl_vivante_delete (gpointer gpu) | ||
9654 | +{ | ||
9655 | + g_free (gpu); | ||
9656 | +} | ||
9657 | + | ||
9658 | +gboolean | ||
9659 | +gst_gl_vivante_check_format (gpointer gpu, GstVideoFormat format, gint width, | ||
9660 | + gint height) | ||
9661 | +{ | ||
9662 | + switch (format) { | ||
9663 | + case GST_VIDEO_FORMAT_YV12: | ||
9664 | + case GST_VIDEO_FORMAT_NV12: | ||
9665 | + if ((width & 15) == 0) | ||
9666 | + return TRUE; | ||
9667 | + break; | ||
9668 | + default: | ||
9669 | + GST_WARNING ("GstVideoFormat %d not supported by vivante", format); | ||
9670 | + } | ||
9671 | + GST_WARNING | ||
9672 | + ("Check format %d, width,height [%d, %d] failed, can't direct render", | ||
9673 | + format, width, height); | ||
9674 | + return FALSE; | ||
9675 | +} | ||
9676 | + | ||
9677 | +GLenum | ||
9678 | +gst_gl_vivante_get_gl_format (gpointer gpu, GstVideoFormat format) | ||
9679 | +{ | ||
9680 | + switch (format) { | ||
9681 | + case GST_VIDEO_FORMAT_YV12: | ||
9682 | + return GL_VIV_YV12; | ||
9683 | + case GST_VIDEO_FORMAT_NV12: | ||
9684 | + return GL_VIV_NV12; | ||
9685 | + default: | ||
9686 | + GST_WARNING ("GstVideoFormat %d not supported by vivante", format); | ||
9687 | + } | ||
9688 | + return GL_NONE; | ||
9689 | +} | ||
9690 | + | ||
9691 | +static gboolean | ||
9692 | +format_is_yuv (GstVideoFormat format) | ||
9693 | +{ | ||
9694 | + switch (format) { | ||
9695 | + case GST_VIDEO_FORMAT_YV12: | ||
9696 | + case GST_VIDEO_FORMAT_NV12: | ||
9697 | + return TRUE; | ||
9698 | + default: | ||
9699 | + return FALSE; | ||
9700 | + } | ||
9701 | +} | ||
9702 | + | ||
9703 | +static void | ||
9704 | +copy_data_to_gpu (gpointer gpu, GstVideoFormat format, gpointer data, | ||
9705 | + gpointer planes[], gint width, gint height) | ||
9706 | +{ | ||
9707 | + gint src_height; | ||
9708 | + gint src_y_size, src_uv_size; | ||
9709 | + gint dst_y_size, dst_uv_size; | ||
9710 | + | ||
9711 | + /* width is already 16 aligned */ | ||
9712 | + switch (format) { | ||
9713 | + case GST_VIDEO_FORMAT_YV12: | ||
9714 | + src_height = GST_ROUND_UP_2 (height); | ||
9715 | + src_y_size = width * src_height; | ||
9716 | + src_uv_size = src_y_size / 4; | ||
9717 | + dst_y_size = width * height; | ||
9718 | + dst_uv_size = dst_y_size / 4; | ||
9719 | + memcpy (planes[0], data, dst_y_size); | ||
9720 | + memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); | ||
9721 | + memcpy (planes[2], (gchar *) data + src_y_size + src_uv_size, | ||
9722 | + dst_uv_size); | ||
9723 | + break; | ||
9724 | + case GST_VIDEO_FORMAT_NV12: | ||
9725 | + src_height = GST_ROUND_UP_2 (height); | ||
9726 | + src_y_size = width * src_height; | ||
9727 | + dst_y_size = width * height; | ||
9728 | + dst_uv_size = dst_y_size / 2; | ||
9729 | + memcpy (planes[0], data, dst_y_size); | ||
9730 | + memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); | ||
9731 | + break; | ||
9732 | + default: | ||
9733 | + return; | ||
9734 | + } | ||
9735 | +} | ||
9736 | + | ||
9737 | +gboolean | ||
9738 | +gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display) | ||
9739 | +{ | ||
9740 | + GstVideoFormat format = display->upload_video_format; | ||
9741 | + gint width = display->upload_data_width; | ||
9742 | + gint height = display->upload_data_height; | ||
9743 | + gpointer data = display->upload_data; | ||
9744 | + GstBufferMeta *meta = GST_BUFFER_META (display->upload_meta); | ||
9745 | + gpointer planes[3]; | ||
9746 | + GLuint physical = meta ? (GLuint) (meta->physical_data) : ~0U; | ||
9747 | + | ||
9748 | + GST_INFO ("gst_gl_vivante_tex_upload physical address 0x%x, data %p, tex %d", | ||
9749 | + physical, data, display->upload_outtex); | ||
9750 | + | ||
9751 | + if (!gst_gl_vivante_check_format (gpu, format, width, height)) | ||
9752 | + return FALSE; | ||
9753 | + | ||
9754 | + glBindTexture (GL_TEXTURE_2D, display->upload_outtex); | ||
9755 | + | ||
9756 | + if (((guint) data & 0x3F) != 0) { /* not aligned, need additional copy */ | ||
9757 | + if (!format_is_yuv (format)) { /* rgb is left to default handler */ | ||
9758 | + GST_WARNING ("Format %d unaligned data is not supported for" | ||
9759 | + " direct rendering", format); | ||
9760 | + return FALSE; | ||
9761 | + } | ||
9762 | + | ||
9763 | + GST_WARNING ("Data not aligned, need additional copy"); | ||
9764 | + | ||
9765 | + glTexDirectVIV (GL_TEXTURE_2D, width, height, | ||
9766 | + gst_gl_vivante_get_gl_format (gpu, format), (GLvoid **) & planes); | ||
9767 | + if (glGetError () != GL_NO_ERROR) | ||
9768 | + return FALSE; | ||
9769 | + | ||
9770 | + copy_data_to_gpu (gpu, format, data, planes, width, height); | ||
9771 | + } else { | ||
9772 | + glTexDirectVIVMap (GL_TEXTURE_2D, width, height, | ||
9773 | + gst_gl_vivante_get_gl_format (gpu, format), &data, &physical); | ||
9774 | + if (glGetError () != GL_NO_ERROR) | ||
9775 | + return FALSE; | ||
9776 | + display->upload_buf_mapped = TRUE; | ||
9777 | + } | ||
9778 | + | ||
9779 | + glTexDirectInvalidateVIV (GL_TEXTURE_2D); | ||
9780 | + | ||
9781 | + return TRUE; | ||
9782 | +} | ||
9783 | + | ||
9784 | +void | ||
9785 | +gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps) | ||
9786 | +{ | ||
9787 | + GstVideoFormat format; | ||
9788 | + gint width; | ||
9789 | + gint height; | ||
9790 | + GstStructure *s; | ||
9791 | + gint left = 0, right = 0, top = 0, bottom = 0; | ||
9792 | + GstGLVivante *viv = (GstGLVivante *) gpu; | ||
9793 | + | ||
9794 | + s = gst_caps_get_structure (caps, 0); | ||
9795 | + gst_structure_get_int (s, "crop-left-by-pixel", &left); | ||
9796 | + gst_structure_get_int (s, "crop-top-by-pixel", &top); | ||
9797 | + gst_structure_get_int (s, "crop-right-by-pixel", &right); | ||
9798 | + gst_structure_get_int (s, "crop-bottom-by-pixel", &bottom); | ||
9799 | + | ||
9800 | + gst_video_format_parse_caps (caps, &format, &width, &height); | ||
9801 | + | ||
9802 | + viv->sampler_left = ((gfloat) left) / width; | ||
9803 | + viv->sampler_right = ((gfloat) (width - right)) / width; | ||
9804 | + viv->sampler_top = ((gfloat) (height - bottom)) / height; | ||
9805 | + viv->sampler_bottom = ((gfloat) top) / height; | ||
9806 | +} | ||
9807 | + | ||
9808 | +void | ||
9809 | +gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat * left, gfloat * right, | ||
9810 | + gfloat * top, gfloat * bottom) | ||
9811 | +{ | ||
9812 | + GstGLVivante *viv = (GstGLVivante *) gpu; | ||
9813 | + | ||
9814 | + *left = viv->sampler_left; | ||
9815 | + *right = viv->sampler_right; | ||
9816 | + *top = viv->sampler_top; | ||
9817 | + *bottom = viv->sampler_bottom; | ||
9818 | +} | ||
9819 | diff --git a/gst-libs/gst/gl/gstglvivante.h b/gst-libs/gst/gl/gstglvivante.h | ||
9820 | new file mode 100644 | ||
9821 | index 0000000..f763f80 | ||
9822 | --- /dev/null | ||
9823 | +++ b/gst-libs/gst/gl/gstglvivante.h | ||
9824 | @@ -0,0 +1,41 @@ | ||
9825 | +/* | ||
9826 | + * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. | ||
9827 | + * | ||
9828 | + * This library is free software; you can redistribute it and/or | ||
9829 | + * modify it under the terms of the GNU Library General Public | ||
9830 | + * License as published by the Free Software Foundation; either | ||
9831 | + * version 2 of the License, or (at your option) any later version. | ||
9832 | + * | ||
9833 | + * This library is distributed in the hope that it will be useful, | ||
9834 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9835 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
9836 | + * Library General Public License for more details. | ||
9837 | + * | ||
9838 | + * You should have received a copy of the GNU Library General Public | ||
9839 | + * License along with this library; if not, write to the | ||
9840 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
9841 | + * Boston, MA 02111-1307, USA. | ||
9842 | + */ | ||
9843 | + | ||
9844 | +#ifndef __GST_GL_VIVANTE_H__ | ||
9845 | +#define __GST_GL_VIVANTE_H__ | ||
9846 | + | ||
9847 | +#include "gstgldisplay.h" | ||
9848 | +#include <GLES2/gl2.h> | ||
9849 | + | ||
9850 | +G_BEGIN_DECLS | ||
9851 | + | ||
9852 | +gpointer gst_gl_vivante_new(); | ||
9853 | +void gst_gl_vivante_delete(gpointer gpu); | ||
9854 | + | ||
9855 | +gboolean gst_gl_vivante_check_format(gpointer gpu, GstVideoFormat format, gint width, gint height); | ||
9856 | +GLenum gst_gl_vivante_get_gl_format(gpointer gpu, GstVideoFormat format); | ||
9857 | + | ||
9858 | +gboolean gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display); | ||
9859 | +void gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps); | ||
9860 | + | ||
9861 | +void gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom); | ||
9862 | + | ||
9863 | +G_END_DECLS | ||
9864 | + | ||
9865 | +#endif /* __GST_GL_VIVANTE_H__ */ | ||
9866 | diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h | ||
9867 | index 499d47a..c3cafb2 100644 | ||
9868 | --- a/gst-libs/gst/gl/gstglwindow.h | ||
9869 | +++ b/gst-libs/gst/gl/gstglwindow.h | ||
9870 | @@ -21,6 +21,10 @@ | ||
9871 | #ifndef __GST_GL_WINDOW_H__ | ||
9872 | #define __GST_GL_WINDOW_H__ | ||
9873 | |||
9874 | +#ifdef HAVE_CONFIG_H | ||
9875 | +#include "config.h" | ||
9876 | +#endif | ||
9877 | + | ||
9878 | /* OpenGL 2.0 for Embedded Systems */ | ||
9879 | #ifdef OPENGL_ES2 | ||
9880 | #undef UNICODE | ||
9881 | diff --git a/gst-libs/gst/gl/gstglwindow_fbES2.c b/gst-libs/gst/gl/gstglwindow_fbES2.c | ||
9882 | new file mode 100644 | ||
9883 | index 0000000..57c02e1 | ||
9884 | --- /dev/null | ||
9885 | +++ b/gst-libs/gst/gl/gstglwindow_fbES2.c | ||
9886 | @@ -0,0 +1,709 @@ | ||
9887 | +/* | ||
9888 | + * GStreamer | ||
9889 | + * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> | ||
9890 | + * | ||
9891 | + * This library is free software; you can redistribute it and/or | ||
9892 | + * modify it under the terms of the GNU Library General Public | ||
9893 | + * License as published by the Free Software Foundation; either | ||
9894 | + * version 2 of the License, or (at your option) any later version. | ||
9895 | + * | ||
9896 | + * This library is distributed in the hope that it will be useful, | ||
9897 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9898 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
9899 | + * Library General Public License for more details. | ||
9900 | + * | ||
9901 | + * You should have received a copy of the GNU Library General Public | ||
9902 | + * License along with this library; if not, write to the | ||
9903 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
9904 | + * Boston, MA 02111-1307, USA. | ||
9905 | + */ | ||
9906 | + | ||
9907 | +#ifdef HAVE_CONFIG_H | ||
9908 | +#include "config.h" | ||
9909 | +#endif | ||
9910 | + | ||
9911 | +#include "gstglwindow.h" | ||
9912 | +#include "EGL/eglvivante.h" | ||
9913 | + | ||
9914 | +#include <locale.h> | ||
9915 | +#include <stdio.h> | ||
9916 | +#include <stdlib.h> | ||
9917 | + | ||
9918 | +#define GST_GL_WINDOW_GET_PRIVATE(o) \ | ||
9919 | + (G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_WINDOW, GstGLWindowPrivate)) | ||
9920 | + | ||
9921 | +/* A gl window is created and deleted in a thread dedicated to opengl calls | ||
9922 | + The name contains "window" because an opengl context is used in cooperation | ||
9923 | + with a window */ | ||
9924 | + | ||
9925 | +const gchar *EGLErrorString (); | ||
9926 | + | ||
9927 | +enum | ||
9928 | +{ | ||
9929 | + ARG_0, | ||
9930 | + ARG_DISPLAY | ||
9931 | +}; | ||
9932 | + | ||
9933 | +enum GstGLFbEventType | ||
9934 | +{ | ||
9935 | + FB_EVENT_DRAW, | ||
9936 | + FB_EVENT_CALLBACK, | ||
9937 | + FB_EVENT_QUIT, | ||
9938 | +}; | ||
9939 | + | ||
9940 | +typedef struct _GstGLFbEvent | ||
9941 | +{ | ||
9942 | + enum GstGLFbEventType type; | ||
9943 | + GstGLWindowCB callback; | ||
9944 | + gpointer data; | ||
9945 | +} GstGLFbEvent; | ||
9946 | + | ||
9947 | +struct _GstGLWindowPrivate | ||
9948 | +{ | ||
9949 | + /* X is not thread safe */ | ||
9950 | + GMutex *lock; | ||
9951 | + GCond *cond_send_message; | ||
9952 | + GCond *cond_queue_message; | ||
9953 | + gboolean running; | ||
9954 | + gboolean allow_extra_expose_events; | ||
9955 | + | ||
9956 | + /* fb queue */ | ||
9957 | + GList *queue; | ||
9958 | + | ||
9959 | + /* X context */ | ||
9960 | + gchar *display_name; | ||
9961 | + gint device_width; | ||
9962 | + gint device_height; | ||
9963 | + | ||
9964 | + EGLNativeWindowType internal_win_id; | ||
9965 | + EGLNativeDisplayType device; | ||
9966 | + | ||
9967 | + /* EGL */ | ||
9968 | + EGLContext gl_context; | ||
9969 | + EGLDisplay gl_display; | ||
9970 | + EGLSurface gl_surface; | ||
9971 | + | ||
9972 | + /* frozen callbacks */ | ||
9973 | + GstGLWindowCB draw_cb; | ||
9974 | + gpointer draw_data; | ||
9975 | + GstGLWindowCB2 resize_cb; | ||
9976 | + gpointer resize_data; | ||
9977 | + GstGLWindowCB close_cb; | ||
9978 | + gpointer close_data; | ||
9979 | +}; | ||
9980 | + | ||
9981 | +G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT); | ||
9982 | + | ||
9983 | +#undef G_LOG_DOMAIN | ||
9984 | +#define G_LOG_DOMAIN "GstGLWindow" | ||
9985 | + | ||
9986 | +gboolean _gst_gl_window_debug = FALSE; | ||
9987 | + | ||
9988 | +void | ||
9989 | +gst_gl_window_init_platform () | ||
9990 | +{ | ||
9991 | +} | ||
9992 | + | ||
9993 | +static void | ||
9994 | +free_event (gpointer event, gpointer data) | ||
9995 | +{ | ||
9996 | + g_slice_free (GstGLFbEvent, event); | ||
9997 | +} | ||
9998 | + | ||
9999 | +/* Must be called in the gl thread */ | ||
10000 | +static void | ||
10001 | +gst_gl_window_finalize (GObject * object) | ||
10002 | +{ | ||
10003 | + GstGLWindow *window = GST_GL_WINDOW (object); | ||
10004 | + GstGLWindowPrivate *priv = window->priv; | ||
10005 | + gboolean ret = TRUE; | ||
10006 | + | ||
10007 | + g_mutex_lock (priv->lock); | ||
10008 | + | ||
10009 | + g_debug ("about to finalize gl window\n"); | ||
10010 | + | ||
10011 | + if (priv->gl_context) { | ||
10012 | + ret = | ||
10013 | + eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10014 | + EGL_NO_CONTEXT); | ||
10015 | + if (!ret) | ||
10016 | + g_debug ("failed to release opengl context\n"); | ||
10017 | + | ||
10018 | + eglDestroyContext (priv->gl_display, priv->gl_context); | ||
10019 | + } | ||
10020 | + | ||
10021 | + if (priv->gl_display) | ||
10022 | + eglTerminate (priv->gl_display); | ||
10023 | + | ||
10024 | + if (priv->device) | ||
10025 | + fbDestroyDisplay (priv->device); | ||
10026 | + | ||
10027 | + g_list_foreach (priv->queue, free_event, NULL); | ||
10028 | + g_list_free (priv->queue); | ||
10029 | + priv->queue = NULL; | ||
10030 | + | ||
10031 | + if (priv->cond_send_message) { | ||
10032 | + g_cond_free (priv->cond_send_message); | ||
10033 | + priv->cond_send_message = NULL; | ||
10034 | + } | ||
10035 | + | ||
10036 | + if (priv->cond_queue_message) { | ||
10037 | + g_cond_free (priv->cond_queue_message); | ||
10038 | + priv->cond_queue_message = NULL; | ||
10039 | + } | ||
10040 | + | ||
10041 | + g_mutex_unlock (priv->lock); | ||
10042 | + | ||
10043 | + if (priv->lock) { | ||
10044 | + g_mutex_free (priv->lock); | ||
10045 | + priv->lock = NULL; | ||
10046 | + } | ||
10047 | + | ||
10048 | + G_OBJECT_CLASS (gst_gl_window_parent_class)->finalize (object); | ||
10049 | +} | ||
10050 | + | ||
10051 | +static void | ||
10052 | +gst_gl_window_set_property (GObject * object, guint prop_id, | ||
10053 | + const GValue * value, GParamSpec * pspec) | ||
10054 | +{ | ||
10055 | + GstGLWindow *window; | ||
10056 | + GstGLWindowPrivate *priv; | ||
10057 | + | ||
10058 | + g_return_if_fail (GST_GL_IS_WINDOW (object)); | ||
10059 | + | ||
10060 | + window = GST_GL_WINDOW (object); | ||
10061 | + | ||
10062 | + priv = window->priv; | ||
10063 | + | ||
10064 | + switch (prop_id) { | ||
10065 | + case ARG_DISPLAY: | ||
10066 | + priv->display_name = g_strdup (g_value_get_string (value)); | ||
10067 | + break; | ||
10068 | + default: | ||
10069 | + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
10070 | + break; | ||
10071 | + } | ||
10072 | +} | ||
10073 | + | ||
10074 | +static void | ||
10075 | +gst_gl_window_get_property (GObject * object, guint prop_id, | ||
10076 | + GValue * value, GParamSpec * pspec) | ||
10077 | +{ | ||
10078 | + GstGLWindow *window; | ||
10079 | + GstGLWindowPrivate *priv; | ||
10080 | + | ||
10081 | + g_return_if_fail (GST_GL_IS_WINDOW (object)); | ||
10082 | + | ||
10083 | + window = GST_GL_WINDOW (object); | ||
10084 | + | ||
10085 | + priv = window->priv; | ||
10086 | + | ||
10087 | + switch (prop_id) { | ||
10088 | + case ARG_DISPLAY: | ||
10089 | + g_value_set_string (value, priv->display_name); | ||
10090 | + break; | ||
10091 | + default: | ||
10092 | + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
10093 | + break; | ||
10094 | + } | ||
10095 | +} | ||
10096 | + | ||
10097 | +static void | ||
10098 | +gst_gl_window_log_handler (const gchar * domain, GLogLevelFlags flags, | ||
10099 | + const gchar * message, gpointer user_data) | ||
10100 | +{ | ||
10101 | + if (_gst_gl_window_debug) { | ||
10102 | + g_log_default_handler (domain, flags, message, user_data); | ||
10103 | + } | ||
10104 | +} | ||
10105 | + | ||
10106 | +static void | ||
10107 | +gst_gl_window_class_init (GstGLWindowClass * klass) | ||
10108 | +{ | ||
10109 | + GObjectClass *obj_class = G_OBJECT_CLASS (klass); | ||
10110 | + | ||
10111 | + g_type_class_add_private (klass, sizeof (GstGLWindowPrivate)); | ||
10112 | + | ||
10113 | + obj_class->finalize = gst_gl_window_finalize; | ||
10114 | + obj_class->set_property = gst_gl_window_set_property; | ||
10115 | + obj_class->get_property = gst_gl_window_get_property; | ||
10116 | + | ||
10117 | + g_object_class_install_property (obj_class, ARG_DISPLAY, | ||
10118 | + g_param_spec_string ("display", "Display", "X Display name", NULL, | ||
10119 | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | ||
10120 | +} | ||
10121 | + | ||
10122 | +static void | ||
10123 | +gst_gl_window_init (GstGLWindow * window) | ||
10124 | +{ | ||
10125 | + GstGLWindowPrivate *priv = NULL; | ||
10126 | + window->priv = GST_GL_WINDOW_GET_PRIVATE (window); | ||
10127 | + priv = window->priv; | ||
10128 | + | ||
10129 | + if (g_getenv ("GST_GL_WINDOW_DEBUG") != NULL) | ||
10130 | + _gst_gl_window_debug = TRUE; | ||
10131 | + | ||
10132 | + g_log_set_handler ("GstGLWindow", G_LOG_LEVEL_DEBUG, | ||
10133 | + gst_gl_window_log_handler, NULL); | ||
10134 | + | ||
10135 | + priv->lock = NULL; | ||
10136 | + priv->cond_send_message = NULL; | ||
10137 | + priv->running = FALSE; | ||
10138 | + priv->allow_extra_expose_events = FALSE; | ||
10139 | + | ||
10140 | + priv->queue = NULL; | ||
10141 | + | ||
10142 | + /* X context */ | ||
10143 | + priv->display_name = NULL; | ||
10144 | + priv->device_width = 0; | ||
10145 | + priv->device_height = 0; | ||
10146 | + | ||
10147 | + /* EGL */ | ||
10148 | + priv->gl_context = EGL_NO_CONTEXT; | ||
10149 | + priv->gl_display = 0; | ||
10150 | + priv->gl_surface = EGL_NO_SURFACE; | ||
10151 | + | ||
10152 | + /* frozen callbacks */ | ||
10153 | + priv->draw_cb = NULL; | ||
10154 | + priv->draw_data = NULL; | ||
10155 | + priv->resize_cb = NULL; | ||
10156 | + priv->resize_data = NULL; | ||
10157 | + priv->close_cb = NULL; | ||
10158 | + priv->close_data = NULL; | ||
10159 | +} | ||
10160 | + | ||
10161 | +/* Must be called in the gl thread */ | ||
10162 | +GstGLWindow * | ||
10163 | +gst_gl_window_new (gulong external_gl_context) | ||
10164 | +{ | ||
10165 | + GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL); | ||
10166 | + GstGLWindowPrivate *priv = window->priv; | ||
10167 | + | ||
10168 | + EGLint config_attrib[] = { | ||
10169 | + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, | ||
10170 | + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, | ||
10171 | + EGL_DEPTH_SIZE, 16, | ||
10172 | + EGL_NONE | ||
10173 | + }; | ||
10174 | + | ||
10175 | + EGLint context_attrib[] = { | ||
10176 | + EGL_CONTEXT_CLIENT_VERSION, 2, | ||
10177 | + EGL_NONE | ||
10178 | + }; | ||
10179 | + | ||
10180 | + EGLint majorVersion; | ||
10181 | + EGLint minorVersion; | ||
10182 | + EGLint numConfigs; | ||
10183 | + EGLConfig config; | ||
10184 | + | ||
10185 | + int index = 0; | ||
10186 | + | ||
10187 | + setlocale (LC_NUMERIC, "C"); | ||
10188 | + | ||
10189 | + priv->lock = g_mutex_new (); | ||
10190 | + priv->cond_send_message = g_cond_new (); | ||
10191 | + priv->cond_queue_message = g_cond_new (); | ||
10192 | + priv->running = TRUE; | ||
10193 | + priv->allow_extra_expose_events = TRUE; | ||
10194 | + | ||
10195 | + g_mutex_lock (priv->lock); | ||
10196 | + | ||
10197 | + if (priv->display_name) | ||
10198 | + index = strtol (priv->display_name, NULL, 0); | ||
10199 | + | ||
10200 | + priv->device = fbGetDisplayByIndex (index); | ||
10201 | + | ||
10202 | + if (!priv->device) { | ||
10203 | + g_debug ("failed to get fb display by index %d\n", index); | ||
10204 | + goto failure; | ||
10205 | + } | ||
10206 | + | ||
10207 | + priv->internal_win_id = fbCreateWindow (priv->device, -1, -1, 0, 0); | ||
10208 | + | ||
10209 | + fbGetDisplayGeometry (priv->device, &priv->device_width, | ||
10210 | + &priv->device_height); | ||
10211 | + | ||
10212 | + priv->gl_display = eglGetDisplay (priv->device); | ||
10213 | + | ||
10214 | + if (eglInitialize (priv->gl_display, &majorVersion, &minorVersion)) | ||
10215 | + g_debug ("egl initialized: %d.%d\n", majorVersion, minorVersion); | ||
10216 | + else { | ||
10217 | + g_debug ("failed to initialize egl %ld, %s\n", (gulong) priv->gl_display, | ||
10218 | + EGLErrorString ()); | ||
10219 | + goto failure; | ||
10220 | + } | ||
10221 | + | ||
10222 | + if (eglChooseConfig (priv->gl_display, config_attrib, &config, 1, | ||
10223 | + &numConfigs)) | ||
10224 | + g_debug ("config set: %ld, %ld\n", (gulong) config, (gulong) numConfigs); | ||
10225 | + else { | ||
10226 | + g_debug ("failed to set config %ld, %s\n", (gulong) priv->gl_display, | ||
10227 | + EGLErrorString ()); | ||
10228 | + goto failure; | ||
10229 | + } | ||
10230 | + | ||
10231 | + priv->gl_surface = | ||
10232 | + eglCreateWindowSurface (priv->gl_display, config, priv->internal_win_id, | ||
10233 | + NULL); | ||
10234 | + if (priv->gl_surface != EGL_NO_SURFACE) | ||
10235 | + g_debug ("surface created: %ld\n", (gulong) priv->gl_surface); | ||
10236 | + else { | ||
10237 | + g_debug ("failed to create surface %ld, %ld, %ld, %s\n", | ||
10238 | + (gulong) priv->gl_display, (gulong) priv->gl_surface, | ||
10239 | + (gulong) priv->gl_display, EGLErrorString ()); | ||
10240 | + goto failure; | ||
10241 | + } | ||
10242 | + | ||
10243 | + g_debug ("about to create gl context\n"); | ||
10244 | + | ||
10245 | + priv->gl_context = | ||
10246 | + eglCreateContext (priv->gl_display, config, | ||
10247 | + (EGLContext) (guint) external_gl_context, context_attrib); | ||
10248 | + | ||
10249 | + if (priv->gl_context != EGL_NO_CONTEXT) | ||
10250 | + g_debug ("gl context created: %ld\n", (gulong) priv->gl_context); | ||
10251 | + else { | ||
10252 | + g_debug ("failed to create glcontext %ld, %ld, %s\n", | ||
10253 | + (gulong) priv->gl_context, (gulong) priv->gl_display, | ||
10254 | + EGLErrorString ()); | ||
10255 | + goto failure; | ||
10256 | + } | ||
10257 | + | ||
10258 | + if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, | ||
10259 | + priv->gl_context)) { | ||
10260 | + g_debug ("failed to make opengl context current %ld, %s\n", | ||
10261 | + (gulong) priv->gl_display, EGLErrorString ()); | ||
10262 | + goto failure; | ||
10263 | + } | ||
10264 | + | ||
10265 | + g_mutex_unlock (priv->lock); | ||
10266 | + printf ("device WxH:%dx%d\n", priv->device_width, priv->device_height); | ||
10267 | + return window; | ||
10268 | + | ||
10269 | +failure: | ||
10270 | + g_mutex_unlock (priv->lock); | ||
10271 | + g_object_unref (G_OBJECT (window)); | ||
10272 | + return NULL; | ||
10273 | +} | ||
10274 | + | ||
10275 | +GQuark | ||
10276 | +gst_gl_window_error_quark (void) | ||
10277 | +{ | ||
10278 | + return g_quark_from_static_string ("gst-gl-window-error"); | ||
10279 | +} | ||
10280 | + | ||
10281 | +gulong | ||
10282 | +gst_gl_window_get_internal_gl_context (GstGLWindow * window) | ||
10283 | +{ | ||
10284 | + GstGLWindowPrivate *priv = window->priv; | ||
10285 | + return (gulong) priv->gl_context; | ||
10286 | +} | ||
10287 | + | ||
10288 | +void | ||
10289 | +callback_activate_gl_context (GstGLWindowPrivate * priv) | ||
10290 | +{ | ||
10291 | + if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, | ||
10292 | + priv->gl_context)) | ||
10293 | + g_debug ("failed to activate opengl context %lud\n", | ||
10294 | + (gulong) priv->gl_context); | ||
10295 | +} | ||
10296 | + | ||
10297 | +void | ||
10298 | +callback_inactivate_gl_context (GstGLWindowPrivate * priv) | ||
10299 | +{ | ||
10300 | + if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10301 | + EGL_NO_CONTEXT)) | ||
10302 | + g_debug ("failed to inactivate opengl context %lud\n", | ||
10303 | + (gulong) priv->gl_context); | ||
10304 | +} | ||
10305 | + | ||
10306 | +void | ||
10307 | +gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate) | ||
10308 | +{ | ||
10309 | + GstGLWindowPrivate *priv = window->priv; | ||
10310 | + if (activate) | ||
10311 | + gst_gl_window_send_message (window, | ||
10312 | + GST_GL_WINDOW_CB (callback_activate_gl_context), priv); | ||
10313 | + else | ||
10314 | + gst_gl_window_send_message (window, | ||
10315 | + GST_GL_WINDOW_CB (callback_inactivate_gl_context), priv); | ||
10316 | +} | ||
10317 | + | ||
10318 | +/* Not called by the gl thread */ | ||
10319 | +void | ||
10320 | +gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id) | ||
10321 | +{ | ||
10322 | +} | ||
10323 | + | ||
10324 | +void | ||
10325 | +gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback, | ||
10326 | + gpointer data) | ||
10327 | +{ | ||
10328 | + GstGLWindowPrivate *priv = window->priv; | ||
10329 | + | ||
10330 | + g_mutex_lock (priv->lock); | ||
10331 | + | ||
10332 | + priv->draw_cb = callback; | ||
10333 | + priv->draw_data = data; | ||
10334 | + | ||
10335 | + g_mutex_unlock (priv->lock); | ||
10336 | +} | ||
10337 | + | ||
10338 | +void | ||
10339 | +gst_gl_window_set_resize_callback (GstGLWindow * window, | ||
10340 | + GstGLWindowCB2 callback, gpointer data) | ||
10341 | +{ | ||
10342 | + GstGLWindowPrivate *priv = window->priv; | ||
10343 | + | ||
10344 | + g_mutex_lock (priv->lock); | ||
10345 | + | ||
10346 | + priv->resize_cb = callback; | ||
10347 | + priv->resize_data = data; | ||
10348 | + | ||
10349 | + g_mutex_unlock (priv->lock); | ||
10350 | +} | ||
10351 | + | ||
10352 | +void | ||
10353 | +gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback, | ||
10354 | + gpointer data) | ||
10355 | +{ | ||
10356 | + GstGLWindowPrivate *priv = window->priv; | ||
10357 | + | ||
10358 | + g_mutex_lock (priv->lock); | ||
10359 | + | ||
10360 | + priv->close_cb = callback; | ||
10361 | + priv->close_data = data; | ||
10362 | + | ||
10363 | + g_mutex_unlock (priv->lock); | ||
10364 | +} | ||
10365 | + | ||
10366 | +/* Called in the gl thread */ | ||
10367 | +void | ||
10368 | +gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) | ||
10369 | +{ | ||
10370 | + GstGLWindowPrivate *priv = window->priv; | ||
10371 | + | ||
10372 | + if (priv->running && priv->allow_extra_expose_events) { | ||
10373 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
10374 | + event->type = FB_EVENT_DRAW; | ||
10375 | + priv->queue = g_list_append (priv->queue, event); | ||
10376 | + g_cond_signal (priv->cond_queue_message); | ||
10377 | + /* block until opengl calls have been executed in the gl thread */ | ||
10378 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
10379 | + } | ||
10380 | +} | ||
10381 | + | ||
10382 | +/* Not called by the gl thread */ | ||
10383 | +void | ||
10384 | +gst_gl_window_draw (GstGLWindow * window, gint width, gint height) | ||
10385 | +{ | ||
10386 | + if (window) { | ||
10387 | + GstGLWindowPrivate *priv = window->priv; | ||
10388 | + | ||
10389 | + g_mutex_lock (priv->lock); | ||
10390 | + | ||
10391 | + if (priv->running) { | ||
10392 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
10393 | + event->type = FB_EVENT_DRAW; | ||
10394 | + priv->queue = g_list_append (priv->queue, event); | ||
10395 | + g_cond_signal (priv->cond_queue_message); | ||
10396 | + /* block until opengl calls have been executed in the gl thread */ | ||
10397 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
10398 | + } | ||
10399 | + | ||
10400 | + g_mutex_unlock (priv->lock); | ||
10401 | + } | ||
10402 | +} | ||
10403 | + | ||
10404 | +static void | ||
10405 | +gst_gl_fb_queue_flush (GList * queue, GCond * cond) | ||
10406 | +{ | ||
10407 | + GstGLFbEvent *event; | ||
10408 | + GList *first; | ||
10409 | + | ||
10410 | + while ((first = g_list_first (queue))) { | ||
10411 | + event = first->data; | ||
10412 | + queue = g_list_delete_link (queue, first); | ||
10413 | + | ||
10414 | + if (event->type == FB_EVENT_CALLBACK) { | ||
10415 | + g_debug ("execute last pending custom x events\n"); | ||
10416 | + | ||
10417 | + if (!event->callback || !event->data) | ||
10418 | + g_debug ("custom cb not initialized\n"); | ||
10419 | + | ||
10420 | + event->callback (event->data); | ||
10421 | + | ||
10422 | + g_cond_signal (cond); | ||
10423 | + } | ||
10424 | + | ||
10425 | + g_slice_free (GstGLFbEvent, event); | ||
10426 | + } | ||
10427 | +} | ||
10428 | + | ||
10429 | +/* Called in the gl thread */ | ||
10430 | +void | ||
10431 | +gst_gl_window_run_loop (GstGLWindow * window) | ||
10432 | +{ | ||
10433 | + GstGLWindowPrivate *priv = window->priv; | ||
10434 | + GstGLFbEvent *event; | ||
10435 | + GList *first; | ||
10436 | + | ||
10437 | + g_debug ("begin loop\n"); | ||
10438 | + | ||
10439 | + g_mutex_lock (priv->lock); | ||
10440 | + | ||
10441 | + while (priv->running) { | ||
10442 | + | ||
10443 | + if (!priv->queue) | ||
10444 | + g_cond_wait (priv->cond_queue_message, priv->lock); | ||
10445 | + | ||
10446 | + first = g_list_first (priv->queue); | ||
10447 | + event = first->data; | ||
10448 | + priv->queue = g_list_delete_link (priv->queue, first); | ||
10449 | + | ||
10450 | + // use in generic/cube and other related uses | ||
10451 | + priv->allow_extra_expose_events = g_list_length (priv->queue) <= 2; | ||
10452 | + | ||
10453 | + switch (event->type) { | ||
10454 | + case FB_EVENT_CALLBACK: | ||
10455 | + { | ||
10456 | + if (priv->running) { | ||
10457 | + if (!event->callback || !event->data) | ||
10458 | + g_debug ("custom cb not initialized\n"); | ||
10459 | + event->callback (event->data); | ||
10460 | + g_cond_signal (priv->cond_send_message); | ||
10461 | + } | ||
10462 | + break; | ||
10463 | + } | ||
10464 | + | ||
10465 | + case FB_EVENT_QUIT: | ||
10466 | + { | ||
10467 | + g_debug ("Quit loop message %lud\n", (gulong) priv->internal_win_id); | ||
10468 | + | ||
10469 | + /* exit loop */ | ||
10470 | + priv->running = FALSE; | ||
10471 | + | ||
10472 | + /* make sure last pendings send message calls are executed */ | ||
10473 | + gst_gl_fb_queue_flush (priv->queue, priv->cond_send_message); | ||
10474 | + priv->queue = NULL; | ||
10475 | + | ||
10476 | + /* Finally we can destroy opengl ressources (texture/shaders/fbo) */ | ||
10477 | + if (!event->callback || !event->data) | ||
10478 | + g_debug ("destroy cb not correclty set\n"); | ||
10479 | + | ||
10480 | + event->callback (event->data); | ||
10481 | + g_cond_signal (priv->cond_send_message); | ||
10482 | + break; | ||
10483 | + } | ||
10484 | + | ||
10485 | + case FB_EVENT_DRAW: | ||
10486 | + if (priv->draw_cb) { | ||
10487 | + priv->draw_cb (priv->draw_data); | ||
10488 | + glFlush (); | ||
10489 | + eglSwapBuffers (priv->gl_display, priv->gl_surface); | ||
10490 | + g_cond_signal (priv->cond_send_message); | ||
10491 | + } | ||
10492 | + break; | ||
10493 | + | ||
10494 | + default: | ||
10495 | + g_debug ("unknown GstGLFbEvent type: %ud\n", event->type); | ||
10496 | + break; | ||
10497 | + } // switch | ||
10498 | + | ||
10499 | + g_slice_free (GstGLFbEvent, event); | ||
10500 | + | ||
10501 | + } // while running | ||
10502 | + | ||
10503 | + g_mutex_unlock (priv->lock); | ||
10504 | + | ||
10505 | + g_debug ("end loop\n"); | ||
10506 | +} | ||
10507 | + | ||
10508 | +/* Not called by the gl thread */ | ||
10509 | +void | ||
10510 | +gst_gl_window_quit_loop (GstGLWindow * window, GstGLWindowCB callback, | ||
10511 | + gpointer data) | ||
10512 | +{ | ||
10513 | + if (window) { | ||
10514 | + GstGLWindowPrivate *priv = window->priv; | ||
10515 | + | ||
10516 | + g_mutex_lock (priv->lock); | ||
10517 | + | ||
10518 | + if (priv->running) { | ||
10519 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
10520 | + event->type = FB_EVENT_QUIT; | ||
10521 | + event->callback = callback; | ||
10522 | + event->data = data; | ||
10523 | + priv->queue = g_list_append (priv->queue, event); | ||
10524 | + | ||
10525 | + g_cond_signal (priv->cond_queue_message); | ||
10526 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
10527 | + } | ||
10528 | + | ||
10529 | + g_mutex_unlock (priv->lock); | ||
10530 | + } | ||
10531 | +} | ||
10532 | + | ||
10533 | +/* Not called by the gl thread */ | ||
10534 | +void | ||
10535 | +gst_gl_window_send_message (GstGLWindow * window, GstGLWindowCB callback, | ||
10536 | + gpointer data) | ||
10537 | +{ | ||
10538 | + if (window) { | ||
10539 | + GstGLWindowPrivate *priv = window->priv; | ||
10540 | + | ||
10541 | + g_mutex_lock (priv->lock); | ||
10542 | + | ||
10543 | + if (priv->running) { | ||
10544 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
10545 | + event->type = FB_EVENT_CALLBACK; | ||
10546 | + event->callback = callback; | ||
10547 | + event->data = data; | ||
10548 | + priv->queue = g_list_append (priv->queue, event); | ||
10549 | + g_cond_signal (priv->cond_queue_message); | ||
10550 | + | ||
10551 | + /* block until opengl calls have been executed in the gl thread */ | ||
10552 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
10553 | + } | ||
10554 | + | ||
10555 | + g_mutex_unlock (priv->lock); | ||
10556 | + } | ||
10557 | +} | ||
10558 | + | ||
10559 | +const gchar * | ||
10560 | +EGLErrorString () | ||
10561 | +{ | ||
10562 | + EGLint nErr = eglGetError (); | ||
10563 | + switch (nErr) { | ||
10564 | + case EGL_SUCCESS: | ||
10565 | + return "EGL_SUCCESS"; | ||
10566 | + case EGL_BAD_DISPLAY: | ||
10567 | + return "EGL_BAD_DISPLAY"; | ||
10568 | + case EGL_NOT_INITIALIZED: | ||
10569 | + return "EGL_NOT_INITIALIZED"; | ||
10570 | + case EGL_BAD_ACCESS: | ||
10571 | + return "EGL_BAD_ACCESS"; | ||
10572 | + case EGL_BAD_ALLOC: | ||
10573 | + return "EGL_BAD_ALLOC"; | ||
10574 | + case EGL_BAD_ATTRIBUTE: | ||
10575 | + return "EGL_BAD_ATTRIBUTE"; | ||
10576 | + case EGL_BAD_CONFIG: | ||
10577 | + return "EGL_BAD_CONFIG"; | ||
10578 | + case EGL_BAD_CONTEXT: | ||
10579 | + return "EGL_BAD_CONTEXT"; | ||
10580 | + case EGL_BAD_CURRENT_SURFACE: | ||
10581 | + return "EGL_BAD_CURRENT_SURFACE"; | ||
10582 | + case EGL_BAD_MATCH: | ||
10583 | + return "EGL_BAD_MATCH"; | ||
10584 | + case EGL_BAD_NATIVE_PIXMAP: | ||
10585 | + return "EGL_BAD_NATIVE_PIXMAP"; | ||
10586 | + case EGL_BAD_NATIVE_WINDOW: | ||
10587 | + return "EGL_BAD_NATIVE_WINDOW"; | ||
10588 | + case EGL_BAD_PARAMETER: | ||
10589 | + return "EGL_BAD_PARAMETER"; | ||
10590 | + case EGL_BAD_SURFACE: | ||
10591 | + return "EGL_BAD_SURFACE"; | ||
10592 | + default: | ||
10593 | + return "unknown"; | ||
10594 | + } | ||
10595 | +} | ||
10596 | diff --git a/gst-libs/gst/gl/gstglwindow_x11ES2.c b/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
10597 | index 260fd2e..65afb50 100644 | ||
10598 | --- a/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
10599 | +++ b/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
10600 | @@ -116,16 +116,16 @@ gst_gl_window_finalize (GObject * object) | ||
10601 | |||
10602 | if (priv->gl_context) { | ||
10603 | ret = | ||
10604 | - eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10605 | + eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10606 | EGL_NO_CONTEXT); | ||
10607 | if (!ret) | ||
10608 | g_debug ("failed to release opengl context\n"); | ||
10609 | |||
10610 | - eglDestroyContext (priv->device, priv->gl_context); | ||
10611 | + eglDestroyContext (priv->gl_display, priv->gl_context); | ||
10612 | } | ||
10613 | |||
10614 | - if (priv->device) | ||
10615 | - eglTerminate (priv->device); | ||
10616 | + if (priv->gl_display) | ||
10617 | + eglTerminate (priv->gl_display); | ||
10618 | |||
10619 | XFree (priv->visual_info); | ||
10620 | |||
10621 | @@ -510,7 +510,7 @@ callback_activate_gl_context (GstGLWindowPrivate * priv) | ||
10622 | void | ||
10623 | callback_inactivate_gl_context (GstGLWindowPrivate * priv) | ||
10624 | { | ||
10625 | - if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10626 | + if (!eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
10627 | EGL_NO_CONTEXT)) | ||
10628 | g_debug ("failed to inactivate opengl context %lud\n", | ||
10629 | (gulong) priv->gl_context); | ||
10630 | @@ -622,7 +622,7 @@ gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) | ||
10631 | |||
10632 | XSendEvent (priv->device, priv->internal_win_id, FALSE, ExposureMask, | ||
10633 | &event); | ||
10634 | - XSync (priv->disp_send, FALSE); | ||
10635 | + XSync (priv->device, FALSE); | ||
10636 | } | ||
10637 | } | ||
10638 | |||
10639 | diff --git a/gst/CMakeLists.txt b/gst/CMakeLists.txt | ||
10640 | new file mode 100644 | ||
10641 | index 0000000..3300d05 | ||
10642 | --- /dev/null | ||
10643 | +++ b/gst/CMakeLists.txt | ||
10644 | @@ -0,0 +1 @@ | ||
10645 | +add_subdirectory (gl) | ||
10646 | diff --git a/gst/Makefile.in b/gst/Makefile.in | ||
10647 | index ff7b517..a86785b 100644 | ||
10648 | --- a/gst/Makefile.in | ||
10649 | +++ b/gst/Makefile.in | ||
10650 | @@ -1,9 +1,9 @@ | ||
10651 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
10652 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
10653 | # @configure_input@ | ||
10654 | |||
10655 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
10656 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
10657 | -# Foundation, Inc. | ||
10658 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
10659 | +# Inc. | ||
10660 | # This Makefile.in is free software; the Free Software Foundation | ||
10661 | # gives unlimited permission to copy and/or distribute it, | ||
10662 | # with or without modifications, as long as this notice is preserved. | ||
10663 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
10664 | POST_UNINSTALL = : | ||
10665 | build_triplet = @build@ | ||
10666 | host_triplet = @host@ | ||
10667 | +target_triplet = @target@ | ||
10668 | subdir = gst | ||
10669 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
10670 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
10671 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
10672 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
10673 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
10674 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
10675 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
10676 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
10677 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
10678 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
10679 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
10680 | CONFIG_HEADER = $(top_builddir)/config.h | ||
10681 | CONFIG_CLEAN_FILES = | ||
10682 | CONFIG_CLEAN_VPATH_FILES = | ||
10683 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
10684 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
10685 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
10686 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
10687 | am__v_GEN_0 = @echo " GEN " $@; | ||
10688 | -AM_V_at = $(am__v_at_@AM_V@) | ||
10689 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
10690 | +AM_V_at = $(am__v_at_$(V)) | ||
10691 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
10692 | am__v_at_0 = @ | ||
10693 | SOURCES = | ||
10694 | DIST_SOURCES = | ||
10695 | @@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ | ||
10696 | EGREP = @EGREP@ | ||
10697 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
10698 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
10699 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
10700 | EXEEXT = @EXEEXT@ | ||
10701 | FFLAGS = @FFLAGS@ | ||
10702 | FGREP = @FGREP@ | ||
10703 | @@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
10704 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
10705 | GST_CURRENT = @GST_CURRENT@ | ||
10706 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
10707 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
10708 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
10709 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
10710 | GST_LIBS = @GST_LIBS@ | ||
10711 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
10712 | @@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
10713 | GST_LICENSE = @GST_LICENSE@ | ||
10714 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
10715 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
10716 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
10717 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
10718 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
10719 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
10720 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
10721 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
10722 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
10723 | @@ -279,7 +284,7 @@ NM = @NM@ | ||
10724 | NMEDIT = @NMEDIT@ | ||
10725 | OBJC = @OBJC@ | ||
10726 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
10727 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
10728 | +OBJCFLAGS = @OBJCFLAGS@ | ||
10729 | OBJDUMP = @OBJDUMP@ | ||
10730 | OBJEXT = @OBJEXT@ | ||
10731 | OPENGL_ES2 = @OPENGL_ES2@ | ||
10732 | @@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
10733 | VERSION = @VERSION@ | ||
10734 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
10735 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
10736 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
10737 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
10738 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
10739 | XGETTEXT = @XGETTEXT@ | ||
10740 | @@ -389,7 +395,11 @@ sbindir = @sbindir@ | ||
10741 | sharedstatedir = @sharedstatedir@ | ||
10742 | srcdir = @srcdir@ | ||
10743 | sysconfdir = @sysconfdir@ | ||
10744 | +target = @target@ | ||
10745 | target_alias = @target_alias@ | ||
10746 | +target_cpu = @target_cpu@ | ||
10747 | +target_os = @target_os@ | ||
10748 | +target_vendor = @target_vendor@ | ||
10749 | top_build_prefix = @top_build_prefix@ | ||
10750 | top_builddir = @top_builddir@ | ||
10751 | top_srcdir = @top_srcdir@ | ||
10752 | @@ -643,15 +653,10 @@ install-am: all-am | ||
10753 | |||
10754 | installcheck: installcheck-recursive | ||
10755 | install-strip: | ||
10756 | - if test -z '$(STRIP)'; then \ | ||
10757 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
10758 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
10759 | - install; \ | ||
10760 | - else \ | ||
10761 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
10762 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
10763 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
10764 | - fi | ||
10765 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
10766 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
10767 | + `test -z '$(STRIP)' || \ | ||
10768 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
10769 | mostlyclean-generic: | ||
10770 | |||
10771 | clean-generic: | ||
10772 | diff --git a/gst/gl/BUGS b/gst/gl/BUGS | ||
10773 | new file mode 100644 | ||
10774 | index 0000000..7110c92 | ||
10775 | --- /dev/null | ||
10776 | +++ b/gst/gl/BUGS | ||
10777 | @@ -0,0 +1,3 @@ | ||
10778 | + | ||
10779 | +known issues: | ||
10780 | + | ||
10781 | diff --git a/gst/gl/CMakeLists.txt b/gst/gl/CMakeLists.txt | ||
10782 | new file mode 100644 | ||
10783 | index 0000000..e57d77a | ||
10784 | --- /dev/null | ||
10785 | +++ b/gst/gl/CMakeLists.txt | ||
10786 | @@ -0,0 +1,72 @@ | ||
10787 | +add_definitions(-DHAVE_CONFIG_H) | ||
10788 | + | ||
10789 | +include_directories(AFTER | ||
10790 | + ${GSTREAMER_INCLUDE_DIR} | ||
10791 | + ${GLIB2_INCLUDE_DIR} | ||
10792 | + ${PNG_INCLUDE_DIR} | ||
10793 | + ${ZLIB_INCLUDE_DIR} | ||
10794 | + ../../gst-libs/gst/gl | ||
10795 | + ${GLEW_INCLUDE_DIR} | ||
10796 | + ../../gst-libs | ||
10797 | + . | ||
10798 | + effects) | ||
10799 | + | ||
10800 | +if (NOT GST_USING_BINARY_REGISTRY) | ||
10801 | +include_directories(AFTER | ||
10802 | + ${LIBXML2_INCLUDE_DIR} | ||
10803 | + ${LIBICONV_INCLUDE_DIR}) | ||
10804 | +endif (NOT GST_USING_BINARY_REGISTRY) | ||
10805 | + | ||
10806 | +if (WIN32) | ||
10807 | + include_directories(AFTER | ||
10808 | + ../../win32/common | ||
10809 | + ../../../win32/common) | ||
10810 | +endif (WIN32) | ||
10811 | + | ||
10812 | +if (APPLE) | ||
10813 | + include_directories(AFTER ../..) | ||
10814 | +endif (APPLE) | ||
10815 | + | ||
10816 | +add_library (gstopengl MODULE | ||
10817 | + gstopengl.c | ||
10818 | + gstglimagesink.c | ||
10819 | + gstglupload.c | ||
10820 | + gstgldownload.c | ||
10821 | + gstglfilterblur.c | ||
10822 | + gstglfiltercube.c | ||
10823 | + gstglfilterlaplacian.c | ||
10824 | + gstglfiltersobel.c | ||
10825 | + gstglfilterglass.c | ||
10826 | + gstglfilterapp.c | ||
10827 | + gstglfilterreflectedscreen.c | ||
10828 | + gstglfiltershader.c | ||
10829 | + gstglcolorscale.c | ||
10830 | + gltestsrc.c | ||
10831 | + gstgltestsrc.c | ||
10832 | + gstgloverlay.c | ||
10833 | + gstgldeinterlace.c | ||
10834 | + gstgldifferencematte.c | ||
10835 | + gstglbumper.c | ||
10836 | + gstgleffects.c | ||
10837 | + gstglmosaic.c | ||
10838 | + effects/gstgleffectssources.c | ||
10839 | + effects/gstgleffectidentity.c | ||
10840 | + effects/gstgleffectmirror.c | ||
10841 | + effects/gstgleffectsqueeze.c | ||
10842 | + effects/gstgleffectstretch.c | ||
10843 | + effects/gstgleffecttunnel.c | ||
10844 | + effects/gstgleffectfisheye.c | ||
10845 | + effects/gstgleffecttwirl.c | ||
10846 | + effects/gstgleffectbulge.c | ||
10847 | + effects/gstgleffectsquare.c | ||
10848 | + effects/gstgleffectlumatocurve.c | ||
10849 | + effects/gstgleffectrgbtocurve.c | ||
10850 | + effects/gstgleffectsin.c | ||
10851 | + effects/gstgleffectglow.c | ||
10852 | + effects/gstgleffectxray.c) | ||
10853 | + | ||
10854 | +target_link_libraries(gstopengl | ||
10855 | + general gstgl | ||
10856 | + general ${JPEG_LIBRARY} | ||
10857 | + general ${PNG_LIBRARY} | ||
10858 | + general ${ZLIB_LIBRARY}) | ||
10859 | diff --git a/gst/gl/GNUmakefile.gnustep b/gst/gl/GNUmakefile.gnustep | ||
10860 | new file mode 100644 | ||
10861 | index 0000000..37df1d4 | ||
10862 | --- /dev/null | ||
10863 | +++ b/gst/gl/GNUmakefile.gnustep | ||
10864 | @@ -0,0 +1,45 @@ | ||
10865 | +include $(GNUSTEP_MAKEFILES)/common.make | ||
10866 | + | ||
10867 | +SUBPROJECT_NAME = gstgl | ||
10868 | + | ||
10869 | +gstgl_C_FILES += \ | ||
10870 | + gstopengl.c \ | ||
10871 | + gstglimagesink.c \ | ||
10872 | + gstglupload.c \ | ||
10873 | + gstgldownload.c \ | ||
10874 | + gstglfilterblur.c \ | ||
10875 | + gstglfiltercube.c \ | ||
10876 | + gstglfilterlaplacian.c \ | ||
10877 | + gstglfiltersobel.c \ | ||
10878 | + gstglfilterglass.c \ | ||
10879 | + gstglfilterapp.c \ | ||
10880 | + gstglfilterreflectedscreen.c \ | ||
10881 | + gstglfiltershader.c \ | ||
10882 | + gstglcolorscale.c \ | ||
10883 | + gltestsrc.c \ | ||
10884 | + gstgltestsrc.c \ | ||
10885 | + gstgloverlay.c \ | ||
10886 | + gstgldifferencematte.c \ | ||
10887 | + gstgldeinterlace.c \ | ||
10888 | + gstglbumper.c \ | ||
10889 | + gstgleffects.c \ | ||
10890 | + gstglmosaic.c | ||
10891 | + | ||
10892 | +gstgl_INCLUDE_DIRS += \ | ||
10893 | + -I../../gst-libs \ | ||
10894 | + -I../../gst-libs/gst/gl \ | ||
10895 | + -Ieffects | ||
10896 | + | ||
10897 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
10898 | + gstgl_INCLUDE_DIRS += \ | ||
10899 | + -I../../win32/common \ | ||
10900 | + -IC:/gstreamer/include/libxml2 \ | ||
10901 | + -IC:/gstreamer/include/glib-2.0 \ | ||
10902 | + -IC:/gstreamer/lib/glib-2.0/include \ | ||
10903 | + -IC:/gstreamer/include \ | ||
10904 | + -IC:/gstreamer/include/gstreamer-0.10 | ||
10905 | +endif | ||
10906 | + | ||
10907 | +gstgl_CFLAGS = -Wall -DHAVE_CONFIG_H | ||
10908 | + | ||
10909 | +include $(GNUSTEP_MAKEFILES)/subproject.make | ||
10910 | diff --git a/gst/gl/Makefile.in b/gst/gl/Makefile.in | ||
10911 | index c95d83f..cf88d25 100644 | ||
10912 | --- a/gst/gl/Makefile.in | ||
10913 | +++ b/gst/gl/Makefile.in | ||
10914 | @@ -1,9 +1,9 @@ | ||
10915 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
10916 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
10917 | # @configure_input@ | ||
10918 | |||
10919 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
10920 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
10921 | -# Foundation, Inc. | ||
10922 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
10923 | +# Inc. | ||
10924 | # This Makefile.in is free software; the Free Software Foundation | ||
10925 | # gives unlimited permission to copy and/or distribute it, | ||
10926 | # with or without modifications, as long as this notice is preserved. | ||
10927 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
10928 | POST_UNINSTALL = : | ||
10929 | build_triplet = @build@ | ||
10930 | host_triplet = @host@ | ||
10931 | +target_triplet = @target@ | ||
10932 | @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@am__append_1 = \ | ||
10933 | @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@ gstglbumper.c \ | ||
10934 | @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@ gstglbumper.h \ | ||
10935 | @@ -51,7 +52,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
10936 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
10937 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
10938 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
10939 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
10940 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
10941 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
10942 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
10943 | @@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ | ||
10944 | am__base_list = \ | ||
10945 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
10946 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
10947 | -am__uninstall_files_from_dir = { \ | ||
10948 | - test -z "$$files" \ | ||
10949 | - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
10950 | - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
10951 | - $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
10952 | - } | ||
10953 | am__installdirs = "$(DESTDIR)$(plugindir)" | ||
10954 | LTLIBRARIES = $(plugin_LTLIBRARIES) | ||
10955 | am__DEPENDENCIES_1 = | ||
10956 | @@ -182,8 +176,8 @@ am_libgstopengl_la_OBJECTS = libgstopengl_la-gstopengl.lo \ | ||
10957 | libgstopengl_la-gstgleffectmirror.lo \ | ||
10958 | libgstopengl_la-gstgleffectsqueeze.lo $(am__objects_3) | ||
10959 | libgstopengl_la_OBJECTS = $(am_libgstopengl_la_OBJECTS) | ||
10960 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
10961 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
10962 | +AM_V_lt = $(am__v_lt_$(V)) | ||
10963 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
10964 | am__v_lt_0 = --silent | ||
10965 | libgstopengl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
10966 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
10967 | @@ -199,21 +193,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
10968 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
10969 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
10970 | $(AM_CFLAGS) $(CFLAGS) | ||
10971 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
10972 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
10973 | +AM_V_CC = $(am__v_CC_$(V)) | ||
10974 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
10975 | am__v_CC_0 = @echo " CC " $@; | ||
10976 | -AM_V_at = $(am__v_at_@AM_V@) | ||
10977 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
10978 | +AM_V_at = $(am__v_at_$(V)) | ||
10979 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
10980 | am__v_at_0 = @ | ||
10981 | CCLD = $(CC) | ||
10982 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
10983 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
10984 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
10985 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
10986 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
10987 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
10988 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
10989 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
10990 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
10991 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
10992 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
10993 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
10994 | am__v_GEN_0 = @echo " GEN " $@; | ||
10995 | SOURCES = $(libgstopengl_la_SOURCES) | ||
10996 | DIST_SOURCES = $(am__libgstopengl_la_SOURCES_DIST) | ||
10997 | @@ -266,6 +260,7 @@ ECHO_T = @ECHO_T@ | ||
10998 | EGREP = @EGREP@ | ||
10999 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
11000 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
11001 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
11002 | EXEEXT = @EXEEXT@ | ||
11003 | FFLAGS = @FFLAGS@ | ||
11004 | FGREP = @FGREP@ | ||
11005 | @@ -297,6 +292,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
11006 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
11007 | GST_CURRENT = @GST_CURRENT@ | ||
11008 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
11009 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
11010 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
11011 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
11012 | GST_LIBS = @GST_LIBS@ | ||
11013 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
11014 | @@ -304,8 +301,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
11015 | GST_LICENSE = @GST_LICENSE@ | ||
11016 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
11017 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
11018 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
11019 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
11020 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
11021 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
11022 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
11023 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
11024 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
11025 | @@ -378,7 +377,7 @@ NM = @NM@ | ||
11026 | NMEDIT = @NMEDIT@ | ||
11027 | OBJC = @OBJC@ | ||
11028 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
11029 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
11030 | +OBJCFLAGS = @OBJCFLAGS@ | ||
11031 | OBJDUMP = @OBJDUMP@ | ||
11032 | OBJEXT = @OBJEXT@ | ||
11033 | OPENGL_ES2 = @OPENGL_ES2@ | ||
11034 | @@ -423,6 +422,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
11035 | VERSION = @VERSION@ | ||
11036 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
11037 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
11038 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
11039 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
11040 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
11041 | XGETTEXT = @XGETTEXT@ | ||
11042 | @@ -488,7 +488,11 @@ sbindir = @sbindir@ | ||
11043 | sharedstatedir = @sharedstatedir@ | ||
11044 | srcdir = @srcdir@ | ||
11045 | sysconfdir = @sysconfdir@ | ||
11046 | +target = @target@ | ||
11047 | target_alias = @target_alias@ | ||
11048 | +target_cpu = @target_cpu@ | ||
11049 | +target_os = @target_os@ | ||
11050 | +target_vendor = @target_vendor@ | ||
11051 | top_build_prefix = @top_build_prefix@ | ||
11052 | top_builddir = @top_builddir@ | ||
11053 | top_srcdir = @top_srcdir@ | ||
11054 | @@ -627,7 +631,7 @@ clean-pluginLTLIBRARIES: | ||
11055 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
11056 | rm -f "$${dir}/so_locations"; \ | ||
11057 | done | ||
11058 | -libgstopengl.la: $(libgstopengl_la_OBJECTS) $(libgstopengl_la_DEPENDENCIES) $(EXTRA_libgstopengl_la_DEPENDENCIES) | ||
11059 | +libgstopengl.la: $(libgstopengl_la_OBJECTS) $(libgstopengl_la_DEPENDENCIES) | ||
11060 | $(AM_V_CCLD)$(libgstopengl_la_LINK) -rpath $(plugindir) $(libgstopengl_la_OBJECTS) $(libgstopengl_la_LIBADD) $(LIBS) | ||
11061 | |||
11062 | mostlyclean-compile: | ||
11063 | @@ -676,275 +680,314 @@ distclean-compile: | ||
11064 | .c.o: | ||
11065 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
11066 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
11067 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
11068 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11069 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
11070 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11071 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
11072 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
11073 | |||
11074 | .c.obj: | ||
11075 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
11076 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
11077 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
11078 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11079 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
11080 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11081 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
11082 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
11083 | |||
11084 | .c.lo: | ||
11085 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
11086 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
11087 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
11088 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11089 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
11090 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11091 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
11092 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
11093 | |||
11094 | libgstopengl_la-gstopengl.lo: gstopengl.c | ||
11095 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstopengl.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstopengl.Tpo -c -o libgstopengl_la-gstopengl.lo `test -f 'gstopengl.c' || echo '$(srcdir)/'`gstopengl.c | ||
11096 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstopengl.Tpo $(DEPDIR)/libgstopengl_la-gstopengl.Plo | ||
11097 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopengl.c' object='libgstopengl_la-gstopengl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11098 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11099 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstopengl.c' object='libgstopengl_la-gstopengl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11100 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11101 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstopengl.lo `test -f 'gstopengl.c' || echo '$(srcdir)/'`gstopengl.c | ||
11102 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstopengl.lo `test -f 'gstopengl.c' || echo '$(srcdir)/'`gstopengl.c | ||
11103 | |||
11104 | libgstopengl_la-gstglimagesink.lo: gstglimagesink.c | ||
11105 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglimagesink.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglimagesink.Tpo -c -o libgstopengl_la-gstglimagesink.lo `test -f 'gstglimagesink.c' || echo '$(srcdir)/'`gstglimagesink.c | ||
11106 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglimagesink.Tpo $(DEPDIR)/libgstopengl_la-gstglimagesink.Plo | ||
11107 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglimagesink.c' object='libgstopengl_la-gstglimagesink.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11108 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11109 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglimagesink.c' object='libgstopengl_la-gstglimagesink.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11110 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11111 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglimagesink.lo `test -f 'gstglimagesink.c' || echo '$(srcdir)/'`gstglimagesink.c | ||
11112 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglimagesink.lo `test -f 'gstglimagesink.c' || echo '$(srcdir)/'`gstglimagesink.c | ||
11113 | |||
11114 | libgstopengl_la-gstglupload.lo: gstglupload.c | ||
11115 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglupload.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglupload.Tpo -c -o libgstopengl_la-gstglupload.lo `test -f 'gstglupload.c' || echo '$(srcdir)/'`gstglupload.c | ||
11116 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglupload.Tpo $(DEPDIR)/libgstopengl_la-gstglupload.Plo | ||
11117 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglupload.c' object='libgstopengl_la-gstglupload.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11118 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11119 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglupload.c' object='libgstopengl_la-gstglupload.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11120 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11121 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglupload.lo `test -f 'gstglupload.c' || echo '$(srcdir)/'`gstglupload.c | ||
11122 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglupload.lo `test -f 'gstglupload.c' || echo '$(srcdir)/'`gstglupload.c | ||
11123 | |||
11124 | libgstopengl_la-gstgldownload.lo: gstgldownload.c | ||
11125 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgldownload.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgldownload.Tpo -c -o libgstopengl_la-gstgldownload.lo `test -f 'gstgldownload.c' || echo '$(srcdir)/'`gstgldownload.c | ||
11126 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldownload.Tpo $(DEPDIR)/libgstopengl_la-gstgldownload.Plo | ||
11127 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldownload.c' object='libgstopengl_la-gstgldownload.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11128 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11129 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldownload.c' object='libgstopengl_la-gstgldownload.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11130 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11131 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldownload.lo `test -f 'gstgldownload.c' || echo '$(srcdir)/'`gstgldownload.c | ||
11132 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldownload.lo `test -f 'gstgldownload.c' || echo '$(srcdir)/'`gstgldownload.c | ||
11133 | |||
11134 | libgstopengl_la-gstglfiltercube.lo: gstglfiltercube.c | ||
11135 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfiltercube.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfiltercube.Tpo -c -o libgstopengl_la-gstglfiltercube.lo `test -f 'gstglfiltercube.c' || echo '$(srcdir)/'`gstglfiltercube.c | ||
11136 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltercube.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltercube.Plo | ||
11137 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltercube.c' object='libgstopengl_la-gstglfiltercube.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11138 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11139 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltercube.c' object='libgstopengl_la-gstglfiltercube.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11140 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11141 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltercube.lo `test -f 'gstglfiltercube.c' || echo '$(srcdir)/'`gstglfiltercube.c | ||
11142 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltercube.lo `test -f 'gstglfiltercube.c' || echo '$(srcdir)/'`gstglfiltercube.c | ||
11143 | |||
11144 | libgstopengl_la-gstgleffects.lo: gstgleffects.c | ||
11145 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffects.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffects.Tpo -c -o libgstopengl_la-gstgleffects.lo `test -f 'gstgleffects.c' || echo '$(srcdir)/'`gstgleffects.c | ||
11146 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffects.Tpo $(DEPDIR)/libgstopengl_la-gstgleffects.Plo | ||
11147 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgleffects.c' object='libgstopengl_la-gstgleffects.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11148 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11149 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgleffects.c' object='libgstopengl_la-gstgleffects.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11150 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11151 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffects.lo `test -f 'gstgleffects.c' || echo '$(srcdir)/'`gstgleffects.c | ||
11152 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffects.lo `test -f 'gstgleffects.c' || echo '$(srcdir)/'`gstgleffects.c | ||
11153 | |||
11154 | libgstopengl_la-gstgleffectssources.lo: effects/gstgleffectssources.c | ||
11155 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectssources.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectssources.Tpo -c -o libgstopengl_la-gstgleffectssources.lo `test -f 'effects/gstgleffectssources.c' || echo '$(srcdir)/'`effects/gstgleffectssources.c | ||
11156 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectssources.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectssources.Plo | ||
11157 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectssources.c' object='libgstopengl_la-gstgleffectssources.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11158 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11159 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectssources.c' object='libgstopengl_la-gstgleffectssources.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11160 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11161 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectssources.lo `test -f 'effects/gstgleffectssources.c' || echo '$(srcdir)/'`effects/gstgleffectssources.c | ||
11162 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectssources.lo `test -f 'effects/gstgleffectssources.c' || echo '$(srcdir)/'`effects/gstgleffectssources.c | ||
11163 | |||
11164 | libgstopengl_la-gstgleffectidentity.lo: effects/gstgleffectidentity.c | ||
11165 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectidentity.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectidentity.Tpo -c -o libgstopengl_la-gstgleffectidentity.lo `test -f 'effects/gstgleffectidentity.c' || echo '$(srcdir)/'`effects/gstgleffectidentity.c | ||
11166 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectidentity.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectidentity.Plo | ||
11167 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectidentity.c' object='libgstopengl_la-gstgleffectidentity.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11168 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11169 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectidentity.c' object='libgstopengl_la-gstgleffectidentity.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11170 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11171 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectidentity.lo `test -f 'effects/gstgleffectidentity.c' || echo '$(srcdir)/'`effects/gstgleffectidentity.c | ||
11172 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectidentity.lo `test -f 'effects/gstgleffectidentity.c' || echo '$(srcdir)/'`effects/gstgleffectidentity.c | ||
11173 | |||
11174 | libgstopengl_la-gstgleffectmirror.lo: effects/gstgleffectmirror.c | ||
11175 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectmirror.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectmirror.Tpo -c -o libgstopengl_la-gstgleffectmirror.lo `test -f 'effects/gstgleffectmirror.c' || echo '$(srcdir)/'`effects/gstgleffectmirror.c | ||
11176 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectmirror.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectmirror.Plo | ||
11177 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectmirror.c' object='libgstopengl_la-gstgleffectmirror.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11178 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11179 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectmirror.c' object='libgstopengl_la-gstgleffectmirror.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11180 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11181 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectmirror.lo `test -f 'effects/gstgleffectmirror.c' || echo '$(srcdir)/'`effects/gstgleffectmirror.c | ||
11182 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectmirror.lo `test -f 'effects/gstgleffectmirror.c' || echo '$(srcdir)/'`effects/gstgleffectmirror.c | ||
11183 | |||
11184 | libgstopengl_la-gstgleffectsqueeze.lo: effects/gstgleffectsqueeze.c | ||
11185 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectsqueeze.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectsqueeze.Tpo -c -o libgstopengl_la-gstgleffectsqueeze.lo `test -f 'effects/gstgleffectsqueeze.c' || echo '$(srcdir)/'`effects/gstgleffectsqueeze.c | ||
11186 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsqueeze.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsqueeze.Plo | ||
11187 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsqueeze.c' object='libgstopengl_la-gstgleffectsqueeze.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11188 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11189 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsqueeze.c' object='libgstopengl_la-gstgleffectsqueeze.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11190 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11191 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsqueeze.lo `test -f 'effects/gstgleffectsqueeze.c' || echo '$(srcdir)/'`effects/gstgleffectsqueeze.c | ||
11192 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsqueeze.lo `test -f 'effects/gstgleffectsqueeze.c' || echo '$(srcdir)/'`effects/gstgleffectsqueeze.c | ||
11193 | |||
11194 | libgstopengl_la-gstglfiltershader.lo: gstglfiltershader.c | ||
11195 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfiltershader.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfiltershader.Tpo -c -o libgstopengl_la-gstglfiltershader.lo `test -f 'gstglfiltershader.c' || echo '$(srcdir)/'`gstglfiltershader.c | ||
11196 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltershader.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltershader.Plo | ||
11197 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltershader.c' object='libgstopengl_la-gstglfiltershader.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11198 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11199 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltershader.c' object='libgstopengl_la-gstglfiltershader.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11200 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11201 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltershader.lo `test -f 'gstglfiltershader.c' || echo '$(srcdir)/'`gstglfiltershader.c | ||
11202 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltershader.lo `test -f 'gstglfiltershader.c' || echo '$(srcdir)/'`gstglfiltershader.c | ||
11203 | |||
11204 | libgstopengl_la-gstglfilterblur.lo: gstglfilterblur.c | ||
11205 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfilterblur.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfilterblur.Tpo -c -o libgstopengl_la-gstglfilterblur.lo `test -f 'gstglfilterblur.c' || echo '$(srcdir)/'`gstglfilterblur.c | ||
11206 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterblur.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterblur.Plo | ||
11207 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterblur.c' object='libgstopengl_la-gstglfilterblur.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11208 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11209 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterblur.c' object='libgstopengl_la-gstglfilterblur.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11210 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11211 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterblur.lo `test -f 'gstglfilterblur.c' || echo '$(srcdir)/'`gstglfilterblur.c | ||
11212 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterblur.lo `test -f 'gstglfilterblur.c' || echo '$(srcdir)/'`gstglfilterblur.c | ||
11213 | |||
11214 | libgstopengl_la-gstglfiltersobel.lo: gstglfiltersobel.c | ||
11215 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfiltersobel.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfiltersobel.Tpo -c -o libgstopengl_la-gstglfiltersobel.lo `test -f 'gstglfiltersobel.c' || echo '$(srcdir)/'`gstglfiltersobel.c | ||
11216 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltersobel.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltersobel.Plo | ||
11217 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltersobel.c' object='libgstopengl_la-gstglfiltersobel.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11218 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11219 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltersobel.c' object='libgstopengl_la-gstglfiltersobel.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11220 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11221 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltersobel.lo `test -f 'gstglfiltersobel.c' || echo '$(srcdir)/'`gstglfiltersobel.c | ||
11222 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfiltersobel.lo `test -f 'gstglfiltersobel.c' || echo '$(srcdir)/'`gstglfiltersobel.c | ||
11223 | |||
11224 | libgstopengl_la-gstglfilterlaplacian.lo: gstglfilterlaplacian.c | ||
11225 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfilterlaplacian.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfilterlaplacian.Tpo -c -o libgstopengl_la-gstglfilterlaplacian.lo `test -f 'gstglfilterlaplacian.c' || echo '$(srcdir)/'`gstglfilterlaplacian.c | ||
11226 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterlaplacian.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterlaplacian.Plo | ||
11227 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterlaplacian.c' object='libgstopengl_la-gstglfilterlaplacian.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11228 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11229 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterlaplacian.c' object='libgstopengl_la-gstglfilterlaplacian.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11230 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11231 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterlaplacian.lo `test -f 'gstglfilterlaplacian.c' || echo '$(srcdir)/'`gstglfilterlaplacian.c | ||
11232 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterlaplacian.lo `test -f 'gstglfilterlaplacian.c' || echo '$(srcdir)/'`gstglfilterlaplacian.c | ||
11233 | |||
11234 | libgstopengl_la-gstglfilterglass.lo: gstglfilterglass.c | ||
11235 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfilterglass.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfilterglass.Tpo -c -o libgstopengl_la-gstglfilterglass.lo `test -f 'gstglfilterglass.c' || echo '$(srcdir)/'`gstglfilterglass.c | ||
11236 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterglass.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterglass.Plo | ||
11237 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterglass.c' object='libgstopengl_la-gstglfilterglass.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11238 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11239 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterglass.c' object='libgstopengl_la-gstglfilterglass.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11240 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11241 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterglass.lo `test -f 'gstglfilterglass.c' || echo '$(srcdir)/'`gstglfilterglass.c | ||
11242 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterglass.lo `test -f 'gstglfilterglass.c' || echo '$(srcdir)/'`gstglfilterglass.c | ||
11243 | |||
11244 | libgstopengl_la-gstglfilterapp.lo: gstglfilterapp.c | ||
11245 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfilterapp.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfilterapp.Tpo -c -o libgstopengl_la-gstglfilterapp.lo `test -f 'gstglfilterapp.c' || echo '$(srcdir)/'`gstglfilterapp.c | ||
11246 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterapp.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterapp.Plo | ||
11247 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterapp.c' object='libgstopengl_la-gstglfilterapp.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11248 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11249 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterapp.c' object='libgstopengl_la-gstglfilterapp.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11250 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11251 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterapp.lo `test -f 'gstglfilterapp.c' || echo '$(srcdir)/'`gstglfilterapp.c | ||
11252 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterapp.lo `test -f 'gstglfilterapp.c' || echo '$(srcdir)/'`gstglfilterapp.c | ||
11253 | |||
11254 | libgstopengl_la-gstglfilterreflectedscreen.lo: gstglfilterreflectedscreen.c | ||
11255 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglfilterreflectedscreen.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglfilterreflectedscreen.Tpo -c -o libgstopengl_la-gstglfilterreflectedscreen.lo `test -f 'gstglfilterreflectedscreen.c' || echo '$(srcdir)/'`gstglfilterreflectedscreen.c | ||
11256 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterreflectedscreen.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterreflectedscreen.Plo | ||
11257 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterreflectedscreen.c' object='libgstopengl_la-gstglfilterreflectedscreen.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11258 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11259 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterreflectedscreen.c' object='libgstopengl_la-gstglfilterreflectedscreen.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11260 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11261 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterreflectedscreen.lo `test -f 'gstglfilterreflectedscreen.c' || echo '$(srcdir)/'`gstglfilterreflectedscreen.c | ||
11262 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglfilterreflectedscreen.lo `test -f 'gstglfilterreflectedscreen.c' || echo '$(srcdir)/'`gstglfilterreflectedscreen.c | ||
11263 | |||
11264 | libgstopengl_la-gstglcolorscale.lo: gstglcolorscale.c | ||
11265 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglcolorscale.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglcolorscale.Tpo -c -o libgstopengl_la-gstglcolorscale.lo `test -f 'gstglcolorscale.c' || echo '$(srcdir)/'`gstglcolorscale.c | ||
11266 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglcolorscale.Tpo $(DEPDIR)/libgstopengl_la-gstglcolorscale.Plo | ||
11267 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglcolorscale.c' object='libgstopengl_la-gstglcolorscale.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11268 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11269 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglcolorscale.c' object='libgstopengl_la-gstglcolorscale.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11270 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11271 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglcolorscale.lo `test -f 'gstglcolorscale.c' || echo '$(srcdir)/'`gstglcolorscale.c | ||
11272 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglcolorscale.lo `test -f 'gstglcolorscale.c' || echo '$(srcdir)/'`gstglcolorscale.c | ||
11273 | |||
11274 | libgstopengl_la-gstgldeinterlace.lo: gstgldeinterlace.c | ||
11275 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgldeinterlace.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgldeinterlace.Tpo -c -o libgstopengl_la-gstgldeinterlace.lo `test -f 'gstgldeinterlace.c' || echo '$(srcdir)/'`gstgldeinterlace.c | ||
11276 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldeinterlace.Tpo $(DEPDIR)/libgstopengl_la-gstgldeinterlace.Plo | ||
11277 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldeinterlace.c' object='libgstopengl_la-gstgldeinterlace.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11278 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11279 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldeinterlace.c' object='libgstopengl_la-gstgldeinterlace.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11280 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11281 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldeinterlace.lo `test -f 'gstgldeinterlace.c' || echo '$(srcdir)/'`gstgldeinterlace.c | ||
11282 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldeinterlace.lo `test -f 'gstgldeinterlace.c' || echo '$(srcdir)/'`gstgldeinterlace.c | ||
11283 | |||
11284 | libgstopengl_la-gltestsrc.lo: gltestsrc.c | ||
11285 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gltestsrc.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gltestsrc.Tpo -c -o libgstopengl_la-gltestsrc.lo `test -f 'gltestsrc.c' || echo '$(srcdir)/'`gltestsrc.c | ||
11286 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gltestsrc.Tpo $(DEPDIR)/libgstopengl_la-gltestsrc.Plo | ||
11287 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gltestsrc.c' object='libgstopengl_la-gltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11288 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11289 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gltestsrc.c' object='libgstopengl_la-gltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11290 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11291 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gltestsrc.lo `test -f 'gltestsrc.c' || echo '$(srcdir)/'`gltestsrc.c | ||
11292 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gltestsrc.lo `test -f 'gltestsrc.c' || echo '$(srcdir)/'`gltestsrc.c | ||
11293 | |||
11294 | libgstopengl_la-gstgltestsrc.lo: gstgltestsrc.c | ||
11295 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgltestsrc.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgltestsrc.Tpo -c -o libgstopengl_la-gstgltestsrc.lo `test -f 'gstgltestsrc.c' || echo '$(srcdir)/'`gstgltestsrc.c | ||
11296 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgltestsrc.Tpo $(DEPDIR)/libgstopengl_la-gstgltestsrc.Plo | ||
11297 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgltestsrc.c' object='libgstopengl_la-gstgltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11298 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11299 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgltestsrc.c' object='libgstopengl_la-gstgltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11300 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11301 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgltestsrc.lo `test -f 'gstgltestsrc.c' || echo '$(srcdir)/'`gstgltestsrc.c | ||
11302 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgltestsrc.lo `test -f 'gstgltestsrc.c' || echo '$(srcdir)/'`gstgltestsrc.c | ||
11303 | |||
11304 | libgstopengl_la-gstglmosaic.lo: gstglmosaic.c | ||
11305 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglmosaic.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglmosaic.Tpo -c -o libgstopengl_la-gstglmosaic.lo `test -f 'gstglmosaic.c' || echo '$(srcdir)/'`gstglmosaic.c | ||
11306 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglmosaic.Tpo $(DEPDIR)/libgstopengl_la-gstglmosaic.Plo | ||
11307 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglmosaic.c' object='libgstopengl_la-gstglmosaic.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11308 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11309 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglmosaic.c' object='libgstopengl_la-gstglmosaic.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11310 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11311 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglmosaic.lo `test -f 'gstglmosaic.c' || echo '$(srcdir)/'`gstglmosaic.c | ||
11312 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglmosaic.lo `test -f 'gstglmosaic.c' || echo '$(srcdir)/'`gstglmosaic.c | ||
11313 | |||
11314 | libgstopengl_la-gstgleffectstretch.lo: effects/gstgleffectstretch.c | ||
11315 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectstretch.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectstretch.Tpo -c -o libgstopengl_la-gstgleffectstretch.lo `test -f 'effects/gstgleffectstretch.c' || echo '$(srcdir)/'`effects/gstgleffectstretch.c | ||
11316 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectstretch.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectstretch.Plo | ||
11317 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectstretch.c' object='libgstopengl_la-gstgleffectstretch.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11318 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11319 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectstretch.c' object='libgstopengl_la-gstgleffectstretch.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11320 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11321 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectstretch.lo `test -f 'effects/gstgleffectstretch.c' || echo '$(srcdir)/'`effects/gstgleffectstretch.c | ||
11322 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectstretch.lo `test -f 'effects/gstgleffectstretch.c' || echo '$(srcdir)/'`effects/gstgleffectstretch.c | ||
11323 | |||
11324 | libgstopengl_la-gstgleffecttunnel.lo: effects/gstgleffecttunnel.c | ||
11325 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffecttunnel.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffecttunnel.Tpo -c -o libgstopengl_la-gstgleffecttunnel.lo `test -f 'effects/gstgleffecttunnel.c' || echo '$(srcdir)/'`effects/gstgleffecttunnel.c | ||
11326 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffecttunnel.Tpo $(DEPDIR)/libgstopengl_la-gstgleffecttunnel.Plo | ||
11327 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffecttunnel.c' object='libgstopengl_la-gstgleffecttunnel.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11328 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11329 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffecttunnel.c' object='libgstopengl_la-gstgleffecttunnel.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11330 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11331 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffecttunnel.lo `test -f 'effects/gstgleffecttunnel.c' || echo '$(srcdir)/'`effects/gstgleffecttunnel.c | ||
11332 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffecttunnel.lo `test -f 'effects/gstgleffecttunnel.c' || echo '$(srcdir)/'`effects/gstgleffecttunnel.c | ||
11333 | |||
11334 | libgstopengl_la-gstgleffectfisheye.lo: effects/gstgleffectfisheye.c | ||
11335 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectfisheye.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectfisheye.Tpo -c -o libgstopengl_la-gstgleffectfisheye.lo `test -f 'effects/gstgleffectfisheye.c' || echo '$(srcdir)/'`effects/gstgleffectfisheye.c | ||
11336 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectfisheye.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectfisheye.Plo | ||
11337 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectfisheye.c' object='libgstopengl_la-gstgleffectfisheye.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11338 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11339 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectfisheye.c' object='libgstopengl_la-gstgleffectfisheye.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11340 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11341 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectfisheye.lo `test -f 'effects/gstgleffectfisheye.c' || echo '$(srcdir)/'`effects/gstgleffectfisheye.c | ||
11342 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectfisheye.lo `test -f 'effects/gstgleffectfisheye.c' || echo '$(srcdir)/'`effects/gstgleffectfisheye.c | ||
11343 | |||
11344 | libgstopengl_la-gstgleffecttwirl.lo: effects/gstgleffecttwirl.c | ||
11345 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffecttwirl.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffecttwirl.Tpo -c -o libgstopengl_la-gstgleffecttwirl.lo `test -f 'effects/gstgleffecttwirl.c' || echo '$(srcdir)/'`effects/gstgleffecttwirl.c | ||
11346 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffecttwirl.Tpo $(DEPDIR)/libgstopengl_la-gstgleffecttwirl.Plo | ||
11347 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffecttwirl.c' object='libgstopengl_la-gstgleffecttwirl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11348 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11349 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffecttwirl.c' object='libgstopengl_la-gstgleffecttwirl.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11350 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11351 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffecttwirl.lo `test -f 'effects/gstgleffecttwirl.c' || echo '$(srcdir)/'`effects/gstgleffecttwirl.c | ||
11352 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffecttwirl.lo `test -f 'effects/gstgleffecttwirl.c' || echo '$(srcdir)/'`effects/gstgleffecttwirl.c | ||
11353 | |||
11354 | libgstopengl_la-gstgleffectbulge.lo: effects/gstgleffectbulge.c | ||
11355 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectbulge.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectbulge.Tpo -c -o libgstopengl_la-gstgleffectbulge.lo `test -f 'effects/gstgleffectbulge.c' || echo '$(srcdir)/'`effects/gstgleffectbulge.c | ||
11356 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectbulge.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectbulge.Plo | ||
11357 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectbulge.c' object='libgstopengl_la-gstgleffectbulge.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11358 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11359 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectbulge.c' object='libgstopengl_la-gstgleffectbulge.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11360 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11361 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectbulge.lo `test -f 'effects/gstgleffectbulge.c' || echo '$(srcdir)/'`effects/gstgleffectbulge.c | ||
11362 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectbulge.lo `test -f 'effects/gstgleffectbulge.c' || echo '$(srcdir)/'`effects/gstgleffectbulge.c | ||
11363 | |||
11364 | libgstopengl_la-gstgleffectsquare.lo: effects/gstgleffectsquare.c | ||
11365 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectsquare.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectsquare.Tpo -c -o libgstopengl_la-gstgleffectsquare.lo `test -f 'effects/gstgleffectsquare.c' || echo '$(srcdir)/'`effects/gstgleffectsquare.c | ||
11366 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsquare.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsquare.Plo | ||
11367 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsquare.c' object='libgstopengl_la-gstgleffectsquare.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11368 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11369 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsquare.c' object='libgstopengl_la-gstgleffectsquare.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11370 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11371 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsquare.lo `test -f 'effects/gstgleffectsquare.c' || echo '$(srcdir)/'`effects/gstgleffectsquare.c | ||
11372 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsquare.lo `test -f 'effects/gstgleffectsquare.c' || echo '$(srcdir)/'`effects/gstgleffectsquare.c | ||
11373 | |||
11374 | libgstopengl_la-gstgleffectlumatocurve.lo: effects/gstgleffectlumatocurve.c | ||
11375 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectlumatocurve.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectlumatocurve.Tpo -c -o libgstopengl_la-gstgleffectlumatocurve.lo `test -f 'effects/gstgleffectlumatocurve.c' || echo '$(srcdir)/'`effects/gstgleffectlumatocurve.c | ||
11376 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectlumatocurve.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectlumatocurve.Plo | ||
11377 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectlumatocurve.c' object='libgstopengl_la-gstgleffectlumatocurve.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11378 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11379 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectlumatocurve.c' object='libgstopengl_la-gstgleffectlumatocurve.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11380 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11381 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectlumatocurve.lo `test -f 'effects/gstgleffectlumatocurve.c' || echo '$(srcdir)/'`effects/gstgleffectlumatocurve.c | ||
11382 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectlumatocurve.lo `test -f 'effects/gstgleffectlumatocurve.c' || echo '$(srcdir)/'`effects/gstgleffectlumatocurve.c | ||
11383 | |||
11384 | libgstopengl_la-gstgleffectrgbtocurve.lo: effects/gstgleffectrgbtocurve.c | ||
11385 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectrgbtocurve.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectrgbtocurve.Tpo -c -o libgstopengl_la-gstgleffectrgbtocurve.lo `test -f 'effects/gstgleffectrgbtocurve.c' || echo '$(srcdir)/'`effects/gstgleffectrgbtocurve.c | ||
11386 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectrgbtocurve.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectrgbtocurve.Plo | ||
11387 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectrgbtocurve.c' object='libgstopengl_la-gstgleffectrgbtocurve.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11388 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11389 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectrgbtocurve.c' object='libgstopengl_la-gstgleffectrgbtocurve.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11390 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11391 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectrgbtocurve.lo `test -f 'effects/gstgleffectrgbtocurve.c' || echo '$(srcdir)/'`effects/gstgleffectrgbtocurve.c | ||
11392 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectrgbtocurve.lo `test -f 'effects/gstgleffectrgbtocurve.c' || echo '$(srcdir)/'`effects/gstgleffectrgbtocurve.c | ||
11393 | |||
11394 | libgstopengl_la-gstgleffectsin.lo: effects/gstgleffectsin.c | ||
11395 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectsin.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectsin.Tpo -c -o libgstopengl_la-gstgleffectsin.lo `test -f 'effects/gstgleffectsin.c' || echo '$(srcdir)/'`effects/gstgleffectsin.c | ||
11396 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsin.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsin.Plo | ||
11397 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsin.c' object='libgstopengl_la-gstgleffectsin.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11398 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11399 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsin.c' object='libgstopengl_la-gstgleffectsin.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11400 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11401 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsin.lo `test -f 'effects/gstgleffectsin.c' || echo '$(srcdir)/'`effects/gstgleffectsin.c | ||
11402 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectsin.lo `test -f 'effects/gstgleffectsin.c' || echo '$(srcdir)/'`effects/gstgleffectsin.c | ||
11403 | |||
11404 | libgstopengl_la-gstgleffectglow.lo: effects/gstgleffectglow.c | ||
11405 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectglow.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectglow.Tpo -c -o libgstopengl_la-gstgleffectglow.lo `test -f 'effects/gstgleffectglow.c' || echo '$(srcdir)/'`effects/gstgleffectglow.c | ||
11406 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectglow.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectglow.Plo | ||
11407 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectglow.c' object='libgstopengl_la-gstgleffectglow.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11408 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11409 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectglow.c' object='libgstopengl_la-gstgleffectglow.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11410 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11411 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectglow.lo `test -f 'effects/gstgleffectglow.c' || echo '$(srcdir)/'`effects/gstgleffectglow.c | ||
11412 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectglow.lo `test -f 'effects/gstgleffectglow.c' || echo '$(srcdir)/'`effects/gstgleffectglow.c | ||
11413 | |||
11414 | libgstopengl_la-gstgleffectxray.lo: effects/gstgleffectxray.c | ||
11415 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgleffectxray.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgleffectxray.Tpo -c -o libgstopengl_la-gstgleffectxray.lo `test -f 'effects/gstgleffectxray.c' || echo '$(srcdir)/'`effects/gstgleffectxray.c | ||
11416 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectxray.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectxray.Plo | ||
11417 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectxray.c' object='libgstopengl_la-gstgleffectxray.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11418 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11419 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectxray.c' object='libgstopengl_la-gstgleffectxray.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11420 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11421 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectxray.lo `test -f 'effects/gstgleffectxray.c' || echo '$(srcdir)/'`effects/gstgleffectxray.c | ||
11422 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgleffectxray.lo `test -f 'effects/gstgleffectxray.c' || echo '$(srcdir)/'`effects/gstgleffectxray.c | ||
11423 | |||
11424 | libgstopengl_la-gstglbumper.lo: gstglbumper.c | ||
11425 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstglbumper.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstglbumper.Tpo -c -o libgstopengl_la-gstglbumper.lo `test -f 'gstglbumper.c' || echo '$(srcdir)/'`gstglbumper.c | ||
11426 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglbumper.Tpo $(DEPDIR)/libgstopengl_la-gstglbumper.Plo | ||
11427 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglbumper.c' object='libgstopengl_la-gstglbumper.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11428 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11429 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglbumper.c' object='libgstopengl_la-gstglbumper.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11430 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11431 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglbumper.lo `test -f 'gstglbumper.c' || echo '$(srcdir)/'`gstglbumper.c | ||
11432 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstglbumper.lo `test -f 'gstglbumper.c' || echo '$(srcdir)/'`gstglbumper.c | ||
11433 | |||
11434 | libgstopengl_la-gstgldifferencematte.lo: gstgldifferencematte.c | ||
11435 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgldifferencematte.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgldifferencematte.Tpo -c -o libgstopengl_la-gstgldifferencematte.lo `test -f 'gstgldifferencematte.c' || echo '$(srcdir)/'`gstgldifferencematte.c | ||
11436 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldifferencematte.Tpo $(DEPDIR)/libgstopengl_la-gstgldifferencematte.Plo | ||
11437 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldifferencematte.c' object='libgstopengl_la-gstgldifferencematte.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11438 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11439 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldifferencematte.c' object='libgstopengl_la-gstgldifferencematte.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11440 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11441 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldifferencematte.lo `test -f 'gstgldifferencematte.c' || echo '$(srcdir)/'`gstgldifferencematte.c | ||
11442 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgldifferencematte.lo `test -f 'gstgldifferencematte.c' || echo '$(srcdir)/'`gstgldifferencematte.c | ||
11443 | |||
11444 | libgstopengl_la-gstgloverlay.lo: gstgloverlay.c | ||
11445 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -MT libgstopengl_la-gstgloverlay.lo -MD -MP -MF $(DEPDIR)/libgstopengl_la-gstgloverlay.Tpo -c -o libgstopengl_la-gstgloverlay.lo `test -f 'gstgloverlay.c' || echo '$(srcdir)/'`gstgloverlay.c | ||
11446 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgloverlay.Tpo $(DEPDIR)/libgstopengl_la-gstgloverlay.Plo | ||
11447 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgloverlay.c' object='libgstopengl_la-gstgloverlay.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11448 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
11449 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgloverlay.c' object='libgstopengl_la-gstgloverlay.lo' libtool=yes @AMDEPBACKSLASH@ | ||
11450 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
11451 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgloverlay.lo `test -f 'gstgloverlay.c' || echo '$(srcdir)/'`gstgloverlay.c | ||
11452 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopengl_la_CFLAGS) $(CFLAGS) -c -o libgstopengl_la-gstgloverlay.lo `test -f 'gstgloverlay.c' || echo '$(srcdir)/'`gstgloverlay.c | ||
11453 | |||
11454 | mostlyclean-libtool: | ||
11455 | -rm -f *.lo | ||
11456 | @@ -1051,15 +1094,10 @@ install-am: all-am | ||
11457 | |||
11458 | installcheck: installcheck-am | ||
11459 | install-strip: | ||
11460 | - if test -z '$(STRIP)'; then \ | ||
11461 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
11462 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
11463 | - install; \ | ||
11464 | - else \ | ||
11465 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
11466 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
11467 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
11468 | - fi | ||
11469 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
11470 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
11471 | + `test -z '$(STRIP)' || \ | ||
11472 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
11473 | mostlyclean-generic: | ||
11474 | |||
11475 | clean-generic: | ||
11476 | diff --git a/gst/gl/effects/GNUmakefile.gnustep b/gst/gl/effects/GNUmakefile.gnustep | ||
11477 | new file mode 100644 | ||
11478 | index 0000000..2a7859b | ||
11479 | --- /dev/null | ||
11480 | +++ b/gst/gl/effects/GNUmakefile.gnustep | ||
11481 | @@ -0,0 +1,38 @@ | ||
11482 | +include $(GNUSTEP_MAKEFILES)/common.make | ||
11483 | + | ||
11484 | +SUBPROJECT_NAME = gstgleffects | ||
11485 | + | ||
11486 | +gstgleffects_C_FILES = \ | ||
11487 | + gstgleffectssources.c \ | ||
11488 | + gstgleffectidentity.c \ | ||
11489 | + gstgleffectmirror.c \ | ||
11490 | + gstgleffectsqueeze.c \ | ||
11491 | + gstgleffectstretch.c \ | ||
11492 | + gstgleffecttunnel.c \ | ||
11493 | + gstgleffectfisheye.c \ | ||
11494 | + gstgleffecttwirl.c \ | ||
11495 | + gstgleffectbulge.c \ | ||
11496 | + gstgleffectsquare.c \ | ||
11497 | + gstgleffectlumatocurve.c \ | ||
11498 | + gstgleffectrgbtocurve.c \ | ||
11499 | + gstgleffectsin.c \ | ||
11500 | + gstgleffectglow.c \ | ||
11501 | + gstgleffectxray.c | ||
11502 | + | ||
11503 | +gstgleffects_INCLUDE_DIRS = \ | ||
11504 | + -I.. \ | ||
11505 | + -I../../../gst-libs/gst/gl | ||
11506 | + | ||
11507 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
11508 | + gstgleffects_INCLUDE_DIRS += \ | ||
11509 | + -I../../../win32/common \ | ||
11510 | + -IC:/gstreamer/include/libxml2 \ | ||
11511 | + -IC:/gstreamer/include/glib-2.0 \ | ||
11512 | + -IC:/gstreamer/lib/glib-2.0/include \ | ||
11513 | + -IC:/gstreamer/include \ | ||
11514 | + -IC:/gstreamer/include/gstreamer-0.10 | ||
11515 | +endif | ||
11516 | + | ||
11517 | +gstgleffects_CFLAGS = -Wall -DHAVE_CONFIG_H | ||
11518 | + | ||
11519 | +include $(GNUSTEP_MAKEFILES)/subproject.make | ||
11520 | diff --git a/gst/gl/gstglbumper.c b/gst/gl/gstglbumper.c | ||
11521 | index 12efe7d..2daec5b 100644 | ||
11522 | --- a/gst/gl/gstglbumper.c | ||
11523 | +++ b/gst/gl/gstglbumper.c | ||
11524 | @@ -157,7 +157,6 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) | ||
11525 | |||
11526 | png_structp png_ptr; | ||
11527 | png_infop info_ptr; | ||
11528 | - guint sig_read = 0; | ||
11529 | png_uint_32 width = 0; | ||
11530 | png_uint_32 height = 0; | ||
11531 | gint bit_depth = 0; | ||
11532 | @@ -209,7 +208,7 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) | ||
11533 | |||
11534 | png_init_io (png_ptr, fp); | ||
11535 | |||
11536 | - png_set_sig_bytes (png_ptr, sig_read); | ||
11537 | + png_set_sig_bytes (png_ptr, sizeof (magic)); | ||
11538 | |||
11539 | png_read_info (png_ptr, info_ptr); | ||
11540 | |||
11541 | diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c | ||
11542 | index d57f5b5..369d7f1 100644 | ||
11543 | --- a/gst/gl/gstglimagesink.c | ||
11544 | +++ b/gst/gl/gstglimagesink.c | ||
11545 | @@ -1,6 +1,6 @@ | ||
11546 | /* | ||
11547 | - * GStreamer | ||
11548 | - * Copyright (C) 2003 Julien Moutte <julien@moutte.net> | ||
11549 | + * GStreamerfor | ||
11550 | + * Copyright (C) 2003 Julien Moutte <julien@moutte.net>for | ||
11551 | * Copyright (C) 2005,2006,2007 David A. Schleef <ds@schleef.org> | ||
11552 | * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> | ||
11553 | * | ||
11554 | @@ -86,6 +86,9 @@ | ||
11555 | #include <gst/interfaces/xoverlay.h> | ||
11556 | |||
11557 | #include "gstglimagesink.h" | ||
11558 | +#ifdef GPU_VIVANTE | ||
11559 | +#include "gstglvivante.h" | ||
11560 | +#endif | ||
11561 | |||
11562 | GST_DEBUG_CATEGORY (gst_debug_glimage_sink); | ||
11563 | #define GST_CAT_DEFAULT gst_debug_glimage_sink | ||
11564 | @@ -137,11 +140,13 @@ static GstStaticPadTemplate gst_glimage_sink_template = | ||
11565 | GST_PAD_SINK, | ||
11566 | GST_PAD_ALWAYS, | ||
11567 | GST_STATIC_CAPS (GST_GL_VIDEO_CAPS ";" | ||
11568 | - GST_VIDEO_CAPS_RGB ";" | ||
11569 | - GST_VIDEO_CAPS_RGBx ";" | ||
11570 | - GST_VIDEO_CAPS_RGBA ";" | ||
11571 | - GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) | ||
11572 | - ); | ||
11573 | + GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" | ||
11574 | +#ifdef GPU_VIVANTE | ||
11575 | + GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") | ||
11576 | +#else | ||
11577 | + GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") | ||
11578 | +#endif | ||
11579 | + )); | ||
11580 | #endif | ||
11581 | |||
11582 | enum | ||
11583 | @@ -152,7 +157,8 @@ enum | ||
11584 | PROP_CLIENT_DRAW_CALLBACK, | ||
11585 | PROP_CLIENT_DATA, | ||
11586 | PROP_FORCE_ASPECT_RATIO, | ||
11587 | - PROP_PIXEL_ASPECT_RATIO | ||
11588 | + PROP_PIXEL_ASPECT_RATIO, | ||
11589 | + PROP_RENDERED_FRAMES | ||
11590 | }; | ||
11591 | |||
11592 | GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink, | ||
11593 | @@ -241,6 +247,10 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) | ||
11594 | "The pixel aspect ratio of the device", "1/1", | ||
11595 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | ||
11596 | |||
11597 | + g_object_class_install_property (gobject_class, PROP_RENDERED_FRAMES, | ||
11598 | + g_param_spec_int ("rendered", "rendered", | ||
11599 | + "Get the total rendered frames", 0, G_MAXINT, 0, G_PARAM_READABLE)); | ||
11600 | + | ||
11601 | gobject_class->finalize = gst_glimage_sink_finalize; | ||
11602 | |||
11603 | gstelement_class->change_state = gst_glimage_sink_change_state; | ||
11604 | @@ -261,6 +271,7 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink, | ||
11605 | glimage_sink->new_window_id = 0; | ||
11606 | glimage_sink->display = NULL; | ||
11607 | glimage_sink->stored_buffer = NULL; | ||
11608 | + glimage_sink->stored_input_buffer = NULL; | ||
11609 | glimage_sink->clientReshapeCallback = NULL; | ||
11610 | glimage_sink->clientDrawCallback = NULL; | ||
11611 | glimage_sink->client_data = NULL; | ||
11612 | @@ -370,6 +381,9 @@ gst_glimage_sink_get_property (GObject * object, guint prop_id, | ||
11613 | if (!g_value_transform (glimage_sink->par, value)) | ||
11614 | g_warning ("Could not transform string to aspect ratio"); | ||
11615 | break; | ||
11616 | + case PROP_RENDERED_FRAMES: | ||
11617 | + g_value_set_int (value, glimage_sink->rendered); | ||
11618 | + break; | ||
11619 | default: | ||
11620 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
11621 | break; | ||
11622 | @@ -435,6 +449,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) | ||
11623 | |||
11624 | return GST_STATE_CHANGE_FAILURE; | ||
11625 | } | ||
11626 | + glimage_sink->rendered = 0; | ||
11627 | } | ||
11628 | break; | ||
11629 | case GST_STATE_CHANGE_PAUSED_TO_PLAYING: | ||
11630 | @@ -456,6 +471,10 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) | ||
11631 | gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
11632 | glimage_sink->stored_buffer = NULL; | ||
11633 | } | ||
11634 | + if (glimage_sink->stored_input_buffer) { | ||
11635 | + gst_buffer_unref (glimage_sink->stored_input_buffer); | ||
11636 | + glimage_sink->stored_input_buffer = NULL; | ||
11637 | + } | ||
11638 | if (glimage_sink->display) { | ||
11639 | g_object_unref (glimage_sink->display); | ||
11640 | glimage_sink->display = NULL; | ||
11641 | @@ -533,6 +552,14 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) | ||
11642 | if (!ok) | ||
11643 | return FALSE; | ||
11644 | |||
11645 | +#ifdef GPU_VIVANTE | ||
11646 | + /* special case for format that vivante can't handle */ | ||
11647 | + if (format == GST_VIDEO_FORMAT_NV12 && | ||
11648 | + !gst_gl_vivante_check_format (glimage_sink->display->gpu_priv, format, | ||
11649 | + width, height)) | ||
11650 | + return FALSE; | ||
11651 | +#endif | ||
11652 | + | ||
11653 | /* init colorspace conversion if needed */ | ||
11654 | ok = gst_gl_display_init_upload (glimage_sink->display, format, | ||
11655 | width, height, width, height); | ||
11656 | @@ -609,6 +636,11 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) | ||
11657 | if (!glimage_sink->window_id && !glimage_sink->new_window_id) | ||
11658 | gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (glimage_sink)); | ||
11659 | |||
11660 | +#ifdef GPU_VIVANTE | ||
11661 | + if (glimage_sink->display->gpu_priv) | ||
11662 | + gst_gl_vivante_set_caps (glimage_sink->display->gpu_priv, caps); | ||
11663 | +#endif | ||
11664 | + | ||
11665 | return TRUE; | ||
11666 | } | ||
11667 | |||
11668 | @@ -617,11 +649,18 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
11669 | { | ||
11670 | GstGLImageSink *glimage_sink = NULL; | ||
11671 | GstGLBuffer *gl_buffer = NULL; | ||
11672 | + gint index; | ||
11673 | + GstFlowReturn res; | ||
11674 | |||
11675 | glimage_sink = GST_GLIMAGE_SINK (bsink); | ||
11676 | |||
11677 | GST_INFO ("buffer size: %d", GST_BUFFER_SIZE (buf)); | ||
11678 | |||
11679 | + if (buf == glimage_sink->stored_input_buffer) | ||
11680 | + return GST_FLOW_OK; | ||
11681 | + | ||
11682 | + glimage_sink->display->upload_buf_mapped = FALSE; | ||
11683 | + | ||
11684 | //is gl | ||
11685 | if (glimage_sink->is_gl) { | ||
11686 | //increment gl buffer ref before storage | ||
11687 | @@ -633,9 +672,16 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
11688 | gl_buffer = gst_gl_buffer_new (glimage_sink->display, | ||
11689 | glimage_sink->width, glimage_sink->height); | ||
11690 | |||
11691 | - //blocking call | ||
11692 | - gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, | ||
11693 | - glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); | ||
11694 | + index = G_N_ELEMENTS (buf->_gst_reserved) - 1; | ||
11695 | + | ||
11696 | + if (index >= 0) | ||
11697 | + //blocking call | ||
11698 | + gst_gl_display_do_upload_with_meta (glimage_sink->display, | ||
11699 | + gl_buffer->texture, glimage_sink->width, glimage_sink->height, | ||
11700 | + GST_BUFFER_DATA (buf), buf->_gst_reserved[index]); | ||
11701 | + else | ||
11702 | + gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, | ||
11703 | + glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); | ||
11704 | |||
11705 | //gl_buffer is created in this block, so the gl buffer is already referenced | ||
11706 | } | ||
11707 | @@ -645,26 +691,36 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
11708 | gst_gl_display_set_window_id (glimage_sink->display, | ||
11709 | glimage_sink->window_id); | ||
11710 | } | ||
11711 | - //the buffer is cleared when an other comes in | ||
11712 | - if (glimage_sink->stored_buffer) { | ||
11713 | - gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
11714 | - glimage_sink->stored_buffer = NULL; | ||
11715 | - } | ||
11716 | - //store current buffer | ||
11717 | - glimage_sink->stored_buffer = gl_buffer; | ||
11718 | - | ||
11719 | //redisplay opengl scene | ||
11720 | if (gl_buffer->texture && | ||
11721 | gst_gl_display_redisplay (glimage_sink->display, | ||
11722 | gl_buffer->texture, gl_buffer->width, gl_buffer->height, | ||
11723 | glimage_sink->window_width, glimage_sink->window_height, | ||
11724 | glimage_sink->keep_aspect_ratio)) | ||
11725 | - return GST_FLOW_OK; | ||
11726 | + res = GST_FLOW_OK; | ||
11727 | else { | ||
11728 | GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND, | ||
11729 | GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL)); | ||
11730 | - return GST_FLOW_ERROR; | ||
11731 | + res = GST_FLOW_ERROR; | ||
11732 | } | ||
11733 | + | ||
11734 | + //the buffer is cleared when an other comes in | ||
11735 | + if (glimage_sink->stored_buffer) { | ||
11736 | + gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
11737 | + glimage_sink->stored_buffer = NULL; | ||
11738 | + } | ||
11739 | + if (glimage_sink->stored_input_buffer) { | ||
11740 | + gst_buffer_unref (glimage_sink->stored_input_buffer); | ||
11741 | + glimage_sink->stored_input_buffer = NULL; | ||
11742 | + } | ||
11743 | + //store current buffer | ||
11744 | + glimage_sink->stored_buffer = gl_buffer; | ||
11745 | + if (glimage_sink->display->upload_buf_mapped) | ||
11746 | + glimage_sink->stored_input_buffer = gst_buffer_ref (buf); | ||
11747 | + | ||
11748 | + glimage_sink->rendered++; | ||
11749 | + | ||
11750 | + return res; | ||
11751 | } | ||
11752 | |||
11753 | |||
11754 | diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h | ||
11755 | index c61b5c5..bd40bc4 100644 | ||
11756 | --- a/gst/gl/gstglimagesink.h | ||
11757 | +++ b/gst/gl/gstglimagesink.h | ||
11758 | @@ -51,6 +51,7 @@ struct _GstGLImageSink | ||
11759 | |||
11760 | //properties | ||
11761 | gchar *display_name; | ||
11762 | + gint rendered; | ||
11763 | |||
11764 | gulong window_id; | ||
11765 | gulong new_window_id; | ||
11766 | @@ -67,6 +68,7 @@ struct _GstGLImageSink | ||
11767 | |||
11768 | GstGLDisplay *display; | ||
11769 | GstGLBuffer *stored_buffer; | ||
11770 | + GstBuffer *stored_input_buffer; | ||
11771 | |||
11772 | CRCB clientReshapeCallback; | ||
11773 | CDCB clientDrawCallback; | ||
11774 | diff --git a/gst/gl/gstglupload.c b/gst/gl/gstglupload.c | ||
11775 | index 09bc96d..8e12532 100644 | ||
11776 | --- a/gst/gl/gstglupload.c | ||
11777 | +++ b/gst/gl/gstglupload.c | ||
11778 | @@ -70,6 +70,9 @@ | ||
11779 | |||
11780 | #include "gstglupload.h" | ||
11781 | |||
11782 | +#ifdef GPU_VIVANTE | ||
11783 | +#include "gstglvivante.h" | ||
11784 | +#endif | ||
11785 | |||
11786 | #define GST_CAT_DEFAULT gst_gl_upload_debug | ||
11787 | GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); | ||
11788 | @@ -106,10 +109,13 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template = | ||
11789 | GST_PAD_SINK, | ||
11790 | GST_PAD_ALWAYS, | ||
11791 | GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";" | ||
11792 | - GST_VIDEO_CAPS_RGBx ";" | ||
11793 | - GST_VIDEO_CAPS_RGBA ";" | ||
11794 | - GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) | ||
11795 | - ); | ||
11796 | + GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" | ||
11797 | +#ifdef GPU_VIVANTE | ||
11798 | + GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") | ||
11799 | +#else | ||
11800 | + GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") | ||
11801 | +#endif | ||
11802 | + )); | ||
11803 | #endif | ||
11804 | |||
11805 | /* Properties */ | ||
11806 | @@ -504,6 +510,14 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps, | ||
11807 | GST_DEBUG ("caps connot be parsed"); | ||
11808 | return FALSE; | ||
11809 | } | ||
11810 | +#ifdef GPU_VIVANTE | ||
11811 | + /* special case for format that vivante can't handle */ | ||
11812 | + if (upload->video_format == GST_VIDEO_FORMAT_NV12 && | ||
11813 | + !gst_gl_vivante_check_format (upload->display->gpu_priv, | ||
11814 | + upload->video_format, upload->video_width, upload->video_height)) | ||
11815 | + return FALSE; | ||
11816 | +#endif | ||
11817 | + | ||
11818 | //init colorspace conversion if needed | ||
11819 | ret = gst_gl_display_init_upload (upload->display, upload->video_format, | ||
11820 | upload->gl_width, upload->gl_height, | ||
11821 | diff --git a/install-sh b/install-sh | ||
11822 | index a9244eb..6781b98 100755 | ||
11823 | --- a/install-sh | ||
11824 | +++ b/install-sh | ||
11825 | @@ -1,7 +1,7 @@ | ||
11826 | #!/bin/sh | ||
11827 | # install - install a program, script, or datafile | ||
11828 | |||
11829 | -scriptversion=2011-01-19.21; # UTC | ||
11830 | +scriptversion=2009-04-28.21; # UTC | ||
11831 | |||
11832 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | ||
11833 | # later released in X11R6 (xc/config/util/install.sh) with the | ||
11834 | @@ -156,10 +156,6 @@ while test $# -ne 0; do | ||
11835 | -s) stripcmd=$stripprog;; | ||
11836 | |||
11837 | -t) dst_arg=$2 | ||
11838 | - # Protect names problematic for `test' and other utilities. | ||
11839 | - case $dst_arg in | ||
11840 | - -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
11841 | - esac | ||
11842 | shift;; | ||
11843 | |||
11844 | -T) no_target_directory=true;; | ||
11845 | @@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then | ||
11846 | fi | ||
11847 | shift # arg | ||
11848 | dst_arg=$arg | ||
11849 | - # Protect names problematic for `test' and other utilities. | ||
11850 | - case $dst_arg in | ||
11851 | - -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
11852 | - esac | ||
11853 | done | ||
11854 | fi | ||
11855 | |||
11856 | @@ -208,11 +200,7 @@ if test $# -eq 0; then | ||
11857 | fi | ||
11858 | |||
11859 | if test -z "$dir_arg"; then | ||
11860 | - do_exit='(exit $ret); exit $ret' | ||
11861 | - trap "ret=129; $do_exit" 1 | ||
11862 | - trap "ret=130; $do_exit" 2 | ||
11863 | - trap "ret=141; $do_exit" 13 | ||
11864 | - trap "ret=143; $do_exit" 15 | ||
11865 | + trap '(exit $?); exit' 1 2 13 15 | ||
11866 | |||
11867 | # Set umask so as not to create temps with too-generous modes. | ||
11868 | # However, 'strip' requires both read and write access to temps. | ||
11869 | @@ -240,9 +228,9 @@ fi | ||
11870 | |||
11871 | for src | ||
11872 | do | ||
11873 | - # Protect names problematic for `test' and other utilities. | ||
11874 | + # Protect names starting with `-'. | ||
11875 | case $src in | ||
11876 | - -* | [=\(\)!]) src=./$src;; | ||
11877 | + -*) src=./$src;; | ||
11878 | esac | ||
11879 | |||
11880 | if test -n "$dir_arg"; then | ||
11881 | @@ -264,7 +252,12 @@ do | ||
11882 | echo "$0: no destination specified." >&2 | ||
11883 | exit 1 | ||
11884 | fi | ||
11885 | + | ||
11886 | dst=$dst_arg | ||
11887 | + # Protect names starting with `-'. | ||
11888 | + case $dst in | ||
11889 | + -*) dst=./$dst;; | ||
11890 | + esac | ||
11891 | |||
11892 | # If destination is a directory, append the input filename; won't work | ||
11893 | # if double slashes aren't ignored. | ||
11894 | @@ -392,7 +385,7 @@ do | ||
11895 | |||
11896 | case $dstdir in | ||
11897 | /*) prefix='/';; | ||
11898 | - [-=\(\)!]*) prefix='./';; | ||
11899 | + -*) prefix='./';; | ||
11900 | *) prefix='';; | ||
11901 | esac | ||
11902 | |||
11903 | @@ -410,7 +403,7 @@ do | ||
11904 | |||
11905 | for d | ||
11906 | do | ||
11907 | - test X"$d" = X && continue | ||
11908 | + test -z "$d" && continue | ||
11909 | |||
11910 | prefix=$prefix$d | ||
11911 | if test -d "$prefix"; then | ||
11912 | diff --git a/ltmain.sh b/ltmain.sh | ||
11913 | index c7d06c3..b4a3231 100644 | ||
11914 | --- a/ltmain.sh | ||
11915 | +++ b/ltmain.sh | ||
11916 | @@ -1,9 +1,9 @@ | ||
11917 | |||
11918 | -# libtool (GNU libtool) 2.4.2 | ||
11919 | +# libtool (GNU libtool) 2.4 | ||
11920 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
11921 | |||
11922 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, | ||
11923 | -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. | ||
11924 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
11925 | # This is free software; see the source for copying conditions. There is NO | ||
11926 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
11927 | |||
11928 | @@ -41,7 +41,6 @@ | ||
11929 | # --quiet, --silent don't print informational messages | ||
11930 | # --no-quiet, --no-silent | ||
11931 | # print informational messages (default) | ||
11932 | -# --no-warn don't display warning messages | ||
11933 | # --tag=TAG use configuration variables from tag TAG | ||
11934 | # -v, --verbose print more informational messages than default | ||
11935 | # --no-verbose don't print the extra informational messages | ||
11936 | @@ -70,7 +69,7 @@ | ||
11937 | # compiler: $LTCC | ||
11938 | # compiler flags: $LTCFLAGS | ||
11939 | # linker: $LD (gnu? $with_gnu_ld) | ||
11940 | -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 | ||
11941 | +# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 | ||
11942 | # automake: $automake_version | ||
11943 | # autoconf: $autoconf_version | ||
11944 | # | ||
11945 | @@ -80,9 +79,9 @@ | ||
11946 | |||
11947 | PROGRAM=libtool | ||
11948 | PACKAGE=libtool | ||
11949 | -VERSION="2.4.2 Debian-2.4.2-1" | ||
11950 | +VERSION="2.4 Debian-2.4-2ubuntu1" | ||
11951 | TIMESTAMP="" | ||
11952 | -package_revision=1.3337 | ||
11953 | +package_revision=1.3293 | ||
11954 | |||
11955 | # Be Bourne compatible | ||
11956 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
11957 | @@ -137,10 +136,15 @@ progpath="$0" | ||
11958 | |||
11959 | : ${CP="cp -f"} | ||
11960 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | ||
11961 | +: ${EGREP="/bin/grep -E"} | ||
11962 | +: ${FGREP="/bin/grep -F"} | ||
11963 | +: ${GREP="/bin/grep"} | ||
11964 | +: ${LN_S="ln -s"} | ||
11965 | : ${MAKE="make"} | ||
11966 | : ${MKDIR="mkdir"} | ||
11967 | : ${MV="mv -f"} | ||
11968 | : ${RM="rm -f"} | ||
11969 | +: ${SED="/bin/sed"} | ||
11970 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | ||
11971 | : ${Xsed="$SED -e 1s/^X//"} | ||
11972 | |||
11973 | @@ -383,7 +387,7 @@ case $progpath in | ||
11974 | ;; | ||
11975 | *) | ||
11976 | save_IFS="$IFS" | ||
11977 | - IFS=${PATH_SEPARATOR-:} | ||
11978 | + IFS=: | ||
11979 | for progdir in $PATH; do | ||
11980 | IFS="$save_IFS" | ||
11981 | test -x "$progdir/$progname" && break | ||
11982 | @@ -767,8 +771,8 @@ func_help () | ||
11983 | s*\$LTCFLAGS*'"$LTCFLAGS"'* | ||
11984 | s*\$LD*'"$LD"'* | ||
11985 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ | ||
11986 | - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ | ||
11987 | - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ | ||
11988 | + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ | ||
11989 | + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ | ||
11990 | p | ||
11991 | d | ||
11992 | } | ||
11993 | @@ -1048,7 +1052,6 @@ opt_finish=false | ||
11994 | opt_help=false | ||
11995 | opt_help_all=false | ||
11996 | opt_silent=: | ||
11997 | -opt_warning=: | ||
11998 | opt_verbose=: | ||
11999 | opt_silent=false | ||
12000 | opt_verbose=false | ||
12001 | @@ -1117,10 +1120,6 @@ esac | ||
12002 | opt_silent=false | ||
12003 | func_append preserve_args " $opt" | ||
12004 | ;; | ||
12005 | - --no-warning|--no-warn) | ||
12006 | - opt_warning=false | ||
12007 | -func_append preserve_args " $opt" | ||
12008 | - ;; | ||
12009 | --no-verbose) | ||
12010 | opt_verbose=false | ||
12011 | func_append preserve_args " $opt" | ||
12012 | @@ -2060,7 +2059,7 @@ func_mode_compile () | ||
12013 | *.[cCFSifmso] | \ | ||
12014 | *.ada | *.adb | *.ads | *.asm | \ | ||
12015 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ | ||
12016 | - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) | ||
12017 | + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) | ||
12018 | func_xform "$libobj" | ||
12019 | libobj=$func_xform_result | ||
12020 | ;; | ||
12021 | @@ -3202,13 +3201,11 @@ func_mode_install () | ||
12022 | |||
12023 | # Set up the ranlib parameters. | ||
12024 | oldlib="$destdir/$name" | ||
12025 | - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
12026 | - tool_oldlib=$func_to_tool_file_result | ||
12027 | |||
12028 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' | ||
12029 | |||
12030 | if test -n "$stripme" && test -n "$old_striplib"; then | ||
12031 | - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' | ||
12032 | + func_show_eval "$old_striplib $oldlib" 'exit $?' | ||
12033 | fi | ||
12034 | |||
12035 | # Do each command in the postinstall commands. | ||
12036 | @@ -3473,7 +3470,7 @@ static const void *lt_preloaded_setup() { | ||
12037 | # linked before any other PIC object. But we must not use | ||
12038 | # pic_flag when linking with -static. The problem exists in | ||
12039 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. | ||
12040 | - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | ||
12041 | + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | ||
12042 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; | ||
12043 | *-*-hpux*) | ||
12044 | pic_flag_for_symtable=" $pic_flag" ;; | ||
12045 | @@ -3985,17 +3982,14 @@ func_exec_program_core () | ||
12046 | # launches target application with the remaining arguments. | ||
12047 | func_exec_program () | ||
12048 | { | ||
12049 | - case \" \$* \" in | ||
12050 | - *\\ --lt-*) | ||
12051 | - for lt_wr_arg | ||
12052 | - do | ||
12053 | - case \$lt_wr_arg in | ||
12054 | - --lt-*) ;; | ||
12055 | - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | ||
12056 | - esac | ||
12057 | - shift | ||
12058 | - done ;; | ||
12059 | - esac | ||
12060 | + for lt_wr_arg | ||
12061 | + do | ||
12062 | + case \$lt_wr_arg in | ||
12063 | + --lt-*) ;; | ||
12064 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | ||
12065 | + esac | ||
12066 | + shift | ||
12067 | + done | ||
12068 | func_exec_program_core \${1+\"\$@\"} | ||
12069 | } | ||
12070 | |||
12071 | @@ -5063,15 +5057,9 @@ void lt_dump_script (FILE* f) | ||
12072 | { | ||
12073 | EOF | ||
12074 | func_emit_wrapper yes | | ||
12075 | - $SED -n -e ' | ||
12076 | -s/^\(.\{79\}\)\(..*\)/\1\ | ||
12077 | -\2/ | ||
12078 | -h | ||
12079 | -s/\([\\"]\)/\\\1/g | ||
12080 | -s/$/\\n/ | ||
12081 | -s/\([^\n]*\).*/ fputs ("\1", f);/p | ||
12082 | -g | ||
12083 | -D' | ||
12084 | + $SED -e 's/\([\\"]\)/\\\1/g' \ | ||
12085 | + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' | ||
12086 | + | ||
12087 | cat <<"EOF" | ||
12088 | } | ||
12089 | EOF | ||
12090 | @@ -5655,8 +5643,7 @@ func_mode_link () | ||
12091 | continue | ||
12092 | ;; | ||
12093 | |||
12094 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ | ||
12095 | - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
12096 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | ||
12097 | func_append compiler_flags " $arg" | ||
12098 | func_append compile_command " $arg" | ||
12099 | func_append finalize_command " $arg" | ||
12100 | @@ -6163,8 +6150,7 @@ func_mode_link () | ||
12101 | lib= | ||
12102 | found=no | ||
12103 | case $deplib in | ||
12104 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ | ||
12105 | - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
12106 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | ||
12107 | if test "$linkmode,$pass" = "prog,link"; then | ||
12108 | compile_deplibs="$deplib $compile_deplibs" | ||
12109 | finalize_deplibs="$deplib $finalize_deplibs" | ||
12110 | @@ -6848,7 +6834,7 @@ func_mode_link () | ||
12111 | test "$hardcode_direct_absolute" = no; then | ||
12112 | add="$dir/$linklib" | ||
12113 | elif test "$hardcode_minus_L" = yes; then | ||
12114 | - add_dir="-L$absdir" | ||
12115 | + add_dir="-L$dir" | ||
12116 | # Try looking first in the location we're being installed to. | ||
12117 | if test -n "$inst_prefix_dir"; then | ||
12118 | case $libdir in | ||
12119 | @@ -7333,7 +7319,6 @@ func_mode_link () | ||
12120 | # which has an extra 1 added just for fun | ||
12121 | # | ||
12122 | case $version_type in | ||
12123 | - # correct linux to gnu/linux during the next big refactor | ||
12124 | darwin|linux|osf|windows|none) | ||
12125 | func_arith $number_major + $number_minor | ||
12126 | current=$func_arith_result | ||
12127 | @@ -7453,7 +7438,7 @@ func_mode_link () | ||
12128 | versuffix="$major.$revision" | ||
12129 | ;; | ||
12130 | |||
12131 | - linux) # correct to gnu/linux during the next big refactor | ||
12132 | + linux) | ||
12133 | func_arith $current - $age | ||
12134 | major=.$func_arith_result | ||
12135 | versuffix="$major.$age.$revision" | ||
12136 | @@ -8041,11 +8026,6 @@ EOF | ||
12137 | |||
12138 | # Test again, we may have decided not to build it any more | ||
12139 | if test "$build_libtool_libs" = yes; then | ||
12140 | - # Remove ${wl} instances when linking with ld. | ||
12141 | - # FIXME: should test the right _cmds variable. | ||
12142 | - case $archive_cmds in | ||
12143 | - *\$LD\ *) wl= ;; | ||
12144 | - esac | ||
12145 | if test "$hardcode_into_libs" = yes; then | ||
12146 | # Hardcode the library paths | ||
12147 | hardcode_libdirs= | ||
12148 | @@ -8076,7 +8056,7 @@ EOF | ||
12149 | elif test -n "$runpath_var"; then | ||
12150 | case "$perm_rpath " in | ||
12151 | *" $libdir "*) ;; | ||
12152 | - *) func_append perm_rpath " $libdir" ;; | ||
12153 | + *) func_apped perm_rpath " $libdir" ;; | ||
12154 | esac | ||
12155 | fi | ||
12156 | done | ||
12157 | @@ -8084,7 +8064,11 @@ EOF | ||
12158 | if test -n "$hardcode_libdir_separator" && | ||
12159 | test -n "$hardcode_libdirs"; then | ||
12160 | libdir="$hardcode_libdirs" | ||
12161 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" | ||
12162 | + if test -n "$hardcode_libdir_flag_spec_ld"; then | ||
12163 | + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" | ||
12164 | + else | ||
12165 | + eval dep_rpath=\"$hardcode_libdir_flag_spec\" | ||
12166 | + fi | ||
12167 | fi | ||
12168 | if test -n "$runpath_var" && test -n "$perm_rpath"; then | ||
12169 | # We should set the runpath_var. | ||
12170 | @@ -9174,8 +9158,6 @@ EOF | ||
12171 | esac | ||
12172 | done | ||
12173 | fi | ||
12174 | - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
12175 | - tool_oldlib=$func_to_tool_file_result | ||
12176 | eval cmds=\"$old_archive_cmds\" | ||
12177 | |||
12178 | func_len " $cmds" | ||
12179 | @@ -9285,8 +9267,7 @@ EOF | ||
12180 | *.la) | ||
12181 | func_basename "$deplib" | ||
12182 | name="$func_basename_result" | ||
12183 | - func_resolve_sysroot "$deplib" | ||
12184 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
12185 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
12186 | test -z "$libdir" && \ | ||
12187 | func_fatal_error "\`$deplib' is not a valid libtool archive" | ||
12188 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" | ||
12189 | diff --git a/m4/Makefile.in b/m4/Makefile.in | ||
12190 | index d36ada1..cc7ff44 100644 | ||
12191 | --- a/m4/Makefile.in | ||
12192 | +++ b/m4/Makefile.in | ||
12193 | @@ -1,9 +1,9 @@ | ||
12194 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
12195 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
12196 | # @configure_input@ | ||
12197 | |||
12198 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
12199 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
12200 | -# Foundation, Inc. | ||
12201 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
12202 | +# Inc. | ||
12203 | # This Makefile.in is free software; the Free Software Foundation | ||
12204 | # gives unlimited permission to copy and/or distribute it, | ||
12205 | # with or without modifications, as long as this notice is preserved. | ||
12206 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
12207 | POST_UNINSTALL = : | ||
12208 | build_triplet = @build@ | ||
12209 | host_triplet = @host@ | ||
12210 | +target_triplet = @target@ | ||
12211 | subdir = m4 | ||
12212 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
12213 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
12214 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
12215 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
12216 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
12217 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
12218 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
12219 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
12220 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
12221 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
12222 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
12223 | CONFIG_HEADER = $(top_builddir)/config.h | ||
12224 | CONFIG_CLEAN_FILES = | ||
12225 | CONFIG_CLEAN_VPATH_FILES = | ||
12226 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
12227 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
12228 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
12229 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
12230 | am__v_GEN_0 = @echo " GEN " $@; | ||
12231 | -AM_V_at = $(am__v_at_@AM_V@) | ||
12232 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
12233 | +AM_V_at = $(am__v_at_$(V)) | ||
12234 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
12235 | am__v_at_0 = @ | ||
12236 | SOURCES = | ||
12237 | DIST_SOURCES = | ||
12238 | @@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ | ||
12239 | EGREP = @EGREP@ | ||
12240 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
12241 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
12242 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
12243 | EXEEXT = @EXEEXT@ | ||
12244 | FFLAGS = @FFLAGS@ | ||
12245 | FGREP = @FGREP@ | ||
12246 | @@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
12247 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
12248 | GST_CURRENT = @GST_CURRENT@ | ||
12249 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
12250 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
12251 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
12252 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
12253 | GST_LIBS = @GST_LIBS@ | ||
12254 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
12255 | @@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
12256 | GST_LICENSE = @GST_LICENSE@ | ||
12257 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
12258 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
12259 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
12260 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
12261 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
12262 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
12263 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
12264 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
12265 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
12266 | @@ -240,7 +245,7 @@ NM = @NM@ | ||
12267 | NMEDIT = @NMEDIT@ | ||
12268 | OBJC = @OBJC@ | ||
12269 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
12270 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
12271 | +OBJCFLAGS = @OBJCFLAGS@ | ||
12272 | OBJDUMP = @OBJDUMP@ | ||
12273 | OBJEXT = @OBJEXT@ | ||
12274 | OPENGL_ES2 = @OPENGL_ES2@ | ||
12275 | @@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
12276 | VERSION = @VERSION@ | ||
12277 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
12278 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
12279 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
12280 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
12281 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
12282 | XGETTEXT = @XGETTEXT@ | ||
12283 | @@ -350,7 +356,11 @@ sbindir = @sbindir@ | ||
12284 | sharedstatedir = @sharedstatedir@ | ||
12285 | srcdir = @srcdir@ | ||
12286 | sysconfdir = @sysconfdir@ | ||
12287 | +target = @target@ | ||
12288 | target_alias = @target_alias@ | ||
12289 | +target_cpu = @target_cpu@ | ||
12290 | +target_os = @target_os@ | ||
12291 | +target_vendor = @target_vendor@ | ||
12292 | top_build_prefix = @top_build_prefix@ | ||
12293 | top_builddir = @top_builddir@ | ||
12294 | top_srcdir = @top_srcdir@ | ||
12295 | @@ -449,15 +459,10 @@ install-am: all-am | ||
12296 | |||
12297 | installcheck: installcheck-am | ||
12298 | install-strip: | ||
12299 | - if test -z '$(STRIP)'; then \ | ||
12300 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
12301 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
12302 | - install; \ | ||
12303 | - else \ | ||
12304 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
12305 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
12306 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
12307 | - fi | ||
12308 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
12309 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
12310 | + `test -z '$(STRIP)' || \ | ||
12311 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
12312 | mostlyclean-generic: | ||
12313 | |||
12314 | clean-generic: | ||
12315 | diff --git a/m4/codeset.m4 b/m4/codeset.m4 | ||
12316 | new file mode 100644 | ||
12317 | index 0000000..223955b | ||
12318 | --- /dev/null | ||
12319 | +++ b/m4/codeset.m4 | ||
12320 | @@ -0,0 +1,21 @@ | ||
12321 | +# codeset.m4 serial 2 (gettext-0.16) | ||
12322 | +dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. | ||
12323 | +dnl This file is free software; the Free Software Foundation | ||
12324 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12325 | +dnl with or without modifications, as long as this notice is preserved. | ||
12326 | + | ||
12327 | +dnl From Bruno Haible. | ||
12328 | + | ||
12329 | +AC_DEFUN([AM_LANGINFO_CODESET], | ||
12330 | +[ | ||
12331 | + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, | ||
12332 | + [AC_TRY_LINK([#include <langinfo.h>], | ||
12333 | + [char* cs = nl_langinfo(CODESET); return !cs;], | ||
12334 | + am_cv_langinfo_codeset=yes, | ||
12335 | + am_cv_langinfo_codeset=no) | ||
12336 | + ]) | ||
12337 | + if test $am_cv_langinfo_codeset = yes; then | ||
12338 | + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, | ||
12339 | + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) | ||
12340 | + fi | ||
12341 | +]) | ||
12342 | diff --git a/m4/glibc2.m4 b/m4/glibc2.m4 | ||
12343 | new file mode 100644 | ||
12344 | index 0000000..e8f5bfe | ||
12345 | --- /dev/null | ||
12346 | +++ b/m4/glibc2.m4 | ||
12347 | @@ -0,0 +1,30 @@ | ||
12348 | +# glibc2.m4 serial 1 | ||
12349 | +dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. | ||
12350 | +dnl This file is free software; the Free Software Foundation | ||
12351 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12352 | +dnl with or without modifications, as long as this notice is preserved. | ||
12353 | + | ||
12354 | +# Test for the GNU C Library, version 2.0 or newer. | ||
12355 | +# From Bruno Haible. | ||
12356 | + | ||
12357 | +AC_DEFUN([gt_GLIBC2], | ||
12358 | + [ | ||
12359 | + AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, | ||
12360 | + ac_cv_gnu_library_2, | ||
12361 | + [AC_EGREP_CPP([Lucky GNU user], | ||
12362 | + [ | ||
12363 | +#include <features.h> | ||
12364 | +#ifdef __GNU_LIBRARY__ | ||
12365 | + #if (__GLIBC__ >= 2) | ||
12366 | + Lucky GNU user | ||
12367 | + #endif | ||
12368 | +#endif | ||
12369 | + ], | ||
12370 | + ac_cv_gnu_library_2=yes, | ||
12371 | + ac_cv_gnu_library_2=no) | ||
12372 | + ] | ||
12373 | + ) | ||
12374 | + AC_SUBST(GLIBC2) | ||
12375 | + GLIBC2="$ac_cv_gnu_library_2" | ||
12376 | + ] | ||
12377 | +) | ||
12378 | diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 | ||
12379 | new file mode 100644 | ||
12380 | index 0000000..d95fd98 | ||
12381 | --- /dev/null | ||
12382 | +++ b/m4/glibc21.m4 | ||
12383 | @@ -0,0 +1,30 @@ | ||
12384 | +# glibc21.m4 serial 3 | ||
12385 | +dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. | ||
12386 | +dnl This file is free software; the Free Software Foundation | ||
12387 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12388 | +dnl with or without modifications, as long as this notice is preserved. | ||
12389 | + | ||
12390 | +# Test for the GNU C Library, version 2.1 or newer. | ||
12391 | +# From Bruno Haible. | ||
12392 | + | ||
12393 | +AC_DEFUN([gl_GLIBC21], | ||
12394 | + [ | ||
12395 | + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, | ||
12396 | + ac_cv_gnu_library_2_1, | ||
12397 | + [AC_EGREP_CPP([Lucky GNU user], | ||
12398 | + [ | ||
12399 | +#include <features.h> | ||
12400 | +#ifdef __GNU_LIBRARY__ | ||
12401 | + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) | ||
12402 | + Lucky GNU user | ||
12403 | + #endif | ||
12404 | +#endif | ||
12405 | + ], | ||
12406 | + ac_cv_gnu_library_2_1=yes, | ||
12407 | + ac_cv_gnu_library_2_1=no) | ||
12408 | + ] | ||
12409 | + ) | ||
12410 | + AC_SUBST(GLIBC21) | ||
12411 | + GLIBC21="$ac_cv_gnu_library_2_1" | ||
12412 | + ] | ||
12413 | +) | ||
12414 | diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 | ||
12415 | new file mode 100644 | ||
12416 | index 0000000..8c8a670 | ||
12417 | --- /dev/null | ||
12418 | +++ b/m4/intdiv0.m4 | ||
12419 | @@ -0,0 +1,84 @@ | ||
12420 | +# intdiv0.m4 serial 2 (gettext-0.17) | ||
12421 | +dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. | ||
12422 | +dnl This file is free software; the Free Software Foundation | ||
12423 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12424 | +dnl with or without modifications, as long as this notice is preserved. | ||
12425 | + | ||
12426 | +dnl From Bruno Haible. | ||
12427 | + | ||
12428 | +AC_DEFUN([gt_INTDIV0], | ||
12429 | +[ | ||
12430 | + AC_REQUIRE([AC_PROG_CC])dnl | ||
12431 | + AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
12432 | + | ||
12433 | + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], | ||
12434 | + gt_cv_int_divbyzero_sigfpe, | ||
12435 | + [ | ||
12436 | + gt_cv_int_divbyzero_sigfpe= | ||
12437 | +changequote(,)dnl | ||
12438 | + case "$host_os" in | ||
12439 | + macos* | darwin[6-9]* | darwin[1-9][0-9]*) | ||
12440 | + # On MacOS X 10.2 or newer, just assume the same as when cross- | ||
12441 | + # compiling. If we were to perform the real test, 1 Crash Report | ||
12442 | + # dialog window would pop up. | ||
12443 | + case "$host_cpu" in | ||
12444 | + i[34567]86 | x86_64) | ||
12445 | + gt_cv_int_divbyzero_sigfpe="guessing yes" ;; | ||
12446 | + esac | ||
12447 | + ;; | ||
12448 | + esac | ||
12449 | +changequote([,])dnl | ||
12450 | + if test -z "$gt_cv_int_divbyzero_sigfpe"; then | ||
12451 | + AC_TRY_RUN([ | ||
12452 | +#include <stdlib.h> | ||
12453 | +#include <signal.h> | ||
12454 | + | ||
12455 | +static void | ||
12456 | +sigfpe_handler (int sig) | ||
12457 | +{ | ||
12458 | + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ | ||
12459 | + exit (sig != SIGFPE); | ||
12460 | +} | ||
12461 | + | ||
12462 | +int x = 1; | ||
12463 | +int y = 0; | ||
12464 | +int z; | ||
12465 | +int nan; | ||
12466 | + | ||
12467 | +int main () | ||
12468 | +{ | ||
12469 | + signal (SIGFPE, sigfpe_handler); | ||
12470 | +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ | ||
12471 | +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) | ||
12472 | + signal (SIGTRAP, sigfpe_handler); | ||
12473 | +#endif | ||
12474 | +/* Linux/SPARC yields signal SIGILL. */ | ||
12475 | +#if defined (__sparc__) && defined (__linux__) | ||
12476 | + signal (SIGILL, sigfpe_handler); | ||
12477 | +#endif | ||
12478 | + | ||
12479 | + z = x / y; | ||
12480 | + nan = y / y; | ||
12481 | + exit (1); | ||
12482 | +} | ||
12483 | +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, | ||
12484 | + [ | ||
12485 | + # Guess based on the CPU. | ||
12486 | +changequote(,)dnl | ||
12487 | + case "$host_cpu" in | ||
12488 | + alpha* | i[34567]86 | x86_64 | m68k | s390*) | ||
12489 | + gt_cv_int_divbyzero_sigfpe="guessing yes";; | ||
12490 | + *) | ||
12491 | + gt_cv_int_divbyzero_sigfpe="guessing no";; | ||
12492 | + esac | ||
12493 | +changequote([,])dnl | ||
12494 | + ]) | ||
12495 | + fi | ||
12496 | + ]) | ||
12497 | + case "$gt_cv_int_divbyzero_sigfpe" in | ||
12498 | + *yes) value=1;; | ||
12499 | + *) value=0;; | ||
12500 | + esac | ||
12501 | + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, | ||
12502 | + [Define if integer division by zero raises signal SIGFPE.]) | ||
12503 | +]) | ||
12504 | diff --git a/m4/intl.m4 b/m4/intl.m4 | ||
12505 | new file mode 100644 | ||
12506 | index 0000000..934408b | ||
12507 | --- /dev/null | ||
12508 | +++ b/m4/intl.m4 | ||
12509 | @@ -0,0 +1,285 @@ | ||
12510 | +# intl.m4 serial 8 (gettext-0.17) | ||
12511 | +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. | ||
12512 | +dnl This file is free software; the Free Software Foundation | ||
12513 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12514 | +dnl with or without modifications, as long as this notice is preserved. | ||
12515 | +dnl | ||
12516 | +dnl This file can can be used in projects which are not available under | ||
12517 | +dnl the GNU General Public License or the GNU Library General Public | ||
12518 | +dnl License but which still want to provide support for the GNU gettext | ||
12519 | +dnl functionality. | ||
12520 | +dnl Please note that the actual code of the GNU gettext library is covered | ||
12521 | +dnl by the GNU Library General Public License, and the rest of the GNU | ||
12522 | +dnl gettext package package is covered by the GNU General Public License. | ||
12523 | +dnl They are *not* in the public domain. | ||
12524 | + | ||
12525 | +dnl Authors: | ||
12526 | +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | ||
12527 | +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. | ||
12528 | + | ||
12529 | +AC_PREREQ(2.52) | ||
12530 | + | ||
12531 | +dnl Checks for all prerequisites of the intl subdirectory, | ||
12532 | +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, | ||
12533 | +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. | ||
12534 | +AC_DEFUN([AM_INTL_SUBDIR], | ||
12535 | +[ | ||
12536 | + AC_REQUIRE([AC_PROG_INSTALL])dnl | ||
12537 | + AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
12538 | + AC_REQUIRE([AC_PROG_CC])dnl | ||
12539 | + AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
12540 | + AC_REQUIRE([gt_GLIBC2])dnl | ||
12541 | + AC_REQUIRE([AC_PROG_RANLIB])dnl | ||
12542 | + AC_REQUIRE([gl_VISIBILITY])dnl | ||
12543 | + AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl | ||
12544 | + AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl | ||
12545 | + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl | ||
12546 | + AC_REQUIRE([gt_TYPE_WINT_T])dnl | ||
12547 | + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
12548 | + AC_REQUIRE([gt_TYPE_INTMAX_T]) | ||
12549 | + AC_REQUIRE([gt_PRINTF_POSIX]) | ||
12550 | + AC_REQUIRE([gl_GLIBC21])dnl | ||
12551 | + AC_REQUIRE([gl_XSIZE])dnl | ||
12552 | + AC_REQUIRE([gt_INTL_MACOSX])dnl | ||
12553 | + | ||
12554 | + AC_CHECK_TYPE([ptrdiff_t], , | ||
12555 | + [AC_DEFINE([ptrdiff_t], [long], | ||
12556 | + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) | ||
12557 | + ]) | ||
12558 | + AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) | ||
12559 | + AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) | ||
12560 | + | ||
12561 | + dnl Use the _snprintf function only if it is declared (because on NetBSD it | ||
12562 | + dnl is defined as a weak alias of snprintf; we prefer to use the latter). | ||
12563 | + gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) | ||
12564 | + gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) | ||
12565 | + | ||
12566 | + dnl Use the *_unlocked functions only if they are declared. | ||
12567 | + dnl (because some of them were defined without being declared in Solaris | ||
12568 | + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | ||
12569 | + dnl on Solaris 2.5.1 to run on Solaris 2.6). | ||
12570 | + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | ||
12571 | + gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) | ||
12572 | + | ||
12573 | + case $gt_cv_func_printf_posix in | ||
12574 | + *yes) HAVE_POSIX_PRINTF=1 ;; | ||
12575 | + *) HAVE_POSIX_PRINTF=0 ;; | ||
12576 | + esac | ||
12577 | + AC_SUBST([HAVE_POSIX_PRINTF]) | ||
12578 | + if test "$ac_cv_func_asprintf" = yes; then | ||
12579 | + HAVE_ASPRINTF=1 | ||
12580 | + else | ||
12581 | + HAVE_ASPRINTF=0 | ||
12582 | + fi | ||
12583 | + AC_SUBST([HAVE_ASPRINTF]) | ||
12584 | + if test "$ac_cv_func_snprintf" = yes; then | ||
12585 | + HAVE_SNPRINTF=1 | ||
12586 | + else | ||
12587 | + HAVE_SNPRINTF=0 | ||
12588 | + fi | ||
12589 | + AC_SUBST([HAVE_SNPRINTF]) | ||
12590 | + if test "$ac_cv_func_wprintf" = yes; then | ||
12591 | + HAVE_WPRINTF=1 | ||
12592 | + else | ||
12593 | + HAVE_WPRINTF=0 | ||
12594 | + fi | ||
12595 | + AC_SUBST([HAVE_WPRINTF]) | ||
12596 | + | ||
12597 | + AM_LANGINFO_CODESET | ||
12598 | + gt_LC_MESSAGES | ||
12599 | + | ||
12600 | + dnl Compilation on mingw and Cygwin needs special Makefile rules, because | ||
12601 | + dnl 1. when we install a shared library, we must arrange to export | ||
12602 | + dnl auxiliary pointer variables for every exported variable, | ||
12603 | + dnl 2. when we install a shared library and a static library simultaneously, | ||
12604 | + dnl the include file specifies __declspec(dllimport) and therefore we | ||
12605 | + dnl must arrange to define the auxiliary pointer variables for the | ||
12606 | + dnl exported variables _also_ in the static library. | ||
12607 | + if test "$enable_shared" = yes; then | ||
12608 | + case "$host_os" in | ||
12609 | + mingw* | cygwin*) is_woe32dll=yes ;; | ||
12610 | + *) is_woe32dll=no ;; | ||
12611 | + esac | ||
12612 | + else | ||
12613 | + is_woe32dll=no | ||
12614 | + fi | ||
12615 | + WOE32DLL=$is_woe32dll | ||
12616 | + AC_SUBST([WOE32DLL]) | ||
12617 | + | ||
12618 | + dnl On mingw and Cygwin, we can activate special Makefile rules which add | ||
12619 | + dnl version information to the shared libraries and executables. | ||
12620 | + case "$host_os" in | ||
12621 | + mingw* | cygwin*) is_woe32=yes ;; | ||
12622 | + *) is_woe32=no ;; | ||
12623 | + esac | ||
12624 | + WOE32=$is_woe32 | ||
12625 | + AC_SUBST([WOE32]) | ||
12626 | + if test $WOE32 = yes; then | ||
12627 | + dnl Check for a program that compiles Windows resource files. | ||
12628 | + AC_CHECK_TOOL([WINDRES], [windres]) | ||
12629 | + fi | ||
12630 | + | ||
12631 | + dnl Determine whether when creating a library, "-lc" should be passed to | ||
12632 | + dnl libtool or not. On many platforms, it is required for the libtool option | ||
12633 | + dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool | ||
12634 | + dnl in the *.la files - makes it impossible to create multithreaded programs, | ||
12635 | + dnl because libtool also reorders the -lc to come before the -pthread, and | ||
12636 | + dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>. | ||
12637 | + case "$host_os" in | ||
12638 | + hpux*) LTLIBC="" ;; | ||
12639 | + *) LTLIBC="-lc" ;; | ||
12640 | + esac | ||
12641 | + AC_SUBST([LTLIBC]) | ||
12642 | + | ||
12643 | + dnl Rename some macros and functions used for locking. | ||
12644 | + AH_BOTTOM([ | ||
12645 | +#define __libc_lock_t gl_lock_t | ||
12646 | +#define __libc_lock_define gl_lock_define | ||
12647 | +#define __libc_lock_define_initialized gl_lock_define_initialized | ||
12648 | +#define __libc_lock_init gl_lock_init | ||
12649 | +#define __libc_lock_lock gl_lock_lock | ||
12650 | +#define __libc_lock_unlock gl_lock_unlock | ||
12651 | +#define __libc_lock_recursive_t gl_recursive_lock_t | ||
12652 | +#define __libc_lock_define_recursive gl_recursive_lock_define | ||
12653 | +#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized | ||
12654 | +#define __libc_lock_init_recursive gl_recursive_lock_init | ||
12655 | +#define __libc_lock_lock_recursive gl_recursive_lock_lock | ||
12656 | +#define __libc_lock_unlock_recursive gl_recursive_lock_unlock | ||
12657 | +#define glthread_in_use libintl_thread_in_use | ||
12658 | +#define glthread_lock_init libintl_lock_init | ||
12659 | +#define glthread_lock_lock libintl_lock_lock | ||
12660 | +#define glthread_lock_unlock libintl_lock_unlock | ||
12661 | +#define glthread_lock_destroy libintl_lock_destroy | ||
12662 | +#define glthread_rwlock_init libintl_rwlock_init | ||
12663 | +#define glthread_rwlock_rdlock libintl_rwlock_rdlock | ||
12664 | +#define glthread_rwlock_wrlock libintl_rwlock_wrlock | ||
12665 | +#define glthread_rwlock_unlock libintl_rwlock_unlock | ||
12666 | +#define glthread_rwlock_destroy libintl_rwlock_destroy | ||
12667 | +#define glthread_recursive_lock_init libintl_recursive_lock_init | ||
12668 | +#define glthread_recursive_lock_lock libintl_recursive_lock_lock | ||
12669 | +#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock | ||
12670 | +#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy | ||
12671 | +#define glthread_once libintl_once | ||
12672 | +#define glthread_once_call libintl_once_call | ||
12673 | +#define glthread_once_singlethreaded libintl_once_singlethreaded | ||
12674 | +]) | ||
12675 | +]) | ||
12676 | + | ||
12677 | + | ||
12678 | +dnl Checks for the core files of the intl subdirectory: | ||
12679 | +dnl dcigettext.c | ||
12680 | +dnl eval-plural.h | ||
12681 | +dnl explodename.c | ||
12682 | +dnl finddomain.c | ||
12683 | +dnl gettextP.h | ||
12684 | +dnl gmo.h | ||
12685 | +dnl hash-string.h hash-string.c | ||
12686 | +dnl l10nflist.c | ||
12687 | +dnl libgnuintl.h.in (except the *printf stuff) | ||
12688 | +dnl loadinfo.h | ||
12689 | +dnl loadmsgcat.c | ||
12690 | +dnl localealias.c | ||
12691 | +dnl log.c | ||
12692 | +dnl plural-exp.h plural-exp.c | ||
12693 | +dnl plural.y | ||
12694 | +dnl Used by libglocale. | ||
12695 | +AC_DEFUN([gt_INTL_SUBDIR_CORE], | ||
12696 | +[ | ||
12697 | + AC_REQUIRE([AC_C_INLINE])dnl | ||
12698 | + AC_REQUIRE([AC_TYPE_SIZE_T])dnl | ||
12699 | + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
12700 | + AC_REQUIRE([AC_FUNC_ALLOCA])dnl | ||
12701 | + AC_REQUIRE([AC_FUNC_MMAP])dnl | ||
12702 | + AC_REQUIRE([gt_INTDIV0])dnl | ||
12703 | + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl | ||
12704 | + AC_REQUIRE([gt_INTTYPES_PRI])dnl | ||
12705 | + AC_REQUIRE([gl_LOCK])dnl | ||
12706 | + | ||
12707 | + AC_TRY_LINK( | ||
12708 | + [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], | ||
12709 | + [], | ||
12710 | + [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, | ||
12711 | + [Define to 1 if the compiler understands __builtin_expect.])]) | ||
12712 | + | ||
12713 | + AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) | ||
12714 | + AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ | ||
12715 | + stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ | ||
12716 | + argz_next __fsetlocking]) | ||
12717 | + | ||
12718 | + dnl Use the *_unlocked functions only if they are declared. | ||
12719 | + dnl (because some of them were defined without being declared in Solaris | ||
12720 | + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | ||
12721 | + dnl on Solaris 2.5.1 to run on Solaris 2.6). | ||
12722 | + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | ||
12723 | + gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) | ||
12724 | + gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) | ||
12725 | + | ||
12726 | + AM_ICONV | ||
12727 | + | ||
12728 | + dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, | ||
12729 | + dnl and a _NL_LOCALE_NAME macro always. | ||
12730 | + AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, | ||
12731 | + [AC_TRY_LINK([#include <langinfo.h> | ||
12732 | +#include <locale.h>], | ||
12733 | + [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); | ||
12734 | + return !cs; | ||
12735 | + ], | ||
12736 | + gt_cv_nl_locale_name=yes, | ||
12737 | + gt_cv_nl_locale_name=no) | ||
12738 | + ]) | ||
12739 | + if test $gt_cv_nl_locale_name = yes; then | ||
12740 | + AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, | ||
12741 | + [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) | ||
12742 | + fi | ||
12743 | + | ||
12744 | + dnl intl/plural.c is generated from intl/plural.y. It requires bison, | ||
12745 | + dnl because plural.y uses bison specific features. It requires at least | ||
12746 | + dnl bison-1.26 because earlier versions generate a plural.c that doesn't | ||
12747 | + dnl compile. | ||
12748 | + dnl bison is only needed for the maintainer (who touches plural.y). But in | ||
12749 | + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put | ||
12750 | + dnl the rule in general Makefile. Now, some people carelessly touch the | ||
12751 | + dnl files or have a broken "make" program, hence the plural.c rule will | ||
12752 | + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not | ||
12753 | + dnl present or too old. | ||
12754 | + AC_CHECK_PROGS([INTLBISON], [bison]) | ||
12755 | + if test -z "$INTLBISON"; then | ||
12756 | + ac_verc_fail=yes | ||
12757 | + else | ||
12758 | + dnl Found it, now check the version. | ||
12759 | + AC_MSG_CHECKING([version of bison]) | ||
12760 | +changequote(<<,>>)dnl | ||
12761 | + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` | ||
12762 | + case $ac_prog_version in | ||
12763 | + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | ||
12764 | + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) | ||
12765 | +changequote([,])dnl | ||
12766 | + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; | ||
12767 | + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; | ||
12768 | + esac | ||
12769 | + AC_MSG_RESULT([$ac_prog_version]) | ||
12770 | + fi | ||
12771 | + if test $ac_verc_fail = yes; then | ||
12772 | + INTLBISON=: | ||
12773 | + fi | ||
12774 | +]) | ||
12775 | + | ||
12776 | + | ||
12777 | +dnl gt_CHECK_DECL(FUNC, INCLUDES) | ||
12778 | +dnl Check whether a function is declared. | ||
12779 | +AC_DEFUN([gt_CHECK_DECL], | ||
12780 | +[ | ||
12781 | + AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, | ||
12782 | + [AC_TRY_COMPILE([$2], [ | ||
12783 | +#ifndef $1 | ||
12784 | + char *p = (char *) $1; | ||
12785 | +#endif | ||
12786 | +], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) | ||
12787 | + if test $ac_cv_have_decl_$1 = yes; then | ||
12788 | + gt_value=1 | ||
12789 | + else | ||
12790 | + gt_value=0 | ||
12791 | + fi | ||
12792 | + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], | ||
12793 | + [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) | ||
12794 | +]) | ||
12795 | diff --git a/m4/intldir.m4 b/m4/intldir.m4 | ||
12796 | new file mode 100644 | ||
12797 | index 0000000..7a28843 | ||
12798 | --- /dev/null | ||
12799 | +++ b/m4/intldir.m4 | ||
12800 | @@ -0,0 +1,19 @@ | ||
12801 | +# intldir.m4 serial 1 (gettext-0.16) | ||
12802 | +dnl Copyright (C) 2006 Free Software Foundation, Inc. | ||
12803 | +dnl This file is free software; the Free Software Foundation | ||
12804 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12805 | +dnl with or without modifications, as long as this notice is preserved. | ||
12806 | +dnl | ||
12807 | +dnl This file can can be used in projects which are not available under | ||
12808 | +dnl the GNU General Public License or the GNU Library General Public | ||
12809 | +dnl License but which still want to provide support for the GNU gettext | ||
12810 | +dnl functionality. | ||
12811 | +dnl Please note that the actual code of the GNU gettext library is covered | ||
12812 | +dnl by the GNU Library General Public License, and the rest of the GNU | ||
12813 | +dnl gettext package package is covered by the GNU General Public License. | ||
12814 | +dnl They are *not* in the public domain. | ||
12815 | + | ||
12816 | +AC_PREREQ(2.52) | ||
12817 | + | ||
12818 | +dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. | ||
12819 | +AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) | ||
12820 | diff --git a/m4/intmax.m4 b/m4/intmax.m4 | ||
12821 | new file mode 100644 | ||
12822 | index 0000000..ce7a8a4 | ||
12823 | --- /dev/null | ||
12824 | +++ b/m4/intmax.m4 | ||
12825 | @@ -0,0 +1,33 @@ | ||
12826 | +# intmax.m4 serial 3 (gettext-0.16) | ||
12827 | +dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. | ||
12828 | +dnl This file is free software; the Free Software Foundation | ||
12829 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12830 | +dnl with or without modifications, as long as this notice is preserved. | ||
12831 | + | ||
12832 | +dnl From Bruno Haible. | ||
12833 | +dnl Test whether the system has the 'intmax_t' type, but don't attempt to | ||
12834 | +dnl find a replacement if it is lacking. | ||
12835 | + | ||
12836 | +AC_DEFUN([gt_TYPE_INTMAX_T], | ||
12837 | +[ | ||
12838 | + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
12839 | + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
12840 | + AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, | ||
12841 | + [AC_TRY_COMPILE([ | ||
12842 | +#include <stddef.h> | ||
12843 | +#include <stdlib.h> | ||
12844 | +#if HAVE_STDINT_H_WITH_UINTMAX | ||
12845 | +#include <stdint.h> | ||
12846 | +#endif | ||
12847 | +#if HAVE_INTTYPES_H_WITH_UINTMAX | ||
12848 | +#include <inttypes.h> | ||
12849 | +#endif | ||
12850 | +], [intmax_t x = -1; | ||
12851 | + return !x;], | ||
12852 | + gt_cv_c_intmax_t=yes, | ||
12853 | + gt_cv_c_intmax_t=no)]) | ||
12854 | + if test $gt_cv_c_intmax_t = yes; then | ||
12855 | + AC_DEFINE(HAVE_INTMAX_T, 1, | ||
12856 | + [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) | ||
12857 | + fi | ||
12858 | +]) | ||
12859 | diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 | ||
12860 | new file mode 100644 | ||
12861 | index 0000000..7c7f894 | ||
12862 | --- /dev/null | ||
12863 | +++ b/m4/inttypes-pri.m4 | ||
12864 | @@ -0,0 +1,36 @@ | ||
12865 | +# inttypes-pri.m4 serial 4 (gettext-0.16) | ||
12866 | +dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. | ||
12867 | +dnl This file is free software; the Free Software Foundation | ||
12868 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12869 | +dnl with or without modifications, as long as this notice is preserved. | ||
12870 | + | ||
12871 | +dnl From Bruno Haible. | ||
12872 | + | ||
12873 | +AC_PREREQ(2.52) | ||
12874 | + | ||
12875 | +# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* | ||
12876 | +# macros to non-string values. This is the case on AIX 4.3.3. | ||
12877 | + | ||
12878 | +AC_DEFUN([gt_INTTYPES_PRI], | ||
12879 | +[ | ||
12880 | + AC_CHECK_HEADERS([inttypes.h]) | ||
12881 | + if test $ac_cv_header_inttypes_h = yes; then | ||
12882 | + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], | ||
12883 | + gt_cv_inttypes_pri_broken, | ||
12884 | + [ | ||
12885 | + AC_TRY_COMPILE([#include <inttypes.h> | ||
12886 | +#ifdef PRId32 | ||
12887 | +char *p = PRId32; | ||
12888 | +#endif | ||
12889 | +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) | ||
12890 | + ]) | ||
12891 | + fi | ||
12892 | + if test "$gt_cv_inttypes_pri_broken" = yes; then | ||
12893 | + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, | ||
12894 | + [Define if <inttypes.h> exists and defines unusable PRI* macros.]) | ||
12895 | + PRI_MACROS_BROKEN=1 | ||
12896 | + else | ||
12897 | + PRI_MACROS_BROKEN=0 | ||
12898 | + fi | ||
12899 | + AC_SUBST([PRI_MACROS_BROKEN]) | ||
12900 | +]) | ||
12901 | diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 | ||
12902 | new file mode 100644 | ||
12903 | index 0000000..edc8ecb | ||
12904 | --- /dev/null | ||
12905 | +++ b/m4/inttypes_h.m4 | ||
12906 | @@ -0,0 +1,26 @@ | ||
12907 | +# inttypes_h.m4 serial 7 | ||
12908 | +dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. | ||
12909 | +dnl This file is free software; the Free Software Foundation | ||
12910 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12911 | +dnl with or without modifications, as long as this notice is preserved. | ||
12912 | + | ||
12913 | +dnl From Paul Eggert. | ||
12914 | + | ||
12915 | +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, | ||
12916 | +# doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
12917 | + | ||
12918 | +AC_DEFUN([gl_AC_HEADER_INTTYPES_H], | ||
12919 | +[ | ||
12920 | + AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, | ||
12921 | + [AC_TRY_COMPILE( | ||
12922 | + [#include <sys/types.h> | ||
12923 | +#include <inttypes.h>], | ||
12924 | + [uintmax_t i = (uintmax_t) -1; return !i;], | ||
12925 | + gl_cv_header_inttypes_h=yes, | ||
12926 | + gl_cv_header_inttypes_h=no)]) | ||
12927 | + if test $gl_cv_header_inttypes_h = yes; then | ||
12928 | + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, | ||
12929 | + [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, | ||
12930 | + and declares uintmax_t. ]) | ||
12931 | + fi | ||
12932 | +]) | ||
12933 | diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 | ||
12934 | new file mode 100644 | ||
12935 | index 0000000..19aa77e | ||
12936 | --- /dev/null | ||
12937 | +++ b/m4/lcmessage.m4 | ||
12938 | @@ -0,0 +1,30 @@ | ||
12939 | +# lcmessage.m4 serial 4 (gettext-0.14.2) | ||
12940 | +dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. | ||
12941 | +dnl This file is free software; the Free Software Foundation | ||
12942 | +dnl gives unlimited permission to copy and/or distribute it, | ||
12943 | +dnl with or without modifications, as long as this notice is preserved. | ||
12944 | +dnl | ||
12945 | +dnl This file can can be used in projects which are not available under | ||
12946 | +dnl the GNU General Public License or the GNU Library General Public | ||
12947 | +dnl License but which still want to provide support for the GNU gettext | ||
12948 | +dnl functionality. | ||
12949 | +dnl Please note that the actual code of the GNU gettext library is covered | ||
12950 | +dnl by the GNU Library General Public License, and the rest of the GNU | ||
12951 | +dnl gettext package package is covered by the GNU General Public License. | ||
12952 | +dnl They are *not* in the public domain. | ||
12953 | + | ||
12954 | +dnl Authors: | ||
12955 | +dnl Ulrich Drepper <drepper@cygnus.com>, 1995. | ||
12956 | + | ||
12957 | +# Check whether LC_MESSAGES is available in <locale.h>. | ||
12958 | + | ||
12959 | +AC_DEFUN([gt_LC_MESSAGES], | ||
12960 | +[ | ||
12961 | + AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, | ||
12962 | + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
12963 | + gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) | ||
12964 | + if test $gt_cv_val_LC_MESSAGES = yes; then | ||
12965 | + AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
12966 | + [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
12967 | + fi | ||
12968 | +]) | ||
12969 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
12970 | index 828104c..8ff3c76 100644 | ||
12971 | --- a/m4/libtool.m4 | ||
12972 | +++ b/m4/libtool.m4 | ||
12973 | @@ -1,8 +1,8 @@ | ||
12974 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | ||
12975 | # | ||
12976 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
12977 | -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
12978 | -# Foundation, Inc. | ||
12979 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
12980 | +# Inc. | ||
12981 | # Written by Gordon Matzigkeit, 1996 | ||
12982 | # | ||
12983 | # This file is free software; the Free Software Foundation gives | ||
12984 | @@ -11,8 +11,8 @@ | ||
12985 | |||
12986 | m4_define([_LT_COPYING], [dnl | ||
12987 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
12988 | -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
12989 | -# Foundation, Inc. | ||
12990 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
12991 | +# Inc. | ||
12992 | # Written by Gordon Matzigkeit, 1996 | ||
12993 | # | ||
12994 | # This file is part of GNU Libtool. | ||
12995 | @@ -146,8 +146,6 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl | ||
12996 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | ||
12997 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | ||
12998 | |||
12999 | -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
13000 | -dnl | ||
13001 | _LT_DECL([], [host_alias], [0], [The host system])dnl | ||
13002 | _LT_DECL([], [host], [0])dnl | ||
13003 | _LT_DECL([], [host_os], [0])dnl | ||
13004 | @@ -639,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl | ||
13005 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | ||
13006 | configured by $[0], generated by m4_PACKAGE_STRING. | ||
13007 | |||
13008 | -Copyright (C) 2011 Free Software Foundation, Inc. | ||
13009 | +Copyright (C) 2010 Free Software Foundation, Inc. | ||
13010 | This config.lt script is free software; the Free Software Foundation | ||
13011 | gives unlimited permision to copy, distribute and modify it." | ||
13012 | |||
13013 | @@ -803,7 +801,6 @@ AC_DEFUN([LT_LANG], | ||
13014 | m4_case([$1], | ||
13015 | [C], [_LT_LANG(C)], | ||
13016 | [C++], [_LT_LANG(CXX)], | ||
13017 | - [Go], [_LT_LANG(GO)], | ||
13018 | [Java], [_LT_LANG(GCJ)], | ||
13019 | [Fortran 77], [_LT_LANG(F77)], | ||
13020 | [Fortran], [_LT_LANG(FC)], | ||
13021 | @@ -825,31 +822,6 @@ m4_defun([_LT_LANG], | ||
13022 | ])# _LT_LANG | ||
13023 | |||
13024 | |||
13025 | -m4_ifndef([AC_PROG_GO], [ | ||
13026 | -############################################################ | ||
13027 | -# NOTE: This macro has been submitted for inclusion into # | ||
13028 | -# GNU Autoconf as AC_PROG_GO. When it is available in # | ||
13029 | -# a released version of Autoconf we should remove this # | ||
13030 | -# macro and use it instead. # | ||
13031 | -############################################################ | ||
13032 | -m4_defun([AC_PROG_GO], | ||
13033 | -[AC_LANG_PUSH(Go)dnl | ||
13034 | -AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
13035 | -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
13036 | -_AC_ARG_VAR_LDFLAGS()dnl | ||
13037 | -AC_CHECK_TOOL(GOC, gccgo) | ||
13038 | -if test -z "$GOC"; then | ||
13039 | - if test -n "$ac_tool_prefix"; then | ||
13040 | - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
13041 | - fi | ||
13042 | -fi | ||
13043 | -if test -z "$GOC"; then | ||
13044 | - AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
13045 | -fi | ||
13046 | -])#m4_defun | ||
13047 | -])#m4_ifndef | ||
13048 | - | ||
13049 | - | ||
13050 | # _LT_LANG_DEFAULT_CONFIG | ||
13051 | # ----------------------- | ||
13052 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | ||
13053 | @@ -880,10 +852,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], | ||
13054 | m4_ifdef([LT_PROG_GCJ], | ||
13055 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) | ||
13056 | |||
13057 | -AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
13058 | - [LT_LANG(GO)], | ||
13059 | - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
13060 | - | ||
13061 | AC_PROVIDE_IFELSE([LT_PROG_RC], | ||
13062 | [LT_LANG(RC)], | ||
13063 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) | ||
13064 | @@ -986,13 +954,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | ||
13065 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | ||
13066 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | ||
13067 | _lt_result=$? | ||
13068 | - # If there is a non-empty error log, and "single_module" | ||
13069 | - # appears in it, assume the flag caused a linker warning | ||
13070 | - if test -s conftest.err && $GREP single_module conftest.err; then | ||
13071 | - cat conftest.err >&AS_MESSAGE_LOG_FD | ||
13072 | - # Otherwise, if the output was created with a 0 exit code from | ||
13073 | - # the compiler, it worked. | ||
13074 | - elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
13075 | + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | ||
13076 | lt_cv_apple_cc_single_mod=yes | ||
13077 | else | ||
13078 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
13079 | @@ -1000,7 +962,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | ||
13080 | rm -rf libconftest.dylib* | ||
13081 | rm -f conftest.* | ||
13082 | fi]) | ||
13083 | - | ||
13084 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | ||
13085 | [lt_cv_ld_exported_symbols_list], | ||
13086 | [lt_cv_ld_exported_symbols_list=no | ||
13087 | @@ -1012,7 +973,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | ||
13088 | [lt_cv_ld_exported_symbols_list=no]) | ||
13089 | LDFLAGS="$save_LDFLAGS" | ||
13090 | ]) | ||
13091 | - | ||
13092 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
13093 | [lt_cv_ld_force_load=no | ||
13094 | cat > conftest.c << _LT_EOF | ||
13095 | @@ -1030,9 +990,7 @@ _LT_EOF | ||
13096 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
13097 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
13098 | _lt_result=$? | ||
13099 | - if test -s conftest.err && $GREP force_load conftest.err; then | ||
13100 | - cat conftest.err >&AS_MESSAGE_LOG_FD | ||
13101 | - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
13102 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | ||
13103 | lt_cv_ld_force_load=yes | ||
13104 | else | ||
13105 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
13106 | @@ -1077,8 +1035,8 @@ _LT_EOF | ||
13107 | ]) | ||
13108 | |||
13109 | |||
13110 | -# _LT_DARWIN_LINKER_FEATURES([TAG]) | ||
13111 | -# --------------------------------- | ||
13112 | +# _LT_DARWIN_LINKER_FEATURES | ||
13113 | +# -------------------------- | ||
13114 | # Checks for linker and compiler features on darwin | ||
13115 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | ||
13116 | [ | ||
13117 | @@ -1089,8 +1047,6 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | ||
13118 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | ||
13119 | if test "$lt_cv_ld_force_load" = "yes"; then | ||
13120 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | ||
13121 | - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
13122 | - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
13123 | else | ||
13124 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
13125 | fi | ||
13126 | @@ -1374,27 +1330,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | ||
13127 | CFLAGS="$SAVE_CFLAGS" | ||
13128 | fi | ||
13129 | ;; | ||
13130 | -*-*solaris*) | ||
13131 | +sparc*-*solaris*) | ||
13132 | # Find out which ABI we are using. | ||
13133 | echo 'int i;' > conftest.$ac_ext | ||
13134 | if AC_TRY_EVAL(ac_compile); then | ||
13135 | case `/usr/bin/file conftest.o` in | ||
13136 | *64-bit*) | ||
13137 | case $lt_cv_prog_gnu_ld in | ||
13138 | - yes*) | ||
13139 | - case $host in | ||
13140 | - i?86-*-solaris*) | ||
13141 | - LD="${LD-ld} -m elf_x86_64" | ||
13142 | - ;; | ||
13143 | - sparc*-*-solaris*) | ||
13144 | - LD="${LD-ld} -m elf64_sparc" | ||
13145 | - ;; | ||
13146 | - esac | ||
13147 | - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
13148 | - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
13149 | - LD="${LD-ld}_sol2" | ||
13150 | - fi | ||
13151 | - ;; | ||
13152 | + yes*) LD="${LD-ld} -m elf64_sparc" ;; | ||
13153 | *) | ||
13154 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | ||
13155 | LD="${LD-ld} -64" | ||
13156 | @@ -1471,13 +1414,13 @@ old_postuninstall_cmds= | ||
13157 | if test -n "$RANLIB"; then | ||
13158 | case $host_os in | ||
13159 | openbsd*) | ||
13160 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | ||
13161 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | ||
13162 | ;; | ||
13163 | *) | ||
13164 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | ||
13165 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | ||
13166 | ;; | ||
13167 | esac | ||
13168 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | ||
13169 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | ||
13170 | fi | ||
13171 | |||
13172 | case $host_os in | ||
13173 | @@ -1657,11 +1600,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl | ||
13174 | lt_cv_sys_max_cmd_len=196608 | ||
13175 | ;; | ||
13176 | |||
13177 | - os2*) | ||
13178 | - # The test takes a long time on OS/2. | ||
13179 | - lt_cv_sys_max_cmd_len=8192 | ||
13180 | - ;; | ||
13181 | - | ||
13182 | osf*) | ||
13183 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | ||
13184 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | ||
13185 | @@ -1701,7 +1639,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl | ||
13186 | # If test is not a shell built-in, we'll probably end up computing a | ||
13187 | # maximum length that is only half of the actual maximum length, but | ||
13188 | # we can't tell. | ||
13189 | - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ | ||
13190 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | ||
13191 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | ||
13192 | test $i != 17 # 1/2 MB should be enough | ||
13193 | do | ||
13194 | @@ -2247,7 +2185,7 @@ need_version=unknown | ||
13195 | |||
13196 | case $host_os in | ||
13197 | aix3*) | ||
13198 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13199 | + version_type=linux | ||
13200 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | ||
13201 | shlibpath_var=LIBPATH | ||
13202 | |||
13203 | @@ -2256,7 +2194,7 @@ aix3*) | ||
13204 | ;; | ||
13205 | |||
13206 | aix[[4-9]]*) | ||
13207 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13208 | + version_type=linux | ||
13209 | need_lib_prefix=no | ||
13210 | need_version=no | ||
13211 | hardcode_into_libs=yes | ||
13212 | @@ -2321,7 +2259,7 @@ beos*) | ||
13213 | ;; | ||
13214 | |||
13215 | bsdi[[45]]*) | ||
13216 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13217 | + version_type=linux | ||
13218 | need_version=no | ||
13219 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13220 | soname_spec='${libname}${release}${shared_ext}$major' | ||
13221 | @@ -2460,7 +2398,7 @@ m4_if([$1], [],[ | ||
13222 | ;; | ||
13223 | |||
13224 | dgux*) | ||
13225 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13226 | + version_type=linux | ||
13227 | need_lib_prefix=no | ||
13228 | need_version=no | ||
13229 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | ||
13230 | @@ -2468,6 +2406,10 @@ dgux*) | ||
13231 | shlibpath_var=LD_LIBRARY_PATH | ||
13232 | ;; | ||
13233 | |||
13234 | +freebsd1*) | ||
13235 | + dynamic_linker=no | ||
13236 | + ;; | ||
13237 | + | ||
13238 | freebsd* | dragonfly*) | ||
13239 | # DragonFly does not have aout. When/if they implement a new | ||
13240 | # versioning mechanism, adjust this. | ||
13241 | @@ -2475,7 +2417,7 @@ freebsd* | dragonfly*) | ||
13242 | objformat=`/usr/bin/objformat` | ||
13243 | else | ||
13244 | case $host_os in | ||
13245 | - freebsd[[23]].*) objformat=aout ;; | ||
13246 | + freebsd[[123]]*) objformat=aout ;; | ||
13247 | *) objformat=elf ;; | ||
13248 | esac | ||
13249 | fi | ||
13250 | @@ -2493,7 +2435,7 @@ freebsd* | dragonfly*) | ||
13251 | esac | ||
13252 | shlibpath_var=LD_LIBRARY_PATH | ||
13253 | case $host_os in | ||
13254 | - freebsd2.*) | ||
13255 | + freebsd2*) | ||
13256 | shlibpath_overrides_runpath=yes | ||
13257 | ;; | ||
13258 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | ||
13259 | @@ -2513,7 +2455,7 @@ freebsd* | dragonfly*) | ||
13260 | ;; | ||
13261 | |||
13262 | gnu*) | ||
13263 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13264 | + version_type=linux | ||
13265 | need_lib_prefix=no | ||
13266 | need_version=no | ||
13267 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
13268 | @@ -2524,7 +2466,7 @@ gnu*) | ||
13269 | ;; | ||
13270 | |||
13271 | haiku*) | ||
13272 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13273 | + version_type=linux | ||
13274 | need_lib_prefix=no | ||
13275 | need_version=no | ||
13276 | dynamic_linker="$host_os runtime_loader" | ||
13277 | @@ -2585,7 +2527,7 @@ hpux9* | hpux10* | hpux11*) | ||
13278 | ;; | ||
13279 | |||
13280 | interix[[3-9]]*) | ||
13281 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13282 | + version_type=linux | ||
13283 | need_lib_prefix=no | ||
13284 | need_version=no | ||
13285 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
13286 | @@ -2601,7 +2543,7 @@ irix5* | irix6* | nonstopux*) | ||
13287 | nonstopux*) version_type=nonstopux ;; | ||
13288 | *) | ||
13289 | if test "$lt_cv_prog_gnu_ld" = yes; then | ||
13290 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13291 | + version_type=linux | ||
13292 | else | ||
13293 | version_type=irix | ||
13294 | fi ;; | ||
13295 | @@ -2638,9 +2580,9 @@ linux*oldld* | linux*aout* | linux*coff*) | ||
13296 | dynamic_linker=no | ||
13297 | ;; | ||
13298 | |||
13299 | -# This must be glibc/ELF. | ||
13300 | +# This must be Linux ELF. | ||
13301 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | ||
13302 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13303 | + version_type=linux | ||
13304 | need_lib_prefix=no | ||
13305 | need_version=no | ||
13306 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13307 | @@ -2715,7 +2657,7 @@ netbsd*) | ||
13308 | ;; | ||
13309 | |||
13310 | newsos6) | ||
13311 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13312 | + version_type=linux | ||
13313 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13314 | shlibpath_var=LD_LIBRARY_PATH | ||
13315 | shlibpath_overrides_runpath=yes | ||
13316 | @@ -2784,7 +2726,7 @@ rdos*) | ||
13317 | ;; | ||
13318 | |||
13319 | solaris*) | ||
13320 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13321 | + version_type=linux | ||
13322 | need_lib_prefix=no | ||
13323 | need_version=no | ||
13324 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13325 | @@ -2809,7 +2751,7 @@ sunos4*) | ||
13326 | ;; | ||
13327 | |||
13328 | sysv4 | sysv4.3*) | ||
13329 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13330 | + version_type=linux | ||
13331 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13332 | soname_spec='${libname}${release}${shared_ext}$major' | ||
13333 | shlibpath_var=LD_LIBRARY_PATH | ||
13334 | @@ -2833,7 +2775,7 @@ sysv4 | sysv4.3*) | ||
13335 | |||
13336 | sysv4*MP*) | ||
13337 | if test -d /usr/nec ;then | ||
13338 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13339 | + version_type=linux | ||
13340 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | ||
13341 | soname_spec='$libname${shared_ext}.$major' | ||
13342 | shlibpath_var=LD_LIBRARY_PATH | ||
13343 | @@ -2864,7 +2806,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
13344 | |||
13345 | tpf*) | ||
13346 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | ||
13347 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13348 | + version_type=linux | ||
13349 | need_lib_prefix=no | ||
13350 | need_version=no | ||
13351 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13352 | @@ -2874,7 +2816,7 @@ tpf*) | ||
13353 | ;; | ||
13354 | |||
13355 | uts4*) | ||
13356 | - version_type=linux # correct to gnu/linux during the next big refactor | ||
13357 | + version_type=linux | ||
13358 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | ||
13359 | soname_spec='${libname}${release}${shared_ext}$major' | ||
13360 | shlibpath_var=LD_LIBRARY_PATH | ||
13361 | @@ -3296,7 +3238,7 @@ irix5* | irix6* | nonstopux*) | ||
13362 | lt_cv_deplibs_check_method=pass_all | ||
13363 | ;; | ||
13364 | |||
13365 | -# This must be glibc/ELF. | ||
13366 | +# This must be Linux ELF. | ||
13367 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | ||
13368 | lt_cv_deplibs_check_method=pass_all | ||
13369 | ;; | ||
13370 | @@ -3716,7 +3658,6 @@ for ac_symprfx in "" "_"; do | ||
13371 | # which start with @ or ?. | ||
13372 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | ||
13373 | " {last_section=section; section=\$ 3};"\ | ||
13374 | -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
13375 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | ||
13376 | " \$ 0!~/External *\|/{next};"\ | ||
13377 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | ||
13378 | @@ -4301,9 +4242,7 @@ m4_if([$1], [CXX], [ | ||
13379 | case $cc_basename in | ||
13380 | nvcc*) # Cuda Compiler Driver 2.2 | ||
13381 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
13382 | - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then | ||
13383 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
13384 | - fi | ||
13385 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' | ||
13386 | ;; | ||
13387 | esac | ||
13388 | else | ||
13389 | @@ -4395,33 +4334,18 @@ m4_if([$1], [CXX], [ | ||
13390 | ;; | ||
13391 | *) | ||
13392 | case `$CC -V 2>&1 | sed 5q` in | ||
13393 | - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) | ||
13394 | + *Sun\ F* | *Sun*Fortran*) | ||
13395 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
13396 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
13397 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
13398 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
13399 | ;; | ||
13400 | - *Sun\ F* | *Sun*Fortran*) | ||
13401 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
13402 | - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
13403 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
13404 | - ;; | ||
13405 | *Sun\ C*) | ||
13406 | # Sun C 5.9 | ||
13407 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
13408 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
13409 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
13410 | ;; | ||
13411 | - *Intel*\ [[CF]]*Compiler*) | ||
13412 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
13413 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
13414 | - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
13415 | - ;; | ||
13416 | - *Portland\ Group*) | ||
13417 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
13418 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
13419 | - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
13420 | - ;; | ||
13421 | esac | ||
13422 | ;; | ||
13423 | esac | ||
13424 | @@ -4581,9 +4505,7 @@ m4_if([$1], [CXX], [ | ||
13425 | ;; | ||
13426 | cygwin* | mingw* | cegcc*) | ||
13427 | case $cc_basename in | ||
13428 | - cl*) | ||
13429 | - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
13430 | - ;; | ||
13431 | + cl*) ;; | ||
13432 | *) | ||
13433 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
13434 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
13435 | @@ -4611,6 +4533,7 @@ m4_if([$1], [CXX], [ | ||
13436 | _LT_TAGVAR(hardcode_direct, $1)=no | ||
13437 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | ||
13438 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
13439 | + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
13440 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | ||
13441 | _LT_TAGVAR(hardcode_minus_L, $1)=no | ||
13442 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | ||
13443 | @@ -4864,7 +4787,8 @@ _LT_EOF | ||
13444 | xlf* | bgf* | bgxlf* | mpixlf*) | ||
13445 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | ||
13446 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | ||
13447 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | ||
13448 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
13449 | + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | ||
13450 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
13451 | if test "x$supports_anon_versioning" = xyes; then | ||
13452 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | ||
13453 | @@ -5160,7 +5084,6 @@ _LT_EOF | ||
13454 | # The linker will not automatically build a static lib if we build a DLL. | ||
13455 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
13456 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13457 | - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
13458 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | ||
13459 | # Don't use ranlib | ||
13460 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
13461 | @@ -5207,6 +5130,10 @@ _LT_EOF | ||
13462 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | ||
13463 | ;; | ||
13464 | |||
13465 | + freebsd1*) | ||
13466 | + _LT_TAGVAR(ld_shlibs, $1)=no | ||
13467 | + ;; | ||
13468 | + | ||
13469 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | ||
13470 | # support. Future versions do this automatically, but an explicit c++rt0.o | ||
13471 | # does not break anything, and helps significantly (at the cost of a little | ||
13472 | @@ -5219,7 +5146,7 @@ _LT_EOF | ||
13473 | ;; | ||
13474 | |||
13475 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | ||
13476 | - freebsd2.*) | ||
13477 | + freebsd2*) | ||
13478 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | ||
13479 | _LT_TAGVAR(hardcode_direct, $1)=yes | ||
13480 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | ||
13481 | @@ -5258,6 +5185,7 @@ _LT_EOF | ||
13482 | fi | ||
13483 | if test "$with_gnu_ld" = no; then | ||
13484 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | ||
13485 | + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
13486 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | ||
13487 | _LT_TAGVAR(hardcode_direct, $1)=yes | ||
13488 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | ||
13489 | @@ -5699,6 +5627,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1], | ||
13490 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | ||
13491 | [Flag to hardcode $libdir into a binary during linking. | ||
13492 | This must work even if $libdir does not exist]) | ||
13493 | +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
13494 | + [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
13495 | + during linking. This must work even if $libdir does not exist]]) | ||
13496 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | ||
13497 | [Whether we need a single "-rpath" flag with a separated argument]) | ||
13498 | _LT_TAGDECL([], [hardcode_direct], [0], | ||
13499 | @@ -5856,6 +5787,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | ||
13500 | _LT_TAGVAR(hardcode_direct, $1)=no | ||
13501 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | ||
13502 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
13503 | +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
13504 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | ||
13505 | _LT_TAGVAR(hardcode_minus_L, $1)=no | ||
13506 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | ||
13507 | @@ -6225,7 +6157,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13508 | esac | ||
13509 | ;; | ||
13510 | |||
13511 | - freebsd2.*) | ||
13512 | + freebsd[[12]]*) | ||
13513 | # C++ shared libraries reported to be fairly broken before | ||
13514 | # switch to ELF | ||
13515 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
13516 | @@ -6986,18 +6918,12 @@ public class foo { | ||
13517 | } | ||
13518 | }; | ||
13519 | _LT_EOF | ||
13520 | -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
13521 | -package foo | ||
13522 | -func foo() { | ||
13523 | -} | ||
13524 | -_LT_EOF | ||
13525 | ]) | ||
13526 | |||
13527 | _lt_libdeps_save_CFLAGS=$CFLAGS | ||
13528 | case "$CC $CFLAGS " in #( | ||
13529 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
13530 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
13531 | -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
13532 | esac | ||
13533 | |||
13534 | dnl Parse the compiler output and extract the necessary | ||
13535 | @@ -7194,6 +7120,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | ||
13536 | _LT_TAGVAR(hardcode_direct, $1)=no | ||
13537 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | ||
13538 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
13539 | +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
13540 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | ||
13541 | _LT_TAGVAR(hardcode_minus_L, $1)=no | ||
13542 | _LT_TAGVAR(hardcode_automatic, $1)=no | ||
13543 | @@ -7326,6 +7253,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | ||
13544 | _LT_TAGVAR(hardcode_direct, $1)=no | ||
13545 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | ||
13546 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
13547 | +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
13548 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | ||
13549 | _LT_TAGVAR(hardcode_minus_L, $1)=no | ||
13550 | _LT_TAGVAR(hardcode_automatic, $1)=no | ||
13551 | @@ -7512,77 +7440,6 @@ CFLAGS=$lt_save_CFLAGS | ||
13552 | ])# _LT_LANG_GCJ_CONFIG | ||
13553 | |||
13554 | |||
13555 | -# _LT_LANG_GO_CONFIG([TAG]) | ||
13556 | -# -------------------------- | ||
13557 | -# Ensure that the configuration variables for the GNU Go compiler | ||
13558 | -# are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
13559 | -# to write the compiler configuration to `libtool'. | ||
13560 | -m4_defun([_LT_LANG_GO_CONFIG], | ||
13561 | -[AC_REQUIRE([LT_PROG_GO])dnl | ||
13562 | -AC_LANG_SAVE | ||
13563 | - | ||
13564 | -# Source file extension for Go test sources. | ||
13565 | -ac_ext=go | ||
13566 | - | ||
13567 | -# Object file extension for compiled Go test sources. | ||
13568 | -objext=o | ||
13569 | -_LT_TAGVAR(objext, $1)=$objext | ||
13570 | - | ||
13571 | -# Code to be used in simple compile tests | ||
13572 | -lt_simple_compile_test_code="package main; func main() { }" | ||
13573 | - | ||
13574 | -# Code to be used in simple link tests | ||
13575 | -lt_simple_link_test_code='package main; func main() { }' | ||
13576 | - | ||
13577 | -# ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
13578 | -_LT_TAG_COMPILER | ||
13579 | - | ||
13580 | -# save warnings/boilerplate of simple test code | ||
13581 | -_LT_COMPILER_BOILERPLATE | ||
13582 | -_LT_LINKER_BOILERPLATE | ||
13583 | - | ||
13584 | -# Allow CC to be a program name with arguments. | ||
13585 | -lt_save_CC=$CC | ||
13586 | -lt_save_CFLAGS=$CFLAGS | ||
13587 | -lt_save_GCC=$GCC | ||
13588 | -GCC=yes | ||
13589 | -CC=${GOC-"gccgo"} | ||
13590 | -CFLAGS=$GOFLAGS | ||
13591 | -compiler=$CC | ||
13592 | -_LT_TAGVAR(compiler, $1)=$CC | ||
13593 | -_LT_TAGVAR(LD, $1)="$LD" | ||
13594 | -_LT_CC_BASENAME([$compiler]) | ||
13595 | - | ||
13596 | -# Go did not exist at the time GCC didn't implicitly link libc in. | ||
13597 | -_LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
13598 | - | ||
13599 | -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
13600 | -_LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
13601 | -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
13602 | - | ||
13603 | -## CAVEAT EMPTOR: | ||
13604 | -## There is no encapsulation within the following macros, do not change | ||
13605 | -## the running order or otherwise move them around unless you know exactly | ||
13606 | -## what you are doing... | ||
13607 | -if test -n "$compiler"; then | ||
13608 | - _LT_COMPILER_NO_RTTI($1) | ||
13609 | - _LT_COMPILER_PIC($1) | ||
13610 | - _LT_COMPILER_C_O($1) | ||
13611 | - _LT_COMPILER_FILE_LOCKS($1) | ||
13612 | - _LT_LINKER_SHLIBS($1) | ||
13613 | - _LT_LINKER_HARDCODE_LIBPATH($1) | ||
13614 | - | ||
13615 | - _LT_CONFIG($1) | ||
13616 | -fi | ||
13617 | - | ||
13618 | -AC_LANG_RESTORE | ||
13619 | - | ||
13620 | -GCC=$lt_save_GCC | ||
13621 | -CC=$lt_save_CC | ||
13622 | -CFLAGS=$lt_save_CFLAGS | ||
13623 | -])# _LT_LANG_GO_CONFIG | ||
13624 | - | ||
13625 | - | ||
13626 | # _LT_LANG_RC_CONFIG([TAG]) | ||
13627 | # ------------------------- | ||
13628 | # Ensure that the configuration variables for the Windows resource compiler | ||
13629 | @@ -7652,13 +7509,6 @@ dnl aclocal-1.4 backwards compatibility: | ||
13630 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | ||
13631 | |||
13632 | |||
13633 | -# LT_PROG_GO | ||
13634 | -# ---------- | ||
13635 | -AC_DEFUN([LT_PROG_GO], | ||
13636 | -[AC_CHECK_TOOL(GOC, gccgo,) | ||
13637 | -]) | ||
13638 | - | ||
13639 | - | ||
13640 | # LT_PROG_RC | ||
13641 | # ---------- | ||
13642 | AC_DEFUN([LT_PROG_RC], | ||
13643 | diff --git a/m4/lock.m4 b/m4/lock.m4 | ||
13644 | new file mode 100644 | ||
13645 | index 0000000..9111933 | ||
13646 | --- /dev/null | ||
13647 | +++ b/m4/lock.m4 | ||
13648 | @@ -0,0 +1,316 @@ | ||
13649 | +# lock.m4 serial 7 (gettext-0.17) | ||
13650 | +dnl Copyright (C) 2005-2007 Free Software Foundation, Inc. | ||
13651 | +dnl This file is free software; the Free Software Foundation | ||
13652 | +dnl gives unlimited permission to copy and/or distribute it, | ||
13653 | +dnl with or without modifications, as long as this notice is preserved. | ||
13654 | + | ||
13655 | +dnl From Bruno Haible. | ||
13656 | + | ||
13657 | +dnl Tests for a multithreading library to be used. | ||
13658 | +dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, | ||
13659 | +dnl USE_PTH_THREADS, USE_WIN32_THREADS | ||
13660 | +dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use | ||
13661 | +dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with | ||
13662 | +dnl libtool). | ||
13663 | +dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for | ||
13664 | +dnl programs that really need multithread functionality. The difference | ||
13665 | +dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak | ||
13666 | +dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". | ||
13667 | +dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for | ||
13668 | +dnl multithread-safe programs. | ||
13669 | + | ||
13670 | +AC_DEFUN([gl_LOCK_EARLY], | ||
13671 | +[ | ||
13672 | + AC_REQUIRE([gl_LOCK_EARLY_BODY]) | ||
13673 | +]) | ||
13674 | + | ||
13675 | +dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once. | ||
13676 | + | ||
13677 | +AC_DEFUN([gl_LOCK_EARLY_BODY], | ||
13678 | +[ | ||
13679 | + dnl Ordering constraints: This macro modifies CPPFLAGS in a way that | ||
13680 | + dnl influences the result of the autoconf tests that test for *_unlocked | ||
13681 | + dnl declarations, on AIX 5 at least. Therefore it must come early. | ||
13682 | + AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl | ||
13683 | + AC_BEFORE([$0], [gl_ARGP])dnl | ||
13684 | + | ||
13685 | + AC_REQUIRE([AC_CANONICAL_HOST]) | ||
13686 | + dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems. | ||
13687 | + dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes | ||
13688 | + dnl AC_GNU_SOURCE. | ||
13689 | + m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], | ||
13690 | + [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], | ||
13691 | + [AC_REQUIRE([AC_GNU_SOURCE])]) | ||
13692 | + dnl Check for multithreading. | ||
13693 | + AC_ARG_ENABLE(threads, | ||
13694 | +AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) | ||
13695 | +AC_HELP_STRING([--disable-threads], [build without multithread safety]), | ||
13696 | + [gl_use_threads=$enableval], | ||
13697 | + [case "$host_os" in | ||
13698 | + dnl Disable multithreading by default on OSF/1, because it interferes | ||
13699 | + dnl with fork()/exec(): When msgexec is linked with -lpthread, its child | ||
13700 | + dnl process gets an endless segmentation fault inside execvp(). | ||
13701 | + osf*) gl_use_threads=no ;; | ||
13702 | + *) gl_use_threads=yes ;; | ||
13703 | + esac | ||
13704 | + ]) | ||
13705 | + if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then | ||
13706 | + # For using <pthread.h>: | ||
13707 | + case "$host_os" in | ||
13708 | + osf*) | ||
13709 | + # On OSF/1, the compiler needs the flag -D_REENTRANT so that it | ||
13710 | + # groks <pthread.h>. cc also understands the flag -pthread, but | ||
13711 | + # we don't use it because 1. gcc-2.95 doesn't understand -pthread, | ||
13712 | + # 2. putting a flag into CPPFLAGS that has an effect on the linker | ||
13713 | + # causes the AC_TRY_LINK test below to succeed unexpectedly, | ||
13714 | + # leading to wrong values of LIBTHREAD and LTLIBTHREAD. | ||
13715 | + CPPFLAGS="$CPPFLAGS -D_REENTRANT" | ||
13716 | + ;; | ||
13717 | + esac | ||
13718 | + # Some systems optimize for single-threaded programs by default, and | ||
13719 | + # need special flags to disable these optimizations. For example, the | ||
13720 | + # definition of 'errno' in <errno.h>. | ||
13721 | + case "$host_os" in | ||
13722 | + aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; | ||
13723 | + solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; | ||
13724 | + esac | ||
13725 | + fi | ||
13726 | +]) | ||
13727 | + | ||
13728 | +dnl The guts of gl_LOCK. Needs to be expanded only once. | ||
13729 | + | ||
13730 | +AC_DEFUN([gl_LOCK_BODY], | ||
13731 | +[ | ||
13732 | + AC_REQUIRE([gl_LOCK_EARLY_BODY]) | ||
13733 | + gl_threads_api=none | ||
13734 | + LIBTHREAD= | ||
13735 | + LTLIBTHREAD= | ||
13736 | + LIBMULTITHREAD= | ||
13737 | + LTLIBMULTITHREAD= | ||
13738 | + if test "$gl_use_threads" != no; then | ||
13739 | + dnl Check whether the compiler and linker support weak declarations. | ||
13740 | + AC_MSG_CHECKING([whether imported symbols can be declared weak]) | ||
13741 | + gl_have_weak=no | ||
13742 | + AC_TRY_LINK([extern void xyzzy (); | ||
13743 | +#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) | ||
13744 | + AC_MSG_RESULT([$gl_have_weak]) | ||
13745 | + if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then | ||
13746 | + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that | ||
13747 | + # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY. | ||
13748 | + AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) | ||
13749 | + if test "$gl_have_pthread_h" = yes; then | ||
13750 | + # Other possible tests: | ||
13751 | + # -lpthreads (FSU threads, PCthreads) | ||
13752 | + # -lgthreads | ||
13753 | + gl_have_pthread= | ||
13754 | + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist | ||
13755 | + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but | ||
13756 | + # the second one only in libpthread, and lock.c needs it. | ||
13757 | + AC_TRY_LINK([#include <pthread.h>], | ||
13758 | + [pthread_mutex_lock((pthread_mutex_t*)0); | ||
13759 | + pthread_mutexattr_init((pthread_mutexattr_t*)0);], | ||
13760 | + [gl_have_pthread=yes]) | ||
13761 | + # Test for libpthread by looking for pthread_kill. (Not pthread_self, | ||
13762 | + # since it is defined as a macro on OSF/1.) | ||
13763 | + if test -n "$gl_have_pthread"; then | ||
13764 | + # The program links fine without libpthread. But it may actually | ||
13765 | + # need to link with libpthread in order to create multiple threads. | ||
13766 | + AC_CHECK_LIB(pthread, pthread_kill, | ||
13767 | + [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread | ||
13768 | + # On Solaris and HP-UX, most pthread functions exist also in libc. | ||
13769 | + # Therefore pthread_in_use() needs to actually try to create a | ||
13770 | + # thread: pthread_create from libc will fail, whereas | ||
13771 | + # pthread_create will actually create a thread. | ||
13772 | + case "$host_os" in | ||
13773 | + solaris* | hpux*) | ||
13774 | + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, | ||
13775 | + [Define if the pthread_in_use() detection is hard.]) | ||
13776 | + esac | ||
13777 | + ]) | ||
13778 | + else | ||
13779 | + # Some library is needed. Try libpthread and libc_r. | ||
13780 | + AC_CHECK_LIB(pthread, pthread_kill, | ||
13781 | + [gl_have_pthread=yes | ||
13782 | + LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread | ||
13783 | + LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) | ||
13784 | + if test -z "$gl_have_pthread"; then | ||
13785 | + # For FreeBSD 4. | ||
13786 | + AC_CHECK_LIB(c_r, pthread_kill, | ||
13787 | + [gl_have_pthread=yes | ||
13788 | + LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r | ||
13789 | + LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) | ||
13790 | + fi | ||
13791 | + fi | ||
13792 | + if test -n "$gl_have_pthread"; then | ||
13793 | + gl_threads_api=posix | ||
13794 | + AC_DEFINE([USE_POSIX_THREADS], 1, | ||
13795 | + [Define if the POSIX multithreading library can be used.]) | ||
13796 | + if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then | ||
13797 | + if test $gl_have_weak = yes; then | ||
13798 | + AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, | ||
13799 | + [Define if references to the POSIX multithreading library should be made weak.]) | ||
13800 | + LIBTHREAD= | ||
13801 | + LTLIBTHREAD= | ||
13802 | + fi | ||
13803 | + fi | ||
13804 | + # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the | ||
13805 | + # pthread_rwlock_* functions. | ||
13806 | + AC_CHECK_TYPE([pthread_rwlock_t], | ||
13807 | + [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, | ||
13808 | + [Define if the POSIX multithreading library has read/write locks.])], | ||
13809 | + [], | ||
13810 | + [#include <pthread.h>]) | ||
13811 | + # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. | ||
13812 | + AC_TRY_COMPILE([#include <pthread.h>], | ||
13813 | + [#if __FreeBSD__ == 4 | ||
13814 | +error "No, in FreeBSD 4.0 recursive mutexes actually don't work." | ||
13815 | +#else | ||
13816 | +int x = (int)PTHREAD_MUTEX_RECURSIVE; | ||
13817 | +return !x; | ||
13818 | +#endif], | ||
13819 | + [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, | ||
13820 | + [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])]) | ||
13821 | + fi | ||
13822 | + fi | ||
13823 | + fi | ||
13824 | + if test -z "$gl_have_pthread"; then | ||
13825 | + if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then | ||
13826 | + gl_have_solaristhread= | ||
13827 | + gl_save_LIBS="$LIBS" | ||
13828 | + LIBS="$LIBS -lthread" | ||
13829 | + AC_TRY_LINK([#include <thread.h> | ||
13830 | +#include <synch.h>], | ||
13831 | + [thr_self();], | ||
13832 | + [gl_have_solaristhread=yes]) | ||
13833 | + LIBS="$gl_save_LIBS" | ||
13834 | + if test -n "$gl_have_solaristhread"; then | ||
13835 | + gl_threads_api=solaris | ||
13836 | + LIBTHREAD=-lthread | ||
13837 | + LTLIBTHREAD=-lthread | ||
13838 | + LIBMULTITHREAD="$LIBTHREAD" | ||
13839 | + LTLIBMULTITHREAD="$LTLIBTHREAD" | ||
13840 | + AC_DEFINE([USE_SOLARIS_THREADS], 1, | ||
13841 | + [Define if the old Solaris multithreading library can be used.]) | ||
13842 | + if test $gl_have_weak = yes; then | ||
13843 | + AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, | ||
13844 | + [Define if references to the old Solaris multithreading library should be made weak.]) | ||
13845 | + LIBTHREAD= | ||
13846 | + LTLIBTHREAD= | ||
13847 | + fi | ||
13848 | + fi | ||
13849 | + fi | ||
13850 | + fi | ||
13851 | + if test "$gl_use_threads" = pth; then | ||
13852 | + gl_save_CPPFLAGS="$CPPFLAGS" | ||
13853 | + AC_LIB_LINKFLAGS(pth) | ||
13854 | + gl_have_pth= | ||
13855 | + gl_save_LIBS="$LIBS" | ||
13856 | + LIBS="$LIBS -lpth" | ||
13857 | + AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes) | ||
13858 | + LIBS="$gl_save_LIBS" | ||
13859 | + if test -n "$gl_have_pth"; then | ||
13860 | + gl_threads_api=pth | ||
13861 | + LIBTHREAD="$LIBPTH" | ||
13862 | + LTLIBTHREAD="$LTLIBPTH" | ||
13863 | + LIBMULTITHREAD="$LIBTHREAD" | ||
13864 | + LTLIBMULTITHREAD="$LTLIBTHREAD" | ||
13865 | + AC_DEFINE([USE_PTH_THREADS], 1, | ||
13866 | + [Define if the GNU Pth multithreading library can be used.]) | ||
13867 | + if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then | ||
13868 | + if test $gl_have_weak = yes; then | ||
13869 | + AC_DEFINE([USE_PTH_THREADS_WEAK], 1, | ||
13870 | + [Define if references to the GNU Pth multithreading library should be made weak.]) | ||
13871 | + LIBTHREAD= | ||
13872 | + LTLIBTHREAD= | ||
13873 | + fi | ||
13874 | + fi | ||
13875 | + else | ||
13876 | + CPPFLAGS="$gl_save_CPPFLAGS" | ||
13877 | + fi | ||
13878 | + fi | ||
13879 | + if test -z "$gl_have_pthread"; then | ||
13880 | + if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then | ||
13881 | + if { case "$host_os" in | ||
13882 | + mingw*) true;; | ||
13883 | + *) false;; | ||
13884 | + esac | ||
13885 | + }; then | ||
13886 | + gl_threads_api=win32 | ||
13887 | + AC_DEFINE([USE_WIN32_THREADS], 1, | ||
13888 | + [Define if the Win32 multithreading API can be used.]) | ||
13889 | + fi | ||
13890 | + fi | ||
13891 | + fi | ||
13892 | + fi | ||
13893 | + AC_MSG_CHECKING([for multithread API to use]) | ||
13894 | + AC_MSG_RESULT([$gl_threads_api]) | ||
13895 | + AC_SUBST(LIBTHREAD) | ||
13896 | + AC_SUBST(LTLIBTHREAD) | ||
13897 | + AC_SUBST(LIBMULTITHREAD) | ||
13898 | + AC_SUBST(LTLIBMULTITHREAD) | ||
13899 | +]) | ||
13900 | + | ||
13901 | +AC_DEFUN([gl_LOCK], | ||
13902 | +[ | ||
13903 | + AC_REQUIRE([gl_LOCK_EARLY]) | ||
13904 | + AC_REQUIRE([gl_LOCK_BODY]) | ||
13905 | + gl_PREREQ_LOCK | ||
13906 | +]) | ||
13907 | + | ||
13908 | +# Prerequisites of lib/lock.c. | ||
13909 | +AC_DEFUN([gl_PREREQ_LOCK], [ | ||
13910 | + AC_REQUIRE([AC_C_INLINE]) | ||
13911 | +]) | ||
13912 | + | ||
13913 | +dnl Survey of platforms: | ||
13914 | +dnl | ||
13915 | +dnl Platform Available Compiler Supports test-lock | ||
13916 | +dnl flavours option weak result | ||
13917 | +dnl --------------- --------- --------- -------- --------- | ||
13918 | +dnl Linux 2.4/glibc posix -lpthread Y OK | ||
13919 | +dnl | ||
13920 | +dnl GNU Hurd/glibc posix | ||
13921 | +dnl | ||
13922 | +dnl FreeBSD 5.3 posix -lc_r Y | ||
13923 | +dnl posix -lkse ? Y | ||
13924 | +dnl posix -lpthread ? Y | ||
13925 | +dnl posix -lthr Y | ||
13926 | +dnl | ||
13927 | +dnl FreeBSD 5.2 posix -lc_r Y | ||
13928 | +dnl posix -lkse Y | ||
13929 | +dnl posix -lthr Y | ||
13930 | +dnl | ||
13931 | +dnl FreeBSD 4.0,4.10 posix -lc_r Y OK | ||
13932 | +dnl | ||
13933 | +dnl NetBSD 1.6 -- | ||
13934 | +dnl | ||
13935 | +dnl OpenBSD 3.4 posix -lpthread Y OK | ||
13936 | +dnl | ||
13937 | +dnl MacOS X 10.[123] posix -lpthread Y OK | ||
13938 | +dnl | ||
13939 | +dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK | ||
13940 | +dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK | ||
13941 | +dnl | ||
13942 | +dnl HP-UX 11 posix -lpthread N (cc) OK | ||
13943 | +dnl Y (gcc) | ||
13944 | +dnl | ||
13945 | +dnl IRIX 6.5 posix -lpthread Y 0.5 | ||
13946 | +dnl | ||
13947 | +dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK | ||
13948 | +dnl | ||
13949 | +dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK | ||
13950 | +dnl -lpthread (gcc) Y | ||
13951 | +dnl | ||
13952 | +dnl Cygwin posix -lpthread Y OK | ||
13953 | +dnl | ||
13954 | +dnl Any of the above pth -lpth 0.0 | ||
13955 | +dnl | ||
13956 | +dnl Mingw win32 N OK | ||
13957 | +dnl | ||
13958 | +dnl BeOS 5 -- | ||
13959 | +dnl | ||
13960 | +dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is | ||
13961 | +dnl turned off: | ||
13962 | +dnl OK if all three tests terminate OK, | ||
13963 | +dnl 0.5 if the first test terminates OK but the second one loops endlessly, | ||
13964 | +dnl 0.0 if the first test already loops endlessly. | ||
13965 | diff --git a/m4/longlong.m4 b/m4/longlong.m4 | ||
13966 | new file mode 100644 | ||
13967 | index 0000000..a72e53b | ||
13968 | --- /dev/null | ||
13969 | +++ b/m4/longlong.m4 | ||
13970 | @@ -0,0 +1,109 @@ | ||
13971 | +# longlong.m4 serial 13 | ||
13972 | +dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. | ||
13973 | +dnl This file is free software; the Free Software Foundation | ||
13974 | +dnl gives unlimited permission to copy and/or distribute it, | ||
13975 | +dnl with or without modifications, as long as this notice is preserved. | ||
13976 | + | ||
13977 | +dnl From Paul Eggert. | ||
13978 | + | ||
13979 | +# Define HAVE_LONG_LONG_INT if 'long long int' works. | ||
13980 | +# This fixes a bug in Autoconf 2.61, but can be removed once we | ||
13981 | +# assume 2.62 everywhere. | ||
13982 | + | ||
13983 | +# Note: If the type 'long long int' exists but is only 32 bits large | ||
13984 | +# (as on some very old compilers), HAVE_LONG_LONG_INT will not be | ||
13985 | +# defined. In this case you can treat 'long long int' like 'long int'. | ||
13986 | + | ||
13987 | +AC_DEFUN([AC_TYPE_LONG_LONG_INT], | ||
13988 | +[ | ||
13989 | + AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], | ||
13990 | + [AC_LINK_IFELSE( | ||
13991 | + [_AC_TYPE_LONG_LONG_SNIPPET], | ||
13992 | + [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. | ||
13993 | + dnl If cross compiling, assume the bug isn't important, since | ||
13994 | + dnl nobody cross compiles for this platform as far as we know. | ||
13995 | + AC_RUN_IFELSE( | ||
13996 | + [AC_LANG_PROGRAM( | ||
13997 | + [[@%:@include <limits.h> | ||
13998 | + @%:@ifndef LLONG_MAX | ||
13999 | + @%:@ define HALF \ | ||
14000 | + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) | ||
14001 | + @%:@ define LLONG_MAX (HALF - 1 + HALF) | ||
14002 | + @%:@endif]], | ||
14003 | + [[long long int n = 1; | ||
14004 | + int i; | ||
14005 | + for (i = 0; ; i++) | ||
14006 | + { | ||
14007 | + long long int m = n << i; | ||
14008 | + if (m >> i != n) | ||
14009 | + return 1; | ||
14010 | + if (LLONG_MAX / 2 < m) | ||
14011 | + break; | ||
14012 | + } | ||
14013 | + return 0;]])], | ||
14014 | + [ac_cv_type_long_long_int=yes], | ||
14015 | + [ac_cv_type_long_long_int=no], | ||
14016 | + [ac_cv_type_long_long_int=yes])], | ||
14017 | + [ac_cv_type_long_long_int=no])]) | ||
14018 | + if test $ac_cv_type_long_long_int = yes; then | ||
14019 | + AC_DEFINE([HAVE_LONG_LONG_INT], 1, | ||
14020 | + [Define to 1 if the system has the type `long long int'.]) | ||
14021 | + fi | ||
14022 | +]) | ||
14023 | + | ||
14024 | +# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. | ||
14025 | +# This fixes a bug in Autoconf 2.61, but can be removed once we | ||
14026 | +# assume 2.62 everywhere. | ||
14027 | + | ||
14028 | +# Note: If the type 'unsigned long long int' exists but is only 32 bits | ||
14029 | +# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT | ||
14030 | +# will not be defined. In this case you can treat 'unsigned long long int' | ||
14031 | +# like 'unsigned long int'. | ||
14032 | + | ||
14033 | +AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], | ||
14034 | +[ | ||
14035 | + AC_CACHE_CHECK([for unsigned long long int], | ||
14036 | + [ac_cv_type_unsigned_long_long_int], | ||
14037 | + [AC_LINK_IFELSE( | ||
14038 | + [_AC_TYPE_LONG_LONG_SNIPPET], | ||
14039 | + [ac_cv_type_unsigned_long_long_int=yes], | ||
14040 | + [ac_cv_type_unsigned_long_long_int=no])]) | ||
14041 | + if test $ac_cv_type_unsigned_long_long_int = yes; then | ||
14042 | + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, | ||
14043 | + [Define to 1 if the system has the type `unsigned long long int'.]) | ||
14044 | + fi | ||
14045 | +]) | ||
14046 | + | ||
14047 | +# Expands to a C program that can be used to test for simultaneous support | ||
14048 | +# of 'long long' and 'unsigned long long'. We don't want to say that | ||
14049 | +# 'long long' is available if 'unsigned long long' is not, or vice versa, | ||
14050 | +# because too many programs rely on the symmetry between signed and unsigned | ||
14051 | +# integer types (excluding 'bool'). | ||
14052 | +AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], | ||
14053 | +[ | ||
14054 | + AC_LANG_PROGRAM( | ||
14055 | + [[/* Test preprocessor. */ | ||
14056 | + #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) | ||
14057 | + error in preprocessor; | ||
14058 | + #endif | ||
14059 | + #if ! (18446744073709551615ULL <= -1ull) | ||
14060 | + error in preprocessor; | ||
14061 | + #endif | ||
14062 | + /* Test literals. */ | ||
14063 | + long long int ll = 9223372036854775807ll; | ||
14064 | + long long int nll = -9223372036854775807LL; | ||
14065 | + unsigned long long int ull = 18446744073709551615ULL; | ||
14066 | + /* Test constant expressions. */ | ||
14067 | + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) | ||
14068 | + ? 1 : -1)]; | ||
14069 | + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 | ||
14070 | + ? 1 : -1)]; | ||
14071 | + int i = 63;]], | ||
14072 | + [[/* Test availability of runtime routines for shift and division. */ | ||
14073 | + long long int llmax = 9223372036854775807ll; | ||
14074 | + unsigned long long int ullmax = 18446744073709551615ull; | ||
14075 | + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) | ||
14076 | + | (llmax / ll) | (llmax % ll) | ||
14077 | + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) | ||
14078 | + | (ullmax / ull) | (ullmax % ull));]]) | ||
14079 | +]) | ||
14080 | diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 | ||
14081 | index 5d9acd8..17cfd51 100644 | ||
14082 | --- a/m4/ltoptions.m4 | ||
14083 | +++ b/m4/ltoptions.m4 | ||
14084 | @@ -326,24 +326,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) | ||
14085 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. | ||
14086 | m4_define([_LT_WITH_PIC], | ||
14087 | [AC_ARG_WITH([pic], | ||
14088 | - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], | ||
14089 | + [AS_HELP_STRING([--with-pic], | ||
14090 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], | ||
14091 | - [lt_p=${PACKAGE-default} | ||
14092 | - case $withval in | ||
14093 | - yes|no) pic_mode=$withval ;; | ||
14094 | - *) | ||
14095 | - pic_mode=default | ||
14096 | - # Look at the argument we got. We use all the common list separators. | ||
14097 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
14098 | - for lt_pkg in $withval; do | ||
14099 | - IFS="$lt_save_ifs" | ||
14100 | - if test "X$lt_pkg" = "X$lt_p"; then | ||
14101 | - pic_mode=yes | ||
14102 | - fi | ||
14103 | - done | ||
14104 | - IFS="$lt_save_ifs" | ||
14105 | - ;; | ||
14106 | - esac], | ||
14107 | + [pic_mode="$withval"], | ||
14108 | [pic_mode=default]) | ||
14109 | |||
14110 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | ||
14111 | diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 | ||
14112 | index 07a8602..9c7b5d4 100644 | ||
14113 | --- a/m4/ltversion.m4 | ||
14114 | +++ b/m4/ltversion.m4 | ||
14115 | @@ -9,15 +9,15 @@ | ||
14116 | |||
14117 | # @configure_input@ | ||
14118 | |||
14119 | -# serial 3337 ltversion.m4 | ||
14120 | +# serial 3293 ltversion.m4 | ||
14121 | # This file is part of GNU Libtool | ||
14122 | |||
14123 | -m4_define([LT_PACKAGE_VERSION], [2.4.2]) | ||
14124 | -m4_define([LT_PACKAGE_REVISION], [1.3337]) | ||
14125 | +m4_define([LT_PACKAGE_VERSION], [2.4]) | ||
14126 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) | ||
14127 | |||
14128 | AC_DEFUN([LTVERSION_VERSION], | ||
14129 | -[macro_version='2.4.2' | ||
14130 | -macro_revision='1.3337' | ||
14131 | +[macro_version='2.4' | ||
14132 | +macro_revision='1.3293' | ||
14133 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | ||
14134 | _LT_DECL(, macro_revision, 0) | ||
14135 | ]) | ||
14136 | diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 | ||
14137 | new file mode 100644 | ||
14138 | index 0000000..14ba612 | ||
14139 | --- /dev/null | ||
14140 | +++ b/m4/printf-posix.m4 | ||
14141 | @@ -0,0 +1,44 @@ | ||
14142 | +# printf-posix.m4 serial 3 (gettext-0.17) | ||
14143 | +dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. | ||
14144 | +dnl This file is free software; the Free Software Foundation | ||
14145 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14146 | +dnl with or without modifications, as long as this notice is preserved. | ||
14147 | + | ||
14148 | +dnl From Bruno Haible. | ||
14149 | +dnl Test whether the printf() function supports POSIX/XSI format strings with | ||
14150 | +dnl positions. | ||
14151 | + | ||
14152 | +AC_DEFUN([gt_PRINTF_POSIX], | ||
14153 | +[ | ||
14154 | + AC_REQUIRE([AC_PROG_CC]) | ||
14155 | + AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], | ||
14156 | + gt_cv_func_printf_posix, | ||
14157 | + [ | ||
14158 | + AC_TRY_RUN([ | ||
14159 | +#include <stdio.h> | ||
14160 | +#include <string.h> | ||
14161 | +/* The string "%2$d %1$d", with dollar characters protected from the shell's | ||
14162 | + dollar expansion (possibly an autoconf bug). */ | ||
14163 | +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; | ||
14164 | +static char buf[100]; | ||
14165 | +int main () | ||
14166 | +{ | ||
14167 | + sprintf (buf, format, 33, 55); | ||
14168 | + return (strcmp (buf, "55 33") != 0); | ||
14169 | +}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, | ||
14170 | + [ | ||
14171 | + AC_EGREP_CPP(notposix, [ | ||
14172 | +#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ | ||
14173 | + notposix | ||
14174 | +#endif | ||
14175 | + ], gt_cv_func_printf_posix="guessing no", | ||
14176 | + gt_cv_func_printf_posix="guessing yes") | ||
14177 | + ]) | ||
14178 | + ]) | ||
14179 | + case $gt_cv_func_printf_posix in | ||
14180 | + *yes) | ||
14181 | + AC_DEFINE(HAVE_POSIX_PRINTF, 1, | ||
14182 | + [Define if your printf() function supports format strings with positions.]) | ||
14183 | + ;; | ||
14184 | + esac | ||
14185 | +]) | ||
14186 | diff --git a/m4/size_max.m4 b/m4/size_max.m4 | ||
14187 | new file mode 100644 | ||
14188 | index 0000000..6cb4868 | ||
14189 | --- /dev/null | ||
14190 | +++ b/m4/size_max.m4 | ||
14191 | @@ -0,0 +1,68 @@ | ||
14192 | +# size_max.m4 serial 6 | ||
14193 | +dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. | ||
14194 | +dnl This file is free software; the Free Software Foundation | ||
14195 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14196 | +dnl with or without modifications, as long as this notice is preserved. | ||
14197 | + | ||
14198 | +dnl From Bruno Haible. | ||
14199 | + | ||
14200 | +AC_DEFUN([gl_SIZE_MAX], | ||
14201 | +[ | ||
14202 | + AC_CHECK_HEADERS(stdint.h) | ||
14203 | + dnl First test whether the system already has SIZE_MAX. | ||
14204 | + AC_MSG_CHECKING([for SIZE_MAX]) | ||
14205 | + AC_CACHE_VAL([gl_cv_size_max], [ | ||
14206 | + gl_cv_size_max= | ||
14207 | + AC_EGREP_CPP([Found it], [ | ||
14208 | +#include <limits.h> | ||
14209 | +#if HAVE_STDINT_H | ||
14210 | +#include <stdint.h> | ||
14211 | +#endif | ||
14212 | +#ifdef SIZE_MAX | ||
14213 | +Found it | ||
14214 | +#endif | ||
14215 | +], gl_cv_size_max=yes) | ||
14216 | + if test -z "$gl_cv_size_max"; then | ||
14217 | + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider | ||
14218 | + dnl than the type 'unsigned long'. Try hard to find a definition that can | ||
14219 | + dnl be used in a preprocessor #if, i.e. doesn't contain a cast. | ||
14220 | + AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], | ||
14221 | + [#include <stddef.h> | ||
14222 | +#include <limits.h>], size_t_bits_minus_1=) | ||
14223 | + AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], | ||
14224 | + [#include <stddef.h>], fits_in_uint=) | ||
14225 | + if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then | ||
14226 | + if test $fits_in_uint = 1; then | ||
14227 | + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type | ||
14228 | + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. | ||
14229 | + AC_TRY_COMPILE([#include <stddef.h> | ||
14230 | + extern size_t foo; | ||
14231 | + extern unsigned long foo; | ||
14232 | + ], [], fits_in_uint=0) | ||
14233 | + fi | ||
14234 | + dnl We cannot use 'expr' to simplify this expression, because 'expr' | ||
14235 | + dnl works only with 'long' integers in the host environment, while we | ||
14236 | + dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. | ||
14237 | + if test $fits_in_uint = 1; then | ||
14238 | + gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" | ||
14239 | + else | ||
14240 | + gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" | ||
14241 | + fi | ||
14242 | + else | ||
14243 | + dnl Shouldn't happen, but who knows... | ||
14244 | + gl_cv_size_max='((size_t)~(size_t)0)' | ||
14245 | + fi | ||
14246 | + fi | ||
14247 | + ]) | ||
14248 | + AC_MSG_RESULT([$gl_cv_size_max]) | ||
14249 | + if test "$gl_cv_size_max" != yes; then | ||
14250 | + AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], | ||
14251 | + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) | ||
14252 | + fi | ||
14253 | +]) | ||
14254 | + | ||
14255 | +dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. | ||
14256 | +dnl Remove this when we can assume autoconf >= 2.61. | ||
14257 | +m4_ifdef([AC_COMPUTE_INT], [], [ | ||
14258 | + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) | ||
14259 | +]) | ||
14260 | diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 | ||
14261 | new file mode 100644 | ||
14262 | index 0000000..db9a8ac | ||
14263 | --- /dev/null | ||
14264 | +++ b/m4/stdint_h.m4 | ||
14265 | @@ -0,0 +1,26 @@ | ||
14266 | +# stdint_h.m4 serial 6 | ||
14267 | +dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. | ||
14268 | +dnl This file is free software; the Free Software Foundation | ||
14269 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14270 | +dnl with or without modifications, as long as this notice is preserved. | ||
14271 | + | ||
14272 | +dnl From Paul Eggert. | ||
14273 | + | ||
14274 | +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, | ||
14275 | +# doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
14276 | + | ||
14277 | +AC_DEFUN([gl_AC_HEADER_STDINT_H], | ||
14278 | +[ | ||
14279 | + AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, | ||
14280 | + [AC_TRY_COMPILE( | ||
14281 | + [#include <sys/types.h> | ||
14282 | +#include <stdint.h>], | ||
14283 | + [uintmax_t i = (uintmax_t) -1; return !i;], | ||
14284 | + gl_cv_header_stdint_h=yes, | ||
14285 | + gl_cv_header_stdint_h=no)]) | ||
14286 | + if test $gl_cv_header_stdint_h = yes; then | ||
14287 | + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, | ||
14288 | + [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, | ||
14289 | + and declares uintmax_t. ]) | ||
14290 | + fi | ||
14291 | +]) | ||
14292 | diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 | ||
14293 | new file mode 100644 | ||
14294 | index 0000000..641c489 | ||
14295 | --- /dev/null | ||
14296 | +++ b/m4/uintmax_t.m4 | ||
14297 | @@ -0,0 +1,30 @@ | ||
14298 | +# uintmax_t.m4 serial 10 | ||
14299 | +dnl Copyright (C) 1997-2004, 2007 Free Software Foundation, Inc. | ||
14300 | +dnl This file is free software; the Free Software Foundation | ||
14301 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14302 | +dnl with or without modifications, as long as this notice is preserved. | ||
14303 | + | ||
14304 | +dnl From Paul Eggert. | ||
14305 | + | ||
14306 | +AC_PREREQ(2.13) | ||
14307 | + | ||
14308 | +# Define uintmax_t to 'unsigned long' or 'unsigned long long' | ||
14309 | +# if it is not already defined in <stdint.h> or <inttypes.h>. | ||
14310 | + | ||
14311 | +AC_DEFUN([gl_AC_TYPE_UINTMAX_T], | ||
14312 | +[ | ||
14313 | + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
14314 | + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
14315 | + if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then | ||
14316 | + AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) | ||
14317 | + test $ac_cv_type_unsigned_long_long_int = yes \ | ||
14318 | + && ac_type='unsigned long long' \ | ||
14319 | + || ac_type='unsigned long' | ||
14320 | + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, | ||
14321 | + [Define to unsigned long or unsigned long long | ||
14322 | + if <stdint.h> and <inttypes.h> don't define.]) | ||
14323 | + else | ||
14324 | + AC_DEFINE(HAVE_UINTMAX_T, 1, | ||
14325 | + [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) | ||
14326 | + fi | ||
14327 | +]) | ||
14328 | diff --git a/m4/visibility.m4 b/m4/visibility.m4 | ||
14329 | new file mode 100644 | ||
14330 | index 0000000..2ff6330 | ||
14331 | --- /dev/null | ||
14332 | +++ b/m4/visibility.m4 | ||
14333 | @@ -0,0 +1,52 @@ | ||
14334 | +# visibility.m4 serial 1 (gettext-0.15) | ||
14335 | +dnl Copyright (C) 2005 Free Software Foundation, Inc. | ||
14336 | +dnl This file is free software; the Free Software Foundation | ||
14337 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14338 | +dnl with or without modifications, as long as this notice is preserved. | ||
14339 | + | ||
14340 | +dnl From Bruno Haible. | ||
14341 | + | ||
14342 | +dnl Tests whether the compiler supports the command-line option | ||
14343 | +dnl -fvisibility=hidden and the function and variable attributes | ||
14344 | +dnl __attribute__((__visibility__("hidden"))) and | ||
14345 | +dnl __attribute__((__visibility__("default"))). | ||
14346 | +dnl Does *not* test for __visibility__("protected") - which has tricky | ||
14347 | +dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on | ||
14348 | +dnl MacOS X. | ||
14349 | +dnl Does *not* test for __visibility__("internal") - which has processor | ||
14350 | +dnl dependent semantics. | ||
14351 | +dnl Does *not* test for #pragma GCC visibility push(hidden) - which is | ||
14352 | +dnl "really only recommended for legacy code". | ||
14353 | +dnl Set the variable CFLAG_VISIBILITY. | ||
14354 | +dnl Defines and sets the variable HAVE_VISIBILITY. | ||
14355 | + | ||
14356 | +AC_DEFUN([gl_VISIBILITY], | ||
14357 | +[ | ||
14358 | + AC_REQUIRE([AC_PROG_CC]) | ||
14359 | + CFLAG_VISIBILITY= | ||
14360 | + HAVE_VISIBILITY=0 | ||
14361 | + if test -n "$GCC"; then | ||
14362 | + AC_MSG_CHECKING([for simple visibility declarations]) | ||
14363 | + AC_CACHE_VAL(gl_cv_cc_visibility, [ | ||
14364 | + gl_save_CFLAGS="$CFLAGS" | ||
14365 | + CFLAGS="$CFLAGS -fvisibility=hidden" | ||
14366 | + AC_TRY_COMPILE( | ||
14367 | + [extern __attribute__((__visibility__("hidden"))) int hiddenvar; | ||
14368 | + extern __attribute__((__visibility__("default"))) int exportedvar; | ||
14369 | + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); | ||
14370 | + extern __attribute__((__visibility__("default"))) int exportedfunc (void);], | ||
14371 | + [], | ||
14372 | + gl_cv_cc_visibility=yes, | ||
14373 | + gl_cv_cc_visibility=no) | ||
14374 | + CFLAGS="$gl_save_CFLAGS"]) | ||
14375 | + AC_MSG_RESULT([$gl_cv_cc_visibility]) | ||
14376 | + if test $gl_cv_cc_visibility = yes; then | ||
14377 | + CFLAG_VISIBILITY="-fvisibility=hidden" | ||
14378 | + HAVE_VISIBILITY=1 | ||
14379 | + fi | ||
14380 | + fi | ||
14381 | + AC_SUBST([CFLAG_VISIBILITY]) | ||
14382 | + AC_SUBST([HAVE_VISIBILITY]) | ||
14383 | + AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], | ||
14384 | + [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) | ||
14385 | +]) | ||
14386 | diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 | ||
14387 | new file mode 100644 | ||
14388 | index 0000000..cde2129 | ||
14389 | --- /dev/null | ||
14390 | +++ b/m4/wchar_t.m4 | ||
14391 | @@ -0,0 +1,20 @@ | ||
14392 | +# wchar_t.m4 serial 1 (gettext-0.12) | ||
14393 | +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
14394 | +dnl This file is free software; the Free Software Foundation | ||
14395 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14396 | +dnl with or without modifications, as long as this notice is preserved. | ||
14397 | + | ||
14398 | +dnl From Bruno Haible. | ||
14399 | +dnl Test whether <stddef.h> has the 'wchar_t' type. | ||
14400 | +dnl Prerequisite: AC_PROG_CC | ||
14401 | + | ||
14402 | +AC_DEFUN([gt_TYPE_WCHAR_T], | ||
14403 | +[ | ||
14404 | + AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, | ||
14405 | + [AC_TRY_COMPILE([#include <stddef.h> | ||
14406 | + wchar_t foo = (wchar_t)'\0';], , | ||
14407 | + gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) | ||
14408 | + if test $gt_cv_c_wchar_t = yes; then | ||
14409 | + AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) | ||
14410 | + fi | ||
14411 | +]) | ||
14412 | diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 | ||
14413 | new file mode 100644 | ||
14414 | index 0000000..af5ed93 | ||
14415 | --- /dev/null | ||
14416 | +++ b/m4/wint_t.m4 | ||
14417 | @@ -0,0 +1,28 @@ | ||
14418 | +# wint_t.m4 serial 2 (gettext-0.17) | ||
14419 | +dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. | ||
14420 | +dnl This file is free software; the Free Software Foundation | ||
14421 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14422 | +dnl with or without modifications, as long as this notice is preserved. | ||
14423 | + | ||
14424 | +dnl From Bruno Haible. | ||
14425 | +dnl Test whether <wchar.h> has the 'wint_t' type. | ||
14426 | +dnl Prerequisite: AC_PROG_CC | ||
14427 | + | ||
14428 | +AC_DEFUN([gt_TYPE_WINT_T], | ||
14429 | +[ | ||
14430 | + AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, | ||
14431 | + [AC_TRY_COMPILE([ | ||
14432 | +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before | ||
14433 | + <wchar.h>. | ||
14434 | + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included | ||
14435 | + before <wchar.h>. */ | ||
14436 | +#include <stddef.h> | ||
14437 | +#include <stdio.h> | ||
14438 | +#include <time.h> | ||
14439 | +#include <wchar.h> | ||
14440 | + wint_t foo = (wchar_t)'\0';], , | ||
14441 | + gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) | ||
14442 | + if test $gt_cv_c_wint_t = yes; then | ||
14443 | + AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) | ||
14444 | + fi | ||
14445 | +]) | ||
14446 | diff --git a/m4/xsize.m4 b/m4/xsize.m4 | ||
14447 | new file mode 100644 | ||
14448 | index 0000000..85bb721 | ||
14449 | --- /dev/null | ||
14450 | +++ b/m4/xsize.m4 | ||
14451 | @@ -0,0 +1,13 @@ | ||
14452 | +# xsize.m4 serial 3 | ||
14453 | +dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. | ||
14454 | +dnl This file is free software; the Free Software Foundation | ||
14455 | +dnl gives unlimited permission to copy and/or distribute it, | ||
14456 | +dnl with or without modifications, as long as this notice is preserved. | ||
14457 | + | ||
14458 | +AC_DEFUN([gl_XSIZE], | ||
14459 | +[ | ||
14460 | + dnl Prerequisites of lib/xsize.h. | ||
14461 | + AC_REQUIRE([gl_SIZE_MAX]) | ||
14462 | + AC_REQUIRE([AC_C_INLINE]) | ||
14463 | + AC_CHECK_HEADERS(stdint.h) | ||
14464 | +]) | ||
14465 | diff --git a/missing b/missing | ||
14466 | index 86a8fc3..28055d2 100755 | ||
14467 | --- a/missing | ||
14468 | +++ b/missing | ||
14469 | @@ -1,10 +1,10 @@ | ||
14470 | #! /bin/sh | ||
14471 | # Common stub for a few missing GNU programs while installing. | ||
14472 | |||
14473 | -scriptversion=2012-01-06.13; # UTC | ||
14474 | +scriptversion=2009-04-28.21; # UTC | ||
14475 | |||
14476 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, | ||
14477 | -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. | ||
14478 | +# 2008, 2009 Free Software Foundation, Inc. | ||
14479 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | ||
14480 | |||
14481 | # This program is free software; you can redistribute it and/or modify | ||
14482 | @@ -84,6 +84,7 @@ Supported PROGRAM values: | ||
14483 | help2man touch the output file | ||
14484 | lex create \`lex.yy.c', if possible, from existing .c | ||
14485 | makeinfo touch the output file | ||
14486 | + tar try tar, gnutar, gtar, then tar without non-portable flags | ||
14487 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] | ||
14488 | |||
14489 | Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and | ||
14490 | @@ -121,6 +122,15 @@ case $1 in | ||
14491 | # Not GNU programs, they don't have --version. | ||
14492 | ;; | ||
14493 | |||
14494 | + tar*) | ||
14495 | + if test -n "$run"; then | ||
14496 | + echo 1>&2 "ERROR: \`tar' requires --run" | ||
14497 | + exit 1 | ||
14498 | + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then | ||
14499 | + exit 1 | ||
14500 | + fi | ||
14501 | + ;; | ||
14502 | + | ||
14503 | *) | ||
14504 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
14505 | # We have it, but it failed. | ||
14506 | @@ -216,7 +226,7 @@ WARNING: \`$1' $msg. You should only need it if | ||
14507 | \`Bison' from any GNU archive site." | ||
14508 | rm -f y.tab.c y.tab.h | ||
14509 | if test $# -ne 1; then | ||
14510 | - eval LASTARG=\${$#} | ||
14511 | + eval LASTARG="\${$#}" | ||
14512 | case $LASTARG in | ||
14513 | *.y) | ||
14514 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` | ||
14515 | @@ -246,7 +256,7 @@ WARNING: \`$1' is $msg. You should only need it if | ||
14516 | \`Flex' from any GNU archive site." | ||
14517 | rm -f lex.yy.c | ||
14518 | if test $# -ne 1; then | ||
14519 | - eval LASTARG=\${$#} | ||
14520 | + eval LASTARG="\${$#}" | ||
14521 | case $LASTARG in | ||
14522 | *.l) | ||
14523 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` | ||
14524 | @@ -308,6 +318,41 @@ WARNING: \`$1' is $msg. You should only need it if | ||
14525 | touch $file | ||
14526 | ;; | ||
14527 | |||
14528 | + tar*) | ||
14529 | + shift | ||
14530 | + | ||
14531 | + # We have already tried tar in the generic part. | ||
14532 | + # Look for gnutar/gtar before invocation to avoid ugly error | ||
14533 | + # messages. | ||
14534 | + if (gnutar --version > /dev/null 2>&1); then | ||
14535 | + gnutar "$@" && exit 0 | ||
14536 | + fi | ||
14537 | + if (gtar --version > /dev/null 2>&1); then | ||
14538 | + gtar "$@" && exit 0 | ||
14539 | + fi | ||
14540 | + firstarg="$1" | ||
14541 | + if shift; then | ||
14542 | + case $firstarg in | ||
14543 | + *o*) | ||
14544 | + firstarg=`echo "$firstarg" | sed s/o//` | ||
14545 | + tar "$firstarg" "$@" && exit 0 | ||
14546 | + ;; | ||
14547 | + esac | ||
14548 | + case $firstarg in | ||
14549 | + *h*) | ||
14550 | + firstarg=`echo "$firstarg" | sed s/h//` | ||
14551 | + tar "$firstarg" "$@" && exit 0 | ||
14552 | + ;; | ||
14553 | + esac | ||
14554 | + fi | ||
14555 | + | ||
14556 | + echo 1>&2 "\ | ||
14557 | +WARNING: I can't seem to be able to run \`tar' with the given arguments. | ||
14558 | + You may want to install GNU tar or Free paxutils, or check the | ||
14559 | + command line arguments." | ||
14560 | + exit 1 | ||
14561 | + ;; | ||
14562 | + | ||
14563 | *) | ||
14564 | echo 1>&2 "\ | ||
14565 | WARNING: \`$1' is needed, and is $msg. | ||
14566 | diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in | ||
14567 | index 6b97955..33f9c78 100644 | ||
14568 | --- a/pkgconfig/Makefile.in | ||
14569 | +++ b/pkgconfig/Makefile.in | ||
14570 | @@ -1,9 +1,9 @@ | ||
14571 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
14572 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
14573 | # @configure_input@ | ||
14574 | |||
14575 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
14576 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
14577 | -# Foundation, Inc. | ||
14578 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
14579 | +# Inc. | ||
14580 | # This Makefile.in is free software; the Free Software Foundation | ||
14581 | # gives unlimited permission to copy and/or distribute it, | ||
14582 | # with or without modifications, as long as this notice is preserved. | ||
14583 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
14584 | POST_UNINSTALL = : | ||
14585 | build_triplet = @build@ | ||
14586 | host_triplet = @host@ | ||
14587 | +target_triplet = @target@ | ||
14588 | subdir = pkgconfig | ||
14589 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
14590 | $(srcdir)/gstreamer-gl-uninstalled.pc.in \ | ||
14591 | @@ -43,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
14592 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
14593 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
14594 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
14595 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
14596 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
14597 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
14598 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
14599 | @@ -76,11 +76,11 @@ mkinstalldirs = $(install_sh) -d | ||
14600 | CONFIG_HEADER = $(top_builddir)/config.h | ||
14601 | CONFIG_CLEAN_FILES = gstreamer-gl.pc gstreamer-gl-uninstalled.pc | ||
14602 | CONFIG_CLEAN_VPATH_FILES = | ||
14603 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
14604 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
14605 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
14606 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
14607 | am__v_GEN_0 = @echo " GEN " $@; | ||
14608 | -AM_V_at = $(am__v_at_@AM_V@) | ||
14609 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
14610 | +AM_V_at = $(am__v_at_$(V)) | ||
14611 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
14612 | am__v_at_0 = @ | ||
14613 | SOURCES = | ||
14614 | DIST_SOURCES = | ||
14615 | @@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ | ||
14616 | am__base_list = \ | ||
14617 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
14618 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
14619 | -am__uninstall_files_from_dir = { \ | ||
14620 | - test -z "$$files" \ | ||
14621 | - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
14622 | - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
14623 | - $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
14624 | - } | ||
14625 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" | ||
14626 | DATA = $(pkgconfig_DATA) | ||
14627 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
14628 | @@ -160,6 +154,7 @@ ECHO_T = @ECHO_T@ | ||
14629 | EGREP = @EGREP@ | ||
14630 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
14631 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
14632 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
14633 | EXEEXT = @EXEEXT@ | ||
14634 | FFLAGS = @FFLAGS@ | ||
14635 | FGREP = @FGREP@ | ||
14636 | @@ -191,6 +186,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
14637 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
14638 | GST_CURRENT = @GST_CURRENT@ | ||
14639 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
14640 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
14641 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
14642 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
14643 | GST_LIBS = @GST_LIBS@ | ||
14644 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
14645 | @@ -198,8 +195,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
14646 | GST_LICENSE = @GST_LICENSE@ | ||
14647 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
14648 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
14649 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
14650 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
14651 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
14652 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
14653 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
14654 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
14655 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
14656 | @@ -272,7 +271,7 @@ NM = @NM@ | ||
14657 | NMEDIT = @NMEDIT@ | ||
14658 | OBJC = @OBJC@ | ||
14659 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
14660 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
14661 | +OBJCFLAGS = @OBJCFLAGS@ | ||
14662 | OBJDUMP = @OBJDUMP@ | ||
14663 | OBJEXT = @OBJEXT@ | ||
14664 | OPENGL_ES2 = @OPENGL_ES2@ | ||
14665 | @@ -317,6 +316,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
14666 | VERSION = @VERSION@ | ||
14667 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
14668 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
14669 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
14670 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
14671 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
14672 | XGETTEXT = @XGETTEXT@ | ||
14673 | @@ -382,7 +382,11 @@ sbindir = @sbindir@ | ||
14674 | sharedstatedir = @sharedstatedir@ | ||
14675 | srcdir = @srcdir@ | ||
14676 | sysconfdir = @sysconfdir@ | ||
14677 | +target = @target@ | ||
14678 | target_alias = @target_alias@ | ||
14679 | +target_cpu = @target_cpu@ | ||
14680 | +target_os = @target_os@ | ||
14681 | +target_vendor = @target_vendor@ | ||
14682 | top_build_prefix = @top_build_prefix@ | ||
14683 | top_builddir = @top_builddir@ | ||
14684 | top_srcdir = @top_srcdir@ | ||
14685 | @@ -456,7 +460,9 @@ uninstall-pkgconfigDATA: | ||
14686 | @$(NORMAL_UNINSTALL) | ||
14687 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | ||
14688 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
14689 | - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) | ||
14690 | + test -n "$$files" || exit 0; \ | ||
14691 | + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ | ||
14692 | + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files | ||
14693 | tags: TAGS | ||
14694 | TAGS: | ||
14695 | |||
14696 | @@ -511,15 +517,10 @@ install-am: all-am | ||
14697 | |||
14698 | installcheck: installcheck-am | ||
14699 | install-strip: | ||
14700 | - if test -z '$(STRIP)'; then \ | ||
14701 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
14702 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
14703 | - install; \ | ||
14704 | - else \ | ||
14705 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
14706 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
14707 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
14708 | - fi | ||
14709 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
14710 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
14711 | + `test -z '$(STRIP)' || \ | ||
14712 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
14713 | mostlyclean-generic: | ||
14714 | |||
14715 | clean-generic: | ||
14716 | diff --git a/po/Makefile.in.in.orig b/po/Makefile.in.in.orig | ||
14717 | new file mode 100644 | ||
14718 | index 0000000..fecf500 | ||
14719 | --- /dev/null | ||
14720 | +++ b/po/Makefile.in.in.orig | ||
14721 | @@ -0,0 +1,429 @@ | ||
14722 | +# Makefile for PO directory in any package using GNU gettext. | ||
14723 | +# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu> | ||
14724 | +# | ||
14725 | +# This file can be copied and used freely without restrictions. It can | ||
14726 | +# be used in projects which are not available under the GNU General Public | ||
14727 | +# License but which still want to provide support for the GNU gettext | ||
14728 | +# functionality. | ||
14729 | +# Please note that the actual code of GNU gettext is covered by the GNU | ||
14730 | +# General Public License and is *not* in the public domain. | ||
14731 | +# | ||
14732 | +# Origin: gettext-0.17 | ||
14733 | +GETTEXT_MACRO_VERSION = 0.17 | ||
14734 | + | ||
14735 | +PACKAGE = @PACKAGE@ | ||
14736 | +VERSION = @VERSION@ | ||
14737 | +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
14738 | + | ||
14739 | +SHELL = /bin/sh | ||
14740 | +@SET_MAKE@ | ||
14741 | + | ||
14742 | +srcdir = @srcdir@ | ||
14743 | +top_srcdir = @top_srcdir@ | ||
14744 | +VPATH = @srcdir@ | ||
14745 | + | ||
14746 | +prefix = @prefix@ | ||
14747 | +exec_prefix = @exec_prefix@ | ||
14748 | +datarootdir = @datarootdir@ | ||
14749 | +datadir = @datadir@ | ||
14750 | +localedir = @localedir@ | ||
14751 | +gettextsrcdir = $(datadir)/gettext/po | ||
14752 | + | ||
14753 | +INSTALL = @INSTALL@ | ||
14754 | +INSTALL_DATA = @INSTALL_DATA@ | ||
14755 | + | ||
14756 | +# We use $(mkdir_p). | ||
14757 | +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as | ||
14758 | +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, | ||
14759 | +# @install_sh@ does not start with $(SHELL), so we add it. | ||
14760 | +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined | ||
14761 | +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake | ||
14762 | +# versions, $(mkinstalldirs) and $(install_sh) are unused. | ||
14763 | +mkinstalldirs = $(SHELL) @install_sh@ -d | ||
14764 | +install_sh = $(SHELL) @install_sh@ | ||
14765 | +MKDIR_P = @MKDIR_P@ | ||
14766 | +mkdir_p = @mkdir_p@ | ||
14767 | + | ||
14768 | +GMSGFMT_ = @GMSGFMT@ | ||
14769 | +GMSGFMT_no = @GMSGFMT@ | ||
14770 | +GMSGFMT_yes = @GMSGFMT_015@ | ||
14771 | +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) | ||
14772 | +MSGFMT_ = @MSGFMT@ | ||
14773 | +MSGFMT_no = @MSGFMT@ | ||
14774 | +MSGFMT_yes = @MSGFMT_015@ | ||
14775 | +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) | ||
14776 | +XGETTEXT_ = @XGETTEXT@ | ||
14777 | +XGETTEXT_no = @XGETTEXT@ | ||
14778 | +XGETTEXT_yes = @XGETTEXT_015@ | ||
14779 | +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) | ||
14780 | +MSGMERGE = msgmerge | ||
14781 | +MSGMERGE_UPDATE = @MSGMERGE@ --update | ||
14782 | +MSGINIT = msginit | ||
14783 | +MSGCONV = msgconv | ||
14784 | +MSGFILTER = msgfilter | ||
14785 | + | ||
14786 | +POFILES = @POFILES@ | ||
14787 | +GMOFILES = @GMOFILES@ | ||
14788 | +UPDATEPOFILES = @UPDATEPOFILES@ | ||
14789 | +DUMMYPOFILES = @DUMMYPOFILES@ | ||
14790 | +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ | ||
14791 | +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) | ||
14792 | +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ | ||
14793 | +$(POFILES) $(GMOFILES) \ | ||
14794 | +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) | ||
14795 | + | ||
14796 | +POTFILES = \ | ||
14797 | + | ||
14798 | +CATALOGS = @CATALOGS@ | ||
14799 | + | ||
14800 | +# Makevars gets inserted here. (Don't remove this line!) | ||
14801 | + | ||
14802 | +.SUFFIXES: | ||
14803 | +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update | ||
14804 | + | ||
14805 | +.po.mo: | ||
14806 | + @echo "$(MSGFMT) -c -o $@ $<"; \ | ||
14807 | + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ | ||
14808 | + | ||
14809 | +.po.gmo: | ||
14810 | + @lang=`echo $* | sed -e 's,.*/,,'`; \ | ||
14811 | + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ | ||
14812 | + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ | ||
14813 | + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo | ||
14814 | + | ||
14815 | +.sin.sed: | ||
14816 | + sed -e '/^#/d' $< > t-$@ | ||
14817 | + mv t-$@ $@ | ||
14818 | + | ||
14819 | + | ||
14820 | +all: check-macro-version all-@USE_NLS@ | ||
14821 | + | ||
14822 | +all-yes: stamp-po | ||
14823 | +all-no: | ||
14824 | + | ||
14825 | +# Ensure that the gettext macros and this Makefile.in.in are in sync. | ||
14826 | +check-macro-version: | ||
14827 | + @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ | ||
14828 | + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ | ||
14829 | + exit 1; \ | ||
14830 | + } | ||
14831 | + | ||
14832 | +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no | ||
14833 | +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because | ||
14834 | +# we don't want to bother translators with empty POT files). We assume that | ||
14835 | +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. | ||
14836 | +# In this case, stamp-po is a nop (i.e. a phony target). | ||
14837 | + | ||
14838 | +# stamp-po is a timestamp denoting the last time at which the CATALOGS have | ||
14839 | +# been loosely updated. Its purpose is that when a developer or translator | ||
14840 | +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, | ||
14841 | +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent | ||
14842 | +# invocations of "make" will do nothing. This timestamp would not be necessary | ||
14843 | +# if updating the $(CATALOGS) would always touch them; however, the rule for | ||
14844 | +# $(POFILES) has been designed to not touch files that don't need to be | ||
14845 | +# changed. | ||
14846 | +stamp-po: $(srcdir)/$(DOMAIN).pot | ||
14847 | + test ! -f $(srcdir)/$(DOMAIN).pot || \ | ||
14848 | + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) | ||
14849 | + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ | ||
14850 | + echo "touch stamp-po" && \ | ||
14851 | + echo timestamp > stamp-poT && \ | ||
14852 | + mv stamp-poT stamp-po; \ | ||
14853 | + } | ||
14854 | + | ||
14855 | +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', | ||
14856 | +# otherwise packages like GCC can not be built if only parts of the source | ||
14857 | +# have been downloaded. | ||
14858 | + | ||
14859 | +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. | ||
14860 | +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. | ||
14861 | +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed | ||
14862 | + if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ | ||
14863 | + package_gnu='GNU '; \ | ||
14864 | + else \ | ||
14865 | + package_gnu=''; \ | ||
14866 | + fi; \ | ||
14867 | + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ | ||
14868 | + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ | ||
14869 | + else \ | ||
14870 | + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ | ||
14871 | + fi; \ | ||
14872 | + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ | ||
14873 | + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ | ||
14874 | + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ | ||
14875 | + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ | ||
14876 | + --files-from=$(srcdir)/POTFILES.in \ | ||
14877 | + --copyright-holder='$(COPYRIGHT_HOLDER)' \ | ||
14878 | + --msgid-bugs-address="$$msgid_bugs_address" \ | ||
14879 | + ;; \ | ||
14880 | + *) \ | ||
14881 | + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ | ||
14882 | + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ | ||
14883 | + --files-from=$(srcdir)/POTFILES.in \ | ||
14884 | + --copyright-holder='$(COPYRIGHT_HOLDER)' \ | ||
14885 | + --package-name="$${package_gnu}@PACKAGE@" \ | ||
14886 | + --package-version='@VERSION@' \ | ||
14887 | + --msgid-bugs-address="$$msgid_bugs_address" \ | ||
14888 | + ;; \ | ||
14889 | + esac | ||
14890 | + test ! -f $(DOMAIN).po || { \ | ||
14891 | + if test -f $(srcdir)/$(DOMAIN).pot; then \ | ||
14892 | + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ | ||
14893 | + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ | ||
14894 | + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ | ||
14895 | + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ | ||
14896 | + else \ | ||
14897 | + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ | ||
14898 | + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ | ||
14899 | + fi; \ | ||
14900 | + else \ | ||
14901 | + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ | ||
14902 | + fi; \ | ||
14903 | + } | ||
14904 | + | ||
14905 | +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at | ||
14906 | +# every "make" invocation, only create it when it is missing. | ||
14907 | +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. | ||
14908 | +$(srcdir)/$(DOMAIN).pot: | ||
14909 | + $(MAKE) $(DOMAIN).pot-update | ||
14910 | + | ||
14911 | +# This target rebuilds a PO file if $(DOMAIN).pot has changed. | ||
14912 | +# Note that a PO file is not touched if it doesn't need to be changed. | ||
14913 | +$(POFILES): $(srcdir)/$(DOMAIN).pot | ||
14914 | + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ | ||
14915 | + if test -f "$(srcdir)/$${lang}.po"; then \ | ||
14916 | + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ | ||
14917 | + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ | ||
14918 | + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ | ||
14919 | + else \ | ||
14920 | + $(MAKE) $${lang}.po-create; \ | ||
14921 | + fi | ||
14922 | + | ||
14923 | + | ||
14924 | +install: install-exec install-data | ||
14925 | +install-exec: | ||
14926 | +install-data: install-data-@USE_NLS@ | ||
14927 | + if test "$(PACKAGE)" = "gettext-tools"; then \ | ||
14928 | + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ | ||
14929 | + for file in $(DISTFILES.common) Makevars.template; do \ | ||
14930 | + $(INSTALL_DATA) $(srcdir)/$$file \ | ||
14931 | + $(DESTDIR)$(gettextsrcdir)/$$file; \ | ||
14932 | + done; \ | ||
14933 | + for file in Makevars; do \ | ||
14934 | + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ | ||
14935 | + done; \ | ||
14936 | + else \ | ||
14937 | + : ; \ | ||
14938 | + fi | ||
14939 | +install-data-no: all | ||
14940 | +install-data-yes: all | ||
14941 | + $(mkdir_p) $(DESTDIR)$(datadir) | ||
14942 | + @catalogs='$(CATALOGS)'; \ | ||
14943 | + for cat in $$catalogs; do \ | ||
14944 | + cat=`basename $$cat`; \ | ||
14945 | + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | ||
14946 | + dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
14947 | + $(mkdir_p) $(DESTDIR)$$dir; \ | ||
14948 | + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ | ||
14949 | + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ | ||
14950 | + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ | ||
14951 | + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ | ||
14952 | + if test -n "$$lc"; then \ | ||
14953 | + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ | ||
14954 | + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ | ||
14955 | + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ | ||
14956 | + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
14957 | + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ | ||
14958 | + for file in *; do \ | ||
14959 | + if test -f $$file; then \ | ||
14960 | + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ | ||
14961 | + fi; \ | ||
14962 | + done); \ | ||
14963 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ | ||
14964 | + else \ | ||
14965 | + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ | ||
14966 | + :; \ | ||
14967 | + else \ | ||
14968 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
14969 | + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
14970 | + fi; \ | ||
14971 | + fi; \ | ||
14972 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ | ||
14973 | + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ | ||
14974 | + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ | ||
14975 | + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ | ||
14976 | + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ | ||
14977 | + fi; \ | ||
14978 | + done; \ | ||
14979 | + done | ||
14980 | + | ||
14981 | +install-strip: install | ||
14982 | + | ||
14983 | +installdirs: installdirs-exec installdirs-data | ||
14984 | +installdirs-exec: | ||
14985 | +installdirs-data: installdirs-data-@USE_NLS@ | ||
14986 | + if test "$(PACKAGE)" = "gettext-tools"; then \ | ||
14987 | + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ | ||
14988 | + else \ | ||
14989 | + : ; \ | ||
14990 | + fi | ||
14991 | +installdirs-data-no: | ||
14992 | +installdirs-data-yes: | ||
14993 | + $(mkdir_p) $(DESTDIR)$(datadir) | ||
14994 | + @catalogs='$(CATALOGS)'; \ | ||
14995 | + for cat in $$catalogs; do \ | ||
14996 | + cat=`basename $$cat`; \ | ||
14997 | + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | ||
14998 | + dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
14999 | + $(mkdir_p) $(DESTDIR)$$dir; \ | ||
15000 | + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ | ||
15001 | + if test -n "$$lc"; then \ | ||
15002 | + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ | ||
15003 | + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ | ||
15004 | + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ | ||
15005 | + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
15006 | + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ | ||
15007 | + for file in *; do \ | ||
15008 | + if test -f $$file; then \ | ||
15009 | + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ | ||
15010 | + fi; \ | ||
15011 | + done); \ | ||
15012 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ | ||
15013 | + else \ | ||
15014 | + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ | ||
15015 | + :; \ | ||
15016 | + else \ | ||
15017 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
15018 | + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ | ||
15019 | + fi; \ | ||
15020 | + fi; \ | ||
15021 | + fi; \ | ||
15022 | + done; \ | ||
15023 | + done | ||
15024 | + | ||
15025 | +# Define this as empty until I found a useful application. | ||
15026 | +installcheck: | ||
15027 | + | ||
15028 | +uninstall: uninstall-exec uninstall-data | ||
15029 | +uninstall-exec: | ||
15030 | +uninstall-data: uninstall-data-@USE_NLS@ | ||
15031 | + if test "$(PACKAGE)" = "gettext-tools"; then \ | ||
15032 | + for file in $(DISTFILES.common) Makevars.template; do \ | ||
15033 | + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ | ||
15034 | + done; \ | ||
15035 | + else \ | ||
15036 | + : ; \ | ||
15037 | + fi | ||
15038 | +uninstall-data-no: | ||
15039 | +uninstall-data-yes: | ||
15040 | + catalogs='$(CATALOGS)'; \ | ||
15041 | + for cat in $$catalogs; do \ | ||
15042 | + cat=`basename $$cat`; \ | ||
15043 | + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | ||
15044 | + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ | ||
15045 | + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ | ||
15046 | + done; \ | ||
15047 | + done | ||
15048 | + | ||
15049 | +check: all | ||
15050 | + | ||
15051 | +info dvi ps pdf html tags TAGS ctags CTAGS ID: | ||
15052 | + | ||
15053 | +mostlyclean: | ||
15054 | + rm -f remove-potcdate.sed | ||
15055 | + rm -f stamp-poT | ||
15056 | + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po | ||
15057 | + rm -fr *.o | ||
15058 | + | ||
15059 | +clean: mostlyclean | ||
15060 | + | ||
15061 | +distclean: clean | ||
15062 | + rm -f Makefile Makefile.in POTFILES *.mo | ||
15063 | + | ||
15064 | +maintainer-clean: distclean | ||
15065 | + @echo "This command is intended for maintainers to use;" | ||
15066 | + @echo "it deletes files that may require special tools to rebuild." | ||
15067 | + rm -f stamp-po $(GMOFILES) | ||
15068 | + | ||
15069 | +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) | ||
15070 | +dist distdir: | ||
15071 | + $(MAKE) update-po | ||
15072 | + @$(MAKE) dist2 | ||
15073 | +# This is a separate target because 'update-po' must be executed before. | ||
15074 | +dist2: stamp-po $(DISTFILES) | ||
15075 | + dists="$(DISTFILES)"; \ | ||
15076 | + if test "$(PACKAGE)" = "gettext-tools"; then \ | ||
15077 | + dists="$$dists Makevars.template"; \ | ||
15078 | + fi; \ | ||
15079 | + if test -f $(srcdir)/$(DOMAIN).pot; then \ | ||
15080 | + dists="$$dists $(DOMAIN).pot stamp-po"; \ | ||
15081 | + fi; \ | ||
15082 | + if test -f $(srcdir)/ChangeLog; then \ | ||
15083 | + dists="$$dists ChangeLog"; \ | ||
15084 | + fi; \ | ||
15085 | + for i in 0 1 2 3 4 5 6 7 8 9; do \ | ||
15086 | + if test -f $(srcdir)/ChangeLog.$$i; then \ | ||
15087 | + dists="$$dists ChangeLog.$$i"; \ | ||
15088 | + fi; \ | ||
15089 | + done; \ | ||
15090 | + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ | ||
15091 | + for file in $$dists; do \ | ||
15092 | + if test -f $$file; then \ | ||
15093 | + cp -p $$file $(distdir) || exit 1; \ | ||
15094 | + else \ | ||
15095 | + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ | ||
15096 | + fi; \ | ||
15097 | + done | ||
15098 | + | ||
15099 | +update-po: Makefile | ||
15100 | + $(MAKE) $(DOMAIN).pot-update | ||
15101 | + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) | ||
15102 | + $(MAKE) update-gmo | ||
15103 | + | ||
15104 | +# General rule for creating PO files. | ||
15105 | + | ||
15106 | +.nop.po-create: | ||
15107 | + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ | ||
15108 | + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ | ||
15109 | + exit 1 | ||
15110 | + | ||
15111 | +# General rule for updating PO files. | ||
15112 | + | ||
15113 | +.nop.po-update: | ||
15114 | + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ | ||
15115 | + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ | ||
15116 | + tmpdir=`pwd`; \ | ||
15117 | + echo "$$lang:"; \ | ||
15118 | + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ | ||
15119 | + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ | ||
15120 | + cd $(srcdir); \ | ||
15121 | + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ | ||
15122 | + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ | ||
15123 | + rm -f $$tmpdir/$$lang.new.po; \ | ||
15124 | + else \ | ||
15125 | + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ | ||
15126 | + :; \ | ||
15127 | + else \ | ||
15128 | + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ | ||
15129 | + exit 1; \ | ||
15130 | + fi; \ | ||
15131 | + fi; \ | ||
15132 | + else \ | ||
15133 | + echo "msgmerge for $$lang.po failed!" 1>&2; \ | ||
15134 | + rm -f $$tmpdir/$$lang.new.po; \ | ||
15135 | + fi | ||
15136 | + | ||
15137 | +$(DUMMYPOFILES): | ||
15138 | + | ||
15139 | +update-gmo: Makefile $(GMOFILES) | ||
15140 | + @: | ||
15141 | + | ||
15142 | +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ | ||
15143 | + cd $(top_builddir) \ | ||
15144 | + && $(SHELL) ./config.status $(subdir)/$@.in po-directories | ||
15145 | + | ||
15146 | +force: | ||
15147 | + | ||
15148 | +# Tell versions [3.59,3.63) of GNU make not to export all variables. | ||
15149 | +# Otherwise a system limit (for SysV at least) may be exceeded. | ||
15150 | +.NOEXPORT: | ||
15151 | diff --git a/po/Makevars.template b/po/Makevars.template | ||
15152 | new file mode 100644 | ||
15153 | index 0000000..32692ab | ||
15154 | --- /dev/null | ||
15155 | +++ b/po/Makevars.template | ||
15156 | @@ -0,0 +1,41 @@ | ||
15157 | +# Makefile variables for PO directory in any package using GNU gettext. | ||
15158 | + | ||
15159 | +# Usually the message domain is the same as the package name. | ||
15160 | +DOMAIN = $(PACKAGE) | ||
15161 | + | ||
15162 | +# These two variables depend on the location of this directory. | ||
15163 | +subdir = po | ||
15164 | +top_builddir = .. | ||
15165 | + | ||
15166 | +# These options get passed to xgettext. | ||
15167 | +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ | ||
15168 | + | ||
15169 | +# This is the copyright holder that gets inserted into the header of the | ||
15170 | +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding | ||
15171 | +# package. (Note that the msgstr strings, extracted from the package's | ||
15172 | +# sources, belong to the copyright holder of the package.) Translators are | ||
15173 | +# expected to transfer the copyright for their translations to this person | ||
15174 | +# or entity, or to disclaim their copyright. The empty string stands for | ||
15175 | +# the public domain; in this case the translators are expected to disclaim | ||
15176 | +# their copyright. | ||
15177 | +COPYRIGHT_HOLDER = Free Software Foundation, Inc. | ||
15178 | + | ||
15179 | +# This is the email address or URL to which the translators shall report | ||
15180 | +# bugs in the untranslated strings: | ||
15181 | +# - Strings which are not entire sentences, see the maintainer guidelines | ||
15182 | +# in the GNU gettext documentation, section 'Preparing Strings'. | ||
15183 | +# - Strings which use unclear terms or require additional context to be | ||
15184 | +# understood. | ||
15185 | +# - Strings which make invalid assumptions about notation of date, time or | ||
15186 | +# money. | ||
15187 | +# - Pluralisation problems. | ||
15188 | +# - Incorrect English spelling. | ||
15189 | +# - Incorrect formatting. | ||
15190 | +# It can be your email address, or a mailing list address where translators | ||
15191 | +# can write to without being subscribed, or the URL of a web page through | ||
15192 | +# which the translators can contact you. | ||
15193 | +MSGID_BUGS_ADDRESS = | ||
15194 | + | ||
15195 | +# This is the list of locale categories, beyond LC_MESSAGES, for which the | ||
15196 | +# message catalogs shall be used. It is usually empty. | ||
15197 | +EXTRA_LOCALE_CATEGORIES = | ||
15198 | diff --git a/po/gst-plugins-gl-0.10.pot b/po/gst-plugins-gl-0.10.pot | ||
15199 | deleted file mode 100644 | ||
15200 | index eb5fcf8..0000000 | ||
15201 | --- a/po/gst-plugins-gl-0.10.pot | ||
15202 | +++ /dev/null | ||
15203 | @@ -1,21 +0,0 @@ | ||
15204 | -# SOME DESCRIPTIVE TITLE. | ||
15205 | -# This file is put in the public domain. | ||
15206 | -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
15207 | -# | ||
15208 | -#, fuzzy | ||
15209 | -msgid "" | ||
15210 | -msgstr "" | ||
15211 | -"Project-Id-Version: gst-plugins-gl 0.10.3\n" | ||
15212 | -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" | ||
15213 | -"POT-Creation-Date: 2012-05-11 09:09+0100\n" | ||
15214 | -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
15215 | -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
15216 | -"Language-Team: LANGUAGE <LL@li.org>\n" | ||
15217 | -"Language: \n" | ||
15218 | -"MIME-Version: 1.0\n" | ||
15219 | -"Content-Type: text/plain; charset=CHARSET\n" | ||
15220 | -"Content-Transfer-Encoding: 8bit\n" | ||
15221 | - | ||
15222 | -#: gst/gl/gstgltestsrc.c:602 | ||
15223 | -msgid "format wasn't negotiated before get function" | ||
15224 | -msgstr "" | ||
15225 | diff --git a/stamp-h.in b/stamp-h.in | ||
15226 | new file mode 100644 | ||
15227 | index 0000000..9788f70 | ||
15228 | --- /dev/null | ||
15229 | +++ b/stamp-h.in | ||
15230 | @@ -0,0 +1 @@ | ||
15231 | +timestamp | ||
15232 | diff --git a/tests/Makefile.in b/tests/Makefile.in | ||
15233 | index c749303..1577ef9 100644 | ||
15234 | --- a/tests/Makefile.in | ||
15235 | +++ b/tests/Makefile.in | ||
15236 | @@ -1,9 +1,9 @@ | ||
15237 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
15238 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
15239 | # @configure_input@ | ||
15240 | |||
15241 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
15242 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
15243 | -# Foundation, Inc. | ||
15244 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
15245 | +# Inc. | ||
15246 | # This Makefile.in is free software; the Free Software Foundation | ||
15247 | # gives unlimited permission to copy and/or distribute it, | ||
15248 | # with or without modifications, as long as this notice is preserved. | ||
15249 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
15250 | POST_UNINSTALL = : | ||
15251 | build_triplet = @build@ | ||
15252 | host_triplet = @host@ | ||
15253 | +target_triplet = @target@ | ||
15254 | subdir = tests | ||
15255 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
15256 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
15257 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
15258 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
15259 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
15260 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
15261 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
15262 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
15263 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
15264 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
15265 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
15266 | CONFIG_HEADER = $(top_builddir)/config.h | ||
15267 | CONFIG_CLEAN_FILES = | ||
15268 | CONFIG_CLEAN_VPATH_FILES = | ||
15269 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
15270 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
15271 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
15272 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
15273 | am__v_GEN_0 = @echo " GEN " $@; | ||
15274 | -AM_V_at = $(am__v_at_@AM_V@) | ||
15275 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
15276 | +AM_V_at = $(am__v_at_$(V)) | ||
15277 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
15278 | am__v_at_0 = @ | ||
15279 | SOURCES = | ||
15280 | DIST_SOURCES = | ||
15281 | @@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ | ||
15282 | EGREP = @EGREP@ | ||
15283 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
15284 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
15285 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
15286 | EXEEXT = @EXEEXT@ | ||
15287 | FFLAGS = @FFLAGS@ | ||
15288 | FGREP = @FGREP@ | ||
15289 | @@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
15290 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
15291 | GST_CURRENT = @GST_CURRENT@ | ||
15292 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
15293 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
15294 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
15295 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
15296 | GST_LIBS = @GST_LIBS@ | ||
15297 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
15298 | @@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
15299 | GST_LICENSE = @GST_LICENSE@ | ||
15300 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
15301 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
15302 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
15303 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
15304 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
15305 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
15306 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
15307 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
15308 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
15309 | @@ -279,7 +284,7 @@ NM = @NM@ | ||
15310 | NMEDIT = @NMEDIT@ | ||
15311 | OBJC = @OBJC@ | ||
15312 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
15313 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
15314 | +OBJCFLAGS = @OBJCFLAGS@ | ||
15315 | OBJDUMP = @OBJDUMP@ | ||
15316 | OBJEXT = @OBJEXT@ | ||
15317 | OPENGL_ES2 = @OPENGL_ES2@ | ||
15318 | @@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
15319 | VERSION = @VERSION@ | ||
15320 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
15321 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
15322 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
15323 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
15324 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
15325 | XGETTEXT = @XGETTEXT@ | ||
15326 | @@ -389,7 +395,11 @@ sbindir = @sbindir@ | ||
15327 | sharedstatedir = @sharedstatedir@ | ||
15328 | srcdir = @srcdir@ | ||
15329 | sysconfdir = @sysconfdir@ | ||
15330 | +target = @target@ | ||
15331 | target_alias = @target_alias@ | ||
15332 | +target_cpu = @target_cpu@ | ||
15333 | +target_os = @target_os@ | ||
15334 | +target_vendor = @target_vendor@ | ||
15335 | top_build_prefix = @top_build_prefix@ | ||
15336 | top_builddir = @top_builddir@ | ||
15337 | top_srcdir = @top_srcdir@ | ||
15338 | @@ -648,15 +658,10 @@ install-am: all-am | ||
15339 | |||
15340 | installcheck: installcheck-recursive | ||
15341 | install-strip: | ||
15342 | - if test -z '$(STRIP)'; then \ | ||
15343 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15344 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15345 | - install; \ | ||
15346 | - else \ | ||
15347 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15348 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15349 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
15350 | - fi | ||
15351 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15352 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15353 | + `test -z '$(STRIP)' || \ | ||
15354 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
15355 | mostlyclean-generic: | ||
15356 | |||
15357 | clean-generic: | ||
15358 | diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in | ||
15359 | index 0ad30ec..deaa935 100644 | ||
15360 | --- a/tests/check/Makefile.in | ||
15361 | +++ b/tests/check/Makefile.in | ||
15362 | @@ -1,9 +1,9 @@ | ||
15363 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
15364 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
15365 | # @configure_input@ | ||
15366 | |||
15367 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
15368 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
15369 | -# Foundation, Inc. | ||
15370 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
15371 | +# Inc. | ||
15372 | # This Makefile.in is free software; the Free Software Foundation | ||
15373 | # gives unlimited permission to copy and/or distribute it, | ||
15374 | # with or without modifications, as long as this notice is preserved. | ||
15375 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
15376 | POST_UNINSTALL = : | ||
15377 | build_triplet = @build@ | ||
15378 | host_triplet = @host@ | ||
15379 | +target_triplet = @target@ | ||
15380 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
15381 | $(top_srcdir)/common/check.mak | ||
15382 | check_PROGRAMS = generic/states$(EXEEXT) \ | ||
15383 | @@ -43,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
15384 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
15385 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
15386 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
15387 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
15388 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
15389 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
15390 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
15391 | @@ -81,8 +81,8 @@ generic_states_OBJECTS = states.$(OBJEXT) | ||
15392 | generic_states_LDADD = $(LDADD) | ||
15393 | am__DEPENDENCIES_1 = | ||
15394 | generic_states_DEPENDENCIES = $(am__DEPENDENCIES_1) | ||
15395 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
15396 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
15397 | +AM_V_lt = $(am__v_lt_$(V)) | ||
15398 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
15399 | am__v_lt_0 = --silent | ||
15400 | am__dirstamp = $(am__leading_dot)dirstamp | ||
15401 | pipelines_simple_launch_lines_SOURCES = \ | ||
15402 | @@ -100,21 +100,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15403 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
15404 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
15405 | $(AM_CFLAGS) $(CFLAGS) | ||
15406 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
15407 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
15408 | +AM_V_CC = $(am__v_CC_$(V)) | ||
15409 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
15410 | am__v_CC_0 = @echo " CC " $@; | ||
15411 | -AM_V_at = $(am__v_at_@AM_V@) | ||
15412 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
15413 | +AM_V_at = $(am__v_at_$(V)) | ||
15414 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
15415 | am__v_at_0 = @ | ||
15416 | CCLD = $(CC) | ||
15417 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15418 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
15419 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
15420 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
15421 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
15422 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
15423 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
15424 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
15425 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
15426 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
15427 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
15428 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
15429 | am__v_GEN_0 = @echo " GEN " $@; | ||
15430 | SOURCES = generic/states.c pipelines/simple-launch-lines.c | ||
15431 | DIST_SOURCES = generic/states.c pipelines/simple-launch-lines.c | ||
15432 | @@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ | ||
15433 | EGREP = @EGREP@ | ||
15434 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
15435 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
15436 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
15437 | EXEEXT = @EXEEXT@ | ||
15438 | FFLAGS = @FFLAGS@ | ||
15439 | FGREP = @FGREP@ | ||
15440 | @@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
15441 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
15442 | GST_CURRENT = @GST_CURRENT@ | ||
15443 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
15444 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
15445 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
15446 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
15447 | GST_LIBS = @GST_LIBS@ | ||
15448 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
15449 | @@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
15450 | GST_LICENSE = @GST_LICENSE@ | ||
15451 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
15452 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
15453 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
15454 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
15455 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
15456 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
15457 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
15458 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
15459 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
15460 | @@ -281,7 +286,7 @@ NM = @NM@ | ||
15461 | NMEDIT = @NMEDIT@ | ||
15462 | OBJC = @OBJC@ | ||
15463 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
15464 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
15465 | +OBJCFLAGS = @OBJCFLAGS@ | ||
15466 | OBJDUMP = @OBJDUMP@ | ||
15467 | OBJEXT = @OBJEXT@ | ||
15468 | OPENGL_ES2 = @OPENGL_ES2@ | ||
15469 | @@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
15470 | VERSION = @VERSION@ | ||
15471 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
15472 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
15473 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
15474 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
15475 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
15476 | XGETTEXT = @XGETTEXT@ | ||
15477 | @@ -391,7 +397,11 @@ sbindir = @sbindir@ | ||
15478 | sharedstatedir = @sharedstatedir@ | ||
15479 | srcdir = @srcdir@ | ||
15480 | sysconfdir = @sysconfdir@ | ||
15481 | +target = @target@ | ||
15482 | target_alias = @target_alias@ | ||
15483 | +target_cpu = @target_cpu@ | ||
15484 | +target_os = @target_os@ | ||
15485 | +target_vendor = @target_vendor@ | ||
15486 | top_build_prefix = @top_build_prefix@ | ||
15487 | top_builddir = @top_builddir@ | ||
15488 | top_srcdir = @top_srcdir@ | ||
15489 | @@ -456,7 +466,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
15490 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
15491 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
15492 | esac; | ||
15493 | -$(top_srcdir)/common/check.mak: | ||
15494 | |||
15495 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
15496 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
15497 | @@ -478,13 +487,13 @@ clean-checkPROGRAMS: | ||
15498 | generic/$(am__dirstamp): | ||
15499 | @$(MKDIR_P) generic | ||
15500 | @: > generic/$(am__dirstamp) | ||
15501 | -generic/states$(EXEEXT): $(generic_states_OBJECTS) $(generic_states_DEPENDENCIES) $(EXTRA_generic_states_DEPENDENCIES) generic/$(am__dirstamp) | ||
15502 | +generic/states$(EXEEXT): $(generic_states_OBJECTS) $(generic_states_DEPENDENCIES) generic/$(am__dirstamp) | ||
15503 | @rm -f generic/states$(EXEEXT) | ||
15504 | $(AM_V_CCLD)$(LINK) $(generic_states_OBJECTS) $(generic_states_LDADD) $(LIBS) | ||
15505 | pipelines/$(am__dirstamp): | ||
15506 | @$(MKDIR_P) pipelines | ||
15507 | @: > pipelines/$(am__dirstamp) | ||
15508 | -pipelines/simple-launch-lines$(EXEEXT): $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_DEPENDENCIES) $(EXTRA_pipelines_simple_launch_lines_DEPENDENCIES) pipelines/$(am__dirstamp) | ||
15509 | +pipelines/simple-launch-lines$(EXEEXT): $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_DEPENDENCIES) pipelines/$(am__dirstamp) | ||
15510 | @rm -f pipelines/simple-launch-lines$(EXEEXT) | ||
15511 | $(AM_V_CCLD)$(LINK) $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_LDADD) $(LIBS) | ||
15512 | |||
15513 | @@ -500,51 +509,58 @@ distclean-compile: | ||
15514 | .c.o: | ||
15515 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
15516 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
15517 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15518 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15519 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15520 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15521 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
15522 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
15523 | |||
15524 | .c.obj: | ||
15525 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
15526 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
15527 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15528 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15529 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15530 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15531 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
15532 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
15533 | |||
15534 | .c.lo: | ||
15535 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
15536 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
15537 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
15538 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15539 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
15540 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15541 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
15542 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
15543 | |||
15544 | states.o: generic/states.c | ||
15545 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT states.o -MD -MP -MF $(DEPDIR)/states.Tpo -c -o states.o `test -f 'generic/states.c' || echo '$(srcdir)/'`generic/states.c | ||
15546 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/states.Tpo $(DEPDIR)/states.Po | ||
15547 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/states.c' object='states.o' libtool=no @AMDEPBACKSLASH@ | ||
15548 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15549 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generic/states.c' object='states.o' libtool=no @AMDEPBACKSLASH@ | ||
15550 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15551 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o states.o `test -f 'generic/states.c' || echo '$(srcdir)/'`generic/states.c | ||
15552 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o states.o `test -f 'generic/states.c' || echo '$(srcdir)/'`generic/states.c | ||
15553 | |||
15554 | states.obj: generic/states.c | ||
15555 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT states.obj -MD -MP -MF $(DEPDIR)/states.Tpo -c -o states.obj `if test -f 'generic/states.c'; then $(CYGPATH_W) 'generic/states.c'; else $(CYGPATH_W) '$(srcdir)/generic/states.c'; fi` | ||
15556 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/states.Tpo $(DEPDIR)/states.Po | ||
15557 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/states.c' object='states.obj' libtool=no @AMDEPBACKSLASH@ | ||
15558 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15559 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generic/states.c' object='states.obj' libtool=no @AMDEPBACKSLASH@ | ||
15560 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15561 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o states.obj `if test -f 'generic/states.c'; then $(CYGPATH_W) 'generic/states.c'; else $(CYGPATH_W) '$(srcdir)/generic/states.c'; fi` | ||
15562 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o states.obj `if test -f 'generic/states.c'; then $(CYGPATH_W) 'generic/states.c'; else $(CYGPATH_W) '$(srcdir)/generic/states.c'; fi` | ||
15563 | |||
15564 | simple-launch-lines.o: pipelines/simple-launch-lines.c | ||
15565 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simple-launch-lines.o -MD -MP -MF $(DEPDIR)/simple-launch-lines.Tpo -c -o simple-launch-lines.o `test -f 'pipelines/simple-launch-lines.c' || echo '$(srcdir)/'`pipelines/simple-launch-lines.c | ||
15566 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simple-launch-lines.Tpo $(DEPDIR)/simple-launch-lines.Po | ||
15567 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pipelines/simple-launch-lines.c' object='simple-launch-lines.o' libtool=no @AMDEPBACKSLASH@ | ||
15568 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15569 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pipelines/simple-launch-lines.c' object='simple-launch-lines.o' libtool=no @AMDEPBACKSLASH@ | ||
15570 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15571 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple-launch-lines.o `test -f 'pipelines/simple-launch-lines.c' || echo '$(srcdir)/'`pipelines/simple-launch-lines.c | ||
15572 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple-launch-lines.o `test -f 'pipelines/simple-launch-lines.c' || echo '$(srcdir)/'`pipelines/simple-launch-lines.c | ||
15573 | |||
15574 | simple-launch-lines.obj: pipelines/simple-launch-lines.c | ||
15575 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simple-launch-lines.obj -MD -MP -MF $(DEPDIR)/simple-launch-lines.Tpo -c -o simple-launch-lines.obj `if test -f 'pipelines/simple-launch-lines.c'; then $(CYGPATH_W) 'pipelines/simple-launch-lines.c'; else $(CYGPATH_W) '$(srcdir)/pipelines/simple-launch-lines.c'; fi` | ||
15576 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simple-launch-lines.Tpo $(DEPDIR)/simple-launch-lines.Po | ||
15577 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pipelines/simple-launch-lines.c' object='simple-launch-lines.obj' libtool=no @AMDEPBACKSLASH@ | ||
15578 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15579 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pipelines/simple-launch-lines.c' object='simple-launch-lines.obj' libtool=no @AMDEPBACKSLASH@ | ||
15580 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15581 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple-launch-lines.obj `if test -f 'pipelines/simple-launch-lines.c'; then $(CYGPATH_W) 'pipelines/simple-launch-lines.c'; else $(CYGPATH_W) '$(srcdir)/pipelines/simple-launch-lines.c'; fi` | ||
15582 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple-launch-lines.obj `if test -f 'pipelines/simple-launch-lines.c'; then $(CYGPATH_W) 'pipelines/simple-launch-lines.c'; else $(CYGPATH_W) '$(srcdir)/pipelines/simple-launch-lines.c'; fi` | ||
15583 | |||
15584 | mostlyclean-libtool: | ||
15585 | -rm -f *.lo | ||
15586 | @@ -687,15 +703,14 @@ check-TESTS: $(TESTS) | ||
15587 | fi; \ | ||
15588 | dashes=`echo "$$dashes" | sed s/./=/g`; \ | ||
15589 | if test "$$failed" -eq 0; then \ | ||
15590 | - col="$$grn"; \ | ||
15591 | + echo "$$grn$$dashes"; \ | ||
15592 | else \ | ||
15593 | - col="$$red"; \ | ||
15594 | + echo "$$red$$dashes"; \ | ||
15595 | fi; \ | ||
15596 | - echo "$${col}$$dashes$${std}"; \ | ||
15597 | - echo "$${col}$$banner$${std}"; \ | ||
15598 | - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ | ||
15599 | - test -z "$$report" || echo "$${col}$$report$${std}"; \ | ||
15600 | - echo "$${col}$$dashes$${std}"; \ | ||
15601 | + echo "$$banner"; \ | ||
15602 | + test -z "$$skipped" || echo "$$skipped"; \ | ||
15603 | + test -z "$$report" || echo "$$report"; \ | ||
15604 | + echo "$$dashes$$std"; \ | ||
15605 | test "$$failed" -eq 0; \ | ||
15606 | else :; fi | ||
15607 | |||
15608 | @@ -745,15 +760,10 @@ install-am: all-am | ||
15609 | |||
15610 | installcheck: installcheck-am | ||
15611 | install-strip: | ||
15612 | - if test -z '$(STRIP)'; then \ | ||
15613 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15614 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15615 | - install; \ | ||
15616 | - else \ | ||
15617 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15618 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15619 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
15620 | - fi | ||
15621 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15622 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15623 | + `test -z '$(STRIP)' || \ | ||
15624 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
15625 | mostlyclean-generic: | ||
15626 | |||
15627 | clean-generic: | ||
15628 | @@ -877,6 +887,12 @@ clean-local-check: | ||
15629 | CK_DEFAULT_TIMEOUT=20 \ | ||
15630 | $* | ||
15631 | |||
15632 | +# just like 'check', but don't run it again if it fails (useful for debugging) | ||
15633 | +%.check-norepeat: % | ||
15634 | + @$(TESTS_ENVIRONMENT) \ | ||
15635 | + CK_DEFAULT_TIMEOUT=20 \ | ||
15636 | + $* | ||
15637 | + | ||
15638 | # run any given test in a loop | ||
15639 | %.torture: % | ||
15640 | @for i in `seq 1 $(LOOPS)`; do \ | ||
15641 | @@ -1002,7 +1018,8 @@ help: | ||
15642 | @echo | ||
15643 | @echo "make check -- run all checks" | ||
15644 | @echo "make torture -- run all checks $(LOOPS) times" | ||
15645 | - @echo "make (dir)/(test).check -- run the given check once" | ||
15646 | + @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" | ||
15647 | + @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" | ||
15648 | @echo "make (dir)/(test).forever -- run the given check forever" | ||
15649 | @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" | ||
15650 | @echo | ||
15651 | diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in | ||
15652 | index 47314e5..40a0d12 100644 | ||
15653 | --- a/tests/examples/Makefile.in | ||
15654 | +++ b/tests/examples/Makefile.in | ||
15655 | @@ -1,9 +1,9 @@ | ||
15656 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
15657 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
15658 | # @configure_input@ | ||
15659 | |||
15660 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
15661 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
15662 | -# Foundation, Inc. | ||
15663 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
15664 | +# Inc. | ||
15665 | # This Makefile.in is free software; the Free Software Foundation | ||
15666 | # gives unlimited permission to copy and/or distribute it, | ||
15667 | # with or without modifications, as long as this notice is preserved. | ||
15668 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
15669 | POST_UNINSTALL = : | ||
15670 | build_triplet = @build@ | ||
15671 | host_triplet = @host@ | ||
15672 | +target_triplet = @target@ | ||
15673 | @GL_BACKEND_COCOA_TRUE@@GL_IS_OPENGL_TRUE@am__append_1 = cocoa | ||
15674 | @GL_BACKEND_COCOA_FALSE@@GL_IS_OPENGL_TRUE@am__append_2 = generic qt | ||
15675 | @GL_BACKEND_COCOA_FALSE@@GL_IS_OPENGL_TRUE@@HAVE_CLUTTER_TRUE@am__append_3 = clutter | ||
15676 | @@ -45,7 +46,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
15677 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
15678 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
15679 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
15680 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
15681 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
15682 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
15683 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
15684 | @@ -78,11 +78,11 @@ mkinstalldirs = $(install_sh) -d | ||
15685 | CONFIG_HEADER = $(top_builddir)/config.h | ||
15686 | CONFIG_CLEAN_FILES = | ||
15687 | CONFIG_CLEAN_VPATH_FILES = | ||
15688 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
15689 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
15690 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
15691 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
15692 | am__v_GEN_0 = @echo " GEN " $@; | ||
15693 | -AM_V_at = $(am__v_at_@AM_V@) | ||
15694 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
15695 | +AM_V_at = $(am__v_at_$(V)) | ||
15696 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
15697 | am__v_at_0 = @ | ||
15698 | SOURCES = | ||
15699 | DIST_SOURCES = | ||
15700 | @@ -173,6 +173,7 @@ ECHO_T = @ECHO_T@ | ||
15701 | EGREP = @EGREP@ | ||
15702 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
15703 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
15704 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
15705 | EXEEXT = @EXEEXT@ | ||
15706 | FFLAGS = @FFLAGS@ | ||
15707 | FGREP = @FGREP@ | ||
15708 | @@ -204,6 +205,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
15709 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
15710 | GST_CURRENT = @GST_CURRENT@ | ||
15711 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
15712 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
15713 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
15714 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
15715 | GST_LIBS = @GST_LIBS@ | ||
15716 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
15717 | @@ -211,8 +214,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
15718 | GST_LICENSE = @GST_LICENSE@ | ||
15719 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
15720 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
15721 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
15722 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
15723 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
15724 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
15725 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
15726 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
15727 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
15728 | @@ -285,7 +290,7 @@ NM = @NM@ | ||
15729 | NMEDIT = @NMEDIT@ | ||
15730 | OBJC = @OBJC@ | ||
15731 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
15732 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
15733 | +OBJCFLAGS = @OBJCFLAGS@ | ||
15734 | OBJDUMP = @OBJDUMP@ | ||
15735 | OBJEXT = @OBJEXT@ | ||
15736 | OPENGL_ES2 = @OPENGL_ES2@ | ||
15737 | @@ -330,6 +335,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
15738 | VERSION = @VERSION@ | ||
15739 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
15740 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
15741 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
15742 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
15743 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
15744 | XGETTEXT = @XGETTEXT@ | ||
15745 | @@ -395,7 +401,11 @@ sbindir = @sbindir@ | ||
15746 | sharedstatedir = @sharedstatedir@ | ||
15747 | srcdir = @srcdir@ | ||
15748 | sysconfdir = @sysconfdir@ | ||
15749 | +target = @target@ | ||
15750 | target_alias = @target_alias@ | ||
15751 | +target_cpu = @target_cpu@ | ||
15752 | +target_os = @target_os@ | ||
15753 | +target_vendor = @target_vendor@ | ||
15754 | top_build_prefix = @top_build_prefix@ | ||
15755 | top_builddir = @top_builddir@ | ||
15756 | top_srcdir = @top_srcdir@ | ||
15757 | @@ -649,15 +659,10 @@ install-am: all-am | ||
15758 | |||
15759 | installcheck: installcheck-recursive | ||
15760 | install-strip: | ||
15761 | - if test -z '$(STRIP)'; then \ | ||
15762 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15763 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15764 | - install; \ | ||
15765 | - else \ | ||
15766 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15767 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15768 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
15769 | - fi | ||
15770 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
15771 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
15772 | + `test -z '$(STRIP)' || \ | ||
15773 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
15774 | mostlyclean-generic: | ||
15775 | |||
15776 | clean-generic: | ||
15777 | diff --git a/tests/examples/clutter/Makefile.in b/tests/examples/clutter/Makefile.in | ||
15778 | index 5d3b8c3..f19800b 100644 | ||
15779 | --- a/tests/examples/clutter/Makefile.in | ||
15780 | +++ b/tests/examples/clutter/Makefile.in | ||
15781 | @@ -1,9 +1,9 @@ | ||
15782 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
15783 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
15784 | # @configure_input@ | ||
15785 | |||
15786 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
15787 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
15788 | -# Foundation, Inc. | ||
15789 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
15790 | +# Inc. | ||
15791 | # This Makefile.in is free software; the Free Software Foundation | ||
15792 | # gives unlimited permission to copy and/or distribute it, | ||
15793 | # with or without modifications, as long as this notice is preserved. | ||
15794 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
15795 | POST_UNINSTALL = : | ||
15796 | build_triplet = @build@ | ||
15797 | host_triplet = @host@ | ||
15798 | +target_triplet = @target@ | ||
15799 | noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) | ||
15800 | |||
15801 | #works on win32 and X | ||
15802 | @@ -46,7 +47,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
15803 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
15804 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
15805 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
15806 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
15807 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
15808 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
15809 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
15810 | @@ -95,8 +95,8 @@ am__DEPENDENCIES_1 = | ||
15811 | @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) \ | ||
15812 | @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) \ | ||
15813 | @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) | ||
15814 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
15815 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
15816 | +AM_V_lt = $(am__v_lt_$(V)) | ||
15817 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
15818 | am__v_lt_0 = --silent | ||
15819 | clutteractor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15820 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(clutteractor_CFLAGS) \ | ||
15821 | @@ -135,21 +135,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15822 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
15823 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
15824 | $(AM_CFLAGS) $(CFLAGS) | ||
15825 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
15826 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
15827 | +AM_V_CC = $(am__v_CC_$(V)) | ||
15828 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
15829 | am__v_CC_0 = @echo " CC " $@; | ||
15830 | -AM_V_at = $(am__v_at_@AM_V@) | ||
15831 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
15832 | +AM_V_at = $(am__v_at_$(V)) | ||
15833 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
15834 | am__v_at_0 = @ | ||
15835 | CCLD = $(CC) | ||
15836 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15837 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
15838 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
15839 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
15840 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
15841 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
15842 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
15843 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
15844 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
15845 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
15846 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
15847 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
15848 | am__v_GEN_0 = @echo " GEN " $@; | ||
15849 | SOURCES = $(clutteractor_SOURCES) $(clutteractortee_SOURCES) \ | ||
15850 | $(cluttershare_SOURCES) | ||
15851 | @@ -205,6 +205,7 @@ ECHO_T = @ECHO_T@ | ||
15852 | EGREP = @EGREP@ | ||
15853 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
15854 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
15855 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
15856 | EXEEXT = @EXEEXT@ | ||
15857 | FFLAGS = @FFLAGS@ | ||
15858 | FGREP = @FGREP@ | ||
15859 | @@ -236,6 +237,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
15860 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
15861 | GST_CURRENT = @GST_CURRENT@ | ||
15862 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
15863 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
15864 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
15865 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
15866 | GST_LIBS = @GST_LIBS@ | ||
15867 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
15868 | @@ -243,8 +246,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
15869 | GST_LICENSE = @GST_LICENSE@ | ||
15870 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
15871 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
15872 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
15873 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
15874 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
15875 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
15876 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
15877 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
15878 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
15879 | @@ -317,7 +322,7 @@ NM = @NM@ | ||
15880 | NMEDIT = @NMEDIT@ | ||
15881 | OBJC = @OBJC@ | ||
15882 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
15883 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
15884 | +OBJCFLAGS = @OBJCFLAGS@ | ||
15885 | OBJDUMP = @OBJDUMP@ | ||
15886 | OBJEXT = @OBJEXT@ | ||
15887 | OPENGL_ES2 = @OPENGL_ES2@ | ||
15888 | @@ -362,6 +367,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
15889 | VERSION = @VERSION@ | ||
15890 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
15891 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
15892 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
15893 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
15894 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
15895 | XGETTEXT = @XGETTEXT@ | ||
15896 | @@ -427,7 +433,11 @@ sbindir = @sbindir@ | ||
15897 | sharedstatedir = @sharedstatedir@ | ||
15898 | srcdir = @srcdir@ | ||
15899 | sysconfdir = @sysconfdir@ | ||
15900 | +target = @target@ | ||
15901 | target_alias = @target_alias@ | ||
15902 | +target_cpu = @target_cpu@ | ||
15903 | +target_os = @target_os@ | ||
15904 | +target_vendor = @target_vendor@ | ||
15905 | top_build_prefix = @top_build_prefix@ | ||
15906 | top_builddir = @top_builddir@ | ||
15907 | top_srcdir = @top_srcdir@ | ||
15908 | @@ -501,13 +511,13 @@ clean-noinstPROGRAMS: | ||
15909 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
15910 | echo " rm -f" $$list; \ | ||
15911 | rm -f $$list | ||
15912 | -clutteractor$(EXEEXT): $(clutteractor_OBJECTS) $(clutteractor_DEPENDENCIES) $(EXTRA_clutteractor_DEPENDENCIES) | ||
15913 | +clutteractor$(EXEEXT): $(clutteractor_OBJECTS) $(clutteractor_DEPENDENCIES) | ||
15914 | @rm -f clutteractor$(EXEEXT) | ||
15915 | $(AM_V_CCLD)$(clutteractor_LINK) $(clutteractor_OBJECTS) $(clutteractor_LDADD) $(LIBS) | ||
15916 | -clutteractortee$(EXEEXT): $(clutteractortee_OBJECTS) $(clutteractortee_DEPENDENCIES) $(EXTRA_clutteractortee_DEPENDENCIES) | ||
15917 | +clutteractortee$(EXEEXT): $(clutteractortee_OBJECTS) $(clutteractortee_DEPENDENCIES) | ||
15918 | @rm -f clutteractortee$(EXEEXT) | ||
15919 | $(AM_V_CCLD)$(clutteractortee_LINK) $(clutteractortee_OBJECTS) $(clutteractortee_LDADD) $(LIBS) | ||
15920 | -cluttershare$(EXEEXT): $(cluttershare_OBJECTS) $(cluttershare_DEPENDENCIES) $(EXTRA_cluttershare_DEPENDENCIES) | ||
15921 | +cluttershare$(EXEEXT): $(cluttershare_OBJECTS) $(cluttershare_DEPENDENCIES) | ||
15922 | @rm -f cluttershare$(EXEEXT) | ||
15923 | $(AM_V_CCLD)$(cluttershare_LINK) $(cluttershare_OBJECTS) $(cluttershare_LDADD) $(LIBS) | ||
15924 | |||
15925 | @@ -524,65 +534,74 @@ distclean-compile: | ||
15926 | .c.o: | ||
15927 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
15928 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
15929 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15930 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15931 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15932 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15933 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
15934 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
15935 | |||
15936 | .c.obj: | ||
15937 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
15938 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
15939 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15940 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15941 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
15942 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15943 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
15944 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
15945 | |||
15946 | .c.lo: | ||
15947 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
15948 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
15949 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
15950 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15951 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
15952 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15953 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
15954 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
15955 | |||
15956 | clutteractor-clutteractor.o: clutteractor.c | ||
15957 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -MT clutteractor-clutteractor.o -MD -MP -MF $(DEPDIR)/clutteractor-clutteractor.Tpo -c -o clutteractor-clutteractor.o `test -f 'clutteractor.c' || echo '$(srcdir)/'`clutteractor.c | ||
15958 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractor-clutteractor.Tpo $(DEPDIR)/clutteractor-clutteractor.Po | ||
15959 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractor.c' object='clutteractor-clutteractor.o' libtool=no @AMDEPBACKSLASH@ | ||
15960 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15961 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractor.c' object='clutteractor-clutteractor.o' libtool=no @AMDEPBACKSLASH@ | ||
15962 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15963 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -c -o clutteractor-clutteractor.o `test -f 'clutteractor.c' || echo '$(srcdir)/'`clutteractor.c | ||
15964 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -c -o clutteractor-clutteractor.o `test -f 'clutteractor.c' || echo '$(srcdir)/'`clutteractor.c | ||
15965 | |||
15966 | clutteractor-clutteractor.obj: clutteractor.c | ||
15967 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -MT clutteractor-clutteractor.obj -MD -MP -MF $(DEPDIR)/clutteractor-clutteractor.Tpo -c -o clutteractor-clutteractor.obj `if test -f 'clutteractor.c'; then $(CYGPATH_W) 'clutteractor.c'; else $(CYGPATH_W) '$(srcdir)/clutteractor.c'; fi` | ||
15968 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractor-clutteractor.Tpo $(DEPDIR)/clutteractor-clutteractor.Po | ||
15969 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractor.c' object='clutteractor-clutteractor.obj' libtool=no @AMDEPBACKSLASH@ | ||
15970 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15971 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractor.c' object='clutteractor-clutteractor.obj' libtool=no @AMDEPBACKSLASH@ | ||
15972 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15973 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -c -o clutteractor-clutteractor.obj `if test -f 'clutteractor.c'; then $(CYGPATH_W) 'clutteractor.c'; else $(CYGPATH_W) '$(srcdir)/clutteractor.c'; fi` | ||
15974 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractor_CFLAGS) $(CFLAGS) -c -o clutteractor-clutteractor.obj `if test -f 'clutteractor.c'; then $(CYGPATH_W) 'clutteractor.c'; else $(CYGPATH_W) '$(srcdir)/clutteractor.c'; fi` | ||
15975 | |||
15976 | clutteractortee-clutteractortee.o: clutteractortee.c | ||
15977 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -MT clutteractortee-clutteractortee.o -MD -MP -MF $(DEPDIR)/clutteractortee-clutteractortee.Tpo -c -o clutteractortee-clutteractortee.o `test -f 'clutteractortee.c' || echo '$(srcdir)/'`clutteractortee.c | ||
15978 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractortee-clutteractortee.Tpo $(DEPDIR)/clutteractortee-clutteractortee.Po | ||
15979 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractortee.c' object='clutteractortee-clutteractortee.o' libtool=no @AMDEPBACKSLASH@ | ||
15980 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15981 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractortee.c' object='clutteractortee-clutteractortee.o' libtool=no @AMDEPBACKSLASH@ | ||
15982 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15983 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -c -o clutteractortee-clutteractortee.o `test -f 'clutteractortee.c' || echo '$(srcdir)/'`clutteractortee.c | ||
15984 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -c -o clutteractortee-clutteractortee.o `test -f 'clutteractortee.c' || echo '$(srcdir)/'`clutteractortee.c | ||
15985 | |||
15986 | clutteractortee-clutteractortee.obj: clutteractortee.c | ||
15987 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -MT clutteractortee-clutteractortee.obj -MD -MP -MF $(DEPDIR)/clutteractortee-clutteractortee.Tpo -c -o clutteractortee-clutteractortee.obj `if test -f 'clutteractortee.c'; then $(CYGPATH_W) 'clutteractortee.c'; else $(CYGPATH_W) '$(srcdir)/clutteractortee.c'; fi` | ||
15988 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractortee-clutteractortee.Tpo $(DEPDIR)/clutteractortee-clutteractortee.Po | ||
15989 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractortee.c' object='clutteractortee-clutteractortee.obj' libtool=no @AMDEPBACKSLASH@ | ||
15990 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
15991 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractortee.c' object='clutteractortee-clutteractortee.obj' libtool=no @AMDEPBACKSLASH@ | ||
15992 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
15993 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -c -o clutteractortee-clutteractortee.obj `if test -f 'clutteractortee.c'; then $(CYGPATH_W) 'clutteractortee.c'; else $(CYGPATH_W) '$(srcdir)/clutteractortee.c'; fi` | ||
15994 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clutteractortee_CFLAGS) $(CFLAGS) -c -o clutteractortee-clutteractortee.obj `if test -f 'clutteractortee.c'; then $(CYGPATH_W) 'clutteractortee.c'; else $(CYGPATH_W) '$(srcdir)/clutteractortee.c'; fi` | ||
15995 | |||
15996 | cluttershare-cluttershare.o: cluttershare.c | ||
15997 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -MT cluttershare-cluttershare.o -MD -MP -MF $(DEPDIR)/cluttershare-cluttershare.Tpo -c -o cluttershare-cluttershare.o `test -f 'cluttershare.c' || echo '$(srcdir)/'`cluttershare.c | ||
15998 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cluttershare-cluttershare.Tpo $(DEPDIR)/cluttershare-cluttershare.Po | ||
15999 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cluttershare.c' object='cluttershare-cluttershare.o' libtool=no @AMDEPBACKSLASH@ | ||
16000 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
16001 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cluttershare.c' object='cluttershare-cluttershare.o' libtool=no @AMDEPBACKSLASH@ | ||
16002 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16003 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -c -o cluttershare-cluttershare.o `test -f 'cluttershare.c' || echo '$(srcdir)/'`cluttershare.c | ||
16004 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -c -o cluttershare-cluttershare.o `test -f 'cluttershare.c' || echo '$(srcdir)/'`cluttershare.c | ||
16005 | |||
16006 | cluttershare-cluttershare.obj: cluttershare.c | ||
16007 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -MT cluttershare-cluttershare.obj -MD -MP -MF $(DEPDIR)/cluttershare-cluttershare.Tpo -c -o cluttershare-cluttershare.obj `if test -f 'cluttershare.c'; then $(CYGPATH_W) 'cluttershare.c'; else $(CYGPATH_W) '$(srcdir)/cluttershare.c'; fi` | ||
16008 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cluttershare-cluttershare.Tpo $(DEPDIR)/cluttershare-cluttershare.Po | ||
16009 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cluttershare.c' object='cluttershare-cluttershare.obj' libtool=no @AMDEPBACKSLASH@ | ||
16010 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
16011 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cluttershare.c' object='cluttershare-cluttershare.obj' libtool=no @AMDEPBACKSLASH@ | ||
16012 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16013 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -c -o cluttershare-cluttershare.obj `if test -f 'cluttershare.c'; then $(CYGPATH_W) 'cluttershare.c'; else $(CYGPATH_W) '$(srcdir)/cluttershare.c'; fi` | ||
16014 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cluttershare_CFLAGS) $(CFLAGS) -c -o cluttershare-cluttershare.obj `if test -f 'cluttershare.c'; then $(CYGPATH_W) 'cluttershare.c'; else $(CYGPATH_W) '$(srcdir)/cluttershare.c'; fi` | ||
16015 | |||
16016 | mostlyclean-libtool: | ||
16017 | -rm -f *.lo | ||
16018 | @@ -686,15 +705,10 @@ install-am: all-am | ||
16019 | |||
16020 | installcheck: installcheck-am | ||
16021 | install-strip: | ||
16022 | - if test -z '$(STRIP)'; then \ | ||
16023 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16024 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16025 | - install; \ | ||
16026 | - else \ | ||
16027 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16028 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16029 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
16030 | - fi | ||
16031 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16032 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16033 | + `test -z '$(STRIP)' || \ | ||
16034 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
16035 | mostlyclean-generic: | ||
16036 | |||
16037 | clean-generic: | ||
16038 | diff --git a/tests/examples/clutter/cluttershare.cbp b/tests/examples/clutter/cluttershare.cbp | ||
16039 | new file mode 100644 | ||
16040 | index 0000000..2661d1f | ||
16041 | --- /dev/null | ||
16042 | +++ b/tests/examples/clutter/cluttershare.cbp | ||
16043 | @@ -0,0 +1,77 @@ | ||
16044 | +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
16045 | +<CodeBlocks_project_file> | ||
16046 | + <FileVersion major="1" minor="6" /> | ||
16047 | + <Project> | ||
16048 | + <Option title="cluttershare" /> | ||
16049 | + <Option pch_mode="2" /> | ||
16050 | + <Option compiler="gcc" /> | ||
16051 | + <Build> | ||
16052 | + <Target title="Debug"> | ||
16053 | + <Option output="bin\Debug\cluttershare" prefix_auto="1" extension_auto="1" /> | ||
16054 | + <Option object_output="obj\Debug\" /> | ||
16055 | + <Option type="1" /> | ||
16056 | + <Option compiler="gcc" /> | ||
16057 | + <Compiler> | ||
16058 | + <Add option="-g" /> | ||
16059 | + </Compiler> | ||
16060 | + </Target> | ||
16061 | + <Target title="Release"> | ||
16062 | + <Option output="bin\Release\cluttershare" prefix_auto="1" extension_auto="1" /> | ||
16063 | + <Option object_output="obj\Release\" /> | ||
16064 | + <Option type="1" /> | ||
16065 | + <Option compiler="gcc" /> | ||
16066 | + <Compiler> | ||
16067 | + <Add option="-O2" /> | ||
16068 | + </Compiler> | ||
16069 | + <Linker> | ||
16070 | + <Add option="-s" /> | ||
16071 | + </Linker> | ||
16072 | + </Target> | ||
16073 | + </Build> | ||
16074 | + <Compiler> | ||
16075 | + <Add option="-Wall" /> | ||
16076 | + <Add option="-ansi" /> | ||
16077 | + <Add option="-std=c89" /> | ||
16078 | + <Add option="-DWIN32" /> | ||
16079 | + <Add directory="..\..\..\..\clutter\include\clutter-0.8" /> | ||
16080 | + <Add directory="C:\gstreamer\include\glib-2.0" /> | ||
16081 | + <Add directory="C:\gstreamer\lib\glib-2.0\include" /> | ||
16082 | + <Add directory="C:\gstreamer\include\gstreamer-0.10" /> | ||
16083 | + <Add directory="C:\gstreamer\include\pango-1.0" /> | ||
16084 | + <Add directory="C:\gstreamer\include\cairo" /> | ||
16085 | + <Add directory="C:\gstreamer\include\libxml2" /> | ||
16086 | + <Add directory="C:\gstreamer\include" /> | ||
16087 | + </Compiler> | ||
16088 | + <Linker> | ||
16089 | + <Add library="clutter-win32-0.8" /> | ||
16090 | + <Add library="gio-2.0" /> | ||
16091 | + <Add library="gthread-2.0" /> | ||
16092 | + <Add library="gobject-2.0" /> | ||
16093 | + <Add library="gstreamer-0.10" /> | ||
16094 | + <Add library="gmodule-2.0" /> | ||
16095 | + <Add library="gstinterfaces-0.10" /> | ||
16096 | + <Add library="glib-2.0" /> | ||
16097 | + <Add library="pangocairo-1.0" /> | ||
16098 | + <Add library="pangowin32-1.0" /> | ||
16099 | + <Add library="pango-1.0" /> | ||
16100 | + <Add library="gdk_pixbuf-2.0" /> | ||
16101 | + <Add library="cairo" /> | ||
16102 | + <Add library="glew32" /> | ||
16103 | + <Add library="glu32" /> | ||
16104 | + <Add library="opengl32" /> | ||
16105 | + <Add library="gdi32" /> | ||
16106 | + <Add library="winmm" /> | ||
16107 | + <Add directory="..\..\..\..\clutter\lib" /> | ||
16108 | + <Add directory="C:\gstreamer\lib" /> | ||
16109 | + <Add directory="C:\gstreamer\bin" /> | ||
16110 | + <Add directory="..\..\..\..\gtk+\lib" /> | ||
16111 | + </Linker> | ||
16112 | + <Unit filename="cluttershare.c"> | ||
16113 | + <Option compilerVar="CC" /> | ||
16114 | + </Unit> | ||
16115 | + <Extensions> | ||
16116 | + <code_completion /> | ||
16117 | + <debugger /> | ||
16118 | + </Extensions> | ||
16119 | + </Project> | ||
16120 | +</CodeBlocks_project_file> | ||
16121 | diff --git a/tests/examples/cocoa/Makefile.in b/tests/examples/cocoa/Makefile.in | ||
16122 | index 91aebcd..49f2ead 100644 | ||
16123 | --- a/tests/examples/cocoa/Makefile.in | ||
16124 | +++ b/tests/examples/cocoa/Makefile.in | ||
16125 | @@ -1,9 +1,9 @@ | ||
16126 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
16127 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
16128 | # @configure_input@ | ||
16129 | |||
16130 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
16131 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
16132 | -# Foundation, Inc. | ||
16133 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
16134 | +# Inc. | ||
16135 | # This Makefile.in is free software; the Free Software Foundation | ||
16136 | # gives unlimited permission to copy and/or distribute it, | ||
16137 | # with or without modifications, as long as this notice is preserved. | ||
16138 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
16139 | POST_UNINSTALL = : | ||
16140 | build_triplet = @build@ | ||
16141 | host_triplet = @host@ | ||
16142 | +target_triplet = @target@ | ||
16143 | subdir = tests/examples/cocoa | ||
16144 | DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
16145 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
16146 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
16147 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
16148 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
16149 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
16150 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
16151 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
16152 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
16153 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
16154 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
16155 | CONFIG_HEADER = $(top_builddir)/config.h | ||
16156 | CONFIG_CLEAN_FILES = | ||
16157 | CONFIG_CLEAN_VPATH_FILES = | ||
16158 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
16159 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
16160 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
16161 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
16162 | am__v_GEN_0 = @echo " GEN " $@; | ||
16163 | -AM_V_at = $(am__v_at_@AM_V@) | ||
16164 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
16165 | +AM_V_at = $(am__v_at_$(V)) | ||
16166 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
16167 | am__v_at_0 = @ | ||
16168 | SOURCES = | ||
16169 | DIST_SOURCES = | ||
16170 | @@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ | ||
16171 | EGREP = @EGREP@ | ||
16172 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
16173 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
16174 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
16175 | EXEEXT = @EXEEXT@ | ||
16176 | FFLAGS = @FFLAGS@ | ||
16177 | FGREP = @FGREP@ | ||
16178 | @@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
16179 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
16180 | GST_CURRENT = @GST_CURRENT@ | ||
16181 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
16182 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
16183 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
16184 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
16185 | GST_LIBS = @GST_LIBS@ | ||
16186 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
16187 | @@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
16188 | GST_LICENSE = @GST_LICENSE@ | ||
16189 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
16190 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
16191 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
16192 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
16193 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
16194 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
16195 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
16196 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
16197 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
16198 | @@ -280,7 +285,7 @@ NM = @NM@ | ||
16199 | NMEDIT = @NMEDIT@ | ||
16200 | OBJC = @OBJC@ | ||
16201 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
16202 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
16203 | +OBJCFLAGS = @OBJCFLAGS@ | ||
16204 | OBJDUMP = @OBJDUMP@ | ||
16205 | OBJEXT = @OBJEXT@ | ||
16206 | OPENGL_ES2 = @OPENGL_ES2@ | ||
16207 | @@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
16208 | VERSION = @VERSION@ | ||
16209 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
16210 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
16211 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
16212 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
16213 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
16214 | XGETTEXT = @XGETTEXT@ | ||
16215 | @@ -390,7 +396,11 @@ sbindir = @sbindir@ | ||
16216 | sharedstatedir = @sharedstatedir@ | ||
16217 | srcdir = @srcdir@ | ||
16218 | sysconfdir = @sysconfdir@ | ||
16219 | +target = @target@ | ||
16220 | target_alias = @target_alias@ | ||
16221 | +target_cpu = @target_cpu@ | ||
16222 | +target_os = @target_os@ | ||
16223 | +target_vendor = @target_vendor@ | ||
16224 | top_build_prefix = @top_build_prefix@ | ||
16225 | top_builddir = @top_builddir@ | ||
16226 | top_srcdir = @top_srcdir@ | ||
16227 | @@ -643,15 +653,10 @@ install-am: all-am | ||
16228 | |||
16229 | installcheck: installcheck-recursive | ||
16230 | install-strip: | ||
16231 | - if test -z '$(STRIP)'; then \ | ||
16232 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16233 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16234 | - install; \ | ||
16235 | - else \ | ||
16236 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16237 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16238 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
16239 | - fi | ||
16240 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16241 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16242 | + `test -z '$(STRIP)' || \ | ||
16243 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
16244 | mostlyclean-generic: | ||
16245 | |||
16246 | clean-generic: | ||
16247 | diff --git a/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep b/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep | ||
16248 | new file mode 100644 | ||
16249 | index 0000000..00d655f | ||
16250 | --- /dev/null | ||
16251 | +++ b/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep | ||
16252 | @@ -0,0 +1,35 @@ | ||
16253 | +export MAKEFILE_NAME = GNUmakefile.gnustep | ||
16254 | + | ||
16255 | +include $(GNUSTEP_MAKEFILES)/common.make | ||
16256 | + | ||
16257 | +TOOL_NAME = videoxoverlay | ||
16258 | + | ||
16259 | +videoxoverlay_OBJC_FILES = main.m | ||
16260 | + | ||
16261 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
16262 | +videoxoverlay_INCLUDE_DIRS = \ | ||
16263 | + -IC:/gstreamer/include/libxml2 \ | ||
16264 | + -IC:/gstreamer/include/glib-2.0 \ | ||
16265 | + -IC:/gstreamer/lib/glib-2.0/include \ | ||
16266 | + -IC:/gstreamer/include \ | ||
16267 | + -IC:/gstreamer/include/gstreamer-0.10 | ||
16268 | +endif | ||
16269 | + | ||
16270 | +ifeq ($(GNUSTEP_TARGET_OS), mingw32) | ||
16271 | + videoxoverlay_LIB_DIRS += \ | ||
16272 | + -LC:/gstreamer/bin | ||
16273 | +endif | ||
16274 | + | ||
16275 | +videoxoverlay_TOOL_LIBS = \ | ||
16276 | + -lglib-2.0-0 \ | ||
16277 | + -lgobject-2.0-0 \ | ||
16278 | + -lgmodule-2.0-0 \ | ||
16279 | + -lgthread-2.0-0 \ | ||
16280 | + -lgstreamer-0.10 \ | ||
16281 | + -lgstbase-0.10 \ | ||
16282 | + -lgstvideo-0.10 \ | ||
16283 | + -lgstinterfaces-0.10 | ||
16284 | + | ||
16285 | +ADDITIONAL_TOOL_LIBS = -lgnustep-gui | ||
16286 | + | ||
16287 | +include $(GNUSTEP_MAKEFILES)/tool.make | ||
16288 | diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.am b/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
16289 | index 5a85bb4..b4a4932 100755 | ||
16290 | --- a/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
16291 | +++ b/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
16292 | @@ -4,7 +4,7 @@ noinst_PROGRAMS = videoxoverlay | ||
16293 | |||
16294 | videoxoverlay_SOURCES = main.m | ||
16295 | |||
16296 | -videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ | ||
16297 | +videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ | ||
16298 | $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 | ||
16299 | videoxoverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ | ||
16300 | $(GL_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) | ||
16301 | diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.in b/tests/examples/cocoa/videoxoverlay/Makefile.in | ||
16302 | index 445c7c6..6b57456 100644 | ||
16303 | --- a/tests/examples/cocoa/videoxoverlay/Makefile.in | ||
16304 | +++ b/tests/examples/cocoa/videoxoverlay/Makefile.in | ||
16305 | @@ -1,9 +1,9 @@ | ||
16306 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
16307 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
16308 | # @configure_input@ | ||
16309 | |||
16310 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
16311 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
16312 | -# Foundation, Inc. | ||
16313 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
16314 | +# Inc. | ||
16315 | # This Makefile.in is free software; the Free Software Foundation | ||
16316 | # gives unlimited permission to copy and/or distribute it, | ||
16317 | # with or without modifications, as long as this notice is preserved. | ||
16318 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
16319 | POST_UNINSTALL = : | ||
16320 | build_triplet = @build@ | ||
16321 | host_triplet = @host@ | ||
16322 | +target_triplet = @target@ | ||
16323 | @GL_BACKEND_COCOA_TRUE@noinst_PROGRAMS = videoxoverlay$(EXEEXT) | ||
16324 | subdir = tests/examples/cocoa/videoxoverlay | ||
16325 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
16326 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
16327 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
16328 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
16329 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
16330 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
16331 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
16332 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
16333 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
16334 | @@ -85,8 +85,8 @@ am__DEPENDENCIES_1 = | ||
16335 | @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) \ | ||
16336 | @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) \ | ||
16337 | @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) | ||
16338 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
16339 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
16340 | +AM_V_lt = $(am__v_lt_$(V)) | ||
16341 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
16342 | am__v_lt_0 = --silent | ||
16343 | videoxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) \ | ||
16344 | $(videoxoverlay_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ | ||
16345 | @@ -102,21 +102,21 @@ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ | ||
16346 | $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \ | ||
16347 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
16348 | $(AM_OBJCFLAGS) $(OBJCFLAGS) | ||
16349 | -AM_V_OBJC = $(am__v_OBJC_@AM_V@) | ||
16350 | -am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@) | ||
16351 | +AM_V_OBJC = $(am__v_OBJC_$(V)) | ||
16352 | +am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY)) | ||
16353 | am__v_OBJC_0 = @echo " OBJC " $@; | ||
16354 | -AM_V_at = $(am__v_at_@AM_V@) | ||
16355 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
16356 | +AM_V_at = $(am__v_at_$(V)) | ||
16357 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
16358 | am__v_at_0 = @ | ||
16359 | OBJCLD = $(OBJC) | ||
16360 | OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
16361 | --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ | ||
16362 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
16363 | -AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@) | ||
16364 | -am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@) | ||
16365 | +AM_V_OBJCLD = $(am__v_OBJCLD_$(V)) | ||
16366 | +am__v_OBJCLD_ = $(am__v_OBJCLD_$(AM_DEFAULT_VERBOSITY)) | ||
16367 | am__v_OBJCLD_0 = @echo " OBJCLD" $@; | ||
16368 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
16369 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
16370 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
16371 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
16372 | am__v_GEN_0 = @echo " GEN " $@; | ||
16373 | SOURCES = $(videoxoverlay_SOURCES) | ||
16374 | DIST_SOURCES = $(am__videoxoverlay_SOURCES_DIST) | ||
16375 | @@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ | ||
16376 | EGREP = @EGREP@ | ||
16377 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
16378 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
16379 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
16380 | EXEEXT = @EXEEXT@ | ||
16381 | FFLAGS = @FFLAGS@ | ||
16382 | FGREP = @FGREP@ | ||
16383 | @@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
16384 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
16385 | GST_CURRENT = @GST_CURRENT@ | ||
16386 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
16387 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
16388 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
16389 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
16390 | GST_LIBS = @GST_LIBS@ | ||
16391 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
16392 | @@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
16393 | GST_LICENSE = @GST_LICENSE@ | ||
16394 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
16395 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
16396 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
16397 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
16398 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
16399 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
16400 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
16401 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
16402 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
16403 | @@ -281,7 +286,7 @@ NM = @NM@ | ||
16404 | NMEDIT = @NMEDIT@ | ||
16405 | OBJC = @OBJC@ | ||
16406 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
16407 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
16408 | +OBJCFLAGS = @OBJCFLAGS@ | ||
16409 | OBJDUMP = @OBJDUMP@ | ||
16410 | OBJEXT = @OBJEXT@ | ||
16411 | OPENGL_ES2 = @OPENGL_ES2@ | ||
16412 | @@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
16413 | VERSION = @VERSION@ | ||
16414 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
16415 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
16416 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
16417 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
16418 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
16419 | XGETTEXT = @XGETTEXT@ | ||
16420 | @@ -391,12 +397,16 @@ sbindir = @sbindir@ | ||
16421 | sharedstatedir = @sharedstatedir@ | ||
16422 | srcdir = @srcdir@ | ||
16423 | sysconfdir = @sysconfdir@ | ||
16424 | +target = @target@ | ||
16425 | target_alias = @target_alias@ | ||
16426 | +target_cpu = @target_cpu@ | ||
16427 | +target_os = @target_os@ | ||
16428 | +target_vendor = @target_vendor@ | ||
16429 | top_build_prefix = @top_build_prefix@ | ||
16430 | top_builddir = @top_builddir@ | ||
16431 | top_srcdir = @top_srcdir@ | ||
16432 | @GL_BACKEND_COCOA_TRUE@videoxoverlay_SOURCES = main.m | ||
16433 | -@GL_BACKEND_COCOA_TRUE@videoxoverlay_OBJCFLAGS = $(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ | ||
16434 | +@GL_BACKEND_COCOA_TRUE@videoxoverlay_OBJCFLAGS = $(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ | ||
16435 | @GL_BACKEND_COCOA_TRUE@ $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 | ||
16436 | |||
16437 | @GL_BACKEND_COCOA_TRUE@videoxoverlay_LDADD = $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ | ||
16438 | @@ -446,7 +456,7 @@ clean-noinstPROGRAMS: | ||
16439 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
16440 | echo " rm -f" $$list; \ | ||
16441 | rm -f $$list | ||
16442 | -videoxoverlay$(EXEEXT): $(videoxoverlay_OBJECTS) $(videoxoverlay_DEPENDENCIES) $(EXTRA_videoxoverlay_DEPENDENCIES) | ||
16443 | +videoxoverlay$(EXEEXT): $(videoxoverlay_OBJECTS) $(videoxoverlay_DEPENDENCIES) | ||
16444 | @rm -f videoxoverlay$(EXEEXT) | ||
16445 | $(AM_V_OBJCLD)$(videoxoverlay_LINK) $(videoxoverlay_OBJECTS) $(videoxoverlay_LDADD) $(LIBS) | ||
16446 | |||
16447 | @@ -461,37 +471,42 @@ distclean-compile: | ||
16448 | .m.o: | ||
16449 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
16450 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
16451 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16452 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
16453 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16454 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16455 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< | ||
16456 | +@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $< | ||
16457 | |||
16458 | .m.obj: | ||
16459 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
16460 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
16461 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16462 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
16463 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16464 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16465 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
16466 | +@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
16467 | |||
16468 | .m.lo: | ||
16469 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
16470 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
16471 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
16472 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
16473 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
16474 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16475 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $< | ||
16476 | +@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $< | ||
16477 | |||
16478 | videoxoverlay-main.o: main.m | ||
16479 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -MT videoxoverlay-main.o -MD -MP -MF $(DEPDIR)/videoxoverlay-main.Tpo -c -o videoxoverlay-main.o `test -f 'main.m' || echo '$(srcdir)/'`main.m | ||
16480 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/videoxoverlay-main.Tpo $(DEPDIR)/videoxoverlay-main.Po | ||
16481 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='main.m' object='videoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
16482 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
16483 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='main.m' object='videoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
16484 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16485 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -c -o videoxoverlay-main.o `test -f 'main.m' || echo '$(srcdir)/'`main.m | ||
16486 | +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -c -o videoxoverlay-main.o `test -f 'main.m' || echo '$(srcdir)/'`main.m | ||
16487 | |||
16488 | videoxoverlay-main.obj: main.m | ||
16489 | @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -MT videoxoverlay-main.obj -MD -MP -MF $(DEPDIR)/videoxoverlay-main.Tpo -c -o videoxoverlay-main.obj `if test -f 'main.m'; then $(CYGPATH_W) 'main.m'; else $(CYGPATH_W) '$(srcdir)/main.m'; fi` | ||
16490 | @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/videoxoverlay-main.Tpo $(DEPDIR)/videoxoverlay-main.Po | ||
16491 | -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='main.m' object='videoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
16492 | +@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ | ||
16493 | +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='main.m' object='videoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
16494 | @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16495 | -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -c -o videoxoverlay-main.obj `if test -f 'main.m'; then $(CYGPATH_W) 'main.m'; else $(CYGPATH_W) '$(srcdir)/main.m'; fi` | ||
16496 | +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(videoxoverlay_OBJCFLAGS) $(OBJCFLAGS) -c -o videoxoverlay-main.obj `if test -f 'main.m'; then $(CYGPATH_W) 'main.m'; else $(CYGPATH_W) '$(srcdir)/main.m'; fi` | ||
16497 | |||
16498 | mostlyclean-libtool: | ||
16499 | -rm -f *.lo | ||
16500 | @@ -595,15 +610,10 @@ install-am: all-am | ||
16501 | |||
16502 | installcheck: installcheck-am | ||
16503 | install-strip: | ||
16504 | - if test -z '$(STRIP)'; then \ | ||
16505 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16506 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16507 | - install; \ | ||
16508 | - else \ | ||
16509 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16510 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16511 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
16512 | - fi | ||
16513 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16514 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16515 | + `test -z '$(STRIP)' || \ | ||
16516 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
16517 | mostlyclean-generic: | ||
16518 | |||
16519 | clean-generic: | ||
16520 | diff --git a/tests/examples/generic/Makefile.in b/tests/examples/generic/Makefile.in | ||
16521 | index ad146a2..953cc6c 100644 | ||
16522 | --- a/tests/examples/generic/Makefile.in | ||
16523 | +++ b/tests/examples/generic/Makefile.in | ||
16524 | @@ -1,9 +1,9 @@ | ||
16525 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
16526 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
16527 | # @configure_input@ | ||
16528 | |||
16529 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
16530 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
16531 | -# Foundation, Inc. | ||
16532 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
16533 | +# Inc. | ||
16534 | # This Makefile.in is free software; the Free Software Foundation | ||
16535 | # gives unlimited permission to copy and/or distribute it, | ||
16536 | # with or without modifications, as long as this notice is preserved. | ||
16537 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
16538 | POST_UNINSTALL = : | ||
16539 | build_triplet = @build@ | ||
16540 | host_triplet = @host@ | ||
16541 | +target_triplet = @target@ | ||
16542 | subdir = tests/examples/generic | ||
16543 | DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
16544 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
16545 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
16546 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
16547 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
16548 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
16549 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
16550 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
16551 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
16552 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
16553 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
16554 | CONFIG_HEADER = $(top_builddir)/config.h | ||
16555 | CONFIG_CLEAN_FILES = | ||
16556 | CONFIG_CLEAN_VPATH_FILES = | ||
16557 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
16558 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
16559 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
16560 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
16561 | am__v_GEN_0 = @echo " GEN " $@; | ||
16562 | -AM_V_at = $(am__v_at_@AM_V@) | ||
16563 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
16564 | +AM_V_at = $(am__v_at_$(V)) | ||
16565 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
16566 | am__v_at_0 = @ | ||
16567 | SOURCES = | ||
16568 | DIST_SOURCES = | ||
16569 | @@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ | ||
16570 | EGREP = @EGREP@ | ||
16571 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
16572 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
16573 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
16574 | EXEEXT = @EXEEXT@ | ||
16575 | FFLAGS = @FFLAGS@ | ||
16576 | FGREP = @FGREP@ | ||
16577 | @@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
16578 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
16579 | GST_CURRENT = @GST_CURRENT@ | ||
16580 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
16581 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
16582 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
16583 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
16584 | GST_LIBS = @GST_LIBS@ | ||
16585 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
16586 | @@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
16587 | GST_LICENSE = @GST_LICENSE@ | ||
16588 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
16589 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
16590 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
16591 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
16592 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
16593 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
16594 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
16595 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
16596 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
16597 | @@ -280,7 +285,7 @@ NM = @NM@ | ||
16598 | NMEDIT = @NMEDIT@ | ||
16599 | OBJC = @OBJC@ | ||
16600 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
16601 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
16602 | +OBJCFLAGS = @OBJCFLAGS@ | ||
16603 | OBJDUMP = @OBJDUMP@ | ||
16604 | OBJEXT = @OBJEXT@ | ||
16605 | OPENGL_ES2 = @OPENGL_ES2@ | ||
16606 | @@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
16607 | VERSION = @VERSION@ | ||
16608 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
16609 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
16610 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
16611 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
16612 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
16613 | XGETTEXT = @XGETTEXT@ | ||
16614 | @@ -390,7 +396,11 @@ sbindir = @sbindir@ | ||
16615 | sharedstatedir = @sharedstatedir@ | ||
16616 | srcdir = @srcdir@ | ||
16617 | sysconfdir = @sysconfdir@ | ||
16618 | +target = @target@ | ||
16619 | target_alias = @target_alias@ | ||
16620 | +target_cpu = @target_cpu@ | ||
16621 | +target_os = @target_os@ | ||
16622 | +target_vendor = @target_vendor@ | ||
16623 | top_build_prefix = @top_build_prefix@ | ||
16624 | top_builddir = @top_builddir@ | ||
16625 | top_srcdir = @top_srcdir@ | ||
16626 | @@ -643,15 +653,10 @@ install-am: all-am | ||
16627 | |||
16628 | installcheck: installcheck-recursive | ||
16629 | install-strip: | ||
16630 | - if test -z '$(STRIP)'; then \ | ||
16631 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16632 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16633 | - install; \ | ||
16634 | - else \ | ||
16635 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16636 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16637 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
16638 | - fi | ||
16639 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16640 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16641 | + `test -z '$(STRIP)' || \ | ||
16642 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
16643 | mostlyclean-generic: | ||
16644 | |||
16645 | clean-generic: | ||
16646 | diff --git a/tests/examples/generic/cube/Makefile.in b/tests/examples/generic/cube/Makefile.in | ||
16647 | index 495a646..cf722a7 100644 | ||
16648 | --- a/tests/examples/generic/cube/Makefile.in | ||
16649 | +++ b/tests/examples/generic/cube/Makefile.in | ||
16650 | @@ -1,9 +1,9 @@ | ||
16651 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
16652 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
16653 | # @configure_input@ | ||
16654 | |||
16655 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
16656 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
16657 | -# Foundation, Inc. | ||
16658 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
16659 | +# Inc. | ||
16660 | # This Makefile.in is free software; the Free Software Foundation | ||
16661 | # gives unlimited permission to copy and/or distribute it, | ||
16662 | # with or without modifications, as long as this notice is preserved. | ||
16663 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
16664 | POST_UNINSTALL = : | ||
16665 | build_triplet = @build@ | ||
16666 | host_triplet = @host@ | ||
16667 | +target_triplet = @target@ | ||
16668 | noinst_PROGRAMS = cube$(EXEEXT) | ||
16669 | subdir = tests/examples/generic/cube | ||
16670 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
16671 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
16672 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
16673 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
16674 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
16675 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
16676 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
16677 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
16678 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
16679 | @@ -80,8 +80,8 @@ am_cube_OBJECTS = cube-main.$(OBJEXT) | ||
16680 | cube_OBJECTS = $(am_cube_OBJECTS) | ||
16681 | am__DEPENDENCIES_1 = | ||
16682 | cube_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
16683 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
16684 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
16685 | +AM_V_lt = $(am__v_lt_$(V)) | ||
16686 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
16687 | am__v_lt_0 = --silent | ||
16688 | cube_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
16689 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(cube_CXXFLAGS) \ | ||
16690 | @@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
16691 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
16692 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
16693 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
16694 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
16695 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
16696 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
16697 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
16698 | am__v_CXX_0 = @echo " CXX " $@; | ||
16699 | -AM_V_at = $(am__v_at_@AM_V@) | ||
16700 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
16701 | +AM_V_at = $(am__v_at_$(V)) | ||
16702 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
16703 | am__v_at_0 = @ | ||
16704 | CXXLD = $(CXX) | ||
16705 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
16706 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
16707 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
16708 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
16709 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
16710 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
16711 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
16712 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
16713 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
16714 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
16715 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
16716 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
16717 | am__v_GEN_0 = @echo " GEN " $@; | ||
16718 | SOURCES = $(cube_SOURCES) | ||
16719 | DIST_SOURCES = $(cube_SOURCES) | ||
16720 | @@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ | ||
16721 | EGREP = @EGREP@ | ||
16722 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
16723 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
16724 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
16725 | EXEEXT = @EXEEXT@ | ||
16726 | FFLAGS = @FFLAGS@ | ||
16727 | FGREP = @FGREP@ | ||
16728 | @@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
16729 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
16730 | GST_CURRENT = @GST_CURRENT@ | ||
16731 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
16732 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
16733 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
16734 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
16735 | GST_LIBS = @GST_LIBS@ | ||
16736 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
16737 | @@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
16738 | GST_LICENSE = @GST_LICENSE@ | ||
16739 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
16740 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
16741 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
16742 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
16743 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
16744 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
16745 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
16746 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
16747 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
16748 | @@ -275,7 +280,7 @@ NM = @NM@ | ||
16749 | NMEDIT = @NMEDIT@ | ||
16750 | OBJC = @OBJC@ | ||
16751 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
16752 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
16753 | +OBJCFLAGS = @OBJCFLAGS@ | ||
16754 | OBJDUMP = @OBJDUMP@ | ||
16755 | OBJEXT = @OBJEXT@ | ||
16756 | OPENGL_ES2 = @OPENGL_ES2@ | ||
16757 | @@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
16758 | VERSION = @VERSION@ | ||
16759 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
16760 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
16761 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
16762 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
16763 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
16764 | XGETTEXT = @XGETTEXT@ | ||
16765 | @@ -385,7 +391,11 @@ sbindir = @sbindir@ | ||
16766 | sharedstatedir = @sharedstatedir@ | ||
16767 | srcdir = @srcdir@ | ||
16768 | sysconfdir = @sysconfdir@ | ||
16769 | +target = @target@ | ||
16770 | target_alias = @target_alias@ | ||
16771 | +target_cpu = @target_cpu@ | ||
16772 | +target_os = @target_os@ | ||
16773 | +target_vendor = @target_vendor@ | ||
16774 | top_build_prefix = @top_build_prefix@ | ||
16775 | top_builddir = @top_builddir@ | ||
16776 | top_srcdir = @top_srcdir@ | ||
16777 | @@ -435,7 +445,7 @@ clean-noinstPROGRAMS: | ||
16778 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
16779 | echo " rm -f" $$list; \ | ||
16780 | rm -f $$list | ||
16781 | -cube$(EXEEXT): $(cube_OBJECTS) $(cube_DEPENDENCIES) $(EXTRA_cube_DEPENDENCIES) | ||
16782 | +cube$(EXEEXT): $(cube_OBJECTS) $(cube_DEPENDENCIES) | ||
16783 | @rm -f cube$(EXEEXT) | ||
16784 | $(AM_V_CXXLD)$(cube_LINK) $(cube_OBJECTS) $(cube_LDADD) $(LIBS) | ||
16785 | |||
16786 | @@ -450,37 +460,42 @@ distclean-compile: | ||
16787 | .cpp.o: | ||
16788 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
16789 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
16790 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16791 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
16792 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16793 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16794 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
16795 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
16796 | |||
16797 | .cpp.obj: | ||
16798 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
16799 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
16800 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16801 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
16802 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
16803 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16804 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
16805 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
16806 | |||
16807 | .cpp.lo: | ||
16808 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
16809 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
16810 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
16811 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
16812 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
16813 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16814 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
16815 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
16816 | |||
16817 | cube-main.o: main.cpp | ||
16818 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -MT cube-main.o -MD -MP -MF $(DEPDIR)/cube-main.Tpo -c -o cube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
16819 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cube-main.Tpo $(DEPDIR)/cube-main.Po | ||
16820 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cube-main.o' libtool=no @AMDEPBACKSLASH@ | ||
16821 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
16822 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cube-main.o' libtool=no @AMDEPBACKSLASH@ | ||
16823 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16824 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -c -o cube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
16825 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -c -o cube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
16826 | |||
16827 | cube-main.obj: main.cpp | ||
16828 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -MT cube-main.obj -MD -MP -MF $(DEPDIR)/cube-main.Tpo -c -o cube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
16829 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cube-main.Tpo $(DEPDIR)/cube-main.Po | ||
16830 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cube-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
16831 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
16832 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cube-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
16833 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
16834 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -c -o cube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
16835 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cube_CXXFLAGS) $(CXXFLAGS) -c -o cube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
16836 | |||
16837 | mostlyclean-libtool: | ||
16838 | -rm -f *.lo | ||
16839 | @@ -584,15 +599,10 @@ install-am: all-am | ||
16840 | |||
16841 | installcheck: installcheck-am | ||
16842 | install-strip: | ||
16843 | - if test -z '$(STRIP)'; then \ | ||
16844 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16845 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16846 | - install; \ | ||
16847 | - else \ | ||
16848 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16849 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16850 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
16851 | - fi | ||
16852 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
16853 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
16854 | + `test -z '$(STRIP)' || \ | ||
16855 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
16856 | mostlyclean-generic: | ||
16857 | |||
16858 | clean-generic: | ||
16859 | diff --git a/tests/examples/generic/cube/cube.vcproj b/tests/examples/generic/cube/cube.vcproj | ||
16860 | new file mode 100644 | ||
16861 | index 0000000..83cfd27 | ||
16862 | --- /dev/null | ||
16863 | +++ b/tests/examples/generic/cube/cube.vcproj | ||
16864 | @@ -0,0 +1,202 @@ | ||
16865 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
16866 | +<VisualStudioProject | ||
16867 | + ProjectType="Visual C++" | ||
16868 | + Version="9,00" | ||
16869 | + Name="cube" | ||
16870 | + ProjectGUID="{DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}" | ||
16871 | + RootNamespace="cube" | ||
16872 | + Keyword="Win32Proj" | ||
16873 | + TargetFrameworkVersion="131072" | ||
16874 | + > | ||
16875 | + <Platforms> | ||
16876 | + <Platform | ||
16877 | + Name="Win32" | ||
16878 | + /> | ||
16879 | + </Platforms> | ||
16880 | + <ToolFiles> | ||
16881 | + </ToolFiles> | ||
16882 | + <Configurations> | ||
16883 | + <Configuration | ||
16884 | + Name="Debug|Win32" | ||
16885 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
16886 | + IntermediateDirectory="$(ConfigurationName)" | ||
16887 | + ConfigurationType="1" | ||
16888 | + CharacterSet="1" | ||
16889 | + > | ||
16890 | + <Tool | ||
16891 | + Name="VCPreBuildEventTool" | ||
16892 | + /> | ||
16893 | + <Tool | ||
16894 | + Name="VCCustomBuildTool" | ||
16895 | + /> | ||
16896 | + <Tool | ||
16897 | + Name="VCXMLDataGeneratorTool" | ||
16898 | + /> | ||
16899 | + <Tool | ||
16900 | + Name="VCWebServiceProxyGeneratorTool" | ||
16901 | + /> | ||
16902 | + <Tool | ||
16903 | + Name="VCMIDLTool" | ||
16904 | + /> | ||
16905 | + <Tool | ||
16906 | + Name="VCCLCompilerTool" | ||
16907 | + Optimization="0" | ||
16908 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
16909 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
16910 | + MinimalRebuild="true" | ||
16911 | + BasicRuntimeChecks="3" | ||
16912 | + RuntimeLibrary="3" | ||
16913 | + UsePrecompiledHeader="0" | ||
16914 | + WarningLevel="3" | ||
16915 | + Detect64BitPortabilityProblems="true" | ||
16916 | + DebugInformationFormat="4" | ||
16917 | + /> | ||
16918 | + <Tool | ||
16919 | + Name="VCManagedResourceCompilerTool" | ||
16920 | + /> | ||
16921 | + <Tool | ||
16922 | + Name="VCResourceCompilerTool" | ||
16923 | + /> | ||
16924 | + <Tool | ||
16925 | + Name="VCPreLinkEventTool" | ||
16926 | + /> | ||
16927 | + <Tool | ||
16928 | + Name="VCLinkerTool" | ||
16929 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
16930 | + LinkIncremental="2" | ||
16931 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
16932 | + GenerateDebugInformation="true" | ||
16933 | + SubSystem="1" | ||
16934 | + RandomizedBaseAddress="1" | ||
16935 | + DataExecutionPrevention="0" | ||
16936 | + TargetMachine="1" | ||
16937 | + /> | ||
16938 | + <Tool | ||
16939 | + Name="VCALinkTool" | ||
16940 | + /> | ||
16941 | + <Tool | ||
16942 | + Name="VCManifestTool" | ||
16943 | + /> | ||
16944 | + <Tool | ||
16945 | + Name="VCXDCMakeTool" | ||
16946 | + /> | ||
16947 | + <Tool | ||
16948 | + Name="VCBscMakeTool" | ||
16949 | + /> | ||
16950 | + <Tool | ||
16951 | + Name="VCFxCopTool" | ||
16952 | + /> | ||
16953 | + <Tool | ||
16954 | + Name="VCAppVerifierTool" | ||
16955 | + /> | ||
16956 | + <Tool | ||
16957 | + Name="VCPostBuildEventTool" | ||
16958 | + /> | ||
16959 | + </Configuration> | ||
16960 | + <Configuration | ||
16961 | + Name="Release|Win32" | ||
16962 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
16963 | + IntermediateDirectory="$(ConfigurationName)" | ||
16964 | + ConfigurationType="1" | ||
16965 | + CharacterSet="1" | ||
16966 | + WholeProgramOptimization="1" | ||
16967 | + > | ||
16968 | + <Tool | ||
16969 | + Name="VCPreBuildEventTool" | ||
16970 | + /> | ||
16971 | + <Tool | ||
16972 | + Name="VCCustomBuildTool" | ||
16973 | + /> | ||
16974 | + <Tool | ||
16975 | + Name="VCXMLDataGeneratorTool" | ||
16976 | + /> | ||
16977 | + <Tool | ||
16978 | + Name="VCWebServiceProxyGeneratorTool" | ||
16979 | + /> | ||
16980 | + <Tool | ||
16981 | + Name="VCMIDLTool" | ||
16982 | + /> | ||
16983 | + <Tool | ||
16984 | + Name="VCCLCompilerTool" | ||
16985 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
16986 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
16987 | + RuntimeLibrary="2" | ||
16988 | + UsePrecompiledHeader="0" | ||
16989 | + WarningLevel="3" | ||
16990 | + Detect64BitPortabilityProblems="true" | ||
16991 | + DebugInformationFormat="3" | ||
16992 | + /> | ||
16993 | + <Tool | ||
16994 | + Name="VCManagedResourceCompilerTool" | ||
16995 | + /> | ||
16996 | + <Tool | ||
16997 | + Name="VCResourceCompilerTool" | ||
16998 | + /> | ||
16999 | + <Tool | ||
17000 | + Name="VCPreLinkEventTool" | ||
17001 | + /> | ||
17002 | + <Tool | ||
17003 | + Name="VCLinkerTool" | ||
17004 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
17005 | + LinkIncremental="1" | ||
17006 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
17007 | + GenerateDebugInformation="true" | ||
17008 | + SubSystem="1" | ||
17009 | + OptimizeReferences="2" | ||
17010 | + EnableCOMDATFolding="2" | ||
17011 | + RandomizedBaseAddress="1" | ||
17012 | + DataExecutionPrevention="0" | ||
17013 | + TargetMachine="1" | ||
17014 | + /> | ||
17015 | + <Tool | ||
17016 | + Name="VCALinkTool" | ||
17017 | + /> | ||
17018 | + <Tool | ||
17019 | + Name="VCManifestTool" | ||
17020 | + /> | ||
17021 | + <Tool | ||
17022 | + Name="VCXDCMakeTool" | ||
17023 | + /> | ||
17024 | + <Tool | ||
17025 | + Name="VCBscMakeTool" | ||
17026 | + /> | ||
17027 | + <Tool | ||
17028 | + Name="VCFxCopTool" | ||
17029 | + /> | ||
17030 | + <Tool | ||
17031 | + Name="VCAppVerifierTool" | ||
17032 | + /> | ||
17033 | + <Tool | ||
17034 | + Name="VCPostBuildEventTool" | ||
17035 | + /> | ||
17036 | + </Configuration> | ||
17037 | + </Configurations> | ||
17038 | + <References> | ||
17039 | + </References> | ||
17040 | + <Files> | ||
17041 | + <Filter | ||
17042 | + Name="Source Files" | ||
17043 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
17044 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
17045 | + > | ||
17046 | + <File | ||
17047 | + RelativePath=".\main.cpp" | ||
17048 | + > | ||
17049 | + </File> | ||
17050 | + </Filter> | ||
17051 | + <Filter | ||
17052 | + Name="Header Files" | ||
17053 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
17054 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
17055 | + > | ||
17056 | + </Filter> | ||
17057 | + <Filter | ||
17058 | + Name="Resource Files" | ||
17059 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
17060 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
17061 | + > | ||
17062 | + </Filter> | ||
17063 | + </Files> | ||
17064 | + <Globals> | ||
17065 | + </Globals> | ||
17066 | +</VisualStudioProject> | ||
17067 | diff --git a/tests/examples/generic/cubeyuv/Makefile.in b/tests/examples/generic/cubeyuv/Makefile.in | ||
17068 | index 9345de2..9e57d08 100644 | ||
17069 | --- a/tests/examples/generic/cubeyuv/Makefile.in | ||
17070 | +++ b/tests/examples/generic/cubeyuv/Makefile.in | ||
17071 | @@ -1,9 +1,9 @@ | ||
17072 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
17073 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
17074 | # @configure_input@ | ||
17075 | |||
17076 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
17077 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
17078 | -# Foundation, Inc. | ||
17079 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
17080 | +# Inc. | ||
17081 | # This Makefile.in is free software; the Free Software Foundation | ||
17082 | # gives unlimited permission to copy and/or distribute it, | ||
17083 | # with or without modifications, as long as this notice is preserved. | ||
17084 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
17085 | POST_UNINSTALL = : | ||
17086 | build_triplet = @build@ | ||
17087 | host_triplet = @host@ | ||
17088 | +target_triplet = @target@ | ||
17089 | noinst_PROGRAMS = cubeyuv$(EXEEXT) | ||
17090 | subdir = tests/examples/generic/cubeyuv | ||
17091 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
17092 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
17093 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
17094 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
17095 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
17096 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
17097 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
17098 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
17099 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
17100 | @@ -80,8 +80,8 @@ am_cubeyuv_OBJECTS = cubeyuv-main.$(OBJEXT) | ||
17101 | cubeyuv_OBJECTS = $(am_cubeyuv_OBJECTS) | ||
17102 | am__DEPENDENCIES_1 = | ||
17103 | cubeyuv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
17104 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
17105 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
17106 | +AM_V_lt = $(am__v_lt_$(V)) | ||
17107 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
17108 | am__v_lt_0 = --silent | ||
17109 | cubeyuv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17110 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(cubeyuv_CXXFLAGS) \ | ||
17111 | @@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17112 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
17113 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
17114 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
17115 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
17116 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
17117 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
17118 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
17119 | am__v_CXX_0 = @echo " CXX " $@; | ||
17120 | -AM_V_at = $(am__v_at_@AM_V@) | ||
17121 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
17122 | +AM_V_at = $(am__v_at_$(V)) | ||
17123 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
17124 | am__v_at_0 = @ | ||
17125 | CXXLD = $(CXX) | ||
17126 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17127 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
17128 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
17129 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
17130 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
17131 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
17132 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
17133 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
17134 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
17135 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
17136 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
17137 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
17138 | am__v_GEN_0 = @echo " GEN " $@; | ||
17139 | SOURCES = $(cubeyuv_SOURCES) | ||
17140 | DIST_SOURCES = $(cubeyuv_SOURCES) | ||
17141 | @@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ | ||
17142 | EGREP = @EGREP@ | ||
17143 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
17144 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
17145 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
17146 | EXEEXT = @EXEEXT@ | ||
17147 | FFLAGS = @FFLAGS@ | ||
17148 | FGREP = @FGREP@ | ||
17149 | @@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
17150 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
17151 | GST_CURRENT = @GST_CURRENT@ | ||
17152 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
17153 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
17154 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
17155 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
17156 | GST_LIBS = @GST_LIBS@ | ||
17157 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
17158 | @@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
17159 | GST_LICENSE = @GST_LICENSE@ | ||
17160 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
17161 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
17162 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
17163 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
17164 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
17165 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
17166 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
17167 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
17168 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
17169 | @@ -275,7 +280,7 @@ NM = @NM@ | ||
17170 | NMEDIT = @NMEDIT@ | ||
17171 | OBJC = @OBJC@ | ||
17172 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
17173 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
17174 | +OBJCFLAGS = @OBJCFLAGS@ | ||
17175 | OBJDUMP = @OBJDUMP@ | ||
17176 | OBJEXT = @OBJEXT@ | ||
17177 | OPENGL_ES2 = @OPENGL_ES2@ | ||
17178 | @@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
17179 | VERSION = @VERSION@ | ||
17180 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
17181 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
17182 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
17183 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
17184 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
17185 | XGETTEXT = @XGETTEXT@ | ||
17186 | @@ -385,7 +391,11 @@ sbindir = @sbindir@ | ||
17187 | sharedstatedir = @sharedstatedir@ | ||
17188 | srcdir = @srcdir@ | ||
17189 | sysconfdir = @sysconfdir@ | ||
17190 | +target = @target@ | ||
17191 | target_alias = @target_alias@ | ||
17192 | +target_cpu = @target_cpu@ | ||
17193 | +target_os = @target_os@ | ||
17194 | +target_vendor = @target_vendor@ | ||
17195 | top_build_prefix = @top_build_prefix@ | ||
17196 | top_builddir = @top_builddir@ | ||
17197 | top_srcdir = @top_srcdir@ | ||
17198 | @@ -435,7 +445,7 @@ clean-noinstPROGRAMS: | ||
17199 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
17200 | echo " rm -f" $$list; \ | ||
17201 | rm -f $$list | ||
17202 | -cubeyuv$(EXEEXT): $(cubeyuv_OBJECTS) $(cubeyuv_DEPENDENCIES) $(EXTRA_cubeyuv_DEPENDENCIES) | ||
17203 | +cubeyuv$(EXEEXT): $(cubeyuv_OBJECTS) $(cubeyuv_DEPENDENCIES) | ||
17204 | @rm -f cubeyuv$(EXEEXT) | ||
17205 | $(AM_V_CXXLD)$(cubeyuv_LINK) $(cubeyuv_OBJECTS) $(cubeyuv_LDADD) $(LIBS) | ||
17206 | |||
17207 | @@ -450,37 +460,42 @@ distclean-compile: | ||
17208 | .cpp.o: | ||
17209 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
17210 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
17211 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17212 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17213 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17214 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17215 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
17216 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
17217 | |||
17218 | .cpp.obj: | ||
17219 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
17220 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
17221 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17222 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17223 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17224 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17225 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
17226 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
17227 | |||
17228 | .cpp.lo: | ||
17229 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
17230 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
17231 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
17232 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17233 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
17234 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17235 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
17236 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
17237 | |||
17238 | cubeyuv-main.o: main.cpp | ||
17239 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -MT cubeyuv-main.o -MD -MP -MF $(DEPDIR)/cubeyuv-main.Tpo -c -o cubeyuv-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17240 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cubeyuv-main.Tpo $(DEPDIR)/cubeyuv-main.Po | ||
17241 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cubeyuv-main.o' libtool=no @AMDEPBACKSLASH@ | ||
17242 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17243 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cubeyuv-main.o' libtool=no @AMDEPBACKSLASH@ | ||
17244 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17245 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -c -o cubeyuv-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17246 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -c -o cubeyuv-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17247 | |||
17248 | cubeyuv-main.obj: main.cpp | ||
17249 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -MT cubeyuv-main.obj -MD -MP -MF $(DEPDIR)/cubeyuv-main.Tpo -c -o cubeyuv-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17250 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cubeyuv-main.Tpo $(DEPDIR)/cubeyuv-main.Po | ||
17251 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cubeyuv-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
17252 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17253 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cubeyuv-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
17254 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17255 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -c -o cubeyuv-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17256 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cubeyuv_CXXFLAGS) $(CXXFLAGS) -c -o cubeyuv-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17257 | |||
17258 | mostlyclean-libtool: | ||
17259 | -rm -f *.lo | ||
17260 | @@ -584,15 +599,10 @@ install-am: all-am | ||
17261 | |||
17262 | installcheck: installcheck-am | ||
17263 | install-strip: | ||
17264 | - if test -z '$(STRIP)'; then \ | ||
17265 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17266 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17267 | - install; \ | ||
17268 | - else \ | ||
17269 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17270 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17271 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
17272 | - fi | ||
17273 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17274 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17275 | + `test -z '$(STRIP)' || \ | ||
17276 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
17277 | mostlyclean-generic: | ||
17278 | |||
17279 | clean-generic: | ||
17280 | diff --git a/tests/examples/generic/cubeyuv/cubeyuv.vcproj b/tests/examples/generic/cubeyuv/cubeyuv.vcproj | ||
17281 | new file mode 100644 | ||
17282 | index 0000000..0b3ed75 | ||
17283 | --- /dev/null | ||
17284 | +++ b/tests/examples/generic/cubeyuv/cubeyuv.vcproj | ||
17285 | @@ -0,0 +1,202 @@ | ||
17286 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
17287 | +<VisualStudioProject | ||
17288 | + ProjectType="Visual C++" | ||
17289 | + Version="9,00" | ||
17290 | + Name="cubeyuv" | ||
17291 | + ProjectGUID="{6C94B86A-8E34-4163-840A-BFD5C80B1F2E}" | ||
17292 | + RootNamespace="cubeyuv" | ||
17293 | + Keyword="Win32Proj" | ||
17294 | + TargetFrameworkVersion="131072" | ||
17295 | + > | ||
17296 | + <Platforms> | ||
17297 | + <Platform | ||
17298 | + Name="Win32" | ||
17299 | + /> | ||
17300 | + </Platforms> | ||
17301 | + <ToolFiles> | ||
17302 | + </ToolFiles> | ||
17303 | + <Configurations> | ||
17304 | + <Configuration | ||
17305 | + Name="Debug|Win32" | ||
17306 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
17307 | + IntermediateDirectory="$(ConfigurationName)" | ||
17308 | + ConfigurationType="1" | ||
17309 | + CharacterSet="1" | ||
17310 | + > | ||
17311 | + <Tool | ||
17312 | + Name="VCPreBuildEventTool" | ||
17313 | + /> | ||
17314 | + <Tool | ||
17315 | + Name="VCCustomBuildTool" | ||
17316 | + /> | ||
17317 | + <Tool | ||
17318 | + Name="VCXMLDataGeneratorTool" | ||
17319 | + /> | ||
17320 | + <Tool | ||
17321 | + Name="VCWebServiceProxyGeneratorTool" | ||
17322 | + /> | ||
17323 | + <Tool | ||
17324 | + Name="VCMIDLTool" | ||
17325 | + /> | ||
17326 | + <Tool | ||
17327 | + Name="VCCLCompilerTool" | ||
17328 | + Optimization="0" | ||
17329 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
17330 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
17331 | + MinimalRebuild="true" | ||
17332 | + BasicRuntimeChecks="3" | ||
17333 | + RuntimeLibrary="3" | ||
17334 | + UsePrecompiledHeader="0" | ||
17335 | + WarningLevel="3" | ||
17336 | + Detect64BitPortabilityProblems="true" | ||
17337 | + DebugInformationFormat="4" | ||
17338 | + /> | ||
17339 | + <Tool | ||
17340 | + Name="VCManagedResourceCompilerTool" | ||
17341 | + /> | ||
17342 | + <Tool | ||
17343 | + Name="VCResourceCompilerTool" | ||
17344 | + /> | ||
17345 | + <Tool | ||
17346 | + Name="VCPreLinkEventTool" | ||
17347 | + /> | ||
17348 | + <Tool | ||
17349 | + Name="VCLinkerTool" | ||
17350 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
17351 | + LinkIncremental="2" | ||
17352 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
17353 | + GenerateDebugInformation="true" | ||
17354 | + SubSystem="1" | ||
17355 | + RandomizedBaseAddress="1" | ||
17356 | + DataExecutionPrevention="0" | ||
17357 | + TargetMachine="1" | ||
17358 | + /> | ||
17359 | + <Tool | ||
17360 | + Name="VCALinkTool" | ||
17361 | + /> | ||
17362 | + <Tool | ||
17363 | + Name="VCManifestTool" | ||
17364 | + /> | ||
17365 | + <Tool | ||
17366 | + Name="VCXDCMakeTool" | ||
17367 | + /> | ||
17368 | + <Tool | ||
17369 | + Name="VCBscMakeTool" | ||
17370 | + /> | ||
17371 | + <Tool | ||
17372 | + Name="VCFxCopTool" | ||
17373 | + /> | ||
17374 | + <Tool | ||
17375 | + Name="VCAppVerifierTool" | ||
17376 | + /> | ||
17377 | + <Tool | ||
17378 | + Name="VCPostBuildEventTool" | ||
17379 | + /> | ||
17380 | + </Configuration> | ||
17381 | + <Configuration | ||
17382 | + Name="Release|Win32" | ||
17383 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
17384 | + IntermediateDirectory="$(ConfigurationName)" | ||
17385 | + ConfigurationType="1" | ||
17386 | + CharacterSet="1" | ||
17387 | + WholeProgramOptimization="1" | ||
17388 | + > | ||
17389 | + <Tool | ||
17390 | + Name="VCPreBuildEventTool" | ||
17391 | + /> | ||
17392 | + <Tool | ||
17393 | + Name="VCCustomBuildTool" | ||
17394 | + /> | ||
17395 | + <Tool | ||
17396 | + Name="VCXMLDataGeneratorTool" | ||
17397 | + /> | ||
17398 | + <Tool | ||
17399 | + Name="VCWebServiceProxyGeneratorTool" | ||
17400 | + /> | ||
17401 | + <Tool | ||
17402 | + Name="VCMIDLTool" | ||
17403 | + /> | ||
17404 | + <Tool | ||
17405 | + Name="VCCLCompilerTool" | ||
17406 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
17407 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
17408 | + RuntimeLibrary="2" | ||
17409 | + UsePrecompiledHeader="0" | ||
17410 | + WarningLevel="3" | ||
17411 | + Detect64BitPortabilityProblems="true" | ||
17412 | + DebugInformationFormat="3" | ||
17413 | + /> | ||
17414 | + <Tool | ||
17415 | + Name="VCManagedResourceCompilerTool" | ||
17416 | + /> | ||
17417 | + <Tool | ||
17418 | + Name="VCResourceCompilerTool" | ||
17419 | + /> | ||
17420 | + <Tool | ||
17421 | + Name="VCPreLinkEventTool" | ||
17422 | + /> | ||
17423 | + <Tool | ||
17424 | + Name="VCLinkerTool" | ||
17425 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
17426 | + LinkIncremental="1" | ||
17427 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
17428 | + GenerateDebugInformation="true" | ||
17429 | + SubSystem="1" | ||
17430 | + OptimizeReferences="2" | ||
17431 | + EnableCOMDATFolding="2" | ||
17432 | + RandomizedBaseAddress="1" | ||
17433 | + DataExecutionPrevention="0" | ||
17434 | + TargetMachine="1" | ||
17435 | + /> | ||
17436 | + <Tool | ||
17437 | + Name="VCALinkTool" | ||
17438 | + /> | ||
17439 | + <Tool | ||
17440 | + Name="VCManifestTool" | ||
17441 | + /> | ||
17442 | + <Tool | ||
17443 | + Name="VCXDCMakeTool" | ||
17444 | + /> | ||
17445 | + <Tool | ||
17446 | + Name="VCBscMakeTool" | ||
17447 | + /> | ||
17448 | + <Tool | ||
17449 | + Name="VCFxCopTool" | ||
17450 | + /> | ||
17451 | + <Tool | ||
17452 | + Name="VCAppVerifierTool" | ||
17453 | + /> | ||
17454 | + <Tool | ||
17455 | + Name="VCPostBuildEventTool" | ||
17456 | + /> | ||
17457 | + </Configuration> | ||
17458 | + </Configurations> | ||
17459 | + <References> | ||
17460 | + </References> | ||
17461 | + <Files> | ||
17462 | + <Filter | ||
17463 | + Name="Source Files" | ||
17464 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
17465 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
17466 | + > | ||
17467 | + <File | ||
17468 | + RelativePath=".\main.cpp" | ||
17469 | + > | ||
17470 | + </File> | ||
17471 | + </Filter> | ||
17472 | + <Filter | ||
17473 | + Name="Header Files" | ||
17474 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
17475 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
17476 | + > | ||
17477 | + </Filter> | ||
17478 | + <Filter | ||
17479 | + Name="Resource Files" | ||
17480 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
17481 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
17482 | + > | ||
17483 | + </Filter> | ||
17484 | + </Files> | ||
17485 | + <Globals> | ||
17486 | + </Globals> | ||
17487 | +</VisualStudioProject> | ||
17488 | diff --git a/tests/examples/generic/doublecube/Makefile.in b/tests/examples/generic/doublecube/Makefile.in | ||
17489 | index 05bd0d6..381eee9 100644 | ||
17490 | --- a/tests/examples/generic/doublecube/Makefile.in | ||
17491 | +++ b/tests/examples/generic/doublecube/Makefile.in | ||
17492 | @@ -1,9 +1,9 @@ | ||
17493 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
17494 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
17495 | # @configure_input@ | ||
17496 | |||
17497 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
17498 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
17499 | -# Foundation, Inc. | ||
17500 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
17501 | +# Inc. | ||
17502 | # This Makefile.in is free software; the Free Software Foundation | ||
17503 | # gives unlimited permission to copy and/or distribute it, | ||
17504 | # with or without modifications, as long as this notice is preserved. | ||
17505 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
17506 | POST_UNINSTALL = : | ||
17507 | build_triplet = @build@ | ||
17508 | host_triplet = @host@ | ||
17509 | +target_triplet = @target@ | ||
17510 | noinst_PROGRAMS = doublecube$(EXEEXT) | ||
17511 | subdir = tests/examples/generic/doublecube | ||
17512 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
17513 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
17514 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
17515 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
17516 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
17517 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
17518 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
17519 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
17520 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
17521 | @@ -80,8 +80,8 @@ am_doublecube_OBJECTS = doublecube-main.$(OBJEXT) | ||
17522 | doublecube_OBJECTS = $(am_doublecube_OBJECTS) | ||
17523 | am__DEPENDENCIES_1 = | ||
17524 | doublecube_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
17525 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
17526 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
17527 | +AM_V_lt = $(am__v_lt_$(V)) | ||
17528 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
17529 | am__v_lt_0 = --silent | ||
17530 | doublecube_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17531 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(doublecube_CXXFLAGS) \ | ||
17532 | @@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17533 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
17534 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
17535 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
17536 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
17537 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
17538 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
17539 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
17540 | am__v_CXX_0 = @echo " CXX " $@; | ||
17541 | -AM_V_at = $(am__v_at_@AM_V@) | ||
17542 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
17543 | +AM_V_at = $(am__v_at_$(V)) | ||
17544 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
17545 | am__v_at_0 = @ | ||
17546 | CXXLD = $(CXX) | ||
17547 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
17548 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
17549 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
17550 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
17551 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
17552 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
17553 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
17554 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
17555 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
17556 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
17557 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
17558 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
17559 | am__v_GEN_0 = @echo " GEN " $@; | ||
17560 | SOURCES = $(doublecube_SOURCES) | ||
17561 | DIST_SOURCES = $(doublecube_SOURCES) | ||
17562 | @@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ | ||
17563 | EGREP = @EGREP@ | ||
17564 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
17565 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
17566 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
17567 | EXEEXT = @EXEEXT@ | ||
17568 | FFLAGS = @FFLAGS@ | ||
17569 | FGREP = @FGREP@ | ||
17570 | @@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
17571 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
17572 | GST_CURRENT = @GST_CURRENT@ | ||
17573 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
17574 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
17575 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
17576 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
17577 | GST_LIBS = @GST_LIBS@ | ||
17578 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
17579 | @@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
17580 | GST_LICENSE = @GST_LICENSE@ | ||
17581 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
17582 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
17583 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
17584 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
17585 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
17586 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
17587 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
17588 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
17589 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
17590 | @@ -275,7 +280,7 @@ NM = @NM@ | ||
17591 | NMEDIT = @NMEDIT@ | ||
17592 | OBJC = @OBJC@ | ||
17593 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
17594 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
17595 | +OBJCFLAGS = @OBJCFLAGS@ | ||
17596 | OBJDUMP = @OBJDUMP@ | ||
17597 | OBJEXT = @OBJEXT@ | ||
17598 | OPENGL_ES2 = @OPENGL_ES2@ | ||
17599 | @@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
17600 | VERSION = @VERSION@ | ||
17601 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
17602 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
17603 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
17604 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
17605 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
17606 | XGETTEXT = @XGETTEXT@ | ||
17607 | @@ -385,7 +391,11 @@ sbindir = @sbindir@ | ||
17608 | sharedstatedir = @sharedstatedir@ | ||
17609 | srcdir = @srcdir@ | ||
17610 | sysconfdir = @sysconfdir@ | ||
17611 | +target = @target@ | ||
17612 | target_alias = @target_alias@ | ||
17613 | +target_cpu = @target_cpu@ | ||
17614 | +target_os = @target_os@ | ||
17615 | +target_vendor = @target_vendor@ | ||
17616 | top_build_prefix = @top_build_prefix@ | ||
17617 | top_builddir = @top_builddir@ | ||
17618 | top_srcdir = @top_srcdir@ | ||
17619 | @@ -435,7 +445,7 @@ clean-noinstPROGRAMS: | ||
17620 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
17621 | echo " rm -f" $$list; \ | ||
17622 | rm -f $$list | ||
17623 | -doublecube$(EXEEXT): $(doublecube_OBJECTS) $(doublecube_DEPENDENCIES) $(EXTRA_doublecube_DEPENDENCIES) | ||
17624 | +doublecube$(EXEEXT): $(doublecube_OBJECTS) $(doublecube_DEPENDENCIES) | ||
17625 | @rm -f doublecube$(EXEEXT) | ||
17626 | $(AM_V_CXXLD)$(doublecube_LINK) $(doublecube_OBJECTS) $(doublecube_LDADD) $(LIBS) | ||
17627 | |||
17628 | @@ -450,37 +460,42 @@ distclean-compile: | ||
17629 | .cpp.o: | ||
17630 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
17631 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
17632 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17633 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17634 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17635 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17636 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
17637 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
17638 | |||
17639 | .cpp.obj: | ||
17640 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
17641 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
17642 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17643 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17644 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
17645 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17646 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
17647 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
17648 | |||
17649 | .cpp.lo: | ||
17650 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
17651 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
17652 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
17653 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17654 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
17655 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17656 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
17657 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
17658 | |||
17659 | doublecube-main.o: main.cpp | ||
17660 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -MT doublecube-main.o -MD -MP -MF $(DEPDIR)/doublecube-main.Tpo -c -o doublecube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17661 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/doublecube-main.Tpo $(DEPDIR)/doublecube-main.Po | ||
17662 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='doublecube-main.o' libtool=no @AMDEPBACKSLASH@ | ||
17663 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17664 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='doublecube-main.o' libtool=no @AMDEPBACKSLASH@ | ||
17665 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17666 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -c -o doublecube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17667 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -c -o doublecube-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
17668 | |||
17669 | doublecube-main.obj: main.cpp | ||
17670 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -MT doublecube-main.obj -MD -MP -MF $(DEPDIR)/doublecube-main.Tpo -c -o doublecube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17671 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/doublecube-main.Tpo $(DEPDIR)/doublecube-main.Po | ||
17672 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='doublecube-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
17673 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
17674 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='doublecube-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
17675 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
17676 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -c -o doublecube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17677 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(doublecube_CXXFLAGS) $(CXXFLAGS) -c -o doublecube-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
17678 | |||
17679 | mostlyclean-libtool: | ||
17680 | -rm -f *.lo | ||
17681 | @@ -584,15 +599,10 @@ install-am: all-am | ||
17682 | |||
17683 | installcheck: installcheck-am | ||
17684 | install-strip: | ||
17685 | - if test -z '$(STRIP)'; then \ | ||
17686 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17687 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17688 | - install; \ | ||
17689 | - else \ | ||
17690 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17691 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17692 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
17693 | - fi | ||
17694 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
17695 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
17696 | + `test -z '$(STRIP)' || \ | ||
17697 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
17698 | mostlyclean-generic: | ||
17699 | |||
17700 | clean-generic: | ||
17701 | diff --git a/tests/examples/generic/doublecube/doublecube.vcproj b/tests/examples/generic/doublecube/doublecube.vcproj | ||
17702 | new file mode 100644 | ||
17703 | index 0000000..d3f5aa0 | ||
17704 | --- /dev/null | ||
17705 | +++ b/tests/examples/generic/doublecube/doublecube.vcproj | ||
17706 | @@ -0,0 +1,202 @@ | ||
17707 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
17708 | +<VisualStudioProject | ||
17709 | + ProjectType="Visual C++" | ||
17710 | + Version="9,00" | ||
17711 | + Name="doublecube" | ||
17712 | + ProjectGUID="{4EC968E0-5B6C-418A-8A75-F390D56DFFE8}" | ||
17713 | + RootNamespace="doublecube" | ||
17714 | + Keyword="Win32Proj" | ||
17715 | + TargetFrameworkVersion="131072" | ||
17716 | + > | ||
17717 | + <Platforms> | ||
17718 | + <Platform | ||
17719 | + Name="Win32" | ||
17720 | + /> | ||
17721 | + </Platforms> | ||
17722 | + <ToolFiles> | ||
17723 | + </ToolFiles> | ||
17724 | + <Configurations> | ||
17725 | + <Configuration | ||
17726 | + Name="Debug|Win32" | ||
17727 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
17728 | + IntermediateDirectory="$(ConfigurationName)" | ||
17729 | + ConfigurationType="1" | ||
17730 | + CharacterSet="1" | ||
17731 | + > | ||
17732 | + <Tool | ||
17733 | + Name="VCPreBuildEventTool" | ||
17734 | + /> | ||
17735 | + <Tool | ||
17736 | + Name="VCCustomBuildTool" | ||
17737 | + /> | ||
17738 | + <Tool | ||
17739 | + Name="VCXMLDataGeneratorTool" | ||
17740 | + /> | ||
17741 | + <Tool | ||
17742 | + Name="VCWebServiceProxyGeneratorTool" | ||
17743 | + /> | ||
17744 | + <Tool | ||
17745 | + Name="VCMIDLTool" | ||
17746 | + /> | ||
17747 | + <Tool | ||
17748 | + Name="VCCLCompilerTool" | ||
17749 | + Optimization="0" | ||
17750 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
17751 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
17752 | + MinimalRebuild="true" | ||
17753 | + BasicRuntimeChecks="3" | ||
17754 | + RuntimeLibrary="3" | ||
17755 | + UsePrecompiledHeader="0" | ||
17756 | + WarningLevel="3" | ||
17757 | + Detect64BitPortabilityProblems="true" | ||
17758 | + DebugInformationFormat="4" | ||
17759 | + /> | ||
17760 | + <Tool | ||
17761 | + Name="VCManagedResourceCompilerTool" | ||
17762 | + /> | ||
17763 | + <Tool | ||
17764 | + Name="VCResourceCompilerTool" | ||
17765 | + /> | ||
17766 | + <Tool | ||
17767 | + Name="VCPreLinkEventTool" | ||
17768 | + /> | ||
17769 | + <Tool | ||
17770 | + Name="VCLinkerTool" | ||
17771 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
17772 | + LinkIncremental="2" | ||
17773 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
17774 | + GenerateDebugInformation="true" | ||
17775 | + SubSystem="1" | ||
17776 | + RandomizedBaseAddress="1" | ||
17777 | + DataExecutionPrevention="0" | ||
17778 | + TargetMachine="1" | ||
17779 | + /> | ||
17780 | + <Tool | ||
17781 | + Name="VCALinkTool" | ||
17782 | + /> | ||
17783 | + <Tool | ||
17784 | + Name="VCManifestTool" | ||
17785 | + /> | ||
17786 | + <Tool | ||
17787 | + Name="VCXDCMakeTool" | ||
17788 | + /> | ||
17789 | + <Tool | ||
17790 | + Name="VCBscMakeTool" | ||
17791 | + /> | ||
17792 | + <Tool | ||
17793 | + Name="VCFxCopTool" | ||
17794 | + /> | ||
17795 | + <Tool | ||
17796 | + Name="VCAppVerifierTool" | ||
17797 | + /> | ||
17798 | + <Tool | ||
17799 | + Name="VCPostBuildEventTool" | ||
17800 | + /> | ||
17801 | + </Configuration> | ||
17802 | + <Configuration | ||
17803 | + Name="Release|Win32" | ||
17804 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
17805 | + IntermediateDirectory="$(ConfigurationName)" | ||
17806 | + ConfigurationType="1" | ||
17807 | + CharacterSet="1" | ||
17808 | + WholeProgramOptimization="1" | ||
17809 | + > | ||
17810 | + <Tool | ||
17811 | + Name="VCPreBuildEventTool" | ||
17812 | + /> | ||
17813 | + <Tool | ||
17814 | + Name="VCCustomBuildTool" | ||
17815 | + /> | ||
17816 | + <Tool | ||
17817 | + Name="VCXMLDataGeneratorTool" | ||
17818 | + /> | ||
17819 | + <Tool | ||
17820 | + Name="VCWebServiceProxyGeneratorTool" | ||
17821 | + /> | ||
17822 | + <Tool | ||
17823 | + Name="VCMIDLTool" | ||
17824 | + /> | ||
17825 | + <Tool | ||
17826 | + Name="VCCLCompilerTool" | ||
17827 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
17828 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
17829 | + RuntimeLibrary="2" | ||
17830 | + UsePrecompiledHeader="0" | ||
17831 | + WarningLevel="3" | ||
17832 | + Detect64BitPortabilityProblems="true" | ||
17833 | + DebugInformationFormat="3" | ||
17834 | + /> | ||
17835 | + <Tool | ||
17836 | + Name="VCManagedResourceCompilerTool" | ||
17837 | + /> | ||
17838 | + <Tool | ||
17839 | + Name="VCResourceCompilerTool" | ||
17840 | + /> | ||
17841 | + <Tool | ||
17842 | + Name="VCPreLinkEventTool" | ||
17843 | + /> | ||
17844 | + <Tool | ||
17845 | + Name="VCLinkerTool" | ||
17846 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
17847 | + LinkIncremental="1" | ||
17848 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
17849 | + GenerateDebugInformation="true" | ||
17850 | + SubSystem="1" | ||
17851 | + OptimizeReferences="2" | ||
17852 | + EnableCOMDATFolding="2" | ||
17853 | + RandomizedBaseAddress="1" | ||
17854 | + DataExecutionPrevention="0" | ||
17855 | + TargetMachine="1" | ||
17856 | + /> | ||
17857 | + <Tool | ||
17858 | + Name="VCALinkTool" | ||
17859 | + /> | ||
17860 | + <Tool | ||
17861 | + Name="VCManifestTool" | ||
17862 | + /> | ||
17863 | + <Tool | ||
17864 | + Name="VCXDCMakeTool" | ||
17865 | + /> | ||
17866 | + <Tool | ||
17867 | + Name="VCBscMakeTool" | ||
17868 | + /> | ||
17869 | + <Tool | ||
17870 | + Name="VCFxCopTool" | ||
17871 | + /> | ||
17872 | + <Tool | ||
17873 | + Name="VCAppVerifierTool" | ||
17874 | + /> | ||
17875 | + <Tool | ||
17876 | + Name="VCPostBuildEventTool" | ||
17877 | + /> | ||
17878 | + </Configuration> | ||
17879 | + </Configurations> | ||
17880 | + <References> | ||
17881 | + </References> | ||
17882 | + <Files> | ||
17883 | + <Filter | ||
17884 | + Name="Source Files" | ||
17885 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
17886 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
17887 | + > | ||
17888 | + <File | ||
17889 | + RelativePath=".\main.cpp" | ||
17890 | + > | ||
17891 | + </File> | ||
17892 | + </Filter> | ||
17893 | + <Filter | ||
17894 | + Name="Header Files" | ||
17895 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
17896 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
17897 | + > | ||
17898 | + </Filter> | ||
17899 | + <Filter | ||
17900 | + Name="Resource Files" | ||
17901 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
17902 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
17903 | + > | ||
17904 | + </Filter> | ||
17905 | + </Files> | ||
17906 | + <Globals> | ||
17907 | + </Globals> | ||
17908 | +</VisualStudioProject> | ||
17909 | diff --git a/tests/examples/generic/generic.sln b/tests/examples/generic/generic.sln | ||
17910 | new file mode 100644 | ||
17911 | index 0000000..22e86f6 | ||
17912 | --- /dev/null | ||
17913 | +++ b/tests/examples/generic/generic.sln | ||
17914 | @@ -0,0 +1,38 @@ | ||
17915 | +? | ||
17916 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
17917 | +# Visual Studio 2008 | ||
17918 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cube", "cube\cube.vcproj", "{DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}" | ||
17919 | +EndProject | ||
17920 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cubeyuv", "cubeyuv\cubeyuv.vcproj", "{6C94B86A-8E34-4163-840A-BFD5C80B1F2E}" | ||
17921 | +EndProject | ||
17922 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublecube", "doublecube\doublecube.vcproj", "{4EC968E0-5B6C-418A-8A75-F390D56DFFE8}" | ||
17923 | +EndProject | ||
17924 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recordgraphic", "recordgraphic\recordgraphic.vcproj", "{E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}" | ||
17925 | +EndProject | ||
17926 | +Global | ||
17927 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
17928 | + Debug|Win32 = Debug|Win32 | ||
17929 | + Release|Win32 = Release|Win32 | ||
17930 | + EndGlobalSection | ||
17931 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
17932 | + {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
17933 | + {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Debug|Win32.Build.0 = Debug|Win32 | ||
17934 | + {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Release|Win32.ActiveCfg = Release|Win32 | ||
17935 | + {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Release|Win32.Build.0 = Release|Win32 | ||
17936 | + {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
17937 | + {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Debug|Win32.Build.0 = Debug|Win32 | ||
17938 | + {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Release|Win32.ActiveCfg = Release|Win32 | ||
17939 | + {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Release|Win32.Build.0 = Release|Win32 | ||
17940 | + {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
17941 | + {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Debug|Win32.Build.0 = Debug|Win32 | ||
17942 | + {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Release|Win32.ActiveCfg = Release|Win32 | ||
17943 | + {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Release|Win32.Build.0 = Release|Win32 | ||
17944 | + {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
17945 | + {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Debug|Win32.Build.0 = Debug|Win32 | ||
17946 | + {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Release|Win32.ActiveCfg = Release|Win32 | ||
17947 | + {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Release|Win32.Build.0 = Release|Win32 | ||
17948 | + EndGlobalSection | ||
17949 | + GlobalSection(SolutionProperties) = preSolution | ||
17950 | + HideSolutionNode = FALSE | ||
17951 | + EndGlobalSection | ||
17952 | +EndGlobal | ||
17953 | diff --git a/tests/examples/generic/recordgraphic/Makefile b/tests/examples/generic/recordgraphic/Makefile | ||
17954 | new file mode 100644 | ||
17955 | index 0000000..4c27d99 | ||
17956 | --- /dev/null | ||
17957 | +++ b/tests/examples/generic/recordgraphic/Makefile | ||
17958 | @@ -0,0 +1,47 @@ | ||
17959 | +SRC=main.cpp | ||
17960 | +OBJ=$(SRC:.cpp=.o) | ||
17961 | +EXE=recordgraphic | ||
17962 | + | ||
17963 | +CPP=g++ | ||
17964 | +CPPFLAGS=-Wall -Werror -O3 -march=i686 -msse2 -mfpmath=sse | ||
17965 | +LDFLAGS= | ||
17966 | +LIBS=-lgstreamer-0.10 | ||
17967 | +RM=rm | ||
17968 | + | ||
17969 | +ifeq ($(OS),Windows_NT) | ||
17970 | +# Put Windows-specific stuff here (usefull for mingw32) | ||
17971 | +REXE=$(EXE).exe | ||
17972 | +CPPFLAGS=-I../../../../libxml2-2.6.30+.win32/include \ | ||
17973 | + -I../../../../libiconv/include \ | ||
17974 | + -I../../../../glib/include \ | ||
17975 | + -I../../../../gstreamer/include \ | ||
17976 | + -I../../../../glew/include | ||
17977 | +#ld tool from mingw needs dll too | ||
17978 | +LDFLAGS+=-L../../../../glib/lib \ | ||
17979 | + -L../../../../gstreamer/lib \ | ||
17980 | + -L../../../../glew/lib \ | ||
17981 | + -L../../../../glib/bin \ | ||
17982 | + -L../../../../gstreamer/bin/bin \ | ||
17983 | + -L../../../../glew/bin | ||
17984 | +LIBS+=-lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 \ | ||
17985 | + -lopengl32 -lglu32 -lglew32 -lglew32s | ||
17986 | +else | ||
17987 | +# Put Linux-specific stuff here | ||
17988 | +REXE=$(EXE) | ||
17989 | +CPPFLAGS+=-I/usr/include/gstreamer-0.10 \ | ||
17990 | + -I/usr/include/glib-2.0 \ | ||
17991 | + -I/usr/lib/glib-2.0/include \ | ||
17992 | + -I/usr/include/libxml2 | ||
17993 | +LIBS+=-lgstreamer-0.10 -lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lGLU -lGL -lGLEW | ||
17994 | +endif | ||
17995 | + | ||
17996 | + | ||
17997 | +.PHONY : all | ||
17998 | +all: $(REXE) | ||
17999 | + | ||
18000 | +$(REXE): $(OBJ) | ||
18001 | + $(CPP) $(OBJ) $(LDFLAGS) $(LIBS) -o $@ | ||
18002 | + | ||
18003 | +.PHONY : clean | ||
18004 | +clean: | ||
18005 | + -$(RM) $(OBJ) core | ||
18006 | diff --git a/tests/examples/generic/recordgraphic/main.cpp b/tests/examples/generic/recordgraphic/main.cpp | ||
18007 | new file mode 100644 | ||
18008 | index 0000000..6e7e4f7 | ||
18009 | --- /dev/null | ||
18010 | +++ b/tests/examples/generic/recordgraphic/main.cpp | ||
18011 | @@ -0,0 +1,280 @@ | ||
18012 | +/* | ||
18013 | + * GStreamer | ||
18014 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
18015 | + * | ||
18016 | + * This library is free software; you can redistribute it and/or | ||
18017 | + * modify it under the terms of the GNU Library General Public | ||
18018 | + * License as published by the Free Software Foundation; either | ||
18019 | + * version 2 of the License, or (at your option) any later version. | ||
18020 | + * | ||
18021 | + * This library is distributed in the hope that it will be useful, | ||
18022 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18023 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
18024 | + * Library General Public License for more details. | ||
18025 | + * | ||
18026 | + * You should have received a copy of the GNU Library General Public | ||
18027 | + * License along with this library; if not, write to the | ||
18028 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18029 | + * Boston, MA 02111-1307, USA. | ||
18030 | + */ | ||
18031 | + | ||
18032 | +#include <GL/glew.h> | ||
18033 | +#include <gst/gst.h> | ||
18034 | +#include <gst/video/video.h> | ||
18035 | + | ||
18036 | +#include <iostream> | ||
18037 | +#include <string> | ||
18038 | + | ||
18039 | +static gboolean bus_call (GstBus *bus, GstMessage *msg, gpointer data) | ||
18040 | +{ | ||
18041 | + GMainLoop *loop = (GMainLoop*)data; | ||
18042 | + | ||
18043 | + switch (GST_MESSAGE_TYPE (msg)) | ||
18044 | + { | ||
18045 | + case GST_MESSAGE_EOS: | ||
18046 | + g_print ("End-of-stream\n"); | ||
18047 | + g_main_loop_quit (loop); | ||
18048 | + break; | ||
18049 | + case GST_MESSAGE_ERROR: | ||
18050 | + { | ||
18051 | + gchar *debug = NULL; | ||
18052 | + GError *err = NULL; | ||
18053 | + | ||
18054 | + gst_message_parse_error (msg, &err, &debug); | ||
18055 | + | ||
18056 | + g_print ("Error: %s\n", err->message); | ||
18057 | + g_error_free (err); | ||
18058 | + | ||
18059 | + if (debug) | ||
18060 | + { | ||
18061 | + g_print ("Debug deails: %s\n", debug); | ||
18062 | + g_free (debug); | ||
18063 | + } | ||
18064 | + | ||
18065 | + g_main_loop_quit (loop); | ||
18066 | + break; | ||
18067 | + } | ||
18068 | + default: | ||
18069 | + break; | ||
18070 | + } | ||
18071 | + | ||
18072 | + return TRUE; | ||
18073 | +} | ||
18074 | + | ||
18075 | +//client reshape callback | ||
18076 | +void reshapeCallback (GLuint width, GLuint height) | ||
18077 | +{ | ||
18078 | + glViewport(0, 0, width, height); | ||
18079 | + glMatrixMode(GL_PROJECTION); | ||
18080 | + glLoadIdentity(); | ||
18081 | + gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); | ||
18082 | + glMatrixMode(GL_MODELVIEW); | ||
18083 | +} | ||
18084 | + | ||
18085 | + | ||
18086 | +//client draw callback | ||
18087 | +gboolean drawCallback (GLuint width, GLuint height, GLuint texture, gpointer data) | ||
18088 | +{ | ||
18089 | + static GLfloat xrot = 0; | ||
18090 | + static GLfloat yrot = 0; | ||
18091 | + static GLfloat zrot = 0; | ||
18092 | + static GTimeVal current_time; | ||
18093 | + static glong last_sec = current_time.tv_sec; | ||
18094 | + static gint nbFrames = 0; | ||
18095 | + | ||
18096 | + g_get_current_time (¤t_time); | ||
18097 | + nbFrames++ ; | ||
18098 | + | ||
18099 | + if ((current_time.tv_sec - last_sec) >= 1) | ||
18100 | + { | ||
18101 | + std::cout << "GRPHIC FPS = " << nbFrames << std::endl; | ||
18102 | + nbFrames = 0; | ||
18103 | + last_sec = current_time.tv_sec; | ||
18104 | + } | ||
18105 | + | ||
18106 | + glEnable(GL_DEPTH_TEST); | ||
18107 | + | ||
18108 | + glEnable (GL_TEXTURE_RECTANGLE_ARB); | ||
18109 | + glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); | ||
18110 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | ||
18111 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | ||
18112 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); | ||
18113 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); | ||
18114 | + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | ||
18115 | + | ||
18116 | + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | ||
18117 | + glMatrixMode(GL_MODELVIEW); | ||
18118 | + glLoadIdentity(); | ||
18119 | + | ||
18120 | + glTranslatef(0.0f,0.0f,-5.0f); | ||
18121 | + | ||
18122 | + glRotatef(xrot,1.0f,0.0f,0.0f); | ||
18123 | + glRotatef(yrot,0.0f,1.0f,0.0f); | ||
18124 | + glRotatef(zrot,0.0f,0.0f,1.0f); | ||
18125 | + | ||
18126 | + //cube | ||
18127 | + glBegin(GL_QUADS); | ||
18128 | + // Front Face | ||
18129 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
18130 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
18131 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
18132 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
18133 | + // Back Face | ||
18134 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
18135 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
18136 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
18137 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
18138 | + // Top Face | ||
18139 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
18140 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
18141 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
18142 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
18143 | + // Bottom Face | ||
18144 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
18145 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
18146 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
18147 | + glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
18148 | + // Right face | ||
18149 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
18150 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
18151 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
18152 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
18153 | + // Left Face | ||
18154 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
18155 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
18156 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
18157 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
18158 | + glEnd(); | ||
18159 | + | ||
18160 | + xrot+=0.3f; | ||
18161 | + yrot+=0.2f; | ||
18162 | + zrot+=0.4f; | ||
18163 | + | ||
18164 | + //return TRUE causes a postRedisplay | ||
18165 | + return FALSE; | ||
18166 | +} | ||
18167 | + | ||
18168 | + | ||
18169 | +//equivalent command line: | ||
18170 | +//gst-launch-0.10 videotestsrc num_buffers=400 ! glupload ! gldownload ! | ||
18171 | +//ffenc_mpeg4 ! avimux ! filesink location="record.avi" | ||
18172 | +// or | ||
18173 | +//gst-launch-0.10 videotestsrc num_buffers=400 ! glupload ! video/x-raw-gl, width=320, height=240 ! glfiltercube ! video/x-raw-gl, width=720, height=576 ! | ||
18174 | +//gldownload ! ffenc_mpeg4 ! avimux ! filesink location="record.avi" | ||
18175 | +gint main (gint argc, gchar *argv[]) | ||
18176 | +{ | ||
18177 | + GstStateChangeReturn ret; | ||
18178 | + GstElement *pipeline, *videosrc, *glupload, *glfilterapp, *gldownload, *ffenc_mpeg4, *avimux, *filesink; | ||
18179 | + GMainLoop *loop; | ||
18180 | + GstBus *bus; | ||
18181 | + | ||
18182 | + /* initialization */ | ||
18183 | + gst_init (&argc, &argv); | ||
18184 | + loop = g_main_loop_new (NULL, FALSE); | ||
18185 | + | ||
18186 | + /* create elements */ | ||
18187 | + pipeline = gst_pipeline_new ("pipeline"); | ||
18188 | + | ||
18189 | + /* watch for messages on the pipeline's bus (note that this will only | ||
18190 | + * work like this when a GLib main loop is running) */ | ||
18191 | + bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); | ||
18192 | + gst_bus_add_watch (bus, bus_call, loop); | ||
18193 | + gst_object_unref (bus); | ||
18194 | + | ||
18195 | + /* create elements */ | ||
18196 | + videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc0"); | ||
18197 | + glupload = gst_element_factory_make ("glupload", "glupload0"); | ||
18198 | + glfilterapp = gst_element_factory_make ("glfilterapp", "glfilterapp0"); | ||
18199 | + gldownload = gst_element_factory_make ("gldownload", "gldownload0"); | ||
18200 | + ffenc_mpeg4 = gst_element_factory_make ("ffenc_mpeg4", "ffenc_mpeg40"); | ||
18201 | + avimux = gst_element_factory_make ("avimux", "avimux0"); | ||
18202 | + filesink = gst_element_factory_make ("filesink", "filesink0"); | ||
18203 | + | ||
18204 | + | ||
18205 | + if (!videosrc || !glupload || !glfilterapp || !gldownload || !ffenc_mpeg4 || !avimux || !filesink) | ||
18206 | + { | ||
18207 | + g_print ("one element could not be found \n"); | ||
18208 | + return -1; | ||
18209 | + } | ||
18210 | + | ||
18211 | + /* change video source caps */ | ||
18212 | + GstCaps *caps = gst_caps_new_simple("video/x-raw-yuv", | ||
18213 | + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'), | ||
18214 | + "width", G_TYPE_INT, 320, | ||
18215 | + "height", G_TYPE_INT, 240, | ||
18216 | + "framerate", GST_TYPE_FRACTION, 25, 1, | ||
18217 | + NULL) ; | ||
18218 | + | ||
18219 | + /* change video source caps */ | ||
18220 | + GstCaps *outcaps = gst_caps_new_simple("video/x-raw-yuv", | ||
18221 | + "width", G_TYPE_INT, 640, | ||
18222 | + "height", G_TYPE_INT, 480, | ||
18223 | + NULL) ; | ||
18224 | + | ||
18225 | + /* configure elements */ | ||
18226 | + g_object_set(G_OBJECT(videosrc), "num-buffers", 400, NULL); | ||
18227 | + g_object_set(G_OBJECT(glfilterapp), "client-reshape-callback", reshapeCallback, NULL); | ||
18228 | + g_object_set(G_OBJECT(glfilterapp), "client-draw-callback", drawCallback, NULL); | ||
18229 | + g_object_set(G_OBJECT(glfilterapp), "client-data", NULL, NULL); | ||
18230 | + g_object_set(G_OBJECT(filesink), "location", "record.avi", NULL); | ||
18231 | + | ||
18232 | + /* add elements */ | ||
18233 | + gst_bin_add_many (GST_BIN (pipeline), videosrc, glupload, glfilterapp, gldownload, | ||
18234 | + ffenc_mpeg4, avimux, filesink, NULL); | ||
18235 | + | ||
18236 | + /* link elements */ | ||
18237 | + gboolean link_ok = gst_element_link_filtered(videosrc, glupload, caps) ; | ||
18238 | + gst_caps_unref(caps) ; | ||
18239 | + if(!link_ok) | ||
18240 | + { | ||
18241 | + g_warning("Failed to link videosrc to glupload!\n") ; | ||
18242 | + return -1 ; | ||
18243 | + } | ||
18244 | + if (!gst_element_link_many(glupload, glfilterapp, gldownload, NULL)) | ||
18245 | + { | ||
18246 | + g_print ("Failed to link one or more elements!\n"); | ||
18247 | + return -1; | ||
18248 | + } | ||
18249 | + link_ok = gst_element_link_filtered(gldownload, ffenc_mpeg4, outcaps) ; | ||
18250 | + gst_caps_unref(outcaps) ; | ||
18251 | + if(!link_ok) | ||
18252 | + { | ||
18253 | + g_warning("Failed to link glvideomaker to ffenc_mpeg4!\n") ; | ||
18254 | + return -1 ; | ||
18255 | + } | ||
18256 | + if (!gst_element_link_many(ffenc_mpeg4, avimux, filesink, NULL)) | ||
18257 | + { | ||
18258 | + g_print ("Failed to link one or more elements!\n"); | ||
18259 | + return -1; | ||
18260 | + } | ||
18261 | + | ||
18262 | + | ||
18263 | + /* run */ | ||
18264 | + ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); | ||
18265 | + if (ret == GST_STATE_CHANGE_FAILURE) | ||
18266 | + { | ||
18267 | + g_print ("Failed to start up pipeline!\n"); | ||
18268 | + | ||
18269 | + /* check if there is an error message with details on the bus */ | ||
18270 | + GstMessage* msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0); | ||
18271 | + if (msg) | ||
18272 | + { | ||
18273 | + GError *err = NULL; | ||
18274 | + | ||
18275 | + gst_message_parse_error (msg, &err, NULL); | ||
18276 | + g_print ("ERROR: %s\n", err->message); | ||
18277 | + g_error_free (err); | ||
18278 | + gst_message_unref (msg); | ||
18279 | + } | ||
18280 | + return -1; | ||
18281 | + } | ||
18282 | + | ||
18283 | + g_main_loop_run (loop); | ||
18284 | + | ||
18285 | + /* clean up */ | ||
18286 | + gst_element_set_state (pipeline, GST_STATE_NULL); | ||
18287 | + gst_object_unref (pipeline); | ||
18288 | + | ||
18289 | + return 0; | ||
18290 | + | ||
18291 | +} | ||
18292 | diff --git a/tests/examples/generic/recordgraphic/recordgraphic.vcproj b/tests/examples/generic/recordgraphic/recordgraphic.vcproj | ||
18293 | new file mode 100644 | ||
18294 | index 0000000..825cbbd | ||
18295 | --- /dev/null | ||
18296 | +++ b/tests/examples/generic/recordgraphic/recordgraphic.vcproj | ||
18297 | @@ -0,0 +1,202 @@ | ||
18298 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
18299 | +<VisualStudioProject | ||
18300 | + ProjectType="Visual C++" | ||
18301 | + Version="9,00" | ||
18302 | + Name="recordgraphic" | ||
18303 | + ProjectGUID="{E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}" | ||
18304 | + RootNamespace="recordgraphic" | ||
18305 | + Keyword="Win32Proj" | ||
18306 | + TargetFrameworkVersion="131072" | ||
18307 | + > | ||
18308 | + <Platforms> | ||
18309 | + <Platform | ||
18310 | + Name="Win32" | ||
18311 | + /> | ||
18312 | + </Platforms> | ||
18313 | + <ToolFiles> | ||
18314 | + </ToolFiles> | ||
18315 | + <Configurations> | ||
18316 | + <Configuration | ||
18317 | + Name="Debug|Win32" | ||
18318 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
18319 | + IntermediateDirectory="$(ConfigurationName)" | ||
18320 | + ConfigurationType="1" | ||
18321 | + CharacterSet="1" | ||
18322 | + > | ||
18323 | + <Tool | ||
18324 | + Name="VCPreBuildEventTool" | ||
18325 | + /> | ||
18326 | + <Tool | ||
18327 | + Name="VCCustomBuildTool" | ||
18328 | + /> | ||
18329 | + <Tool | ||
18330 | + Name="VCXMLDataGeneratorTool" | ||
18331 | + /> | ||
18332 | + <Tool | ||
18333 | + Name="VCWebServiceProxyGeneratorTool" | ||
18334 | + /> | ||
18335 | + <Tool | ||
18336 | + Name="VCMIDLTool" | ||
18337 | + /> | ||
18338 | + <Tool | ||
18339 | + Name="VCCLCompilerTool" | ||
18340 | + Optimization="0" | ||
18341 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
18342 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
18343 | + MinimalRebuild="true" | ||
18344 | + BasicRuntimeChecks="3" | ||
18345 | + RuntimeLibrary="3" | ||
18346 | + UsePrecompiledHeader="0" | ||
18347 | + WarningLevel="3" | ||
18348 | + Detect64BitPortabilityProblems="true" | ||
18349 | + DebugInformationFormat="4" | ||
18350 | + /> | ||
18351 | + <Tool | ||
18352 | + Name="VCManagedResourceCompilerTool" | ||
18353 | + /> | ||
18354 | + <Tool | ||
18355 | + Name="VCResourceCompilerTool" | ||
18356 | + /> | ||
18357 | + <Tool | ||
18358 | + Name="VCPreLinkEventTool" | ||
18359 | + /> | ||
18360 | + <Tool | ||
18361 | + Name="VCLinkerTool" | ||
18362 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
18363 | + LinkIncremental="2" | ||
18364 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
18365 | + GenerateDebugInformation="true" | ||
18366 | + SubSystem="1" | ||
18367 | + RandomizedBaseAddress="1" | ||
18368 | + DataExecutionPrevention="0" | ||
18369 | + TargetMachine="1" | ||
18370 | + /> | ||
18371 | + <Tool | ||
18372 | + Name="VCALinkTool" | ||
18373 | + /> | ||
18374 | + <Tool | ||
18375 | + Name="VCManifestTool" | ||
18376 | + /> | ||
18377 | + <Tool | ||
18378 | + Name="VCXDCMakeTool" | ||
18379 | + /> | ||
18380 | + <Tool | ||
18381 | + Name="VCBscMakeTool" | ||
18382 | + /> | ||
18383 | + <Tool | ||
18384 | + Name="VCFxCopTool" | ||
18385 | + /> | ||
18386 | + <Tool | ||
18387 | + Name="VCAppVerifierTool" | ||
18388 | + /> | ||
18389 | + <Tool | ||
18390 | + Name="VCPostBuildEventTool" | ||
18391 | + /> | ||
18392 | + </Configuration> | ||
18393 | + <Configuration | ||
18394 | + Name="Release|Win32" | ||
18395 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
18396 | + IntermediateDirectory="$(ConfigurationName)" | ||
18397 | + ConfigurationType="1" | ||
18398 | + CharacterSet="1" | ||
18399 | + WholeProgramOptimization="1" | ||
18400 | + > | ||
18401 | + <Tool | ||
18402 | + Name="VCPreBuildEventTool" | ||
18403 | + /> | ||
18404 | + <Tool | ||
18405 | + Name="VCCustomBuildTool" | ||
18406 | + /> | ||
18407 | + <Tool | ||
18408 | + Name="VCXMLDataGeneratorTool" | ||
18409 | + /> | ||
18410 | + <Tool | ||
18411 | + Name="VCWebServiceProxyGeneratorTool" | ||
18412 | + /> | ||
18413 | + <Tool | ||
18414 | + Name="VCMIDLTool" | ||
18415 | + /> | ||
18416 | + <Tool | ||
18417 | + Name="VCCLCompilerTool" | ||
18418 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
18419 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
18420 | + RuntimeLibrary="2" | ||
18421 | + UsePrecompiledHeader="0" | ||
18422 | + WarningLevel="3" | ||
18423 | + Detect64BitPortabilityProblems="true" | ||
18424 | + DebugInformationFormat="3" | ||
18425 | + /> | ||
18426 | + <Tool | ||
18427 | + Name="VCManagedResourceCompilerTool" | ||
18428 | + /> | ||
18429 | + <Tool | ||
18430 | + Name="VCResourceCompilerTool" | ||
18431 | + /> | ||
18432 | + <Tool | ||
18433 | + Name="VCPreLinkEventTool" | ||
18434 | + /> | ||
18435 | + <Tool | ||
18436 | + Name="VCLinkerTool" | ||
18437 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
18438 | + LinkIncremental="1" | ||
18439 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
18440 | + GenerateDebugInformation="true" | ||
18441 | + SubSystem="1" | ||
18442 | + OptimizeReferences="2" | ||
18443 | + EnableCOMDATFolding="2" | ||
18444 | + RandomizedBaseAddress="1" | ||
18445 | + DataExecutionPrevention="0" | ||
18446 | + TargetMachine="1" | ||
18447 | + /> | ||
18448 | + <Tool | ||
18449 | + Name="VCALinkTool" | ||
18450 | + /> | ||
18451 | + <Tool | ||
18452 | + Name="VCManifestTool" | ||
18453 | + /> | ||
18454 | + <Tool | ||
18455 | + Name="VCXDCMakeTool" | ||
18456 | + /> | ||
18457 | + <Tool | ||
18458 | + Name="VCBscMakeTool" | ||
18459 | + /> | ||
18460 | + <Tool | ||
18461 | + Name="VCFxCopTool" | ||
18462 | + /> | ||
18463 | + <Tool | ||
18464 | + Name="VCAppVerifierTool" | ||
18465 | + /> | ||
18466 | + <Tool | ||
18467 | + Name="VCPostBuildEventTool" | ||
18468 | + /> | ||
18469 | + </Configuration> | ||
18470 | + </Configurations> | ||
18471 | + <References> | ||
18472 | + </References> | ||
18473 | + <Files> | ||
18474 | + <Filter | ||
18475 | + Name="Source Files" | ||
18476 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
18477 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
18478 | + > | ||
18479 | + <File | ||
18480 | + RelativePath=".\main.cpp" | ||
18481 | + > | ||
18482 | + </File> | ||
18483 | + </Filter> | ||
18484 | + <Filter | ||
18485 | + Name="Header Files" | ||
18486 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
18487 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
18488 | + > | ||
18489 | + </Filter> | ||
18490 | + <Filter | ||
18491 | + Name="Resource Files" | ||
18492 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
18493 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
18494 | + > | ||
18495 | + </Filter> | ||
18496 | + </Files> | ||
18497 | + <Globals> | ||
18498 | + </Globals> | ||
18499 | +</VisualStudioProject> | ||
18500 | diff --git a/tests/examples/gtk/Makefile.in b/tests/examples/gtk/Makefile.in | ||
18501 | index f2d9542..51253c1 100644 | ||
18502 | --- a/tests/examples/gtk/Makefile.in | ||
18503 | +++ b/tests/examples/gtk/Makefile.in | ||
18504 | @@ -1,9 +1,9 @@ | ||
18505 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
18506 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
18507 | # @configure_input@ | ||
18508 | |||
18509 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
18510 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
18511 | -# Foundation, Inc. | ||
18512 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
18513 | +# Inc. | ||
18514 | # This Makefile.in is free software; the Free Software Foundation | ||
18515 | # gives unlimited permission to copy and/or distribute it, | ||
18516 | # with or without modifications, as long as this notice is preserved. | ||
18517 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
18518 | POST_UNINSTALL = : | ||
18519 | build_triplet = @build@ | ||
18520 | host_triplet = @host@ | ||
18521 | +target_triplet = @target@ | ||
18522 | @GL_BACKEND_COCOA_TRUE@am__append_1 = -x objective-c | ||
18523 | subdir = tests/examples/gtk | ||
18524 | DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
18525 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
18526 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
18527 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
18528 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
18529 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
18530 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
18531 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
18532 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
18533 | @@ -79,8 +79,8 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
18534 | libgstgtkhelper_la_LIBADD = | ||
18535 | am_libgstgtkhelper_la_OBJECTS = libgstgtkhelper_la-gstgtk.lo | ||
18536 | libgstgtkhelper_la_OBJECTS = $(am_libgstgtkhelper_la_OBJECTS) | ||
18537 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
18538 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
18539 | +AM_V_lt = $(am__v_lt_$(V)) | ||
18540 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
18541 | am__v_lt_0 = --silent | ||
18542 | libgstgtkhelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
18543 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
18544 | @@ -96,21 +96,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
18545 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
18546 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
18547 | $(AM_CFLAGS) $(CFLAGS) | ||
18548 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
18549 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
18550 | +AM_V_CC = $(am__v_CC_$(V)) | ||
18551 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
18552 | am__v_CC_0 = @echo " CC " $@; | ||
18553 | -AM_V_at = $(am__v_at_@AM_V@) | ||
18554 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
18555 | +AM_V_at = $(am__v_at_$(V)) | ||
18556 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
18557 | am__v_at_0 = @ | ||
18558 | CCLD = $(CC) | ||
18559 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
18560 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
18561 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
18562 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
18563 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
18564 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
18565 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
18566 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
18567 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
18568 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
18569 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
18570 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
18571 | am__v_GEN_0 = @echo " GEN " $@; | ||
18572 | SOURCES = $(libgstgtkhelper_la_SOURCES) | ||
18573 | DIST_SOURCES = $(libgstgtkhelper_la_SOURCES) | ||
18574 | @@ -201,6 +201,7 @@ ECHO_T = @ECHO_T@ | ||
18575 | EGREP = @EGREP@ | ||
18576 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
18577 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
18578 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
18579 | EXEEXT = @EXEEXT@ | ||
18580 | FFLAGS = @FFLAGS@ | ||
18581 | FGREP = @FGREP@ | ||
18582 | @@ -232,6 +233,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
18583 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
18584 | GST_CURRENT = @GST_CURRENT@ | ||
18585 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
18586 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
18587 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
18588 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
18589 | GST_LIBS = @GST_LIBS@ | ||
18590 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
18591 | @@ -239,8 +242,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
18592 | GST_LICENSE = @GST_LICENSE@ | ||
18593 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
18594 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
18595 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
18596 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
18597 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
18598 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
18599 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
18600 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
18601 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
18602 | @@ -313,7 +318,7 @@ NM = @NM@ | ||
18603 | NMEDIT = @NMEDIT@ | ||
18604 | OBJC = @OBJC@ | ||
18605 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
18606 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
18607 | +OBJCFLAGS = @OBJCFLAGS@ | ||
18608 | OBJDUMP = @OBJDUMP@ | ||
18609 | OBJEXT = @OBJEXT@ | ||
18610 | OPENGL_ES2 = @OPENGL_ES2@ | ||
18611 | @@ -358,6 +363,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
18612 | VERSION = @VERSION@ | ||
18613 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
18614 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
18615 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
18616 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
18617 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
18618 | XGETTEXT = @XGETTEXT@ | ||
18619 | @@ -423,7 +429,11 @@ sbindir = @sbindir@ | ||
18620 | sharedstatedir = @sharedstatedir@ | ||
18621 | srcdir = @srcdir@ | ||
18622 | sysconfdir = @sysconfdir@ | ||
18623 | +target = @target@ | ||
18624 | target_alias = @target_alias@ | ||
18625 | +target_cpu = @target_cpu@ | ||
18626 | +target_os = @target_os@ | ||
18627 | +target_vendor = @target_vendor@ | ||
18628 | top_build_prefix = @top_build_prefix@ | ||
18629 | top_builddir = @top_builddir@ | ||
18630 | top_srcdir = @top_srcdir@ | ||
18631 | @@ -475,7 +485,7 @@ clean-noinstLTLIBRARIES: | ||
18632 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
18633 | rm -f "$${dir}/so_locations"; \ | ||
18634 | done | ||
18635 | -libgstgtkhelper.la: $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_DEPENDENCIES) $(EXTRA_libgstgtkhelper_la_DEPENDENCIES) | ||
18636 | +libgstgtkhelper.la: $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_DEPENDENCIES) | ||
18637 | $(AM_V_CCLD)$(libgstgtkhelper_la_LINK) $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_LIBADD) $(LIBS) | ||
18638 | |||
18639 | mostlyclean-compile: | ||
18640 | @@ -489,30 +499,34 @@ distclean-compile: | ||
18641 | .c.o: | ||
18642 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
18643 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
18644 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18645 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
18646 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18647 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18648 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
18649 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
18650 | |||
18651 | .c.obj: | ||
18652 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
18653 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
18654 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18655 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
18656 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18657 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18658 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
18659 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
18660 | |||
18661 | .c.lo: | ||
18662 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
18663 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
18664 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
18665 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
18666 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
18667 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18668 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
18669 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
18670 | |||
18671 | libgstgtkhelper_la-gstgtk.lo: gstgtk.c | ||
18672 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgtkhelper_la_CFLAGS) $(CFLAGS) -MT libgstgtkhelper_la-gstgtk.lo -MD -MP -MF $(DEPDIR)/libgstgtkhelper_la-gstgtk.Tpo -c -o libgstgtkhelper_la-gstgtk.lo `test -f 'gstgtk.c' || echo '$(srcdir)/'`gstgtk.c | ||
18673 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgtkhelper_la-gstgtk.Tpo $(DEPDIR)/libgstgtkhelper_la-gstgtk.Plo | ||
18674 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgtk.c' object='libgstgtkhelper_la-gstgtk.lo' libtool=yes @AMDEPBACKSLASH@ | ||
18675 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
18676 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgtk.c' object='libgstgtkhelper_la-gstgtk.lo' libtool=yes @AMDEPBACKSLASH@ | ||
18677 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18678 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgtkhelper_la_CFLAGS) $(CFLAGS) -c -o libgstgtkhelper_la-gstgtk.lo `test -f 'gstgtk.c' || echo '$(srcdir)/'`gstgtk.c | ||
18679 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstgtkhelper_la_CFLAGS) $(CFLAGS) -c -o libgstgtkhelper_la-gstgtk.lo `test -f 'gstgtk.c' || echo '$(srcdir)/'`gstgtk.c | ||
18680 | |||
18681 | mostlyclean-libtool: | ||
18682 | -rm -f *.lo | ||
18683 | @@ -728,15 +742,10 @@ install-am: all-am | ||
18684 | |||
18685 | installcheck: installcheck-recursive | ||
18686 | install-strip: | ||
18687 | - if test -z '$(STRIP)'; then \ | ||
18688 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18689 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18690 | - install; \ | ||
18691 | - else \ | ||
18692 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18693 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18694 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
18695 | - fi | ||
18696 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18697 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18698 | + `test -z '$(STRIP)' || \ | ||
18699 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
18700 | mostlyclean-generic: | ||
18701 | |||
18702 | clean-generic: | ||
18703 | diff --git a/tests/examples/gtk/filternoxoverlay/Makefile.in b/tests/examples/gtk/filternoxoverlay/Makefile.in | ||
18704 | index 43ff858..5be3a6a 100644 | ||
18705 | --- a/tests/examples/gtk/filternoxoverlay/Makefile.in | ||
18706 | +++ b/tests/examples/gtk/filternoxoverlay/Makefile.in | ||
18707 | @@ -1,9 +1,9 @@ | ||
18708 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
18709 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
18710 | # @configure_input@ | ||
18711 | |||
18712 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
18713 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
18714 | -# Foundation, Inc. | ||
18715 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
18716 | +# Inc. | ||
18717 | # This Makefile.in is free software; the Free Software Foundation | ||
18718 | # gives unlimited permission to copy and/or distribute it, | ||
18719 | # with or without modifications, as long as this notice is preserved. | ||
18720 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
18721 | POST_UNINSTALL = : | ||
18722 | build_triplet = @build@ | ||
18723 | host_triplet = @host@ | ||
18724 | +target_triplet = @target@ | ||
18725 | noinst_PROGRAMS = filternoxoverlay$(EXEEXT) | ||
18726 | subdir = tests/examples/gtk/filternoxoverlay | ||
18727 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
18728 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
18729 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
18730 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
18731 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
18732 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
18733 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
18734 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
18735 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
18736 | @@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = | ||
18737 | filternoxoverlay_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | ||
18738 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
18739 | $(am__DEPENDENCIES_1) | ||
18740 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
18741 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
18742 | +AM_V_lt = $(am__v_lt_$(V)) | ||
18743 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
18744 | am__v_lt_0 = --silent | ||
18745 | filternoxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ | ||
18746 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
18747 | @@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
18748 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
18749 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
18750 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
18751 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
18752 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
18753 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
18754 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
18755 | am__v_CXX_0 = @echo " CXX " $@; | ||
18756 | -AM_V_at = $(am__v_at_@AM_V@) | ||
18757 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
18758 | +AM_V_at = $(am__v_at_$(V)) | ||
18759 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
18760 | am__v_at_0 = @ | ||
18761 | CXXLD = $(CXX) | ||
18762 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
18763 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
18764 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
18765 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
18766 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
18767 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
18768 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
18769 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
18770 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
18771 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
18772 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
18773 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
18774 | am__v_GEN_0 = @echo " GEN " $@; | ||
18775 | SOURCES = $(filternoxoverlay_SOURCES) | ||
18776 | DIST_SOURCES = $(filternoxoverlay_SOURCES) | ||
18777 | @@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ | ||
18778 | EGREP = @EGREP@ | ||
18779 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
18780 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
18781 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
18782 | EXEEXT = @EXEEXT@ | ||
18783 | FFLAGS = @FFLAGS@ | ||
18784 | FGREP = @FGREP@ | ||
18785 | @@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
18786 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
18787 | GST_CURRENT = @GST_CURRENT@ | ||
18788 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
18789 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
18790 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
18791 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
18792 | GST_LIBS = @GST_LIBS@ | ||
18793 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
18794 | @@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
18795 | GST_LICENSE = @GST_LICENSE@ | ||
18796 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
18797 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
18798 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
18799 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
18800 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
18801 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
18802 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
18803 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
18804 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
18805 | @@ -278,7 +283,7 @@ NM = @NM@ | ||
18806 | NMEDIT = @NMEDIT@ | ||
18807 | OBJC = @OBJC@ | ||
18808 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
18809 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
18810 | +OBJCFLAGS = @OBJCFLAGS@ | ||
18811 | OBJDUMP = @OBJDUMP@ | ||
18812 | OBJEXT = @OBJEXT@ | ||
18813 | OPENGL_ES2 = @OPENGL_ES2@ | ||
18814 | @@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
18815 | VERSION = @VERSION@ | ||
18816 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
18817 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
18818 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
18819 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
18820 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
18821 | XGETTEXT = @XGETTEXT@ | ||
18822 | @@ -388,7 +394,11 @@ sbindir = @sbindir@ | ||
18823 | sharedstatedir = @sharedstatedir@ | ||
18824 | srcdir = @srcdir@ | ||
18825 | sysconfdir = @sysconfdir@ | ||
18826 | +target = @target@ | ||
18827 | target_alias = @target_alias@ | ||
18828 | +target_cpu = @target_cpu@ | ||
18829 | +target_os = @target_os@ | ||
18830 | +target_vendor = @target_vendor@ | ||
18831 | top_build_prefix = @top_build_prefix@ | ||
18832 | top_builddir = @top_builddir@ | ||
18833 | top_srcdir = @top_srcdir@ | ||
18834 | @@ -442,7 +452,7 @@ clean-noinstPROGRAMS: | ||
18835 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
18836 | echo " rm -f" $$list; \ | ||
18837 | rm -f $$list | ||
18838 | -filternoxoverlay$(EXEEXT): $(filternoxoverlay_OBJECTS) $(filternoxoverlay_DEPENDENCIES) $(EXTRA_filternoxoverlay_DEPENDENCIES) | ||
18839 | +filternoxoverlay$(EXEEXT): $(filternoxoverlay_OBJECTS) $(filternoxoverlay_DEPENDENCIES) | ||
18840 | @rm -f filternoxoverlay$(EXEEXT) | ||
18841 | $(AM_V_CXXLD)$(filternoxoverlay_LINK) $(filternoxoverlay_OBJECTS) $(filternoxoverlay_LDADD) $(LIBS) | ||
18842 | |||
18843 | @@ -457,37 +467,42 @@ distclean-compile: | ||
18844 | .cpp.o: | ||
18845 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
18846 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
18847 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18848 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
18849 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18850 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18851 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
18852 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
18853 | |||
18854 | .cpp.obj: | ||
18855 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
18856 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
18857 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18858 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
18859 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
18860 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18861 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
18862 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
18863 | |||
18864 | .cpp.lo: | ||
18865 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
18866 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
18867 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
18868 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
18869 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
18870 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18871 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
18872 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
18873 | |||
18874 | filternoxoverlay-main.o: main.cpp | ||
18875 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -MT filternoxoverlay-main.o -MD -MP -MF $(DEPDIR)/filternoxoverlay-main.Tpo -c -o filternoxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
18876 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filternoxoverlay-main.Tpo $(DEPDIR)/filternoxoverlay-main.Po | ||
18877 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filternoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
18878 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
18879 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filternoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
18880 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18881 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filternoxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
18882 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filternoxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
18883 | |||
18884 | filternoxoverlay-main.obj: main.cpp | ||
18885 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -MT filternoxoverlay-main.obj -MD -MP -MF $(DEPDIR)/filternoxoverlay-main.Tpo -c -o filternoxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
18886 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filternoxoverlay-main.Tpo $(DEPDIR)/filternoxoverlay-main.Po | ||
18887 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filternoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
18888 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
18889 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filternoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
18890 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
18891 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filternoxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
18892 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filternoxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filternoxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
18893 | |||
18894 | mostlyclean-libtool: | ||
18895 | -rm -f *.lo | ||
18896 | @@ -591,15 +606,10 @@ install-am: all-am | ||
18897 | |||
18898 | installcheck: installcheck-am | ||
18899 | install-strip: | ||
18900 | - if test -z '$(STRIP)'; then \ | ||
18901 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18902 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18903 | - install; \ | ||
18904 | - else \ | ||
18905 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18906 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18907 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
18908 | - fi | ||
18909 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
18910 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
18911 | + `test -z '$(STRIP)' || \ | ||
18912 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
18913 | mostlyclean-generic: | ||
18914 | |||
18915 | clean-generic: | ||
18916 | diff --git a/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj b/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj | ||
18917 | new file mode 100644 | ||
18918 | index 0000000..fb91a55 | ||
18919 | --- /dev/null | ||
18920 | +++ b/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj | ||
18921 | @@ -0,0 +1,202 @@ | ||
18922 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
18923 | +<VisualStudioProject | ||
18924 | + ProjectType="Visual C++" | ||
18925 | + Version="9,00" | ||
18926 | + Name="filternoxoverlay" | ||
18927 | + ProjectGUID="{F41F3034-3E0B-4630-8D1E-35E14C606863}" | ||
18928 | + RootNamespace="filternoxoverlay" | ||
18929 | + Keyword="Win32Proj" | ||
18930 | + TargetFrameworkVersion="131072" | ||
18931 | + > | ||
18932 | + <Platforms> | ||
18933 | + <Platform | ||
18934 | + Name="Win32" | ||
18935 | + /> | ||
18936 | + </Platforms> | ||
18937 | + <ToolFiles> | ||
18938 | + </ToolFiles> | ||
18939 | + <Configurations> | ||
18940 | + <Configuration | ||
18941 | + Name="Debug|Win32" | ||
18942 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
18943 | + IntermediateDirectory="$(ConfigurationName)" | ||
18944 | + ConfigurationType="1" | ||
18945 | + CharacterSet="1" | ||
18946 | + > | ||
18947 | + <Tool | ||
18948 | + Name="VCPreBuildEventTool" | ||
18949 | + /> | ||
18950 | + <Tool | ||
18951 | + Name="VCCustomBuildTool" | ||
18952 | + /> | ||
18953 | + <Tool | ||
18954 | + Name="VCXMLDataGeneratorTool" | ||
18955 | + /> | ||
18956 | + <Tool | ||
18957 | + Name="VCWebServiceProxyGeneratorTool" | ||
18958 | + /> | ||
18959 | + <Tool | ||
18960 | + Name="VCMIDLTool" | ||
18961 | + /> | ||
18962 | + <Tool | ||
18963 | + Name="VCCLCompilerTool" | ||
18964 | + Optimization="0" | ||
18965 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
18966 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
18967 | + MinimalRebuild="true" | ||
18968 | + BasicRuntimeChecks="3" | ||
18969 | + RuntimeLibrary="3" | ||
18970 | + UsePrecompiledHeader="0" | ||
18971 | + WarningLevel="3" | ||
18972 | + Detect64BitPortabilityProblems="false" | ||
18973 | + DebugInformationFormat="4" | ||
18974 | + /> | ||
18975 | + <Tool | ||
18976 | + Name="VCManagedResourceCompilerTool" | ||
18977 | + /> | ||
18978 | + <Tool | ||
18979 | + Name="VCResourceCompilerTool" | ||
18980 | + /> | ||
18981 | + <Tool | ||
18982 | + Name="VCPreLinkEventTool" | ||
18983 | + /> | ||
18984 | + <Tool | ||
18985 | + Name="VCLinkerTool" | ||
18986 | + AdditionalDependencies="gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
18987 | + LinkIncremental="2" | ||
18988 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
18989 | + GenerateDebugInformation="true" | ||
18990 | + SubSystem="1" | ||
18991 | + RandomizedBaseAddress="1" | ||
18992 | + DataExecutionPrevention="0" | ||
18993 | + TargetMachine="1" | ||
18994 | + /> | ||
18995 | + <Tool | ||
18996 | + Name="VCALinkTool" | ||
18997 | + /> | ||
18998 | + <Tool | ||
18999 | + Name="VCManifestTool" | ||
19000 | + /> | ||
19001 | + <Tool | ||
19002 | + Name="VCXDCMakeTool" | ||
19003 | + /> | ||
19004 | + <Tool | ||
19005 | + Name="VCBscMakeTool" | ||
19006 | + /> | ||
19007 | + <Tool | ||
19008 | + Name="VCFxCopTool" | ||
19009 | + /> | ||
19010 | + <Tool | ||
19011 | + Name="VCAppVerifierTool" | ||
19012 | + /> | ||
19013 | + <Tool | ||
19014 | + Name="VCPostBuildEventTool" | ||
19015 | + /> | ||
19016 | + </Configuration> | ||
19017 | + <Configuration | ||
19018 | + Name="Release|Win32" | ||
19019 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
19020 | + IntermediateDirectory="$(ConfigurationName)" | ||
19021 | + ConfigurationType="1" | ||
19022 | + CharacterSet="1" | ||
19023 | + WholeProgramOptimization="1" | ||
19024 | + > | ||
19025 | + <Tool | ||
19026 | + Name="VCPreBuildEventTool" | ||
19027 | + /> | ||
19028 | + <Tool | ||
19029 | + Name="VCCustomBuildTool" | ||
19030 | + /> | ||
19031 | + <Tool | ||
19032 | + Name="VCXMLDataGeneratorTool" | ||
19033 | + /> | ||
19034 | + <Tool | ||
19035 | + Name="VCWebServiceProxyGeneratorTool" | ||
19036 | + /> | ||
19037 | + <Tool | ||
19038 | + Name="VCMIDLTool" | ||
19039 | + /> | ||
19040 | + <Tool | ||
19041 | + Name="VCCLCompilerTool" | ||
19042 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
19043 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
19044 | + RuntimeLibrary="2" | ||
19045 | + UsePrecompiledHeader="0" | ||
19046 | + WarningLevel="3" | ||
19047 | + Detect64BitPortabilityProblems="false" | ||
19048 | + DebugInformationFormat="3" | ||
19049 | + /> | ||
19050 | + <Tool | ||
19051 | + Name="VCManagedResourceCompilerTool" | ||
19052 | + /> | ||
19053 | + <Tool | ||
19054 | + Name="VCResourceCompilerTool" | ||
19055 | + /> | ||
19056 | + <Tool | ||
19057 | + Name="VCPreLinkEventTool" | ||
19058 | + /> | ||
19059 | + <Tool | ||
19060 | + Name="VCLinkerTool" | ||
19061 | + AdditionalDependencies="gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
19062 | + LinkIncremental="1" | ||
19063 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
19064 | + GenerateDebugInformation="true" | ||
19065 | + SubSystem="1" | ||
19066 | + OptimizeReferences="2" | ||
19067 | + EnableCOMDATFolding="2" | ||
19068 | + RandomizedBaseAddress="1" | ||
19069 | + DataExecutionPrevention="0" | ||
19070 | + TargetMachine="1" | ||
19071 | + /> | ||
19072 | + <Tool | ||
19073 | + Name="VCALinkTool" | ||
19074 | + /> | ||
19075 | + <Tool | ||
19076 | + Name="VCManifestTool" | ||
19077 | + /> | ||
19078 | + <Tool | ||
19079 | + Name="VCXDCMakeTool" | ||
19080 | + /> | ||
19081 | + <Tool | ||
19082 | + Name="VCBscMakeTool" | ||
19083 | + /> | ||
19084 | + <Tool | ||
19085 | + Name="VCFxCopTool" | ||
19086 | + /> | ||
19087 | + <Tool | ||
19088 | + Name="VCAppVerifierTool" | ||
19089 | + /> | ||
19090 | + <Tool | ||
19091 | + Name="VCPostBuildEventTool" | ||
19092 | + /> | ||
19093 | + </Configuration> | ||
19094 | + </Configurations> | ||
19095 | + <References> | ||
19096 | + </References> | ||
19097 | + <Files> | ||
19098 | + <Filter | ||
19099 | + Name="Source Files" | ||
19100 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
19101 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
19102 | + > | ||
19103 | + <File | ||
19104 | + RelativePath=".\main.cpp" | ||
19105 | + > | ||
19106 | + </File> | ||
19107 | + </Filter> | ||
19108 | + <Filter | ||
19109 | + Name="Header Files" | ||
19110 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
19111 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
19112 | + > | ||
19113 | + </Filter> | ||
19114 | + <Filter | ||
19115 | + Name="Resource Files" | ||
19116 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
19117 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
19118 | + > | ||
19119 | + </Filter> | ||
19120 | + </Files> | ||
19121 | + <Globals> | ||
19122 | + </Globals> | ||
19123 | +</VisualStudioProject> | ||
19124 | diff --git a/tests/examples/gtk/filterxoverlay/Makefile.in b/tests/examples/gtk/filterxoverlay/Makefile.in | ||
19125 | index 23e9e6c..b2edf09 100644 | ||
19126 | --- a/tests/examples/gtk/filterxoverlay/Makefile.in | ||
19127 | +++ b/tests/examples/gtk/filterxoverlay/Makefile.in | ||
19128 | @@ -1,9 +1,9 @@ | ||
19129 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
19130 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
19131 | # @configure_input@ | ||
19132 | |||
19133 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
19134 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
19135 | -# Foundation, Inc. | ||
19136 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
19137 | +# Inc. | ||
19138 | # This Makefile.in is free software; the Free Software Foundation | ||
19139 | # gives unlimited permission to copy and/or distribute it, | ||
19140 | # with or without modifications, as long as this notice is preserved. | ||
19141 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
19142 | POST_UNINSTALL = : | ||
19143 | build_triplet = @build@ | ||
19144 | host_triplet = @host@ | ||
19145 | +target_triplet = @target@ | ||
19146 | noinst_PROGRAMS = filterxoverlay$(EXEEXT) | ||
19147 | subdir = tests/examples/gtk/filterxoverlay | ||
19148 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
19149 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
19150 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
19151 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
19152 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
19153 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
19154 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
19155 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
19156 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
19157 | @@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = | ||
19158 | filterxoverlay_DEPENDENCIES = ../libgstgtkhelper.la \ | ||
19159 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
19160 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
19161 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
19162 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
19163 | +AM_V_lt = $(am__v_lt_$(V)) | ||
19164 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
19165 | am__v_lt_0 = --silent | ||
19166 | filterxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ | ||
19167 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
19168 | @@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
19169 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
19170 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
19171 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
19172 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
19173 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
19174 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
19175 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
19176 | am__v_CXX_0 = @echo " CXX " $@; | ||
19177 | -AM_V_at = $(am__v_at_@AM_V@) | ||
19178 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
19179 | +AM_V_at = $(am__v_at_$(V)) | ||
19180 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
19181 | am__v_at_0 = @ | ||
19182 | CXXLD = $(CXX) | ||
19183 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
19184 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
19185 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
19186 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
19187 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
19188 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
19189 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
19190 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
19191 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
19192 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
19193 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
19194 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
19195 | am__v_GEN_0 = @echo " GEN " $@; | ||
19196 | SOURCES = $(filterxoverlay_SOURCES) | ||
19197 | DIST_SOURCES = $(filterxoverlay_SOURCES) | ||
19198 | @@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ | ||
19199 | EGREP = @EGREP@ | ||
19200 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
19201 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
19202 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
19203 | EXEEXT = @EXEEXT@ | ||
19204 | FFLAGS = @FFLAGS@ | ||
19205 | FGREP = @FGREP@ | ||
19206 | @@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
19207 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
19208 | GST_CURRENT = @GST_CURRENT@ | ||
19209 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
19210 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
19211 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
19212 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
19213 | GST_LIBS = @GST_LIBS@ | ||
19214 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
19215 | @@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
19216 | GST_LICENSE = @GST_LICENSE@ | ||
19217 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
19218 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
19219 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
19220 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
19221 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
19222 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
19223 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
19224 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
19225 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
19226 | @@ -278,7 +283,7 @@ NM = @NM@ | ||
19227 | NMEDIT = @NMEDIT@ | ||
19228 | OBJC = @OBJC@ | ||
19229 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
19230 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
19231 | +OBJCFLAGS = @OBJCFLAGS@ | ||
19232 | OBJDUMP = @OBJDUMP@ | ||
19233 | OBJEXT = @OBJEXT@ | ||
19234 | OPENGL_ES2 = @OPENGL_ES2@ | ||
19235 | @@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
19236 | VERSION = @VERSION@ | ||
19237 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
19238 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
19239 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
19240 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
19241 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
19242 | XGETTEXT = @XGETTEXT@ | ||
19243 | @@ -388,7 +394,11 @@ sbindir = @sbindir@ | ||
19244 | sharedstatedir = @sharedstatedir@ | ||
19245 | srcdir = @srcdir@ | ||
19246 | sysconfdir = @sysconfdir@ | ||
19247 | +target = @target@ | ||
19248 | target_alias = @target_alias@ | ||
19249 | +target_cpu = @target_cpu@ | ||
19250 | +target_os = @target_os@ | ||
19251 | +target_vendor = @target_vendor@ | ||
19252 | top_build_prefix = @top_build_prefix@ | ||
19253 | top_builddir = @top_builddir@ | ||
19254 | top_srcdir = @top_srcdir@ | ||
19255 | @@ -443,7 +453,7 @@ clean-noinstPROGRAMS: | ||
19256 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
19257 | echo " rm -f" $$list; \ | ||
19258 | rm -f $$list | ||
19259 | -filterxoverlay$(EXEEXT): $(filterxoverlay_OBJECTS) $(filterxoverlay_DEPENDENCIES) $(EXTRA_filterxoverlay_DEPENDENCIES) | ||
19260 | +filterxoverlay$(EXEEXT): $(filterxoverlay_OBJECTS) $(filterxoverlay_DEPENDENCIES) | ||
19261 | @rm -f filterxoverlay$(EXEEXT) | ||
19262 | $(AM_V_CXXLD)$(filterxoverlay_LINK) $(filterxoverlay_OBJECTS) $(filterxoverlay_LDADD) $(LIBS) | ||
19263 | |||
19264 | @@ -458,37 +468,42 @@ distclean-compile: | ||
19265 | .cpp.o: | ||
19266 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
19267 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
19268 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19269 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
19270 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19271 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19272 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
19273 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
19274 | |||
19275 | .cpp.obj: | ||
19276 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
19277 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
19278 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19279 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
19280 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19281 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19282 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
19283 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
19284 | |||
19285 | .cpp.lo: | ||
19286 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
19287 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
19288 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
19289 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
19290 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
19291 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19292 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
19293 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
19294 | |||
19295 | filterxoverlay-main.o: main.cpp | ||
19296 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -MT filterxoverlay-main.o -MD -MP -MF $(DEPDIR)/filterxoverlay-main.Tpo -c -o filterxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
19297 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filterxoverlay-main.Tpo $(DEPDIR)/filterxoverlay-main.Po | ||
19298 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filterxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
19299 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
19300 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filterxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
19301 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19302 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filterxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
19303 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filterxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
19304 | |||
19305 | filterxoverlay-main.obj: main.cpp | ||
19306 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -MT filterxoverlay-main.obj -MD -MP -MF $(DEPDIR)/filterxoverlay-main.Tpo -c -o filterxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
19307 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filterxoverlay-main.Tpo $(DEPDIR)/filterxoverlay-main.Po | ||
19308 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filterxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
19309 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
19310 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filterxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
19311 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19312 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filterxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
19313 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filterxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o filterxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
19314 | |||
19315 | mostlyclean-libtool: | ||
19316 | -rm -f *.lo | ||
19317 | @@ -592,15 +607,10 @@ install-am: all-am | ||
19318 | |||
19319 | installcheck: installcheck-am | ||
19320 | install-strip: | ||
19321 | - if test -z '$(STRIP)'; then \ | ||
19322 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19323 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19324 | - install; \ | ||
19325 | - else \ | ||
19326 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19327 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19328 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
19329 | - fi | ||
19330 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19331 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19332 | + `test -z '$(STRIP)' || \ | ||
19333 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
19334 | mostlyclean-generic: | ||
19335 | |||
19336 | clean-generic: | ||
19337 | diff --git a/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj b/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj | ||
19338 | new file mode 100644 | ||
19339 | index 0000000..ce97ffe | ||
19340 | --- /dev/null | ||
19341 | +++ b/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj | ||
19342 | @@ -0,0 +1,210 @@ | ||
19343 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
19344 | +<VisualStudioProject | ||
19345 | + ProjectType="Visual C++" | ||
19346 | + Version="9,00" | ||
19347 | + Name="filterxoverlay" | ||
19348 | + ProjectGUID="{F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}" | ||
19349 | + RootNamespace="filterxoverlay" | ||
19350 | + Keyword="Win32Proj" | ||
19351 | + TargetFrameworkVersion="131072" | ||
19352 | + > | ||
19353 | + <Platforms> | ||
19354 | + <Platform | ||
19355 | + Name="Win32" | ||
19356 | + /> | ||
19357 | + </Platforms> | ||
19358 | + <ToolFiles> | ||
19359 | + </ToolFiles> | ||
19360 | + <Configurations> | ||
19361 | + <Configuration | ||
19362 | + Name="Debug|Win32" | ||
19363 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
19364 | + IntermediateDirectory="$(ConfigurationName)" | ||
19365 | + ConfigurationType="1" | ||
19366 | + CharacterSet="1" | ||
19367 | + > | ||
19368 | + <Tool | ||
19369 | + Name="VCPreBuildEventTool" | ||
19370 | + /> | ||
19371 | + <Tool | ||
19372 | + Name="VCCustomBuildTool" | ||
19373 | + /> | ||
19374 | + <Tool | ||
19375 | + Name="VCXMLDataGeneratorTool" | ||
19376 | + /> | ||
19377 | + <Tool | ||
19378 | + Name="VCWebServiceProxyGeneratorTool" | ||
19379 | + /> | ||
19380 | + <Tool | ||
19381 | + Name="VCMIDLTool" | ||
19382 | + /> | ||
19383 | + <Tool | ||
19384 | + Name="VCCLCompilerTool" | ||
19385 | + Optimization="0" | ||
19386 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
19387 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
19388 | + MinimalRebuild="true" | ||
19389 | + BasicRuntimeChecks="3" | ||
19390 | + RuntimeLibrary="3" | ||
19391 | + UsePrecompiledHeader="0" | ||
19392 | + WarningLevel="3" | ||
19393 | + Detect64BitPortabilityProblems="false" | ||
19394 | + DebugInformationFormat="4" | ||
19395 | + /> | ||
19396 | + <Tool | ||
19397 | + Name="VCManagedResourceCompilerTool" | ||
19398 | + /> | ||
19399 | + <Tool | ||
19400 | + Name="VCResourceCompilerTool" | ||
19401 | + /> | ||
19402 | + <Tool | ||
19403 | + Name="VCPreLinkEventTool" | ||
19404 | + /> | ||
19405 | + <Tool | ||
19406 | + Name="VCLinkerTool" | ||
19407 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
19408 | + LinkIncremental="2" | ||
19409 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
19410 | + GenerateDebugInformation="true" | ||
19411 | + SubSystem="1" | ||
19412 | + RandomizedBaseAddress="1" | ||
19413 | + DataExecutionPrevention="0" | ||
19414 | + TargetMachine="1" | ||
19415 | + /> | ||
19416 | + <Tool | ||
19417 | + Name="VCALinkTool" | ||
19418 | + /> | ||
19419 | + <Tool | ||
19420 | + Name="VCManifestTool" | ||
19421 | + /> | ||
19422 | + <Tool | ||
19423 | + Name="VCXDCMakeTool" | ||
19424 | + /> | ||
19425 | + <Tool | ||
19426 | + Name="VCBscMakeTool" | ||
19427 | + /> | ||
19428 | + <Tool | ||
19429 | + Name="VCFxCopTool" | ||
19430 | + /> | ||
19431 | + <Tool | ||
19432 | + Name="VCAppVerifierTool" | ||
19433 | + /> | ||
19434 | + <Tool | ||
19435 | + Name="VCPostBuildEventTool" | ||
19436 | + /> | ||
19437 | + </Configuration> | ||
19438 | + <Configuration | ||
19439 | + Name="Release|Win32" | ||
19440 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
19441 | + IntermediateDirectory="$(ConfigurationName)" | ||
19442 | + ConfigurationType="1" | ||
19443 | + CharacterSet="1" | ||
19444 | + WholeProgramOptimization="1" | ||
19445 | + > | ||
19446 | + <Tool | ||
19447 | + Name="VCPreBuildEventTool" | ||
19448 | + /> | ||
19449 | + <Tool | ||
19450 | + Name="VCCustomBuildTool" | ||
19451 | + /> | ||
19452 | + <Tool | ||
19453 | + Name="VCXMLDataGeneratorTool" | ||
19454 | + /> | ||
19455 | + <Tool | ||
19456 | + Name="VCWebServiceProxyGeneratorTool" | ||
19457 | + /> | ||
19458 | + <Tool | ||
19459 | + Name="VCMIDLTool" | ||
19460 | + /> | ||
19461 | + <Tool | ||
19462 | + Name="VCCLCompilerTool" | ||
19463 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
19464 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
19465 | + RuntimeLibrary="2" | ||
19466 | + UsePrecompiledHeader="0" | ||
19467 | + WarningLevel="3" | ||
19468 | + Detect64BitPortabilityProblems="false" | ||
19469 | + DebugInformationFormat="3" | ||
19470 | + /> | ||
19471 | + <Tool | ||
19472 | + Name="VCManagedResourceCompilerTool" | ||
19473 | + /> | ||
19474 | + <Tool | ||
19475 | + Name="VCResourceCompilerTool" | ||
19476 | + /> | ||
19477 | + <Tool | ||
19478 | + Name="VCPreLinkEventTool" | ||
19479 | + /> | ||
19480 | + <Tool | ||
19481 | + Name="VCLinkerTool" | ||
19482 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
19483 | + LinkIncremental="1" | ||
19484 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
19485 | + GenerateDebugInformation="true" | ||
19486 | + SubSystem="1" | ||
19487 | + OptimizeReferences="2" | ||
19488 | + EnableCOMDATFolding="2" | ||
19489 | + RandomizedBaseAddress="1" | ||
19490 | + DataExecutionPrevention="0" | ||
19491 | + TargetMachine="1" | ||
19492 | + /> | ||
19493 | + <Tool | ||
19494 | + Name="VCALinkTool" | ||
19495 | + /> | ||
19496 | + <Tool | ||
19497 | + Name="VCManifestTool" | ||
19498 | + /> | ||
19499 | + <Tool | ||
19500 | + Name="VCXDCMakeTool" | ||
19501 | + /> | ||
19502 | + <Tool | ||
19503 | + Name="VCBscMakeTool" | ||
19504 | + /> | ||
19505 | + <Tool | ||
19506 | + Name="VCFxCopTool" | ||
19507 | + /> | ||
19508 | + <Tool | ||
19509 | + Name="VCAppVerifierTool" | ||
19510 | + /> | ||
19511 | + <Tool | ||
19512 | + Name="VCPostBuildEventTool" | ||
19513 | + /> | ||
19514 | + </Configuration> | ||
19515 | + </Configurations> | ||
19516 | + <References> | ||
19517 | + </References> | ||
19518 | + <Files> | ||
19519 | + <Filter | ||
19520 | + Name="Source Files" | ||
19521 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
19522 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
19523 | + > | ||
19524 | + <File | ||
19525 | + RelativePath="..\gstgtk.c" | ||
19526 | + > | ||
19527 | + </File> | ||
19528 | + <File | ||
19529 | + RelativePath=".\main.cpp" | ||
19530 | + > | ||
19531 | + </File> | ||
19532 | + </Filter> | ||
19533 | + <Filter | ||
19534 | + Name="Header Files" | ||
19535 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
19536 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
19537 | + > | ||
19538 | + <File | ||
19539 | + RelativePath="..\gstgtk.h" | ||
19540 | + > | ||
19541 | + </File> | ||
19542 | + </Filter> | ||
19543 | + <Filter | ||
19544 | + Name="Resource Files" | ||
19545 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
19546 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
19547 | + > | ||
19548 | + </Filter> | ||
19549 | + </Files> | ||
19550 | + <Globals> | ||
19551 | + </Globals> | ||
19552 | +</VisualStudioProject> | ||
19553 | diff --git a/tests/examples/gtk/fxtest/Makefile.in b/tests/examples/gtk/fxtest/Makefile.in | ||
19554 | index 9885033..34f28c9 100644 | ||
19555 | --- a/tests/examples/gtk/fxtest/Makefile.in | ||
19556 | +++ b/tests/examples/gtk/fxtest/Makefile.in | ||
19557 | @@ -1,9 +1,9 @@ | ||
19558 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
19559 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
19560 | # @configure_input@ | ||
19561 | |||
19562 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
19563 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
19564 | -# Foundation, Inc. | ||
19565 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
19566 | +# Inc. | ||
19567 | # This Makefile.in is free software; the Free Software Foundation | ||
19568 | # gives unlimited permission to copy and/or distribute it, | ||
19569 | # with or without modifications, as long as this notice is preserved. | ||
19570 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
19571 | POST_UNINSTALL = : | ||
19572 | build_triplet = @build@ | ||
19573 | host_triplet = @host@ | ||
19574 | +target_triplet = @target@ | ||
19575 | noinst_PROGRAMS = fxtest$(EXEEXT) pixbufdrop$(EXEEXT) | ||
19576 | subdir = tests/examples/gtk/fxtest | ||
19577 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
19578 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
19579 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
19580 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
19581 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
19582 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
19583 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
19584 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
19585 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
19586 | @@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = | ||
19587 | fxtest_DEPENDENCIES = ../libgstgtkhelper.la $(am__DEPENDENCIES_1) \ | ||
19588 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
19589 | $(am__DEPENDENCIES_1) | ||
19590 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
19591 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
19592 | +AM_V_lt = $(am__v_lt_$(V)) | ||
19593 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
19594 | am__v_lt_0 = --silent | ||
19595 | fxtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
19596 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fxtest_CFLAGS) $(CFLAGS) \ | ||
19597 | @@ -106,21 +106,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
19598 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
19599 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
19600 | $(AM_CFLAGS) $(CFLAGS) | ||
19601 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
19602 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
19603 | +AM_V_CC = $(am__v_CC_$(V)) | ||
19604 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
19605 | am__v_CC_0 = @echo " CC " $@; | ||
19606 | -AM_V_at = $(am__v_at_@AM_V@) | ||
19607 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
19608 | +AM_V_at = $(am__v_at_$(V)) | ||
19609 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
19610 | am__v_at_0 = @ | ||
19611 | CCLD = $(CC) | ||
19612 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
19613 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
19614 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
19615 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
19616 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
19617 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
19618 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
19619 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
19620 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
19621 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
19622 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
19623 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
19624 | am__v_GEN_0 = @echo " GEN " $@; | ||
19625 | SOURCES = $(fxtest_SOURCES) $(pixbufdrop_SOURCES) | ||
19626 | DIST_SOURCES = $(fxtest_SOURCES) $(pixbufdrop_SOURCES) | ||
19627 | @@ -173,6 +173,7 @@ ECHO_T = @ECHO_T@ | ||
19628 | EGREP = @EGREP@ | ||
19629 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
19630 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
19631 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
19632 | EXEEXT = @EXEEXT@ | ||
19633 | FFLAGS = @FFLAGS@ | ||
19634 | FGREP = @FGREP@ | ||
19635 | @@ -204,6 +205,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
19636 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
19637 | GST_CURRENT = @GST_CURRENT@ | ||
19638 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
19639 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
19640 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
19641 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
19642 | GST_LIBS = @GST_LIBS@ | ||
19643 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
19644 | @@ -211,8 +214,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
19645 | GST_LICENSE = @GST_LICENSE@ | ||
19646 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
19647 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
19648 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
19649 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
19650 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
19651 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
19652 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
19653 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
19654 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
19655 | @@ -285,7 +290,7 @@ NM = @NM@ | ||
19656 | NMEDIT = @NMEDIT@ | ||
19657 | OBJC = @OBJC@ | ||
19658 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
19659 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
19660 | +OBJCFLAGS = @OBJCFLAGS@ | ||
19661 | OBJDUMP = @OBJDUMP@ | ||
19662 | OBJEXT = @OBJEXT@ | ||
19663 | OPENGL_ES2 = @OPENGL_ES2@ | ||
19664 | @@ -330,6 +335,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
19665 | VERSION = @VERSION@ | ||
19666 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
19667 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
19668 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
19669 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
19670 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
19671 | XGETTEXT = @XGETTEXT@ | ||
19672 | @@ -395,7 +401,11 @@ sbindir = @sbindir@ | ||
19673 | sharedstatedir = @sharedstatedir@ | ||
19674 | srcdir = @srcdir@ | ||
19675 | sysconfdir = @sysconfdir@ | ||
19676 | +target = @target@ | ||
19677 | target_alias = @target_alias@ | ||
19678 | +target_cpu = @target_cpu@ | ||
19679 | +target_os = @target_os@ | ||
19680 | +target_vendor = @target_vendor@ | ||
19681 | top_build_prefix = @top_build_prefix@ | ||
19682 | top_builddir = @top_builddir@ | ||
19683 | top_srcdir = @top_srcdir@ | ||
19684 | @@ -458,10 +468,10 @@ clean-noinstPROGRAMS: | ||
19685 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
19686 | echo " rm -f" $$list; \ | ||
19687 | rm -f $$list | ||
19688 | -fxtest$(EXEEXT): $(fxtest_OBJECTS) $(fxtest_DEPENDENCIES) $(EXTRA_fxtest_DEPENDENCIES) | ||
19689 | +fxtest$(EXEEXT): $(fxtest_OBJECTS) $(fxtest_DEPENDENCIES) | ||
19690 | @rm -f fxtest$(EXEEXT) | ||
19691 | $(AM_V_CCLD)$(fxtest_LINK) $(fxtest_OBJECTS) $(fxtest_LDADD) $(LIBS) | ||
19692 | -pixbufdrop$(EXEEXT): $(pixbufdrop_OBJECTS) $(pixbufdrop_DEPENDENCIES) $(EXTRA_pixbufdrop_DEPENDENCIES) | ||
19693 | +pixbufdrop$(EXEEXT): $(pixbufdrop_OBJECTS) $(pixbufdrop_DEPENDENCIES) | ||
19694 | @rm -f pixbufdrop$(EXEEXT) | ||
19695 | $(AM_V_CCLD)$(pixbufdrop_LINK) $(pixbufdrop_OBJECTS) $(pixbufdrop_LDADD) $(LIBS) | ||
19696 | |||
19697 | @@ -477,51 +487,58 @@ distclean-compile: | ||
19698 | .c.o: | ||
19699 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
19700 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
19701 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19702 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19703 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19704 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19705 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
19706 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
19707 | |||
19708 | .c.obj: | ||
19709 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
19710 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
19711 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19712 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19713 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
19714 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19715 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
19716 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
19717 | |||
19718 | .c.lo: | ||
19719 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
19720 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
19721 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
19722 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19723 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
19724 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19725 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
19726 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
19727 | |||
19728 | fxtest-fxtest.o: fxtest.c | ||
19729 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -MT fxtest-fxtest.o -MD -MP -MF $(DEPDIR)/fxtest-fxtest.Tpo -c -o fxtest-fxtest.o `test -f 'fxtest.c' || echo '$(srcdir)/'`fxtest.c | ||
19730 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fxtest-fxtest.Tpo $(DEPDIR)/fxtest-fxtest.Po | ||
19731 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fxtest.c' object='fxtest-fxtest.o' libtool=no @AMDEPBACKSLASH@ | ||
19732 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19733 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fxtest.c' object='fxtest-fxtest.o' libtool=no @AMDEPBACKSLASH@ | ||
19734 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19735 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -c -o fxtest-fxtest.o `test -f 'fxtest.c' || echo '$(srcdir)/'`fxtest.c | ||
19736 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -c -o fxtest-fxtest.o `test -f 'fxtest.c' || echo '$(srcdir)/'`fxtest.c | ||
19737 | |||
19738 | fxtest-fxtest.obj: fxtest.c | ||
19739 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -MT fxtest-fxtest.obj -MD -MP -MF $(DEPDIR)/fxtest-fxtest.Tpo -c -o fxtest-fxtest.obj `if test -f 'fxtest.c'; then $(CYGPATH_W) 'fxtest.c'; else $(CYGPATH_W) '$(srcdir)/fxtest.c'; fi` | ||
19740 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fxtest-fxtest.Tpo $(DEPDIR)/fxtest-fxtest.Po | ||
19741 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fxtest.c' object='fxtest-fxtest.obj' libtool=no @AMDEPBACKSLASH@ | ||
19742 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19743 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fxtest.c' object='fxtest-fxtest.obj' libtool=no @AMDEPBACKSLASH@ | ||
19744 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19745 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -c -o fxtest-fxtest.obj `if test -f 'fxtest.c'; then $(CYGPATH_W) 'fxtest.c'; else $(CYGPATH_W) '$(srcdir)/fxtest.c'; fi` | ||
19746 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fxtest_CFLAGS) $(CFLAGS) -c -o fxtest-fxtest.obj `if test -f 'fxtest.c'; then $(CYGPATH_W) 'fxtest.c'; else $(CYGPATH_W) '$(srcdir)/fxtest.c'; fi` | ||
19747 | |||
19748 | pixbufdrop-pixbufdrop.o: pixbufdrop.c | ||
19749 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -MT pixbufdrop-pixbufdrop.o -MD -MP -MF $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo -c -o pixbufdrop-pixbufdrop.o `test -f 'pixbufdrop.c' || echo '$(srcdir)/'`pixbufdrop.c | ||
19750 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo $(DEPDIR)/pixbufdrop-pixbufdrop.Po | ||
19751 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.o' libtool=no @AMDEPBACKSLASH@ | ||
19752 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19753 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.o' libtool=no @AMDEPBACKSLASH@ | ||
19754 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19755 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -c -o pixbufdrop-pixbufdrop.o `test -f 'pixbufdrop.c' || echo '$(srcdir)/'`pixbufdrop.c | ||
19756 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -c -o pixbufdrop-pixbufdrop.o `test -f 'pixbufdrop.c' || echo '$(srcdir)/'`pixbufdrop.c | ||
19757 | |||
19758 | pixbufdrop-pixbufdrop.obj: pixbufdrop.c | ||
19759 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -MT pixbufdrop-pixbufdrop.obj -MD -MP -MF $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo -c -o pixbufdrop-pixbufdrop.obj `if test -f 'pixbufdrop.c'; then $(CYGPATH_W) 'pixbufdrop.c'; else $(CYGPATH_W) '$(srcdir)/pixbufdrop.c'; fi` | ||
19760 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo $(DEPDIR)/pixbufdrop-pixbufdrop.Po | ||
19761 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.obj' libtool=no @AMDEPBACKSLASH@ | ||
19762 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
19763 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.obj' libtool=no @AMDEPBACKSLASH@ | ||
19764 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19765 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -c -o pixbufdrop-pixbufdrop.obj `if test -f 'pixbufdrop.c'; then $(CYGPATH_W) 'pixbufdrop.c'; else $(CYGPATH_W) '$(srcdir)/pixbufdrop.c'; fi` | ||
19766 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pixbufdrop_CFLAGS) $(CFLAGS) -c -o pixbufdrop-pixbufdrop.obj `if test -f 'pixbufdrop.c'; then $(CYGPATH_W) 'pixbufdrop.c'; else $(CYGPATH_W) '$(srcdir)/pixbufdrop.c'; fi` | ||
19767 | |||
19768 | mostlyclean-libtool: | ||
19769 | -rm -f *.lo | ||
19770 | @@ -625,15 +642,10 @@ install-am: all-am | ||
19771 | |||
19772 | installcheck: installcheck-am | ||
19773 | install-strip: | ||
19774 | - if test -z '$(STRIP)'; then \ | ||
19775 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19776 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19777 | - install; \ | ||
19778 | - else \ | ||
19779 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19780 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19781 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
19782 | - fi | ||
19783 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
19784 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
19785 | + `test -z '$(STRIP)' || \ | ||
19786 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
19787 | mostlyclean-generic: | ||
19788 | |||
19789 | clean-generic: | ||
19790 | diff --git a/tests/examples/gtk/fxtest/fxtest.vcproj b/tests/examples/gtk/fxtest/fxtest.vcproj | ||
19791 | new file mode 100644 | ||
19792 | index 0000000..47f0b5c | ||
19793 | --- /dev/null | ||
19794 | +++ b/tests/examples/gtk/fxtest/fxtest.vcproj | ||
19795 | @@ -0,0 +1,210 @@ | ||
19796 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
19797 | +<VisualStudioProject | ||
19798 | + ProjectType="Visual C++" | ||
19799 | + Version="9,00" | ||
19800 | + Name="fxtest" | ||
19801 | + ProjectGUID="{59075FDD-68CD-4F1A-948B-46D142800798}" | ||
19802 | + RootNamespace="fxtest" | ||
19803 | + Keyword="Win32Proj" | ||
19804 | + TargetFrameworkVersion="131072" | ||
19805 | + > | ||
19806 | + <Platforms> | ||
19807 | + <Platform | ||
19808 | + Name="Win32" | ||
19809 | + /> | ||
19810 | + </Platforms> | ||
19811 | + <ToolFiles> | ||
19812 | + </ToolFiles> | ||
19813 | + <Configurations> | ||
19814 | + <Configuration | ||
19815 | + Name="Debug|Win32" | ||
19816 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
19817 | + IntermediateDirectory="$(ConfigurationName)" | ||
19818 | + ConfigurationType="1" | ||
19819 | + CharacterSet="1" | ||
19820 | + > | ||
19821 | + <Tool | ||
19822 | + Name="VCPreBuildEventTool" | ||
19823 | + /> | ||
19824 | + <Tool | ||
19825 | + Name="VCCustomBuildTool" | ||
19826 | + /> | ||
19827 | + <Tool | ||
19828 | + Name="VCXMLDataGeneratorTool" | ||
19829 | + /> | ||
19830 | + <Tool | ||
19831 | + Name="VCWebServiceProxyGeneratorTool" | ||
19832 | + /> | ||
19833 | + <Tool | ||
19834 | + Name="VCMIDLTool" | ||
19835 | + /> | ||
19836 | + <Tool | ||
19837 | + Name="VCCLCompilerTool" | ||
19838 | + Optimization="0" | ||
19839 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
19840 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
19841 | + MinimalRebuild="true" | ||
19842 | + BasicRuntimeChecks="3" | ||
19843 | + RuntimeLibrary="3" | ||
19844 | + UsePrecompiledHeader="0" | ||
19845 | + WarningLevel="3" | ||
19846 | + Detect64BitPortabilityProblems="false" | ||
19847 | + DebugInformationFormat="4" | ||
19848 | + /> | ||
19849 | + <Tool | ||
19850 | + Name="VCManagedResourceCompilerTool" | ||
19851 | + /> | ||
19852 | + <Tool | ||
19853 | + Name="VCResourceCompilerTool" | ||
19854 | + /> | ||
19855 | + <Tool | ||
19856 | + Name="VCPreLinkEventTool" | ||
19857 | + /> | ||
19858 | + <Tool | ||
19859 | + Name="VCLinkerTool" | ||
19860 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
19861 | + LinkIncremental="2" | ||
19862 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
19863 | + GenerateDebugInformation="true" | ||
19864 | + SubSystem="1" | ||
19865 | + RandomizedBaseAddress="1" | ||
19866 | + DataExecutionPrevention="0" | ||
19867 | + TargetMachine="1" | ||
19868 | + /> | ||
19869 | + <Tool | ||
19870 | + Name="VCALinkTool" | ||
19871 | + /> | ||
19872 | + <Tool | ||
19873 | + Name="VCManifestTool" | ||
19874 | + /> | ||
19875 | + <Tool | ||
19876 | + Name="VCXDCMakeTool" | ||
19877 | + /> | ||
19878 | + <Tool | ||
19879 | + Name="VCBscMakeTool" | ||
19880 | + /> | ||
19881 | + <Tool | ||
19882 | + Name="VCFxCopTool" | ||
19883 | + /> | ||
19884 | + <Tool | ||
19885 | + Name="VCAppVerifierTool" | ||
19886 | + /> | ||
19887 | + <Tool | ||
19888 | + Name="VCPostBuildEventTool" | ||
19889 | + /> | ||
19890 | + </Configuration> | ||
19891 | + <Configuration | ||
19892 | + Name="Release|Win32" | ||
19893 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
19894 | + IntermediateDirectory="$(ConfigurationName)" | ||
19895 | + ConfigurationType="1" | ||
19896 | + CharacterSet="1" | ||
19897 | + WholeProgramOptimization="1" | ||
19898 | + > | ||
19899 | + <Tool | ||
19900 | + Name="VCPreBuildEventTool" | ||
19901 | + /> | ||
19902 | + <Tool | ||
19903 | + Name="VCCustomBuildTool" | ||
19904 | + /> | ||
19905 | + <Tool | ||
19906 | + Name="VCXMLDataGeneratorTool" | ||
19907 | + /> | ||
19908 | + <Tool | ||
19909 | + Name="VCWebServiceProxyGeneratorTool" | ||
19910 | + /> | ||
19911 | + <Tool | ||
19912 | + Name="VCMIDLTool" | ||
19913 | + /> | ||
19914 | + <Tool | ||
19915 | + Name="VCCLCompilerTool" | ||
19916 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
19917 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
19918 | + RuntimeLibrary="2" | ||
19919 | + UsePrecompiledHeader="0" | ||
19920 | + WarningLevel="3" | ||
19921 | + Detect64BitPortabilityProblems="false" | ||
19922 | + DebugInformationFormat="3" | ||
19923 | + /> | ||
19924 | + <Tool | ||
19925 | + Name="VCManagedResourceCompilerTool" | ||
19926 | + /> | ||
19927 | + <Tool | ||
19928 | + Name="VCResourceCompilerTool" | ||
19929 | + /> | ||
19930 | + <Tool | ||
19931 | + Name="VCPreLinkEventTool" | ||
19932 | + /> | ||
19933 | + <Tool | ||
19934 | + Name="VCLinkerTool" | ||
19935 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
19936 | + LinkIncremental="1" | ||
19937 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
19938 | + GenerateDebugInformation="true" | ||
19939 | + SubSystem="1" | ||
19940 | + OptimizeReferences="2" | ||
19941 | + EnableCOMDATFolding="2" | ||
19942 | + RandomizedBaseAddress="1" | ||
19943 | + DataExecutionPrevention="0" | ||
19944 | + TargetMachine="1" | ||
19945 | + /> | ||
19946 | + <Tool | ||
19947 | + Name="VCALinkTool" | ||
19948 | + /> | ||
19949 | + <Tool | ||
19950 | + Name="VCManifestTool" | ||
19951 | + /> | ||
19952 | + <Tool | ||
19953 | + Name="VCXDCMakeTool" | ||
19954 | + /> | ||
19955 | + <Tool | ||
19956 | + Name="VCBscMakeTool" | ||
19957 | + /> | ||
19958 | + <Tool | ||
19959 | + Name="VCFxCopTool" | ||
19960 | + /> | ||
19961 | + <Tool | ||
19962 | + Name="VCAppVerifierTool" | ||
19963 | + /> | ||
19964 | + <Tool | ||
19965 | + Name="VCPostBuildEventTool" | ||
19966 | + /> | ||
19967 | + </Configuration> | ||
19968 | + </Configurations> | ||
19969 | + <References> | ||
19970 | + </References> | ||
19971 | + <Files> | ||
19972 | + <Filter | ||
19973 | + Name="Source Files" | ||
19974 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
19975 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
19976 | + > | ||
19977 | + <File | ||
19978 | + RelativePath=".\fxtest.c" | ||
19979 | + > | ||
19980 | + </File> | ||
19981 | + <File | ||
19982 | + RelativePath="..\gstgtk.c" | ||
19983 | + > | ||
19984 | + </File> | ||
19985 | + </Filter> | ||
19986 | + <Filter | ||
19987 | + Name="Header Files" | ||
19988 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
19989 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
19990 | + > | ||
19991 | + <File | ||
19992 | + RelativePath="..\gstgtk.h" | ||
19993 | + > | ||
19994 | + </File> | ||
19995 | + </Filter> | ||
19996 | + <Filter | ||
19997 | + Name="Resource Files" | ||
19998 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
19999 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
20000 | + > | ||
20001 | + </Filter> | ||
20002 | + </Files> | ||
20003 | + <Globals> | ||
20004 | + </Globals> | ||
20005 | +</VisualStudioProject> | ||
20006 | diff --git a/tests/examples/gtk/gtk.sln b/tests/examples/gtk/gtk.sln | ||
20007 | new file mode 100644 | ||
20008 | index 0000000..9965c8a | ||
20009 | --- /dev/null | ||
20010 | +++ b/tests/examples/gtk/gtk.sln | ||
20011 | @@ -0,0 +1,50 @@ | ||
20012 | +? | ||
20013 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
20014 | +# Visual Studio 2008 | ||
20015 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterxoverlay", "filterxoverlay\filterxoverlay.vcproj", "{F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}" | ||
20016 | +EndProject | ||
20017 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkxoverlay", "gtkxoverlay\gtkxoverlay.vcproj", "{E83070C2-58E4-48AE-AEB3-A4580EDE1212}" | ||
20018 | +EndProject | ||
20019 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxtest", "fxtest\fxtest.vcproj", "{59075FDD-68CD-4F1A-948B-46D142800798}" | ||
20020 | +EndProject | ||
20021 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixbufdrop", "pixbufdrop\pixbufdrop.vcproj", "{09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}" | ||
20022 | +EndProject | ||
20023 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filternoxoverlay", "filternoxoverlay\filternoxoverlay.vcproj", "{F41F3034-3E0B-4630-8D1E-35E14C606863}" | ||
20024 | +EndProject | ||
20025 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "switchxoverlay", "switchxoverlay\switchxoverlay.vcproj", "{BA78B4B4-3268-483E-9676-911E29FD2C69}" | ||
20026 | +EndProject | ||
20027 | +Global | ||
20028 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
20029 | + Debug|Win32 = Debug|Win32 | ||
20030 | + Release|Win32 = Release|Win32 | ||
20031 | + EndGlobalSection | ||
20032 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
20033 | + {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20034 | + {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Debug|Win32.Build.0 = Debug|Win32 | ||
20035 | + {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Release|Win32.ActiveCfg = Release|Win32 | ||
20036 | + {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Release|Win32.Build.0 = Release|Win32 | ||
20037 | + {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20038 | + {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Debug|Win32.Build.0 = Debug|Win32 | ||
20039 | + {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Release|Win32.ActiveCfg = Release|Win32 | ||
20040 | + {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Release|Win32.Build.0 = Release|Win32 | ||
20041 | + {59075FDD-68CD-4F1A-948B-46D142800798}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20042 | + {59075FDD-68CD-4F1A-948B-46D142800798}.Debug|Win32.Build.0 = Debug|Win32 | ||
20043 | + {59075FDD-68CD-4F1A-948B-46D142800798}.Release|Win32.ActiveCfg = Release|Win32 | ||
20044 | + {59075FDD-68CD-4F1A-948B-46D142800798}.Release|Win32.Build.0 = Release|Win32 | ||
20045 | + {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20046 | + {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Debug|Win32.Build.0 = Debug|Win32 | ||
20047 | + {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Release|Win32.ActiveCfg = Release|Win32 | ||
20048 | + {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Release|Win32.Build.0 = Release|Win32 | ||
20049 | + {F41F3034-3E0B-4630-8D1E-35E14C606863}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20050 | + {F41F3034-3E0B-4630-8D1E-35E14C606863}.Debug|Win32.Build.0 = Debug|Win32 | ||
20051 | + {F41F3034-3E0B-4630-8D1E-35E14C606863}.Release|Win32.ActiveCfg = Release|Win32 | ||
20052 | + {F41F3034-3E0B-4630-8D1E-35E14C606863}.Release|Win32.Build.0 = Release|Win32 | ||
20053 | + {BA78B4B4-3268-483E-9676-911E29FD2C69}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
20054 | + {BA78B4B4-3268-483E-9676-911E29FD2C69}.Debug|Win32.Build.0 = Debug|Win32 | ||
20055 | + {BA78B4B4-3268-483E-9676-911E29FD2C69}.Release|Win32.ActiveCfg = Release|Win32 | ||
20056 | + {BA78B4B4-3268-483E-9676-911E29FD2C69}.Release|Win32.Build.0 = Release|Win32 | ||
20057 | + EndGlobalSection | ||
20058 | + GlobalSection(SolutionProperties) = preSolution | ||
20059 | + HideSolutionNode = FALSE | ||
20060 | + EndGlobalSection | ||
20061 | +EndGlobal | ||
20062 | diff --git a/tests/examples/gtk/gtkxoverlay/Makefile.in b/tests/examples/gtk/gtkxoverlay/Makefile.in | ||
20063 | index 44050e4..30a0f1d 100644 | ||
20064 | --- a/tests/examples/gtk/gtkxoverlay/Makefile.in | ||
20065 | +++ b/tests/examples/gtk/gtkxoverlay/Makefile.in | ||
20066 | @@ -1,9 +1,9 @@ | ||
20067 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
20068 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
20069 | # @configure_input@ | ||
20070 | |||
20071 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
20072 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
20073 | -# Foundation, Inc. | ||
20074 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
20075 | +# Inc. | ||
20076 | # This Makefile.in is free software; the Free Software Foundation | ||
20077 | # gives unlimited permission to copy and/or distribute it, | ||
20078 | # with or without modifications, as long as this notice is preserved. | ||
20079 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
20080 | POST_UNINSTALL = : | ||
20081 | build_triplet = @build@ | ||
20082 | host_triplet = @host@ | ||
20083 | +target_triplet = @target@ | ||
20084 | noinst_PROGRAMS = gtkxoverlay$(EXEEXT) | ||
20085 | subdir = tests/examples/gtk/gtkxoverlay | ||
20086 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
20087 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
20088 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
20089 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
20090 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
20091 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
20092 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
20093 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
20094 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
20095 | @@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = | ||
20096 | gtkxoverlay_DEPENDENCIES = ../libgstgtkhelper.la $(am__DEPENDENCIES_1) \ | ||
20097 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
20098 | $(am__DEPENDENCIES_1) | ||
20099 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
20100 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
20101 | +AM_V_lt = $(am__v_lt_$(V)) | ||
20102 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
20103 | am__v_lt_0 = --silent | ||
20104 | gtkxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
20105 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(gtkxoverlay_CXXFLAGS) \ | ||
20106 | @@ -98,21 +98,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
20107 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
20108 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
20109 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
20110 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
20111 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
20112 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
20113 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
20114 | am__v_CXX_0 = @echo " CXX " $@; | ||
20115 | -AM_V_at = $(am__v_at_@AM_V@) | ||
20116 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
20117 | +AM_V_at = $(am__v_at_$(V)) | ||
20118 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
20119 | am__v_at_0 = @ | ||
20120 | CXXLD = $(CXX) | ||
20121 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
20122 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
20123 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
20124 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
20125 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
20126 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
20127 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
20128 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
20129 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
20130 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
20131 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
20132 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
20133 | am__v_GEN_0 = @echo " GEN " $@; | ||
20134 | SOURCES = $(gtkxoverlay_SOURCES) | ||
20135 | DIST_SOURCES = $(gtkxoverlay_SOURCES) | ||
20136 | @@ -165,6 +165,7 @@ ECHO_T = @ECHO_T@ | ||
20137 | EGREP = @EGREP@ | ||
20138 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
20139 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
20140 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
20141 | EXEEXT = @EXEEXT@ | ||
20142 | FFLAGS = @FFLAGS@ | ||
20143 | FGREP = @FGREP@ | ||
20144 | @@ -196,6 +197,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
20145 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
20146 | GST_CURRENT = @GST_CURRENT@ | ||
20147 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
20148 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
20149 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
20150 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
20151 | GST_LIBS = @GST_LIBS@ | ||
20152 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
20153 | @@ -203,8 +206,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
20154 | GST_LICENSE = @GST_LICENSE@ | ||
20155 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
20156 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
20157 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
20158 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
20159 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
20160 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
20161 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
20162 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
20163 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
20164 | @@ -277,7 +282,7 @@ NM = @NM@ | ||
20165 | NMEDIT = @NMEDIT@ | ||
20166 | OBJC = @OBJC@ | ||
20167 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
20168 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
20169 | +OBJCFLAGS = @OBJCFLAGS@ | ||
20170 | OBJDUMP = @OBJDUMP@ | ||
20171 | OBJEXT = @OBJEXT@ | ||
20172 | OPENGL_ES2 = @OPENGL_ES2@ | ||
20173 | @@ -322,6 +327,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
20174 | VERSION = @VERSION@ | ||
20175 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
20176 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
20177 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
20178 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
20179 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
20180 | XGETTEXT = @XGETTEXT@ | ||
20181 | @@ -387,7 +393,11 @@ sbindir = @sbindir@ | ||
20182 | sharedstatedir = @sharedstatedir@ | ||
20183 | srcdir = @srcdir@ | ||
20184 | sysconfdir = @sysconfdir@ | ||
20185 | +target = @target@ | ||
20186 | target_alias = @target_alias@ | ||
20187 | +target_cpu = @target_cpu@ | ||
20188 | +target_os = @target_os@ | ||
20189 | +target_vendor = @target_vendor@ | ||
20190 | top_build_prefix = @top_build_prefix@ | ||
20191 | top_builddir = @top_builddir@ | ||
20192 | top_srcdir = @top_srcdir@ | ||
20193 | @@ -442,7 +452,7 @@ clean-noinstPROGRAMS: | ||
20194 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
20195 | echo " rm -f" $$list; \ | ||
20196 | rm -f $$list | ||
20197 | -gtkxoverlay$(EXEEXT): $(gtkxoverlay_OBJECTS) $(gtkxoverlay_DEPENDENCIES) $(EXTRA_gtkxoverlay_DEPENDENCIES) | ||
20198 | +gtkxoverlay$(EXEEXT): $(gtkxoverlay_OBJECTS) $(gtkxoverlay_DEPENDENCIES) | ||
20199 | @rm -f gtkxoverlay$(EXEEXT) | ||
20200 | $(AM_V_CXXLD)$(gtkxoverlay_LINK) $(gtkxoverlay_OBJECTS) $(gtkxoverlay_LDADD) $(LIBS) | ||
20201 | |||
20202 | @@ -457,37 +467,42 @@ distclean-compile: | ||
20203 | .cpp.o: | ||
20204 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
20205 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
20206 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20207 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20208 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20209 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20210 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
20211 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
20212 | |||
20213 | .cpp.obj: | ||
20214 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
20215 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
20216 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20217 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20218 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20219 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20220 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
20221 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
20222 | |||
20223 | .cpp.lo: | ||
20224 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
20225 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
20226 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
20227 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20228 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
20229 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20230 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
20231 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
20232 | |||
20233 | gtkxoverlay-main.o: main.cpp | ||
20234 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -MT gtkxoverlay-main.o -MD -MP -MF $(DEPDIR)/gtkxoverlay-main.Tpo -c -o gtkxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20235 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gtkxoverlay-main.Tpo $(DEPDIR)/gtkxoverlay-main.Po | ||
20236 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='gtkxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
20237 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20238 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gtkxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
20239 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20240 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o gtkxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20241 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o gtkxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20242 | |||
20243 | gtkxoverlay-main.obj: main.cpp | ||
20244 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -MT gtkxoverlay-main.obj -MD -MP -MF $(DEPDIR)/gtkxoverlay-main.Tpo -c -o gtkxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20245 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gtkxoverlay-main.Tpo $(DEPDIR)/gtkxoverlay-main.Po | ||
20246 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='gtkxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
20247 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20248 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gtkxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
20249 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20250 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o gtkxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20251 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o gtkxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20252 | |||
20253 | mostlyclean-libtool: | ||
20254 | -rm -f *.lo | ||
20255 | @@ -591,15 +606,10 @@ install-am: all-am | ||
20256 | |||
20257 | installcheck: installcheck-am | ||
20258 | install-strip: | ||
20259 | - if test -z '$(STRIP)'; then \ | ||
20260 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20261 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20262 | - install; \ | ||
20263 | - else \ | ||
20264 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20265 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20266 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
20267 | - fi | ||
20268 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20269 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20270 | + `test -z '$(STRIP)' || \ | ||
20271 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
20272 | mostlyclean-generic: | ||
20273 | |||
20274 | clean-generic: | ||
20275 | diff --git a/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj b/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj | ||
20276 | new file mode 100644 | ||
20277 | index 0000000..3117f5f | ||
20278 | --- /dev/null | ||
20279 | +++ b/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj | ||
20280 | @@ -0,0 +1,210 @@ | ||
20281 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
20282 | +<VisualStudioProject | ||
20283 | + ProjectType="Visual C++" | ||
20284 | + Version="9,00" | ||
20285 | + Name="gtkxoverlay" | ||
20286 | + ProjectGUID="{E83070C2-58E4-48AE-AEB3-A4580EDE1212}" | ||
20287 | + RootNamespace="filterxoverlay" | ||
20288 | + Keyword="Win32Proj" | ||
20289 | + TargetFrameworkVersion="131072" | ||
20290 | + > | ||
20291 | + <Platforms> | ||
20292 | + <Platform | ||
20293 | + Name="Win32" | ||
20294 | + /> | ||
20295 | + </Platforms> | ||
20296 | + <ToolFiles> | ||
20297 | + </ToolFiles> | ||
20298 | + <Configurations> | ||
20299 | + <Configuration | ||
20300 | + Name="Debug|Win32" | ||
20301 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
20302 | + IntermediateDirectory="$(ConfigurationName)" | ||
20303 | + ConfigurationType="1" | ||
20304 | + CharacterSet="1" | ||
20305 | + > | ||
20306 | + <Tool | ||
20307 | + Name="VCPreBuildEventTool" | ||
20308 | + /> | ||
20309 | + <Tool | ||
20310 | + Name="VCCustomBuildTool" | ||
20311 | + /> | ||
20312 | + <Tool | ||
20313 | + Name="VCXMLDataGeneratorTool" | ||
20314 | + /> | ||
20315 | + <Tool | ||
20316 | + Name="VCWebServiceProxyGeneratorTool" | ||
20317 | + /> | ||
20318 | + <Tool | ||
20319 | + Name="VCMIDLTool" | ||
20320 | + /> | ||
20321 | + <Tool | ||
20322 | + Name="VCCLCompilerTool" | ||
20323 | + Optimization="0" | ||
20324 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
20325 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
20326 | + MinimalRebuild="true" | ||
20327 | + BasicRuntimeChecks="3" | ||
20328 | + RuntimeLibrary="3" | ||
20329 | + UsePrecompiledHeader="0" | ||
20330 | + WarningLevel="3" | ||
20331 | + Detect64BitPortabilityProblems="false" | ||
20332 | + DebugInformationFormat="4" | ||
20333 | + /> | ||
20334 | + <Tool | ||
20335 | + Name="VCManagedResourceCompilerTool" | ||
20336 | + /> | ||
20337 | + <Tool | ||
20338 | + Name="VCResourceCompilerTool" | ||
20339 | + /> | ||
20340 | + <Tool | ||
20341 | + Name="VCPreLinkEventTool" | ||
20342 | + /> | ||
20343 | + <Tool | ||
20344 | + Name="VCLinkerTool" | ||
20345 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
20346 | + LinkIncremental="2" | ||
20347 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
20348 | + GenerateDebugInformation="true" | ||
20349 | + SubSystem="1" | ||
20350 | + RandomizedBaseAddress="1" | ||
20351 | + DataExecutionPrevention="0" | ||
20352 | + TargetMachine="1" | ||
20353 | + /> | ||
20354 | + <Tool | ||
20355 | + Name="VCALinkTool" | ||
20356 | + /> | ||
20357 | + <Tool | ||
20358 | + Name="VCManifestTool" | ||
20359 | + /> | ||
20360 | + <Tool | ||
20361 | + Name="VCXDCMakeTool" | ||
20362 | + /> | ||
20363 | + <Tool | ||
20364 | + Name="VCBscMakeTool" | ||
20365 | + /> | ||
20366 | + <Tool | ||
20367 | + Name="VCFxCopTool" | ||
20368 | + /> | ||
20369 | + <Tool | ||
20370 | + Name="VCAppVerifierTool" | ||
20371 | + /> | ||
20372 | + <Tool | ||
20373 | + Name="VCPostBuildEventTool" | ||
20374 | + /> | ||
20375 | + </Configuration> | ||
20376 | + <Configuration | ||
20377 | + Name="Release|Win32" | ||
20378 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
20379 | + IntermediateDirectory="$(ConfigurationName)" | ||
20380 | + ConfigurationType="1" | ||
20381 | + CharacterSet="1" | ||
20382 | + WholeProgramOptimization="1" | ||
20383 | + > | ||
20384 | + <Tool | ||
20385 | + Name="VCPreBuildEventTool" | ||
20386 | + /> | ||
20387 | + <Tool | ||
20388 | + Name="VCCustomBuildTool" | ||
20389 | + /> | ||
20390 | + <Tool | ||
20391 | + Name="VCXMLDataGeneratorTool" | ||
20392 | + /> | ||
20393 | + <Tool | ||
20394 | + Name="VCWebServiceProxyGeneratorTool" | ||
20395 | + /> | ||
20396 | + <Tool | ||
20397 | + Name="VCMIDLTool" | ||
20398 | + /> | ||
20399 | + <Tool | ||
20400 | + Name="VCCLCompilerTool" | ||
20401 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
20402 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
20403 | + RuntimeLibrary="2" | ||
20404 | + UsePrecompiledHeader="0" | ||
20405 | + WarningLevel="3" | ||
20406 | + Detect64BitPortabilityProblems="false" | ||
20407 | + DebugInformationFormat="3" | ||
20408 | + /> | ||
20409 | + <Tool | ||
20410 | + Name="VCManagedResourceCompilerTool" | ||
20411 | + /> | ||
20412 | + <Tool | ||
20413 | + Name="VCResourceCompilerTool" | ||
20414 | + /> | ||
20415 | + <Tool | ||
20416 | + Name="VCPreLinkEventTool" | ||
20417 | + /> | ||
20418 | + <Tool | ||
20419 | + Name="VCLinkerTool" | ||
20420 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
20421 | + LinkIncremental="1" | ||
20422 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
20423 | + GenerateDebugInformation="true" | ||
20424 | + SubSystem="1" | ||
20425 | + OptimizeReferences="2" | ||
20426 | + EnableCOMDATFolding="2" | ||
20427 | + RandomizedBaseAddress="1" | ||
20428 | + DataExecutionPrevention="0" | ||
20429 | + TargetMachine="1" | ||
20430 | + /> | ||
20431 | + <Tool | ||
20432 | + Name="VCALinkTool" | ||
20433 | + /> | ||
20434 | + <Tool | ||
20435 | + Name="VCManifestTool" | ||
20436 | + /> | ||
20437 | + <Tool | ||
20438 | + Name="VCXDCMakeTool" | ||
20439 | + /> | ||
20440 | + <Tool | ||
20441 | + Name="VCBscMakeTool" | ||
20442 | + /> | ||
20443 | + <Tool | ||
20444 | + Name="VCFxCopTool" | ||
20445 | + /> | ||
20446 | + <Tool | ||
20447 | + Name="VCAppVerifierTool" | ||
20448 | + /> | ||
20449 | + <Tool | ||
20450 | + Name="VCPostBuildEventTool" | ||
20451 | + /> | ||
20452 | + </Configuration> | ||
20453 | + </Configurations> | ||
20454 | + <References> | ||
20455 | + </References> | ||
20456 | + <Files> | ||
20457 | + <Filter | ||
20458 | + Name="Source Files" | ||
20459 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
20460 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
20461 | + > | ||
20462 | + <File | ||
20463 | + RelativePath="..\gstgtk.c" | ||
20464 | + > | ||
20465 | + </File> | ||
20466 | + <File | ||
20467 | + RelativePath=".\main.cpp" | ||
20468 | + > | ||
20469 | + </File> | ||
20470 | + </Filter> | ||
20471 | + <Filter | ||
20472 | + Name="Header Files" | ||
20473 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
20474 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
20475 | + > | ||
20476 | + <File | ||
20477 | + RelativePath="..\gstgtk.h" | ||
20478 | + > | ||
20479 | + </File> | ||
20480 | + </Filter> | ||
20481 | + <Filter | ||
20482 | + Name="Resource Files" | ||
20483 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
20484 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
20485 | + > | ||
20486 | + </Filter> | ||
20487 | + </Files> | ||
20488 | + <Globals> | ||
20489 | + </Globals> | ||
20490 | +</VisualStudioProject> | ||
20491 | diff --git a/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj b/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj | ||
20492 | new file mode 100644 | ||
20493 | index 0000000..02abc45 | ||
20494 | --- /dev/null | ||
20495 | +++ b/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj | ||
20496 | @@ -0,0 +1,210 @@ | ||
20497 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
20498 | +<VisualStudioProject | ||
20499 | + ProjectType="Visual C++" | ||
20500 | + Version="9,00" | ||
20501 | + Name="pixbufdrop" | ||
20502 | + ProjectGUID="{09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}" | ||
20503 | + RootNamespace="pixbufdrop" | ||
20504 | + Keyword="Win32Proj" | ||
20505 | + TargetFrameworkVersion="131072" | ||
20506 | + > | ||
20507 | + <Platforms> | ||
20508 | + <Platform | ||
20509 | + Name="Win32" | ||
20510 | + /> | ||
20511 | + </Platforms> | ||
20512 | + <ToolFiles> | ||
20513 | + </ToolFiles> | ||
20514 | + <Configurations> | ||
20515 | + <Configuration | ||
20516 | + Name="Debug|Win32" | ||
20517 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
20518 | + IntermediateDirectory="$(ConfigurationName)" | ||
20519 | + ConfigurationType="1" | ||
20520 | + CharacterSet="1" | ||
20521 | + > | ||
20522 | + <Tool | ||
20523 | + Name="VCPreBuildEventTool" | ||
20524 | + /> | ||
20525 | + <Tool | ||
20526 | + Name="VCCustomBuildTool" | ||
20527 | + /> | ||
20528 | + <Tool | ||
20529 | + Name="VCXMLDataGeneratorTool" | ||
20530 | + /> | ||
20531 | + <Tool | ||
20532 | + Name="VCWebServiceProxyGeneratorTool" | ||
20533 | + /> | ||
20534 | + <Tool | ||
20535 | + Name="VCMIDLTool" | ||
20536 | + /> | ||
20537 | + <Tool | ||
20538 | + Name="VCCLCompilerTool" | ||
20539 | + Optimization="0" | ||
20540 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
20541 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
20542 | + MinimalRebuild="true" | ||
20543 | + BasicRuntimeChecks="3" | ||
20544 | + RuntimeLibrary="3" | ||
20545 | + UsePrecompiledHeader="0" | ||
20546 | + WarningLevel="3" | ||
20547 | + Detect64BitPortabilityProblems="false" | ||
20548 | + DebugInformationFormat="4" | ||
20549 | + /> | ||
20550 | + <Tool | ||
20551 | + Name="VCManagedResourceCompilerTool" | ||
20552 | + /> | ||
20553 | + <Tool | ||
20554 | + Name="VCResourceCompilerTool" | ||
20555 | + /> | ||
20556 | + <Tool | ||
20557 | + Name="VCPreLinkEventTool" | ||
20558 | + /> | ||
20559 | + <Tool | ||
20560 | + Name="VCLinkerTool" | ||
20561 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib" | ||
20562 | + LinkIncremental="2" | ||
20563 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
20564 | + GenerateDebugInformation="true" | ||
20565 | + SubSystem="1" | ||
20566 | + RandomizedBaseAddress="1" | ||
20567 | + DataExecutionPrevention="0" | ||
20568 | + TargetMachine="1" | ||
20569 | + /> | ||
20570 | + <Tool | ||
20571 | + Name="VCALinkTool" | ||
20572 | + /> | ||
20573 | + <Tool | ||
20574 | + Name="VCManifestTool" | ||
20575 | + /> | ||
20576 | + <Tool | ||
20577 | + Name="VCXDCMakeTool" | ||
20578 | + /> | ||
20579 | + <Tool | ||
20580 | + Name="VCBscMakeTool" | ||
20581 | + /> | ||
20582 | + <Tool | ||
20583 | + Name="VCFxCopTool" | ||
20584 | + /> | ||
20585 | + <Tool | ||
20586 | + Name="VCAppVerifierTool" | ||
20587 | + /> | ||
20588 | + <Tool | ||
20589 | + Name="VCPostBuildEventTool" | ||
20590 | + /> | ||
20591 | + </Configuration> | ||
20592 | + <Configuration | ||
20593 | + Name="Release|Win32" | ||
20594 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
20595 | + IntermediateDirectory="$(ConfigurationName)" | ||
20596 | + ConfigurationType="1" | ||
20597 | + CharacterSet="1" | ||
20598 | + WholeProgramOptimization="1" | ||
20599 | + > | ||
20600 | + <Tool | ||
20601 | + Name="VCPreBuildEventTool" | ||
20602 | + /> | ||
20603 | + <Tool | ||
20604 | + Name="VCCustomBuildTool" | ||
20605 | + /> | ||
20606 | + <Tool | ||
20607 | + Name="VCXMLDataGeneratorTool" | ||
20608 | + /> | ||
20609 | + <Tool | ||
20610 | + Name="VCWebServiceProxyGeneratorTool" | ||
20611 | + /> | ||
20612 | + <Tool | ||
20613 | + Name="VCMIDLTool" | ||
20614 | + /> | ||
20615 | + <Tool | ||
20616 | + Name="VCCLCompilerTool" | ||
20617 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
20618 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
20619 | + RuntimeLibrary="2" | ||
20620 | + UsePrecompiledHeader="0" | ||
20621 | + WarningLevel="3" | ||
20622 | + Detect64BitPortabilityProblems="false" | ||
20623 | + DebugInformationFormat="3" | ||
20624 | + /> | ||
20625 | + <Tool | ||
20626 | + Name="VCManagedResourceCompilerTool" | ||
20627 | + /> | ||
20628 | + <Tool | ||
20629 | + Name="VCResourceCompilerTool" | ||
20630 | + /> | ||
20631 | + <Tool | ||
20632 | + Name="VCPreLinkEventTool" | ||
20633 | + /> | ||
20634 | + <Tool | ||
20635 | + Name="VCLinkerTool" | ||
20636 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib" | ||
20637 | + LinkIncremental="1" | ||
20638 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
20639 | + GenerateDebugInformation="true" | ||
20640 | + SubSystem="1" | ||
20641 | + OptimizeReferences="2" | ||
20642 | + EnableCOMDATFolding="2" | ||
20643 | + RandomizedBaseAddress="1" | ||
20644 | + DataExecutionPrevention="0" | ||
20645 | + TargetMachine="1" | ||
20646 | + /> | ||
20647 | + <Tool | ||
20648 | + Name="VCALinkTool" | ||
20649 | + /> | ||
20650 | + <Tool | ||
20651 | + Name="VCManifestTool" | ||
20652 | + /> | ||
20653 | + <Tool | ||
20654 | + Name="VCXDCMakeTool" | ||
20655 | + /> | ||
20656 | + <Tool | ||
20657 | + Name="VCBscMakeTool" | ||
20658 | + /> | ||
20659 | + <Tool | ||
20660 | + Name="VCFxCopTool" | ||
20661 | + /> | ||
20662 | + <Tool | ||
20663 | + Name="VCAppVerifierTool" | ||
20664 | + /> | ||
20665 | + <Tool | ||
20666 | + Name="VCPostBuildEventTool" | ||
20667 | + /> | ||
20668 | + </Configuration> | ||
20669 | + </Configurations> | ||
20670 | + <References> | ||
20671 | + </References> | ||
20672 | + <Files> | ||
20673 | + <Filter | ||
20674 | + Name="Source Files" | ||
20675 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
20676 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
20677 | + > | ||
20678 | + <File | ||
20679 | + RelativePath="..\gstgtk.c" | ||
20680 | + > | ||
20681 | + </File> | ||
20682 | + <File | ||
20683 | + RelativePath="..\fxtest\pixbufdrop.c" | ||
20684 | + > | ||
20685 | + </File> | ||
20686 | + </Filter> | ||
20687 | + <Filter | ||
20688 | + Name="Header Files" | ||
20689 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
20690 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
20691 | + > | ||
20692 | + <File | ||
20693 | + RelativePath="..\gstgtk.h" | ||
20694 | + > | ||
20695 | + </File> | ||
20696 | + </Filter> | ||
20697 | + <Filter | ||
20698 | + Name="Resource Files" | ||
20699 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
20700 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
20701 | + > | ||
20702 | + </Filter> | ||
20703 | + </Files> | ||
20704 | + <Globals> | ||
20705 | + </Globals> | ||
20706 | +</VisualStudioProject> | ||
20707 | diff --git a/tests/examples/gtk/switchxoverlay/Makefile.in b/tests/examples/gtk/switchxoverlay/Makefile.in | ||
20708 | index e28a118..85f6218 100644 | ||
20709 | --- a/tests/examples/gtk/switchxoverlay/Makefile.in | ||
20710 | +++ b/tests/examples/gtk/switchxoverlay/Makefile.in | ||
20711 | @@ -1,9 +1,9 @@ | ||
20712 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
20713 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
20714 | # @configure_input@ | ||
20715 | |||
20716 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
20717 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
20718 | -# Foundation, Inc. | ||
20719 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
20720 | +# Inc. | ||
20721 | # This Makefile.in is free software; the Free Software Foundation | ||
20722 | # gives unlimited permission to copy and/or distribute it, | ||
20723 | # with or without modifications, as long as this notice is preserved. | ||
20724 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
20725 | POST_UNINSTALL = : | ||
20726 | build_triplet = @build@ | ||
20727 | host_triplet = @host@ | ||
20728 | +target_triplet = @target@ | ||
20729 | noinst_PROGRAMS = switchxoverlay$(EXEEXT) | ||
20730 | subdir = tests/examples/gtk/switchxoverlay | ||
20731 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
20732 | @@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
20733 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
20734 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
20735 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
20736 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
20737 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
20738 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
20739 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
20740 | @@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = | ||
20741 | switchxoverlay_DEPENDENCIES = ../libgstgtkhelper.la \ | ||
20742 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||
20743 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
20744 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
20745 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
20746 | +AM_V_lt = $(am__v_lt_$(V)) | ||
20747 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
20748 | am__v_lt_0 = --silent | ||
20749 | switchxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ | ||
20750 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
20751 | @@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
20752 | $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ | ||
20753 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
20754 | $(AM_CXXFLAGS) $(CXXFLAGS) | ||
20755 | -AM_V_CXX = $(am__v_CXX_@AM_V@) | ||
20756 | -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) | ||
20757 | +AM_V_CXX = $(am__v_CXX_$(V)) | ||
20758 | +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) | ||
20759 | am__v_CXX_0 = @echo " CXX " $@; | ||
20760 | -AM_V_at = $(am__v_at_@AM_V@) | ||
20761 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
20762 | +AM_V_at = $(am__v_at_$(V)) | ||
20763 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
20764 | am__v_at_0 = @ | ||
20765 | CXXLD = $(CXX) | ||
20766 | CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
20767 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | ||
20768 | $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
20769 | -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) | ||
20770 | -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) | ||
20771 | +AM_V_CXXLD = $(am__v_CXXLD_$(V)) | ||
20772 | +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) | ||
20773 | am__v_CXXLD_0 = @echo " CXXLD " $@; | ||
20774 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
20775 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
20776 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
20777 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
20778 | am__v_GEN_0 = @echo " GEN " $@; | ||
20779 | SOURCES = $(switchxoverlay_SOURCES) | ||
20780 | DIST_SOURCES = $(switchxoverlay_SOURCES) | ||
20781 | @@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ | ||
20782 | EGREP = @EGREP@ | ||
20783 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
20784 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
20785 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
20786 | EXEEXT = @EXEEXT@ | ||
20787 | FFLAGS = @FFLAGS@ | ||
20788 | FGREP = @FGREP@ | ||
20789 | @@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
20790 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
20791 | GST_CURRENT = @GST_CURRENT@ | ||
20792 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
20793 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
20794 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
20795 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
20796 | GST_LIBS = @GST_LIBS@ | ||
20797 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
20798 | @@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
20799 | GST_LICENSE = @GST_LICENSE@ | ||
20800 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
20801 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
20802 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
20803 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
20804 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
20805 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
20806 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
20807 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
20808 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
20809 | @@ -278,7 +283,7 @@ NM = @NM@ | ||
20810 | NMEDIT = @NMEDIT@ | ||
20811 | OBJC = @OBJC@ | ||
20812 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
20813 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
20814 | +OBJCFLAGS = @OBJCFLAGS@ | ||
20815 | OBJDUMP = @OBJDUMP@ | ||
20816 | OBJEXT = @OBJEXT@ | ||
20817 | OPENGL_ES2 = @OPENGL_ES2@ | ||
20818 | @@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
20819 | VERSION = @VERSION@ | ||
20820 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
20821 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
20822 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
20823 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
20824 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
20825 | XGETTEXT = @XGETTEXT@ | ||
20826 | @@ -388,7 +394,11 @@ sbindir = @sbindir@ | ||
20827 | sharedstatedir = @sharedstatedir@ | ||
20828 | srcdir = @srcdir@ | ||
20829 | sysconfdir = @sysconfdir@ | ||
20830 | +target = @target@ | ||
20831 | target_alias = @target_alias@ | ||
20832 | +target_cpu = @target_cpu@ | ||
20833 | +target_os = @target_os@ | ||
20834 | +target_vendor = @target_vendor@ | ||
20835 | top_build_prefix = @top_build_prefix@ | ||
20836 | top_builddir = @top_builddir@ | ||
20837 | top_srcdir = @top_srcdir@ | ||
20838 | @@ -443,7 +453,7 @@ clean-noinstPROGRAMS: | ||
20839 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
20840 | echo " rm -f" $$list; \ | ||
20841 | rm -f $$list | ||
20842 | -switchxoverlay$(EXEEXT): $(switchxoverlay_OBJECTS) $(switchxoverlay_DEPENDENCIES) $(EXTRA_switchxoverlay_DEPENDENCIES) | ||
20843 | +switchxoverlay$(EXEEXT): $(switchxoverlay_OBJECTS) $(switchxoverlay_DEPENDENCIES) | ||
20844 | @rm -f switchxoverlay$(EXEEXT) | ||
20845 | $(AM_V_CXXLD)$(switchxoverlay_LINK) $(switchxoverlay_OBJECTS) $(switchxoverlay_LDADD) $(LIBS) | ||
20846 | |||
20847 | @@ -458,37 +468,42 @@ distclean-compile: | ||
20848 | .cpp.o: | ||
20849 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
20850 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
20851 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20852 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20853 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20854 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20855 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< | ||
20856 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< | ||
20857 | |||
20858 | .cpp.obj: | ||
20859 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
20860 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
20861 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20862 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20863 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
20864 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20865 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
20866 | +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | ||
20867 | |||
20868 | .cpp.lo: | ||
20869 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
20870 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
20871 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
20872 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20873 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
20874 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20875 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< | ||
20876 | +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< | ||
20877 | |||
20878 | switchxoverlay-main.o: main.cpp | ||
20879 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -MT switchxoverlay-main.o -MD -MP -MF $(DEPDIR)/switchxoverlay-main.Tpo -c -o switchxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20880 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switchxoverlay-main.Tpo $(DEPDIR)/switchxoverlay-main.Po | ||
20881 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='switchxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
20882 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20883 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='switchxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ | ||
20884 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20885 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o switchxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20886 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o switchxoverlay-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp | ||
20887 | |||
20888 | switchxoverlay-main.obj: main.cpp | ||
20889 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -MT switchxoverlay-main.obj -MD -MP -MF $(DEPDIR)/switchxoverlay-main.Tpo -c -o switchxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20890 | @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switchxoverlay-main.Tpo $(DEPDIR)/switchxoverlay-main.Po | ||
20891 | -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='switchxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
20892 | +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ | ||
20893 | +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='switchxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ | ||
20894 | @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20895 | -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o switchxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20896 | +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(switchxoverlay_CXXFLAGS) $(CXXFLAGS) -c -o switchxoverlay-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` | ||
20897 | |||
20898 | mostlyclean-libtool: | ||
20899 | -rm -f *.lo | ||
20900 | @@ -592,15 +607,10 @@ install-am: all-am | ||
20901 | |||
20902 | installcheck: installcheck-am | ||
20903 | install-strip: | ||
20904 | - if test -z '$(STRIP)'; then \ | ||
20905 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20906 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20907 | - install; \ | ||
20908 | - else \ | ||
20909 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20910 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20911 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
20912 | - fi | ||
20913 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
20914 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
20915 | + `test -z '$(STRIP)' || \ | ||
20916 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
20917 | mostlyclean-generic: | ||
20918 | |||
20919 | clean-generic: | ||
20920 | diff --git a/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj b/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj | ||
20921 | new file mode 100644 | ||
20922 | index 0000000..515aa45 | ||
20923 | --- /dev/null | ||
20924 | +++ b/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj | ||
20925 | @@ -0,0 +1,210 @@ | ||
20926 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
20927 | +<VisualStudioProject | ||
20928 | + ProjectType="Visual C++" | ||
20929 | + Version="9,00" | ||
20930 | + Name="switchxoverlay" | ||
20931 | + ProjectGUID="{BA78B4B4-3268-483E-9676-911E29FD2C69}" | ||
20932 | + RootNamespace="filterxoverlay" | ||
20933 | + Keyword="Win32Proj" | ||
20934 | + TargetFrameworkVersion="131072" | ||
20935 | + > | ||
20936 | + <Platforms> | ||
20937 | + <Platform | ||
20938 | + Name="Win32" | ||
20939 | + /> | ||
20940 | + </Platforms> | ||
20941 | + <ToolFiles> | ||
20942 | + </ToolFiles> | ||
20943 | + <Configurations> | ||
20944 | + <Configuration | ||
20945 | + Name="Debug|Win32" | ||
20946 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
20947 | + IntermediateDirectory="$(ConfigurationName)" | ||
20948 | + ConfigurationType="1" | ||
20949 | + CharacterSet="1" | ||
20950 | + > | ||
20951 | + <Tool | ||
20952 | + Name="VCPreBuildEventTool" | ||
20953 | + /> | ||
20954 | + <Tool | ||
20955 | + Name="VCCustomBuildTool" | ||
20956 | + /> | ||
20957 | + <Tool | ||
20958 | + Name="VCXMLDataGeneratorTool" | ||
20959 | + /> | ||
20960 | + <Tool | ||
20961 | + Name="VCWebServiceProxyGeneratorTool" | ||
20962 | + /> | ||
20963 | + <Tool | ||
20964 | + Name="VCMIDLTool" | ||
20965 | + /> | ||
20966 | + <Tool | ||
20967 | + Name="VCCLCompilerTool" | ||
20968 | + Optimization="0" | ||
20969 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
20970 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
20971 | + MinimalRebuild="true" | ||
20972 | + BasicRuntimeChecks="3" | ||
20973 | + RuntimeLibrary="3" | ||
20974 | + UsePrecompiledHeader="0" | ||
20975 | + WarningLevel="3" | ||
20976 | + Detect64BitPortabilityProblems="false" | ||
20977 | + DebugInformationFormat="4" | ||
20978 | + /> | ||
20979 | + <Tool | ||
20980 | + Name="VCManagedResourceCompilerTool" | ||
20981 | + /> | ||
20982 | + <Tool | ||
20983 | + Name="VCResourceCompilerTool" | ||
20984 | + /> | ||
20985 | + <Tool | ||
20986 | + Name="VCPreLinkEventTool" | ||
20987 | + /> | ||
20988 | + <Tool | ||
20989 | + Name="VCLinkerTool" | ||
20990 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
20991 | + LinkIncremental="2" | ||
20992 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
20993 | + GenerateDebugInformation="true" | ||
20994 | + SubSystem="1" | ||
20995 | + RandomizedBaseAddress="1" | ||
20996 | + DataExecutionPrevention="0" | ||
20997 | + TargetMachine="1" | ||
20998 | + /> | ||
20999 | + <Tool | ||
21000 | + Name="VCALinkTool" | ||
21001 | + /> | ||
21002 | + <Tool | ||
21003 | + Name="VCManifestTool" | ||
21004 | + /> | ||
21005 | + <Tool | ||
21006 | + Name="VCXDCMakeTool" | ||
21007 | + /> | ||
21008 | + <Tool | ||
21009 | + Name="VCBscMakeTool" | ||
21010 | + /> | ||
21011 | + <Tool | ||
21012 | + Name="VCFxCopTool" | ||
21013 | + /> | ||
21014 | + <Tool | ||
21015 | + Name="VCAppVerifierTool" | ||
21016 | + /> | ||
21017 | + <Tool | ||
21018 | + Name="VCPostBuildEventTool" | ||
21019 | + /> | ||
21020 | + </Configuration> | ||
21021 | + <Configuration | ||
21022 | + Name="Release|Win32" | ||
21023 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
21024 | + IntermediateDirectory="$(ConfigurationName)" | ||
21025 | + ConfigurationType="1" | ||
21026 | + CharacterSet="1" | ||
21027 | + WholeProgramOptimization="1" | ||
21028 | + > | ||
21029 | + <Tool | ||
21030 | + Name="VCPreBuildEventTool" | ||
21031 | + /> | ||
21032 | + <Tool | ||
21033 | + Name="VCCustomBuildTool" | ||
21034 | + /> | ||
21035 | + <Tool | ||
21036 | + Name="VCXMLDataGeneratorTool" | ||
21037 | + /> | ||
21038 | + <Tool | ||
21039 | + Name="VCWebServiceProxyGeneratorTool" | ||
21040 | + /> | ||
21041 | + <Tool | ||
21042 | + Name="VCMIDLTool" | ||
21043 | + /> | ||
21044 | + <Tool | ||
21045 | + Name="VCCLCompilerTool" | ||
21046 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";"..\..\..\..\..\gtk+\include\gtk-2.0";"..\..\..\..\..\gtk+\lib\gtk-2.0\include";"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include\cairo;"C:\gstreamer\include\pango-1.0";"..\..\..\..\..\atk\include\atk-1.0";C:\gstreamer\include\libxml2;C:\gstreamer\include" | ||
21047 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
21048 | + RuntimeLibrary="2" | ||
21049 | + UsePrecompiledHeader="0" | ||
21050 | + WarningLevel="3" | ||
21051 | + Detect64BitPortabilityProblems="false" | ||
21052 | + DebugInformationFormat="3" | ||
21053 | + /> | ||
21054 | + <Tool | ||
21055 | + Name="VCManagedResourceCompilerTool" | ||
21056 | + /> | ||
21057 | + <Tool | ||
21058 | + Name="VCResourceCompilerTool" | ||
21059 | + /> | ||
21060 | + <Tool | ||
21061 | + Name="VCPreLinkEventTool" | ||
21062 | + /> | ||
21063 | + <Tool | ||
21064 | + Name="VCLinkerTool" | ||
21065 | + AdditionalDependencies="gstreamer-0.10.lib gstinterfaces-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib gdk-win32-2.0.lib" | ||
21066 | + LinkIncremental="1" | ||
21067 | + AdditionalLibraryDirectories="C:\gstreamer\lib;"..\..\..\..\..\gtk+\lib"" | ||
21068 | + GenerateDebugInformation="true" | ||
21069 | + SubSystem="1" | ||
21070 | + OptimizeReferences="2" | ||
21071 | + EnableCOMDATFolding="2" | ||
21072 | + RandomizedBaseAddress="1" | ||
21073 | + DataExecutionPrevention="0" | ||
21074 | + TargetMachine="1" | ||
21075 | + /> | ||
21076 | + <Tool | ||
21077 | + Name="VCALinkTool" | ||
21078 | + /> | ||
21079 | + <Tool | ||
21080 | + Name="VCManifestTool" | ||
21081 | + /> | ||
21082 | + <Tool | ||
21083 | + Name="VCXDCMakeTool" | ||
21084 | + /> | ||
21085 | + <Tool | ||
21086 | + Name="VCBscMakeTool" | ||
21087 | + /> | ||
21088 | + <Tool | ||
21089 | + Name="VCFxCopTool" | ||
21090 | + /> | ||
21091 | + <Tool | ||
21092 | + Name="VCAppVerifierTool" | ||
21093 | + /> | ||
21094 | + <Tool | ||
21095 | + Name="VCPostBuildEventTool" | ||
21096 | + /> | ||
21097 | + </Configuration> | ||
21098 | + </Configurations> | ||
21099 | + <References> | ||
21100 | + </References> | ||
21101 | + <Files> | ||
21102 | + <Filter | ||
21103 | + Name="Source Files" | ||
21104 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
21105 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
21106 | + > | ||
21107 | + <File | ||
21108 | + RelativePath="..\gstgtk.c" | ||
21109 | + > | ||
21110 | + </File> | ||
21111 | + <File | ||
21112 | + RelativePath=".\main.cpp" | ||
21113 | + > | ||
21114 | + </File> | ||
21115 | + </Filter> | ||
21116 | + <Filter | ||
21117 | + Name="Header Files" | ||
21118 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
21119 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
21120 | + > | ||
21121 | + <File | ||
21122 | + RelativePath="..\gstgtk.h" | ||
21123 | + > | ||
21124 | + </File> | ||
21125 | + </Filter> | ||
21126 | + <Filter | ||
21127 | + Name="Resource Files" | ||
21128 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
21129 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
21130 | + > | ||
21131 | + </Filter> | ||
21132 | + </Files> | ||
21133 | + <Globals> | ||
21134 | + </Globals> | ||
21135 | +</VisualStudioProject> | ||
21136 | diff --git a/tests/examples/qt/Makefile.in b/tests/examples/qt/Makefile.in | ||
21137 | index e29ccd9..b915acb 100644 | ||
21138 | --- a/tests/examples/qt/Makefile.in | ||
21139 | +++ b/tests/examples/qt/Makefile.in | ||
21140 | @@ -1,9 +1,9 @@ | ||
21141 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
21142 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
21143 | # @configure_input@ | ||
21144 | |||
21145 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
21146 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
21147 | -# Foundation, Inc. | ||
21148 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
21149 | +# Inc. | ||
21150 | # This Makefile.in is free software; the Free Software Foundation | ||
21151 | # gives unlimited permission to copy and/or distribute it, | ||
21152 | # with or without modifications, as long as this notice is preserved. | ||
21153 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
21154 | POST_UNINSTALL = : | ||
21155 | build_triplet = @build@ | ||
21156 | host_triplet = @host@ | ||
21157 | +target_triplet = @target@ | ||
21158 | subdir = tests/examples/qt | ||
21159 | DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
21160 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
21161 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
21162 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
21163 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
21164 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
21165 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
21166 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
21167 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
21168 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
21169 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
21170 | CONFIG_HEADER = $(top_builddir)/config.h | ||
21171 | CONFIG_CLEAN_FILES = | ||
21172 | CONFIG_CLEAN_VPATH_FILES = | ||
21173 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
21174 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
21175 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
21176 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
21177 | am__v_GEN_0 = @echo " GEN " $@; | ||
21178 | -AM_V_at = $(am__v_at_@AM_V@) | ||
21179 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
21180 | +AM_V_at = $(am__v_at_$(V)) | ||
21181 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
21182 | am__v_at_0 = @ | ||
21183 | SOURCES = | ||
21184 | DIST_SOURCES = | ||
21185 | @@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ | ||
21186 | EGREP = @EGREP@ | ||
21187 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
21188 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
21189 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
21190 | EXEEXT = @EXEEXT@ | ||
21191 | FFLAGS = @FFLAGS@ | ||
21192 | FGREP = @FGREP@ | ||
21193 | @@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
21194 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
21195 | GST_CURRENT = @GST_CURRENT@ | ||
21196 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
21197 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
21198 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
21199 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
21200 | GST_LIBS = @GST_LIBS@ | ||
21201 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
21202 | @@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
21203 | GST_LICENSE = @GST_LICENSE@ | ||
21204 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
21205 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
21206 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
21207 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
21208 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
21209 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
21210 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
21211 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
21212 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
21213 | @@ -240,7 +245,7 @@ NM = @NM@ | ||
21214 | NMEDIT = @NMEDIT@ | ||
21215 | OBJC = @OBJC@ | ||
21216 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
21217 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
21218 | +OBJCFLAGS = @OBJCFLAGS@ | ||
21219 | OBJDUMP = @OBJDUMP@ | ||
21220 | OBJEXT = @OBJEXT@ | ||
21221 | OPENGL_ES2 = @OPENGL_ES2@ | ||
21222 | @@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
21223 | VERSION = @VERSION@ | ||
21224 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
21225 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
21226 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
21227 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
21228 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
21229 | XGETTEXT = @XGETTEXT@ | ||
21230 | @@ -350,7 +356,11 @@ sbindir = @sbindir@ | ||
21231 | sharedstatedir = @sharedstatedir@ | ||
21232 | srcdir = @srcdir@ | ||
21233 | sysconfdir = @sysconfdir@ | ||
21234 | +target = @target@ | ||
21235 | target_alias = @target_alias@ | ||
21236 | +target_cpu = @target_cpu@ | ||
21237 | +target_os = @target_os@ | ||
21238 | +target_vendor = @target_vendor@ | ||
21239 | top_build_prefix = @top_build_prefix@ | ||
21240 | top_builddir = @top_builddir@ | ||
21241 | top_srcdir = @top_srcdir@ | ||
21242 | @@ -444,15 +454,10 @@ install-am: all-am | ||
21243 | |||
21244 | installcheck: installcheck-am | ||
21245 | install-strip: | ||
21246 | - if test -z '$(STRIP)'; then \ | ||
21247 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
21248 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
21249 | - install; \ | ||
21250 | - else \ | ||
21251 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
21252 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
21253 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
21254 | - fi | ||
21255 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
21256 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
21257 | + `test -z '$(STRIP)' || \ | ||
21258 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
21259 | mostlyclean-generic: | ||
21260 | |||
21261 | clean-generic: | ||
21262 | diff --git a/tests/examples/qt/mousexoverlay/gstthread.cpp b/tests/examples/qt/mousexoverlay/gstthread.cpp | ||
21263 | new file mode 100644 | ||
21264 | index 0000000..55c5541 | ||
21265 | --- /dev/null | ||
21266 | +++ b/tests/examples/qt/mousexoverlay/gstthread.cpp | ||
21267 | @@ -0,0 +1,67 @@ | ||
21268 | +/* | ||
21269 | + * GStreamer | ||
21270 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
21271 | + * | ||
21272 | + * This library is free software; you can redistribute it and/or | ||
21273 | + * modify it under the terms of the GNU Library General Public | ||
21274 | + * License as published by the Free Software Foundation; either | ||
21275 | + * version 2 of the License, or (at your option) any later version. | ||
21276 | + * | ||
21277 | + * This library is distributed in the hope that it will be useful, | ||
21278 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21279 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
21280 | + * Library General Public License for more details. | ||
21281 | + * | ||
21282 | + * You should have received a copy of the GNU Library General Public | ||
21283 | + * License along with this library; if not, write to the | ||
21284 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21285 | + * Boston, MA 02111-1307, USA. | ||
21286 | + */ | ||
21287 | + | ||
21288 | +#include "gstthread.h" | ||
21289 | + | ||
21290 | +GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): | ||
21291 | + QThread(parent), | ||
21292 | + m_winId(winId), | ||
21293 | + m_videoLocation(videoLocation) | ||
21294 | +{ | ||
21295 | +} | ||
21296 | + | ||
21297 | +GstThread::~GstThread() | ||
21298 | +{ | ||
21299 | +} | ||
21300 | + | ||
21301 | +void GstThread::exposeRequested() | ||
21302 | +{ | ||
21303 | + m_pipeline->exposeRequested(); | ||
21304 | +} | ||
21305 | + | ||
21306 | +void GstThread::onMouseMove() | ||
21307 | +{ | ||
21308 | + m_pipeline->rotateRequested(); | ||
21309 | +} | ||
21310 | + | ||
21311 | +void GstThread::show() | ||
21312 | +{ | ||
21313 | + emit showRequested(); | ||
21314 | +} | ||
21315 | + | ||
21316 | +void GstThread::stop() | ||
21317 | +{ | ||
21318 | + m_pipeline->stop(); | ||
21319 | +} | ||
21320 | + | ||
21321 | +void GstThread::run() | ||
21322 | +{ | ||
21323 | + m_pipeline = new Pipeline(m_winId, m_videoLocation); | ||
21324 | + connect(m_pipeline, SIGNAL(showRequested()), this, SLOT(show())); | ||
21325 | + m_pipeline->start(); //it runs the gmainloop on win32 | ||
21326 | + | ||
21327 | +#ifndef WIN32 | ||
21328 | + //works like the gmainloop on linux (GstEvent are handled) | ||
21329 | + connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); | ||
21330 | + exec(); | ||
21331 | +#endif | ||
21332 | + | ||
21333 | + m_pipeline->unconfigure(); | ||
21334 | +} | ||
21335 | diff --git a/tests/examples/qt/mousexoverlay/gstthread.h b/tests/examples/qt/mousexoverlay/gstthread.h | ||
21336 | new file mode 100644 | ||
21337 | index 0000000..f89593c | ||
21338 | --- /dev/null | ||
21339 | +++ b/tests/examples/qt/mousexoverlay/gstthread.h | ||
21340 | @@ -0,0 +1,56 @@ | ||
21341 | +/* | ||
21342 | + * GStreamer | ||
21343 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
21344 | + * | ||
21345 | + * This library is free software; you can redistribute it and/or | ||
21346 | + * modify it under the terms of the GNU Library General Public | ||
21347 | + * License as published by the Free Software Foundation; either | ||
21348 | + * version 2 of the License, or (at your option) any later version. | ||
21349 | + * | ||
21350 | + * This library is distributed in the hope that it will be useful, | ||
21351 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21352 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
21353 | + * Library General Public License for more details. | ||
21354 | + * | ||
21355 | + * You should have received a copy of the GNU Library General Public | ||
21356 | + * License along with this library; if not, write to the | ||
21357 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21358 | + * Boston, MA 02111-1307, USA. | ||
21359 | + */ | ||
21360 | + | ||
21361 | +#ifndef GSTTHREAD_H | ||
21362 | +#define GSTTHREAD_H | ||
21363 | + | ||
21364 | +#include <QtGui> | ||
21365 | +#include <QtCore/QThread> | ||
21366 | + | ||
21367 | +#include "pipeline.h" | ||
21368 | + | ||
21369 | +class GstThread : public QThread | ||
21370 | +{ | ||
21371 | + Q_OBJECT | ||
21372 | + | ||
21373 | +public: | ||
21374 | + GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); | ||
21375 | + ~GstThread(); | ||
21376 | + | ||
21377 | +public slots: | ||
21378 | + void exposeRequested(); | ||
21379 | + void onMouseMove(); | ||
21380 | + void show(); | ||
21381 | + void stop(); | ||
21382 | + | ||
21383 | +signals: | ||
21384 | + void showRequested(); | ||
21385 | + | ||
21386 | +protected: | ||
21387 | + void run(); | ||
21388 | + | ||
21389 | +private: | ||
21390 | + const WId m_winId; | ||
21391 | + const QString m_videoLocation; | ||
21392 | + Pipeline* m_pipeline; | ||
21393 | + | ||
21394 | +}; | ||
21395 | + | ||
21396 | +#endif | ||
21397 | diff --git a/tests/examples/qt/mousexoverlay/main.cpp b/tests/examples/qt/mousexoverlay/main.cpp | ||
21398 | new file mode 100644 | ||
21399 | index 0000000..40bdd67 | ||
21400 | --- /dev/null | ||
21401 | +++ b/tests/examples/qt/mousexoverlay/main.cpp | ||
21402 | @@ -0,0 +1,39 @@ | ||
21403 | +/* | ||
21404 | + * GStreamer | ||
21405 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
21406 | + * | ||
21407 | + * This library is free software; you can redistribute it and/or | ||
21408 | + * modify it under the terms of the GNU Library General Public | ||
21409 | + * License as published by the Free Software Foundation; either | ||
21410 | + * version 2 of the License, or (at your option) any later version. | ||
21411 | + * | ||
21412 | + * This library is distributed in the hope that it will be useful, | ||
21413 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21414 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
21415 | + * Library General Public License for more details. | ||
21416 | + * | ||
21417 | + * You should have received a copy of the GNU Library General Public | ||
21418 | + * License along with this library; if not, write to the | ||
21419 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21420 | + * Boston, MA 02111-1307, USA. | ||
21421 | + */ | ||
21422 | + | ||
21423 | +#include <QtGui/QApplication> | ||
21424 | +#include "qrenderer.h" | ||
21425 | + | ||
21426 | +int main(int argc, char *argv[]) | ||
21427 | +{ | ||
21428 | + QApplication a(argc, argv); | ||
21429 | + a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | ||
21430 | + | ||
21431 | + QString videolcoation = QFileDialog::getOpenFileName(0, "Select a video file", | ||
21432 | + ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); | ||
21433 | + | ||
21434 | + if (videolcoation.isEmpty()) | ||
21435 | + return -1; | ||
21436 | + | ||
21437 | + QRenderer w(videolcoation); | ||
21438 | + w.setWindowTitle("glimagesink implements the gstxoverlay interface"); | ||
21439 | + | ||
21440 | + return a.exec(); | ||
21441 | +} | ||
21442 | diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.pri b/tests/examples/qt/mousexoverlay/mousexoverlay.pri | ||
21443 | new file mode 100644 | ||
21444 | index 0000000..75b23cd | ||
21445 | --- /dev/null | ||
21446 | +++ b/tests/examples/qt/mousexoverlay/mousexoverlay.pri | ||
21447 | @@ -0,0 +1,10 @@ | ||
21448 | +#Header files | ||
21449 | +HEADERS += ./gstthread.h \ | ||
21450 | + ./pipeline.h \ | ||
21451 | + ./qrenderer.h | ||
21452 | + | ||
21453 | +#Source files | ||
21454 | +SOURCES += ./gstthread.cpp \ | ||
21455 | + ./main.cpp \ | ||
21456 | + ./pipeline.cpp \ | ||
21457 | + ./qrenderer.cpp | ||
21458 | diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.pro b/tests/examples/qt/mousexoverlay/mousexoverlay.pro | ||
21459 | new file mode 100644 | ||
21460 | index 0000000..411822b | ||
21461 | --- /dev/null | ||
21462 | +++ b/tests/examples/qt/mousexoverlay/mousexoverlay.pro | ||
21463 | @@ -0,0 +1,56 @@ | ||
21464 | +TEMPLATE = app | ||
21465 | +TARGET = mousexoverlay | ||
21466 | +DESTDIR = ./debug | ||
21467 | +CONFIG += debug | ||
21468 | +DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB | ||
21469 | + | ||
21470 | +win32 { | ||
21471 | +DEFINES += WIN32 | ||
21472 | +INCLUDEPATH += ./GeneratedFiles \ | ||
21473 | + ./GeneratedFiles/Debug \ | ||
21474 | + C:/gstreamer/include \ | ||
21475 | + C:/gstreamer/include/libxml2 \ | ||
21476 | + C:/gstreamer/include/glib-2.0 \ | ||
21477 | + C:/gstreamer/lib/glib-2.0/include \ | ||
21478 | + C:/gstreamer/include/gstreamer-0.10 | ||
21479 | +LIBS += -L"C:/gstreamer/lib" \ | ||
21480 | + -L"C:/gstreamer/bin" \ | ||
21481 | + -lgstreamer-0.10 \ | ||
21482 | + -lglib-2.0 \ | ||
21483 | + -lgmodule-2.0 \ | ||
21484 | + -lgobject-2.0 \ | ||
21485 | + -lgthread-2.0 \ | ||
21486 | + -llibgstinterfaces-0.10 \ | ||
21487 | + -lopengl32 \ | ||
21488 | + -lglu32 \ | ||
21489 | + -lglew32 | ||
21490 | +} | ||
21491 | + | ||
21492 | +unix { | ||
21493 | +DEFINES += UNIX | ||
21494 | +INCLUDEPATH += GeneratedFiles \ | ||
21495 | + GeneratedFiles/Debug \ | ||
21496 | + /usr/include/gstreamer-0.10 \ | ||
21497 | + /usr/local/include/gstreamer-0.10 \ | ||
21498 | + /usr/include/glib-2.0 \ | ||
21499 | + /usr/lib/glib-2.0/include \ | ||
21500 | + /usr/include/libxml2 | ||
21501 | +LIBS += -lgstreamer-0.10 \ | ||
21502 | + -lgstinterfaces-0.10 \ | ||
21503 | + -lglib-2.0 \ | ||
21504 | + -lgmodule-2.0 \ | ||
21505 | + -lgobject-2.0 \ | ||
21506 | + -lgthread-2.0 \ | ||
21507 | + -lGLU \ | ||
21508 | + -lGL \ | ||
21509 | + -lGLEW | ||
21510 | +} | ||
21511 | + | ||
21512 | +DEPENDPATH += . | ||
21513 | +MOC_DIR += ./GeneratedFiles/debug | ||
21514 | +OBJECTS_DIR += debug | ||
21515 | +UI_DIR += ./GeneratedFiles | ||
21516 | +RCC_DIR += ./GeneratedFiles | ||
21517 | + | ||
21518 | +#Include file(s) | ||
21519 | +include(mousexoverlay.pri) | ||
21520 | diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.sln b/tests/examples/qt/mousexoverlay/mousexoverlay.sln | ||
21521 | new file mode 100644 | ||
21522 | index 0000000..8916d56 | ||
21523 | --- /dev/null | ||
21524 | +++ b/tests/examples/qt/mousexoverlay/mousexoverlay.sln | ||
21525 | @@ -0,0 +1,26 @@ | ||
21526 | +? | ||
21527 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
21528 | +# Visual Studio 2008 | ||
21529 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mousexoverlay", "mousexoverlay.vcproj", "{E94F8CAA-628F-4872-8E73-AD56D34899CB}" | ||
21530 | +EndProject | ||
21531 | +Global | ||
21532 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
21533 | + Debug|Win32 = Debug|Win32 | ||
21534 | + Release|Win32 = Release|Win32 | ||
21535 | + EndGlobalSection | ||
21536 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
21537 | + {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
21538 | + {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Debug|Win32.Build.0 = Debug|Win32 | ||
21539 | + {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Release|Win32.ActiveCfg = Release|Win32 | ||
21540 | + {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Release|Win32.Build.0 = Release|Win32 | ||
21541 | + EndGlobalSection | ||
21542 | + GlobalSection(SolutionProperties) = preSolution | ||
21543 | + HideSolutionNode = FALSE | ||
21544 | + EndGlobalSection | ||
21545 | + GlobalSection(Qt) = preSolution | ||
21546 | + Integration = True | ||
21547 | + EndGlobalSection | ||
21548 | + GlobalSection(Qt) = preSolution | ||
21549 | + Integration = True | ||
21550 | + EndGlobalSection | ||
21551 | +EndGlobal | ||
21552 | diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj b/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj | ||
21553 | new file mode 100644 | ||
21554 | index 0000000..e413b53 | ||
21555 | --- /dev/null | ||
21556 | +++ b/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj | ||
21557 | @@ -0,0 +1,321 @@ | ||
21558 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
21559 | +<VisualStudioProject | ||
21560 | + ProjectType="Visual C++" | ||
21561 | + Version="9,00" | ||
21562 | + Name="mousexoverlay" | ||
21563 | + ProjectGUID="{E94F8CAA-628F-4872-8E73-AD56D34899CB}" | ||
21564 | + RootNamespace="mousexoverlay" | ||
21565 | + Keyword="Qt4VSv1.0" | ||
21566 | + TargetFrameworkVersion="131072" | ||
21567 | + > | ||
21568 | + <Platforms> | ||
21569 | + <Platform | ||
21570 | + Name="Win32" | ||
21571 | + /> | ||
21572 | + </Platforms> | ||
21573 | + <ToolFiles> | ||
21574 | + </ToolFiles> | ||
21575 | + <Configurations> | ||
21576 | + <Configuration | ||
21577 | + Name="Release|Win32" | ||
21578 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
21579 | + IntermediateDirectory="$(ConfigurationName)" | ||
21580 | + ConfigurationType="1" | ||
21581 | + > | ||
21582 | + <Tool | ||
21583 | + Name="VCPreBuildEventTool" | ||
21584 | + /> | ||
21585 | + <Tool | ||
21586 | + Name="VCCustomBuildTool" | ||
21587 | + /> | ||
21588 | + <Tool | ||
21589 | + Name="VCXMLDataGeneratorTool" | ||
21590 | + /> | ||
21591 | + <Tool | ||
21592 | + Name="VCWebServiceProxyGeneratorTool" | ||
21593 | + /> | ||
21594 | + <Tool | ||
21595 | + Name="VCMIDLTool" | ||
21596 | + /> | ||
21597 | + <Tool | ||
21598 | + Name="VCCLCompilerTool" | ||
21599 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
21600 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_NO_DEBUG,NDEBUG,QT_CORE_LIB,QT_GUI_LIB" | ||
21601 | + RuntimeLibrary="2" | ||
21602 | + TreatWChar_tAsBuiltInType="false" | ||
21603 | + DebugInformationFormat="0" | ||
21604 | + /> | ||
21605 | + <Tool | ||
21606 | + Name="VCManagedResourceCompilerTool" | ||
21607 | + /> | ||
21608 | + <Tool | ||
21609 | + Name="VCResourceCompilerTool" | ||
21610 | + /> | ||
21611 | + <Tool | ||
21612 | + Name="VCPreLinkEventTool" | ||
21613 | + /> | ||
21614 | + <Tool | ||
21615 | + Name="VCLinkerTool" | ||
21616 | + AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
21617 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
21618 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
21619 | + GenerateDebugInformation="false" | ||
21620 | + SubSystem="2" | ||
21621 | + RandomizedBaseAddress="1" | ||
21622 | + DataExecutionPrevention="0" | ||
21623 | + /> | ||
21624 | + <Tool | ||
21625 | + Name="VCALinkTool" | ||
21626 | + /> | ||
21627 | + <Tool | ||
21628 | + Name="VCManifestTool" | ||
21629 | + /> | ||
21630 | + <Tool | ||
21631 | + Name="VCXDCMakeTool" | ||
21632 | + /> | ||
21633 | + <Tool | ||
21634 | + Name="VCBscMakeTool" | ||
21635 | + /> | ||
21636 | + <Tool | ||
21637 | + Name="VCFxCopTool" | ||
21638 | + /> | ||
21639 | + <Tool | ||
21640 | + Name="VCAppVerifierTool" | ||
21641 | + /> | ||
21642 | + <Tool | ||
21643 | + Name="VCPostBuildEventTool" | ||
21644 | + /> | ||
21645 | + </Configuration> | ||
21646 | + <Configuration | ||
21647 | + Name="Debug|Win32" | ||
21648 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
21649 | + IntermediateDirectory="$(ConfigurationName)" | ||
21650 | + ConfigurationType="1" | ||
21651 | + > | ||
21652 | + <Tool | ||
21653 | + Name="VCPreBuildEventTool" | ||
21654 | + /> | ||
21655 | + <Tool | ||
21656 | + Name="VCCustomBuildTool" | ||
21657 | + /> | ||
21658 | + <Tool | ||
21659 | + Name="VCXMLDataGeneratorTool" | ||
21660 | + /> | ||
21661 | + <Tool | ||
21662 | + Name="VCWebServiceProxyGeneratorTool" | ||
21663 | + /> | ||
21664 | + <Tool | ||
21665 | + Name="VCMIDLTool" | ||
21666 | + /> | ||
21667 | + <Tool | ||
21668 | + Name="VCCLCompilerTool" | ||
21669 | + Optimization="0" | ||
21670 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
21671 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_CORE_LIB,QT_GUI_LIB" | ||
21672 | + RuntimeLibrary="3" | ||
21673 | + TreatWChar_tAsBuiltInType="false" | ||
21674 | + DebugInformationFormat="3" | ||
21675 | + /> | ||
21676 | + <Tool | ||
21677 | + Name="VCManagedResourceCompilerTool" | ||
21678 | + /> | ||
21679 | + <Tool | ||
21680 | + Name="VCResourceCompilerTool" | ||
21681 | + /> | ||
21682 | + <Tool | ||
21683 | + Name="VCPreLinkEventTool" | ||
21684 | + /> | ||
21685 | + <Tool | ||
21686 | + Name="VCLinkerTool" | ||
21687 | + AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" | ||
21688 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
21689 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
21690 | + GenerateDebugInformation="true" | ||
21691 | + SubSystem="2" | ||
21692 | + RandomizedBaseAddress="1" | ||
21693 | + DataExecutionPrevention="0" | ||
21694 | + /> | ||
21695 | + <Tool | ||
21696 | + Name="VCALinkTool" | ||
21697 | + /> | ||
21698 | + <Tool | ||
21699 | + Name="VCManifestTool" | ||
21700 | + /> | ||
21701 | + <Tool | ||
21702 | + Name="VCXDCMakeTool" | ||
21703 | + /> | ||
21704 | + <Tool | ||
21705 | + Name="VCBscMakeTool" | ||
21706 | + /> | ||
21707 | + <Tool | ||
21708 | + Name="VCFxCopTool" | ||
21709 | + /> | ||
21710 | + <Tool | ||
21711 | + Name="VCAppVerifierTool" | ||
21712 | + /> | ||
21713 | + <Tool | ||
21714 | + Name="VCPostBuildEventTool" | ||
21715 | + /> | ||
21716 | + </Configuration> | ||
21717 | + </Configurations> | ||
21718 | + <References> | ||
21719 | + </References> | ||
21720 | + <Files> | ||
21721 | + <Filter | ||
21722 | + Name="Source Files" | ||
21723 | + Filter="cpp;cxx;c;def" | ||
21724 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
21725 | + > | ||
21726 | + <File | ||
21727 | + RelativePath=".\gstthread.cpp" | ||
21728 | + > | ||
21729 | + </File> | ||
21730 | + <File | ||
21731 | + RelativePath=".\main.cpp" | ||
21732 | + > | ||
21733 | + </File> | ||
21734 | + <File | ||
21735 | + RelativePath=".\pipeline.cpp" | ||
21736 | + > | ||
21737 | + </File> | ||
21738 | + <File | ||
21739 | + RelativePath=".\qrenderer.cpp" | ||
21740 | + > | ||
21741 | + </File> | ||
21742 | + </Filter> | ||
21743 | + <Filter | ||
21744 | + Name="Header Files" | ||
21745 | + Filter="h" | ||
21746 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
21747 | + > | ||
21748 | + <File | ||
21749 | + RelativePath=".\gstthread.h" | ||
21750 | + > | ||
21751 | + <FileConfiguration | ||
21752 | + Name="Release|Win32" | ||
21753 | + > | ||
21754 | + <Tool | ||
21755 | + Name="VCCustomBuildTool" | ||
21756 | + Description="Moc'ing gstthread.h..." | ||
21757 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
21758 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
21759 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
21760 | + /> | ||
21761 | + </FileConfiguration> | ||
21762 | + <FileConfiguration | ||
21763 | + Name="Debug|Win32" | ||
21764 | + > | ||
21765 | + <Tool | ||
21766 | + Name="VCCustomBuildTool" | ||
21767 | + Description="Moc'ing gstthread.h..." | ||
21768 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
21769 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
21770 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
21771 | + /> | ||
21772 | + </FileConfiguration> | ||
21773 | + </File> | ||
21774 | + <File | ||
21775 | + RelativePath=".\pipeline.h" | ||
21776 | + > | ||
21777 | + <FileConfiguration | ||
21778 | + Name="Release|Win32" | ||
21779 | + > | ||
21780 | + <Tool | ||
21781 | + Name="VCCustomBuildTool" | ||
21782 | + Description="Moc'ing pipeline.h..." | ||
21783 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
21784 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
21785 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
21786 | + /> | ||
21787 | + </FileConfiguration> | ||
21788 | + <FileConfiguration | ||
21789 | + Name="Debug|Win32" | ||
21790 | + > | ||
21791 | + <Tool | ||
21792 | + Name="VCCustomBuildTool" | ||
21793 | + Description="Moc'ing pipeline.h..." | ||
21794 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
21795 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
21796 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
21797 | + /> | ||
21798 | + </FileConfiguration> | ||
21799 | + </File> | ||
21800 | + <File | ||
21801 | + RelativePath=".\qrenderer.h" | ||
21802 | + > | ||
21803 | + <FileConfiguration | ||
21804 | + Name="Release|Win32" | ||
21805 | + > | ||
21806 | + <Tool | ||
21807 | + Name="VCCustomBuildTool" | ||
21808 | + Description="Moc'ing qrenderer.h..." | ||
21809 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"
" | ||
21810 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qrenderer.h" | ||
21811 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"" | ||
21812 | + /> | ||
21813 | + </FileConfiguration> | ||
21814 | + <FileConfiguration | ||
21815 | + Name="Debug|Win32" | ||
21816 | + > | ||
21817 | + <Tool | ||
21818 | + Name="VCCustomBuildTool" | ||
21819 | + Description="Moc'ing qrenderer.h..." | ||
21820 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"
" | ||
21821 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qrenderer.h" | ||
21822 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"" | ||
21823 | + /> | ||
21824 | + </FileConfiguration> | ||
21825 | + </File> | ||
21826 | + </Filter> | ||
21827 | + <Filter | ||
21828 | + Name="Form Files" | ||
21829 | + Filter="ui" | ||
21830 | + UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}" | ||
21831 | + > | ||
21832 | + </Filter> | ||
21833 | + <Filter | ||
21834 | + Name="Resource Files" | ||
21835 | + Filter="qrc;*" | ||
21836 | + UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}" | ||
21837 | + ParseFiles="false" | ||
21838 | + > | ||
21839 | + </Filter> | ||
21840 | + <Filter | ||
21841 | + Name="Generated Files" | ||
21842 | + Filter="moc;h;cpp" | ||
21843 | + UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" | ||
21844 | + SourceControlFiles="false" | ||
21845 | + > | ||
21846 | + <File | ||
21847 | + RelativePath=".\generatedfiles\debug\moc_gstthread.cpp" | ||
21848 | + > | ||
21849 | + </File> | ||
21850 | + <File | ||
21851 | + RelativePath=".\generatedfiles\debug\moc_pipeline.cpp" | ||
21852 | + > | ||
21853 | + </File> | ||
21854 | + <File | ||
21855 | + RelativePath=".\generatedfiles\debug\moc_qrenderer.cpp" | ||
21856 | + > | ||
21857 | + </File> | ||
21858 | + </Filter> | ||
21859 | + </Files> | ||
21860 | + <Globals> | ||
21861 | + <Global | ||
21862 | + Name="MocDir" | ||
21863 | + Value=".\GeneratedFiles\$(ConfigurationName)" | ||
21864 | + /> | ||
21865 | + <Global | ||
21866 | + Name="QtVersion" | ||
21867 | + Value="qt-4.3.0" | ||
21868 | + /> | ||
21869 | + <Global | ||
21870 | + Name="RccDir" | ||
21871 | + Value=".\GeneratedFiles" | ||
21872 | + /> | ||
21873 | + <Global | ||
21874 | + Name="UicDir" | ||
21875 | + Value=".\GeneratedFiles" | ||
21876 | + /> | ||
21877 | + </Globals> | ||
21878 | +</VisualStudioProject> | ||
21879 | diff --git a/tests/examples/qt/mousexoverlay/pipeline.cpp b/tests/examples/qt/mousexoverlay/pipeline.cpp | ||
21880 | new file mode 100644 | ||
21881 | index 0000000..6f00bbe | ||
21882 | --- /dev/null | ||
21883 | +++ b/tests/examples/qt/mousexoverlay/pipeline.cpp | ||
21884 | @@ -0,0 +1,334 @@ | ||
21885 | +/* | ||
21886 | + * GStreamer | ||
21887 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
21888 | + * | ||
21889 | + * This library is free software; you can redistribute it and/or | ||
21890 | + * modify it under the terms of the GNU Library General Public | ||
21891 | + * License as published by the Free Software Foundation; either | ||
21892 | + * version 2 of the License, or (at your option) any later version. | ||
21893 | + * | ||
21894 | + * This library is distributed in the hope that it will be useful, | ||
21895 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21896 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
21897 | + * Library General Public License for more details. | ||
21898 | + * | ||
21899 | + * You should have received a copy of the GNU Library General Public | ||
21900 | + * License along with this library; if not, write to the | ||
21901 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21902 | + * Boston, MA 02111-1307, USA. | ||
21903 | + */ | ||
21904 | + | ||
21905 | +#include <gst/interfaces/xoverlay.h> | ||
21906 | +#include <GL/glew.h> | ||
21907 | +#include "pipeline.h" | ||
21908 | + | ||
21909 | +Pipeline::Pipeline(const WId id, const QString videoLocation): | ||
21910 | + m_winId(id), | ||
21911 | + m_videoLocation(videoLocation), | ||
21912 | + m_loop(NULL), | ||
21913 | + m_bus(NULL), | ||
21914 | + m_pipeline(NULL), | ||
21915 | + m_glimagesink(NULL) | ||
21916 | +{ | ||
21917 | + create(); | ||
21918 | +} | ||
21919 | + | ||
21920 | +Pipeline::~Pipeline() | ||
21921 | +{ | ||
21922 | +} | ||
21923 | + | ||
21924 | +void Pipeline::create() | ||
21925 | +{ | ||
21926 | + qDebug("Loading video: %s", m_videoLocation.toAscii().data()); | ||
21927 | + | ||
21928 | + gst_init (NULL, NULL); | ||
21929 | + | ||
21930 | +#ifdef WIN32 | ||
21931 | + m_loop = g_main_loop_new (NULL, FALSE); | ||
21932 | +#endif | ||
21933 | + m_pipeline = gst_pipeline_new ("pipeline"); | ||
21934 | + | ||
21935 | + m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); | ||
21936 | + gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); | ||
21937 | + gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); | ||
21938 | + gst_object_unref (m_bus); | ||
21939 | + | ||
21940 | + GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); | ||
21941 | + GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); | ||
21942 | + m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); | ||
21943 | + | ||
21944 | + if (!videosrc || !decodebin || !m_glimagesink ) | ||
21945 | + { | ||
21946 | + qDebug ("one element could not be found"); | ||
21947 | + return; | ||
21948 | + } | ||
21949 | + | ||
21950 | + g_object_set(G_OBJECT(videosrc), "num-buffers", 800, NULL); | ||
21951 | + g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); | ||
21952 | + g_object_set(G_OBJECT(m_glimagesink), "client-reshape-callback", reshapeCallback, NULL); | ||
21953 | + g_object_set(G_OBJECT(m_glimagesink), "client-draw-callback", drawCallback, NULL); | ||
21954 | + | ||
21955 | + gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glimagesink, NULL); | ||
21956 | + | ||
21957 | + gst_element_link_pads (videosrc, "src", decodebin, "sink"); | ||
21958 | + | ||
21959 | + g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), this); | ||
21960 | +} | ||
21961 | + | ||
21962 | +void Pipeline::start() | ||
21963 | +{ | ||
21964 | + GstStateChangeReturn ret = gst_element_set_state (m_pipeline, GST_STATE_PLAYING); | ||
21965 | + if (ret == GST_STATE_CHANGE_FAILURE) | ||
21966 | + { | ||
21967 | + qDebug ("Failed to start up pipeline!"); | ||
21968 | + | ||
21969 | + /* check if there is an error message with details on the bus */ | ||
21970 | + GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); | ||
21971 | + if (msg) | ||
21972 | + { | ||
21973 | + GError *err = NULL; | ||
21974 | + gst_message_parse_error (msg, &err, NULL); | ||
21975 | + qDebug ("ERROR: %s", err->message); | ||
21976 | + g_error_free (err); | ||
21977 | + gst_message_unref (msg); | ||
21978 | + } | ||
21979 | + return; | ||
21980 | + } | ||
21981 | + | ||
21982 | +#ifdef WIN32 | ||
21983 | + g_main_loop_run(m_loop); | ||
21984 | +#endif | ||
21985 | +} | ||
21986 | + | ||
21987 | +//we don't want a thread safe stop in this example | ||
21988 | +void Pipeline::stop() | ||
21989 | +{ | ||
21990 | +#ifdef WIN32 | ||
21991 | + g_main_loop_quit(m_loop); | ||
21992 | +#else | ||
21993 | + emit stopRequested(); | ||
21994 | +#endif | ||
21995 | +} | ||
21996 | + | ||
21997 | +void Pipeline::unconfigure() const | ||
21998 | +{ | ||
21999 | + gst_element_set_state (m_pipeline, GST_STATE_NULL); | ||
22000 | + gst_object_unref (m_pipeline); | ||
22001 | +} | ||
22002 | + | ||
22003 | +void Pipeline::show() | ||
22004 | +{ | ||
22005 | + emit showRequested(); | ||
22006 | +} | ||
22007 | + | ||
22008 | +//redraw the current frame in the drawable | ||
22009 | +void Pipeline::doExpose() const | ||
22010 | +{ | ||
22011 | + if (m_pipeline && m_glimagesink) | ||
22012 | + gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); | ||
22013 | +} | ||
22014 | + | ||
22015 | +//post message to g_main_loop in order to call expose | ||
22016 | +//in the gt thread | ||
22017 | +void Pipeline::exposeRequested() | ||
22018 | +{ | ||
22019 | + g_idle_add(cb_expose, this); | ||
22020 | +} | ||
22021 | + | ||
22022 | +//rotate the cube | ||
22023 | +void Pipeline::doRotate() | ||
22024 | +{ | ||
22025 | + m_xrot += 3.0f; | ||
22026 | + m_yrot += 2.0f; | ||
22027 | + m_zrot += 4.0f; | ||
22028 | +} | ||
22029 | + | ||
22030 | +//post message to g_main_loop in order to call rotate | ||
22031 | +//in the gt thread | ||
22032 | +void Pipeline::rotateRequested() | ||
22033 | +{ | ||
22034 | + g_idle_add(cb_rotate, this); | ||
22035 | +} | ||
22036 | + | ||
22037 | +//----------------------------------------------------------------------- | ||
22038 | +//----------------------------- static members -------------------------- | ||
22039 | +//----------------------------------------------------------------------- | ||
22040 | + | ||
22041 | +float Pipeline::m_xrot = 0; | ||
22042 | +float Pipeline::m_yrot = 0; | ||
22043 | +float Pipeline::m_zrot = 0; | ||
22044 | + | ||
22045 | +//client reshape callback | ||
22046 | +void Pipeline::reshapeCallback (uint width, uint height) | ||
22047 | +{ | ||
22048 | + glViewport(0, 0, width, height); | ||
22049 | + glMatrixMode(GL_PROJECTION); | ||
22050 | + glLoadIdentity(); | ||
22051 | + gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); | ||
22052 | + glMatrixMode(GL_MODELVIEW); | ||
22053 | +} | ||
22054 | + | ||
22055 | +//client draw callback | ||
22056 | +gboolean Pipeline::drawCallback (uint texture, uint width, uint height) | ||
22057 | +{ | ||
22058 | + static GTimeVal current_time; | ||
22059 | + static glong last_sec = current_time.tv_sec; | ||
22060 | + static gint nbFrames = 0; | ||
22061 | + | ||
22062 | + g_get_current_time (¤t_time); | ||
22063 | + nbFrames++ ; | ||
22064 | + | ||
22065 | + if ((current_time.tv_sec - last_sec) >= 1) | ||
22066 | + { | ||
22067 | + qDebug ("GRPHIC FPS = %d", nbFrames); | ||
22068 | + nbFrames = 0; | ||
22069 | + last_sec = current_time.tv_sec; | ||
22070 | + } | ||
22071 | + | ||
22072 | + glEnable(GL_DEPTH_TEST); | ||
22073 | + | ||
22074 | + glEnable (GL_TEXTURE_RECTANGLE_ARB); | ||
22075 | + glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); | ||
22076 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | ||
22077 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | ||
22078 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); | ||
22079 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); | ||
22080 | + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | ||
22081 | + | ||
22082 | + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | ||
22083 | + glMatrixMode(GL_MODELVIEW); | ||
22084 | + glLoadIdentity(); | ||
22085 | + | ||
22086 | + glTranslatef(0.0f,0.0f,-5.0f); | ||
22087 | + | ||
22088 | + glRotatef(m_xrot,1.0f,0.0f,0.0f); | ||
22089 | + glRotatef(m_yrot,0.0f,1.0f,0.0f); | ||
22090 | + glRotatef(m_zrot,0.0f,0.0f,1.0f); | ||
22091 | + | ||
22092 | + glBegin(GL_QUADS); | ||
22093 | + // Front Face | ||
22094 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22095 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22096 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22097 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22098 | + // Back Face | ||
22099 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22100 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22101 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22102 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22103 | + // Top Face | ||
22104 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22105 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22106 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22107 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22108 | + // Bottom Face | ||
22109 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22110 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22111 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22112 | + glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22113 | + // Right face | ||
22114 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22115 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22116 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22117 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22118 | + // Left Face | ||
22119 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22120 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22121 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22122 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22123 | + glEnd(); | ||
22124 | + | ||
22125 | + //return TRUE causes a postRedisplay | ||
22126 | + return FALSE; | ||
22127 | +} | ||
22128 | + | ||
22129 | +gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) | ||
22130 | +{ | ||
22131 | + switch (GST_MESSAGE_TYPE (msg)) | ||
22132 | + { | ||
22133 | + case GST_MESSAGE_EOS: | ||
22134 | + qDebug ("End-of-stream"); | ||
22135 | + p->stop(); | ||
22136 | + break; | ||
22137 | + case GST_MESSAGE_ERROR: | ||
22138 | + { | ||
22139 | + gchar *debug = NULL; | ||
22140 | + GError *err = NULL; | ||
22141 | + gst_message_parse_error (msg, &err, &debug); | ||
22142 | + qDebug ("Error: %s", err->message); | ||
22143 | + g_error_free (err); | ||
22144 | + if (debug) | ||
22145 | + { | ||
22146 | + qDebug ("Debug deails: %s", debug); | ||
22147 | + g_free (debug); | ||
22148 | + } | ||
22149 | + p->stop(); | ||
22150 | + break; | ||
22151 | + } | ||
22152 | + default: | ||
22153 | + break; | ||
22154 | + } | ||
22155 | + | ||
22156 | + return TRUE; | ||
22157 | +} | ||
22158 | + | ||
22159 | +void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p) | ||
22160 | +{ | ||
22161 | + GstElement* glimagesink = p->getVideoSink(); | ||
22162 | + GstPad* glpad = gst_element_get_pad (glimagesink, "sink"); | ||
22163 | + | ||
22164 | + //only link once | ||
22165 | + if (GST_PAD_IS_LINKED (glpad)) | ||
22166 | + { | ||
22167 | + g_object_unref (glpad); | ||
22168 | + return; | ||
22169 | + } | ||
22170 | + | ||
22171 | + GstCaps* caps = gst_pad_get_caps (pad); | ||
22172 | + GstStructure* str = gst_caps_get_structure (caps, 0); | ||
22173 | + if (!g_strrstr (gst_structure_get_name (str), "video")) | ||
22174 | + { | ||
22175 | + gst_caps_unref (caps); | ||
22176 | + gst_object_unref (glpad); | ||
22177 | + return; | ||
22178 | + } | ||
22179 | + gst_caps_unref (caps); | ||
22180 | + | ||
22181 | + GstPadLinkReturn ret = gst_pad_link (pad, glpad); | ||
22182 | + if (ret != GST_PAD_LINK_OK) | ||
22183 | + g_warning ("Failed to link with decodebin!\n"); | ||
22184 | + | ||
22185 | + p->show(); | ||
22186 | +} | ||
22187 | + | ||
22188 | +gboolean Pipeline::cb_expose (gpointer data) | ||
22189 | +{ | ||
22190 | + ((Pipeline*)data)->doExpose(); | ||
22191 | + return FALSE; | ||
22192 | +} | ||
22193 | + | ||
22194 | +gboolean Pipeline::cb_rotate (gpointer data) | ||
22195 | +{ | ||
22196 | + ((Pipeline*)data)->doRotate(); | ||
22197 | + return FALSE; | ||
22198 | +} | ||
22199 | + | ||
22200 | +GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) | ||
22201 | +{ | ||
22202 | + // ignore anything but 'prepare-xwindow-id' element messages | ||
22203 | + if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) | ||
22204 | + return GST_BUS_PASS; | ||
22205 | + | ||
22206 | + if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) | ||
22207 | + return GST_BUS_PASS; | ||
22208 | + | ||
22209 | + qDebug ("setting xwindow id"); | ||
22210 | + | ||
22211 | + //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. | ||
22212 | + //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. | ||
22213 | + gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); | ||
22214 | + | ||
22215 | + gst_message_unref (message); | ||
22216 | + | ||
22217 | + return GST_BUS_DROP; | ||
22218 | +} | ||
22219 | diff --git a/tests/examples/qt/mousexoverlay/pipeline.h b/tests/examples/qt/mousexoverlay/pipeline.h | ||
22220 | new file mode 100644 | ||
22221 | index 0000000..9c5d044 | ||
22222 | --- /dev/null | ||
22223 | +++ b/tests/examples/qt/mousexoverlay/pipeline.h | ||
22224 | @@ -0,0 +1,72 @@ | ||
22225 | +/* | ||
22226 | + * GStreamer | ||
22227 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22228 | + * | ||
22229 | + * This library is free software; you can redistribute it and/or | ||
22230 | + * modify it under the terms of the GNU Library General Public | ||
22231 | + * License as published by the Free Software Foundation; either | ||
22232 | + * version 2 of the License, or (at your option) any later version. | ||
22233 | + * | ||
22234 | + * This library is distributed in the hope that it will be useful, | ||
22235 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22236 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22237 | + * Library General Public License for more details. | ||
22238 | + * | ||
22239 | + * You should have received a copy of the GNU Library General Public | ||
22240 | + * License along with this library; if not, write to the | ||
22241 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22242 | + * Boston, MA 02111-1307, USA. | ||
22243 | + */ | ||
22244 | + | ||
22245 | +#ifndef PIPELINE_H | ||
22246 | +#define PIPELINE_H | ||
22247 | + | ||
22248 | +#include <QtGui> | ||
22249 | +#include <gst/gst.h> | ||
22250 | +//#include <QtCore/private/qeventdispatcher_glib_p.h> | ||
22251 | + | ||
22252 | +class Pipeline : public QObject | ||
22253 | +{ | ||
22254 | + Q_OBJECT | ||
22255 | + | ||
22256 | +public: | ||
22257 | + Pipeline(const WId windId, const QString videoLocation); | ||
22258 | + ~Pipeline(); | ||
22259 | + void start(); | ||
22260 | + void exposeRequested(); | ||
22261 | + void rotateRequested(); | ||
22262 | + void stop(); | ||
22263 | + void unconfigure() const; | ||
22264 | + void show(); | ||
22265 | + GstElement* getVideoSink() { return m_glimagesink; } ; | ||
22266 | + | ||
22267 | +signals: | ||
22268 | + void showRequested(); | ||
22269 | + void stopRequested(); | ||
22270 | + | ||
22271 | +private: | ||
22272 | + const WId m_winId; | ||
22273 | + const QString m_videoLocation; | ||
22274 | + GMainLoop* m_loop; | ||
22275 | + GstBus* m_bus; | ||
22276 | + GstElement* m_pipeline; | ||
22277 | + GstElement* m_glimagesink; | ||
22278 | + static float m_xrot; | ||
22279 | + static float m_yrot; | ||
22280 | + static float m_zrot; | ||
22281 | + | ||
22282 | + void create(); | ||
22283 | + WId winId() const { return m_winId; } | ||
22284 | + void doExpose() const; | ||
22285 | + void doRotate(); | ||
22286 | + | ||
22287 | + static void reshapeCallback (uint width, uint height); | ||
22288 | + static gboolean drawCallback (uint texture, uint width, uint height); | ||
22289 | + static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); | ||
22290 | + static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p); | ||
22291 | + static gboolean cb_expose (gpointer data); | ||
22292 | + static gboolean cb_rotate (gpointer data); | ||
22293 | + static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); | ||
22294 | +}; | ||
22295 | + | ||
22296 | +#endif | ||
22297 | diff --git a/tests/examples/qt/mousexoverlay/qrenderer.cpp b/tests/examples/qt/mousexoverlay/qrenderer.cpp | ||
22298 | new file mode 100644 | ||
22299 | index 0000000..6263035 | ||
22300 | --- /dev/null | ||
22301 | +++ b/tests/examples/qt/mousexoverlay/qrenderer.cpp | ||
22302 | @@ -0,0 +1,58 @@ | ||
22303 | +/* | ||
22304 | + * GStreamer | ||
22305 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22306 | + * | ||
22307 | + * This library is free software; you can redistribute it and/or | ||
22308 | + * modify it under the terms of the GNU Library General Public | ||
22309 | + * License as published by the Free Software Foundation; either | ||
22310 | + * version 2 of the License, or (at your option) any later version. | ||
22311 | + * | ||
22312 | + * This library is distributed in the hope that it will be useful, | ||
22313 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22314 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22315 | + * Library General Public License for more details. | ||
22316 | + * | ||
22317 | + * You should have received a copy of the GNU Library General Public | ||
22318 | + * License along with this library; if not, write to the | ||
22319 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22320 | + * Boston, MA 02111-1307, USA. | ||
22321 | + */ | ||
22322 | + | ||
22323 | +#include "qrenderer.h" | ||
22324 | + | ||
22325 | +QRenderer::QRenderer(const QString videoLocation, QWidget *parent, Qt::WFlags flags) | ||
22326 | + : QWidget(parent, flags), | ||
22327 | + m_gt(winId(), videoLocation) | ||
22328 | +{ | ||
22329 | + setAttribute(Qt::WA_NoSystemBackground); | ||
22330 | + setVisible(false); | ||
22331 | + move(20, 10); | ||
22332 | + resize(640, 480); | ||
22333 | + | ||
22334 | + QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); | ||
22335 | + QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); | ||
22336 | + QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); | ||
22337 | + QObject::connect(&m_gt, SIGNAL(showRequested()), this, SLOT(show())); | ||
22338 | + QObject::connect(this, SIGNAL(mouseMoved()), &m_gt, SLOT(onMouseMove())); | ||
22339 | + m_gt.start(); | ||
22340 | +} | ||
22341 | + | ||
22342 | +QRenderer::~QRenderer() | ||
22343 | +{ | ||
22344 | +} | ||
22345 | + | ||
22346 | +void QRenderer::paintEvent(QPaintEvent* event) | ||
22347 | +{ | ||
22348 | + emit exposeRequested(); | ||
22349 | +} | ||
22350 | + | ||
22351 | +void QRenderer::mouseMoveEvent(QMouseEvent* event) | ||
22352 | +{ | ||
22353 | + emit mouseMoved(); | ||
22354 | +} | ||
22355 | + | ||
22356 | +void QRenderer::closeEvent(QCloseEvent* event) | ||
22357 | +{ | ||
22358 | + emit closeRequested(); | ||
22359 | + m_gt.wait(); | ||
22360 | +} | ||
22361 | diff --git a/tests/examples/qt/mousexoverlay/qrenderer.h b/tests/examples/qt/mousexoverlay/qrenderer.h | ||
22362 | new file mode 100644 | ||
22363 | index 0000000..a5057b9 | ||
22364 | --- /dev/null | ||
22365 | +++ b/tests/examples/qt/mousexoverlay/qrenderer.h | ||
22366 | @@ -0,0 +1,47 @@ | ||
22367 | +/* | ||
22368 | + * GStreamer | ||
22369 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22370 | + * | ||
22371 | + * This library is free software; you can redistribute it and/or | ||
22372 | + * modify it under the terms of the GNU Library General Public | ||
22373 | + * License as published by the Free Software Foundation; either | ||
22374 | + * version 2 of the License, or (at your option) any later version. | ||
22375 | + * | ||
22376 | + * This library is distributed in the hope that it will be useful, | ||
22377 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22378 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22379 | + * Library General Public License for more details. | ||
22380 | + * | ||
22381 | + * You should have received a copy of the GNU Library General Public | ||
22382 | + * License along with this library; if not, write to the | ||
22383 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22384 | + * Boston, MA 02111-1307, USA. | ||
22385 | + */ | ||
22386 | + | ||
22387 | +#ifndef QRENDERER_H | ||
22388 | +#define QRENDERER_H | ||
22389 | + | ||
22390 | +#include <QtGui/QWidget> | ||
22391 | +#include "gstthread.h" | ||
22392 | + | ||
22393 | +class QRenderer : public QWidget | ||
22394 | +{ | ||
22395 | + Q_OBJECT | ||
22396 | + | ||
22397 | +public: | ||
22398 | + QRenderer(const QString videoLocation, QWidget *parent = 0, Qt::WFlags flags = 0); | ||
22399 | + ~QRenderer(); | ||
22400 | + void paintEvent(QPaintEvent* event); | ||
22401 | + void mouseMoveEvent(QMouseEvent* event); | ||
22402 | + void closeEvent (QCloseEvent* event); | ||
22403 | + | ||
22404 | +signals: | ||
22405 | + void exposeRequested(); | ||
22406 | + void closeRequested(); | ||
22407 | + void mouseMoved(); | ||
22408 | + | ||
22409 | +private: | ||
22410 | + GstThread m_gt; | ||
22411 | +}; | ||
22412 | + | ||
22413 | +#endif // QRENDERER_H | ||
22414 | diff --git a/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp b/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp | ||
22415 | new file mode 100644 | ||
22416 | index 0000000..4eebd30 | ||
22417 | --- /dev/null | ||
22418 | +++ b/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp | ||
22419 | @@ -0,0 +1,62 @@ | ||
22420 | +/* | ||
22421 | + * GStreamer | ||
22422 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22423 | + * | ||
22424 | + * This library is free software; you can redistribute it and/or | ||
22425 | + * modify it under the terms of the GNU Library General Public | ||
22426 | + * License as published by the Free Software Foundation; either | ||
22427 | + * version 2 of the License, or (at your option) any later version. | ||
22428 | + * | ||
22429 | + * This library is distributed in the hope that it will be useful, | ||
22430 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22431 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22432 | + * Library General Public License for more details. | ||
22433 | + * | ||
22434 | + * You should have received a copy of the GNU Library General Public | ||
22435 | + * License along with this library; if not, write to the | ||
22436 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22437 | + * Boston, MA 02111-1307, USA. | ||
22438 | + */ | ||
22439 | + | ||
22440 | +#include "gstthread.h" | ||
22441 | + | ||
22442 | +GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): | ||
22443 | + QThread(parent), | ||
22444 | + m_winId(winId), | ||
22445 | + m_videoLocation(videoLocation) | ||
22446 | +{ | ||
22447 | +} | ||
22448 | + | ||
22449 | +GstThread::~GstThread() | ||
22450 | +{ | ||
22451 | +} | ||
22452 | + | ||
22453 | +void GstThread::exposeRequested() | ||
22454 | +{ | ||
22455 | + m_pipeline->exposeRequested(); | ||
22456 | +} | ||
22457 | + | ||
22458 | +void GstThread::show() | ||
22459 | +{ | ||
22460 | + emit showRequested(); | ||
22461 | +} | ||
22462 | + | ||
22463 | +void GstThread::stop() | ||
22464 | +{ | ||
22465 | + m_pipeline->stop(); | ||
22466 | +} | ||
22467 | + | ||
22468 | +void GstThread::run() | ||
22469 | +{ | ||
22470 | + m_pipeline = new Pipeline(m_winId, m_videoLocation); | ||
22471 | + connect(m_pipeline, SIGNAL(showRequested()), this, SLOT(show())); | ||
22472 | + m_pipeline->start(); //it runs the gmainloop on win32 | ||
22473 | + | ||
22474 | +#ifndef WIN32 | ||
22475 | + //works like the gmainloop on linux (GstEvent are handled) | ||
22476 | + connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); | ||
22477 | + exec(); | ||
22478 | +#endif | ||
22479 | + | ||
22480 | + m_pipeline->unconfigure(); | ||
22481 | +} | ||
22482 | diff --git a/tests/examples/qt/qglwidgetxoverlay/gstthread.h b/tests/examples/qt/qglwidgetxoverlay/gstthread.h | ||
22483 | new file mode 100644 | ||
22484 | index 0000000..1ee555c | ||
22485 | --- /dev/null | ||
22486 | +++ b/tests/examples/qt/qglwidgetxoverlay/gstthread.h | ||
22487 | @@ -0,0 +1,55 @@ | ||
22488 | +/* | ||
22489 | + * GStreamer | ||
22490 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22491 | + * | ||
22492 | + * This library is free software; you can redistribute it and/or | ||
22493 | + * modify it under the terms of the GNU Library General Public | ||
22494 | + * License as published by the Free Software Foundation; either | ||
22495 | + * version 2 of the License, or (at your option) any later version. | ||
22496 | + * | ||
22497 | + * This library is distributed in the hope that it will be useful, | ||
22498 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22499 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22500 | + * Library General Public License for more details. | ||
22501 | + * | ||
22502 | + * You should have received a copy of the GNU Library General Public | ||
22503 | + * License along with this library; if not, write to the | ||
22504 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22505 | + * Boston, MA 02111-1307, USA. | ||
22506 | + */ | ||
22507 | + | ||
22508 | +#ifndef GSTTHREAD_H | ||
22509 | +#define GSTTHREAD_H | ||
22510 | + | ||
22511 | +#include <QtGui> | ||
22512 | +#include <QtCore/QThread> | ||
22513 | + | ||
22514 | +#include "pipeline.h" | ||
22515 | + | ||
22516 | +class GstThread : public QThread | ||
22517 | +{ | ||
22518 | + Q_OBJECT | ||
22519 | + | ||
22520 | +public: | ||
22521 | + GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); | ||
22522 | + ~GstThread(); | ||
22523 | + | ||
22524 | +public slots: | ||
22525 | + void exposeRequested(); | ||
22526 | + void show(); | ||
22527 | + void stop(); | ||
22528 | + | ||
22529 | +signals: | ||
22530 | + void showRequested(); | ||
22531 | + | ||
22532 | +protected: | ||
22533 | + void run(); | ||
22534 | + | ||
22535 | +private: | ||
22536 | + const WId m_winId; | ||
22537 | + const QString m_videoLocation; | ||
22538 | + Pipeline* m_pipeline; | ||
22539 | + | ||
22540 | +}; | ||
22541 | + | ||
22542 | +#endif | ||
22543 | diff --git a/tests/examples/qt/qglwidgetxoverlay/main.cpp b/tests/examples/qt/qglwidgetxoverlay/main.cpp | ||
22544 | new file mode 100644 | ||
22545 | index 0000000..77a31a6 | ||
22546 | --- /dev/null | ||
22547 | +++ b/tests/examples/qt/qglwidgetxoverlay/main.cpp | ||
22548 | @@ -0,0 +1,39 @@ | ||
22549 | +/* | ||
22550 | + * GStreamer | ||
22551 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22552 | + * | ||
22553 | + * This library is free software; you can redistribute it and/or | ||
22554 | + * modify it under the terms of the GNU Library General Public | ||
22555 | + * License as published by the Free Software Foundation; either | ||
22556 | + * version 2 of the License, or (at your option) any later version. | ||
22557 | + * | ||
22558 | + * This library is distributed in the hope that it will be useful, | ||
22559 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22560 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22561 | + * Library General Public License for more details. | ||
22562 | + * | ||
22563 | + * You should have received a copy of the GNU Library General Public | ||
22564 | + * License along with this library; if not, write to the | ||
22565 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22566 | + * Boston, MA 02111-1307, USA. | ||
22567 | + */ | ||
22568 | + | ||
22569 | +#include <QtGui/QApplication> | ||
22570 | +#include "qglrenderer.h" | ||
22571 | + | ||
22572 | +int main(int argc, char *argv[]) | ||
22573 | +{ | ||
22574 | + QApplication a(argc, argv); | ||
22575 | + a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | ||
22576 | + | ||
22577 | + QString videolcoation = QFileDialog::getOpenFileName(0, "Select a video file", | ||
22578 | + ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); | ||
22579 | + | ||
22580 | + if (videolcoation.isEmpty()) | ||
22581 | + return -1; | ||
22582 | + | ||
22583 | + QGLRenderer w(videolcoation); | ||
22584 | + w.setWindowTitle("glimagesink implements the gstxoverlay interface"); | ||
22585 | + | ||
22586 | + return a.exec(); | ||
22587 | +} | ||
22588 | diff --git a/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp b/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp | ||
22589 | new file mode 100644 | ||
22590 | index 0000000..319eb3c | ||
22591 | --- /dev/null | ||
22592 | +++ b/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp | ||
22593 | @@ -0,0 +1,332 @@ | ||
22594 | +/* | ||
22595 | + * GStreamer | ||
22596 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22597 | + * | ||
22598 | + * This library is free software; you can redistribute it and/or | ||
22599 | + * modify it under the terms of the GNU Library General Public | ||
22600 | + * License as published by the Free Software Foundation; either | ||
22601 | + * version 2 of the License, or (at your option) any later version. | ||
22602 | + * | ||
22603 | + * This library is distributed in the hope that it will be useful, | ||
22604 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22605 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22606 | + * Library General Public License for more details. | ||
22607 | + * | ||
22608 | + * You should have received a copy of the GNU Library General Public | ||
22609 | + * License along with this library; if not, write to the | ||
22610 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22611 | + * Boston, MA 02111-1307, USA. | ||
22612 | + */ | ||
22613 | + | ||
22614 | +#include <gst/interfaces/xoverlay.h> | ||
22615 | +#include <GL/glew.h> | ||
22616 | +#include "pipeline.h" | ||
22617 | + | ||
22618 | +Pipeline::Pipeline(const WId id, const QString videoLocation): | ||
22619 | + m_winId(id), | ||
22620 | + m_videoLocation(videoLocation), | ||
22621 | + m_loop(NULL), | ||
22622 | + m_bus(NULL), | ||
22623 | + m_pipeline(NULL), | ||
22624 | + m_glupload(NULL), | ||
22625 | + m_glimagesink(NULL) | ||
22626 | +{ | ||
22627 | + create(); | ||
22628 | +} | ||
22629 | + | ||
22630 | +Pipeline::~Pipeline() | ||
22631 | +{ | ||
22632 | +} | ||
22633 | + | ||
22634 | +void Pipeline::create() | ||
22635 | +{ | ||
22636 | + qDebug("Loading video: %s", m_videoLocation.toAscii().data()); | ||
22637 | + | ||
22638 | + gst_init (NULL, NULL); | ||
22639 | + | ||
22640 | +#ifdef WIN32 | ||
22641 | + m_loop = g_main_loop_new (NULL, FALSE); | ||
22642 | +#endif | ||
22643 | + m_pipeline = gst_pipeline_new ("pipeline"); | ||
22644 | + | ||
22645 | + m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); | ||
22646 | + gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); | ||
22647 | + gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); | ||
22648 | + gst_object_unref (m_bus); | ||
22649 | + | ||
22650 | + GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); | ||
22651 | + GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); | ||
22652 | + m_glupload = gst_element_factory_make ("glupload", "glupload0"); | ||
22653 | + m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); | ||
22654 | + | ||
22655 | + if (!videosrc || !decodebin || !m_glupload || !m_glimagesink ) | ||
22656 | + { | ||
22657 | + qDebug ("one element could not be found"); | ||
22658 | + return; | ||
22659 | + } | ||
22660 | + | ||
22661 | + GstCaps *outcaps = gst_caps_new_simple("video/x-raw-gl", | ||
22662 | + "width", G_TYPE_INT, 800, | ||
22663 | + "height", G_TYPE_INT, 600, | ||
22664 | + NULL) ; | ||
22665 | + | ||
22666 | + g_object_set(G_OBJECT(videosrc), "num-buffers", 800, NULL); | ||
22667 | + g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); | ||
22668 | + g_object_set(G_OBJECT(m_glimagesink), "client-reshape-callback", reshapeCallback, NULL); | ||
22669 | + g_object_set(G_OBJECT(m_glimagesink), "client-draw-callback", drawCallback, NULL); | ||
22670 | + | ||
22671 | + gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glupload, m_glimagesink, NULL); | ||
22672 | + | ||
22673 | + gboolean link_ok = gst_element_link_filtered(m_glupload, m_glimagesink, outcaps) ; | ||
22674 | + gst_caps_unref(outcaps) ; | ||
22675 | + if(!link_ok) | ||
22676 | + { | ||
22677 | + qDebug("Failed to link glupload to glimagesink!\n") ; | ||
22678 | + return; | ||
22679 | + } | ||
22680 | + | ||
22681 | + gst_element_link_pads (videosrc, "src", decodebin, "sink"); | ||
22682 | + | ||
22683 | + g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), this); | ||
22684 | +} | ||
22685 | + | ||
22686 | +void Pipeline::start() | ||
22687 | +{ | ||
22688 | + GstStateChangeReturn ret = gst_element_set_state (m_pipeline, GST_STATE_PLAYING); | ||
22689 | + if (ret == GST_STATE_CHANGE_FAILURE) | ||
22690 | + { | ||
22691 | + qDebug ("Failed to start up pipeline!"); | ||
22692 | + | ||
22693 | + /* check if there is an error message with details on the bus */ | ||
22694 | + GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); | ||
22695 | + if (msg) | ||
22696 | + { | ||
22697 | + GError *err = NULL; | ||
22698 | + gst_message_parse_error (msg, &err, NULL); | ||
22699 | + qDebug ("ERROR: %s", err->message); | ||
22700 | + g_error_free (err); | ||
22701 | + gst_message_unref (msg); | ||
22702 | + } | ||
22703 | + return; | ||
22704 | + } | ||
22705 | + | ||
22706 | +#ifdef WIN32 | ||
22707 | + g_main_loop_run(m_loop); | ||
22708 | +#endif | ||
22709 | +} | ||
22710 | + | ||
22711 | +//we don't want a thread safe stop in this example | ||
22712 | +void Pipeline::stop() | ||
22713 | +{ | ||
22714 | +#ifdef WIN32 | ||
22715 | + g_main_loop_quit(m_loop); | ||
22716 | +#else | ||
22717 | + emit stopRequested(); | ||
22718 | +#endif | ||
22719 | +} | ||
22720 | + | ||
22721 | +void Pipeline::unconfigure() const | ||
22722 | +{ | ||
22723 | + gst_element_set_state (m_pipeline, GST_STATE_NULL); | ||
22724 | + gst_object_unref (m_pipeline); | ||
22725 | +} | ||
22726 | + | ||
22727 | +void Pipeline::show() | ||
22728 | +{ | ||
22729 | + emit showRequested(); | ||
22730 | +} | ||
22731 | + | ||
22732 | +//redraw the current frame in the drawable | ||
22733 | +void Pipeline::doExpose() const | ||
22734 | +{ | ||
22735 | + if (m_pipeline && m_glimagesink) | ||
22736 | + gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); | ||
22737 | +} | ||
22738 | + | ||
22739 | +//post message to g_main_loop in order to call expose | ||
22740 | +//in the gt thread | ||
22741 | +void Pipeline::exposeRequested() | ||
22742 | +{ | ||
22743 | + g_idle_add(cb_expose, this); | ||
22744 | +} | ||
22745 | + | ||
22746 | + | ||
22747 | +//----------------------------------------------------------------------- | ||
22748 | +//----------------------------- static members -------------------------- | ||
22749 | +//----------------------------------------------------------------------- | ||
22750 | + | ||
22751 | +//client reshape callback | ||
22752 | +void Pipeline::reshapeCallback (uint width, uint height) | ||
22753 | +{ | ||
22754 | + glViewport(0, 0, width, height); | ||
22755 | + glMatrixMode(GL_PROJECTION); | ||
22756 | + glLoadIdentity(); | ||
22757 | + gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); | ||
22758 | + glMatrixMode(GL_MODELVIEW); | ||
22759 | +} | ||
22760 | + | ||
22761 | +//client draw callback | ||
22762 | +gboolean Pipeline::drawCallback (uint texture, uint width, uint height) | ||
22763 | +{ | ||
22764 | + static GLfloat xrot = 0; | ||
22765 | + static GLfloat yrot = 0; | ||
22766 | + static GLfloat zrot = 0; | ||
22767 | + static GTimeVal current_time; | ||
22768 | + static glong last_sec = current_time.tv_sec; | ||
22769 | + static gint nbFrames = 0; | ||
22770 | + | ||
22771 | + g_get_current_time (¤t_time); | ||
22772 | + nbFrames++ ; | ||
22773 | + | ||
22774 | + if ((current_time.tv_sec - last_sec) >= 1) | ||
22775 | + { | ||
22776 | + qDebug ("GRPHIC FPS = %d", nbFrames); | ||
22777 | + nbFrames = 0; | ||
22778 | + last_sec = current_time.tv_sec; | ||
22779 | + } | ||
22780 | + | ||
22781 | + glEnable(GL_DEPTH_TEST); | ||
22782 | + | ||
22783 | + glEnable (GL_TEXTURE_RECTANGLE_ARB); | ||
22784 | + glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); | ||
22785 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | ||
22786 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | ||
22787 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); | ||
22788 | + glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); | ||
22789 | + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | ||
22790 | + | ||
22791 | + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | ||
22792 | + glMatrixMode(GL_MODELVIEW); | ||
22793 | + glLoadIdentity(); | ||
22794 | + | ||
22795 | + glTranslatef(0.0f,0.0f,-5.0f); | ||
22796 | + | ||
22797 | + glRotatef(xrot,1.0f,0.0f,0.0f); | ||
22798 | + glRotatef(yrot,0.0f,1.0f,0.0f); | ||
22799 | + glRotatef(zrot,0.0f,0.0f,1.0f); | ||
22800 | + | ||
22801 | + glBegin(GL_QUADS); | ||
22802 | + // Front Face | ||
22803 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22804 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22805 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22806 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22807 | + // Back Face | ||
22808 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22809 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22810 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22811 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22812 | + // Top Face | ||
22813 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22814 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22815 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22816 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22817 | + // Bottom Face | ||
22818 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22819 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22820 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22821 | + glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22822 | + // Right face | ||
22823 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
22824 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
22825 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
22826 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
22827 | + // Left Face | ||
22828 | + glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
22829 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
22830 | + glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
22831 | + glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
22832 | + glEnd(); | ||
22833 | + | ||
22834 | + xrot+=0.03f; | ||
22835 | + yrot+=0.02f; | ||
22836 | + zrot+=0.04f; | ||
22837 | + | ||
22838 | + //return TRUE causes a postRedisplay | ||
22839 | + return TRUE; | ||
22840 | +} | ||
22841 | + | ||
22842 | +gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) | ||
22843 | +{ | ||
22844 | + switch (GST_MESSAGE_TYPE (msg)) | ||
22845 | + { | ||
22846 | + case GST_MESSAGE_EOS: | ||
22847 | + qDebug ("End-of-stream"); | ||
22848 | + p->stop(); | ||
22849 | + break; | ||
22850 | + case GST_MESSAGE_ERROR: | ||
22851 | + { | ||
22852 | + gchar *debug = NULL; | ||
22853 | + GError *err = NULL; | ||
22854 | + gst_message_parse_error (msg, &err, &debug); | ||
22855 | + qDebug ("Error: %s", err->message); | ||
22856 | + g_error_free (err); | ||
22857 | + if (debug) | ||
22858 | + { | ||
22859 | + qDebug ("Debug deails: %s", debug); | ||
22860 | + g_free (debug); | ||
22861 | + } | ||
22862 | + p->stop(); | ||
22863 | + break; | ||
22864 | + } | ||
22865 | + default: | ||
22866 | + break; | ||
22867 | + } | ||
22868 | + | ||
22869 | + return TRUE; | ||
22870 | +} | ||
22871 | + | ||
22872 | +void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p) | ||
22873 | +{ | ||
22874 | + GstElement* glupload = p->getVideoSink(); | ||
22875 | + GstPad* glpad = gst_element_get_pad (glupload, "sink"); | ||
22876 | + | ||
22877 | + //only link once | ||
22878 | + if (GST_PAD_IS_LINKED (glpad)) | ||
22879 | + { | ||
22880 | + g_object_unref (glpad); | ||
22881 | + return; | ||
22882 | + } | ||
22883 | + | ||
22884 | + GstCaps* caps = gst_pad_get_caps (pad); | ||
22885 | + GstStructure* str = gst_caps_get_structure (caps, 0); | ||
22886 | + if (!g_strrstr (gst_structure_get_name (str), "video")) | ||
22887 | + { | ||
22888 | + gst_caps_unref (caps); | ||
22889 | + gst_object_unref (glpad); | ||
22890 | + return; | ||
22891 | + } | ||
22892 | + gst_caps_unref (caps); | ||
22893 | + | ||
22894 | + GstPadLinkReturn ret = gst_pad_link (pad, glpad); | ||
22895 | + if (ret != GST_PAD_LINK_OK) | ||
22896 | + g_warning ("Failed to link with decodebin!\n"); | ||
22897 | + | ||
22898 | + p->show(); | ||
22899 | +} | ||
22900 | + | ||
22901 | +gboolean Pipeline::cb_expose (gpointer data) | ||
22902 | +{ | ||
22903 | + ((Pipeline*)data)->doExpose(); | ||
22904 | + return FALSE; | ||
22905 | +} | ||
22906 | + | ||
22907 | +GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) | ||
22908 | +{ | ||
22909 | + // ignore anything but 'prepare-xwindow-id' element messages | ||
22910 | + if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) | ||
22911 | + return GST_BUS_PASS; | ||
22912 | + | ||
22913 | + if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) | ||
22914 | + return GST_BUS_PASS; | ||
22915 | + | ||
22916 | + qDebug ("setting xwindow id"); | ||
22917 | + | ||
22918 | + //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. | ||
22919 | + //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. | ||
22920 | + gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); | ||
22921 | + | ||
22922 | + gst_message_unref (message); | ||
22923 | + | ||
22924 | + return GST_BUS_DROP; | ||
22925 | +} | ||
22926 | diff --git a/tests/examples/qt/qglwidgetxoverlay/pipeline.h b/tests/examples/qt/qglwidgetxoverlay/pipeline.h | ||
22927 | new file mode 100644 | ||
22928 | index 0000000..0da6d32 | ||
22929 | --- /dev/null | ||
22930 | +++ b/tests/examples/qt/qglwidgetxoverlay/pipeline.h | ||
22931 | @@ -0,0 +1,70 @@ | ||
22932 | +/* | ||
22933 | + * GStreamer | ||
22934 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
22935 | + * | ||
22936 | + * This library is free software; you can redistribute it and/or | ||
22937 | + * modify it under the terms of the GNU Library General Public | ||
22938 | + * License as published by the Free Software Foundation; either | ||
22939 | + * version 2 of the License, or (at your option) any later version. | ||
22940 | + * | ||
22941 | + * This library is distributed in the hope that it will be useful, | ||
22942 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22943 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22944 | + * Library General Public License for more details. | ||
22945 | + * | ||
22946 | + * You should have received a copy of the GNU Library General Public | ||
22947 | + * License along with this library; if not, write to the | ||
22948 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
22949 | + * Boston, MA 02111-1307, USA. | ||
22950 | + */ | ||
22951 | + | ||
22952 | +#ifndef PIPELINE_H | ||
22953 | +#define PIPELINE_H | ||
22954 | + | ||
22955 | +#include <QtGui> | ||
22956 | +#include <gst/gst.h> | ||
22957 | +//#include <QtCore/private/qeventdispatcher_glib_p.h> | ||
22958 | + | ||
22959 | +class Pipeline : public QObject | ||
22960 | +{ | ||
22961 | + Q_OBJECT | ||
22962 | + | ||
22963 | +public: | ||
22964 | + Pipeline(const WId windId, const QString videoLocation); | ||
22965 | + ~Pipeline(); | ||
22966 | + void start(); | ||
22967 | + void exposeRequested(); | ||
22968 | + void stop(); | ||
22969 | + void unconfigure() const; | ||
22970 | + void show(); | ||
22971 | + GstElement* getVideoSink() { return m_glupload; } ; | ||
22972 | + | ||
22973 | +signals: | ||
22974 | + void showRequested(); | ||
22975 | + void stopRequested(); | ||
22976 | + | ||
22977 | +private: | ||
22978 | + const WId m_winId; | ||
22979 | + const QString m_videoLocation; | ||
22980 | + GMainLoop* m_loop; | ||
22981 | + GstBus* m_bus; | ||
22982 | + GstElement* m_pipeline; | ||
22983 | + GstElement* m_glupload; | ||
22984 | + GstElement* m_glimagesink; | ||
22985 | + static float m_xrot; | ||
22986 | + static float m_yrot; | ||
22987 | + static float m_zrot; | ||
22988 | + | ||
22989 | + void create(); | ||
22990 | + WId winId() const { return m_winId; } | ||
22991 | + void doExpose() const; | ||
22992 | + | ||
22993 | + static void reshapeCallback (uint width, uint height); | ||
22994 | + static gboolean drawCallback (uint texture, uint width, uint height); | ||
22995 | + static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); | ||
22996 | + static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p); | ||
22997 | + static gboolean cb_expose (gpointer data); | ||
22998 | + static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); | ||
22999 | +}; | ||
23000 | + | ||
23001 | +#endif | ||
23002 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp | ||
23003 | new file mode 100644 | ||
23004 | index 0000000..dc01e1e | ||
23005 | --- /dev/null | ||
23006 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp | ||
23007 | @@ -0,0 +1,52 @@ | ||
23008 | +/* | ||
23009 | + * GStreamer | ||
23010 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
23011 | + * | ||
23012 | + * This library is free software; you can redistribute it and/or | ||
23013 | + * modify it under the terms of the GNU Library General Public | ||
23014 | + * License as published by the Free Software Foundation; either | ||
23015 | + * version 2 of the License, or (at your option) any later version. | ||
23016 | + * | ||
23017 | + * This library is distributed in the hope that it will be useful, | ||
23018 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23019 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23020 | + * Library General Public License for more details. | ||
23021 | + * | ||
23022 | + * You should have received a copy of the GNU Library General Public | ||
23023 | + * License along with this library; if not, write to the | ||
23024 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23025 | + * Boston, MA 02111-1307, USA. | ||
23026 | + */ | ||
23027 | + | ||
23028 | +#include "qglrenderer.h" | ||
23029 | + | ||
23030 | +QGLRenderer::QGLRenderer(const QString videoLocation, QWidget *parent) | ||
23031 | + : QGLWidget(parent), | ||
23032 | + m_gt(winId(), videoLocation) | ||
23033 | +{ | ||
23034 | + setAttribute(Qt::WA_NoSystemBackground); | ||
23035 | + setVisible(false); | ||
23036 | + move(20, 10); | ||
23037 | + resize(640, 480); | ||
23038 | + | ||
23039 | + QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); | ||
23040 | + QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); | ||
23041 | + QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); | ||
23042 | + QObject::connect(&m_gt, SIGNAL(showRequested()), this, SLOT(show())); | ||
23043 | + m_gt.start(); | ||
23044 | +} | ||
23045 | + | ||
23046 | +QGLRenderer::~QGLRenderer() | ||
23047 | +{ | ||
23048 | +} | ||
23049 | + | ||
23050 | +void QGLRenderer::paintEvent(QPaintEvent* event) | ||
23051 | +{ | ||
23052 | + emit exposeRequested(); | ||
23053 | +} | ||
23054 | + | ||
23055 | +void QGLRenderer::closeEvent(QCloseEvent* event) | ||
23056 | +{ | ||
23057 | + emit closeRequested(); | ||
23058 | + m_gt.wait(); | ||
23059 | +} | ||
23060 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h | ||
23061 | new file mode 100644 | ||
23062 | index 0000000..855631e | ||
23063 | --- /dev/null | ||
23064 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h | ||
23065 | @@ -0,0 +1,45 @@ | ||
23066 | +/* | ||
23067 | + * GStreamer | ||
23068 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
23069 | + * | ||
23070 | + * This library is free software; you can redistribute it and/or | ||
23071 | + * modify it under the terms of the GNU Library General Public | ||
23072 | + * License as published by the Free Software Foundation; either | ||
23073 | + * version 2 of the License, or (at your option) any later version. | ||
23074 | + * | ||
23075 | + * This library is distributed in the hope that it will be useful, | ||
23076 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23077 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23078 | + * Library General Public License for more details. | ||
23079 | + * | ||
23080 | + * You should have received a copy of the GNU Library General Public | ||
23081 | + * License along with this library; if not, write to the | ||
23082 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23083 | + * Boston, MA 02111-1307, USA. | ||
23084 | + */ | ||
23085 | + | ||
23086 | +#ifndef QGLRENDERER_H | ||
23087 | +#define QGLRENDERER_H | ||
23088 | + | ||
23089 | +#include <QGLWidget> | ||
23090 | +#include "gstthread.h" | ||
23091 | + | ||
23092 | +class QGLRenderer : public QGLWidget | ||
23093 | +{ | ||
23094 | + Q_OBJECT | ||
23095 | + | ||
23096 | +public: | ||
23097 | + QGLRenderer(const QString videoLocation, QWidget *parent = 0); | ||
23098 | + ~QGLRenderer(); | ||
23099 | + void paintEvent(QPaintEvent* event); | ||
23100 | + void closeEvent (QCloseEvent* event); | ||
23101 | + | ||
23102 | +signals: | ||
23103 | + void exposeRequested(); | ||
23104 | + void closeRequested(); | ||
23105 | + | ||
23106 | +private: | ||
23107 | + GstThread m_gt; | ||
23108 | +}; | ||
23109 | + | ||
23110 | +#endif // QGLRENDERER_H | ||
23111 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri | ||
23112 | new file mode 100644 | ||
23113 | index 0000000..772d1d4 | ||
23114 | --- /dev/null | ||
23115 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri | ||
23116 | @@ -0,0 +1,10 @@ | ||
23117 | +#Header files | ||
23118 | +HEADERS += ./gstthread.h \ | ||
23119 | + ./pipeline.h \ | ||
23120 | + ./qglrenderer.h | ||
23121 | + | ||
23122 | +#Source files | ||
23123 | +SOURCES += ./gstthread.cpp \ | ||
23124 | + ./main.cpp \ | ||
23125 | + ./pipeline.cpp \ | ||
23126 | + ./qglrenderer.cpp | ||
23127 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro | ||
23128 | new file mode 100644 | ||
23129 | index 0000000..b272af3 | ||
23130 | --- /dev/null | ||
23131 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro | ||
23132 | @@ -0,0 +1,57 @@ | ||
23133 | +TEMPLATE = app | ||
23134 | +TARGET = qglwidgetxoverlay | ||
23135 | +DESTDIR = ./debug | ||
23136 | +QT += opengl | ||
23137 | +CONFIG += debug | ||
23138 | +DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB | ||
23139 | + | ||
23140 | +win32 { | ||
23141 | +DEFINES += WIN32 | ||
23142 | +INCLUDEPATH += ./GeneratedFiles \ | ||
23143 | + ./GeneratedFiles/Debug \ | ||
23144 | + C:/gstreamer/include \ | ||
23145 | + C:/gstreamer/include/libxml2 \ | ||
23146 | + C:/gstreamer/include/glib-2.0 \ | ||
23147 | + C:/gstreamer/lib/glib-2.0/include \ | ||
23148 | + C:/gstreamer/include/gstreamer-0.10 | ||
23149 | +LIBS += -L"C:/gstreamer/lib" \ | ||
23150 | + -L"C:/gstreamer/bin" \ | ||
23151 | + -lgstreamer-0.10 \ | ||
23152 | + -lglib-2.0 \ | ||
23153 | + -lgmodule-2.0 \ | ||
23154 | + -lgobject-2.0 \ | ||
23155 | + -lgthread-2.0 \ | ||
23156 | + -llibgstinterfaces-0.10 \ | ||
23157 | + -lopengl32 \ | ||
23158 | + -lglu32 \ | ||
23159 | + -lglew32 | ||
23160 | +} | ||
23161 | + | ||
23162 | +unix { | ||
23163 | +DEFINES += UNIX | ||
23164 | +INCLUDEPATH += GeneratedFiles \ | ||
23165 | + GeneratedFiles/Debug \ | ||
23166 | + /usr/include/gstreamer-0.10 \ | ||
23167 | + /usr/local/include/gstreamer-0.10 \ | ||
23168 | + /usr/include/glib-2.0 \ | ||
23169 | + /usr/lib/glib-2.0/include \ | ||
23170 | + /usr/include/libxml2 | ||
23171 | +LIBS += -lgstreamer-0.10 \ | ||
23172 | + -lgstinterfaces-0.10 \ | ||
23173 | + -lglib-2.0 \ | ||
23174 | + -lgmodule-2.0 \ | ||
23175 | + -lgobject-2.0 \ | ||
23176 | + -lgthread-2.0 \ | ||
23177 | + -lGLU \ | ||
23178 | + -lGL \ | ||
23179 | + -lGLEW | ||
23180 | +} | ||
23181 | + | ||
23182 | +DEPENDPATH += . | ||
23183 | +MOC_DIR += ./GeneratedFiles/debug | ||
23184 | +OBJECTS_DIR += debug | ||
23185 | +UI_DIR += ./GeneratedFiles | ||
23186 | +RCC_DIR += ./GeneratedFiles | ||
23187 | + | ||
23188 | +#Include file(s) | ||
23189 | +include(qglwidgetxoverlay.pri) | ||
23190 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln | ||
23191 | new file mode 100644 | ||
23192 | index 0000000..fe575f5 | ||
23193 | --- /dev/null | ||
23194 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln | ||
23195 | @@ -0,0 +1,26 @@ | ||
23196 | +? | ||
23197 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
23198 | +# Visual Studio 2008 | ||
23199 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qglwidgetxoverlay", "qglwidgetxoverlay.vcproj", "{F40D2D98-281E-465F-B63F-2D473E1C2616}" | ||
23200 | +EndProject | ||
23201 | +Global | ||
23202 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
23203 | + Debug|Win32 = Debug|Win32 | ||
23204 | + Release|Win32 = Release|Win32 | ||
23205 | + EndGlobalSection | ||
23206 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
23207 | + {F40D2D98-281E-465F-B63F-2D473E1C2616}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
23208 | + {F40D2D98-281E-465F-B63F-2D473E1C2616}.Debug|Win32.Build.0 = Debug|Win32 | ||
23209 | + {F40D2D98-281E-465F-B63F-2D473E1C2616}.Release|Win32.ActiveCfg = Release|Win32 | ||
23210 | + {F40D2D98-281E-465F-B63F-2D473E1C2616}.Release|Win32.Build.0 = Release|Win32 | ||
23211 | + EndGlobalSection | ||
23212 | + GlobalSection(SolutionProperties) = preSolution | ||
23213 | + HideSolutionNode = FALSE | ||
23214 | + EndGlobalSection | ||
23215 | + GlobalSection(Qt) = preSolution | ||
23216 | + Integration = True | ||
23217 | + EndGlobalSection | ||
23218 | + GlobalSection(Qt) = preSolution | ||
23219 | + Integration = True | ||
23220 | + EndGlobalSection | ||
23221 | +EndGlobal | ||
23222 | diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj | ||
23223 | new file mode 100644 | ||
23224 | index 0000000..127f293 | ||
23225 | --- /dev/null | ||
23226 | +++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj | ||
23227 | @@ -0,0 +1,320 @@ | ||
23228 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
23229 | +<VisualStudioProject | ||
23230 | + ProjectType="Visual C++" | ||
23231 | + Version="9,00" | ||
23232 | + Name="qglwidgetxoverlay" | ||
23233 | + ProjectGUID="{F40D2D98-281E-465F-B63F-2D473E1C2616}" | ||
23234 | + Keyword="Qt4VSv1.0" | ||
23235 | + TargetFrameworkVersion="131072" | ||
23236 | + > | ||
23237 | + <Platforms> | ||
23238 | + <Platform | ||
23239 | + Name="Win32" | ||
23240 | + /> | ||
23241 | + </Platforms> | ||
23242 | + <ToolFiles> | ||
23243 | + </ToolFiles> | ||
23244 | + <Configurations> | ||
23245 | + <Configuration | ||
23246 | + Name="Release|Win32" | ||
23247 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
23248 | + IntermediateDirectory="$(ConfigurationName)" | ||
23249 | + ConfigurationType="1" | ||
23250 | + > | ||
23251 | + <Tool | ||
23252 | + Name="VCPreBuildEventTool" | ||
23253 | + /> | ||
23254 | + <Tool | ||
23255 | + Name="VCCustomBuildTool" | ||
23256 | + /> | ||
23257 | + <Tool | ||
23258 | + Name="VCXMLDataGeneratorTool" | ||
23259 | + /> | ||
23260 | + <Tool | ||
23261 | + Name="VCWebServiceProxyGeneratorTool" | ||
23262 | + /> | ||
23263 | + <Tool | ||
23264 | + Name="VCMIDLTool" | ||
23265 | + /> | ||
23266 | + <Tool | ||
23267 | + Name="VCCLCompilerTool" | ||
23268 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtOpenGL";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
23269 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_NO_DEBUG,NDEBUG,QT_CORE_LIB,QT_GUI_LIB,QT_OPENGL_LIB" | ||
23270 | + RuntimeLibrary="2" | ||
23271 | + TreatWChar_tAsBuiltInType="false" | ||
23272 | + DebugInformationFormat="0" | ||
23273 | + /> | ||
23274 | + <Tool | ||
23275 | + Name="VCManagedResourceCompilerTool" | ||
23276 | + /> | ||
23277 | + <Tool | ||
23278 | + Name="VCResourceCompilerTool" | ||
23279 | + /> | ||
23280 | + <Tool | ||
23281 | + Name="VCPreLinkEventTool" | ||
23282 | + /> | ||
23283 | + <Tool | ||
23284 | + Name="VCLinkerTool" | ||
23285 | + AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gstinterfaces-0.10.lib glew32.lib" | ||
23286 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
23287 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
23288 | + GenerateDebugInformation="false" | ||
23289 | + SubSystem="2" | ||
23290 | + RandomizedBaseAddress="1" | ||
23291 | + DataExecutionPrevention="0" | ||
23292 | + /> | ||
23293 | + <Tool | ||
23294 | + Name="VCALinkTool" | ||
23295 | + /> | ||
23296 | + <Tool | ||
23297 | + Name="VCManifestTool" | ||
23298 | + /> | ||
23299 | + <Tool | ||
23300 | + Name="VCXDCMakeTool" | ||
23301 | + /> | ||
23302 | + <Tool | ||
23303 | + Name="VCBscMakeTool" | ||
23304 | + /> | ||
23305 | + <Tool | ||
23306 | + Name="VCFxCopTool" | ||
23307 | + /> | ||
23308 | + <Tool | ||
23309 | + Name="VCAppVerifierTool" | ||
23310 | + /> | ||
23311 | + <Tool | ||
23312 | + Name="VCPostBuildEventTool" | ||
23313 | + /> | ||
23314 | + </Configuration> | ||
23315 | + <Configuration | ||
23316 | + Name="Debug|Win32" | ||
23317 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
23318 | + IntermediateDirectory="$(ConfigurationName)" | ||
23319 | + ConfigurationType="1" | ||
23320 | + > | ||
23321 | + <Tool | ||
23322 | + Name="VCPreBuildEventTool" | ||
23323 | + /> | ||
23324 | + <Tool | ||
23325 | + Name="VCCustomBuildTool" | ||
23326 | + /> | ||
23327 | + <Tool | ||
23328 | + Name="VCXMLDataGeneratorTool" | ||
23329 | + /> | ||
23330 | + <Tool | ||
23331 | + Name="VCWebServiceProxyGeneratorTool" | ||
23332 | + /> | ||
23333 | + <Tool | ||
23334 | + Name="VCMIDLTool" | ||
23335 | + /> | ||
23336 | + <Tool | ||
23337 | + Name="VCCLCompilerTool" | ||
23338 | + Optimization="0" | ||
23339 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtOpenGL";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
23340 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_CORE_LIB,QT_GUI_LIB,QT_OPENGL_LIB" | ||
23341 | + RuntimeLibrary="3" | ||
23342 | + TreatWChar_tAsBuiltInType="false" | ||
23343 | + DebugInformationFormat="3" | ||
23344 | + /> | ||
23345 | + <Tool | ||
23346 | + Name="VCManagedResourceCompilerTool" | ||
23347 | + /> | ||
23348 | + <Tool | ||
23349 | + Name="VCResourceCompilerTool" | ||
23350 | + /> | ||
23351 | + <Tool | ||
23352 | + Name="VCPreLinkEventTool" | ||
23353 | + /> | ||
23354 | + <Tool | ||
23355 | + Name="VCLinkerTool" | ||
23356 | + AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGLd4.lib opengl32.lib glu32.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib gstinterfaces-0.10.lib glew32.lib" | ||
23357 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
23358 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
23359 | + GenerateDebugInformation="true" | ||
23360 | + SubSystem="2" | ||
23361 | + RandomizedBaseAddress="1" | ||
23362 | + DataExecutionPrevention="0" | ||
23363 | + /> | ||
23364 | + <Tool | ||
23365 | + Name="VCALinkTool" | ||
23366 | + /> | ||
23367 | + <Tool | ||
23368 | + Name="VCManifestTool" | ||
23369 | + /> | ||
23370 | + <Tool | ||
23371 | + Name="VCXDCMakeTool" | ||
23372 | + /> | ||
23373 | + <Tool | ||
23374 | + Name="VCBscMakeTool" | ||
23375 | + /> | ||
23376 | + <Tool | ||
23377 | + Name="VCFxCopTool" | ||
23378 | + /> | ||
23379 | + <Tool | ||
23380 | + Name="VCAppVerifierTool" | ||
23381 | + /> | ||
23382 | + <Tool | ||
23383 | + Name="VCPostBuildEventTool" | ||
23384 | + /> | ||
23385 | + </Configuration> | ||
23386 | + </Configurations> | ||
23387 | + <References> | ||
23388 | + </References> | ||
23389 | + <Files> | ||
23390 | + <Filter | ||
23391 | + Name="Source Files" | ||
23392 | + Filter="cpp;cxx;c;def" | ||
23393 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
23394 | + > | ||
23395 | + <File | ||
23396 | + RelativePath=".\gstthread.cpp" | ||
23397 | + > | ||
23398 | + </File> | ||
23399 | + <File | ||
23400 | + RelativePath=".\main.cpp" | ||
23401 | + > | ||
23402 | + </File> | ||
23403 | + <File | ||
23404 | + RelativePath=".\pipeline.cpp" | ||
23405 | + > | ||
23406 | + </File> | ||
23407 | + <File | ||
23408 | + RelativePath=".\qglrenderer.cpp" | ||
23409 | + > | ||
23410 | + </File> | ||
23411 | + </Filter> | ||
23412 | + <Filter | ||
23413 | + Name="Header Files" | ||
23414 | + Filter="h" | ||
23415 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
23416 | + > | ||
23417 | + <File | ||
23418 | + RelativePath=".\gstthread.h" | ||
23419 | + > | ||
23420 | + <FileConfiguration | ||
23421 | + Name="Release|Win32" | ||
23422 | + > | ||
23423 | + <Tool | ||
23424 | + Name="VCCustomBuildTool" | ||
23425 | + Description="Moc'ing gstthread.h..." | ||
23426 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
23427 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
23428 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
23429 | + /> | ||
23430 | + </FileConfiguration> | ||
23431 | + <FileConfiguration | ||
23432 | + Name="Debug|Win32" | ||
23433 | + > | ||
23434 | + <Tool | ||
23435 | + Name="VCCustomBuildTool" | ||
23436 | + Description="Moc'ing gstthread.h..." | ||
23437 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
23438 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
23439 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
23440 | + /> | ||
23441 | + </FileConfiguration> | ||
23442 | + </File> | ||
23443 | + <File | ||
23444 | + RelativePath=".\pipeline.h" | ||
23445 | + > | ||
23446 | + <FileConfiguration | ||
23447 | + Name="Release|Win32" | ||
23448 | + > | ||
23449 | + <Tool | ||
23450 | + Name="VCCustomBuildTool" | ||
23451 | + Description="Moc'ing pipeline.h..." | ||
23452 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
23453 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
23454 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
23455 | + /> | ||
23456 | + </FileConfiguration> | ||
23457 | + <FileConfiguration | ||
23458 | + Name="Debug|Win32" | ||
23459 | + > | ||
23460 | + <Tool | ||
23461 | + Name="VCCustomBuildTool" | ||
23462 | + Description="Moc'ing pipeline.h..." | ||
23463 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
23464 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
23465 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
23466 | + /> | ||
23467 | + </FileConfiguration> | ||
23468 | + </File> | ||
23469 | + <File | ||
23470 | + RelativePath=".\qglrenderer.h" | ||
23471 | + > | ||
23472 | + <FileConfiguration | ||
23473 | + Name="Release|Win32" | ||
23474 | + > | ||
23475 | + <Tool | ||
23476 | + Name="VCCustomBuildTool" | ||
23477 | + Description="Moc'ing qglrenderer.h..." | ||
23478 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qglrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qglrenderer.cpp"
" | ||
23479 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qglrenderer.h" | ||
23480 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qglrenderer.cpp"" | ||
23481 | + /> | ||
23482 | + </FileConfiguration> | ||
23483 | + <FileConfiguration | ||
23484 | + Name="Debug|Win32" | ||
23485 | + > | ||
23486 | + <Tool | ||
23487 | + Name="VCCustomBuildTool" | ||
23488 | + Description="Moc'ing qglrenderer.h..." | ||
23489 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"$(QTDIR)\include\QtOpenGL\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qglrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qglrenderer.cpp"
" | ||
23490 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qglrenderer.h" | ||
23491 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qglrenderer.cpp"" | ||
23492 | + /> | ||
23493 | + </FileConfiguration> | ||
23494 | + </File> | ||
23495 | + </Filter> | ||
23496 | + <Filter | ||
23497 | + Name="Form Files" | ||
23498 | + Filter="ui" | ||
23499 | + UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}" | ||
23500 | + > | ||
23501 | + </Filter> | ||
23502 | + <Filter | ||
23503 | + Name="Resource Files" | ||
23504 | + Filter="qrc;*" | ||
23505 | + UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}" | ||
23506 | + ParseFiles="false" | ||
23507 | + > | ||
23508 | + </Filter> | ||
23509 | + <Filter | ||
23510 | + Name="Generated Files" | ||
23511 | + Filter="moc;h;cpp" | ||
23512 | + UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" | ||
23513 | + SourceControlFiles="false" | ||
23514 | + > | ||
23515 | + <File | ||
23516 | + RelativePath=".\generatedfiles\debug\moc_gstthread.cpp" | ||
23517 | + > | ||
23518 | + </File> | ||
23519 | + <File | ||
23520 | + RelativePath=".\generatedfiles\debug\moc_pipeline.cpp" | ||
23521 | + > | ||
23522 | + </File> | ||
23523 | + <File | ||
23524 | + RelativePath=".\generatedfiles\debug\moc_qglrenderer.cpp" | ||
23525 | + > | ||
23526 | + </File> | ||
23527 | + </Filter> | ||
23528 | + </Files> | ||
23529 | + <Globals> | ||
23530 | + <Global | ||
23531 | + Name="MocDir" | ||
23532 | + Value=".\GeneratedFiles\$(ConfigurationName)" | ||
23533 | + /> | ||
23534 | + <Global | ||
23535 | + Name="QtVersion" | ||
23536 | + Value="qt-4.3.0" | ||
23537 | + /> | ||
23538 | + <Global | ||
23539 | + Name="RccDir" | ||
23540 | + Value=".\GeneratedFiles" | ||
23541 | + /> | ||
23542 | + <Global | ||
23543 | + Name="UicDir" | ||
23544 | + Value=".\GeneratedFiles" | ||
23545 | + /> | ||
23546 | + </Globals> | ||
23547 | +</VisualStudioProject> | ||
23548 | diff --git a/tests/examples/qt/qglwtextureshare/AsyncQueue.h b/tests/examples/qt/qglwtextureshare/AsyncQueue.h | ||
23549 | new file mode 100644 | ||
23550 | index 0000000..7c6e1af | ||
23551 | --- /dev/null | ||
23552 | +++ b/tests/examples/qt/qglwtextureshare/AsyncQueue.h | ||
23553 | @@ -0,0 +1,77 @@ | ||
23554 | +/* | ||
23555 | + * GStreamer | ||
23556 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23557 | + * | ||
23558 | + * This library is free software; you can redistribute it and/or | ||
23559 | + * modify it under the terms of the GNU Library General Public | ||
23560 | + * License as published by the Free Software Foundation; either | ||
23561 | + * version 2 of the License, or (at your option) any later version. | ||
23562 | + * | ||
23563 | + * This library is distributed in the hope that it will be useful, | ||
23564 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23565 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23566 | + * Library General Public License for more details. | ||
23567 | + * | ||
23568 | + * You should have received a copy of the GNU Library General Public | ||
23569 | + * License along with this library; if not, write to the | ||
23570 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23571 | + * Boston, MA 02111-1307, USA. | ||
23572 | + */ | ||
23573 | + | ||
23574 | +#ifndef __ASYNCQUEUE_H | ||
23575 | +#define __ASYNCQUEUE_H | ||
23576 | + | ||
23577 | +#include <QMutex> | ||
23578 | +#include <QWaitCondition> | ||
23579 | +#include <QList> | ||
23580 | + | ||
23581 | +/** | ||
23582 | + * This is the thread safe implementation of the Queue. It can be | ||
23583 | + * used in classical producers/consumers multithreaded scenario. The | ||
23584 | + * template parameter is the class which can be put/get to/from the | ||
23585 | + * queue. | ||
23586 | + */ | ||
23587 | +template<class T> | ||
23588 | +class AsyncQueue | ||
23589 | +{ | ||
23590 | +public: | ||
23591 | + AsyncQueue() : waitingReaders(0) {} | ||
23592 | + | ||
23593 | + int size() | ||
23594 | + { | ||
23595 | + QMutexLocker locker(&mutex); | ||
23596 | + return this->buffer.size(); | ||
23597 | + } | ||
23598 | + | ||
23599 | + void put(const T& item) | ||
23600 | + { | ||
23601 | + QMutexLocker locker(&mutex); | ||
23602 | + this->buffer.push_back(item); | ||
23603 | + if(this->waitingReaders) | ||
23604 | + this->bufferIsNotEmpty.wakeOne(); | ||
23605 | + } | ||
23606 | + | ||
23607 | + T get() | ||
23608 | + { | ||
23609 | + QMutexLocker locker(&mutex); | ||
23610 | + while(this->buffer.size() == 0) | ||
23611 | + { | ||
23612 | + ++(this->waitingReaders); | ||
23613 | + this->bufferIsNotEmpty.wait(&mutex); | ||
23614 | + --(this->waitingReaders); | ||
23615 | + } | ||
23616 | + T item = this->buffer.front(); | ||
23617 | + this->buffer.pop_front(); | ||
23618 | + return item; | ||
23619 | + } | ||
23620 | + | ||
23621 | +private: | ||
23622 | + typedef QList<T> Container; | ||
23623 | + QMutex mutex; | ||
23624 | + QWaitCondition bufferIsNotEmpty; | ||
23625 | + Container buffer; | ||
23626 | + short waitingReaders; | ||
23627 | +}; | ||
23628 | + | ||
23629 | + | ||
23630 | +#endif // __ASYNCQUEUE_H | ||
23631 | diff --git a/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h b/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h | ||
23632 | new file mode 100644 | ||
23633 | index 0000000..0d270cf | ||
23634 | --- /dev/null | ||
23635 | +++ b/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h | ||
23636 | @@ -0,0 +1,40 @@ | ||
23637 | +/* | ||
23638 | + * GStreamer | ||
23639 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23640 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23641 | + * | ||
23642 | + * This library is free software; you can redistribute it and/or | ||
23643 | + * modify it under the terms of the GNU Library General Public | ||
23644 | + * License as published by the Free Software Foundation; either | ||
23645 | + * version 2 of the License, or (at your option) any later version. | ||
23646 | + * | ||
23647 | + * This library is distributed in the hope that it will be useful, | ||
23648 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23649 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23650 | + * Library General Public License for more details. | ||
23651 | + * | ||
23652 | + * You should have received a copy of the GNU Library General Public | ||
23653 | + * License along with this library; if not, write to the | ||
23654 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23655 | + * Boston, MA 02111-1307, USA. | ||
23656 | + */ | ||
23657 | + | ||
23658 | +#ifndef __GSTGLBUFFERDEF_H | ||
23659 | +#define __GSTGLBUFFERDEF_H | ||
23660 | + | ||
23661 | +#include <gst/gst.h> | ||
23662 | + | ||
23663 | +/* hack */ | ||
23664 | +typedef struct _GstGLBuffer GstGLBuffer; | ||
23665 | +struct _GstGLBuffer | ||
23666 | +{ | ||
23667 | + GstBuffer buffer; | ||
23668 | + | ||
23669 | + GObject *obj; | ||
23670 | + | ||
23671 | + gint width; | ||
23672 | + gint height; | ||
23673 | + GLuint texture; | ||
23674 | +}; | ||
23675 | + | ||
23676 | +#endif // __GSTGLBUFFERDEF_H | ||
23677 | diff --git a/tests/examples/qt/qglwtextureshare/README b/tests/examples/qt/qglwtextureshare/README | ||
23678 | new file mode 100644 | ||
23679 | index 0000000..b9cc88d | ||
23680 | --- /dev/null | ||
23681 | +++ b/tests/examples/qt/qglwtextureshare/README | ||
23682 | @@ -0,0 +1,29 @@ | ||
23683 | +This example illustrates how to integrate Gstreamer GL plugin with | ||
23684 | +Qt. In particular it uses glupload with fakesink elements to create | ||
23685 | +texture with decoded video frame. This texture is shared with | ||
23686 | +QGLWidget derived class, which paints a cube with video texture on | ||
23687 | +each face. | ||
23688 | + | ||
23689 | +To compile the example, include and library paths might be adjusted in | ||
23690 | +.pro file according to your installation of the gstreamer and | ||
23691 | +corresponding development files. Most probably, the adjustments will | ||
23692 | +be necessary on Windows. | ||
23693 | + | ||
23694 | +To run the example simply start executable file after compilation. If | ||
23695 | +there is no command line arguments provided, then videotestsrc element | ||
23696 | +will be used to generate video. The following pipeline will be created | ||
23697 | +in this case: | ||
23698 | + | ||
23699 | +videotestsrc ! video/x-raw-yuv, width=640, height=480, framerate=(fraction)30/1 ! glupload ! fakesink sync=1 | ||
23700 | + | ||
23701 | +It is also possible to provide the video file name as a first command | ||
23702 | +line parameter, i.e. ./qglwtextureshare myvideo.ogv . In this case, | ||
23703 | +the following pipeline will be executed: | ||
23704 | + | ||
23705 | +filesrc location=myvideo.ogv ! decodebin2 ! glupload ! fakesink sync=1 | ||
23706 | + | ||
23707 | +I would appreciate any feedback and improvement suggestions for this | ||
23708 | +example. | ||
23709 | + | ||
23710 | +Have fun :-) | ||
23711 | +Andrey Nechypurenko (andreynech@gmail.com) | ||
23712 | diff --git a/tests/examples/qt/qglwtextureshare/cocoa_utils.mm b/tests/examples/qt/qglwtextureshare/cocoa_utils.mm | ||
23713 | new file mode 100644 | ||
23714 | index 0000000..b046b88 | ||
23715 | --- /dev/null | ||
23716 | +++ b/tests/examples/qt/qglwtextureshare/cocoa_utils.mm | ||
23717 | @@ -0,0 +1,26 @@ | ||
23718 | +/* | ||
23719 | + * GStreamer | ||
23720 | + * Copyright (C) 2010 Julien Isorce <julien.isorce@gmail.com> | ||
23721 | + * Copyright (C) 2010 Nuno Santos <nunosantos@imaginando.net> | ||
23722 | + * | ||
23723 | + * This library is free software; you can redistribute it and/or | ||
23724 | + * modify it under the terms of the GNU Library General Public | ||
23725 | + * License as published by the Free Software Foundation; either | ||
23726 | + * version 2 of the License, or (at your option) any later version. | ||
23727 | + * | ||
23728 | + * This library is distributed in the hope that it will be useful, | ||
23729 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23730 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23731 | + * Library General Public License for more details. | ||
23732 | + * | ||
23733 | + * You should have received a copy of the GNU Library General Public | ||
23734 | + * License along with this library; if not, write to the | ||
23735 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23736 | + * Boston, MA 02111-1307, USA. | ||
23737 | + */ | ||
23738 | + | ||
23739 | +#import <Cocoa/Cocoa.h> | ||
23740 | +void *qt_current_nsopengl_context() | ||
23741 | +{ | ||
23742 | + return [NSOpenGLContext currentContext]; | ||
23743 | +} | ||
23744 | diff --git a/tests/examples/qt/qglwtextureshare/glcontextid.h b/tests/examples/qt/qglwtextureshare/glcontextid.h | ||
23745 | new file mode 100644 | ||
23746 | index 0000000..52550a9 | ||
23747 | --- /dev/null | ||
23748 | +++ b/tests/examples/qt/qglwtextureshare/glcontextid.h | ||
23749 | @@ -0,0 +1,64 @@ | ||
23750 | +/* | ||
23751 | + * GStreamer | ||
23752 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23753 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23754 | + * Copyright (C) 2010 Nuno Santos <nunosantos@imaginando.net> | ||
23755 | + * | ||
23756 | + * This library is free software; you can redistribute it and/or | ||
23757 | + * modify it under the terms of the GNU Library General Public | ||
23758 | + * License as published by the Free Software Foundation; either | ||
23759 | + * version 2 of the License, or (at your option) any later version. | ||
23760 | + * | ||
23761 | + * This library is distributed in the hope that it will be useful, | ||
23762 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23763 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23764 | + * Library General Public License for more details. | ||
23765 | + * | ||
23766 | + * You should have received a copy of the GNU Library General Public | ||
23767 | + * License along with this library; if not, write to the | ||
23768 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23769 | + * Boston, MA 02111-1307, USA. | ||
23770 | + */ | ||
23771 | + | ||
23772 | +#ifndef __GLCONTEXTID_H | ||
23773 | +#define __GLCONTEXTID_H | ||
23774 | + | ||
23775 | +#if defined(Q_OS_WIN32) | ||
23776 | + #define WIN32_LEAN_AND_MEAN | ||
23777 | + #include <windows.h> | ||
23778 | + #include <Wingdi.h> | ||
23779 | + #include <GL/glew.h> | ||
23780 | + #include <GL/gl.h> | ||
23781 | +#elif defined (Q_OS_MAC) | ||
23782 | + #include <OpenGL/OpenGL.h> | ||
23783 | + class NSOpenGLContext; | ||
23784 | +#else | ||
23785 | + #include <X11/Xlib.h> | ||
23786 | + //#include <GL/glxew.h> | ||
23787 | + #include <GL/gl.h> | ||
23788 | + #include <GL/glx.h> | ||
23789 | +#endif | ||
23790 | + | ||
23791 | + | ||
23792 | +#if defined(Q_WS_WIN) | ||
23793 | + typedef struct _tagGLContextID | ||
23794 | + { | ||
23795 | + HGLRC contextId; | ||
23796 | + HDC dc; | ||
23797 | + } GLContextID; | ||
23798 | +#elif defined(Q_WS_MAC) | ||
23799 | + typedef struct _tagGLContextID | ||
23800 | + { | ||
23801 | + NSOpenGLContext* contextId; | ||
23802 | + } GLContextID; | ||
23803 | +#elif defined(Q_WS_X11) | ||
23804 | + typedef struct _tagGLContextID | ||
23805 | + { | ||
23806 | + GLXContext contextId; | ||
23807 | + Display *display; | ||
23808 | + Window wnd; | ||
23809 | + } GLContextID; | ||
23810 | +#endif | ||
23811 | + | ||
23812 | +#endif // __GLCONTEXTID_H | ||
23813 | + | ||
23814 | diff --git a/tests/examples/qt/qglwtextureshare/gstthread.cpp b/tests/examples/qt/qglwtextureshare/gstthread.cpp | ||
23815 | new file mode 100644 | ||
23816 | index 0000000..94f35c9 | ||
23817 | --- /dev/null | ||
23818 | +++ b/tests/examples/qt/qglwtextureshare/gstthread.cpp | ||
23819 | @@ -0,0 +1,66 @@ | ||
23820 | +/* | ||
23821 | + * GStreamer | ||
23822 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23823 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23824 | + * | ||
23825 | + * This library is free software; you can redistribute it and/or | ||
23826 | + * modify it under the terms of the GNU Library General Public | ||
23827 | + * License as published by the Free Software Foundation; either | ||
23828 | + * version 2 of the License, or (at your option) any later version. | ||
23829 | + * | ||
23830 | + * This library is distributed in the hope that it will be useful, | ||
23831 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23832 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23833 | + * Library General Public License for more details. | ||
23834 | + * | ||
23835 | + * You should have received a copy of the GNU Library General Public | ||
23836 | + * License along with this library; if not, write to the | ||
23837 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23838 | + * Boston, MA 02111-1307, USA. | ||
23839 | + */ | ||
23840 | + | ||
23841 | +#include "pipeline.h" | ||
23842 | +#include "gstthread.h" | ||
23843 | + | ||
23844 | + | ||
23845 | +GstThread::GstThread(const GLContextID &ctxId, | ||
23846 | + const QString &videoLocation, | ||
23847 | + const char *renderer_slot, | ||
23848 | + QObject *parent): | ||
23849 | + QThread(parent), | ||
23850 | + contextId(ctxId), | ||
23851 | + m_videoLocation(videoLocation) | ||
23852 | +{ | ||
23853 | + m_pipeline = new Pipeline(this->contextId, m_videoLocation, this); | ||
23854 | + QObject::connect(m_pipeline, SIGNAL(newFrameReady()), this->parent(), renderer_slot, Qt::QueuedConnection); | ||
23855 | +} | ||
23856 | + | ||
23857 | +GstThread::~GstThread() | ||
23858 | +{ | ||
23859 | +} | ||
23860 | + | ||
23861 | +void GstThread::stop() | ||
23862 | +{ | ||
23863 | + if(m_pipeline) | ||
23864 | + m_pipeline->stop(); | ||
23865 | +} | ||
23866 | + | ||
23867 | +void GstThread::run() | ||
23868 | +{ | ||
23869 | + qDebug("Starting gst pipeline"); | ||
23870 | + m_pipeline->start(); //it runs the gmainloop on win32 | ||
23871 | + | ||
23872 | +#ifndef Q_WS_WIN | ||
23873 | + //works like the gmainloop on linux (GstEvent are handled) | ||
23874 | + connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); | ||
23875 | + exec(); | ||
23876 | +#endif | ||
23877 | + | ||
23878 | + m_pipeline->unconfigure(); | ||
23879 | + | ||
23880 | + m_pipeline = NULL; | ||
23881 | + // This is not a memory leak. Pipeline will be deleted | ||
23882 | + // when the parent object (this) will be destroyed. | ||
23883 | + // We set m_pipeline to NULL to prevent further attempts | ||
23884 | + // to stop already stopped pipeline | ||
23885 | +} | ||
23886 | diff --git a/tests/examples/qt/qglwtextureshare/gstthread.h b/tests/examples/qt/qglwtextureshare/gstthread.h | ||
23887 | new file mode 100644 | ||
23888 | index 0000000..76b68d6 | ||
23889 | --- /dev/null | ||
23890 | +++ b/tests/examples/qt/qglwtextureshare/gstthread.h | ||
23891 | @@ -0,0 +1,56 @@ | ||
23892 | +/* | ||
23893 | + * GStreamer | ||
23894 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23895 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23896 | + * | ||
23897 | + * This library is free software; you can redistribute it and/or | ||
23898 | + * modify it under the terms of the GNU Library General Public | ||
23899 | + * License as published by the Free Software Foundation; either | ||
23900 | + * version 2 of the License, or (at your option) any later version. | ||
23901 | + * | ||
23902 | + * This library is distributed in the hope that it will be useful, | ||
23903 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23904 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23905 | + * Library General Public License for more details. | ||
23906 | + * | ||
23907 | + * You should have received a copy of the GNU Library General Public | ||
23908 | + * License along with this library; if not, write to the | ||
23909 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23910 | + * Boston, MA 02111-1307, USA. | ||
23911 | + */ | ||
23912 | + | ||
23913 | +#ifndef GSTTHREAD_H | ||
23914 | +#define GSTTHREAD_H | ||
23915 | + | ||
23916 | +#include <QtCore/QThread> | ||
23917 | +#include "glcontextid.h" | ||
23918 | + | ||
23919 | +class Pipeline; | ||
23920 | + | ||
23921 | +class GstThread : public QThread | ||
23922 | +{ | ||
23923 | + Q_OBJECT | ||
23924 | + | ||
23925 | +public: | ||
23926 | + GstThread(const GLContextID &ctxId, | ||
23927 | + const QString &videoLocation, | ||
23928 | + const char *renderer_slot, | ||
23929 | + QObject *parent = 0); | ||
23930 | + | ||
23931 | + ~GstThread(); | ||
23932 | + | ||
23933 | + Pipeline *getPipeline() {return this->m_pipeline;} | ||
23934 | + | ||
23935 | +public Q_SLOTS: | ||
23936 | + void stop(); | ||
23937 | + | ||
23938 | +protected: | ||
23939 | + void run(); | ||
23940 | + | ||
23941 | +private: | ||
23942 | + const GLContextID contextId; | ||
23943 | + const QString m_videoLocation; | ||
23944 | + Pipeline* m_pipeline; | ||
23945 | +}; | ||
23946 | + | ||
23947 | +#endif | ||
23948 | diff --git a/tests/examples/qt/qglwtextureshare/main.cpp b/tests/examples/qt/qglwtextureshare/main.cpp | ||
23949 | new file mode 100644 | ||
23950 | index 0000000..d3128ff | ||
23951 | --- /dev/null | ||
23952 | +++ b/tests/examples/qt/qglwtextureshare/main.cpp | ||
23953 | @@ -0,0 +1,36 @@ | ||
23954 | +/* | ||
23955 | + * GStreamer | ||
23956 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23957 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
23958 | + * | ||
23959 | + * This library is free software; you can redistribute it and/or | ||
23960 | + * modify it under the terms of the GNU Library General Public | ||
23961 | + * License as published by the Free Software Foundation; either | ||
23962 | + * version 2 of the License, or (at your option) any later version. | ||
23963 | + * | ||
23964 | + * This library is distributed in the hope that it will be useful, | ||
23965 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23966 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
23967 | + * Library General Public License for more details. | ||
23968 | + * | ||
23969 | + * You should have received a copy of the GNU Library General Public | ||
23970 | + * License along with this library; if not, write to the | ||
23971 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
23972 | + * Boston, MA 02111-1307, USA. | ||
23973 | + */ | ||
23974 | + | ||
23975 | +#include <QtGui/QApplication> | ||
23976 | +#include "qglrenderer.h" | ||
23977 | + | ||
23978 | + | ||
23979 | +int | ||
23980 | +main(int argc, char *argv[]) | ||
23981 | +{ | ||
23982 | + QApplication a(argc, argv); | ||
23983 | + a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | ||
23984 | + QGLRenderer w(argc > 1 ? argv[1] : ""); | ||
23985 | + w.setWindowTitle("Texture sharing example"); | ||
23986 | + w.show(); | ||
23987 | + return a.exec(); | ||
23988 | +} | ||
23989 | + | ||
23990 | diff --git a/tests/examples/qt/qglwtextureshare/pipeline.cpp b/tests/examples/qt/qglwtextureshare/pipeline.cpp | ||
23991 | new file mode 100644 | ||
23992 | index 0000000..ac9a560 | ||
23993 | --- /dev/null | ||
23994 | +++ b/tests/examples/qt/qglwtextureshare/pipeline.cpp | ||
23995 | @@ -0,0 +1,222 @@ | ||
23996 | +/* | ||
23997 | + * GStreamer | ||
23998 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
23999 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
24000 | + * | ||
24001 | + * This library is free software; you can redistribute it and/or | ||
24002 | + * modify it under the terms of the GNU Library General Public | ||
24003 | + * License as published by the Free Software Foundation; either | ||
24004 | + * version 2 of the License, or (at your option) any later version. | ||
24005 | + * | ||
24006 | + * This library is distributed in the hope that it will be useful, | ||
24007 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24008 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24009 | + * Library General Public License for more details. | ||
24010 | + * | ||
24011 | + * You should have received a copy of the GNU Library General Public | ||
24012 | + * License along with this library; if not, write to the | ||
24013 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24014 | + * Boston, MA 02111-1307, USA. | ||
24015 | + */ | ||
24016 | + | ||
24017 | +#include "pipeline.h" | ||
24018 | + | ||
24019 | + | ||
24020 | +Pipeline::Pipeline(const GLContextID &ctx, | ||
24021 | + const QString &videoLocation, | ||
24022 | + QObject *parent) | ||
24023 | + : QObject(parent), | ||
24024 | + glctx(ctx), | ||
24025 | + m_videoLocation(videoLocation), | ||
24026 | + m_loop(NULL), | ||
24027 | + m_bus(NULL), | ||
24028 | + m_pipeline(NULL) | ||
24029 | +{ | ||
24030 | + this->configure(); | ||
24031 | +} | ||
24032 | + | ||
24033 | +Pipeline::~Pipeline() | ||
24034 | +{ | ||
24035 | +} | ||
24036 | + | ||
24037 | +void | ||
24038 | +Pipeline::configure() | ||
24039 | +{ | ||
24040 | + gst_init (NULL, NULL); | ||
24041 | + | ||
24042 | +#ifdef Q_WS_WIN | ||
24043 | + m_loop = g_main_loop_new (NULL, FALSE); | ||
24044 | +#endif | ||
24045 | + | ||
24046 | + if(m_videoLocation.isEmpty()) | ||
24047 | + { | ||
24048 | + qDebug("No video file specified. Using video test source."); | ||
24049 | + m_pipeline = | ||
24050 | + GST_PIPELINE (gst_parse_launch | ||
24051 | + ("videotestsrc ! " | ||
24052 | + "video/x-raw-yuv, width=640, height=480, " | ||
24053 | + "framerate=(fraction)30/1 ! " | ||
24054 | + "glupload ! gleffects effect=5 ! fakesink sync=1", | ||
24055 | + NULL)); | ||
24056 | + } | ||
24057 | + else | ||
24058 | + { | ||
24059 | + qDebug("Loading video: %s", m_videoLocation.toAscii().data()); | ||
24060 | + m_pipeline = | ||
24061 | + GST_PIPELINE (gst_parse_launch | ||
24062 | + (QString("filesrc location=%1 ! decodebin2 ! " | ||
24063 | + "glupload ! gleffects effect=5 ! " | ||
24064 | + "fakesink sync=1").arg(m_videoLocation).toAscii(), | ||
24065 | + NULL)); | ||
24066 | + } | ||
24067 | + | ||
24068 | + m_bus = gst_pipeline_get_bus(GST_PIPELINE(m_pipeline)); | ||
24069 | + gst_bus_add_watch(m_bus, (GstBusFunc) bus_call, this); | ||
24070 | + gst_object_unref(m_bus); | ||
24071 | + | ||
24072 | + /* Retrieve the last gl element */ | ||
24073 | + GstElement *gl_element = gst_bin_get_by_name(GST_BIN(m_pipeline), "gleffects0"); | ||
24074 | + if(!gl_element) | ||
24075 | + { | ||
24076 | + qDebug ("gl element could not be found"); | ||
24077 | + return; | ||
24078 | + } | ||
24079 | + g_object_set(G_OBJECT (gl_element), "external-opengl-context", | ||
24080 | + this->glctx.contextId, NULL); | ||
24081 | + g_object_unref(gl_element); | ||
24082 | + | ||
24083 | + gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_PAUSED); | ||
24084 | + GstState state = GST_STATE_PAUSED; | ||
24085 | + if(gst_element_get_state(GST_ELEMENT(this->m_pipeline), | ||
24086 | + &state, NULL, GST_CLOCK_TIME_NONE) | ||
24087 | + != GST_STATE_CHANGE_SUCCESS) | ||
24088 | + { | ||
24089 | + qDebug("failed to pause pipeline"); | ||
24090 | + return; | ||
24091 | + } | ||
24092 | +} | ||
24093 | + | ||
24094 | +void | ||
24095 | +Pipeline::start() | ||
24096 | +{ | ||
24097 | + // set a callback to retrieve the gst gl textures | ||
24098 | + GstElement *fakesink = gst_bin_get_by_name(GST_BIN(this->m_pipeline), | ||
24099 | + "fakesink0"); | ||
24100 | + g_object_set(G_OBJECT (fakesink), "signal-handoffs", TRUE, NULL); | ||
24101 | + g_signal_connect(fakesink, "handoff", G_CALLBACK (on_gst_buffer), this); | ||
24102 | + g_object_unref(fakesink); | ||
24103 | + | ||
24104 | + GstStateChangeReturn ret = | ||
24105 | + gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_PLAYING); | ||
24106 | + if (ret == GST_STATE_CHANGE_FAILURE) | ||
24107 | + { | ||
24108 | + qDebug("Failed to start up pipeline!"); | ||
24109 | + | ||
24110 | + /* check if there is an error message with details on the bus */ | ||
24111 | + GstMessage* msg = gst_bus_poll(this->m_bus, GST_MESSAGE_ERROR, 0); | ||
24112 | + if (msg) | ||
24113 | + { | ||
24114 | + GError *err = NULL; | ||
24115 | + gst_message_parse_error (msg, &err, NULL); | ||
24116 | + qDebug ("ERROR: %s", err->message); | ||
24117 | + g_error_free (err); | ||
24118 | + gst_message_unref (msg); | ||
24119 | + } | ||
24120 | + return; | ||
24121 | + } | ||
24122 | + | ||
24123 | +#ifdef Q_WS_WIN | ||
24124 | + g_main_loop_run(m_loop); | ||
24125 | +#endif | ||
24126 | +} | ||
24127 | + | ||
24128 | +/* fakesink handoff callback */ | ||
24129 | +void | ||
24130 | +Pipeline::on_gst_buffer(GstElement * element, | ||
24131 | + GstBuffer * buf, | ||
24132 | + GstPad * pad, | ||
24133 | + Pipeline* p) | ||
24134 | +{ | ||
24135 | + Q_UNUSED(pad) | ||
24136 | + Q_UNUSED(element) | ||
24137 | + | ||
24138 | + /* ref then push buffer to use it in qt */ | ||
24139 | + gst_buffer_ref(buf); | ||
24140 | + p->queue_input_buf.put((GstGLBuffer*)buf); | ||
24141 | + | ||
24142 | + if (p->queue_input_buf.size() > 3) | ||
24143 | + p->notifyNewFrame(); | ||
24144 | + | ||
24145 | + /* pop then unref buffer we have finished to use in qt */ | ||
24146 | + if (p->queue_output_buf.size() > 3) | ||
24147 | + { | ||
24148 | + GstBuffer *buf_old = (GstBuffer*)(p->queue_output_buf.get()); | ||
24149 | + if (buf_old) | ||
24150 | + gst_buffer_unref(buf_old); | ||
24151 | + } | ||
24152 | +} | ||
24153 | + | ||
24154 | +void | ||
24155 | +Pipeline::stop() | ||
24156 | +{ | ||
24157 | +#ifdef Q_WS_WIN | ||
24158 | + g_main_loop_quit(m_loop); | ||
24159 | +#else | ||
24160 | + emit stopRequested(); | ||
24161 | +#endif | ||
24162 | +} | ||
24163 | + | ||
24164 | +void | ||
24165 | +Pipeline::unconfigure() | ||
24166 | +{ | ||
24167 | + gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_NULL); | ||
24168 | + | ||
24169 | + GstBuffer *buf; | ||
24170 | + while(this->queue_input_buf.size()) | ||
24171 | + { | ||
24172 | + buf = (GstBuffer*)(this->queue_input_buf.get()); | ||
24173 | + gst_buffer_unref(buf); | ||
24174 | + } | ||
24175 | + while(this->queue_output_buf.size()) | ||
24176 | + { | ||
24177 | + buf = (GstBuffer*)(this->queue_output_buf.get()); | ||
24178 | + gst_buffer_unref(buf); | ||
24179 | + } | ||
24180 | + | ||
24181 | + gst_object_unref(m_pipeline); | ||
24182 | +} | ||
24183 | + | ||
24184 | +gboolean | ||
24185 | +Pipeline::bus_call(GstBus *bus, GstMessage *msg, Pipeline* p) | ||
24186 | +{ | ||
24187 | + Q_UNUSED(bus) | ||
24188 | + | ||
24189 | + switch(GST_MESSAGE_TYPE(msg)) | ||
24190 | + { | ||
24191 | + case GST_MESSAGE_EOS: | ||
24192 | + qDebug("End-of-stream received. Stopping."); | ||
24193 | + p->stop(); | ||
24194 | + break; | ||
24195 | + | ||
24196 | + case GST_MESSAGE_ERROR: | ||
24197 | + { | ||
24198 | + gchar *debug = NULL; | ||
24199 | + GError *err = NULL; | ||
24200 | + gst_message_parse_error(msg, &err, &debug); | ||
24201 | + qDebug("Error: %s", err->message); | ||
24202 | + g_error_free (err); | ||
24203 | + if(debug) | ||
24204 | + { | ||
24205 | + qDebug("Debug deails: %s", debug); | ||
24206 | + g_free(debug); | ||
24207 | + } | ||
24208 | + p->stop(); | ||
24209 | + break; | ||
24210 | + } | ||
24211 | + | ||
24212 | + default: | ||
24213 | + break; | ||
24214 | + } | ||
24215 | + | ||
24216 | + return TRUE; | ||
24217 | +} | ||
24218 | diff --git a/tests/examples/qt/qglwtextureshare/pipeline.h b/tests/examples/qt/qglwtextureshare/pipeline.h | ||
24219 | new file mode 100644 | ||
24220 | index 0000000..ce37175 | ||
24221 | --- /dev/null | ||
24222 | +++ b/tests/examples/qt/qglwtextureshare/pipeline.h | ||
24223 | @@ -0,0 +1,68 @@ | ||
24224 | +/* | ||
24225 | + * GStreamer | ||
24226 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
24227 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
24228 | + * | ||
24229 | + * This library is free software; you can redistribute it and/or | ||
24230 | + * modify it under the terms of the GNU Library General Public | ||
24231 | + * License as published by the Free Software Foundation; either | ||
24232 | + * version 2 of the License, or (at your option) any later version. | ||
24233 | + * | ||
24234 | + * This library is distributed in the hope that it will be useful, | ||
24235 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24236 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24237 | + * Library General Public License for more details. | ||
24238 | + * | ||
24239 | + * You should have received a copy of the GNU Library General Public | ||
24240 | + * License along with this library; if not, write to the | ||
24241 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24242 | + * Boston, MA 02111-1307, USA. | ||
24243 | + */ | ||
24244 | + | ||
24245 | +#ifndef PIPELINE_H | ||
24246 | +#define PIPELINE_H | ||
24247 | + | ||
24248 | +#include <QtGui> | ||
24249 | +#include "glcontextid.h" | ||
24250 | +#include "AsyncQueue.h" | ||
24251 | +#include "GstGLBufferDef.h" | ||
24252 | + | ||
24253 | + | ||
24254 | +class Pipeline : public QObject | ||
24255 | +{ | ||
24256 | + Q_OBJECT | ||
24257 | + | ||
24258 | +public: | ||
24259 | + Pipeline(const GLContextID &ctx, | ||
24260 | + const QString &videoLocation, | ||
24261 | + QObject *parent); | ||
24262 | + ~Pipeline(); | ||
24263 | + | ||
24264 | + void configure(); | ||
24265 | + void start(); | ||
24266 | + void notifyNewFrame() {emit newFrameReady();} | ||
24267 | + void stop(); | ||
24268 | + void unconfigure(); | ||
24269 | + | ||
24270 | + AsyncQueue<GstGLBuffer*> queue_input_buf; | ||
24271 | + AsyncQueue<GstGLBuffer*> queue_output_buf; | ||
24272 | + | ||
24273 | +Q_SIGNALS: | ||
24274 | + void newFrameReady(); | ||
24275 | + void stopRequested(); | ||
24276 | + | ||
24277 | +private: | ||
24278 | + const GLContextID glctx; | ||
24279 | + const QString m_videoLocation; | ||
24280 | + GMainLoop* m_loop; | ||
24281 | + GstBus* m_bus; | ||
24282 | + GstPipeline* m_pipeline; | ||
24283 | + static float m_xrot; | ||
24284 | + static float m_yrot; | ||
24285 | + static float m_zrot; | ||
24286 | + | ||
24287 | + static void on_gst_buffer(GstElement * element, GstBuffer * buf, GstPad * pad, Pipeline* p); | ||
24288 | + static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); | ||
24289 | +}; | ||
24290 | + | ||
24291 | +#endif | ||
24292 | diff --git a/tests/examples/qt/qglwtextureshare/qglrenderer.cpp b/tests/examples/qt/qglwtextureshare/qglrenderer.cpp | ||
24293 | new file mode 100644 | ||
24294 | index 0000000..a14f946 | ||
24295 | --- /dev/null | ||
24296 | +++ b/tests/examples/qt/qglwtextureshare/qglrenderer.cpp | ||
24297 | @@ -0,0 +1,214 @@ | ||
24298 | +/* | ||
24299 | + * GStreamer | ||
24300 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
24301 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
24302 | + * Copyright (C) 2010 Nuno Santos <nunosantos@imaginando.net> | ||
24303 | + * | ||
24304 | + * This library is free software; you can redistribute it and/or | ||
24305 | + * modify it under the terms of the GNU Library General Public | ||
24306 | + * License as published by the Free Software Foundation; either | ||
24307 | + * version 2 of the License, or (at your option) any later version. | ||
24308 | + * | ||
24309 | + * This library is distributed in the hope that it will be useful, | ||
24310 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24311 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24312 | + * Library General Public License for more details. | ||
24313 | + * | ||
24314 | + * You should have received a copy of the GNU Library General Public | ||
24315 | + * License along with this library; if not, write to the | ||
24316 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24317 | + * Boston, MA 02111-1307, USA. | ||
24318 | + */ | ||
24319 | + | ||
24320 | +#include <QtGui> | ||
24321 | +#include "gstthread.h" | ||
24322 | +#include "qglrenderer.h" | ||
24323 | +#include "pipeline.h" | ||
24324 | + | ||
24325 | +#if defined(Q_WS_MAC) | ||
24326 | +extern void *qt_current_nsopengl_context(); | ||
24327 | +#endif | ||
24328 | + | ||
24329 | +QGLRenderer::QGLRenderer(const QString &videoLocation, | ||
24330 | + QWidget *parent) | ||
24331 | + : QGLWidget(parent), | ||
24332 | + videoLoc(videoLocation), | ||
24333 | + gst_thread(NULL), | ||
24334 | + closing(false), | ||
24335 | + frame(NULL) | ||
24336 | +{ | ||
24337 | + move(20, 10); | ||
24338 | + resize(640, 480); | ||
24339 | +} | ||
24340 | + | ||
24341 | +QGLRenderer::~QGLRenderer() | ||
24342 | +{ | ||
24343 | +} | ||
24344 | + | ||
24345 | +void | ||
24346 | +QGLRenderer::initializeGL() | ||
24347 | +{ | ||
24348 | + GLContextID ctx; | ||
24349 | + | ||
24350 | +#if defined(Q_WS_WIN) | ||
24351 | + ctx.contextId = wglGetCurrentContext(); | ||
24352 | + ctx.dc = wglGetCurrentDC(); | ||
24353 | +#elif defined (Q_WS_MAC) | ||
24354 | + ctx.contextId = (NSOpenGLContext*) qt_current_nsopengl_context(); | ||
24355 | +#elif defined(Q_WS_X11) | ||
24356 | + ctx.contextId = glXGetCurrentContext(); | ||
24357 | + const char *display_name = getenv("DISPLAY"); | ||
24358 | + if(display_name == NULL) | ||
24359 | + { | ||
24360 | + // actually we should look for --display command line parameter here | ||
24361 | + display_name = ":0.0"; | ||
24362 | + } | ||
24363 | + ctx.display = XOpenDisplay(display_name); | ||
24364 | + ctx.wnd = this->winId(); | ||
24365 | +#endif | ||
24366 | + | ||
24367 | + // We need to unset Qt context before initializing gst-gl plugin. | ||
24368 | + // Otherwise the attempt to share gst-gl context with Qt will fail. | ||
24369 | + this->doneCurrent(); | ||
24370 | + this->gst_thread = | ||
24371 | + new GstThread(ctx, this->videoLoc, SLOT(newFrame()), this); | ||
24372 | + this->makeCurrent(); | ||
24373 | + | ||
24374 | + QObject::connect(this->gst_thread, SIGNAL(finished()), | ||
24375 | + this, SLOT(close())); | ||
24376 | + QObject::connect(this, SIGNAL(closeRequested()), | ||
24377 | + this->gst_thread, SLOT(stop()), Qt::QueuedConnection); | ||
24378 | + | ||
24379 | + qglClearColor(QApplication::palette().color(QPalette::Active, | ||
24380 | + QPalette::Window)); | ||
24381 | + //glShadeModel(GL_FLAT); | ||
24382 | + //glEnable(GL_DEPTH_TEST); | ||
24383 | + //glEnable(GL_CULL_FACE); | ||
24384 | + glEnable(GL_TEXTURE_RECTANGLE_ARB); // Enable Texture Mapping | ||
24385 | + | ||
24386 | + this->gst_thread->start(); | ||
24387 | +} | ||
24388 | + | ||
24389 | +void | ||
24390 | +QGLRenderer::resizeGL(int width, int height) | ||
24391 | +{ | ||
24392 | + // Reset The Current Viewport And Perspective Transformation | ||
24393 | + glViewport(0, 0, width, height); | ||
24394 | + | ||
24395 | + glMatrixMode(GL_PROJECTION); | ||
24396 | + glLoadIdentity(); | ||
24397 | + | ||
24398 | + gluPerspective(45.0f, (GLfloat)width/(GLfloat)height, 0.1f, 100.0f); | ||
24399 | + glMatrixMode(GL_MODELVIEW); | ||
24400 | +} | ||
24401 | + | ||
24402 | +void | ||
24403 | +QGLRenderer::newFrame() | ||
24404 | +{ | ||
24405 | + Pipeline *pipeline = this->gst_thread->getPipeline(); | ||
24406 | + if(!pipeline) | ||
24407 | + return; | ||
24408 | + | ||
24409 | + /* frame is initialized as null */ | ||
24410 | + if (this->frame) | ||
24411 | + pipeline->queue_output_buf.put(this->frame); | ||
24412 | + | ||
24413 | + this->frame = pipeline->queue_input_buf.get(); | ||
24414 | + | ||
24415 | + /* direct call to paintGL (no queued) */ | ||
24416 | + this->updateGL(); | ||
24417 | +} | ||
24418 | + | ||
24419 | +void | ||
24420 | +QGLRenderer::paintGL() | ||
24421 | +{ | ||
24422 | + static GLfloat xrot = 0; | ||
24423 | + static GLfloat yrot = 0; | ||
24424 | + static GLfloat zrot = 0; | ||
24425 | + | ||
24426 | + if (this->frame) | ||
24427 | + { | ||
24428 | + | ||
24429 | + GLfloat width = this->frame->width; | ||
24430 | + GLfloat height = this->frame->height; | ||
24431 | + | ||
24432 | + glEnable(GL_DEPTH_TEST); | ||
24433 | + | ||
24434 | + glEnable(GL_TEXTURE_RECTANGLE_ARB); | ||
24435 | + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->frame->texture); | ||
24436 | + if(glGetError () != GL_NO_ERROR) | ||
24437 | + { | ||
24438 | + qDebug ("failed to bind texture that comes from gst-gl"); | ||
24439 | + emit closeRequested(); | ||
24440 | + return; | ||
24441 | + } | ||
24442 | + | ||
24443 | + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | ||
24444 | + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | ||
24445 | + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, | ||
24446 | + GL_CLAMP_TO_EDGE); | ||
24447 | + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, | ||
24448 | + GL_CLAMP_TO_EDGE); | ||
24449 | + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | ||
24450 | + | ||
24451 | + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | ||
24452 | + glMatrixMode(GL_MODELVIEW); | ||
24453 | + glLoadIdentity(); | ||
24454 | + | ||
24455 | + glTranslatef(0.0f,0.0f,-5.0f); | ||
24456 | + | ||
24457 | + glRotatef(xrot,1.0f,0.0f,0.0f); | ||
24458 | + glRotatef(yrot,0.0f,1.0f,0.0f); | ||
24459 | + glRotatef(zrot,0.0f,0.0f,1.0f); | ||
24460 | + | ||
24461 | + glBegin(GL_QUADS); | ||
24462 | + // Front Face | ||
24463 | + glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
24464 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
24465 | + glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
24466 | + glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
24467 | + // Back Face | ||
24468 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
24469 | + glTexCoord2f(0.0f, height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
24470 | + glTexCoord2f(width, height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
24471 | + glTexCoord2f(width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
24472 | + // Top Face | ||
24473 | + glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
24474 | + glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
24475 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
24476 | + glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
24477 | + // Bottom Face | ||
24478 | + glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
24479 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
24480 | + glTexCoord2f(0.0f, height); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
24481 | + glTexCoord2f(width,height); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
24482 | + // Right face | ||
24483 | + glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); | ||
24484 | + glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, -1.0f); | ||
24485 | + glTexCoord2f(width, height); glVertex3f( 1.0f, 1.0f, 1.0f); | ||
24486 | + glTexCoord2f(width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); | ||
24487 | + // Left Face | ||
24488 | + glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); | ||
24489 | + glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); | ||
24490 | + glTexCoord2f(0.0f, height); glVertex3f(-1.0f, 1.0f, 1.0f); | ||
24491 | + glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, -1.0f); | ||
24492 | + glEnd(); | ||
24493 | + | ||
24494 | + xrot+=0.3f; | ||
24495 | + yrot+=0.2f; | ||
24496 | + zrot+=0.4f; | ||
24497 | + | ||
24498 | + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); | ||
24499 | + } | ||
24500 | +} | ||
24501 | + | ||
24502 | +void | ||
24503 | +QGLRenderer::closeEvent(QCloseEvent* event) | ||
24504 | +{ | ||
24505 | + if(this->closing == false) | ||
24506 | + { | ||
24507 | + this->closing = true; | ||
24508 | + emit closeRequested(); | ||
24509 | + event->ignore(); | ||
24510 | + } | ||
24511 | +} | ||
24512 | diff --git a/tests/examples/qt/qglwtextureshare/qglrenderer.h b/tests/examples/qt/qglwtextureshare/qglrenderer.h | ||
24513 | new file mode 100644 | ||
24514 | index 0000000..93622a0 | ||
24515 | --- /dev/null | ||
24516 | +++ b/tests/examples/qt/qglwtextureshare/qglrenderer.h | ||
24517 | @@ -0,0 +1,59 @@ | ||
24518 | +/* | ||
24519 | + * GStreamer | ||
24520 | + * Copyright (C) 2009 Julien Isorce <julien.isorce@gmail.com> | ||
24521 | + * Copyright (C) 2009 Andrey Nechypurenko <andreynech@gmail.com> | ||
24522 | + * | ||
24523 | + * This library is free software; you can redistribute it and/or | ||
24524 | + * modify it under the terms of the GNU Library General Public | ||
24525 | + * License as published by the Free Software Foundation; either | ||
24526 | + * version 2 of the License, or (at your option) any later version. | ||
24527 | + * | ||
24528 | + * This library is distributed in the hope that it will be useful, | ||
24529 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24530 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24531 | + * Library General Public License for more details. | ||
24532 | + * | ||
24533 | + * You should have received a copy of the GNU Library General Public | ||
24534 | + * License along with this library; if not, write to the | ||
24535 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24536 | + * Boston, MA 02111-1307, USA. | ||
24537 | + */ | ||
24538 | + | ||
24539 | +#ifndef QGLRENDERER_H | ||
24540 | +#define QGLRENDERER_H | ||
24541 | + | ||
24542 | +#include <QGLWidget> | ||
24543 | +#include "GstGLBufferDef.h" | ||
24544 | + | ||
24545 | + | ||
24546 | +class GstThread; | ||
24547 | + | ||
24548 | +class QGLRenderer : public QGLWidget | ||
24549 | +{ | ||
24550 | + Q_OBJECT | ||
24551 | + | ||
24552 | +public: | ||
24553 | + QGLRenderer(const QString &videoLocation, QWidget *parent = 0); | ||
24554 | + ~QGLRenderer(); | ||
24555 | + | ||
24556 | + void closeEvent(QCloseEvent* event); | ||
24557 | + | ||
24558 | +Q_SIGNALS: | ||
24559 | + void closeRequested(); | ||
24560 | + | ||
24561 | +public Q_SLOTS: | ||
24562 | + void newFrame(); | ||
24563 | + | ||
24564 | +protected: | ||
24565 | + virtual void initializeGL(); | ||
24566 | + virtual void resizeGL(int width, int height); | ||
24567 | + virtual void paintGL(); | ||
24568 | + | ||
24569 | +private: | ||
24570 | + QString videoLoc; | ||
24571 | + GstThread *gst_thread; | ||
24572 | + bool closing; | ||
24573 | + GstGLBuffer *frame; | ||
24574 | +}; | ||
24575 | + | ||
24576 | +#endif // QGLRENDERER_H | ||
24577 | diff --git a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro | ||
24578 | new file mode 100644 | ||
24579 | index 0000000..8e02c7a | ||
24580 | --- /dev/null | ||
24581 | +++ b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro | ||
24582 | @@ -0,0 +1,81 @@ | ||
24583 | +TEMPLATE = app | ||
24584 | +TARGET = qglwtextureshare | ||
24585 | +QT += opengl | ||
24586 | + | ||
24587 | +# Add console to the CONFIG to see debug messages printed in | ||
24588 | +# the console on Windows | ||
24589 | +# CONFIG += console | ||
24590 | +DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB | ||
24591 | + | ||
24592 | +win32 { | ||
24593 | +DEFINES += WIN32 | ||
24594 | +INCLUDEPATH += \ | ||
24595 | + C:/gstreamer/include \ | ||
24596 | + C:/gstreamer/include/libxml2 \ | ||
24597 | + C:/gstreamer/include/glib-2.0 \ | ||
24598 | + C:/gstreamer/lib/glib-2.0/include \ | ||
24599 | + C:/gstreamer/include/gstreamer-0.10 | ||
24600 | +LIBS += -L"C:/gstreamer/lib" \ | ||
24601 | + -L"C:/gstreamer/bin" \ | ||
24602 | + -lgstreamer-0.10 \ | ||
24603 | + -lglib-2.0 \ | ||
24604 | + -lgmodule-2.0 \ | ||
24605 | + -lgobject-2.0 \ | ||
24606 | + -lgthread-2.0 \ | ||
24607 | + -lgstinterfaces-0.10 \ | ||
24608 | + -lopengl32 \ | ||
24609 | + -lglu32 \ | ||
24610 | + -lglew32 | ||
24611 | +} | ||
24612 | +unix:!mac { | ||
24613 | + DEFINES += UNIX | ||
24614 | + INCLUDEPATH += /usr/include/gstreamer-0.10 \ | ||
24615 | + /usr/local/include/gstreamer-0.10 \ | ||
24616 | + /usr/include/glib-2.0 \ | ||
24617 | + /usr/lib/glib-2.0/include \ | ||
24618 | + /usr/include/libxml2 | ||
24619 | + LIBS += -lgstreamer-0.10 \ | ||
24620 | + -lgstinterfaces-0.10 \ | ||
24621 | + -lglib-2.0 \ | ||
24622 | + -lgmodule-2.0 \ | ||
24623 | + -lgobject-2.0 \ | ||
24624 | + -lgthread-2.0 \ | ||
24625 | + -lGLU \ | ||
24626 | + -lGL \ | ||
24627 | + -lGLEW | ||
24628 | +} | ||
24629 | +mac { | ||
24630 | + DEFINES += MACOSX | ||
24631 | + INCLUDEPATH += /opt/local/include/ \ | ||
24632 | + /opt/local/include/gstreamer-0.10/ \ | ||
24633 | + /opt/local/include/glib-2.0/ \ | ||
24634 | + /opt/local/lib/glib-2.0/include \ | ||
24635 | + /opt/local/include/libxml2 | ||
24636 | + LIBS += -L/opt/local/lib \ | ||
24637 | + -lGLEW \ | ||
24638 | + -lgstreamer-0.10 \ | ||
24639 | + -lgstapp-0.10 \ | ||
24640 | + -lgstvideo-0.10 \ | ||
24641 | + -lglib-2.0 \ | ||
24642 | + -lgobject-2.0 \ | ||
24643 | + -lcxcore \ | ||
24644 | + -lcvaux \ | ||
24645 | + -lcv | ||
24646 | + OBJECTIVE_SOURCES += cocoa_utils.mm | ||
24647 | + LIBS += -framework AppKit | ||
24648 | +} | ||
24649 | +DEPENDPATH += . | ||
24650 | + | ||
24651 | +# Header files | ||
24652 | +HEADERS += gstthread.h \ | ||
24653 | + pipeline.h \ | ||
24654 | + qglrenderer.h \ | ||
24655 | + AsyncQueue.h \ | ||
24656 | + GstGLBufferDef.h \ | ||
24657 | + glcontextid.h | ||
24658 | + | ||
24659 | +# Source files | ||
24660 | +SOURCES += gstthread.cpp \ | ||
24661 | + main.cpp \ | ||
24662 | + pipeline.cpp \ | ||
24663 | + qglrenderer.cpp | ||
24664 | diff --git a/tests/examples/qt/videoxoverlay/gstthread.cpp b/tests/examples/qt/videoxoverlay/gstthread.cpp | ||
24665 | new file mode 100644 | ||
24666 | index 0000000..5a6370a | ||
24667 | --- /dev/null | ||
24668 | +++ b/tests/examples/qt/videoxoverlay/gstthread.cpp | ||
24669 | @@ -0,0 +1,64 @@ | ||
24670 | +/* | ||
24671 | + * GStreamer | ||
24672 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
24673 | + * | ||
24674 | + * This library is free software; you can redistribute it and/or | ||
24675 | + * modify it under the terms of the GNU Library General Public | ||
24676 | + * License as published by the Free Software Foundation; either | ||
24677 | + * version 2 of the License, or (at your option) any later version. | ||
24678 | + * | ||
24679 | + * This library is distributed in the hope that it will be useful, | ||
24680 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24681 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24682 | + * Library General Public License for more details. | ||
24683 | + * | ||
24684 | + * You should have received a copy of the GNU Library General Public | ||
24685 | + * License along with this library; if not, write to the | ||
24686 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24687 | + * Boston, MA 02111-1307, USA. | ||
24688 | + */ | ||
24689 | + | ||
24690 | +#include "gstthread.h" | ||
24691 | + | ||
24692 | +GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): | ||
24693 | + QThread(parent), | ||
24694 | + m_winId(winId), | ||
24695 | + m_videoLocation(videoLocation) | ||
24696 | +{ | ||
24697 | +} | ||
24698 | + | ||
24699 | +GstThread::~GstThread() | ||
24700 | +{ | ||
24701 | +} | ||
24702 | + | ||
24703 | +void GstThread::exposeRequested() | ||
24704 | +{ | ||
24705 | + m_pipeline->exposeRequested(); | ||
24706 | +} | ||
24707 | + | ||
24708 | +void GstThread::resize(int width, int height) | ||
24709 | +{ | ||
24710 | + emit resizeRequested(width, height); | ||
24711 | +} | ||
24712 | + | ||
24713 | +void GstThread::stop() | ||
24714 | +{ | ||
24715 | + m_pipeline->stop(); | ||
24716 | +} | ||
24717 | + | ||
24718 | +void GstThread::run() | ||
24719 | +{ | ||
24720 | + m_pipeline = new Pipeline(m_winId, m_videoLocation); | ||
24721 | + connect(m_pipeline, SIGNAL(resizeRequested(int, int)), this, SLOT(resize(int, int))); | ||
24722 | + m_pipeline->start(); //it runs the gmainloop on win32 | ||
24723 | + | ||
24724 | + | ||
24725 | +#ifndef WIN32 | ||
24726 | + //works like the gmainloop on linux (GstEvent are handled) | ||
24727 | + connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); | ||
24728 | + exec(); | ||
24729 | +#endif | ||
24730 | + | ||
24731 | + | ||
24732 | + m_pipeline->unconfigure(); | ||
24733 | +} | ||
24734 | diff --git a/tests/examples/qt/videoxoverlay/gstthread.h b/tests/examples/qt/videoxoverlay/gstthread.h | ||
24735 | new file mode 100644 | ||
24736 | index 0000000..d548deb | ||
24737 | --- /dev/null | ||
24738 | +++ b/tests/examples/qt/videoxoverlay/gstthread.h | ||
24739 | @@ -0,0 +1,55 @@ | ||
24740 | +/* | ||
24741 | + * GStreamer | ||
24742 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
24743 | + * | ||
24744 | + * This library is free software; you can redistribute it and/or | ||
24745 | + * modify it under the terms of the GNU Library General Public | ||
24746 | + * License as published by the Free Software Foundation; either | ||
24747 | + * version 2 of the License, or (at your option) any later version. | ||
24748 | + * | ||
24749 | + * This library is distributed in the hope that it will be useful, | ||
24750 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24751 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24752 | + * Library General Public License for more details. | ||
24753 | + * | ||
24754 | + * You should have received a copy of the GNU Library General Public | ||
24755 | + * License along with this library; if not, write to the | ||
24756 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24757 | + * Boston, MA 02111-1307, USA. | ||
24758 | + */ | ||
24759 | + | ||
24760 | +#ifndef GSTTHREAD_H | ||
24761 | +#define GSTTHREAD_H | ||
24762 | + | ||
24763 | +#include <QtGui> | ||
24764 | +#include <QtCore/QThread> | ||
24765 | + | ||
24766 | +#include "pipeline.h" | ||
24767 | + | ||
24768 | +class GstThread : public QThread | ||
24769 | +{ | ||
24770 | + Q_OBJECT | ||
24771 | + | ||
24772 | +public: | ||
24773 | + GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); | ||
24774 | + ~GstThread(); | ||
24775 | + | ||
24776 | +public slots: | ||
24777 | + void exposeRequested(); | ||
24778 | + void resize(int width, int height); | ||
24779 | + void stop(); | ||
24780 | + | ||
24781 | +signals: | ||
24782 | + void resizeRequested(int width, int height); | ||
24783 | + | ||
24784 | +protected: | ||
24785 | + void run(); | ||
24786 | + | ||
24787 | +private: | ||
24788 | + const WId m_winId; | ||
24789 | + const QString m_videoLocation; | ||
24790 | + Pipeline* m_pipeline; | ||
24791 | + | ||
24792 | +}; | ||
24793 | + | ||
24794 | +#endif | ||
24795 | diff --git a/tests/examples/qt/videoxoverlay/main.cpp b/tests/examples/qt/videoxoverlay/main.cpp | ||
24796 | new file mode 100644 | ||
24797 | index 0000000..b10814e | ||
24798 | --- /dev/null | ||
24799 | +++ b/tests/examples/qt/videoxoverlay/main.cpp | ||
24800 | @@ -0,0 +1,40 @@ | ||
24801 | +/* | ||
24802 | + * GStreamer | ||
24803 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
24804 | + * | ||
24805 | + * This library is free software; you can redistribute it and/or | ||
24806 | + * modify it under the terms of the GNU Library General Public | ||
24807 | + * License as published by the Free Software Foundation; either | ||
24808 | + * version 2 of the License, or (at your option) any later version. | ||
24809 | + * | ||
24810 | + * This library is distributed in the hope that it will be useful, | ||
24811 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24812 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24813 | + * Library General Public License for more details. | ||
24814 | + * | ||
24815 | + * You should have received a copy of the GNU Library General Public | ||
24816 | + * License along with this library; if not, write to the | ||
24817 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24818 | + * Boston, MA 02111-1307, USA. | ||
24819 | + */ | ||
24820 | + | ||
24821 | +#include <QtGui/QApplication> | ||
24822 | +#include "qrenderer.h" | ||
24823 | +#include "gstthread.h" | ||
24824 | + | ||
24825 | +int main(int argc, char *argv[]) | ||
24826 | +{ | ||
24827 | + QApplication a(argc, argv); | ||
24828 | + a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | ||
24829 | + | ||
24830 | + QString videolocation = QFileDialog::getOpenFileName(0, "Select a video file", | ||
24831 | + ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); | ||
24832 | + | ||
24833 | + if (videolocation.isEmpty()) | ||
24834 | + return -1; | ||
24835 | + | ||
24836 | + QRenderer w(videolocation); | ||
24837 | + w.setWindowTitle("glimagesink implements the gstxoverlay interface"); | ||
24838 | + | ||
24839 | + return a.exec(); | ||
24840 | +} | ||
24841 | diff --git a/tests/examples/qt/videoxoverlay/pipeline.cpp b/tests/examples/qt/videoxoverlay/pipeline.cpp | ||
24842 | new file mode 100644 | ||
24843 | index 0000000..9719b12 | ||
24844 | --- /dev/null | ||
24845 | +++ b/tests/examples/qt/videoxoverlay/pipeline.cpp | ||
24846 | @@ -0,0 +1,271 @@ | ||
24847 | +/* | ||
24848 | + * GStreamer | ||
24849 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
24850 | + * | ||
24851 | + * This library is free software; you can redistribute it and/or | ||
24852 | + * modify it under the terms of the GNU Library General Public | ||
24853 | + * License as published by the Free Software Foundation; either | ||
24854 | + * version 2 of the License, or (at your option) any later version. | ||
24855 | + * | ||
24856 | + * This library is distributed in the hope that it will be useful, | ||
24857 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24858 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24859 | + * Library General Public License for more details. | ||
24860 | + * | ||
24861 | + * You should have received a copy of the GNU Library General Public | ||
24862 | + * License along with this library; if not, write to the | ||
24863 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
24864 | + * Boston, MA 02111-1307, USA. | ||
24865 | + */ | ||
24866 | + | ||
24867 | +#include <gst/interfaces/xoverlay.h> | ||
24868 | +#include "pipeline.h" | ||
24869 | + | ||
24870 | +Pipeline::Pipeline(const WId id, const QString videoLocation): | ||
24871 | + m_winId(id), | ||
24872 | + m_videoLocation(videoLocation), | ||
24873 | + m_loop(NULL), | ||
24874 | + m_bus(NULL), | ||
24875 | + m_pipeline(NULL), | ||
24876 | + m_glimagesink(NULL) | ||
24877 | +{ | ||
24878 | + create(); | ||
24879 | +} | ||
24880 | + | ||
24881 | +Pipeline::~Pipeline() | ||
24882 | +{ | ||
24883 | +} | ||
24884 | + | ||
24885 | +void Pipeline::create() | ||
24886 | +{ | ||
24887 | + qDebug("Loading video: %s", m_videoLocation.toAscii().data()); | ||
24888 | + | ||
24889 | + gst_init (NULL, NULL); | ||
24890 | + | ||
24891 | +#ifdef WIN32 | ||
24892 | + m_loop = g_main_loop_new (NULL, FALSE); | ||
24893 | +#endif | ||
24894 | + m_pipeline = gst_pipeline_new ("pipeline"); | ||
24895 | + | ||
24896 | + m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); | ||
24897 | + gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); | ||
24898 | + gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); | ||
24899 | + gst_object_unref (m_bus); | ||
24900 | + | ||
24901 | + GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); | ||
24902 | + GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); | ||
24903 | + m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); | ||
24904 | + | ||
24905 | + if (!videosrc || !decodebin || !m_glimagesink ) | ||
24906 | + { | ||
24907 | + qDebug ("one element could not be found"); | ||
24908 | + return; | ||
24909 | + } | ||
24910 | + | ||
24911 | + g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); | ||
24912 | + | ||
24913 | + gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glimagesink, NULL); | ||
24914 | + | ||
24915 | + gst_element_link_pads (videosrc, "src", decodebin, "sink"); | ||
24916 | + | ||
24917 | + g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), m_glimagesink); | ||
24918 | + | ||
24919 | + GstPad* pad = gst_element_get_static_pad (m_glimagesink, "sink"); | ||
24920 | + g_signal_connect(pad, "notify::caps", G_CALLBACK(cb_video_size), this); | ||
24921 | + gst_object_unref (pad); | ||
24922 | +} | ||
24923 | + | ||
24924 | +void Pipeline::seek() | ||
24925 | +{ | ||
24926 | + if (gst_element_seek( | ||
24927 | + m_pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, | ||
24928 | + GST_SEEK_TYPE_SET, 2 * GST_SECOND, | ||
24929 | + GST_SEEK_TYPE_SET, 20 * GST_SECOND) | ||
24930 | + ) | ||
24931 | + qDebug ("Success to seek"); | ||
24932 | + else | ||
24933 | + qDebug ("Failed to seek"); | ||
24934 | +} | ||
24935 | + | ||
24936 | +void Pipeline::setState(GstState state) | ||
24937 | +{ | ||
24938 | + GstStateChangeReturn ret = gst_element_set_state (m_pipeline, state); | ||
24939 | + if (ret == GST_STATE_CHANGE_FAILURE) | ||
24940 | + { | ||
24941 | + qDebug ("Failed to start up pipeline!"); | ||
24942 | + | ||
24943 | + /* check if there is an error message with details on the bus */ | ||
24944 | + GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); | ||
24945 | + if (msg) | ||
24946 | + { | ||
24947 | + GError *err = NULL; | ||
24948 | + gst_message_parse_error (msg, &err, NULL); | ||
24949 | + qDebug ("ERROR: %s", err->message); | ||
24950 | + g_error_free (err); | ||
24951 | + gst_message_unref (msg); | ||
24952 | + } | ||
24953 | + return; | ||
24954 | + } | ||
24955 | +} | ||
24956 | + | ||
24957 | +void Pipeline::start() | ||
24958 | +{ | ||
24959 | + setState(GST_STATE_PLAYING); | ||
24960 | + | ||
24961 | +#ifdef WIN32 | ||
24962 | + g_main_loop_run(m_loop); | ||
24963 | +#endif | ||
24964 | +} | ||
24965 | + | ||
24966 | +//we don't want a thread safe stop in this example | ||
24967 | +void Pipeline::stop() | ||
24968 | +{ | ||
24969 | +#ifdef WIN32 | ||
24970 | + g_main_loop_quit(m_loop); | ||
24971 | +#else | ||
24972 | + emit stopRequested(); | ||
24973 | +#endif | ||
24974 | +} | ||
24975 | + | ||
24976 | + | ||
24977 | +void Pipeline::unconfigure() const | ||
24978 | +{ | ||
24979 | + gst_element_set_state (m_pipeline, GST_STATE_NULL); | ||
24980 | + gst_object_unref (m_pipeline); | ||
24981 | +} | ||
24982 | + | ||
24983 | +//redraw the current frame in the drawable | ||
24984 | +void Pipeline::doExpose() const | ||
24985 | +{ | ||
24986 | + if (m_pipeline && m_glimagesink) | ||
24987 | + gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); | ||
24988 | +} | ||
24989 | + | ||
24990 | +//post message to g_main_loop in order to call expose | ||
24991 | +//in the gt thread | ||
24992 | +void Pipeline::exposeRequested() | ||
24993 | +{ | ||
24994 | + g_idle_add(cb_expose, this); | ||
24995 | +} | ||
24996 | + | ||
24997 | +//post message to the Qt main loop in order to resize the renderer | ||
24998 | +void Pipeline::resize(int width, int height) | ||
24999 | +{ | ||
25000 | + emit resizeRequested(width, height); | ||
25001 | +} | ||
25002 | + | ||
25003 | + | ||
25004 | +//----------------------------------------------------------------------- | ||
25005 | +//----------------------------- static members -------------------------- | ||
25006 | +//----------------------------------------------------------------------- | ||
25007 | + | ||
25008 | + | ||
25009 | +gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) | ||
25010 | +{ | ||
25011 | + | ||
25012 | + switch (GST_MESSAGE_TYPE (msg)) | ||
25013 | + { | ||
25014 | + case GST_MESSAGE_EOS: | ||
25015 | + qDebug ("End-of-stream"); | ||
25016 | + p->stop(); | ||
25017 | + break; | ||
25018 | + case GST_MESSAGE_ERROR: | ||
25019 | + { | ||
25020 | + gchar *debug = NULL; | ||
25021 | + GError *err = NULL; | ||
25022 | + gst_message_parse_error (msg, &err, &debug); | ||
25023 | + qDebug ("Error: %s", err->message); | ||
25024 | + g_error_free (err); | ||
25025 | + if (debug) | ||
25026 | + { | ||
25027 | + qDebug ("Debug deails: %s", debug); | ||
25028 | + g_free (debug); | ||
25029 | + } | ||
25030 | + p->stop(); | ||
25031 | + break; | ||
25032 | + } | ||
25033 | + case GST_MESSAGE_STATE_CHANGED: | ||
25034 | + { | ||
25035 | + GstState oldState = GST_STATE_NULL; | ||
25036 | + GstState currentState = GST_STATE_NULL; | ||
25037 | + GstState pendingState = GST_STATE_NULL; | ||
25038 | + gst_message_parse_state_changed (msg, &oldState, ¤tState, &pendingState); | ||
25039 | + if (oldState == GST_STATE_READY && currentState == GST_STATE_PAUSED && pendingState == GST_STATE_PLAYING) | ||
25040 | + p->seek(); | ||
25041 | + break; | ||
25042 | + } | ||
25043 | + default: | ||
25044 | + break; | ||
25045 | + } | ||
25046 | + | ||
25047 | + return TRUE; | ||
25048 | +} | ||
25049 | + | ||
25050 | +void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, GstElement* glimagesink) | ||
25051 | +{ | ||
25052 | + GstPad* glpad = gst_element_get_pad (glimagesink, "sink"); | ||
25053 | + | ||
25054 | + //only link once | ||
25055 | + if (GST_PAD_IS_LINKED (glpad)) | ||
25056 | + { | ||
25057 | + g_object_unref (glpad); | ||
25058 | + return; | ||
25059 | + } | ||
25060 | + | ||
25061 | + GstCaps* caps = gst_pad_get_caps (pad); | ||
25062 | + GstStructure* str = gst_caps_get_structure (caps, 0); | ||
25063 | + if (!g_strrstr (gst_structure_get_name (str), "video")) | ||
25064 | + { | ||
25065 | + gst_caps_unref (caps); | ||
25066 | + gst_object_unref (glpad); | ||
25067 | + return; | ||
25068 | + } | ||
25069 | + gst_caps_unref (caps); | ||
25070 | + | ||
25071 | + GstPadLinkReturn ret = gst_pad_link (pad, glpad); | ||
25072 | + if (ret != GST_PAD_LINK_OK) | ||
25073 | + g_warning ("Failed to link with decodebin!\n"); | ||
25074 | +} | ||
25075 | + | ||
25076 | +void Pipeline::cb_video_size (GstPad* pad, GParamSpec* pspec, Pipeline* p) | ||
25077 | +{ | ||
25078 | + GstCaps* caps = gst_pad_get_negotiated_caps(pad); | ||
25079 | + if (caps) | ||
25080 | + { | ||
25081 | + qDebug ("negotiated caps : %s", gst_caps_to_string(caps)) ; | ||
25082 | + const GstStructure* str = gst_caps_get_structure (caps, 0); | ||
25083 | + gint width = 0; | ||
25084 | + gint height = 0; | ||
25085 | + if (gst_structure_get_int (str, "width", &width) && | ||
25086 | + gst_structure_get_int (str, "height", &height) ) | ||
25087 | + p->resize(width, height); | ||
25088 | + gst_caps_unref(caps) ; | ||
25089 | + } | ||
25090 | +} | ||
25091 | + | ||
25092 | +gboolean Pipeline::cb_expose (gpointer data) | ||
25093 | +{ | ||
25094 | + ((Pipeline*)data)->doExpose(); | ||
25095 | + return FALSE; | ||
25096 | +} | ||
25097 | + | ||
25098 | + | ||
25099 | +GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) | ||
25100 | +{ | ||
25101 | + // ignore anything but 'prepare-xwindow-id' element messages | ||
25102 | + if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) | ||
25103 | + return GST_BUS_PASS; | ||
25104 | + | ||
25105 | + if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) | ||
25106 | + return GST_BUS_PASS; | ||
25107 | + | ||
25108 | + qDebug ("setting xwindow id"); | ||
25109 | + | ||
25110 | + //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. | ||
25111 | + //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. | ||
25112 | + gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); | ||
25113 | + | ||
25114 | + gst_message_unref (message); | ||
25115 | + | ||
25116 | + return GST_BUS_DROP; | ||
25117 | +} | ||
25118 | diff --git a/tests/examples/qt/videoxoverlay/pipeline.h b/tests/examples/qt/videoxoverlay/pipeline.h | ||
25119 | new file mode 100644 | ||
25120 | index 0000000..139e16e | ||
25121 | --- /dev/null | ||
25122 | +++ b/tests/examples/qt/videoxoverlay/pipeline.h | ||
25123 | @@ -0,0 +1,66 @@ | ||
25124 | +/* | ||
25125 | + * GStreamer | ||
25126 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
25127 | + * | ||
25128 | + * This library is free software; you can redistribute it and/or | ||
25129 | + * modify it under the terms of the GNU Library General Public | ||
25130 | + * License as published by the Free Software Foundation; either | ||
25131 | + * version 2 of the License, or (at your option) any later version. | ||
25132 | + * | ||
25133 | + * This library is distributed in the hope that it will be useful, | ||
25134 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25135 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
25136 | + * Library General Public License for more details. | ||
25137 | + * | ||
25138 | + * You should have received a copy of the GNU Library General Public | ||
25139 | + * License along with this library; if not, write to the | ||
25140 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
25141 | + * Boston, MA 02111-1307, USA. | ||
25142 | + */ | ||
25143 | + | ||
25144 | +#ifndef PIPELINE_H | ||
25145 | +#define PIPELINE_H | ||
25146 | + | ||
25147 | +#include <QtGui> | ||
25148 | +#include <gst/gst.h> | ||
25149 | +//#include <QtCore/private/qeventdispatcher_glib_p.h> | ||
25150 | + | ||
25151 | +class Pipeline : public QObject | ||
25152 | +{ | ||
25153 | + Q_OBJECT | ||
25154 | + | ||
25155 | +public: | ||
25156 | + Pipeline(const WId windId, const QString videoLocation); | ||
25157 | + ~Pipeline(); | ||
25158 | + void start(); | ||
25159 | + void exposeRequested(); | ||
25160 | + void resize(int width, int height); | ||
25161 | + void stop(); | ||
25162 | + void unconfigure() const; | ||
25163 | + | ||
25164 | +signals: | ||
25165 | + void resizeRequested(int width, int height); | ||
25166 | + void stopRequested(); | ||
25167 | + | ||
25168 | +private: | ||
25169 | + const WId m_winId; | ||
25170 | + const QString m_videoLocation; | ||
25171 | + GMainLoop* m_loop; | ||
25172 | + GstBus* m_bus; | ||
25173 | + GstElement* m_pipeline; | ||
25174 | + GstElement* m_glimagesink; | ||
25175 | + | ||
25176 | + void create(); | ||
25177 | + void seek(); | ||
25178 | + void setState(GstState state); | ||
25179 | + WId winId() const { return m_winId; } | ||
25180 | + void doExpose () const; | ||
25181 | + | ||
25182 | + static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); | ||
25183 | + static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, GstElement* glimagesink); | ||
25184 | + static void cb_video_size (GstPad* pad, GParamSpec* pspec, Pipeline* p); | ||
25185 | + static gboolean cb_expose (gpointer data); | ||
25186 | + static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); | ||
25187 | +}; | ||
25188 | + | ||
25189 | +#endif | ||
25190 | diff --git a/tests/examples/qt/videoxoverlay/qrenderer.cpp b/tests/examples/qt/videoxoverlay/qrenderer.cpp | ||
25191 | new file mode 100644 | ||
25192 | index 0000000..d83a0ba | ||
25193 | --- /dev/null | ||
25194 | +++ b/tests/examples/qt/videoxoverlay/qrenderer.cpp | ||
25195 | @@ -0,0 +1,57 @@ | ||
25196 | +/* | ||
25197 | + * GStreamer | ||
25198 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
25199 | + * | ||
25200 | + * This library is free software; you can redistribute it and/or | ||
25201 | + * modify it under the terms of the GNU Library General Public | ||
25202 | + * License as published by the Free Software Foundation; either | ||
25203 | + * version 2 of the License, or (at your option) any later version. | ||
25204 | + * | ||
25205 | + * This library is distributed in the hope that it will be useful, | ||
25206 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25207 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
25208 | + * Library General Public License for more details. | ||
25209 | + * | ||
25210 | + * You should have received a copy of the GNU Library General Public | ||
25211 | + * License along with this library; if not, write to the | ||
25212 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
25213 | + * Boston, MA 02111-1307, USA. | ||
25214 | + */ | ||
25215 | + | ||
25216 | +#include "qrenderer.h" | ||
25217 | + | ||
25218 | +QRenderer::QRenderer(const QString videoLocation, QWidget *parent, Qt::WFlags flags) | ||
25219 | + : QWidget(parent, flags), | ||
25220 | + m_gt(winId(), videoLocation) | ||
25221 | +{ | ||
25222 | + setAttribute(Qt::WA_NoSystemBackground); | ||
25223 | + setVisible(false); | ||
25224 | + move(20, 10); | ||
25225 | + | ||
25226 | + QObject::connect(&m_gt, SIGNAL(resizeRequested(int, int)), this, SLOT(resizeRequested(int, int))); | ||
25227 | + QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); | ||
25228 | + QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); | ||
25229 | + QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); | ||
25230 | + m_gt.start(); | ||
25231 | +} | ||
25232 | + | ||
25233 | +QRenderer::~QRenderer() | ||
25234 | +{ | ||
25235 | +} | ||
25236 | + | ||
25237 | +void QRenderer::paintEvent(QPaintEvent* event) | ||
25238 | +{ | ||
25239 | + emit exposeRequested(); | ||
25240 | +} | ||
25241 | + | ||
25242 | +void QRenderer::closeEvent(QCloseEvent* event) | ||
25243 | +{ | ||
25244 | + emit closeRequested(); | ||
25245 | + m_gt.wait(); | ||
25246 | +} | ||
25247 | + | ||
25248 | +void QRenderer::resizeRequested(int width, int height) | ||
25249 | +{ | ||
25250 | + resize(width, height); | ||
25251 | + setVisible(true); | ||
25252 | +} | ||
25253 | diff --git a/tests/examples/qt/videoxoverlay/qrenderer.h b/tests/examples/qt/videoxoverlay/qrenderer.h | ||
25254 | new file mode 100644 | ||
25255 | index 0000000..d20cd13 | ||
25256 | --- /dev/null | ||
25257 | +++ b/tests/examples/qt/videoxoverlay/qrenderer.h | ||
25258 | @@ -0,0 +1,48 @@ | ||
25259 | +/* | ||
25260 | + * GStreamer | ||
25261 | + * Copyright (C) 2008-2009 Julien Isorce <julien.isorce@gmail.com> | ||
25262 | + * | ||
25263 | + * This library is free software; you can redistribute it and/or | ||
25264 | + * modify it under the terms of the GNU Library General Public | ||
25265 | + * License as published by the Free Software Foundation; either | ||
25266 | + * version 2 of the License, or (at your option) any later version. | ||
25267 | + * | ||
25268 | + * This library is distributed in the hope that it will be useful, | ||
25269 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25270 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
25271 | + * Library General Public License for more details. | ||
25272 | + * | ||
25273 | + * You should have received a copy of the GNU Library General Public | ||
25274 | + * License along with this library; if not, write to the | ||
25275 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
25276 | + * Boston, MA 02111-1307, USA. | ||
25277 | + */ | ||
25278 | + | ||
25279 | +#ifndef QRENDERER_H | ||
25280 | +#define QRENDERER_H | ||
25281 | + | ||
25282 | +#include <QtGui/QWidget> | ||
25283 | +#include "gstthread.h" | ||
25284 | + | ||
25285 | +class QRenderer : public QWidget | ||
25286 | +{ | ||
25287 | + Q_OBJECT | ||
25288 | + | ||
25289 | +public: | ||
25290 | + QRenderer(const QString videoLocation, QWidget *parent = 0, Qt::WFlags flags = 0); | ||
25291 | + ~QRenderer(); | ||
25292 | + void paintEvent(QPaintEvent* event); | ||
25293 | + void closeEvent (QCloseEvent* event); | ||
25294 | + | ||
25295 | +public slots: | ||
25296 | + void resizeRequested(int width, int height); | ||
25297 | + | ||
25298 | +signals: | ||
25299 | + void exposeRequested(); | ||
25300 | + void closeRequested(); | ||
25301 | + | ||
25302 | +private: | ||
25303 | + GstThread m_gt; | ||
25304 | +}; | ||
25305 | + | ||
25306 | +#endif // QRENDERER_H | ||
25307 | diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.pri b/tests/examples/qt/videoxoverlay/videoxoverlay.pri | ||
25308 | new file mode 100644 | ||
25309 | index 0000000..75b23cd | ||
25310 | --- /dev/null | ||
25311 | +++ b/tests/examples/qt/videoxoverlay/videoxoverlay.pri | ||
25312 | @@ -0,0 +1,10 @@ | ||
25313 | +#Header files | ||
25314 | +HEADERS += ./gstthread.h \ | ||
25315 | + ./pipeline.h \ | ||
25316 | + ./qrenderer.h | ||
25317 | + | ||
25318 | +#Source files | ||
25319 | +SOURCES += ./gstthread.cpp \ | ||
25320 | + ./main.cpp \ | ||
25321 | + ./pipeline.cpp \ | ||
25322 | + ./qrenderer.cpp | ||
25323 | diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.pro b/tests/examples/qt/videoxoverlay/videoxoverlay.pro | ||
25324 | new file mode 100644 | ||
25325 | index 0000000..15fd688 | ||
25326 | --- /dev/null | ||
25327 | +++ b/tests/examples/qt/videoxoverlay/videoxoverlay.pro | ||
25328 | @@ -0,0 +1,53 @@ | ||
25329 | +TEMPLATE = app | ||
25330 | +TARGET = videoxoverlay | ||
25331 | +DESTDIR = ./Debug | ||
25332 | +CONFIG += debug | ||
25333 | +DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB | ||
25334 | + | ||
25335 | +win32 { | ||
25336 | +DEFINES += WIN32 | ||
25337 | +INCLUDEPATH += ./GeneratedFiles \ | ||
25338 | + ./GeneratedFiles/Debug \ | ||
25339 | + C:/gstreamer/include \ | ||
25340 | + C:/gstreamer/include/libxml2 \ | ||
25341 | + C:/gstreamer/include/glib-2.0 \ | ||
25342 | + C:/gstreamer/lib/glib-2.0/include \ | ||
25343 | + C:/gstreamer/include/gstreamer-0.10 | ||
25344 | +LIBS += -L"C:/gstreamer/bin" \ | ||
25345 | + -L"C:/gstreamer/lib" \ | ||
25346 | + -lgstinterfaces-0.10 \ | ||
25347 | + -lgstreamer-0.10 \ | ||
25348 | + -lglib-2.0 \ | ||
25349 | + -lgmodule-2.0 \ | ||
25350 | + -lgobject-2.0 \ | ||
25351 | + -lgthread-2.0 | ||
25352 | +} | ||
25353 | + | ||
25354 | +unix { | ||
25355 | +DEFINES += UNIX | ||
25356 | +INCLUDEPATH += GeneratedFiles \ | ||
25357 | + GeneratedFiles/Debug \ | ||
25358 | + /usr/include/gstreamer-0.10 \ | ||
25359 | + /usr/local/include/gstreamer-0.10 \ | ||
25360 | + /usr/include/glib-2.0 \ | ||
25361 | + /usr/lib/glib-2.0/include \ | ||
25362 | + /usr/include/libxml2 | ||
25363 | +LIBS += -lgstreamer-0.10 \ | ||
25364 | + -lgstinterfaces-0.10 \ | ||
25365 | + -lglib-2.0 \ | ||
25366 | + -lgmodule-2.0 \ | ||
25367 | + -lgobject-2.0 \ | ||
25368 | + -lgthread-2.0 \ | ||
25369 | + -lGLU \ | ||
25370 | + -lGL \ | ||
25371 | + -lGLEW | ||
25372 | +} | ||
25373 | + | ||
25374 | +DEPENDPATH += . | ||
25375 | +MOC_DIR += ./GeneratedFiles/debug | ||
25376 | +OBJECTS_DIR += debug | ||
25377 | +UI_DIR += ./GeneratedFiles | ||
25378 | +RCC_DIR += ./GeneratedFiles | ||
25379 | + | ||
25380 | +#Include file(s) | ||
25381 | +include(videoxoverlay.pri) | ||
25382 | diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.sln b/tests/examples/qt/videoxoverlay/videoxoverlay.sln | ||
25383 | new file mode 100644 | ||
25384 | index 0000000..2c81e94 | ||
25385 | --- /dev/null | ||
25386 | +++ b/tests/examples/qt/videoxoverlay/videoxoverlay.sln | ||
25387 | @@ -0,0 +1,26 @@ | ||
25388 | +? | ||
25389 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
25390 | +# Visual Studio 2008 | ||
25391 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoxoverlay", "videoxoverlay.vcproj", "{7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}" | ||
25392 | +EndProject | ||
25393 | +Global | ||
25394 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
25395 | + Debug|Win32 = Debug|Win32 | ||
25396 | + Release|Win32 = Release|Win32 | ||
25397 | + EndGlobalSection | ||
25398 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
25399 | + {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
25400 | + {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Debug|Win32.Build.0 = Debug|Win32 | ||
25401 | + {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Release|Win32.ActiveCfg = Release|Win32 | ||
25402 | + {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Release|Win32.Build.0 = Release|Win32 | ||
25403 | + EndGlobalSection | ||
25404 | + GlobalSection(SolutionProperties) = preSolution | ||
25405 | + HideSolutionNode = FALSE | ||
25406 | + EndGlobalSection | ||
25407 | + GlobalSection(Qt) = preSolution | ||
25408 | + Integration = True | ||
25409 | + EndGlobalSection | ||
25410 | + GlobalSection(Qt) = preSolution | ||
25411 | + Integration = True | ||
25412 | + EndGlobalSection | ||
25413 | +EndGlobal | ||
25414 | diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj b/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj | ||
25415 | new file mode 100644 | ||
25416 | index 0000000..d61df7d | ||
25417 | --- /dev/null | ||
25418 | +++ b/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj | ||
25419 | @@ -0,0 +1,320 @@ | ||
25420 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
25421 | +<VisualStudioProject | ||
25422 | + ProjectType="Visual C++" | ||
25423 | + Version="9,00" | ||
25424 | + Name="videoxoverlay" | ||
25425 | + ProjectGUID="{7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}" | ||
25426 | + Keyword="Qt4VSv1.0" | ||
25427 | + TargetFrameworkVersion="131072" | ||
25428 | + > | ||
25429 | + <Platforms> | ||
25430 | + <Platform | ||
25431 | + Name="Win32" | ||
25432 | + /> | ||
25433 | + </Platforms> | ||
25434 | + <ToolFiles> | ||
25435 | + </ToolFiles> | ||
25436 | + <Configurations> | ||
25437 | + <Configuration | ||
25438 | + Name="Release|Win32" | ||
25439 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
25440 | + IntermediateDirectory="$(ConfigurationName)" | ||
25441 | + ConfigurationType="1" | ||
25442 | + > | ||
25443 | + <Tool | ||
25444 | + Name="VCPreBuildEventTool" | ||
25445 | + /> | ||
25446 | + <Tool | ||
25447 | + Name="VCCustomBuildTool" | ||
25448 | + /> | ||
25449 | + <Tool | ||
25450 | + Name="VCXMLDataGeneratorTool" | ||
25451 | + /> | ||
25452 | + <Tool | ||
25453 | + Name="VCWebServiceProxyGeneratorTool" | ||
25454 | + /> | ||
25455 | + <Tool | ||
25456 | + Name="VCMIDLTool" | ||
25457 | + /> | ||
25458 | + <Tool | ||
25459 | + Name="VCCLCompilerTool" | ||
25460 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
25461 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_NO_DEBUG,NDEBUG,QT_CORE_LIB,QT_GUI_LIB" | ||
25462 | + RuntimeLibrary="2" | ||
25463 | + TreatWChar_tAsBuiltInType="false" | ||
25464 | + DebugInformationFormat="0" | ||
25465 | + /> | ||
25466 | + <Tool | ||
25467 | + Name="VCManagedResourceCompilerTool" | ||
25468 | + /> | ||
25469 | + <Tool | ||
25470 | + Name="VCResourceCompilerTool" | ||
25471 | + /> | ||
25472 | + <Tool | ||
25473 | + Name="VCPreLinkEventTool" | ||
25474 | + /> | ||
25475 | + <Tool | ||
25476 | + Name="VCLinkerTool" | ||
25477 | + AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib" | ||
25478 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
25479 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
25480 | + GenerateDebugInformation="false" | ||
25481 | + SubSystem="2" | ||
25482 | + RandomizedBaseAddress="1" | ||
25483 | + DataExecutionPrevention="0" | ||
25484 | + /> | ||
25485 | + <Tool | ||
25486 | + Name="VCALinkTool" | ||
25487 | + /> | ||
25488 | + <Tool | ||
25489 | + Name="VCManifestTool" | ||
25490 | + /> | ||
25491 | + <Tool | ||
25492 | + Name="VCXDCMakeTool" | ||
25493 | + /> | ||
25494 | + <Tool | ||
25495 | + Name="VCBscMakeTool" | ||
25496 | + /> | ||
25497 | + <Tool | ||
25498 | + Name="VCFxCopTool" | ||
25499 | + /> | ||
25500 | + <Tool | ||
25501 | + Name="VCAppVerifierTool" | ||
25502 | + /> | ||
25503 | + <Tool | ||
25504 | + Name="VCPostBuildEventTool" | ||
25505 | + /> | ||
25506 | + </Configuration> | ||
25507 | + <Configuration | ||
25508 | + Name="Debug|Win32" | ||
25509 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
25510 | + IntermediateDirectory="$(ConfigurationName)" | ||
25511 | + ConfigurationType="1" | ||
25512 | + > | ||
25513 | + <Tool | ||
25514 | + Name="VCPreBuildEventTool" | ||
25515 | + /> | ||
25516 | + <Tool | ||
25517 | + Name="VCCustomBuildTool" | ||
25518 | + /> | ||
25519 | + <Tool | ||
25520 | + Name="VCXMLDataGeneratorTool" | ||
25521 | + /> | ||
25522 | + <Tool | ||
25523 | + Name="VCWebServiceProxyGeneratorTool" | ||
25524 | + /> | ||
25525 | + <Tool | ||
25526 | + Name="VCMIDLTool" | ||
25527 | + /> | ||
25528 | + <Tool | ||
25529 | + Name="VCCLCompilerTool" | ||
25530 | + Optimization="0" | ||
25531 | + AdditionalIncludeDirectories=".\GeneratedFiles;"$(QTDIR)\include";".\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";C:\gstreamer\include;"C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10"" | ||
25532 | + PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_CORE_LIB,QT_GUI_LIB" | ||
25533 | + RuntimeLibrary="3" | ||
25534 | + TreatWChar_tAsBuiltInType="false" | ||
25535 | + DebugInformationFormat="3" | ||
25536 | + /> | ||
25537 | + <Tool | ||
25538 | + Name="VCManagedResourceCompilerTool" | ||
25539 | + /> | ||
25540 | + <Tool | ||
25541 | + Name="VCResourceCompilerTool" | ||
25542 | + /> | ||
25543 | + <Tool | ||
25544 | + Name="VCPreLinkEventTool" | ||
25545 | + /> | ||
25546 | + <Tool | ||
25547 | + Name="VCLinkerTool" | ||
25548 | + AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib gstinterfaces-0.10.lib gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib" | ||
25549 | + OutputFile="$(OutDir)\$(ProjectName).exe" | ||
25550 | + AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" | ||
25551 | + GenerateDebugInformation="true" | ||
25552 | + SubSystem="2" | ||
25553 | + RandomizedBaseAddress="1" | ||
25554 | + DataExecutionPrevention="0" | ||
25555 | + /> | ||
25556 | + <Tool | ||
25557 | + Name="VCALinkTool" | ||
25558 | + /> | ||
25559 | + <Tool | ||
25560 | + Name="VCManifestTool" | ||
25561 | + /> | ||
25562 | + <Tool | ||
25563 | + Name="VCXDCMakeTool" | ||
25564 | + /> | ||
25565 | + <Tool | ||
25566 | + Name="VCBscMakeTool" | ||
25567 | + /> | ||
25568 | + <Tool | ||
25569 | + Name="VCFxCopTool" | ||
25570 | + /> | ||
25571 | + <Tool | ||
25572 | + Name="VCAppVerifierTool" | ||
25573 | + /> | ||
25574 | + <Tool | ||
25575 | + Name="VCPostBuildEventTool" | ||
25576 | + /> | ||
25577 | + </Configuration> | ||
25578 | + </Configurations> | ||
25579 | + <References> | ||
25580 | + </References> | ||
25581 | + <Files> | ||
25582 | + <Filter | ||
25583 | + Name="Source Files" | ||
25584 | + Filter="cpp;cxx;c;def" | ||
25585 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
25586 | + > | ||
25587 | + <File | ||
25588 | + RelativePath=".\gstthread.cpp" | ||
25589 | + > | ||
25590 | + </File> | ||
25591 | + <File | ||
25592 | + RelativePath=".\main.cpp" | ||
25593 | + > | ||
25594 | + </File> | ||
25595 | + <File | ||
25596 | + RelativePath=".\pipeline.cpp" | ||
25597 | + > | ||
25598 | + </File> | ||
25599 | + <File | ||
25600 | + RelativePath=".\qrenderer.cpp" | ||
25601 | + > | ||
25602 | + </File> | ||
25603 | + </Filter> | ||
25604 | + <Filter | ||
25605 | + Name="Header Files" | ||
25606 | + Filter="h" | ||
25607 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
25608 | + > | ||
25609 | + <File | ||
25610 | + RelativePath=".\gstthread.h" | ||
25611 | + > | ||
25612 | + <FileConfiguration | ||
25613 | + Name="Release|Win32" | ||
25614 | + > | ||
25615 | + <Tool | ||
25616 | + Name="VCCustomBuildTool" | ||
25617 | + Description="Moc'ing gstthread.h..." | ||
25618 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
25619 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
25620 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
25621 | + /> | ||
25622 | + </FileConfiguration> | ||
25623 | + <FileConfiguration | ||
25624 | + Name="Debug|Win32" | ||
25625 | + > | ||
25626 | + <Tool | ||
25627 | + Name="VCCustomBuildTool" | ||
25628 | + Description="Moc'ing gstthread.h..." | ||
25629 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\gstthread.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"
" | ||
25630 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\gstthread.h" | ||
25631 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_gstthread.cpp"" | ||
25632 | + /> | ||
25633 | + </FileConfiguration> | ||
25634 | + </File> | ||
25635 | + <File | ||
25636 | + RelativePath=".\pipeline.h" | ||
25637 | + > | ||
25638 | + <FileConfiguration | ||
25639 | + Name="Release|Win32" | ||
25640 | + > | ||
25641 | + <Tool | ||
25642 | + Name="VCCustomBuildTool" | ||
25643 | + Description="Moc'ing pipeline.h..." | ||
25644 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
25645 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
25646 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
25647 | + /> | ||
25648 | + </FileConfiguration> | ||
25649 | + <FileConfiguration | ||
25650 | + Name="Debug|Win32" | ||
25651 | + > | ||
25652 | + <Tool | ||
25653 | + Name="VCCustomBuildTool" | ||
25654 | + Description="Moc'ing pipeline.h..." | ||
25655 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\pipeline.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"
" | ||
25656 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\pipeline.h" | ||
25657 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_pipeline.cpp"" | ||
25658 | + /> | ||
25659 | + </FileConfiguration> | ||
25660 | + </File> | ||
25661 | + <File | ||
25662 | + RelativePath=".\qrenderer.h" | ||
25663 | + > | ||
25664 | + <FileConfiguration | ||
25665 | + Name="Release|Win32" | ||
25666 | + > | ||
25667 | + <Tool | ||
25668 | + Name="VCCustomBuildTool" | ||
25669 | + Description="Moc'ing qrenderer.h..." | ||
25670 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"
" | ||
25671 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qrenderer.h" | ||
25672 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"" | ||
25673 | + /> | ||
25674 | + </FileConfiguration> | ||
25675 | + <FileConfiguration | ||
25676 | + Name="Debug|Win32" | ||
25677 | + > | ||
25678 | + <Tool | ||
25679 | + Name="VCCustomBuildTool" | ||
25680 | + Description="Moc'ing qrenderer.h..." | ||
25681 | + CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles\." -I"$(QTDIR)\include\." -I".\GeneratedFiles\$(ConfigurationName)\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\QtGui\." -I"C:\gstreamer\include\." -I"C:\gstreamer\include\glib-2.0\." -I"C:\gstreamer\lib\glib-2.0\include\." -I"C:\gstreamer\include\libxml2\." -I"C:\gstreamer\include\gstreamer-0.10\." ".\qrenderer.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"
" | ||
25682 | + AdditionalDependencies=""$(QTDIR)\bin\moc.exe";.\qrenderer.h" | ||
25683 | + Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_qrenderer.cpp"" | ||
25684 | + /> | ||
25685 | + </FileConfiguration> | ||
25686 | + </File> | ||
25687 | + </Filter> | ||
25688 | + <Filter | ||
25689 | + Name="Form Files" | ||
25690 | + Filter="ui" | ||
25691 | + UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}" | ||
25692 | + > | ||
25693 | + </Filter> | ||
25694 | + <Filter | ||
25695 | + Name="Resource Files" | ||
25696 | + Filter="qrc;*" | ||
25697 | + UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}" | ||
25698 | + ParseFiles="false" | ||
25699 | + > | ||
25700 | + </Filter> | ||
25701 | + <Filter | ||
25702 | + Name="Generated Files" | ||
25703 | + Filter="moc;h;cpp" | ||
25704 | + UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" | ||
25705 | + SourceControlFiles="false" | ||
25706 | + > | ||
25707 | + <File | ||
25708 | + RelativePath=".\GeneratedFiles\Debug\moc_gstthread.cpp" | ||
25709 | + > | ||
25710 | + </File> | ||
25711 | + <File | ||
25712 | + RelativePath=".\GeneratedFiles\Debug\moc_pipeline.cpp" | ||
25713 | + > | ||
25714 | + </File> | ||
25715 | + <File | ||
25716 | + RelativePath=".\GeneratedFiles\Debug\moc_qrenderer.cpp" | ||
25717 | + > | ||
25718 | + </File> | ||
25719 | + </Filter> | ||
25720 | + </Files> | ||
25721 | + <Globals> | ||
25722 | + <Global | ||
25723 | + Name="MocDir" | ||
25724 | + Value=".\GeneratedFiles\$(ConfigurationName)" | ||
25725 | + /> | ||
25726 | + <Global | ||
25727 | + Name="QtVersion" | ||
25728 | + Value="qt-4.3.0" | ||
25729 | + /> | ||
25730 | + <Global | ||
25731 | + Name="RccDir" | ||
25732 | + Value=".\GeneratedFiles" | ||
25733 | + /> | ||
25734 | + <Global | ||
25735 | + Name="UicDir" | ||
25736 | + Value=".\GeneratedFiles" | ||
25737 | + /> | ||
25738 | + </Globals> | ||
25739 | +</VisualStudioProject> | ||
25740 | diff --git a/tests/examples/sdl/Makefile.in b/tests/examples/sdl/Makefile.in | ||
25741 | index d8ce596..528893d 100644 | ||
25742 | --- a/tests/examples/sdl/Makefile.in | ||
25743 | +++ b/tests/examples/sdl/Makefile.in | ||
25744 | @@ -1,9 +1,9 @@ | ||
25745 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
25746 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
25747 | # @configure_input@ | ||
25748 | |||
25749 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
25750 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
25751 | -# Foundation, Inc. | ||
25752 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
25753 | +# Inc. | ||
25754 | # This Makefile.in is free software; the Free Software Foundation | ||
25755 | # gives unlimited permission to copy and/or distribute it, | ||
25756 | # with or without modifications, as long as this notice is preserved. | ||
25757 | @@ -34,6 +34,7 @@ PRE_UNINSTALL = : | ||
25758 | POST_UNINSTALL = : | ||
25759 | build_triplet = @build@ | ||
25760 | host_triplet = @host@ | ||
25761 | +target_triplet = @target@ | ||
25762 | noinst_PROGRAMS = $(am__EXEEXT_1) | ||
25763 | |||
25764 | #works on win32 and X | ||
25765 | @@ -45,7 +46,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
25766 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
25767 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
25768 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
25769 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
25770 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
25771 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
25772 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
25773 | @@ -86,8 +86,8 @@ sdlshare_OBJECTS = $(am_sdlshare_OBJECTS) | ||
25774 | am__DEPENDENCIES_1 = | ||
25775 | @HAVE_SDL_TRUE@sdlshare_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | ||
25776 | @HAVE_SDL_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
25777 | -AM_V_lt = $(am__v_lt_@AM_V@) | ||
25778 | -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
25779 | +AM_V_lt = $(am__v_lt_$(V)) | ||
25780 | +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
25781 | am__v_lt_0 = --silent | ||
25782 | sdlshare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
25783 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sdlshare_CFLAGS) \ | ||
25784 | @@ -102,21 +102,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
25785 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | ||
25786 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | ||
25787 | $(AM_CFLAGS) $(CFLAGS) | ||
25788 | -AM_V_CC = $(am__v_CC_@AM_V@) | ||
25789 | -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
25790 | +AM_V_CC = $(am__v_CC_$(V)) | ||
25791 | +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | ||
25792 | am__v_CC_0 = @echo " CC " $@; | ||
25793 | -AM_V_at = $(am__v_at_@AM_V@) | ||
25794 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
25795 | +AM_V_at = $(am__v_at_$(V)) | ||
25796 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
25797 | am__v_at_0 = @ | ||
25798 | CCLD = $(CC) | ||
25799 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
25800 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
25801 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
25802 | -AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
25803 | -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
25804 | +AM_V_CCLD = $(am__v_CCLD_$(V)) | ||
25805 | +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | ||
25806 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
25807 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
25808 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
25809 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
25810 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
25811 | am__v_GEN_0 = @echo " GEN " $@; | ||
25812 | SOURCES = $(sdlshare_SOURCES) | ||
25813 | DIST_SOURCES = $(am__sdlshare_SOURCES_DIST) | ||
25814 | @@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ | ||
25815 | EGREP = @EGREP@ | ||
25816 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
25817 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
25818 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
25819 | EXEEXT = @EXEEXT@ | ||
25820 | FFLAGS = @FFLAGS@ | ||
25821 | FGREP = @FGREP@ | ||
25822 | @@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
25823 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
25824 | GST_CURRENT = @GST_CURRENT@ | ||
25825 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
25826 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
25827 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
25828 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
25829 | GST_LIBS = @GST_LIBS@ | ||
25830 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
25831 | @@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
25832 | GST_LICENSE = @GST_LICENSE@ | ||
25833 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
25834 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
25835 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
25836 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
25837 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
25838 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
25839 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
25840 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
25841 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
25842 | @@ -281,7 +286,7 @@ NM = @NM@ | ||
25843 | NMEDIT = @NMEDIT@ | ||
25844 | OBJC = @OBJC@ | ||
25845 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
25846 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
25847 | +OBJCFLAGS = @OBJCFLAGS@ | ||
25848 | OBJDUMP = @OBJDUMP@ | ||
25849 | OBJEXT = @OBJEXT@ | ||
25850 | OPENGL_ES2 = @OPENGL_ES2@ | ||
25851 | @@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
25852 | VERSION = @VERSION@ | ||
25853 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
25854 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
25855 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
25856 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
25857 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
25858 | XGETTEXT = @XGETTEXT@ | ||
25859 | @@ -391,7 +397,11 @@ sbindir = @sbindir@ | ||
25860 | sharedstatedir = @sharedstatedir@ | ||
25861 | srcdir = @srcdir@ | ||
25862 | sysconfdir = @sysconfdir@ | ||
25863 | +target = @target@ | ||
25864 | target_alias = @target_alias@ | ||
25865 | +target_cpu = @target_cpu@ | ||
25866 | +target_os = @target_os@ | ||
25867 | +target_vendor = @target_vendor@ | ||
25868 | top_build_prefix = @top_build_prefix@ | ||
25869 | top_builddir = @top_builddir@ | ||
25870 | top_srcdir = @top_srcdir@ | ||
25871 | @@ -445,7 +455,7 @@ clean-noinstPROGRAMS: | ||
25872 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
25873 | echo " rm -f" $$list; \ | ||
25874 | rm -f $$list | ||
25875 | -sdlshare$(EXEEXT): $(sdlshare_OBJECTS) $(sdlshare_DEPENDENCIES) $(EXTRA_sdlshare_DEPENDENCIES) | ||
25876 | +sdlshare$(EXEEXT): $(sdlshare_OBJECTS) $(sdlshare_DEPENDENCIES) | ||
25877 | @rm -f sdlshare$(EXEEXT) | ||
25878 | $(AM_V_CCLD)$(sdlshare_LINK) $(sdlshare_OBJECTS) $(sdlshare_LDADD) $(LIBS) | ||
25879 | |||
25880 | @@ -460,37 +470,42 @@ distclean-compile: | ||
25881 | .c.o: | ||
25882 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
25883 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25884 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25885 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
25886 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25887 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25888 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< | ||
25889 | +@am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
25890 | |||
25891 | .c.obj: | ||
25892 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
25893 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25894 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25895 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
25896 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25897 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25898 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
25899 | +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
25900 | |||
25901 | .c.lo: | ||
25902 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
25903 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
25904 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
25905 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
25906 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
25907 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25908 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | ||
25909 | +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
25910 | |||
25911 | sdlshare-sdlshare.o: sdlshare.c | ||
25912 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -MT sdlshare-sdlshare.o -MD -MP -MF $(DEPDIR)/sdlshare-sdlshare.Tpo -c -o sdlshare-sdlshare.o `test -f 'sdlshare.c' || echo '$(srcdir)/'`sdlshare.c | ||
25913 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sdlshare-sdlshare.Tpo $(DEPDIR)/sdlshare-sdlshare.Po | ||
25914 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sdlshare.c' object='sdlshare-sdlshare.o' libtool=no @AMDEPBACKSLASH@ | ||
25915 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
25916 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdlshare.c' object='sdlshare-sdlshare.o' libtool=no @AMDEPBACKSLASH@ | ||
25917 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25918 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -c -o sdlshare-sdlshare.o `test -f 'sdlshare.c' || echo '$(srcdir)/'`sdlshare.c | ||
25919 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -c -o sdlshare-sdlshare.o `test -f 'sdlshare.c' || echo '$(srcdir)/'`sdlshare.c | ||
25920 | |||
25921 | sdlshare-sdlshare.obj: sdlshare.c | ||
25922 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -MT sdlshare-sdlshare.obj -MD -MP -MF $(DEPDIR)/sdlshare-sdlshare.Tpo -c -o sdlshare-sdlshare.obj `if test -f 'sdlshare.c'; then $(CYGPATH_W) 'sdlshare.c'; else $(CYGPATH_W) '$(srcdir)/sdlshare.c'; fi` | ||
25923 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sdlshare-sdlshare.Tpo $(DEPDIR)/sdlshare-sdlshare.Po | ||
25924 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sdlshare.c' object='sdlshare-sdlshare.obj' libtool=no @AMDEPBACKSLASH@ | ||
25925 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
25926 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdlshare.c' object='sdlshare-sdlshare.obj' libtool=no @AMDEPBACKSLASH@ | ||
25927 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25928 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -c -o sdlshare-sdlshare.obj `if test -f 'sdlshare.c'; then $(CYGPATH_W) 'sdlshare.c'; else $(CYGPATH_W) '$(srcdir)/sdlshare.c'; fi` | ||
25929 | +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdlshare_CFLAGS) $(CFLAGS) -c -o sdlshare-sdlshare.obj `if test -f 'sdlshare.c'; then $(CYGPATH_W) 'sdlshare.c'; else $(CYGPATH_W) '$(srcdir)/sdlshare.c'; fi` | ||
25930 | |||
25931 | mostlyclean-libtool: | ||
25932 | -rm -f *.lo | ||
25933 | @@ -594,15 +609,10 @@ install-am: all-am | ||
25934 | |||
25935 | installcheck: installcheck-am | ||
25936 | install-strip: | ||
25937 | - if test -z '$(STRIP)'; then \ | ||
25938 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
25939 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
25940 | - install; \ | ||
25941 | - else \ | ||
25942 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
25943 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
25944 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
25945 | - fi | ||
25946 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
25947 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
25948 | + `test -z '$(STRIP)' || \ | ||
25949 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
25950 | mostlyclean-generic: | ||
25951 | |||
25952 | clean-generic: | ||
25953 | diff --git a/tests/examples/sdl/sdl.sln b/tests/examples/sdl/sdl.sln | ||
25954 | new file mode 100644 | ||
25955 | index 0000000..0ecdd00 | ||
25956 | --- /dev/null | ||
25957 | +++ b/tests/examples/sdl/sdl.sln | ||
25958 | @@ -0,0 +1,20 @@ | ||
25959 | +? | ||
25960 | +Microsoft Visual Studio Solution File, Format Version 10.00 | ||
25961 | +# Visual Studio 2008 | ||
25962 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdlshare", "sdlshare.vcproj", "{2C29F5A2-5982-428A-8068-9A5788FD2277}" | ||
25963 | +EndProject | ||
25964 | +Global | ||
25965 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
25966 | + Debug|Win32 = Debug|Win32 | ||
25967 | + Release|Win32 = Release|Win32 | ||
25968 | + EndGlobalSection | ||
25969 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
25970 | + {2C29F5A2-5982-428A-8068-9A5788FD2277}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
25971 | + {2C29F5A2-5982-428A-8068-9A5788FD2277}.Debug|Win32.Build.0 = Debug|Win32 | ||
25972 | + {2C29F5A2-5982-428A-8068-9A5788FD2277}.Release|Win32.ActiveCfg = Release|Win32 | ||
25973 | + {2C29F5A2-5982-428A-8068-9A5788FD2277}.Release|Win32.Build.0 = Release|Win32 | ||
25974 | + EndGlobalSection | ||
25975 | + GlobalSection(SolutionProperties) = preSolution | ||
25976 | + HideSolutionNode = FALSE | ||
25977 | + EndGlobalSection | ||
25978 | +EndGlobal | ||
25979 | diff --git a/tests/examples/sdl/sdlshare.vcproj b/tests/examples/sdl/sdlshare.vcproj | ||
25980 | new file mode 100644 | ||
25981 | index 0000000..0a837af | ||
25982 | --- /dev/null | ||
25983 | +++ b/tests/examples/sdl/sdlshare.vcproj | ||
25984 | @@ -0,0 +1,199 @@ | ||
25985 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
25986 | +<VisualStudioProject | ||
25987 | + ProjectType="Visual C++" | ||
25988 | + Version="9,00" | ||
25989 | + Name="sdlshare" | ||
25990 | + ProjectGUID="{2C29F5A2-5982-428A-8068-9A5788FD2277}" | ||
25991 | + RootNamespace="sdlshare" | ||
25992 | + Keyword="Win32Proj" | ||
25993 | + TargetFrameworkVersion="196613" | ||
25994 | + > | ||
25995 | + <Platforms> | ||
25996 | + <Platform | ||
25997 | + Name="Win32" | ||
25998 | + /> | ||
25999 | + </Platforms> | ||
26000 | + <ToolFiles> | ||
26001 | + </ToolFiles> | ||
26002 | + <Configurations> | ||
26003 | + <Configuration | ||
26004 | + Name="Debug|Win32" | ||
26005 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
26006 | + IntermediateDirectory="$(ConfigurationName)" | ||
26007 | + ConfigurationType="1" | ||
26008 | + CharacterSet="1" | ||
26009 | + > | ||
26010 | + <Tool | ||
26011 | + Name="VCPreBuildEventTool" | ||
26012 | + /> | ||
26013 | + <Tool | ||
26014 | + Name="VCCustomBuildTool" | ||
26015 | + /> | ||
26016 | + <Tool | ||
26017 | + Name="VCXMLDataGeneratorTool" | ||
26018 | + /> | ||
26019 | + <Tool | ||
26020 | + Name="VCWebServiceProxyGeneratorTool" | ||
26021 | + /> | ||
26022 | + <Tool | ||
26023 | + Name="VCMIDLTool" | ||
26024 | + /> | ||
26025 | + <Tool | ||
26026 | + Name="VCCLCompilerTool" | ||
26027 | + Optimization="0" | ||
26028 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include" | ||
26029 | + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | ||
26030 | + MinimalRebuild="true" | ||
26031 | + BasicRuntimeChecks="3" | ||
26032 | + RuntimeLibrary="3" | ||
26033 | + UsePrecompiledHeader="0" | ||
26034 | + WarningLevel="3" | ||
26035 | + DebugInformationFormat="4" | ||
26036 | + /> | ||
26037 | + <Tool | ||
26038 | + Name="VCManagedResourceCompilerTool" | ||
26039 | + /> | ||
26040 | + <Tool | ||
26041 | + Name="VCResourceCompilerTool" | ||
26042 | + /> | ||
26043 | + <Tool | ||
26044 | + Name="VCPreLinkEventTool" | ||
26045 | + /> | ||
26046 | + <Tool | ||
26047 | + Name="VCLinkerTool" | ||
26048 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib sdl.lib sdlmain.lib opengl32.lib glu32.lib" | ||
26049 | + LinkIncremental="2" | ||
26050 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
26051 | + GenerateDebugInformation="true" | ||
26052 | + SubSystem="1" | ||
26053 | + TargetMachine="1" | ||
26054 | + /> | ||
26055 | + <Tool | ||
26056 | + Name="VCALinkTool" | ||
26057 | + /> | ||
26058 | + <Tool | ||
26059 | + Name="VCManifestTool" | ||
26060 | + /> | ||
26061 | + <Tool | ||
26062 | + Name="VCXDCMakeTool" | ||
26063 | + /> | ||
26064 | + <Tool | ||
26065 | + Name="VCBscMakeTool" | ||
26066 | + /> | ||
26067 | + <Tool | ||
26068 | + Name="VCFxCopTool" | ||
26069 | + /> | ||
26070 | + <Tool | ||
26071 | + Name="VCAppVerifierTool" | ||
26072 | + /> | ||
26073 | + <Tool | ||
26074 | + Name="VCPostBuildEventTool" | ||
26075 | + /> | ||
26076 | + </Configuration> | ||
26077 | + <Configuration | ||
26078 | + Name="Release|Win32" | ||
26079 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
26080 | + IntermediateDirectory="$(ConfigurationName)" | ||
26081 | + ConfigurationType="1" | ||
26082 | + CharacterSet="1" | ||
26083 | + WholeProgramOptimization="1" | ||
26084 | + > | ||
26085 | + <Tool | ||
26086 | + Name="VCPreBuildEventTool" | ||
26087 | + /> | ||
26088 | + <Tool | ||
26089 | + Name="VCCustomBuildTool" | ||
26090 | + /> | ||
26091 | + <Tool | ||
26092 | + Name="VCXMLDataGeneratorTool" | ||
26093 | + /> | ||
26094 | + <Tool | ||
26095 | + Name="VCWebServiceProxyGeneratorTool" | ||
26096 | + /> | ||
26097 | + <Tool | ||
26098 | + Name="VCMIDLTool" | ||
26099 | + /> | ||
26100 | + <Tool | ||
26101 | + Name="VCCLCompilerTool" | ||
26102 | + Optimization="2" | ||
26103 | + EnableIntrinsicFunctions="true" | ||
26104 | + AdditionalIncludeDirectories=""C:\gstreamer\include\glib-2.0";"C:\gstreamer\lib\glib-2.0\include";C:\gstreamer\include\libxml2;"C:\gstreamer\include\gstreamer-0.10";C:\gstreamer\include" | ||
26105 | + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | ||
26106 | + RuntimeLibrary="2" | ||
26107 | + EnableFunctionLevelLinking="true" | ||
26108 | + UsePrecompiledHeader="0" | ||
26109 | + WarningLevel="3" | ||
26110 | + DebugInformationFormat="3" | ||
26111 | + /> | ||
26112 | + <Tool | ||
26113 | + Name="VCManagedResourceCompilerTool" | ||
26114 | + /> | ||
26115 | + <Tool | ||
26116 | + Name="VCResourceCompilerTool" | ||
26117 | + /> | ||
26118 | + <Tool | ||
26119 | + Name="VCPreLinkEventTool" | ||
26120 | + /> | ||
26121 | + <Tool | ||
26122 | + Name="VCLinkerTool" | ||
26123 | + AdditionalDependencies="gstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib sdl.lib sdlmain.lib opengl32.lib glu32.lib" | ||
26124 | + LinkIncremental="1" | ||
26125 | + AdditionalLibraryDirectories="C:\gstreamer\lib" | ||
26126 | + GenerateDebugInformation="true" | ||
26127 | + SubSystem="1" | ||
26128 | + OptimizeReferences="2" | ||
26129 | + EnableCOMDATFolding="2" | ||
26130 | + TargetMachine="1" | ||
26131 | + /> | ||
26132 | + <Tool | ||
26133 | + Name="VCALinkTool" | ||
26134 | + /> | ||
26135 | + <Tool | ||
26136 | + Name="VCManifestTool" | ||
26137 | + /> | ||
26138 | + <Tool | ||
26139 | + Name="VCXDCMakeTool" | ||
26140 | + /> | ||
26141 | + <Tool | ||
26142 | + Name="VCBscMakeTool" | ||
26143 | + /> | ||
26144 | + <Tool | ||
26145 | + Name="VCFxCopTool" | ||
26146 | + /> | ||
26147 | + <Tool | ||
26148 | + Name="VCAppVerifierTool" | ||
26149 | + /> | ||
26150 | + <Tool | ||
26151 | + Name="VCPostBuildEventTool" | ||
26152 | + /> | ||
26153 | + </Configuration> | ||
26154 | + </Configurations> | ||
26155 | + <References> | ||
26156 | + </References> | ||
26157 | + <Files> | ||
26158 | + <Filter | ||
26159 | + Name="Source Files" | ||
26160 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
26161 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
26162 | + > | ||
26163 | + <File | ||
26164 | + RelativePath=".\sdlshare.c" | ||
26165 | + > | ||
26166 | + </File> | ||
26167 | + </Filter> | ||
26168 | + <Filter | ||
26169 | + Name="Header Files" | ||
26170 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
26171 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
26172 | + > | ||
26173 | + </Filter> | ||
26174 | + <Filter | ||
26175 | + Name="Resource Files" | ||
26176 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
26177 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
26178 | + > | ||
26179 | + </Filter> | ||
26180 | + </Files> | ||
26181 | + <Globals> | ||
26182 | + </Globals> | ||
26183 | +</VisualStudioProject> | ||
26184 | diff --git a/tests/icles/Makefile.in b/tests/icles/Makefile.in | ||
26185 | index 8680405..0b38f41 100644 | ||
26186 | --- a/tests/icles/Makefile.in | ||
26187 | +++ b/tests/icles/Makefile.in | ||
26188 | @@ -1,9 +1,9 @@ | ||
26189 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
26190 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26191 | # @configure_input@ | ||
26192 | |||
26193 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26194 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
26195 | -# Foundation, Inc. | ||
26196 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26197 | +# Inc. | ||
26198 | # This Makefile.in is free software; the Free Software Foundation | ||
26199 | # gives unlimited permission to copy and/or distribute it, | ||
26200 | # with or without modifications, as long as this notice is preserved. | ||
26201 | @@ -33,6 +33,7 @@ PRE_UNINSTALL = : | ||
26202 | POST_UNINSTALL = : | ||
26203 | build_triplet = @build@ | ||
26204 | host_triplet = @host@ | ||
26205 | +target_triplet = @target@ | ||
26206 | subdir = tests/icles | ||
26207 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
26208 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
26209 | @@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ | ||
26210 | $(top_srcdir)/common/m4/as-auto-alt.m4 \ | ||
26211 | $(top_srcdir)/common/m4/as-compiler-flag.m4 \ | ||
26212 | $(top_srcdir)/common/m4/as-libtool.m4 \ | ||
26213 | - $(top_srcdir)/common/m4/as-objc.m4 \ | ||
26214 | $(top_srcdir)/common/m4/as-python.m4 \ | ||
26215 | $(top_srcdir)/common/m4/as-scrub-include.m4 \ | ||
26216 | $(top_srcdir)/common/m4/as-version.m4 \ | ||
26217 | @@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d | ||
26218 | CONFIG_HEADER = $(top_builddir)/config.h | ||
26219 | CONFIG_CLEAN_FILES = | ||
26220 | CONFIG_CLEAN_VPATH_FILES = | ||
26221 | -AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
26222 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
26223 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
26224 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
26225 | am__v_GEN_0 = @echo " GEN " $@; | ||
26226 | -AM_V_at = $(am__v_at_@AM_V@) | ||
26227 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
26228 | +AM_V_at = $(am__v_at_$(V)) | ||
26229 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
26230 | am__v_at_0 = @ | ||
26231 | SOURCES = | ||
26232 | DIST_SOURCES = | ||
26233 | @@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ | ||
26234 | EGREP = @EGREP@ | ||
26235 | ERROR_CFLAGS = @ERROR_CFLAGS@ | ||
26236 | ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ | ||
26237 | +ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ | ||
26238 | EXEEXT = @EXEEXT@ | ||
26239 | FFLAGS = @FFLAGS@ | ||
26240 | FGREP = @FGREP@ | ||
26241 | @@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ | ||
26242 | GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ | ||
26243 | GST_CURRENT = @GST_CURRENT@ | ||
26244 | GST_CXXFLAGS = @GST_CXXFLAGS@ | ||
26245 | +GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ | ||
26246 | +GST_FSL_LIBS = @GST_FSL_LIBS@ | ||
26247 | GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ | ||
26248 | GST_LIBS = @GST_LIBS@ | ||
26249 | GST_LIBVERSION = @GST_LIBVERSION@ | ||
26250 | @@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ | ||
26251 | GST_LICENSE = @GST_LICENSE@ | ||
26252 | GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ | ||
26253 | GST_MAJORMINOR = @GST_MAJORMINOR@ | ||
26254 | +GST_OBJCFLAGS = @GST_OBJCFLAGS@ | ||
26255 | GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ | ||
26256 | GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ | ||
26257 | +GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ | ||
26258 | GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ | ||
26259 | GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ | ||
26260 | GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ | ||
26261 | @@ -240,7 +245,7 @@ NM = @NM@ | ||
26262 | NMEDIT = @NMEDIT@ | ||
26263 | OBJC = @OBJC@ | ||
26264 | OBJCDEPMODE = @OBJCDEPMODE@ | ||
26265 | -OBJC_LDFLAGS = @OBJC_LDFLAGS@ | ||
26266 | +OBJCFLAGS = @OBJCFLAGS@ | ||
26267 | OBJDUMP = @OBJDUMP@ | ||
26268 | OBJEXT = @OBJEXT@ | ||
26269 | OPENGL_ES2 = @OPENGL_ES2@ | ||
26270 | @@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ | ||
26271 | VERSION = @VERSION@ | ||
26272 | WARNING_CFLAGS = @WARNING_CFLAGS@ | ||
26273 | WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ | ||
26274 | +WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ | ||
26275 | XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ | ||
26276 | XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ | ||
26277 | XGETTEXT = @XGETTEXT@ | ||
26278 | @@ -350,7 +356,11 @@ sbindir = @sbindir@ | ||
26279 | sharedstatedir = @sharedstatedir@ | ||
26280 | srcdir = @srcdir@ | ||
26281 | sysconfdir = @sysconfdir@ | ||
26282 | +target = @target@ | ||
26283 | target_alias = @target_alias@ | ||
26284 | +target_cpu = @target_cpu@ | ||
26285 | +target_os = @target_os@ | ||
26286 | +target_vendor = @target_vendor@ | ||
26287 | top_build_prefix = @top_build_prefix@ | ||
26288 | top_builddir = @top_builddir@ | ||
26289 | top_srcdir = @top_srcdir@ | ||
26290 | @@ -444,15 +454,10 @@ install-am: all-am | ||
26291 | |||
26292 | installcheck: installcheck-am | ||
26293 | install-strip: | ||
26294 | - if test -z '$(STRIP)'; then \ | ||
26295 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
26296 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
26297 | - install; \ | ||
26298 | - else \ | ||
26299 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
26300 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
26301 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
26302 | - fi | ||
26303 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
26304 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
26305 | + `test -z '$(STRIP)' || \ | ||
26306 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
26307 | mostlyclean-generic: | ||
26308 | |||
26309 | clean-generic: | ||
26310 | diff --git a/tests/pipelines b/tests/pipelines | ||
26311 | new file mode 100644 | ||
26312 | index 0000000..f0739ce | ||
26313 | --- /dev/null | ||
26314 | +++ b/tests/pipelines | ||
26315 | @@ -0,0 +1,79 @@ | ||
26316 | +//list of pipelines that show the gst-plugins-gl capabilities | ||
26317 | +//(can use gst-launch-0.10 --gst-debug=gldisplay:3 pipeline) | ||
26318 | + | ||
26319 | +gst-launch-0.10 videotestsrc ! glimagesink | ||
26320 | +gst-launch-0.10 videotestsrc num_buffers = 200 ! glimagesink | ||
26321 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)I420, width=201, height=103" ! glimagesink | ||
26322 | +gst-launch-0.10 videotestsrc ! "video/x-raw-rgb, width=640, height=480" ! glimagesink | ||
26323 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YV12" ! glimagesink | ||
26324 | + | ||
26325 | +gst-launch-0.10 gltestsrc ! glimagesink | ||
26326 | +gst-launch-0.10 gltestsrc ! "video/x-raw-gl, width=720, height=576" ! glimagesink | ||
26327 | + | ||
26328 | +gst-launch-0.10 videotestsrc ! glupload ! glimagesink | ||
26329 | +gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=720, height=576" ! glimagesink | ||
26330 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)AYUV, width=380, height=288" ! glupload ! "video/x-raw-gl, width=720, height=576" ! glimagesink | ||
26331 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)I420, width=720,height=576" ! glupload ! "video/x-raw-gl, width=240, height=320" ! glimagesink | ||
26332 | + | ||
26333 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glimagesink | ||
26334 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glfiltercube ! glimagesink | ||
26335 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glimagesink force-aspect-ratio=1 | ||
26336 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube red=1.0 green=0.5 blue=0.1 ! glfiltercube red=0.6 green=0.9 blue=1.0 ! glimagesink | ||
26337 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube red=0.6 green=0.2 blue=1.0 ! glfiltercube fovy=50.0 znear=0.2 zfar=1000.0 ! glimagesink | ||
26338 | +gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=720, height=576" ! glfiltercube ! "video/x-raw-gl, width=320, height=240" ! glimagesink | ||
26339 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)AYUV, width=320, height=240" ! glupload ! "video/x-raw-gl, width=720, height=576" ! glfiltercube ! "video/x-raw-gl, width=320, height=240" ! glimagesink | ||
26340 | +gst-launch-0.10 videotestsrc ! "video/x-raw-rgb, width=320, height=240" ! glupload ! "video/x-raw-gl, width=800, height=600" ! glimagesink | ||
26341 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YUY2, width=320, height=240" ! glupload ! "video/x-raw-gl, width=800, height=600" ! glimagesink | ||
26342 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)I420, width=320, height=240" ! glupload ! "video/x-raw-gl, width=800, height=600" ! glimagesink | ||
26343 | +gst-launch-0.10 gltestsrc ! glfiltercube ! glimagesink | ||
26344 | + | ||
26345 | +gst-launch-0.10 videotestsrc ! glupload ! glfilterapp ! glimagesink | ||
26346 | +gst-launch-0.10 gltestsrc ! glfilterapp ! glimagesink | ||
26347 | + | ||
26348 | +gst-launch-0.10 videotestsrc ! glcolorscale ! ximagesink | ||
26349 | +gst-launch-0.10 videotestsrc ! glcolorscale ! glimagesink | ||
26350 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YV12, width=640, height=480" ! glcolorscale ! "video/x-raw-rgb, width=320, height=240" ! ximagesink | ||
26351 | +gst-launch-0.10 gltestsrc ! gldownload ! glcolorscale ! glimagesink | ||
26352 | + | ||
26353 | +gst-launch-0.10 videotestsrc ! glupload ! gldownload ! ximagesink | ||
26354 | +gst-launch-0.10 videotestsrc ! glupload ! gldownload ! glimagesink | ||
26355 | +gst-launch-0.10 videotestsrc ! glupload ! gldownload ! "video/x-raw-yuv, format=(fourcc)UYVY" ! glimagesink | ||
26356 | +gst-launch-0.10 videotestsrc ! glupload ! gldownload ! "video/x-raw-yuv, format=(fourcc)AYUV" ! glimagesink | ||
26357 | + | ||
26358 | +gst-launch-0.10 videotestsrc num_buffers=200 ! glupload ! video/x-raw-gl, width=720, height=576 ! glfiltercube ! video/x-raw-gl, width=320, height=240 ! gldownload ! ffenc_mpeg4 ! avimux ! filesink location="record.avi" | ||
26359 | +gst-launch-0.10 gltestsrc ! glfiltercube ! gldownload ! ximagesink | ||
26360 | +gst-launch-0.10 videotestsrc ! glupload ! gldownload ! glupload ! gldownload ! glupload ! glimagesink | ||
26361 | + | ||
26362 | +gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glimagesink t. ! queue ! glimagesink | ||
26363 | +gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glupload ! glfiltercube ! glimagesink | ||
26364 | +gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glupload ! glfiltercube ! glimagesink t. ! queue ! glcolorscale ! glimagesink | ||
26365 | + | ||
26366 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glfilterlaplacian ! glimagesink | ||
26367 | +gst-launch-0.10 videotestsrc ! glupload ! glfilterlaplacian ! glfiltercube ! glimagesink | ||
26368 | + | ||
26369 | +gst-launch-0.10 videotestsrc ! glupload ! glfilterblur ! glimagesink | ||
26370 | + | ||
26371 | +gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! gleffects effect=3 ! glimagesink | ||
26372 | + | ||
26373 | +gst-launch-0.10 videotestsrc ! glupload ! glbumper location=normalmap.png ! glimagesink | ||
26374 | +gst-launch-0.10 videotestsrc ! glupload ! glbumper location=bumpwall.png ! "video/x-raw-gl, width=1200, height=800" ! glimagesink | ||
26375 | + | ||
26376 | +gst-launch-0.10 videotestsrc ! glupload ! glfilterglass ! glimagesink | ||
26377 | +gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=640, height=480" ! glfilterglass ! glimagesink | ||
26378 | + | ||
26379 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YUY2" ! glupload ! queue ! glmosaic name=m ! glimagesink videotestsrc pattern=12 ! "video/x-raw-yuv, format=(fourcc)I420, framerate=(fraction)5/1, width=100, height=200" ! glupload ! queue ! m. videotestsrc ! "video/x-raw-rgb, framerate=(fraction)15/1, width=1500, height=1500" ! glupload ! gleffects effect=3 ! queue ! m. videotestsrc ! glupload ! gleffects effect=2 ! queue ! m. videotestsrc ! glupload ! glfiltercube ! queue ! m. videotestsrc ! glupload ! gleffects effect=6 ! queue ! m. | ||
26380 | + | ||
26381 | +gst-launch-0.10 -v videotestsrc ! glupload ! gloverlay location=image.png proportion-png=40 proportion-video=40 xpos-png=75 ypos-png=50 xpos-video=30 ypos-video=50 rotate-png=2 rotate-video=2 angle-png=-15 angle-video=15 ! glimagesink | ||
26382 | + | ||
26383 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, pixel-aspect-ratio=(fraction)5/2" ! glimagesink | ||
26384 | + | ||
26385 | +gst-launch-0.10 videotestsrc ! "video/x-raw-yuv,format=(fourcc)I420,width=720,height=576,pixel-aspect-ratio=(fraction)64/45" ! glupload ! glimagesink | ||
26386 | + | ||
26387 | +gst-launch-0.10 audiotestsrc ! libvisual_gl_projectM ! "video/x-raw-gl,width=800, height=600" ! gleffects effect=tunnel ! glimagesink | ||
26388 | + | ||
26389 | +gst-launch-0.10 audiotestsrc ! libvisual_gl_lv_gltest ! gldownload ! glimagesink | ||
26390 | + | ||
26391 | +gst-launch-0.10 audiotestsrc ! libvisual_gl_lv_gltest ! gldownload ! ximagesink | ||
26392 | + | ||
26393 | +// OPENGL ES 2.0 | ||
26394 | +LD_LIBRARY_PATH=/home/julien/dev/SDKPackage_OGLES2/Builds/OGLES2/LinuxX86/Lib/:/usr/lib/nvidia-current-updates/ gst-launch-0.10 videotestsrc ! glupload ! gleffects effect=2 ! glimagesink | ||
26395 | diff --git a/unix/codeblocks/gstopengl/gstopengl.cbp b/unix/codeblocks/gstopengl/gstopengl.cbp | ||
26396 | new file mode 100644 | ||
26397 | index 0000000..7e5b6a6 | ||
26398 | --- /dev/null | ||
26399 | +++ b/unix/codeblocks/gstopengl/gstopengl.cbp | ||
26400 | @@ -0,0 +1,236 @@ | ||
26401 | +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
26402 | +<CodeBlocks_project_file> | ||
26403 | + <FileVersion major="1" minor="6" /> | ||
26404 | + <Project> | ||
26405 | + <Option title="gstopengl" /> | ||
26406 | + <Option pch_mode="2" /> | ||
26407 | + <Option compiler="gcc" /> | ||
26408 | + <Build> | ||
26409 | + <Target title="Debug"> | ||
26410 | + <Option output="bin/Debug/libgstopengl" prefix_auto="1" extension_auto="1" /> | ||
26411 | + <Option object_output="obj/Debug/" /> | ||
26412 | + <Option type="3" /> | ||
26413 | + <Option compiler="gcc" /> | ||
26414 | + <Option parameters="videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glimagesink" /> | ||
26415 | + <Option host_application="gst-launch-0.10" /> | ||
26416 | + <Option createDefFile="1" /> | ||
26417 | + <Option createStaticLib="1" /> | ||
26418 | + <Compiler> | ||
26419 | + <Add option="-Wall" /> | ||
26420 | + <Add option="-g" /> | ||
26421 | + </Compiler> | ||
26422 | + </Target> | ||
26423 | + <Target title="Release"> | ||
26424 | + <Option output="bin/Release/libgstopengl" prefix_auto="1" extension_auto="1" /> | ||
26425 | + <Option object_output="obj/Release/" /> | ||
26426 | + <Option type="3" /> | ||
26427 | + <Option compiler="gcc" /> | ||
26428 | + <Option createDefFile="1" /> | ||
26429 | + <Option createStaticLib="1" /> | ||
26430 | + <Compiler> | ||
26431 | + <Add option="-O2" /> | ||
26432 | + </Compiler> | ||
26433 | + <Linker> | ||
26434 | + <Add option="-s" /> | ||
26435 | + </Linker> | ||
26436 | + </Target> | ||
26437 | + </Build> | ||
26438 | + <Compiler> | ||
26439 | + <Add option="-Wall" /> | ||
26440 | + <Add option="-g" /> | ||
26441 | + <Add option="-DHAVE_CONFIG_H" /> | ||
26442 | + <Add directory="/usr/lib/glib-2.0/include" /> | ||
26443 | + <Add directory="/usr/include/glib-2.0" /> | ||
26444 | + <Add directory="/usr/include/libxml2" /> | ||
26445 | + <Add directory="/usr/include/gstreamer-0.10" /> | ||
26446 | + <Add directory="/usr/local/include/gstreamer-0.10" /> | ||
26447 | + <Add directory="../../../gst-libs/gst/gl" /> | ||
26448 | + <Add directory="../../../gst/gl" /> | ||
26449 | + <Add directory="../../.." /> | ||
26450 | + <Add directory="../../../gst/gl/effects" /> | ||
26451 | + <Add directory="../../../gst-libs" /> | ||
26452 | + <Add directory="/usr/lib/i386-linux-gnu/glib-2.0/include" /> | ||
26453 | + </Compiler> | ||
26454 | + <Linker> | ||
26455 | + <Add library="glib-2.0" /> | ||
26456 | + <Add library="gobject-2.0" /> | ||
26457 | + <Add library="gthread-2.0" /> | ||
26458 | + <Add library="gstreamer-0.10" /> | ||
26459 | + <Add library="gstbase-0.10" /> | ||
26460 | + <Add library="gstvideo-0.10" /> | ||
26461 | + <Add library="gstinterfaces-0.10" /> | ||
26462 | + <Add library="gstcontroller-0.10" /> | ||
26463 | + <Add library="png" /> | ||
26464 | + <Add library="GLEW" /> | ||
26465 | + <Add library="GLU" /> | ||
26466 | + <Add library="GL" /> | ||
26467 | + <Add library="jpeg" /> | ||
26468 | + </Linker> | ||
26469 | + <Unit filename="../../../gst-libs/gst/gettext.h" /> | ||
26470 | + <Unit filename="../../../gst-libs/gst/gl/gstglbuffer.c"> | ||
26471 | + <Option compilerVar="CC" /> | ||
26472 | + </Unit> | ||
26473 | + <Unit filename="../../../gst-libs/gst/gl/gstglbuffer.h" /> | ||
26474 | + <Unit filename="../../../gst-libs/gst/gl/gstgldisplay.c"> | ||
26475 | + <Option compilerVar="CC" /> | ||
26476 | + </Unit> | ||
26477 | + <Unit filename="../../../gst-libs/gst/gl/gstgldisplay.h" /> | ||
26478 | + <Unit filename="../../../gst-libs/gst/gl/gstglfilter.c"> | ||
26479 | + <Option compilerVar="CC" /> | ||
26480 | + </Unit> | ||
26481 | + <Unit filename="../../../gst-libs/gst/gl/gstglfilter.h" /> | ||
26482 | + <Unit filename="../../../gst-libs/gst/gl/gstglmixer.c"> | ||
26483 | + <Option compilerVar="CC" /> | ||
26484 | + </Unit> | ||
26485 | + <Unit filename="../../../gst-libs/gst/gl/gstglmixer.h" /> | ||
26486 | + <Unit filename="../../../gst-libs/gst/gl/gstglshader.c"> | ||
26487 | + <Option compilerVar="CC" /> | ||
26488 | + </Unit> | ||
26489 | + <Unit filename="../../../gst-libs/gst/gl/gstglshader.h" /> | ||
26490 | + <Unit filename="../../../gst-libs/gst/gl/gstglshadervariables.c"> | ||
26491 | + <Option compilerVar="CC" /> | ||
26492 | + </Unit> | ||
26493 | + <Unit filename="../../../gst-libs/gst/gl/gstglshadervariables.h" /> | ||
26494 | + <Unit filename="../../../gst-libs/gst/gl/gstglwindow.h" /> | ||
26495 | + <Unit filename="../../../gst-libs/gst/gl/gstglwindow_x11.c"> | ||
26496 | + <Option compilerVar="CC" /> | ||
26497 | + </Unit> | ||
26498 | + <Unit filename="../../../gst-libs/gst/gst-i18n-plugin.h" /> | ||
26499 | + <Unit filename="../../../gst/gl/effects/gstgleffectbulge.c"> | ||
26500 | + <Option compilerVar="CC" /> | ||
26501 | + </Unit> | ||
26502 | + <Unit filename="../../../gst/gl/effects/gstgleffectfisheye.c"> | ||
26503 | + <Option compilerVar="CC" /> | ||
26504 | + </Unit> | ||
26505 | + <Unit filename="../../../gst/gl/effects/gstgleffectglow.c"> | ||
26506 | + <Option compilerVar="CC" /> | ||
26507 | + </Unit> | ||
26508 | + <Unit filename="../../../gst/gl/effects/gstgleffectidentity.c"> | ||
26509 | + <Option compilerVar="CC" /> | ||
26510 | + </Unit> | ||
26511 | + <Unit filename="../../../gst/gl/effects/gstgleffectlumatocurve.c"> | ||
26512 | + <Option compilerVar="CC" /> | ||
26513 | + </Unit> | ||
26514 | + <Unit filename="../../../gst/gl/effects/gstgleffectlumatocurve.h" /> | ||
26515 | + <Unit filename="../../../gst/gl/effects/gstgleffectmirror.c"> | ||
26516 | + <Option compilerVar="CC" /> | ||
26517 | + </Unit> | ||
26518 | + <Unit filename="../../../gst/gl/effects/gstgleffectrgbtocurve.c"> | ||
26519 | + <Option compilerVar="CC" /> | ||
26520 | + </Unit> | ||
26521 | + <Unit filename="../../../gst/gl/effects/gstgleffectscurves.h" /> | ||
26522 | + <Unit filename="../../../gst/gl/effects/gstgleffectsin.c"> | ||
26523 | + <Option compilerVar="CC" /> | ||
26524 | + </Unit> | ||
26525 | + <Unit filename="../../../gst/gl/effects/gstgleffectsquare.c"> | ||
26526 | + <Option compilerVar="CC" /> | ||
26527 | + </Unit> | ||
26528 | + <Unit filename="../../../gst/gl/effects/gstgleffectsqueeze.c"> | ||
26529 | + <Option compilerVar="CC" /> | ||
26530 | + </Unit> | ||
26531 | + <Unit filename="../../../gst/gl/effects/gstgleffectssources.c"> | ||
26532 | + <Option compilerVar="CC" /> | ||
26533 | + </Unit> | ||
26534 | + <Unit filename="../../../gst/gl/effects/gstgleffectssources.h" /> | ||
26535 | + <Unit filename="../../../gst/gl/effects/gstgleffectstretch.c"> | ||
26536 | + <Option compilerVar="CC" /> | ||
26537 | + </Unit> | ||
26538 | + <Unit filename="../../../gst/gl/effects/gstgleffecttunnel.c"> | ||
26539 | + <Option compilerVar="CC" /> | ||
26540 | + </Unit> | ||
26541 | + <Unit filename="../../../gst/gl/effects/gstgleffecttwirl.c"> | ||
26542 | + <Option compilerVar="CC" /> | ||
26543 | + </Unit> | ||
26544 | + <Unit filename="../../../gst/gl/effects/gstgleffectxray.c"> | ||
26545 | + <Option compilerVar="CC" /> | ||
26546 | + </Unit> | ||
26547 | + <Unit filename="../../../gst/gl/gltestsrc.c"> | ||
26548 | + <Option compilerVar="CC" /> | ||
26549 | + </Unit> | ||
26550 | + <Unit filename="../../../gst/gl/gltestsrc.h" /> | ||
26551 | + <Unit filename="../../../gst/gl/gstglbumper.c"> | ||
26552 | + <Option compilerVar="CC" /> | ||
26553 | + </Unit> | ||
26554 | + <Unit filename="../../../gst/gl/gstglbumper.h" /> | ||
26555 | + <Unit filename="../../../gst/gl/gstglcolorscale.c"> | ||
26556 | + <Option compilerVar="CC" /> | ||
26557 | + </Unit> | ||
26558 | + <Unit filename="../../../gst/gl/gstglcolorscale.h" /> | ||
26559 | + <Unit filename="../../../gst/gl/gstgldeinterlace.c"> | ||
26560 | + <Option compilerVar="CC" /> | ||
26561 | + </Unit> | ||
26562 | + <Unit filename="../../../gst/gl/gstgldifferencematte.c"> | ||
26563 | + <Option compilerVar="CC" /> | ||
26564 | + </Unit> | ||
26565 | + <Unit filename="../../../gst/gl/gstgldownload.c"> | ||
26566 | + <Option compilerVar="CC" /> | ||
26567 | + </Unit> | ||
26568 | + <Unit filename="../../../gst/gl/gstgldownload.h" /> | ||
26569 | + <Unit filename="../../../gst/gl/gstgleffects.c"> | ||
26570 | + <Option compilerVar="CC" /> | ||
26571 | + </Unit> | ||
26572 | + <Unit filename="../../../gst/gl/gstgleffects.h" /> | ||
26573 | + <Unit filename="../../../gst/gl/gstglfilterapp.c"> | ||
26574 | + <Option compilerVar="CC" /> | ||
26575 | + </Unit> | ||
26576 | + <Unit filename="../../../gst/gl/gstglfilterapp.h" /> | ||
26577 | + <Unit filename="../../../gst/gl/gstglfilterblur.c"> | ||
26578 | + <Option compilerVar="CC" /> | ||
26579 | + </Unit> | ||
26580 | + <Unit filename="../../../gst/gl/gstglfiltercube.c"> | ||
26581 | + <Option compilerVar="CC" /> | ||
26582 | + </Unit> | ||
26583 | + <Unit filename="../../../gst/gl/gstglfiltercube.h" /> | ||
26584 | + <Unit filename="../../../gst/gl/gstglfilterglass.c"> | ||
26585 | + <Option compilerVar="CC" /> | ||
26586 | + </Unit> | ||
26587 | + <Unit filename="../../../gst/gl/gstglfilterglass.h" /> | ||
26588 | + <Unit filename="../../../gst/gl/gstglfilterlaplacian.c"> | ||
26589 | + <Option compilerVar="CC" /> | ||
26590 | + </Unit> | ||
26591 | + <Unit filename="../../../gst/gl/gstglfilterlaplacian.h" /> | ||
26592 | + <Unit filename="../../../gst/gl/gstglfilterreflectedscreen.c"> | ||
26593 | + <Option compilerVar="CC" /> | ||
26594 | + </Unit> | ||
26595 | + <Unit filename="../../../gst/gl/gstglfilterreflectedscreen.h" /> | ||
26596 | + <Unit filename="../../../gst/gl/gstglfiltershader.c"> | ||
26597 | + <Option compilerVar="CC" /> | ||
26598 | + </Unit> | ||
26599 | + <Unit filename="../../../gst/gl/gstglfiltershader.h" /> | ||
26600 | + <Unit filename="../../../gst/gl/gstglfiltersobel.c"> | ||
26601 | + <Option compilerVar="CC" /> | ||
26602 | + </Unit> | ||
26603 | + <Unit filename="../../../gst/gl/gstglimagesink.c"> | ||
26604 | + <Option compilerVar="CC" /> | ||
26605 | + </Unit> | ||
26606 | + <Unit filename="../../../gst/gl/gstglimagesink.h" /> | ||
26607 | + <Unit filename="../../../gst/gl/gstglmosaic.c"> | ||
26608 | + <Option compilerVar="CC" /> | ||
26609 | + </Unit> | ||
26610 | + <Unit filename="../../../gst/gl/gstglmosaic.h" /> | ||
26611 | + <Unit filename="../../../gst/gl/gstgloverlay.c"> | ||
26612 | + <Option compilerVar="CC" /> | ||
26613 | + </Unit> | ||
26614 | + <Unit filename="../../../gst/gl/gstgltestsrc.c"> | ||
26615 | + <Option compilerVar="CC" /> | ||
26616 | + </Unit> | ||
26617 | + <Unit filename="../../../gst/gl/gstgltestsrc.h" /> | ||
26618 | + <Unit filename="../../../gst/gl/gstglupload.c"> | ||
26619 | + <Option compilerVar="CC" /> | ||
26620 | + </Unit> | ||
26621 | + <Unit filename="../../../gst/gl/gstglupload.h" /> | ||
26622 | + <Unit filename="../../../gst/gl/gstopengl.c"> | ||
26623 | + <Option compilerVar="CC" /> | ||
26624 | + </Unit> | ||
26625 | + <Unit filename="../../gst/gl/gstgldeinterlace.h" /> | ||
26626 | + <Extensions> | ||
26627 | + <code_completion /> | ||
26628 | + <envvars /> | ||
26629 | + <lib_finder disable_auto="1" /> | ||
26630 | + <debugger /> | ||
26631 | + <wxsmith version="1"> | ||
26632 | + <gui name="wxWidgets" src="" main="" init_handlers="necessary" language="CPP" /> | ||
26633 | + </wxsmith> | ||
26634 | + </Extensions> | ||
26635 | + </Project> | ||
26636 | +</CodeBlocks_project_file> | ||
26637 | diff --git a/unixES/codeblocks/gstopengl.cbp b/unixES/codeblocks/gstopengl.cbp | ||
26638 | new file mode 100644 | ||
26639 | index 0000000..4e4dec1 | ||
26640 | --- /dev/null | ||
26641 | +++ b/unixES/codeblocks/gstopengl.cbp | ||
26642 | @@ -0,0 +1,137 @@ | ||
26643 | +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
26644 | +<CodeBlocks_project_file> | ||
26645 | + <FileVersion major="1" minor="6" /> | ||
26646 | + <Project> | ||
26647 | + <Option title="gstopengl" /> | ||
26648 | + <Option pch_mode="2" /> | ||
26649 | + <Option compiler="gcc" /> | ||
26650 | + <Build> | ||
26651 | + <Target title="Debug"> | ||
26652 | + <Option output="bin/Debug/libgstopengl" prefix_auto="1" extension_auto="1" /> | ||
26653 | + <Option object_output="obj/Debug/" /> | ||
26654 | + <Option type="3" /> | ||
26655 | + <Option compiler="gcc" /> | ||
26656 | + <Option parameters="videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glimagesink" /> | ||
26657 | + <Option host_application="gst-launch-0.10" /> | ||
26658 | + <Option createDefFile="1" /> | ||
26659 | + <Option createStaticLib="1" /> | ||
26660 | + <Compiler> | ||
26661 | + <Add option="-Wall" /> | ||
26662 | + <Add option="-g" /> | ||
26663 | + </Compiler> | ||
26664 | + </Target> | ||
26665 | + <Target title="Release"> | ||
26666 | + <Option output="bin/Release/libgstopengl" prefix_auto="1" extension_auto="1" /> | ||
26667 | + <Option object_output="obj/Release/" /> | ||
26668 | + <Option type="3" /> | ||
26669 | + <Option compiler="gcc" /> | ||
26670 | + <Option createDefFile="1" /> | ||
26671 | + <Option createStaticLib="1" /> | ||
26672 | + <Compiler> | ||
26673 | + <Add option="-O2" /> | ||
26674 | + </Compiler> | ||
26675 | + <Linker> | ||
26676 | + <Add option="-s" /> | ||
26677 | + </Linker> | ||
26678 | + </Target> | ||
26679 | + </Build> | ||
26680 | + <Compiler> | ||
26681 | + <Add option="-Wall" /> | ||
26682 | + <Add option="-g" /> | ||
26683 | + <Add option="-DHAVE_CONFIG_H" /> | ||
26684 | + <Add option="-DOPENGL_ES2" /> | ||
26685 | + <Add directory="/usr/lib/glib-2.0/include" /> | ||
26686 | + <Add directory="/usr/include/glib-2.0" /> | ||
26687 | + <Add directory="/usr/include/libxml2" /> | ||
26688 | + <Add directory="/usr/include/gstreamer-0.10" /> | ||
26689 | + <Add directory="/usr/local/include/gstreamer-0.10" /> | ||
26690 | + <Add directory="../../gst-libs/gst/gl" /> | ||
26691 | + <Add directory="../../gst/gl" /> | ||
26692 | + <Add directory="../.." /> | ||
26693 | + <Add directory="../../gst-libs" /> | ||
26694 | + <Add directory="../../../../SDKPackage_OGLES2/Builds/OGLES2/Include" /> | ||
26695 | + <Add directory="../../gst/gl/effects" /> | ||
26696 | + <Add directory="/usr/lib/i386-linux-gnu/glib-2.0/include" /> | ||
26697 | + </Compiler> | ||
26698 | + <Linker> | ||
26699 | + <Add library="glib-2.0" /> | ||
26700 | + <Add library="gobject-2.0" /> | ||
26701 | + <Add library="gthread-2.0" /> | ||
26702 | + <Add library="gstreamer-0.10" /> | ||
26703 | + <Add library="gstbase-0.10" /> | ||
26704 | + <Add library="gstvideo-0.10" /> | ||
26705 | + <Add library="gstinterfaces-0.10" /> | ||
26706 | + <Add library="EGL" /> | ||
26707 | + <Add library="GLESv2" /> | ||
26708 | + <Add directory="../../../../SDKPackage_OGLES2/Builds/OGLES2/LinuxX86/Lib" /> | ||
26709 | + </Linker> | ||
26710 | + <Unit filename="../../gst-libs/gst/gettext.h" /> | ||
26711 | + <Unit filename="../../gst-libs/gst/gl/gstglbuffer.c"> | ||
26712 | + <Option compilerVar="CC" /> | ||
26713 | + </Unit> | ||
26714 | + <Unit filename="../../gst-libs/gst/gl/gstglbuffer.h" /> | ||
26715 | + <Unit filename="../../gst-libs/gst/gl/gstgldisplay.c"> | ||
26716 | + <Option compilerVar="CC" /> | ||
26717 | + </Unit> | ||
26718 | + <Unit filename="../../gst-libs/gst/gl/gstgldisplay.h" /> | ||
26719 | + <Unit filename="../../gst-libs/gst/gl/gstgles2.h" /> | ||
26720 | + <Unit filename="../../gst-libs/gst/gl/gstglfilter.c"> | ||
26721 | + <Option compilerVar="CC" /> | ||
26722 | + </Unit> | ||
26723 | + <Unit filename="../../gst-libs/gst/gl/gstglfilter.h" /> | ||
26724 | + <Unit filename="../../gst-libs/gst/gl/gstglshader.c"> | ||
26725 | + <Option compilerVar="CC" /> | ||
26726 | + </Unit> | ||
26727 | + <Unit filename="../../gst-libs/gst/gl/gstglshader.h" /> | ||
26728 | + <Unit filename="../../gst-libs/gst/gl/gstglwindow.h" /> | ||
26729 | + <Unit filename="../../gst-libs/gst/gl/gstglwindow_x11ES2.c"> | ||
26730 | + <Option compilerVar="CC" /> | ||
26731 | + </Unit> | ||
26732 | + <Unit filename="../../gst-libs/gst/gst-i18n-plugin.h" /> | ||
26733 | + <Unit filename="../../gst/gl/effects/gstgleffectidentity.c"> | ||
26734 | + <Option compilerVar="CC" /> | ||
26735 | + </Unit> | ||
26736 | + <Unit filename="../../gst/gl/effects/gstgleffectmirror.c"> | ||
26737 | + <Option compilerVar="CC" /> | ||
26738 | + </Unit> | ||
26739 | + <Unit filename="../../gst/gl/effects/gstgleffectsqueeze.c"> | ||
26740 | + <Option compilerVar="CC" /> | ||
26741 | + </Unit> | ||
26742 | + <Unit filename="../../gst/gl/effects/gstgleffectssources.c"> | ||
26743 | + <Option compilerVar="CC" /> | ||
26744 | + </Unit> | ||
26745 | + <Unit filename="../../gst/gl/effects/gstgleffectssources.h" /> | ||
26746 | + <Unit filename="../../gst/gl/gstgldownload.c"> | ||
26747 | + <Option compilerVar="CC" /> | ||
26748 | + </Unit> | ||
26749 | + <Unit filename="../../gst/gl/gstgldownload.h" /> | ||
26750 | + <Unit filename="../../gst/gl/gstgleffects.c"> | ||
26751 | + <Option compilerVar="CC" /> | ||
26752 | + </Unit> | ||
26753 | + <Unit filename="../../gst/gl/gstgleffects.h" /> | ||
26754 | + <Unit filename="../../gst/gl/gstglfiltercube.c"> | ||
26755 | + <Option compilerVar="CC" /> | ||
26756 | + </Unit> | ||
26757 | + <Unit filename="../../gst/gl/gstglfiltercube.h" /> | ||
26758 | + <Unit filename="../../gst/gl/gstglimagesink.c"> | ||
26759 | + <Option compilerVar="CC" /> | ||
26760 | + </Unit> | ||
26761 | + <Unit filename="../../gst/gl/gstglimagesink.h" /> | ||
26762 | + <Unit filename="../../gst/gl/gstglupload.c"> | ||
26763 | + <Option compilerVar="CC" /> | ||
26764 | + </Unit> | ||
26765 | + <Unit filename="../../gst/gl/gstglupload.h" /> | ||
26766 | + <Unit filename="../../gst/gl/gstopengl.c"> | ||
26767 | + <Option compilerVar="CC" /> | ||
26768 | + </Unit> | ||
26769 | + <Extensions> | ||
26770 | + <code_completion /> | ||
26771 | + <envvars /> | ||
26772 | + <lib_finder disable_auto="1" /> | ||
26773 | + <debugger /> | ||
26774 | + <wxsmith version="1"> | ||
26775 | + <gui name="wxWidgets" src="" main="" init_handlers="necessary" language="CPP" /> | ||
26776 | + </wxsmith> | ||
26777 | + </Extensions> | ||
26778 | + </Project> | ||
26779 | +</CodeBlocks_project_file> | ||
26780 | diff --git a/win32/codeblock/gstopengl.cbp b/win32/codeblock/gstopengl.cbp | ||
26781 | new file mode 100644 | ||
26782 | index 0000000..2a1f875 | ||
26783 | --- /dev/null | ||
26784 | +++ b/win32/codeblock/gstopengl.cbp | ||
26785 | @@ -0,0 +1,242 @@ | ||
26786 | +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
26787 | +<CodeBlocks_project_file> | ||
26788 | + <FileVersion major="1" minor="6" /> | ||
26789 | + <Project> | ||
26790 | + <Option title="gstopengl" /> | ||
26791 | + <Option pch_mode="2" /> | ||
26792 | + <Option compiler="gcc" /> | ||
26793 | + <Build> | ||
26794 | + <Target title="Debug"> | ||
26795 | + <Option output="Debug\libgstopengl.dll" prefix_auto="1" extension_auto="0" /> | ||
26796 | + <Option object_output="obj\Debug\" /> | ||
26797 | + <Option type="3" /> | ||
26798 | + <Option compiler="gcc" /> | ||
26799 | + <Option createDefFile="1" /> | ||
26800 | + <Option createStaticLib="1" /> | ||
26801 | + <Compiler> | ||
26802 | + <Add option="-g" /> | ||
26803 | + </Compiler> | ||
26804 | + <ExtraCommands> | ||
26805 | + <Add after='cp Debug/libgstopengl.dll "$(OSSBUILD_GSTREAMER_DIR)/lib/gstreamer-0.10"' /> | ||
26806 | + <Mode after="always" /> | ||
26807 | + </ExtraCommands> | ||
26808 | + </Target> | ||
26809 | + <Target title="Release"> | ||
26810 | + <Option output="Release\libgstopengl.dll" prefix_auto="1" extension_auto="0" /> | ||
26811 | + <Option object_output="obj\Release\" /> | ||
26812 | + <Option type="3" /> | ||
26813 | + <Option compiler="gcc" /> | ||
26814 | + <Option createDefFile="1" /> | ||
26815 | + <Option createStaticLib="1" /> | ||
26816 | + <Compiler> | ||
26817 | + <Add option="-O2" /> | ||
26818 | + </Compiler> | ||
26819 | + <Linker> | ||
26820 | + <Add option="-s" /> | ||
26821 | + </Linker> | ||
26822 | + <ExtraCommands> | ||
26823 | + <Add after='cp Release/libgstopengl.dll "$(OSSBUILD_GSTREAMER_DIR)/lib/gstreamer-0.10"' /> | ||
26824 | + <Mode after="always" /> | ||
26825 | + </ExtraCommands> | ||
26826 | + </Target> | ||
26827 | + </Build> | ||
26828 | + <Compiler> | ||
26829 | + <Add option="-O3" /> | ||
26830 | + <Add option="-Wall" /> | ||
26831 | + <Add option="-DWIN32" /> | ||
26832 | + <Add option="-DHAVE_CONFIG_H" /> | ||
26833 | + <Add directory="$(OSSBUILD_GSTREAMER_SDK_DIR)\include\gstreamer-0.10" /> | ||
26834 | + <Add directory="$(OSSBUILD_GSTREAMER_SDK_DIR)\include\libxml2" /> | ||
26835 | + <Add directory="$(OSSBUILD_GSTREAMER_SDK_DIR)\include\glib-2.0" /> | ||
26836 | + <Add directory="$(OSSBUILD_GSTREAMER_SDK_DIR)\include" /> | ||
26837 | + <Add directory="..\common" /> | ||
26838 | + <Add directory="..\..\gst-libs" /> | ||
26839 | + <Add directory="..\..\gst-libs\gst\gl" /> | ||
26840 | + <Add directory="..\..\gst\gl" /> | ||
26841 | + <Add directory="..\..\gst\gl\effects" /> | ||
26842 | + </Compiler> | ||
26843 | + <Linker> | ||
26844 | + <Add library="glib-2.0-0" /> | ||
26845 | + <Add library="gobject-2.0-0" /> | ||
26846 | + <Add library="gmodule-2.0-0" /> | ||
26847 | + <Add library="gthread-2.0-0" /> | ||
26848 | + <Add library="gstreamer-0.10" /> | ||
26849 | + <Add library="gstbase-0.10" /> | ||
26850 | + <Add library="gstvideo-0.10" /> | ||
26851 | + <Add library="gstinterfaces-0.10" /> | ||
26852 | + <Add library="gstcontroller-0.10" /> | ||
26853 | + <Add library="glew32" /> | ||
26854 | + <Add library="glu32" /> | ||
26855 | + <Add library="opengl32" /> | ||
26856 | + <Add library="gdi32" /> | ||
26857 | + <Add library="png14-14" /> | ||
26858 | + <Add library="z" /> | ||
26859 | + <Add library="jpeg-8" /> | ||
26860 | + <Add library="winmm" /> | ||
26861 | + <Add directory="$(OSSBUILD_GSTREAMER_DIR)\bin" /> | ||
26862 | + </Linker> | ||
26863 | + <Unit filename="..\..\gst-libs\gst\gettext.h" /> | ||
26864 | + <Unit filename="..\..\gst-libs\gst\gl\gstglbuffer.c"> | ||
26865 | + <Option compilerVar="CC" /> | ||
26866 | + </Unit> | ||
26867 | + <Unit filename="..\..\gst-libs\gst\gl\gstglbuffer.h" /> | ||
26868 | + <Unit filename="..\..\gst-libs\gst\gl\gstgldisplay.c"> | ||
26869 | + <Option compilerVar="CC" /> | ||
26870 | + </Unit> | ||
26871 | + <Unit filename="..\..\gst-libs\gst\gl\gstgldisplay.h" /> | ||
26872 | + <Unit filename="..\..\gst-libs\gst\gl\gstglfilter.c"> | ||
26873 | + <Option compilerVar="CC" /> | ||
26874 | + </Unit> | ||
26875 | + <Unit filename="..\..\gst-libs\gst\gl\gstglfilter.h" /> | ||
26876 | + <Unit filename="..\..\gst-libs\gst\gl\gstglmixer.c"> | ||
26877 | + <Option compilerVar="CC" /> | ||
26878 | + </Unit> | ||
26879 | + <Unit filename="..\..\gst-libs\gst\gl\gstglmixer.h" /> | ||
26880 | + <Unit filename="..\..\gst-libs\gst\gl\gstglshader.c"> | ||
26881 | + <Option compilerVar="CC" /> | ||
26882 | + </Unit> | ||
26883 | + <Unit filename="..\..\gst-libs\gst\gl\gstglshader.h" /> | ||
26884 | + <Unit filename="..\..\gst-libs\gst\gl\gstglshadervariables.c"> | ||
26885 | + <Option compilerVar="CC" /> | ||
26886 | + </Unit> | ||
26887 | + <Unit filename="..\..\gst-libs\gst\gl\gstglshadervariables.h" /> | ||
26888 | + <Unit filename="..\..\gst-libs\gst\gl\gstglwindow.h" /> | ||
26889 | + <Unit filename="..\..\gst-libs\gst\gl\gstglwindow_win32.c"> | ||
26890 | + <Option compilerVar="CC" /> | ||
26891 | + </Unit> | ||
26892 | + <Unit filename="..\..\gst-libs\gst\gst-i18n-plugin.h" /> | ||
26893 | + <Unit filename="..\..\gst\gl\effects\gstgleffectbulge.c"> | ||
26894 | + <Option compilerVar="CC" /> | ||
26895 | + </Unit> | ||
26896 | + <Unit filename="..\..\gst\gl\effects\gstgleffectfisheye.c"> | ||
26897 | + <Option compilerVar="CC" /> | ||
26898 | + </Unit> | ||
26899 | + <Unit filename="..\..\gst\gl\effects\gstgleffectglow.c"> | ||
26900 | + <Option compilerVar="CC" /> | ||
26901 | + </Unit> | ||
26902 | + <Unit filename="..\..\gst\gl\effects\gstgleffectidentity.c"> | ||
26903 | + <Option compilerVar="CC" /> | ||
26904 | + </Unit> | ||
26905 | + <Unit filename="..\..\gst\gl\effects\gstgleffectlumatocurve.c"> | ||
26906 | + <Option compilerVar="CC" /> | ||
26907 | + </Unit> | ||
26908 | + <Unit filename="..\..\gst\gl\effects\gstgleffectlumatocurve.h" /> | ||
26909 | + <Unit filename="..\..\gst\gl\effects\gstgleffectmirror.c"> | ||
26910 | + <Option compilerVar="CC" /> | ||
26911 | + </Unit> | ||
26912 | + <Unit filename="..\..\gst\gl\effects\gstgleffectrgbtocurve.c"> | ||
26913 | + <Option compilerVar="CC" /> | ||
26914 | + </Unit> | ||
26915 | + <Unit filename="..\..\gst\gl\effects\gstgleffectscurves.h" /> | ||
26916 | + <Unit filename="..\..\gst\gl\effects\gstgleffectsin.c"> | ||
26917 | + <Option compilerVar="CC" /> | ||
26918 | + </Unit> | ||
26919 | + <Unit filename="..\..\gst\gl\effects\gstgleffectsquare.c"> | ||
26920 | + <Option compilerVar="CC" /> | ||
26921 | + </Unit> | ||
26922 | + <Unit filename="..\..\gst\gl\effects\gstgleffectsqueeze.c"> | ||
26923 | + <Option compilerVar="CC" /> | ||
26924 | + </Unit> | ||
26925 | + <Unit filename="..\..\gst\gl\effects\gstgleffectssources.c"> | ||
26926 | + <Option compilerVar="CC" /> | ||
26927 | + </Unit> | ||
26928 | + <Unit filename="..\..\gst\gl\effects\gstgleffectssources.h" /> | ||
26929 | + <Unit filename="..\..\gst\gl\effects\gstgleffectstretch.c"> | ||
26930 | + <Option compilerVar="CC" /> | ||
26931 | + </Unit> | ||
26932 | + <Unit filename="..\..\gst\gl\effects\gstgleffecttunnel.c"> | ||
26933 | + <Option compilerVar="CC" /> | ||
26934 | + </Unit> | ||
26935 | + <Unit filename="..\..\gst\gl\effects\gstgleffecttwirl.c"> | ||
26936 | + <Option compilerVar="CC" /> | ||
26937 | + </Unit> | ||
26938 | + <Unit filename="..\..\gst\gl\effects\gstgleffectxray.c"> | ||
26939 | + <Option compilerVar="CC" /> | ||
26940 | + </Unit> | ||
26941 | + <Unit filename="..\..\gst\gl\gltestsrc.c"> | ||
26942 | + <Option compilerVar="CC" /> | ||
26943 | + </Unit> | ||
26944 | + <Unit filename="..\..\gst\gl\gltestsrc.h" /> | ||
26945 | + <Unit filename="..\..\gst\gl\gstglbumper.c"> | ||
26946 | + <Option compilerVar="CC" /> | ||
26947 | + </Unit> | ||
26948 | + <Unit filename="..\..\gst\gl\gstglbumper.h" /> | ||
26949 | + <Unit filename="..\..\gst\gl\gstglcolorscale.c"> | ||
26950 | + <Option compilerVar="CC" /> | ||
26951 | + </Unit> | ||
26952 | + <Unit filename="..\..\gst\gl\gstglcolorscale.h" /> | ||
26953 | + <Unit filename="..\..\gst\gl\gstgldeinterlace.c"> | ||
26954 | + <Option compilerVar="CC" /> | ||
26955 | + </Unit> | ||
26956 | + <Unit filename="..\..\gst\gl\gstgldeinterlace.h" /> | ||
26957 | + <Unit filename="..\..\gst\gl\gstgldifferencematte.c"> | ||
26958 | + <Option compilerVar="CC" /> | ||
26959 | + </Unit> | ||
26960 | + <Unit filename="..\..\gst\gl\gstgldownload.c"> | ||
26961 | + <Option compilerVar="CC" /> | ||
26962 | + </Unit> | ||
26963 | + <Unit filename="..\..\gst\gl\gstgldownload.h" /> | ||
26964 | + <Unit filename="..\..\gst\gl\gstgleffects.c"> | ||
26965 | + <Option compilerVar="CC" /> | ||
26966 | + </Unit> | ||
26967 | + <Unit filename="..\..\gst\gl\gstgleffects.h" /> | ||
26968 | + <Unit filename="..\..\gst\gl\gstglfilterapp.c"> | ||
26969 | + <Option compilerVar="CC" /> | ||
26970 | + </Unit> | ||
26971 | + <Unit filename="..\..\gst\gl\gstglfilterapp.h" /> | ||
26972 | + <Unit filename="..\..\gst\gl\gstglfilterblur.c"> | ||
26973 | + <Option compilerVar="CC" /> | ||
26974 | + </Unit> | ||
26975 | + <Unit filename="..\..\gst\gl\gstglfiltercube.c"> | ||
26976 | + <Option compilerVar="CC" /> | ||
26977 | + </Unit> | ||
26978 | + <Unit filename="..\..\gst\gl\gstglfiltercube.h" /> | ||
26979 | + <Unit filename="..\..\gst\gl\gstglfilterglass.c"> | ||
26980 | + <Option compilerVar="CC" /> | ||
26981 | + </Unit> | ||
26982 | + <Unit filename="..\..\gst\gl\gstglfilterglass.h" /> | ||
26983 | + <Unit filename="..\..\gst\gl\gstglfilterlaplacian.c"> | ||
26984 | + <Option compilerVar="CC" /> | ||
26985 | + </Unit> | ||
26986 | + <Unit filename="..\..\gst\gl\gstglfilterlaplacian.h" /> | ||
26987 | + <Unit filename="..\..\gst\gl\gstglfilterreflectedscreen.c"> | ||
26988 | + <Option compilerVar="CC" /> | ||
26989 | + </Unit> | ||
26990 | + <Unit filename="..\..\gst\gl\gstglfilterreflectedscreen.h" /> | ||
26991 | + <Unit filename="..\..\gst\gl\gstglfiltershader.c"> | ||
26992 | + <Option compilerVar="CC" /> | ||
26993 | + </Unit> | ||
26994 | + <Unit filename="..\..\gst\gl\gstglfiltershader.h" /> | ||
26995 | + <Unit filename="..\..\gst\gl\gstglfiltersobel.c"> | ||
26996 | + <Option compilerVar="CC" /> | ||
26997 | + </Unit> | ||
26998 | + <Unit filename="..\..\gst\gl\gstglimagesink.c"> | ||
26999 | + <Option compilerVar="CC" /> | ||
27000 | + </Unit> | ||
27001 | + <Unit filename="..\..\gst\gl\gstglimagesink.h" /> | ||
27002 | + <Unit filename="..\..\gst\gl\gstglmosaic.c"> | ||
27003 | + <Option compilerVar="CC" /> | ||
27004 | + </Unit> | ||
27005 | + <Unit filename="..\..\gst\gl\gstglmosaic.h" /> | ||
27006 | + <Unit filename="..\..\gst\gl\gstgloverlay.c"> | ||
27007 | + <Option compilerVar="CC" /> | ||
27008 | + </Unit> | ||
27009 | + <Unit filename="..\..\gst\gl\gstgloverlay.h" /> | ||
27010 | + <Unit filename="..\..\gst\gl\gstgltestsrc.c"> | ||
27011 | + <Option compilerVar="CC" /> | ||
27012 | + </Unit> | ||
27013 | + <Unit filename="..\..\gst\gl\gstgltestsrc.h" /> | ||
27014 | + <Unit filename="..\..\gst\gl\gstglupload.c"> | ||
27015 | + <Option compilerVar="CC" /> | ||
27016 | + </Unit> | ||
27017 | + <Unit filename="..\..\gst\gl\gstglupload.h" /> | ||
27018 | + <Unit filename="..\..\gst\gl\gstopengl.c"> | ||
27019 | + <Option compilerVar="CC" /> | ||
27020 | + </Unit> | ||
27021 | + <Unit filename="..\common\config.h" /> | ||
27022 | + <Extensions> | ||
27023 | + <code_completion /> | ||
27024 | + <debugger /> | ||
27025 | + </Extensions> | ||
27026 | + </Project> | ||
27027 | +</CodeBlocks_project_file> | ||
27028 | diff --git a/win32/common/config.h b/win32/common/config.h | ||
27029 | new file mode 100644 | ||
27030 | index 0000000..d02b566 | ||
27031 | --- /dev/null | ||
27032 | +++ b/win32/common/config.h | ||
27033 | @@ -0,0 +1,232 @@ | ||
27034 | +/* config.h.in. Generated from configure.ac by autoheader. */ | ||
27035 | +/* This copy of config.h.in is specifically for win32 Visual Studio builds */ | ||
27036 | + | ||
27037 | +/* Define to 1 if translation of program messages to the user's native | ||
27038 | + language is requested. */ | ||
27039 | +#undef ENABLE_NLS | ||
27040 | + | ||
27041 | +/* gettext package name */ | ||
27042 | +#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" | ||
27043 | + | ||
27044 | +/* PREFIX - specifically added for Windows for easier moving */ | ||
27045 | +#define PREFIX "C:\\gstreamer" | ||
27046 | + | ||
27047 | +/* Location of registry */ | ||
27048 | +#define GST_CACHE_DIR PREFIX "\\var\\cache" | ||
27049 | + | ||
27050 | +/* macro to use to show function name */ | ||
27051 | +#undef GST_FUNCTION | ||
27052 | + | ||
27053 | +/* Defined if gcov is enabled to force a rebuild due to config.h changing */ | ||
27054 | +#undef GST_GCOV_ENABLED | ||
27055 | + | ||
27056 | +/* Default errorlevel to use */ | ||
27057 | +#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR | ||
27058 | + | ||
27059 | +/* GStreamer license */ | ||
27060 | +#define GST_LICENSE "LGPL" | ||
27061 | + | ||
27062 | +/* package name in plugins */ | ||
27063 | +#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" | ||
27064 | + | ||
27065 | +/* package origin */ | ||
27066 | +#define GST_PACKAGE_ORIGIN "Unknown package origin" | ||
27067 | + | ||
27068 | +/* Define if the host CPU is an Alpha */ | ||
27069 | +#undef HAVE_CPU_ALPHA | ||
27070 | + | ||
27071 | +/* Define if the host CPU is an ARM */ | ||
27072 | +#undef HAVE_CPU_ARM | ||
27073 | + | ||
27074 | +/* Define if the host CPU is a HPPA */ | ||
27075 | +#undef HAVE_CPU_HPPA | ||
27076 | + | ||
27077 | +/* Define if the host CPU is an x86 */ | ||
27078 | +#undef HAVE_CPU_I386 | ||
27079 | + | ||
27080 | +/* Define if the host CPU is a IA64 */ | ||
27081 | +#undef HAVE_CPU_IA64 | ||
27082 | + | ||
27083 | +/* Define if the host CPU is a M68K */ | ||
27084 | +#undef HAVE_CPU_M68K | ||
27085 | + | ||
27086 | +/* Define if the host CPU is a MIPS */ | ||
27087 | +#undef HAVE_CPU_MIPS | ||
27088 | + | ||
27089 | +/* Define if the host CPU is a PowerPC */ | ||
27090 | +#undef HAVE_CPU_PPC | ||
27091 | + | ||
27092 | +/* Define if the host CPU is a S390 */ | ||
27093 | +#undef HAVE_CPU_S390 | ||
27094 | + | ||
27095 | +/* Define if the host CPU is a SPARC */ | ||
27096 | +#undef HAVE_CPU_SPARC | ||
27097 | + | ||
27098 | +/* Define if the host CPU is a x86_64 */ | ||
27099 | +#undef HAVE_CPU_X86_64 | ||
27100 | + | ||
27101 | +/* Define if the GNU dcgettext() function is already present or preinstalled. | ||
27102 | + */ | ||
27103 | +#undef HAVE_DCGETTEXT | ||
27104 | + | ||
27105 | +/* Defined if we have dladdr () */ | ||
27106 | +#undef HAVE_DLADDR | ||
27107 | + | ||
27108 | +/* Define to 1 if you have the <dlfcn.h> header file. */ | ||
27109 | +#undef HAVE_DLFCN_H | ||
27110 | + | ||
27111 | +/* Define to 1 if you have the `fgetpos' function. */ | ||
27112 | +#define HAVE_FGETPOS 1 | ||
27113 | + | ||
27114 | +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ | ||
27115 | +#undef HAVE_FSEEKO | ||
27116 | + | ||
27117 | +/* Define to 1 if you have the `fsetpos' function. */ | ||
27118 | +#define HAVE_FSETPOS 1 | ||
27119 | + | ||
27120 | +/* Define to 1 if you have the `ftello' function. */ | ||
27121 | +#undef HAVE_FTELLO | ||
27122 | + | ||
27123 | +/* defined if the compiler implements __func__ */ | ||
27124 | +#undef HAVE_FUNC | ||
27125 | + | ||
27126 | +/* defined if the compiler implements __FUNCTION__ */ | ||
27127 | +#undef HAVE_FUNCTION | ||
27128 | + | ||
27129 | +/* Define to 1 if you have the `getpagesize' function. */ | ||
27130 | +#undef HAVE_GETPAGESIZE | ||
27131 | + | ||
27132 | +/* Define if the GNU gettext() function is already present or preinstalled. */ | ||
27133 | +#undef HAVE_GETTEXT | ||
27134 | + | ||
27135 | +/* Define if you have the iconv() function. */ | ||
27136 | +#undef HAVE_ICONV | ||
27137 | + | ||
27138 | +/* Define to 1 if you have the <inttypes.h> header file. */ | ||
27139 | +#undef HAVE_INTTYPES_H | ||
27140 | + | ||
27141 | +/* Define if libxml2 is available */ | ||
27142 | +#define HAVE_LIBXML2 1 | ||
27143 | + | ||
27144 | +/* defined if we have makecontext () */ | ||
27145 | +#undef HAVE_MAKECONTEXT | ||
27146 | + | ||
27147 | +/* Use libjpeg */ | ||
27148 | +#define HAVE_JPEG 1 | ||
27149 | + | ||
27150 | +/* Use libpng */ | ||
27151 | +#define HAVE_PNG 1 | ||
27152 | + | ||
27153 | +/* Define to 1 if you have the <memory.h> header file. */ | ||
27154 | +#undef HAVE_MEMORY_H | ||
27155 | + | ||
27156 | +/* Define to 1 if you have a working `mmap' system call. */ | ||
27157 | +#undef HAVE_MMAP | ||
27158 | + | ||
27159 | +/* defined if the compiler implements __PRETTY_FUNCTION__ */ | ||
27160 | +#undef HAVE_PRETTY_FUNCTION | ||
27161 | + | ||
27162 | +/* Defined if we have register_printf_function () */ | ||
27163 | +#undef HAVE_PRINTF_EXTENSION | ||
27164 | + | ||
27165 | +/* Define to 1 if you have the <process.h> header file. */ | ||
27166 | +#define HAVE_PROCESS_H 1 | ||
27167 | + | ||
27168 | +/* Define if RDTSC is available */ | ||
27169 | +#undef HAVE_RDTSC | ||
27170 | + | ||
27171 | +/* Define to 1 if you have the `sigaction' function. */ | ||
27172 | +#undef HAVE_SIGACTION | ||
27173 | + | ||
27174 | +/* Define to 1 if you have the <stdint.h> header file. */ | ||
27175 | +#undef HAVE_STDINT_H | ||
27176 | + | ||
27177 | +/* Define to 1 if you have the <stdlib.h> header file. */ | ||
27178 | +#define HAVE_STDLIB_H 1 | ||
27179 | + | ||
27180 | +/* Define to 1 if you have the <strings.h> header file. */ | ||
27181 | +#undef HAVE_STRINGS_H | ||
27182 | + | ||
27183 | +/* Define to 1 if you have the <string.h> header file. */ | ||
27184 | +#define HAVE_STRING_H 1 | ||
27185 | + | ||
27186 | +/* Define to 1 if you have the <sys/socket.h> header file. */ | ||
27187 | +#undef HAVE_SYS_SOCKET_H | ||
27188 | + | ||
27189 | +/* Define to 1 if you have the <sys/stat.h> header file. */ | ||
27190 | +#define HAVE_SYS_STAT_H 1 | ||
27191 | + | ||
27192 | +/* Define to 1 if you have the <sys/types.h> header file. */ | ||
27193 | +#define HAVE_SYS_TYPES_H 1 | ||
27194 | + | ||
27195 | +/* Define to 1 if you have the <ucontext.h> header file. */ | ||
27196 | +#undef HAVE_UCONTEXT_H | ||
27197 | + | ||
27198 | +/* defined if unaligned memory access works correctly */ | ||
27199 | +#undef HAVE_UNALIGNED_ACCESS | ||
27200 | + | ||
27201 | +/* Define to 1 if you have the <unistd.h> header file. */ | ||
27202 | +#undef HAVE_UNISTD_H | ||
27203 | + | ||
27204 | +/* Define if valgrind should be used */ | ||
27205 | +#undef HAVE_VALGRIND | ||
27206 | + | ||
27207 | +/* Defined if compiling for Windows */ | ||
27208 | +#define HAVE_WIN32 1 | ||
27209 | + | ||
27210 | +/* library dir */ | ||
27211 | +#define LIBDIR PREFIX "\\lib" | ||
27212 | + | ||
27213 | +/* gettext locale dir */ | ||
27214 | +#define LOCALEDIR PREFIX "\\share\\locale" | ||
27215 | + | ||
27216 | +/* Name of package */ | ||
27217 | +#define PACKAGE "gst-plugins-gl" | ||
27218 | + | ||
27219 | +/* Define to the address where bug reports for this package should be sent. */ | ||
27220 | +#undef PACKAGE_BUGREPORT | ||
27221 | + | ||
27222 | +/* Define to the full name of this package. */ | ||
27223 | +#undef PACKAGE_NAME | ||
27224 | + | ||
27225 | +/* Define to the full name and version of this package. */ | ||
27226 | +#undef PACKAGE_STRING | ||
27227 | + | ||
27228 | +/* Define to the one symbol short name of this package. */ | ||
27229 | +#undef PACKAGE_TARNAME | ||
27230 | + | ||
27231 | +/* Define to the version of this package. */ | ||
27232 | +#undef PACKAGE_VERSION | ||
27233 | + | ||
27234 | +/* directory where plugins are located */ | ||
27235 | +#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" | ||
27236 | + | ||
27237 | +/* Define to 1 if you have the ANSI C header files. */ | ||
27238 | +#undef STDC_HEADERS | ||
27239 | + | ||
27240 | +/* Define if we should poison deallocated memory */ | ||
27241 | +#undef USE_POISONING | ||
27242 | + | ||
27243 | +/* Version number of package */ | ||
27244 | +#define VERSION "0.10.0.1" | ||
27245 | + | ||
27246 | +/* Define to 1 if your processor stores words with the most significant byte | ||
27247 | + first (like Motorola and SPARC, unlike Intel and VAX). */ | ||
27248 | +#undef WORDS_BIGENDIAN | ||
27249 | + | ||
27250 | +/* Number of bits in a file offset, on hosts where this is settable. */ | ||
27251 | +#undef _FILE_OFFSET_BITS | ||
27252 | + | ||
27253 | +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ | ||
27254 | +#undef _LARGEFILE_SOURCE | ||
27255 | + | ||
27256 | +/* Define for large files, on AIX-style hosts. */ | ||
27257 | +#undef _LARGE_FILES | ||
27258 | + | ||
27259 | +/* Define to `__inline__' or `__inline' if that's what the C compiler | ||
27260 | + calls it, or to nothing if 'inline' is not supported under any name. */ | ||
27261 | +/* #undef inline */ | ||
27262 | + | ||
27263 | +#define GST_PACKAGE "Gst-plugins-gl" | ||
27264 | +#define PACKAGE "gst-plugins-gl" | ||
27265 | +#define GST_ORIGIN "gstreamer.freedesktop.org" | ||
27266 | diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj | ||
27267 | new file mode 100644 | ||
27268 | index 0000000..a7810db | ||
27269 | --- /dev/null | ||
27270 | +++ b/win32/vs9/libgstopengl.vcproj | ||
27271 | @@ -0,0 +1,508 @@ | ||
27272 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
27273 | +<VisualStudioProject | ||
27274 | + ProjectType="Visual C++" | ||
27275 | + Version="9,00" | ||
27276 | + Name="libgstopengl" | ||
27277 | + ProjectGUID="{F4E2D883-31DB-48B7-BEE9-0D9FDBBC805F}" | ||
27278 | + RootNamespace="libgstgl" | ||
27279 | + Keyword="Win32Proj" | ||
27280 | + TargetFrameworkVersion="131072" | ||
27281 | + > | ||
27282 | + <Platforms> | ||
27283 | + <Platform | ||
27284 | + Name="Win32" | ||
27285 | + /> | ||
27286 | + </Platforms> | ||
27287 | + <ToolFiles> | ||
27288 | + </ToolFiles> | ||
27289 | + <Configurations> | ||
27290 | + <Configuration | ||
27291 | + Name="Debug|Win32" | ||
27292 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
27293 | + IntermediateDirectory="$(ConfigurationName)" | ||
27294 | + ConfigurationType="2" | ||
27295 | + CharacterSet="1" | ||
27296 | + > | ||
27297 | + <Tool | ||
27298 | + Name="VCPreBuildEventTool" | ||
27299 | + /> | ||
27300 | + <Tool | ||
27301 | + Name="VCCustomBuildTool" | ||
27302 | + /> | ||
27303 | + <Tool | ||
27304 | + Name="VCXMLDataGeneratorTool" | ||
27305 | + /> | ||
27306 | + <Tool | ||
27307 | + Name="VCWebServiceProxyGeneratorTool" | ||
27308 | + /> | ||
27309 | + <Tool | ||
27310 | + Name="VCMIDLTool" | ||
27311 | + /> | ||
27312 | + <Tool | ||
27313 | + Name="VCCLCompilerTool" | ||
27314 | + Optimization="0" | ||
27315 | + AdditionalIncludeDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\include\glib-2.0";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\libxml2";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\gstreamer-0.10";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include";..\common;"..\..\gst-libs\gst\gl";..\..\gst\gl;..\..\gst\gl\effects;"..\..\gst-libs"" | ||
27316 | + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H" | ||
27317 | + MinimalRebuild="true" | ||
27318 | + BasicRuntimeChecks="3" | ||
27319 | + RuntimeLibrary="3" | ||
27320 | + UsePrecompiledHeader="0" | ||
27321 | + WarningLevel="3" | ||
27322 | + Detect64BitPortabilityProblems="false" | ||
27323 | + DebugInformationFormat="4" | ||
27324 | + /> | ||
27325 | + <Tool | ||
27326 | + Name="VCManagedResourceCompilerTool" | ||
27327 | + /> | ||
27328 | + <Tool | ||
27329 | + Name="VCResourceCompilerTool" | ||
27330 | + /> | ||
27331 | + <Tool | ||
27332 | + Name="VCPreLinkEventTool" | ||
27333 | + /> | ||
27334 | + <Tool | ||
27335 | + Name="VCLinkerTool" | ||
27336 | + AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png14.lib z.lib jpeg.lib opengl32.lib glu32.lib glew32.lib winmm.lib" | ||
27337 | + LinkIncremental="2" | ||
27338 | + AdditionalLibraryDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\lib"" | ||
27339 | + GenerateDebugInformation="true" | ||
27340 | + SubSystem="2" | ||
27341 | + RandomizedBaseAddress="1" | ||
27342 | + DataExecutionPrevention="0" | ||
27343 | + TargetMachine="1" | ||
27344 | + /> | ||
27345 | + <Tool | ||
27346 | + Name="VCALinkTool" | ||
27347 | + /> | ||
27348 | + <Tool | ||
27349 | + Name="VCManifestTool" | ||
27350 | + /> | ||
27351 | + <Tool | ||
27352 | + Name="VCXDCMakeTool" | ||
27353 | + /> | ||
27354 | + <Tool | ||
27355 | + Name="VCBscMakeTool" | ||
27356 | + /> | ||
27357 | + <Tool | ||
27358 | + Name="VCFxCopTool" | ||
27359 | + /> | ||
27360 | + <Tool | ||
27361 | + Name="VCAppVerifierTool" | ||
27362 | + /> | ||
27363 | + <Tool | ||
27364 | + Name="VCPostBuildEventTool" | ||
27365 | + CommandLine="copy /Y $(OutDir)\$(ProjectName).dll "$(OSSBUILD_GSTREAMER_DIR)\lib\gstreamer-0.10"" | ||
27366 | + /> | ||
27367 | + </Configuration> | ||
27368 | + <Configuration | ||
27369 | + Name="Release|Win32" | ||
27370 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
27371 | + IntermediateDirectory="$(ConfigurationName)" | ||
27372 | + ConfigurationType="2" | ||
27373 | + CharacterSet="1" | ||
27374 | + WholeProgramOptimization="1" | ||
27375 | + > | ||
27376 | + <Tool | ||
27377 | + Name="VCPreBuildEventTool" | ||
27378 | + /> | ||
27379 | + <Tool | ||
27380 | + Name="VCCustomBuildTool" | ||
27381 | + /> | ||
27382 | + <Tool | ||
27383 | + Name="VCXMLDataGeneratorTool" | ||
27384 | + /> | ||
27385 | + <Tool | ||
27386 | + Name="VCWebServiceProxyGeneratorTool" | ||
27387 | + /> | ||
27388 | + <Tool | ||
27389 | + Name="VCMIDLTool" | ||
27390 | + /> | ||
27391 | + <Tool | ||
27392 | + Name="VCCLCompilerTool" | ||
27393 | + AdditionalIncludeDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\include\glib-2.0";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\libxml2";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\gstreamer-0.10";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include";..\common;"..\..\gst-libs\gst\gl";..\..\gst\gl;..\..\gst\gl\effects;"..\..\gst-libs"" | ||
27394 | + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H" | ||
27395 | + RuntimeLibrary="2" | ||
27396 | + UsePrecompiledHeader="0" | ||
27397 | + WarningLevel="3" | ||
27398 | + Detect64BitPortabilityProblems="false" | ||
27399 | + DebugInformationFormat="3" | ||
27400 | + /> | ||
27401 | + <Tool | ||
27402 | + Name="VCManagedResourceCompilerTool" | ||
27403 | + /> | ||
27404 | + <Tool | ||
27405 | + Name="VCResourceCompilerTool" | ||
27406 | + /> | ||
27407 | + <Tool | ||
27408 | + Name="VCPreLinkEventTool" | ||
27409 | + /> | ||
27410 | + <Tool | ||
27411 | + Name="VCLinkerTool" | ||
27412 | + AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png14.lib z.lib jpeg.lib opengl32.lib glu32.lib glew32.lib winmm.lib" | ||
27413 | + LinkIncremental="1" | ||
27414 | + AdditionalLibraryDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\lib"" | ||
27415 | + GenerateDebugInformation="true" | ||
27416 | + SubSystem="2" | ||
27417 | + OptimizeReferences="2" | ||
27418 | + EnableCOMDATFolding="2" | ||
27419 | + RandomizedBaseAddress="1" | ||
27420 | + DataExecutionPrevention="0" | ||
27421 | + TargetMachine="1" | ||
27422 | + /> | ||
27423 | + <Tool | ||
27424 | + Name="VCALinkTool" | ||
27425 | + /> | ||
27426 | + <Tool | ||
27427 | + Name="VCManifestTool" | ||
27428 | + /> | ||
27429 | + <Tool | ||
27430 | + Name="VCXDCMakeTool" | ||
27431 | + /> | ||
27432 | + <Tool | ||
27433 | + Name="VCBscMakeTool" | ||
27434 | + /> | ||
27435 | + <Tool | ||
27436 | + Name="VCFxCopTool" | ||
27437 | + /> | ||
27438 | + <Tool | ||
27439 | + Name="VCAppVerifierTool" | ||
27440 | + /> | ||
27441 | + <Tool | ||
27442 | + Name="VCPostBuildEventTool" | ||
27443 | + CommandLine="copy /Y $(OutDir)\$(ProjectName).dll "$(OSSBUILD_GSTREAMER_DIR)\lib\gstreamer-0.10"" | ||
27444 | + /> | ||
27445 | + </Configuration> | ||
27446 | + </Configurations> | ||
27447 | + <References> | ||
27448 | + </References> | ||
27449 | + <Files> | ||
27450 | + <Filter | ||
27451 | + Name="Source Files" | ||
27452 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
27453 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
27454 | + > | ||
27455 | + <Filter | ||
27456 | + Name="gstgl" | ||
27457 | + > | ||
27458 | + <File | ||
27459 | + RelativePath="..\..\gst\gl\gltestsrc.c" | ||
27460 | + > | ||
27461 | + </File> | ||
27462 | + <File | ||
27463 | + RelativePath="..\..\gst-libs\gst\gl\gstglbuffer.c" | ||
27464 | + > | ||
27465 | + </File> | ||
27466 | + <File | ||
27467 | + RelativePath="..\..\gst-libs\gst\gl\gstgldisplay.c" | ||
27468 | + > | ||
27469 | + </File> | ||
27470 | + <File | ||
27471 | + RelativePath="..\..\gst-libs\gst\gl\gstglfilter.c" | ||
27472 | + > | ||
27473 | + </File> | ||
27474 | + <File | ||
27475 | + RelativePath="..\..\gst-libs\gst\gl\gstglmixer.c" | ||
27476 | + > | ||
27477 | + </File> | ||
27478 | + <File | ||
27479 | + RelativePath="..\..\gst-libs\gst\gl\gstglshader.c" | ||
27480 | + > | ||
27481 | + </File> | ||
27482 | + <File | ||
27483 | + RelativePath="..\..\gst-libs\gst\gl\gstglshadervariables.c" | ||
27484 | + > | ||
27485 | + </File> | ||
27486 | + <File | ||
27487 | + RelativePath="..\..\gst-libs\gst\gl\gstglwindow_win32.c" | ||
27488 | + > | ||
27489 | + </File> | ||
27490 | + </Filter> | ||
27491 | + <Filter | ||
27492 | + Name="gstglelements" | ||
27493 | + > | ||
27494 | + <File | ||
27495 | + RelativePath="..\..\gst\gl\gstglbumper.c" | ||
27496 | + > | ||
27497 | + </File> | ||
27498 | + <File | ||
27499 | + RelativePath="..\..\gst\gl\gstglcolorscale.c" | ||
27500 | + > | ||
27501 | + </File> | ||
27502 | + <File | ||
27503 | + RelativePath="..\..\gst\gl\gstgldeinterlace.c" | ||
27504 | + > | ||
27505 | + </File> | ||
27506 | + <File | ||
27507 | + RelativePath="..\..\gst\gl\gstgldifferencematte.c" | ||
27508 | + > | ||
27509 | + </File> | ||
27510 | + <File | ||
27511 | + RelativePath="..\..\gst\gl\gstgldownload.c" | ||
27512 | + > | ||
27513 | + </File> | ||
27514 | + <File | ||
27515 | + RelativePath="..\..\gst\gl\gstgleffects.c" | ||
27516 | + > | ||
27517 | + </File> | ||
27518 | + <File | ||
27519 | + RelativePath="..\..\gst\gl\gstglfilterapp.c" | ||
27520 | + > | ||
27521 | + </File> | ||
27522 | + <File | ||
27523 | + RelativePath="..\..\gst\gl\gstglfilterblur.c" | ||
27524 | + > | ||
27525 | + </File> | ||
27526 | + <File | ||
27527 | + RelativePath="..\..\gst\gl\gstglfiltercube.c" | ||
27528 | + > | ||
27529 | + </File> | ||
27530 | + <File | ||
27531 | + RelativePath="..\..\gst\gl\gstglfilterglass.c" | ||
27532 | + > | ||
27533 | + </File> | ||
27534 | + <File | ||
27535 | + RelativePath="..\..\gst\gl\gstglfilterlaplacian.c" | ||
27536 | + > | ||
27537 | + </File> | ||
27538 | + <File | ||
27539 | + RelativePath="..\..\gst\gl\gstglfilterreflectedscreen.c" | ||
27540 | + > | ||
27541 | + </File> | ||
27542 | + <File | ||
27543 | + RelativePath="..\..\gst\gl\gstglfiltershader.c" | ||
27544 | + > | ||
27545 | + </File> | ||
27546 | + <File | ||
27547 | + RelativePath="..\..\gst\gl\gstglfiltersobel.c" | ||
27548 | + > | ||
27549 | + </File> | ||
27550 | + <File | ||
27551 | + RelativePath="..\..\gst\gl\gstglimagesink.c" | ||
27552 | + > | ||
27553 | + </File> | ||
27554 | + <File | ||
27555 | + RelativePath="..\..\gst\gl\gstglmosaic.c" | ||
27556 | + > | ||
27557 | + </File> | ||
27558 | + <File | ||
27559 | + RelativePath="..\..\gst\gl\gstgloverlay.c" | ||
27560 | + > | ||
27561 | + </File> | ||
27562 | + <File | ||
27563 | + RelativePath="..\..\gst\gl\gstgltestsrc.c" | ||
27564 | + > | ||
27565 | + </File> | ||
27566 | + <File | ||
27567 | + RelativePath="..\..\gst\gl\gstglupload.c" | ||
27568 | + > | ||
27569 | + </File> | ||
27570 | + <File | ||
27571 | + RelativePath="..\..\gst\gl\gstopengl.c" | ||
27572 | + > | ||
27573 | + </File> | ||
27574 | + <Filter | ||
27575 | + Name="effects" | ||
27576 | + > | ||
27577 | + <File | ||
27578 | + RelativePath="..\..\gst\gl\effects\gstgleffectbulge.c" | ||
27579 | + > | ||
27580 | + </File> | ||
27581 | + <File | ||
27582 | + RelativePath="..\..\gst\gl\effects\gstgleffectfisheye.c" | ||
27583 | + > | ||
27584 | + </File> | ||
27585 | + <File | ||
27586 | + RelativePath="..\..\gst\gl\effects\gstgleffectglow.c" | ||
27587 | + > | ||
27588 | + </File> | ||
27589 | + <File | ||
27590 | + RelativePath="..\..\gst\gl\effects\gstgleffectidentity.c" | ||
27591 | + > | ||
27592 | + </File> | ||
27593 | + <File | ||
27594 | + RelativePath="..\..\gst\gl\effects\gstgleffectlumatocurve.c" | ||
27595 | + > | ||
27596 | + </File> | ||
27597 | + <File | ||
27598 | + RelativePath="..\..\gst\gl\effects\gstgleffectmirror.c" | ||
27599 | + > | ||
27600 | + </File> | ||
27601 | + <File | ||
27602 | + RelativePath="..\..\gst\gl\effects\gstgleffectrgbtocurve.c" | ||
27603 | + > | ||
27604 | + </File> | ||
27605 | + <File | ||
27606 | + RelativePath="..\..\gst\gl\effects\gstgleffectsin.c" | ||
27607 | + > | ||
27608 | + </File> | ||
27609 | + <File | ||
27610 | + RelativePath="..\..\gst\gl\effects\gstgleffectsquare.c" | ||
27611 | + > | ||
27612 | + </File> | ||
27613 | + <File | ||
27614 | + RelativePath="..\..\gst\gl\effects\gstgleffectsqueeze.c" | ||
27615 | + > | ||
27616 | + </File> | ||
27617 | + <File | ||
27618 | + RelativePath="..\..\gst\gl\effects\gstgleffectssources.c" | ||
27619 | + > | ||
27620 | + </File> | ||
27621 | + <File | ||
27622 | + RelativePath="..\..\gst\gl\effects\gstgleffectstretch.c" | ||
27623 | + > | ||
27624 | + </File> | ||
27625 | + <File | ||
27626 | + RelativePath="..\..\gst\gl\effects\gstgleffecttunnel.c" | ||
27627 | + > | ||
27628 | + </File> | ||
27629 | + <File | ||
27630 | + RelativePath="..\..\gst\gl\effects\gstgleffecttwirl.c" | ||
27631 | + > | ||
27632 | + </File> | ||
27633 | + <File | ||
27634 | + RelativePath="..\..\gst\gl\effects\gstgleffectxray.c" | ||
27635 | + > | ||
27636 | + </File> | ||
27637 | + </Filter> | ||
27638 | + </Filter> | ||
27639 | + </Filter> | ||
27640 | + <Filter | ||
27641 | + Name="Header Files" | ||
27642 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
27643 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
27644 | + > | ||
27645 | + <Filter | ||
27646 | + Name="gstgl" | ||
27647 | + > | ||
27648 | + <File | ||
27649 | + RelativePath="..\common\config.h" | ||
27650 | + > | ||
27651 | + </File> | ||
27652 | + <File | ||
27653 | + RelativePath="..\..\gst\gl\gltestsrc.h" | ||
27654 | + > | ||
27655 | + </File> | ||
27656 | + <File | ||
27657 | + RelativePath="..\..\gst-libs\gst\gl\gstglbuffer.h" | ||
27658 | + > | ||
27659 | + </File> | ||
27660 | + <File | ||
27661 | + RelativePath="..\..\gst-libs\gst\gl\gstgldisplay.h" | ||
27662 | + > | ||
27663 | + </File> | ||
27664 | + <File | ||
27665 | + RelativePath="..\..\gst-libs\gst\gl\gstglfilter.h" | ||
27666 | + > | ||
27667 | + </File> | ||
27668 | + <File | ||
27669 | + RelativePath="..\..\gst-libs\gst\gl\gstglmixer.h" | ||
27670 | + > | ||
27671 | + </File> | ||
27672 | + <File | ||
27673 | + RelativePath="..\..\gst-libs\gst\gl\gstglmixerpad.h" | ||
27674 | + > | ||
27675 | + </File> | ||
27676 | + <File | ||
27677 | + RelativePath="..\..\gst-libs\gst\gl\gstglshader.h" | ||
27678 | + > | ||
27679 | + </File> | ||
27680 | + <File | ||
27681 | + RelativePath="..\..\gst-libs\gst\gl\gstglshadervariables.h" | ||
27682 | + > | ||
27683 | + </File> | ||
27684 | + <File | ||
27685 | + RelativePath="..\..\gst-libs\gst\gl\gstglwindow.h" | ||
27686 | + > | ||
27687 | + </File> | ||
27688 | + </Filter> | ||
27689 | + <Filter | ||
27690 | + Name="gstglelements" | ||
27691 | + > | ||
27692 | + <File | ||
27693 | + RelativePath="..\..\gst\gl\gstglbumper.h" | ||
27694 | + > | ||
27695 | + </File> | ||
27696 | + <File | ||
27697 | + RelativePath="..\..\gst\gl\gstglcolorscale.h" | ||
27698 | + > | ||
27699 | + </File> | ||
27700 | + <File | ||
27701 | + RelativePath="..\..\gst\gl\gstgldeinterlace.h" | ||
27702 | + > | ||
27703 | + </File> | ||
27704 | + <File | ||
27705 | + RelativePath="..\..\gst\gl\gstgldownload.h" | ||
27706 | + > | ||
27707 | + </File> | ||
27708 | + <File | ||
27709 | + RelativePath="..\..\gst\gl\gstgleffects.h" | ||
27710 | + > | ||
27711 | + </File> | ||
27712 | + <File | ||
27713 | + RelativePath="..\..\gst\gl\gstglfilterapp.h" | ||
27714 | + > | ||
27715 | + </File> | ||
27716 | + <File | ||
27717 | + RelativePath="..\..\gst\gl\gstglfiltercube.h" | ||
27718 | + > | ||
27719 | + </File> | ||
27720 | + <File | ||
27721 | + RelativePath="..\..\gst\gl\gstglfilterglass.h" | ||
27722 | + > | ||
27723 | + </File> | ||
27724 | + <File | ||
27725 | + RelativePath="..\..\gst\gl\gstglfilterlaplacian.h" | ||
27726 | + > | ||
27727 | + </File> | ||
27728 | + <File | ||
27729 | + RelativePath="..\..\gst\gl\gstglfilterreflectedscreen.h" | ||
27730 | + > | ||
27731 | + </File> | ||
27732 | + <File | ||
27733 | + RelativePath="..\..\gst\gl\gstglfiltershader.h" | ||
27734 | + > | ||
27735 | + </File> | ||
27736 | + <File | ||
27737 | + RelativePath="..\..\gst\gl\gstglimagesink.h" | ||
27738 | + > | ||
27739 | + </File> | ||
27740 | + <File | ||
27741 | + RelativePath="..\..\gst\gl\gstglmosaic.h" | ||
27742 | + > | ||
27743 | + </File> | ||
27744 | + <File | ||
27745 | + RelativePath="..\..\gst\gl\gstgltestsrc.h" | ||
27746 | + > | ||
27747 | + </File> | ||
27748 | + <File | ||
27749 | + RelativePath="..\..\gst\gl\gstglupload.h" | ||
27750 | + > | ||
27751 | + </File> | ||
27752 | + <Filter | ||
27753 | + Name="effects" | ||
27754 | + > | ||
27755 | + <File | ||
27756 | + RelativePath="..\..\gst\gl\effects\gstgleffectlumatocurve.h" | ||
27757 | + > | ||
27758 | + </File> | ||
27759 | + <File | ||
27760 | + RelativePath="..\..\gst\gl\effects\gstgleffectscurves.h" | ||
27761 | + > | ||
27762 | + </File> | ||
27763 | + <File | ||
27764 | + RelativePath="..\..\gst\gl\effects\gstgleffectssources.h" | ||
27765 | + > | ||
27766 | + </File> | ||
27767 | + </Filter> | ||
27768 | + </Filter> | ||
27769 | + </Filter> | ||
27770 | + <Filter | ||
27771 | + Name="Resource Files" | ||
27772 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
27773 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
27774 | + > | ||
27775 | + </Filter> | ||
27776 | + </Files> | ||
27777 | + <Globals> | ||
27778 | + </Globals> | ||
27779 | +</VisualStudioProject> | ||
27780 | diff --git a/winCE/common/config.h b/winCE/common/config.h | ||
27781 | new file mode 100644 | ||
27782 | index 0000000..d8a79d5 | ||
27783 | --- /dev/null | ||
27784 | +++ b/winCE/common/config.h | ||
27785 | @@ -0,0 +1,226 @@ | ||
27786 | +/* config.h.in. Generated from configure.ac by autoheader. */ | ||
27787 | +/* This copy of config.h.in is specifically for win32 Visual Studio builds */ | ||
27788 | + | ||
27789 | +/* Define to 1 if translation of program messages to the user's native | ||
27790 | + language is requested. */ | ||
27791 | +#undef ENABLE_NLS | ||
27792 | + | ||
27793 | +/* gettext package name */ | ||
27794 | +#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" | ||
27795 | + | ||
27796 | +/* PREFIX - specifically added for Windows for easier moving */ | ||
27797 | +#define PREFIX "C:\\gstreamer" | ||
27798 | + | ||
27799 | +/* Location of registry */ | ||
27800 | +#define GST_CACHE_DIR PREFIX "\\var\\cache" | ||
27801 | + | ||
27802 | +/* macro to use to show function name */ | ||
27803 | +#undef GST_FUNCTION | ||
27804 | + | ||
27805 | +/* Defined if gcov is enabled to force a rebuild due to config.h changing */ | ||
27806 | +#undef GST_GCOV_ENABLED | ||
27807 | + | ||
27808 | +/* Default errorlevel to use */ | ||
27809 | +#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR | ||
27810 | + | ||
27811 | +/* GStreamer license */ | ||
27812 | +#define GST_LICENSE "LGPL" | ||
27813 | + | ||
27814 | +/* package name in plugins */ | ||
27815 | +#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" | ||
27816 | + | ||
27817 | +/* package origin */ | ||
27818 | +#define GST_PACKAGE_ORIGIN "Unknown package origin" | ||
27819 | + | ||
27820 | +/* Define if the host CPU is an Alpha */ | ||
27821 | +#undef HAVE_CPU_ALPHA | ||
27822 | + | ||
27823 | +/* Define if the host CPU is an ARM */ | ||
27824 | +#undef HAVE_CPU_ARM | ||
27825 | + | ||
27826 | +/* Define if the host CPU is a HPPA */ | ||
27827 | +#undef HAVE_CPU_HPPA | ||
27828 | + | ||
27829 | +/* Define if the host CPU is an x86 */ | ||
27830 | +#undef HAVE_CPU_I386 | ||
27831 | + | ||
27832 | +/* Define if the host CPU is a IA64 */ | ||
27833 | +#undef HAVE_CPU_IA64 | ||
27834 | + | ||
27835 | +/* Define if the host CPU is a M68K */ | ||
27836 | +#undef HAVE_CPU_M68K | ||
27837 | + | ||
27838 | +/* Define if the host CPU is a MIPS */ | ||
27839 | +#undef HAVE_CPU_MIPS | ||
27840 | + | ||
27841 | +/* Define if the host CPU is a PowerPC */ | ||
27842 | +#undef HAVE_CPU_PPC | ||
27843 | + | ||
27844 | +/* Define if the host CPU is a S390 */ | ||
27845 | +#undef HAVE_CPU_S390 | ||
27846 | + | ||
27847 | +/* Define if the host CPU is a SPARC */ | ||
27848 | +#undef HAVE_CPU_SPARC | ||
27849 | + | ||
27850 | +/* Define if the host CPU is a x86_64 */ | ||
27851 | +#undef HAVE_CPU_X86_64 | ||
27852 | + | ||
27853 | +/* Define if the GNU dcgettext() function is already present or preinstalled. | ||
27854 | + */ | ||
27855 | +#undef HAVE_DCGETTEXT | ||
27856 | + | ||
27857 | +/* Defined if we have dladdr () */ | ||
27858 | +#undef HAVE_DLADDR | ||
27859 | + | ||
27860 | +/* Define to 1 if you have the <dlfcn.h> header file. */ | ||
27861 | +#undef HAVE_DLFCN_H | ||
27862 | + | ||
27863 | +/* Define to 1 if you have the `fgetpos' function. */ | ||
27864 | +#define HAVE_FGETPOS 1 | ||
27865 | + | ||
27866 | +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ | ||
27867 | +#undef HAVE_FSEEKO | ||
27868 | + | ||
27869 | +/* Define to 1 if you have the `fsetpos' function. */ | ||
27870 | +#define HAVE_FSETPOS 1 | ||
27871 | + | ||
27872 | +/* Define to 1 if you have the `ftello' function. */ | ||
27873 | +#undef HAVE_FTELLO | ||
27874 | + | ||
27875 | +/* defined if the compiler implements __func__ */ | ||
27876 | +#undef HAVE_FUNC | ||
27877 | + | ||
27878 | +/* defined if the compiler implements __FUNCTION__ */ | ||
27879 | +#undef HAVE_FUNCTION | ||
27880 | + | ||
27881 | +/* Define to 1 if you have the `getpagesize' function. */ | ||
27882 | +#undef HAVE_GETPAGESIZE | ||
27883 | + | ||
27884 | +/* Define if the GNU gettext() function is already present or preinstalled. */ | ||
27885 | +#undef HAVE_GETTEXT | ||
27886 | + | ||
27887 | +/* Define if you have the iconv() function. */ | ||
27888 | +#undef HAVE_ICONV | ||
27889 | + | ||
27890 | +/* Define to 1 if you have the <inttypes.h> header file. */ | ||
27891 | +#undef HAVE_INTTYPES_H | ||
27892 | + | ||
27893 | +/* Define if libxml2 is available */ | ||
27894 | +#define HAVE_LIBXML2 1 | ||
27895 | + | ||
27896 | +/* defined if we have makecontext () */ | ||
27897 | +#undef HAVE_MAKECONTEXT | ||
27898 | + | ||
27899 | +/* Define to 1 if you have the <memory.h> header file. */ | ||
27900 | +#undef HAVE_MEMORY_H | ||
27901 | + | ||
27902 | +/* Define to 1 if you have a working `mmap' system call. */ | ||
27903 | +#undef HAVE_MMAP | ||
27904 | + | ||
27905 | +/* defined if the compiler implements __PRETTY_FUNCTION__ */ | ||
27906 | +#undef HAVE_PRETTY_FUNCTION | ||
27907 | + | ||
27908 | +/* Defined if we have register_printf_function () */ | ||
27909 | +#undef HAVE_PRINTF_EXTENSION | ||
27910 | + | ||
27911 | +/* Define to 1 if you have the <process.h> header file. */ | ||
27912 | +#define HAVE_PROCESS_H 1 | ||
27913 | + | ||
27914 | +/* Define if RDTSC is available */ | ||
27915 | +#undef HAVE_RDTSC | ||
27916 | + | ||
27917 | +/* Define to 1 if you have the `sigaction' function. */ | ||
27918 | +#undef HAVE_SIGACTION | ||
27919 | + | ||
27920 | +/* Define to 1 if you have the <stdint.h> header file. */ | ||
27921 | +#undef HAVE_STDINT_H | ||
27922 | + | ||
27923 | +/* Define to 1 if you have the <stdlib.h> header file. */ | ||
27924 | +#define HAVE_STDLIB_H 1 | ||
27925 | + | ||
27926 | +/* Define to 1 if you have the <strings.h> header file. */ | ||
27927 | +#undef HAVE_STRINGS_H | ||
27928 | + | ||
27929 | +/* Define to 1 if you have the <string.h> header file. */ | ||
27930 | +#define HAVE_STRING_H 1 | ||
27931 | + | ||
27932 | +/* Define to 1 if you have the <sys/socket.h> header file. */ | ||
27933 | +#undef HAVE_SYS_SOCKET_H | ||
27934 | + | ||
27935 | +/* Define to 1 if you have the <sys/stat.h> header file. */ | ||
27936 | +#define HAVE_SYS_STAT_H 1 | ||
27937 | + | ||
27938 | +/* Define to 1 if you have the <sys/types.h> header file. */ | ||
27939 | +#define HAVE_SYS_TYPES_H 1 | ||
27940 | + | ||
27941 | +/* Define to 1 if you have the <ucontext.h> header file. */ | ||
27942 | +#undef HAVE_UCONTEXT_H | ||
27943 | + | ||
27944 | +/* defined if unaligned memory access works correctly */ | ||
27945 | +#undef HAVE_UNALIGNED_ACCESS | ||
27946 | + | ||
27947 | +/* Define to 1 if you have the <unistd.h> header file. */ | ||
27948 | +#undef HAVE_UNISTD_H | ||
27949 | + | ||
27950 | +/* Define if valgrind should be used */ | ||
27951 | +#undef HAVE_VALGRIND | ||
27952 | + | ||
27953 | +/* Defined if compiling for Windows */ | ||
27954 | +#define HAVE_WIN32 1 | ||
27955 | + | ||
27956 | +/* library dir */ | ||
27957 | +#define LIBDIR PREFIX "\\lib" | ||
27958 | + | ||
27959 | +/* gettext locale dir */ | ||
27960 | +#define LOCALEDIR PREFIX "\\share\\locale" | ||
27961 | + | ||
27962 | +/* Name of package */ | ||
27963 | +#define PACKAGE "gst-plugins-gl" | ||
27964 | + | ||
27965 | +/* Define to the address where bug reports for this package should be sent. */ | ||
27966 | +#undef PACKAGE_BUGREPORT | ||
27967 | + | ||
27968 | +/* Define to the full name of this package. */ | ||
27969 | +#undef PACKAGE_NAME | ||
27970 | + | ||
27971 | +/* Define to the full name and version of this package. */ | ||
27972 | +#undef PACKAGE_STRING | ||
27973 | + | ||
27974 | +/* Define to the one symbol short name of this package. */ | ||
27975 | +#undef PACKAGE_TARNAME | ||
27976 | + | ||
27977 | +/* Define to the version of this package. */ | ||
27978 | +#undef PACKAGE_VERSION | ||
27979 | + | ||
27980 | +/* directory where plugins are located */ | ||
27981 | +#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" | ||
27982 | + | ||
27983 | +/* Define to 1 if you have the ANSI C header files. */ | ||
27984 | +#undef STDC_HEADERS | ||
27985 | + | ||
27986 | +/* Define if we should poison deallocated memory */ | ||
27987 | +#undef USE_POISONING | ||
27988 | + | ||
27989 | +/* Version number of package */ | ||
27990 | +#define VERSION "0.10.0.1" | ||
27991 | + | ||
27992 | +/* Define to 1 if your processor stores words with the most significant byte | ||
27993 | + first (like Motorola and SPARC, unlike Intel and VAX). */ | ||
27994 | +#undef WORDS_BIGENDIAN | ||
27995 | + | ||
27996 | +/* Number of bits in a file offset, on hosts where this is settable. */ | ||
27997 | +#undef _FILE_OFFSET_BITS | ||
27998 | + | ||
27999 | +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ | ||
28000 | +#undef _LARGEFILE_SOURCE | ||
28001 | + | ||
28002 | +/* Define for large files, on AIX-style hosts. */ | ||
28003 | +#undef _LARGE_FILES | ||
28004 | + | ||
28005 | +/* Define to `__inline__' or `__inline' if that's what the C compiler | ||
28006 | + calls it, or to nothing if 'inline' is not supported under any name. */ | ||
28007 | +/* #undef inline */ | ||
28008 | + | ||
28009 | +#define GST_PACKAGE "Gst-plugins-gl" | ||
28010 | +#define PACKAGE "gst-plugins-gl" | ||
28011 | +#define GST_ORIGIN "gstreamer.freedesktop.org" | ||
28012 | diff --git a/winCE/common/config.h.in b/winCE/common/config.h.in | ||
28013 | new file mode 100644 | ||
28014 | index 0000000..d8a79d5 | ||
28015 | --- /dev/null | ||
28016 | +++ b/winCE/common/config.h.in | ||
28017 | @@ -0,0 +1,226 @@ | ||
28018 | +/* config.h.in. Generated from configure.ac by autoheader. */ | ||
28019 | +/* This copy of config.h.in is specifically for win32 Visual Studio builds */ | ||
28020 | + | ||
28021 | +/* Define to 1 if translation of program messages to the user's native | ||
28022 | + language is requested. */ | ||
28023 | +#undef ENABLE_NLS | ||
28024 | + | ||
28025 | +/* gettext package name */ | ||
28026 | +#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" | ||
28027 | + | ||
28028 | +/* PREFIX - specifically added for Windows for easier moving */ | ||
28029 | +#define PREFIX "C:\\gstreamer" | ||
28030 | + | ||
28031 | +/* Location of registry */ | ||
28032 | +#define GST_CACHE_DIR PREFIX "\\var\\cache" | ||
28033 | + | ||
28034 | +/* macro to use to show function name */ | ||
28035 | +#undef GST_FUNCTION | ||
28036 | + | ||
28037 | +/* Defined if gcov is enabled to force a rebuild due to config.h changing */ | ||
28038 | +#undef GST_GCOV_ENABLED | ||
28039 | + | ||
28040 | +/* Default errorlevel to use */ | ||
28041 | +#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR | ||
28042 | + | ||
28043 | +/* GStreamer license */ | ||
28044 | +#define GST_LICENSE "LGPL" | ||
28045 | + | ||
28046 | +/* package name in plugins */ | ||
28047 | +#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" | ||
28048 | + | ||
28049 | +/* package origin */ | ||
28050 | +#define GST_PACKAGE_ORIGIN "Unknown package origin" | ||
28051 | + | ||
28052 | +/* Define if the host CPU is an Alpha */ | ||
28053 | +#undef HAVE_CPU_ALPHA | ||
28054 | + | ||
28055 | +/* Define if the host CPU is an ARM */ | ||
28056 | +#undef HAVE_CPU_ARM | ||
28057 | + | ||
28058 | +/* Define if the host CPU is a HPPA */ | ||
28059 | +#undef HAVE_CPU_HPPA | ||
28060 | + | ||
28061 | +/* Define if the host CPU is an x86 */ | ||
28062 | +#undef HAVE_CPU_I386 | ||
28063 | + | ||
28064 | +/* Define if the host CPU is a IA64 */ | ||
28065 | +#undef HAVE_CPU_IA64 | ||
28066 | + | ||
28067 | +/* Define if the host CPU is a M68K */ | ||
28068 | +#undef HAVE_CPU_M68K | ||
28069 | + | ||
28070 | +/* Define if the host CPU is a MIPS */ | ||
28071 | +#undef HAVE_CPU_MIPS | ||
28072 | + | ||
28073 | +/* Define if the host CPU is a PowerPC */ | ||
28074 | +#undef HAVE_CPU_PPC | ||
28075 | + | ||
28076 | +/* Define if the host CPU is a S390 */ | ||
28077 | +#undef HAVE_CPU_S390 | ||
28078 | + | ||
28079 | +/* Define if the host CPU is a SPARC */ | ||
28080 | +#undef HAVE_CPU_SPARC | ||
28081 | + | ||
28082 | +/* Define if the host CPU is a x86_64 */ | ||
28083 | +#undef HAVE_CPU_X86_64 | ||
28084 | + | ||
28085 | +/* Define if the GNU dcgettext() function is already present or preinstalled. | ||
28086 | + */ | ||
28087 | +#undef HAVE_DCGETTEXT | ||
28088 | + | ||
28089 | +/* Defined if we have dladdr () */ | ||
28090 | +#undef HAVE_DLADDR | ||
28091 | + | ||
28092 | +/* Define to 1 if you have the <dlfcn.h> header file. */ | ||
28093 | +#undef HAVE_DLFCN_H | ||
28094 | + | ||
28095 | +/* Define to 1 if you have the `fgetpos' function. */ | ||
28096 | +#define HAVE_FGETPOS 1 | ||
28097 | + | ||
28098 | +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ | ||
28099 | +#undef HAVE_FSEEKO | ||
28100 | + | ||
28101 | +/* Define to 1 if you have the `fsetpos' function. */ | ||
28102 | +#define HAVE_FSETPOS 1 | ||
28103 | + | ||
28104 | +/* Define to 1 if you have the `ftello' function. */ | ||
28105 | +#undef HAVE_FTELLO | ||
28106 | + | ||
28107 | +/* defined if the compiler implements __func__ */ | ||
28108 | +#undef HAVE_FUNC | ||
28109 | + | ||
28110 | +/* defined if the compiler implements __FUNCTION__ */ | ||
28111 | +#undef HAVE_FUNCTION | ||
28112 | + | ||
28113 | +/* Define to 1 if you have the `getpagesize' function. */ | ||
28114 | +#undef HAVE_GETPAGESIZE | ||
28115 | + | ||
28116 | +/* Define if the GNU gettext() function is already present or preinstalled. */ | ||
28117 | +#undef HAVE_GETTEXT | ||
28118 | + | ||
28119 | +/* Define if you have the iconv() function. */ | ||
28120 | +#undef HAVE_ICONV | ||
28121 | + | ||
28122 | +/* Define to 1 if you have the <inttypes.h> header file. */ | ||
28123 | +#undef HAVE_INTTYPES_H | ||
28124 | + | ||
28125 | +/* Define if libxml2 is available */ | ||
28126 | +#define HAVE_LIBXML2 1 | ||
28127 | + | ||
28128 | +/* defined if we have makecontext () */ | ||
28129 | +#undef HAVE_MAKECONTEXT | ||
28130 | + | ||
28131 | +/* Define to 1 if you have the <memory.h> header file. */ | ||
28132 | +#undef HAVE_MEMORY_H | ||
28133 | + | ||
28134 | +/* Define to 1 if you have a working `mmap' system call. */ | ||
28135 | +#undef HAVE_MMAP | ||
28136 | + | ||
28137 | +/* defined if the compiler implements __PRETTY_FUNCTION__ */ | ||
28138 | +#undef HAVE_PRETTY_FUNCTION | ||
28139 | + | ||
28140 | +/* Defined if we have register_printf_function () */ | ||
28141 | +#undef HAVE_PRINTF_EXTENSION | ||
28142 | + | ||
28143 | +/* Define to 1 if you have the <process.h> header file. */ | ||
28144 | +#define HAVE_PROCESS_H 1 | ||
28145 | + | ||
28146 | +/* Define if RDTSC is available */ | ||
28147 | +#undef HAVE_RDTSC | ||
28148 | + | ||
28149 | +/* Define to 1 if you have the `sigaction' function. */ | ||
28150 | +#undef HAVE_SIGACTION | ||
28151 | + | ||
28152 | +/* Define to 1 if you have the <stdint.h> header file. */ | ||
28153 | +#undef HAVE_STDINT_H | ||
28154 | + | ||
28155 | +/* Define to 1 if you have the <stdlib.h> header file. */ | ||
28156 | +#define HAVE_STDLIB_H 1 | ||
28157 | + | ||
28158 | +/* Define to 1 if you have the <strings.h> header file. */ | ||
28159 | +#undef HAVE_STRINGS_H | ||
28160 | + | ||
28161 | +/* Define to 1 if you have the <string.h> header file. */ | ||
28162 | +#define HAVE_STRING_H 1 | ||
28163 | + | ||
28164 | +/* Define to 1 if you have the <sys/socket.h> header file. */ | ||
28165 | +#undef HAVE_SYS_SOCKET_H | ||
28166 | + | ||
28167 | +/* Define to 1 if you have the <sys/stat.h> header file. */ | ||
28168 | +#define HAVE_SYS_STAT_H 1 | ||
28169 | + | ||
28170 | +/* Define to 1 if you have the <sys/types.h> header file. */ | ||
28171 | +#define HAVE_SYS_TYPES_H 1 | ||
28172 | + | ||
28173 | +/* Define to 1 if you have the <ucontext.h> header file. */ | ||
28174 | +#undef HAVE_UCONTEXT_H | ||
28175 | + | ||
28176 | +/* defined if unaligned memory access works correctly */ | ||
28177 | +#undef HAVE_UNALIGNED_ACCESS | ||
28178 | + | ||
28179 | +/* Define to 1 if you have the <unistd.h> header file. */ | ||
28180 | +#undef HAVE_UNISTD_H | ||
28181 | + | ||
28182 | +/* Define if valgrind should be used */ | ||
28183 | +#undef HAVE_VALGRIND | ||
28184 | + | ||
28185 | +/* Defined if compiling for Windows */ | ||
28186 | +#define HAVE_WIN32 1 | ||
28187 | + | ||
28188 | +/* library dir */ | ||
28189 | +#define LIBDIR PREFIX "\\lib" | ||
28190 | + | ||
28191 | +/* gettext locale dir */ | ||
28192 | +#define LOCALEDIR PREFIX "\\share\\locale" | ||
28193 | + | ||
28194 | +/* Name of package */ | ||
28195 | +#define PACKAGE "gst-plugins-gl" | ||
28196 | + | ||
28197 | +/* Define to the address where bug reports for this package should be sent. */ | ||
28198 | +#undef PACKAGE_BUGREPORT | ||
28199 | + | ||
28200 | +/* Define to the full name of this package. */ | ||
28201 | +#undef PACKAGE_NAME | ||
28202 | + | ||
28203 | +/* Define to the full name and version of this package. */ | ||
28204 | +#undef PACKAGE_STRING | ||
28205 | + | ||
28206 | +/* Define to the one symbol short name of this package. */ | ||
28207 | +#undef PACKAGE_TARNAME | ||
28208 | + | ||
28209 | +/* Define to the version of this package. */ | ||
28210 | +#undef PACKAGE_VERSION | ||
28211 | + | ||
28212 | +/* directory where plugins are located */ | ||
28213 | +#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" | ||
28214 | + | ||
28215 | +/* Define to 1 if you have the ANSI C header files. */ | ||
28216 | +#undef STDC_HEADERS | ||
28217 | + | ||
28218 | +/* Define if we should poison deallocated memory */ | ||
28219 | +#undef USE_POISONING | ||
28220 | + | ||
28221 | +/* Version number of package */ | ||
28222 | +#define VERSION "0.10.0.1" | ||
28223 | + | ||
28224 | +/* Define to 1 if your processor stores words with the most significant byte | ||
28225 | + first (like Motorola and SPARC, unlike Intel and VAX). */ | ||
28226 | +#undef WORDS_BIGENDIAN | ||
28227 | + | ||
28228 | +/* Number of bits in a file offset, on hosts where this is settable. */ | ||
28229 | +#undef _FILE_OFFSET_BITS | ||
28230 | + | ||
28231 | +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ | ||
28232 | +#undef _LARGEFILE_SOURCE | ||
28233 | + | ||
28234 | +/* Define for large files, on AIX-style hosts. */ | ||
28235 | +#undef _LARGE_FILES | ||
28236 | + | ||
28237 | +/* Define to `__inline__' or `__inline' if that's what the C compiler | ||
28238 | + calls it, or to nothing if 'inline' is not supported under any name. */ | ||
28239 | +/* #undef inline */ | ||
28240 | + | ||
28241 | +#define GST_PACKAGE "Gst-plugins-gl" | ||
28242 | +#define PACKAGE "gst-plugins-gl" | ||
28243 | +#define GST_ORIGIN "gstreamer.freedesktop.org" | ||
28244 | diff --git a/winCE/vs9/libgstopengl.vcproj b/winCE/vs9/libgstopengl.vcproj | ||
28245 | new file mode 100644 | ||
28246 | index 0000000..2dac7f7 | ||
28247 | --- /dev/null | ||
28248 | +++ b/winCE/vs9/libgstopengl.vcproj | ||
28249 | @@ -0,0 +1,336 @@ | ||
28250 | +<?xml version="1.0" encoding="Windows-1252"?> | ||
28251 | +<VisualStudioProject | ||
28252 | + ProjectType="Visual C++" | ||
28253 | + Version="9,00" | ||
28254 | + Name="libgstopengl" | ||
28255 | + ProjectGUID="{F4E2D883-31DB-48B7-BEE9-0D9FDBBC805F}" | ||
28256 | + RootNamespace="libgstgl" | ||
28257 | + Keyword="Win32Proj" | ||
28258 | + TargetFrameworkVersion="131072" | ||
28259 | + > | ||
28260 | + <Platforms> | ||
28261 | + <Platform | ||
28262 | + Name="Win32" | ||
28263 | + /> | ||
28264 | + </Platforms> | ||
28265 | + <ToolFiles> | ||
28266 | + </ToolFiles> | ||
28267 | + <Configurations> | ||
28268 | + <Configuration | ||
28269 | + Name="Debug|Win32" | ||
28270 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
28271 | + IntermediateDirectory="$(ConfigurationName)" | ||
28272 | + ConfigurationType="2" | ||
28273 | + CharacterSet="1" | ||
28274 | + > | ||
28275 | + <Tool | ||
28276 | + Name="VCPreBuildEventTool" | ||
28277 | + /> | ||
28278 | + <Tool | ||
28279 | + Name="VCCustomBuildTool" | ||
28280 | + /> | ||
28281 | + <Tool | ||
28282 | + Name="VCXMLDataGeneratorTool" | ||
28283 | + /> | ||
28284 | + <Tool | ||
28285 | + Name="VCWebServiceProxyGeneratorTool" | ||
28286 | + /> | ||
28287 | + <Tool | ||
28288 | + Name="VCMIDLTool" | ||
28289 | + /> | ||
28290 | + <Tool | ||
28291 | + Name="VCCLCompilerTool" | ||
28292 | + Optimization="0" | ||
28293 | + AdditionalIncludeDirectories=""C:\Program Files\AMD\OpenGL ES 2.0 Emulator v1.4\include";"C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_X86EMULATION_2.09.29.0649\Builds\OGLES2\Include";"C:\Imagination Technologies\PowerVR Insider SDK\OGLES2_WINDOWS_X86EMULATION_2.10\Builds\OGLES2\Include";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\glib-2.0";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\libxml2";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\gstreamer-0.10";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include";..\common;"..\..\gst-libs\gst\gl";..\..\gst\gl;..\..\gst\gl\effects;"..\..\gst-libs"" | ||
28294 | + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;OPENGL_ES2" | ||
28295 | + MinimalRebuild="true" | ||
28296 | + BasicRuntimeChecks="3" | ||
28297 | + RuntimeLibrary="3" | ||
28298 | + UsePrecompiledHeader="0" | ||
28299 | + WarningLevel="3" | ||
28300 | + Detect64BitPortabilityProblems="false" | ||
28301 | + DebugInformationFormat="4" | ||
28302 | + /> | ||
28303 | + <Tool | ||
28304 | + Name="VCManagedResourceCompilerTool" | ||
28305 | + /> | ||
28306 | + <Tool | ||
28307 | + Name="VCResourceCompilerTool" | ||
28308 | + /> | ||
28309 | + <Tool | ||
28310 | + Name="VCPreLinkEventTool" | ||
28311 | + /> | ||
28312 | + <Tool | ||
28313 | + Name="VCLinkerTool" | ||
28314 | + AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libEGL.lib libGLESv2.lib winmm.lib" | ||
28315 | + LinkIncremental="2" | ||
28316 | + AdditionalLibraryDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\lib";"C:\Program Files\AMD\OpenGL ES 2.0 Emulator v1.4\lib";"C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_X86EMULATION_2.09.29.0649\Builds\OGLES2\WindowsX86\Lib";"C:\Imagination Technologies\PowerVR Insider SDK\OGLES2_WINDOWS_X86EMULATION_2.10\Builds\OGLES2\WindowsX86\Lib"" | ||
28317 | + GenerateDebugInformation="true" | ||
28318 | + SubSystem="2" | ||
28319 | + RandomizedBaseAddress="1" | ||
28320 | + DataExecutionPrevention="0" | ||
28321 | + TargetMachine="1" | ||
28322 | + /> | ||
28323 | + <Tool | ||
28324 | + Name="VCALinkTool" | ||
28325 | + /> | ||
28326 | + <Tool | ||
28327 | + Name="VCManifestTool" | ||
28328 | + /> | ||
28329 | + <Tool | ||
28330 | + Name="VCXDCMakeTool" | ||
28331 | + /> | ||
28332 | + <Tool | ||
28333 | + Name="VCBscMakeTool" | ||
28334 | + /> | ||
28335 | + <Tool | ||
28336 | + Name="VCFxCopTool" | ||
28337 | + /> | ||
28338 | + <Tool | ||
28339 | + Name="VCAppVerifierTool" | ||
28340 | + /> | ||
28341 | + <Tool | ||
28342 | + Name="VCPostBuildEventTool" | ||
28343 | + CommandLine="copy /Y $(OutDir)\$(ProjectName).dll "$(OSSBUILD_GSTREAMER_DIR)\lib\gstreamer-0.10"" | ||
28344 | + /> | ||
28345 | + </Configuration> | ||
28346 | + <Configuration | ||
28347 | + Name="Release|Win32" | ||
28348 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
28349 | + IntermediateDirectory="$(ConfigurationName)" | ||
28350 | + ConfigurationType="2" | ||
28351 | + CharacterSet="1" | ||
28352 | + WholeProgramOptimization="1" | ||
28353 | + > | ||
28354 | + <Tool | ||
28355 | + Name="VCPreBuildEventTool" | ||
28356 | + /> | ||
28357 | + <Tool | ||
28358 | + Name="VCCustomBuildTool" | ||
28359 | + /> | ||
28360 | + <Tool | ||
28361 | + Name="VCXMLDataGeneratorTool" | ||
28362 | + /> | ||
28363 | + <Tool | ||
28364 | + Name="VCWebServiceProxyGeneratorTool" | ||
28365 | + /> | ||
28366 | + <Tool | ||
28367 | + Name="VCMIDLTool" | ||
28368 | + /> | ||
28369 | + <Tool | ||
28370 | + Name="VCCLCompilerTool" | ||
28371 | + AdditionalIncludeDirectories=""C:\Program Files\AMD\OpenGL ES 2.0 Emulator v1.4\include";"C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_X86EMULATION_2.09.29.0649\Builds\OGLES2\Include";"C:\Imagination Technologies\PowerVR Insider SDK\OGLES2_WINDOWS_X86EMULATION_2.10\Builds\OGLES2\Include";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\glib-2.0";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\libxml2";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include\gstreamer-0.10";"$(OSSBUILD_GSTREAMER_SDK_DIR)\include";..\common;"..\..\gst-libs\gst\gl";..\..\gst\gl;..\..\gst\gl\effects;"..\..\gst-libs"" | ||
28372 | + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;OPENGL_ES2" | ||
28373 | + RuntimeLibrary="2" | ||
28374 | + UsePrecompiledHeader="0" | ||
28375 | + WarningLevel="3" | ||
28376 | + Detect64BitPortabilityProblems="false" | ||
28377 | + DebugInformationFormat="3" | ||
28378 | + /> | ||
28379 | + <Tool | ||
28380 | + Name="VCManagedResourceCompilerTool" | ||
28381 | + /> | ||
28382 | + <Tool | ||
28383 | + Name="VCResourceCompilerTool" | ||
28384 | + /> | ||
28385 | + <Tool | ||
28386 | + Name="VCPreLinkEventTool" | ||
28387 | + /> | ||
28388 | + <Tool | ||
28389 | + Name="VCLinkerTool" | ||
28390 | + AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libEGL.lib libGLESv2.lib winmm.lib" | ||
28391 | + LinkIncremental="1" | ||
28392 | + AdditionalLibraryDirectories=""$(OSSBUILD_GSTREAMER_SDK_DIR)\lib";"C:\Program Files\AMD\OpenGL ES 2.0 Emulator v1.4\lib";"C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_X86EMULATION_2.09.29.0649\Builds\OGLES2\WindowsX86\Lib";"C:\Imagination Technologies\PowerVR Insider SDK\OGLES2_WINDOWS_X86EMULATION_2.10\Builds\OGLES2\WindowsX86\Lib"" | ||
28393 | + GenerateDebugInformation="true" | ||
28394 | + SubSystem="2" | ||
28395 | + OptimizeReferences="2" | ||
28396 | + EnableCOMDATFolding="2" | ||
28397 | + RandomizedBaseAddress="1" | ||
28398 | + DataExecutionPrevention="0" | ||
28399 | + TargetMachine="1" | ||
28400 | + /> | ||
28401 | + <Tool | ||
28402 | + Name="VCALinkTool" | ||
28403 | + /> | ||
28404 | + <Tool | ||
28405 | + Name="VCManifestTool" | ||
28406 | + /> | ||
28407 | + <Tool | ||
28408 | + Name="VCXDCMakeTool" | ||
28409 | + /> | ||
28410 | + <Tool | ||
28411 | + Name="VCBscMakeTool" | ||
28412 | + /> | ||
28413 | + <Tool | ||
28414 | + Name="VCFxCopTool" | ||
28415 | + /> | ||
28416 | + <Tool | ||
28417 | + Name="VCAppVerifierTool" | ||
28418 | + /> | ||
28419 | + <Tool | ||
28420 | + Name="VCPostBuildEventTool" | ||
28421 | + CommandLine="copy /Y $(OutDir)\$(ProjectName).dll "$(OSSBUILD_GSTREAMER_DIR)\lib\gstreamer-0.10"" | ||
28422 | + /> | ||
28423 | + </Configuration> | ||
28424 | + </Configurations> | ||
28425 | + <References> | ||
28426 | + </References> | ||
28427 | + <Files> | ||
28428 | + <Filter | ||
28429 | + Name="Source Files" | ||
28430 | + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
28431 | + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
28432 | + > | ||
28433 | + <Filter | ||
28434 | + Name="gstgl" | ||
28435 | + > | ||
28436 | + <File | ||
28437 | + RelativePath="..\..\gst-libs\gst\gl\gstglbuffer.c" | ||
28438 | + > | ||
28439 | + </File> | ||
28440 | + <File | ||
28441 | + RelativePath="..\..\gst-libs\gst\gl\gstgldisplay.c" | ||
28442 | + > | ||
28443 | + </File> | ||
28444 | + <File | ||
28445 | + RelativePath="..\..\gst-libs\gst\gl\gstglfilter.c" | ||
28446 | + > | ||
28447 | + </File> | ||
28448 | + <File | ||
28449 | + RelativePath="..\..\gst-libs\gst\gl\gstglshader.c" | ||
28450 | + > | ||
28451 | + </File> | ||
28452 | + <File | ||
28453 | + RelativePath="..\..\gst-libs\gst\gl\gstglwindow_winCE.c" | ||
28454 | + > | ||
28455 | + </File> | ||
28456 | + </Filter> | ||
28457 | + <Filter | ||
28458 | + Name="gstglelements" | ||
28459 | + > | ||
28460 | + <File | ||
28461 | + RelativePath="..\..\gst\gl\gstgldownload.c" | ||
28462 | + > | ||
28463 | + </File> | ||
28464 | + <File | ||
28465 | + RelativePath="..\..\gst\gl\gstgleffects.c" | ||
28466 | + > | ||
28467 | + </File> | ||
28468 | + <File | ||
28469 | + RelativePath="..\..\gst\gl\gstglfiltercube.c" | ||
28470 | + > | ||
28471 | + </File> | ||
28472 | + <File | ||
28473 | + RelativePath="..\..\gst\gl\gstglimagesink.c" | ||
28474 | + > | ||
28475 | + </File> | ||
28476 | + <File | ||
28477 | + RelativePath="..\..\gst\gl\gstglupload.c" | ||
28478 | + > | ||
28479 | + </File> | ||
28480 | + <File | ||
28481 | + RelativePath="..\..\gst\gl\gstopengl.c" | ||
28482 | + > | ||
28483 | + </File> | ||
28484 | + <Filter | ||
28485 | + Name="effects" | ||
28486 | + > | ||
28487 | + <File | ||
28488 | + RelativePath="..\..\gst\gl\effects\gstgleffectidentity.c" | ||
28489 | + > | ||
28490 | + </File> | ||
28491 | + <File | ||
28492 | + RelativePath="..\..\gst\gl\effects\gstgleffectmirror.c" | ||
28493 | + > | ||
28494 | + </File> | ||
28495 | + <File | ||
28496 | + RelativePath="..\..\gst\gl\effects\gstgleffectsqueeze.c" | ||
28497 | + > | ||
28498 | + </File> | ||
28499 | + <File | ||
28500 | + RelativePath="..\..\gst\gl\effects\gstgleffectssources.c" | ||
28501 | + > | ||
28502 | + </File> | ||
28503 | + </Filter> | ||
28504 | + </Filter> | ||
28505 | + </Filter> | ||
28506 | + <Filter | ||
28507 | + Name="Header Files" | ||
28508 | + Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
28509 | + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
28510 | + > | ||
28511 | + <Filter | ||
28512 | + Name="gstgl" | ||
28513 | + > | ||
28514 | + <File | ||
28515 | + RelativePath="..\common\config.h" | ||
28516 | + > | ||
28517 | + </File> | ||
28518 | + <File | ||
28519 | + RelativePath="..\..\gst-libs\gst\gl\gstglbuffer.h" | ||
28520 | + > | ||
28521 | + </File> | ||
28522 | + <File | ||
28523 | + RelativePath="..\..\gst-libs\gst\gl\gstgldisplay.h" | ||
28524 | + > | ||
28525 | + </File> | ||
28526 | + <File | ||
28527 | + RelativePath="..\..\gst-libs\gst\gl\gstgles2.h" | ||
28528 | + > | ||
28529 | + </File> | ||
28530 | + <File | ||
28531 | + RelativePath="..\..\gst-libs\gst\gl\gstglfilter.h" | ||
28532 | + > | ||
28533 | + </File> | ||
28534 | + <File | ||
28535 | + RelativePath="..\..\gst-libs\gst\gl\gstglshader.h" | ||
28536 | + > | ||
28537 | + </File> | ||
28538 | + <File | ||
28539 | + RelativePath="..\..\gst-libs\gst\gl\gstglwindow.h" | ||
28540 | + > | ||
28541 | + </File> | ||
28542 | + </Filter> | ||
28543 | + <Filter | ||
28544 | + Name="gstglelements" | ||
28545 | + > | ||
28546 | + <File | ||
28547 | + RelativePath="..\..\gst\gl\gstgldownload.h" | ||
28548 | + > | ||
28549 | + </File> | ||
28550 | + <File | ||
28551 | + RelativePath="..\..\gst\gl\gstgleffects.h" | ||
28552 | + > | ||
28553 | + </File> | ||
28554 | + <File | ||
28555 | + RelativePath="..\..\gst\gl\gstglfiltercube.h" | ||
28556 | + > | ||
28557 | + </File> | ||
28558 | + <File | ||
28559 | + RelativePath="..\..\gst\gl\gstglimagesink.h" | ||
28560 | + > | ||
28561 | + </File> | ||
28562 | + <File | ||
28563 | + RelativePath="..\..\gst\gl\gstglupload.h" | ||
28564 | + > | ||
28565 | + </File> | ||
28566 | + <Filter | ||
28567 | + Name="effects" | ||
28568 | + > | ||
28569 | + <File | ||
28570 | + RelativePath="..\..\gst\gl\effects\gstgleffectssources.h" | ||
28571 | + > | ||
28572 | + </File> | ||
28573 | + </Filter> | ||
28574 | + </Filter> | ||
28575 | + </Filter> | ||
28576 | + <Filter | ||
28577 | + Name="Resource Files" | ||
28578 | + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
28579 | + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
28580 | + > | ||
28581 | + </Filter> | ||
28582 | + </Files> | ||
28583 | + <Globals> | ||
28584 | + </Globals> | ||
28585 | +</VisualStudioProject> | ||
28586 | -- | ||
28587 | 1.7.9.5 | ||
28588 | |||
diff --git a/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch b/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch new file mode 100644 index 0000000..d4f5576 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch | |||
@@ -0,0 +1,2438 @@ | |||
1 | diff --git a/configure.ac b/configure.ac | ||
2 | index 6a4efe0..fa277fa 100644 | ||
3 | --- a/configure.ac | ||
4 | +++ b/configure.ac | ||
5 | @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file | ||
6 | dnl initialize autoconf | ||
7 | dnl releases only do -Wall, git and prerelease does -Werror too | ||
8 | dnl use a three digit version number for releases, and four for git/prerelease | ||
9 | -AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3, | ||
10 | +AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3.1, | ||
11 | http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, | ||
12 | gst-plugins-gl) | ||
13 | |||
14 | @@ -61,7 +61,7 @@ dnl AS_LIBTOOL_TAGS | ||
15 | |||
16 | AC_LIBTOOL_WIN32_DLL | ||
17 | AM_PROG_LIBTOOL | ||
18 | -AS_PROG_OBJC | ||
19 | +AC_PROG_OBJC | ||
20 | |||
21 | dnl *** required versions of GStreamer stuff *** | ||
22 | GST_REQ=0.10.35 | ||
23 | @@ -83,6 +83,8 @@ AG_GST_GETTEXT([gst-plugins-gl-$GST_MAJORMINOR]) | ||
24 | |||
25 | dnl *** check for arguments to configure *** | ||
26 | |||
27 | +AG_GST_ARG_DISABLE_FATAL_WARNINGS | ||
28 | + | ||
29 | AG_GST_ARG_DEBUG | ||
30 | AG_GST_ARG_PROFILING | ||
31 | AG_GST_ARG_VALGRIND | ||
32 | @@ -160,36 +162,48 @@ AG_GST_CHECK_FUNCTION | ||
33 | dnl *** checks for dependency libraries *** | ||
34 | |||
35 | dnl GLib is required | ||
36 | -AG_GST_GLIB_CHECK([2.6]) | ||
37 | +AG_GST_GLIB_CHECK([2.22]) | ||
38 | |||
39 | #dnl Check for OpenGL, GLU and GLEW | ||
40 | echo host is $host | ||
41 | case $host in | ||
42 | *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) | ||
43 | - AG_GST_CHECK_X | ||
44 | save_CPPFLAGS="$CPPFLAGS" | ||
45 | save_LIBS="$LIBS" | ||
46 | - CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
47 | - LIBS="$LIBS $X_LIBS" | ||
48 | - #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
49 | - AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) | ||
50 | - if test "x$HAVE_GL" = "xyes"; then | ||
51 | - AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) | ||
52 | - AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) | ||
53 | - AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) | ||
54 | - GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
55 | - GL_BACKEND=x11 | ||
56 | - GL_TYPE=gl | ||
57 | + AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_EGL_FB=yes, HAVE_EGL_FB=no) | ||
58 | + if test "x$HAVE_EGL_FB" = "xyes"; then | ||
59 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
60 | + GL_BACKEND=fbES2 | ||
61 | + GL_TYPE=gles | ||
62 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" | ||
63 | else | ||
64 | + AG_GST_CHECK_X | ||
65 | + CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" | ||
66 | + LIBS="$LIBS $X_LIBS" | ||
67 | AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no]) | ||
68 | if test "x$HAVE_EGL" = "xyes"; then | ||
69 | AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required])) | ||
70 | + s_LIBS="$LIBS" | ||
71 | + LIBS="-lEGL $LIBS" | ||
72 | AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required])) | ||
73 | - GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" | ||
74 | + LIBS="$s_LIBS" | ||
75 | + GL_LIBS="$LIBS -lGLESv2 -lEGL" | ||
76 | GL_BACKEND=x11ES2 | ||
77 | GL_TYPE=gles | ||
78 | + save_CPPFLAGS="$save_CPPFLAGS -DLINUX" | ||
79 | else | ||
80 | - AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) | ||
81 | + #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) | ||
82 | + AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) | ||
83 | + if test "x$HAVE_GL" = "xyes"; then | ||
84 | + AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) | ||
85 | + AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) | ||
86 | + AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) | ||
87 | + GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" | ||
88 | + GL_BACKEND=x11 | ||
89 | + GL_TYPE=gl | ||
90 | + else | ||
91 | + AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) | ||
92 | + fi | ||
93 | fi | ||
94 | fi | ||
95 | CPPFLAGS="$save_CPPFLAGS" | ||
96 | @@ -230,6 +244,7 @@ AC_SUBST(GL_BACKEND) | ||
97 | AC_SUBST(OPENGL_ES2) | ||
98 | AM_CONDITIONAL(GL_BACKEND_X11, test "x$GL_BACKEND" = "xx11") | ||
99 | AM_CONDITIONAL(GL_BACKEND_X11ES2, test "x$GL_BACKEND" = "xx11ES2") | ||
100 | +AM_CONDITIONAL(GL_BACKEND_FBES2, test "x$GL_BACKEND" = "xfbES2") | ||
101 | AM_CONDITIONAL(GL_BACKEND_COCOA, test "x$GL_BACKEND" = "xcocoa") | ||
102 | AM_CONDITIONAL(GL_BACKEND_WIN32, test "x$GL_BACKEND" = "xwin32") | ||
103 | AM_CONDITIONAL(GL_IS_OPENGL, test "x$GL_TYPE" = "xgl") | ||
104 | @@ -251,6 +266,18 @@ AC_SUBST(GLIB_PREFIX) | ||
105 | AC_SUBST(GST_PREFIX) | ||
106 | AC_SUBST(GSTPB_PREFIX) | ||
107 | |||
108 | +GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" | ||
109 | +GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" | ||
110 | +AC_CHECK_HEADERS([EGL/eglvivante.h], HAVE_VIVANTE=[yes], HAVE_VIVANTE=[no]) | ||
111 | +if test "x$HAVE_VIVANTE" = "xyes"; then | ||
112 | + if test "x$GST_FSL_CFLAGS" = "x"; then | ||
113 | + AC_MSG_ERROR([gstreamer-fsl is required]) | ||
114 | + fi | ||
115 | + AC_DEFINE(GPU_VIVANTE, [1], [Use Vivante GPU]) | ||
116 | +fi | ||
117 | +AM_CONDITIONAL(USE_VIVANTE, test "x$HAVE_VIVANTE" = "xyes") | ||
118 | +AC_SUBST(GST_FSL_CFLAGS) | ||
119 | +AC_SUBST(GST_FSL_LIBS) | ||
120 | |||
121 | dnl libpng is optional | ||
122 | PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no) | ||
123 | @@ -269,12 +296,15 @@ if test x$with_jpeg_mmx != x; then | ||
124 | LIBS="$LIBS -L$with_jpeg_mmx" | ||
125 | fi | ||
126 | AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") | ||
127 | -JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
128 | -LIBS="$OLD_LIBS" | ||
129 | if test x$HAVE_JPEG != xyes; then | ||
130 | AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") | ||
131 | - JPEG_LIBS="-ljpeg" | ||
132 | - AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) | ||
133 | + if test x$HAVE_JPEG = xyes; then | ||
134 | + JPEG_LIBS="-ljpeg" | ||
135 | + AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) | ||
136 | + fi | ||
137 | +else | ||
138 | + JPEG_LIBS="$LIBS -ljpeg-mmx" | ||
139 | + LIBS="$OLD_LIBS" | ||
140 | fi | ||
141 | AC_SUBST(HAVE_JPEG) | ||
142 | AC_SUBST(JPEG_LIBS) | ||
143 | @@ -383,8 +413,14 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], | ||
144 | [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) | ||
145 | |||
146 | dnl define an ERROR_CFLAGS Makefile variable | ||
147 | -AG_GST_SET_ERROR_CFLAGS($GST_GIT) | ||
148 | -AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) | ||
149 | +AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS) | ||
150 | +AG_GST_SET_ERROR_CXXFLAGS($FATAL_WARNINGS) | ||
151 | +dnl define an ERROR_OBJCFLAGS Makefile variable | ||
152 | +AG_GST_SET_ERROR_OBJCFLAGS($FATAL_WARNINGS, [ | ||
153 | + -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls | ||
154 | + -Wwrite-strings -Wold-style-definition | ||
155 | + -Winit-self -Wmissing-include-dirs -Wno-multichar | ||
156 | + -Wnested-externs $NO_WARNINGS]) | ||
157 | |||
158 | dnl define correct level for debugging messages | ||
159 | AG_GST_SET_LEVEL_DEFAULT($GST_GIT) | ||
160 | @@ -460,8 +496,10 @@ AC_SUBST(DEPRECATED_CFLAGS) | ||
161 | dnl every flag in GST_OPTION_CFLAGS can be overridden at make time | ||
162 | GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
163 | GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
164 | +GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" | ||
165 | AC_SUBST(GST_OPTION_CFLAGS) | ||
166 | AC_SUBST(GST_OPTION_CXXFLAGS) | ||
167 | +AC_SUBST(GST_OPTION_OBJCFLAGS) | ||
168 | |||
169 | dnl our libraries need to be versioned correctly | ||
170 | AC_SUBST(GST_LT_LDFLAGS) | ||
171 | @@ -474,10 +512,12 @@ AC_SUBST(GST_PLUGINS_GL_CFLAGS) | ||
172 | |||
173 | dnl FIXME: do we want to rename to GST_ALL_* ? | ||
174 | dnl add GST_OPTION_CFLAGS, but overridable | ||
175 | +GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" | ||
176 | GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" | ||
177 | GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" | ||
178 | AC_SUBST(GST_CFLAGS) | ||
179 | AC_SUBST(GST_CXXFLAGS) | ||
180 | +AC_SUBST(GST_OBJCFLAGS) | ||
181 | |||
182 | dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage | ||
183 | GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" | ||
184 | diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am | ||
185 | index defa340..18016cf 100644 | ||
186 | --- a/docs/libs/Makefile.am | ||
187 | +++ b/docs/libs/Makefile.am | ||
188 | @@ -50,7 +50,7 @@ extra_files = | ||
189 | # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib | ||
190 | # contains GtkObjects/GObjects and you want to document signals and properties. | ||
191 | GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ | ||
192 | - -I$(top_srcdir)/gst-libs/gst/gl | ||
193 | + -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX | ||
194 | GTKDOC_LIBS = \ | ||
195 | $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ | ||
196 | $(GST_BASE_LIBS) | ||
197 | diff --git a/docs/plugins/inspect/plugin-libvisual-gl.xml b/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
198 | index da5a3d5..477c811 100644 | ||
199 | --- a/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
200 | +++ b/docs/plugins/inspect/plugin-libvisual-gl.xml | ||
201 | @@ -3,10 +3,10 @@ | ||
202 | <description>libvisual-gl visualization plugins</description> | ||
203 | <filename>../../ext/libvisual/.libs/libgstlibvisualgl.so</filename> | ||
204 | <basename>libgstlibvisualgl.so</basename> | ||
205 | - <version>0.10.3</version> | ||
206 | + <version>0.10.3.1</version> | ||
207 | <license>LGPL</license> | ||
208 | <source>gst-plugins-gl</source> | ||
209 | - <package>GStreamer OpenGL Plug-ins source release</package> | ||
210 | + <package>GStreamer OpenGL Plug-ins git</package> | ||
211 | <origin>Unknown package origin</origin> | ||
212 | <elements> | ||
213 | <element> | ||
214 | diff --git a/docs/plugins/inspect/plugin-opengl.xml b/docs/plugins/inspect/plugin-opengl.xml | ||
215 | index dbfa9fb..9b7b663 100644 | ||
216 | --- a/docs/plugins/inspect/plugin-opengl.xml | ||
217 | +++ b/docs/plugins/inspect/plugin-opengl.xml | ||
218 | @@ -3,10 +3,10 @@ | ||
219 | <description>OpenGL plugin</description> | ||
220 | <filename>../../gst/gl/.libs/libgstopengl.so</filename> | ||
221 | <basename>libgstopengl.so</basename> | ||
222 | - <version>0.10.3</version> | ||
223 | + <version>0.10.3.1</version> | ||
224 | <license>LGPL</license> | ||
225 | <source>gst-plugins-gl</source> | ||
226 | - <package>GStreamer OpenGL Plug-ins source release</package> | ||
227 | + <package>GStreamer OpenGL Plug-ins git</package> | ||
228 | <origin>Unknown package origin</origin> | ||
229 | <elements> | ||
230 | <element> | ||
231 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | ||
232 | index 2ef7afc..d55a513 100644 | ||
233 | --- a/gst-libs/gst/gl/Makefile.am | ||
234 | +++ b/gst-libs/gst/gl/Makefile.am | ||
235 | @@ -4,6 +4,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la | ||
236 | EXTRA_DIST = \ | ||
237 | gstglwindow_x11.c \ | ||
238 | gstglwindow_x11ES2.c \ | ||
239 | + gstglwindow_fbES2.c \ | ||
240 | gstglwindow_win32.c \ | ||
241 | gstglwindow_winCE.c \ | ||
242 | gstglwindow_cocoa.m | ||
243 | @@ -28,6 +29,13 @@ endif | ||
244 | if GL_BACKEND_X11ES2 | ||
245 | libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c | ||
246 | endif | ||
247 | +if GL_BACKEND_FBES2 | ||
248 | +libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_fbES2.c | ||
249 | +endif | ||
250 | + | ||
251 | +if USE_VIVANTE | ||
252 | +libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglvivante.c | ||
253 | +endif | ||
254 | |||
255 | libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl | ||
256 | libgstgl_@GST_MAJORMINOR@include_HEADERS = \ | ||
257 | @@ -41,13 +49,19 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \ | ||
258 | gstglshadervariables.h \ | ||
259 | gstglshader.h | ||
260 | |||
261 | +if USE_VIVANTE | ||
262 | +libgstgl_@GST_MAJORMINOR@include_HEADERS += gstglvivante.h | ||
263 | +endif | ||
264 | + | ||
265 | libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ | ||
266 | $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ | ||
267 | + $(GST_FSL_LIBS) \ | ||
268 | $(GST_BASE_LIBS) $(GST_LIBS) \ | ||
269 | $(GL_LIBS) | ||
270 | |||
271 | libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ | ||
272 | $(GL_CFLAGS) $(X_CFLAGS) \ | ||
273 | + $(GST_FSL_CFLAGS) \ | ||
274 | $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) | ||
275 | libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ | ||
276 | $(GL_CFLAGS) $(X_CFLAGS) \ | ||
277 | diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c | ||
278 | index 64c6c2c..da2e602 100644 | ||
279 | --- a/gst-libs/gst/gl/gstgldisplay.c | ||
280 | +++ b/gst-libs/gst/gl/gstgldisplay.c | ||
281 | @@ -28,6 +28,9 @@ | ||
282 | |||
283 | #include <gst/video/gstvideosink.h> | ||
284 | #include "gstgldisplay.h" | ||
285 | +#ifdef GPU_VIVANTE | ||
286 | +#include "gstglvivante.h" | ||
287 | +#endif | ||
288 | |||
289 | #ifndef GLEW_VERSION_MAJOR | ||
290 | #define GLEW_VERSION_MAJOR 4 | ||
291 | @@ -468,6 +471,10 @@ gst_gl_display_init (GstGLDisplay * display, GstGLDisplayClass * klass) | ||
292 | #endif | ||
293 | |||
294 | display->error_message = NULL; | ||
295 | + | ||
296 | +#ifdef GPU_VIVANTE | ||
297 | + display->gpu_priv = gst_gl_vivante_new (); | ||
298 | +#endif | ||
299 | } | ||
300 | |||
301 | static void | ||
302 | @@ -539,6 +546,12 @@ gst_gl_display_finalize (GObject * object) | ||
303 | g_free (display->error_message); | ||
304 | display->error_message = NULL; | ||
305 | } | ||
306 | +#ifdef GPU_VIVANTE | ||
307 | + if (display->gpu_priv) { | ||
308 | + gst_gl_vivante_delete (display->gpu_priv); | ||
309 | + display->gpu_priv = NULL; | ||
310 | + } | ||
311 | +#endif | ||
312 | } | ||
313 | |||
314 | |||
315 | @@ -1135,6 +1148,17 @@ gst_gl_display_thread_init_upload (GstGLDisplay * display) | ||
316 | void | ||
317 | gst_gl_display_thread_do_upload (GstGLDisplay * display) | ||
318 | { | ||
319 | + if (display->gpu_priv && | ||
320 | + display->upload_width == display->upload_data_width && | ||
321 | + display->upload_height == display->upload_data_height) { | ||
322 | +#ifdef GPU_VIVANTE | ||
323 | + if (gst_gl_vivante_tex_upload (display->gpu_priv, display)) | ||
324 | + return; | ||
325 | +#endif | ||
326 | + } | ||
327 | + | ||
328 | + GST_WARNING ("%s: Fall into non direct uploading", __func__); | ||
329 | + | ||
330 | gst_gl_display_thread_do_upload_fill (display); | ||
331 | |||
332 | switch (display->upload_video_format) { | ||
333 | @@ -1950,14 +1974,13 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
334 | |||
335 | glBegin (GL_QUADS); | ||
336 | /* gst images are top-down while opengl plane is bottom-up */ | ||
337 | - glTexCoord2i (display->redisplay_texture_width, 0); | ||
338 | + glTexCoord2i (1, 0); | ||
339 | glVertex2f (1.0f, 1.0f); | ||
340 | glTexCoord2i (0, 0); | ||
341 | glVertex2f (-1.0f, 1.0f); | ||
342 | - glTexCoord2i (0, display->redisplay_texture_height); | ||
343 | + glTexCoord2i (0, 1); | ||
344 | glVertex2f (-1.0f, -1.0f); | ||
345 | - glTexCoord2i (display->redisplay_texture_width, | ||
346 | - display->redisplay_texture_height); | ||
347 | + glTexCoord2i (1, 1); | ||
348 | glVertex2f (1.0f, -1.0f); | ||
349 | /*glTexCoord2i (display->redisplay_texture_width, 0); | ||
350 | glVertex2i (1, -1); | ||
351 | @@ -1974,7 +1997,8 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
352 | |||
353 | #else //OPENGL_ES2 | ||
354 | |||
355 | - const GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, | ||
356 | + GLfloat left, right, top, bottom; | ||
357 | + GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, | ||
358 | 1.0f, 0.0f, | ||
359 | -1.0f, 1.0f, 0.0f, | ||
360 | 0.0f, 0.0f, | ||
361 | @@ -1986,6 +2010,17 @@ gst_gl_display_on_draw (GstGLDisplay * display) | ||
362 | |||
363 | GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; | ||
364 | |||
365 | +#ifdef GPU_VIVANTE | ||
366 | + if (display->gpu_priv) { | ||
367 | + gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, | ||
368 | + &bottom); | ||
369 | + vVertices[3] = vVertices[18] = right; | ||
370 | + vVertices[4] = vVertices[9] = bottom; | ||
371 | + vVertices[8] = vVertices[13] = left; | ||
372 | + vVertices[14] = vVertices[19] = top; | ||
373 | + } | ||
374 | +#endif | ||
375 | + | ||
376 | glClear (GL_COLOR_BUFFER_BIT); | ||
377 | |||
378 | gst_gl_shader_use (display->redisplay_shader); | ||
379 | @@ -2067,6 +2102,9 @@ gst_gl_display_glgen_texture (GstGLDisplay * display, GLuint * pTexture, | ||
380 | case GST_VIDEO_FORMAT_I420: | ||
381 | case GST_VIDEO_FORMAT_YV12: | ||
382 | case GST_VIDEO_FORMAT_AYUV: | ||
383 | +#ifdef GPU_VIVANTE | ||
384 | + case GST_VIDEO_FORMAT_NV12: | ||
385 | +#endif | ||
386 | glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, | ||
387 | width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); | ||
388 | break; | ||
389 | @@ -2177,11 +2215,11 @@ gst_gl_display_check_framebuffer_status (void) | ||
390 | GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"); | ||
391 | break; | ||
392 | |||
393 | -#if defined(GL_ARB_framebuffer_object) | ||
394 | +/* | ||
395 | case GL_FRAMEBUFFER_UNDEFINED: | ||
396 | GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED"); | ||
397 | break; | ||
398 | -#endif | ||
399 | +*/ | ||
400 | |||
401 | default: | ||
402 | GST_ERROR ("General FBO error"); | ||
403 | @@ -2350,8 +2388,13 @@ gst_gl_display_init_upload (GstGLDisplay * display, GstVideoFormat video_format, | ||
404 | display->upload_height = gl_height; | ||
405 | display->upload_data_width = video_width; | ||
406 | display->upload_data_height = video_height; | ||
407 | - gst_gl_window_send_message (display->gl_window, | ||
408 | - GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); | ||
409 | + | ||
410 | +#ifdef GPU_VIVANTE | ||
411 | + if (!gst_gl_vivante_check_format (display->gpu_priv, video_format, | ||
412 | + video_width, video_height)) | ||
413 | +#endif | ||
414 | + gst_gl_window_send_message (display->gl_window, | ||
415 | + GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); | ||
416 | isAlive = display->isAlive; | ||
417 | gst_gl_display_unlock (display); | ||
418 | |||
419 | @@ -2364,6 +2407,14 @@ gboolean | ||
420 | gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
421 | gint data_width, gint data_height, gpointer data) | ||
422 | { | ||
423 | + return gst_gl_display_do_upload_with_meta (display, texture, data_width, | ||
424 | + data_height, data, NULL); | ||
425 | +} | ||
426 | + | ||
427 | +gboolean | ||
428 | +gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, | ||
429 | + gint data_width, gint data_height, gpointer data, gpointer meta) | ||
430 | +{ | ||
431 | gboolean isAlive = TRUE; | ||
432 | |||
433 | gst_gl_display_lock (display); | ||
434 | @@ -2373,6 +2424,7 @@ gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
435 | display->upload_data_width = data_width; | ||
436 | display->upload_data_height = data_height; | ||
437 | display->upload_data = data; | ||
438 | + display->upload_meta = meta; | ||
439 | gst_gl_window_send_message (display->gl_window, | ||
440 | GST_GL_WINDOW_CB (gst_gl_display_thread_do_upload), display); | ||
441 | isAlive = display->isAlive; | ||
442 | @@ -2975,11 +3027,11 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
443 | |||
444 | #ifdef OPENGL_ES2 | ||
445 | GLint viewport_dim[4]; | ||
446 | - | ||
447 | - const GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, | ||
448 | + GLfloat left, right, top, bottom; | ||
449 | + GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, | ||
450 | 1.0f, 0.0f, | ||
451 | -1.0f, -1.0f, 0.0f, | ||
452 | - 0.0f, .0f, | ||
453 | + 0.0f, 0.0f, | ||
454 | -1.0f, 1.0f, 0.0f, | ||
455 | 0.0f, 1.0f, | ||
456 | 1.0f, 1.0f, 0.0f, | ||
457 | @@ -2987,6 +3039,18 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
458 | }; | ||
459 | |||
460 | GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; | ||
461 | + | ||
462 | +#ifdef GPU_VIVANTE | ||
463 | + if (display->gpu_priv) { | ||
464 | + gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, | ||
465 | + &bottom); | ||
466 | + vVertices[3] = vVertices[18] = right; | ||
467 | + vVertices[4] = vVertices[9] = bottom; | ||
468 | + vVertices[8] = vVertices[13] = left; | ||
469 | + vVertices[14] = vVertices[19] = top; | ||
470 | + } | ||
471 | +#endif | ||
472 | + | ||
473 | #endif | ||
474 | |||
475 | glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, display->upload_fbo); | ||
476 | @@ -3260,13 +3324,13 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) | ||
477 | |||
478 | #ifndef OPENGL_ES2 | ||
479 | glBegin (GL_QUADS); | ||
480 | - glTexCoord2i (display->upload_data_width, 0); | ||
481 | + glTexCoord2i (1, 0); | ||
482 | glVertex2f (1.0f, -1.0f); | ||
483 | glTexCoord2i (0, 0); | ||
484 | glVertex2f (-1.0f, -1.0f); | ||
485 | - glTexCoord2i (0, display->upload_data_height); | ||
486 | + glTexCoord2i (0, 1); | ||
487 | glVertex2f (-1.0f, 1.0f); | ||
488 | - glTexCoord2i (display->upload_data_width, display->upload_data_height); | ||
489 | + glTexCoord2i (1, 1); | ||
490 | glVertex2f (1.0f, 1.0f); | ||
491 | glEnd (); | ||
492 | |||
493 | @@ -3554,11 +3618,11 @@ gst_gl_display_thread_do_download_draw_yuv (GstGLDisplay * display) | ||
494 | glBegin (GL_QUADS); | ||
495 | glTexCoord2i (0, 0); | ||
496 | glVertex2f (-1.0f, -1.0f); | ||
497 | - glTexCoord2i (width, 0); | ||
498 | + glTexCoord2i (1, 0); | ||
499 | glVertex2f (1.0f, -1.0f); | ||
500 | - glTexCoord2i (width, height); | ||
501 | + glTexCoord2i (1, 1); | ||
502 | glVertex2f (1.0f, 1.0f); | ||
503 | - glTexCoord2i (0, height); | ||
504 | + glTexCoord2i (0, 1); | ||
505 | glVertex2f (-1.0f, 1.0f); | ||
506 | glEnd (); | ||
507 | |||
508 | diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h | ||
509 | index f657e1e..31dfe26 100644 | ||
510 | --- a/gst-libs/gst/gl/gstgldisplay.h | ||
511 | +++ b/gst-libs/gst/gl/gstgldisplay.h | ||
512 | @@ -229,6 +229,9 @@ struct _GstGLDisplay | ||
513 | |||
514 | gchar *error_message; | ||
515 | |||
516 | + gpointer gpu_priv; | ||
517 | + gpointer upload_meta; | ||
518 | + gboolean upload_buf_mapped; | ||
519 | }; | ||
520 | |||
521 | |||
522 | @@ -264,6 +267,8 @@ gboolean gst_gl_display_init_upload (GstGLDisplay * display, | ||
523 | gint video_width, gint video_height); | ||
524 | gboolean gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, | ||
525 | gint data_width, gint data_height, gpointer data); | ||
526 | +gboolean gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, | ||
527 | + gint data_width, gint data_height, gpointer data, gpointer meta); | ||
528 | gboolean gst_gl_display_init_download (GstGLDisplay * display, | ||
529 | GstVideoFormat video_format, gint width, gint height); | ||
530 | gboolean gst_gl_display_do_download (GstGLDisplay * display, GLuint texture, | ||
531 | diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h | ||
532 | index ddeb99c..aec69f1 100644 | ||
533 | --- a/gst-libs/gst/gl/gstglshader.h | ||
534 | +++ b/gst-libs/gst/gl/gstglshader.h | ||
535 | @@ -21,6 +21,10 @@ | ||
536 | #ifndef __GST_GL_SHADER_H__ | ||
537 | #define __GST_GL_SHADER_H__ | ||
538 | |||
539 | +#ifdef HAVE_CONFIG_H | ||
540 | +#include "config.h" | ||
541 | +#endif | ||
542 | + | ||
543 | /* OpenGL 2.0 for Embedded Systems */ | ||
544 | #ifdef OPENGL_ES2 | ||
545 | #include <GLES2/gl2.h> | ||
546 | diff --git a/gst-libs/gst/gl/gstglshadervariables.c b/gst-libs/gst/gl/gstglshadervariables.c | ||
547 | index 69d5b75..be6e58c 100644 | ||
548 | --- a/gst-libs/gst/gl/gstglshadervariables.c | ||
549 | +++ b/gst-libs/gst/gl/gstglshadervariables.c | ||
550 | @@ -550,6 +550,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
551 | (float *) ret->value); | ||
552 | break; | ||
553 | |||
554 | +#ifndef OPENGL_ES2 | ||
555 | case _mat2x3: | ||
556 | gst_gl_shader_set_uniform_matrix_2x3fv (shader, ret->name, ret->count, 0, | ||
557 | (float *) ret->value); | ||
558 | @@ -569,6 +570,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
559 | gst_gl_shader_set_uniform_matrix_4x2fv (shader, ret->name, ret->count, 0, | ||
560 | (float *) ret->value); | ||
561 | break; | ||
562 | +#endif | ||
563 | |||
564 | case _mat3: | ||
565 | case _mat3x3: | ||
566 | @@ -576,6 +578,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
567 | (float *) ret->value); | ||
568 | break; | ||
569 | |||
570 | +#ifndef OPENGL_ES2 | ||
571 | case _mat3x4: | ||
572 | gst_gl_shader_set_uniform_matrix_3x4fv (shader, ret->name, ret->count, 0, | ||
573 | (float *) ret->value); | ||
574 | @@ -585,6 +588,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, | ||
575 | gst_gl_shader_set_uniform_matrix_4x3fv (shader, ret->name, ret->count, 0, | ||
576 | (float *) ret->value); | ||
577 | break; | ||
578 | +#endif | ||
579 | |||
580 | case _mat4: | ||
581 | case _mat4x4: | ||
582 | diff --git a/gst-libs/gst/gl/gstglvivante.c b/gst-libs/gst/gl/gstglvivante.c | ||
583 | new file mode 100644 | ||
584 | index 0000000..2b8c9ae | ||
585 | --- /dev/null | ||
586 | +++ b/gst-libs/gst/gl/gstglvivante.c | ||
587 | @@ -0,0 +1,218 @@ | ||
588 | +/* | ||
589 | + * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. | ||
590 | + * | ||
591 | + * This library is free software; you can redistribute it and/or | ||
592 | + * modify it under the terms of the GNU Lesser General Public | ||
593 | + * License as published by the Free Software Foundation; either | ||
594 | + * version 2.1 of the License, or (at your option) any later version. | ||
595 | + * | ||
596 | + * This library is distributed in the hope that it will be useful, | ||
597 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
598 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
599 | + * Lesser General Public License for more details. | ||
600 | + * | ||
601 | + * You should have received a copy of the GNU Lesser General Public | ||
602 | + * License along with this library; if not, write to the Free Software | ||
603 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
604 | + */ | ||
605 | + | ||
606 | +#ifdef HAVE_CONFIG_H | ||
607 | +#include "config.h" | ||
608 | +#endif | ||
609 | + | ||
610 | +#include <string.h> | ||
611 | + | ||
612 | +#include "gstglvivante.h" | ||
613 | +#include <gstbufmeta.h> | ||
614 | + | ||
615 | +#define GL_GLEXT_PROTOTYPES | ||
616 | +#include <GLES2/gl2ext.h> | ||
617 | + | ||
618 | +typedef struct | ||
619 | +{ | ||
620 | + gfloat sampler_left; | ||
621 | + gfloat sampler_right; | ||
622 | + gfloat sampler_top; | ||
623 | + gfloat sampler_bottom; | ||
624 | +} GstGLVivante; | ||
625 | + | ||
626 | +gpointer | ||
627 | +gst_gl_vivante_new () | ||
628 | +{ | ||
629 | + GstGLVivante *viv = g_new (GstGLVivante, 1); | ||
630 | + | ||
631 | + viv->sampler_left = 0.0f; | ||
632 | + viv->sampler_right = 1.0f; | ||
633 | + viv->sampler_top = 1.0f; | ||
634 | + viv->sampler_bottom = 0.0f; | ||
635 | + | ||
636 | + return viv; | ||
637 | +} | ||
638 | + | ||
639 | +void | ||
640 | +gst_gl_vivante_delete (gpointer gpu) | ||
641 | +{ | ||
642 | + g_free (gpu); | ||
643 | +} | ||
644 | + | ||
645 | +gboolean | ||
646 | +gst_gl_vivante_check_format (gpointer gpu, GstVideoFormat format, gint width, | ||
647 | + gint height) | ||
648 | +{ | ||
649 | + switch (format) { | ||
650 | + case GST_VIDEO_FORMAT_YV12: | ||
651 | + case GST_VIDEO_FORMAT_NV12: | ||
652 | + if ((width & 15) == 0) | ||
653 | + return TRUE; | ||
654 | + break; | ||
655 | + default: | ||
656 | + GST_WARNING ("GstVideoFormat %d not supported by vivante", format); | ||
657 | + } | ||
658 | + GST_WARNING | ||
659 | + ("Check format %d, width,height [%d, %d] failed, can't direct render", | ||
660 | + format, width, height); | ||
661 | + return FALSE; | ||
662 | +} | ||
663 | + | ||
664 | +GLenum | ||
665 | +gst_gl_vivante_get_gl_format (gpointer gpu, GstVideoFormat format) | ||
666 | +{ | ||
667 | + switch (format) { | ||
668 | + case GST_VIDEO_FORMAT_YV12: | ||
669 | + return GL_VIV_YV12; | ||
670 | + case GST_VIDEO_FORMAT_NV12: | ||
671 | + return GL_VIV_NV12; | ||
672 | + default: | ||
673 | + GST_WARNING ("GstVideoFormat %d not supported by vivante", format); | ||
674 | + } | ||
675 | + return GL_NONE; | ||
676 | +} | ||
677 | + | ||
678 | +static gboolean | ||
679 | +format_is_yuv (GstVideoFormat format) | ||
680 | +{ | ||
681 | + switch (format) { | ||
682 | + case GST_VIDEO_FORMAT_YV12: | ||
683 | + case GST_VIDEO_FORMAT_NV12: | ||
684 | + return TRUE; | ||
685 | + default: | ||
686 | + return FALSE; | ||
687 | + } | ||
688 | +} | ||
689 | + | ||
690 | +static void | ||
691 | +copy_data_to_gpu (gpointer gpu, GstVideoFormat format, gpointer data, | ||
692 | + gpointer planes[], gint width, gint height) | ||
693 | +{ | ||
694 | + gint src_height; | ||
695 | + gint src_y_size, src_uv_size; | ||
696 | + gint dst_y_size, dst_uv_size; | ||
697 | + | ||
698 | + /* width is already 16 aligned */ | ||
699 | + switch (format) { | ||
700 | + case GST_VIDEO_FORMAT_YV12: | ||
701 | + src_height = GST_ROUND_UP_2 (height); | ||
702 | + src_y_size = width * src_height; | ||
703 | + src_uv_size = src_y_size / 4; | ||
704 | + dst_y_size = width * height; | ||
705 | + dst_uv_size = dst_y_size / 4; | ||
706 | + memcpy (planes[0], data, dst_y_size); | ||
707 | + memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); | ||
708 | + memcpy (planes[2], (gchar *) data + src_y_size + src_uv_size, | ||
709 | + dst_uv_size); | ||
710 | + break; | ||
711 | + case GST_VIDEO_FORMAT_NV12: | ||
712 | + src_height = GST_ROUND_UP_2 (height); | ||
713 | + src_y_size = width * src_height; | ||
714 | + dst_y_size = width * height; | ||
715 | + dst_uv_size = dst_y_size / 2; | ||
716 | + memcpy (planes[0], data, dst_y_size); | ||
717 | + memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); | ||
718 | + break; | ||
719 | + default: | ||
720 | + return; | ||
721 | + } | ||
722 | +} | ||
723 | + | ||
724 | +gboolean | ||
725 | +gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display) | ||
726 | +{ | ||
727 | + GstVideoFormat format = display->upload_video_format; | ||
728 | + gint width = display->upload_data_width; | ||
729 | + gint height = display->upload_data_height; | ||
730 | + gpointer data = display->upload_data; | ||
731 | + GstBufferMeta *meta = GST_BUFFER_META (display->upload_meta); | ||
732 | + gpointer planes[3]; | ||
733 | + GLuint physical = meta ? (GLuint) (meta->physical_data) : ~0U; | ||
734 | + | ||
735 | + GST_INFO ("gst_gl_vivante_tex_upload physical address 0x%x, data %p, tex %d", | ||
736 | + physical, data, display->upload_outtex); | ||
737 | + | ||
738 | + if (!gst_gl_vivante_check_format (gpu, format, width, height)) | ||
739 | + return FALSE; | ||
740 | + | ||
741 | + glBindTexture (GL_TEXTURE_2D, display->upload_outtex); | ||
742 | + | ||
743 | + if (((guint) data & 0x3F) != 0) { /* not aligned, need additional copy */ | ||
744 | + if (!format_is_yuv (format)) { /* rgb is left to default handler */ | ||
745 | + GST_WARNING ("Format %d unaligned data is not supported for" | ||
746 | + " direct rendering", format); | ||
747 | + return FALSE; | ||
748 | + } | ||
749 | + | ||
750 | + GST_WARNING ("Data not aligned, need additional copy"); | ||
751 | + | ||
752 | + glTexDirectVIV (GL_TEXTURE_2D, width, height, | ||
753 | + gst_gl_vivante_get_gl_format (gpu, format), (GLvoid **) & planes); | ||
754 | + if (glGetError () != GL_NO_ERROR) | ||
755 | + return FALSE; | ||
756 | + | ||
757 | + copy_data_to_gpu (gpu, format, data, planes, width, height); | ||
758 | + } else { | ||
759 | + glTexDirectVIVMap (GL_TEXTURE_2D, width, height, | ||
760 | + gst_gl_vivante_get_gl_format (gpu, format), &data, &physical); | ||
761 | + if (glGetError () != GL_NO_ERROR) | ||
762 | + return FALSE; | ||
763 | + display->upload_buf_mapped = TRUE; | ||
764 | + } | ||
765 | + | ||
766 | + glTexDirectInvalidateVIV (GL_TEXTURE_2D); | ||
767 | + | ||
768 | + return TRUE; | ||
769 | +} | ||
770 | + | ||
771 | +void | ||
772 | +gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps) | ||
773 | +{ | ||
774 | + GstVideoFormat format; | ||
775 | + gint width; | ||
776 | + gint height; | ||
777 | + GstStructure *s; | ||
778 | + gint left = 0, right = 0, top = 0, bottom = 0; | ||
779 | + GstGLVivante *viv = (GstGLVivante *) gpu; | ||
780 | + | ||
781 | + s = gst_caps_get_structure (caps, 0); | ||
782 | + gst_structure_get_int (s, "crop-left", &left); | ||
783 | + gst_structure_get_int (s, "crop-top", &top); | ||
784 | + gst_structure_get_int (s, "crop-right", &right); | ||
785 | + gst_structure_get_int (s, "crop-bottom", &bottom); | ||
786 | + | ||
787 | + gst_video_format_parse_caps (caps, &format, &width, &height); | ||
788 | + | ||
789 | + viv->sampler_left = ((gfloat) left) / width; | ||
790 | + viv->sampler_right = ((gfloat) (width - right)) / width; | ||
791 | + viv->sampler_top = ((gfloat) (height - bottom)) / height; | ||
792 | + viv->sampler_bottom = ((gfloat) top) / height; | ||
793 | +} | ||
794 | + | ||
795 | +void | ||
796 | +gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat * left, gfloat * right, | ||
797 | + gfloat * top, gfloat * bottom) | ||
798 | +{ | ||
799 | + GstGLVivante *viv = (GstGLVivante *) gpu; | ||
800 | + | ||
801 | + *left = viv->sampler_left; | ||
802 | + *right = viv->sampler_right; | ||
803 | + *top = viv->sampler_top; | ||
804 | + *bottom = viv->sampler_bottom; | ||
805 | +} | ||
806 | diff --git a/gst-libs/gst/gl/gstglvivante.h b/gst-libs/gst/gl/gstglvivante.h | ||
807 | new file mode 100644 | ||
808 | index 0000000..f763f80 | ||
809 | --- /dev/null | ||
810 | +++ b/gst-libs/gst/gl/gstglvivante.h | ||
811 | @@ -0,0 +1,41 @@ | ||
812 | +/* | ||
813 | + * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. | ||
814 | + * | ||
815 | + * This library is free software; you can redistribute it and/or | ||
816 | + * modify it under the terms of the GNU Library General Public | ||
817 | + * License as published by the Free Software Foundation; either | ||
818 | + * version 2 of the License, or (at your option) any later version. | ||
819 | + * | ||
820 | + * This library is distributed in the hope that it will be useful, | ||
821 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
822 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
823 | + * Library General Public License for more details. | ||
824 | + * | ||
825 | + * You should have received a copy of the GNU Library General Public | ||
826 | + * License along with this library; if not, write to the | ||
827 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
828 | + * Boston, MA 02111-1307, USA. | ||
829 | + */ | ||
830 | + | ||
831 | +#ifndef __GST_GL_VIVANTE_H__ | ||
832 | +#define __GST_GL_VIVANTE_H__ | ||
833 | + | ||
834 | +#include "gstgldisplay.h" | ||
835 | +#include <GLES2/gl2.h> | ||
836 | + | ||
837 | +G_BEGIN_DECLS | ||
838 | + | ||
839 | +gpointer gst_gl_vivante_new(); | ||
840 | +void gst_gl_vivante_delete(gpointer gpu); | ||
841 | + | ||
842 | +gboolean gst_gl_vivante_check_format(gpointer gpu, GstVideoFormat format, gint width, gint height); | ||
843 | +GLenum gst_gl_vivante_get_gl_format(gpointer gpu, GstVideoFormat format); | ||
844 | + | ||
845 | +gboolean gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display); | ||
846 | +void gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps); | ||
847 | + | ||
848 | +void gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom); | ||
849 | + | ||
850 | +G_END_DECLS | ||
851 | + | ||
852 | +#endif /* __GST_GL_VIVANTE_H__ */ | ||
853 | diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h | ||
854 | index 499d47a..c3cafb2 100644 | ||
855 | --- a/gst-libs/gst/gl/gstglwindow.h | ||
856 | +++ b/gst-libs/gst/gl/gstglwindow.h | ||
857 | @@ -21,6 +21,10 @@ | ||
858 | #ifndef __GST_GL_WINDOW_H__ | ||
859 | #define __GST_GL_WINDOW_H__ | ||
860 | |||
861 | +#ifdef HAVE_CONFIG_H | ||
862 | +#include "config.h" | ||
863 | +#endif | ||
864 | + | ||
865 | /* OpenGL 2.0 for Embedded Systems */ | ||
866 | #ifdef OPENGL_ES2 | ||
867 | #undef UNICODE | ||
868 | diff --git a/gst-libs/gst/gl/gstglwindow_fbES2.c b/gst-libs/gst/gl/gstglwindow_fbES2.c | ||
869 | new file mode 100644 | ||
870 | index 0000000..57c02e1 | ||
871 | --- /dev/null | ||
872 | +++ b/gst-libs/gst/gl/gstglwindow_fbES2.c | ||
873 | @@ -0,0 +1,709 @@ | ||
874 | +/* | ||
875 | + * GStreamer | ||
876 | + * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> | ||
877 | + * | ||
878 | + * This library is free software; you can redistribute it and/or | ||
879 | + * modify it under the terms of the GNU Library General Public | ||
880 | + * License as published by the Free Software Foundation; either | ||
881 | + * version 2 of the License, or (at your option) any later version. | ||
882 | + * | ||
883 | + * This library is distributed in the hope that it will be useful, | ||
884 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
885 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
886 | + * Library General Public License for more details. | ||
887 | + * | ||
888 | + * You should have received a copy of the GNU Library General Public | ||
889 | + * License along with this library; if not, write to the | ||
890 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
891 | + * Boston, MA 02111-1307, USA. | ||
892 | + */ | ||
893 | + | ||
894 | +#ifdef HAVE_CONFIG_H | ||
895 | +#include "config.h" | ||
896 | +#endif | ||
897 | + | ||
898 | +#include "gstglwindow.h" | ||
899 | +#include "EGL/eglvivante.h" | ||
900 | + | ||
901 | +#include <locale.h> | ||
902 | +#include <stdio.h> | ||
903 | +#include <stdlib.h> | ||
904 | + | ||
905 | +#define GST_GL_WINDOW_GET_PRIVATE(o) \ | ||
906 | + (G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_WINDOW, GstGLWindowPrivate)) | ||
907 | + | ||
908 | +/* A gl window is created and deleted in a thread dedicated to opengl calls | ||
909 | + The name contains "window" because an opengl context is used in cooperation | ||
910 | + with a window */ | ||
911 | + | ||
912 | +const gchar *EGLErrorString (); | ||
913 | + | ||
914 | +enum | ||
915 | +{ | ||
916 | + ARG_0, | ||
917 | + ARG_DISPLAY | ||
918 | +}; | ||
919 | + | ||
920 | +enum GstGLFbEventType | ||
921 | +{ | ||
922 | + FB_EVENT_DRAW, | ||
923 | + FB_EVENT_CALLBACK, | ||
924 | + FB_EVENT_QUIT, | ||
925 | +}; | ||
926 | + | ||
927 | +typedef struct _GstGLFbEvent | ||
928 | +{ | ||
929 | + enum GstGLFbEventType type; | ||
930 | + GstGLWindowCB callback; | ||
931 | + gpointer data; | ||
932 | +} GstGLFbEvent; | ||
933 | + | ||
934 | +struct _GstGLWindowPrivate | ||
935 | +{ | ||
936 | + /* X is not thread safe */ | ||
937 | + GMutex *lock; | ||
938 | + GCond *cond_send_message; | ||
939 | + GCond *cond_queue_message; | ||
940 | + gboolean running; | ||
941 | + gboolean allow_extra_expose_events; | ||
942 | + | ||
943 | + /* fb queue */ | ||
944 | + GList *queue; | ||
945 | + | ||
946 | + /* X context */ | ||
947 | + gchar *display_name; | ||
948 | + gint device_width; | ||
949 | + gint device_height; | ||
950 | + | ||
951 | + EGLNativeWindowType internal_win_id; | ||
952 | + EGLNativeDisplayType device; | ||
953 | + | ||
954 | + /* EGL */ | ||
955 | + EGLContext gl_context; | ||
956 | + EGLDisplay gl_display; | ||
957 | + EGLSurface gl_surface; | ||
958 | + | ||
959 | + /* frozen callbacks */ | ||
960 | + GstGLWindowCB draw_cb; | ||
961 | + gpointer draw_data; | ||
962 | + GstGLWindowCB2 resize_cb; | ||
963 | + gpointer resize_data; | ||
964 | + GstGLWindowCB close_cb; | ||
965 | + gpointer close_data; | ||
966 | +}; | ||
967 | + | ||
968 | +G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT); | ||
969 | + | ||
970 | +#undef G_LOG_DOMAIN | ||
971 | +#define G_LOG_DOMAIN "GstGLWindow" | ||
972 | + | ||
973 | +gboolean _gst_gl_window_debug = FALSE; | ||
974 | + | ||
975 | +void | ||
976 | +gst_gl_window_init_platform () | ||
977 | +{ | ||
978 | +} | ||
979 | + | ||
980 | +static void | ||
981 | +free_event (gpointer event, gpointer data) | ||
982 | +{ | ||
983 | + g_slice_free (GstGLFbEvent, event); | ||
984 | +} | ||
985 | + | ||
986 | +/* Must be called in the gl thread */ | ||
987 | +static void | ||
988 | +gst_gl_window_finalize (GObject * object) | ||
989 | +{ | ||
990 | + GstGLWindow *window = GST_GL_WINDOW (object); | ||
991 | + GstGLWindowPrivate *priv = window->priv; | ||
992 | + gboolean ret = TRUE; | ||
993 | + | ||
994 | + g_mutex_lock (priv->lock); | ||
995 | + | ||
996 | + g_debug ("about to finalize gl window\n"); | ||
997 | + | ||
998 | + if (priv->gl_context) { | ||
999 | + ret = | ||
1000 | + eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1001 | + EGL_NO_CONTEXT); | ||
1002 | + if (!ret) | ||
1003 | + g_debug ("failed to release opengl context\n"); | ||
1004 | + | ||
1005 | + eglDestroyContext (priv->gl_display, priv->gl_context); | ||
1006 | + } | ||
1007 | + | ||
1008 | + if (priv->gl_display) | ||
1009 | + eglTerminate (priv->gl_display); | ||
1010 | + | ||
1011 | + if (priv->device) | ||
1012 | + fbDestroyDisplay (priv->device); | ||
1013 | + | ||
1014 | + g_list_foreach (priv->queue, free_event, NULL); | ||
1015 | + g_list_free (priv->queue); | ||
1016 | + priv->queue = NULL; | ||
1017 | + | ||
1018 | + if (priv->cond_send_message) { | ||
1019 | + g_cond_free (priv->cond_send_message); | ||
1020 | + priv->cond_send_message = NULL; | ||
1021 | + } | ||
1022 | + | ||
1023 | + if (priv->cond_queue_message) { | ||
1024 | + g_cond_free (priv->cond_queue_message); | ||
1025 | + priv->cond_queue_message = NULL; | ||
1026 | + } | ||
1027 | + | ||
1028 | + g_mutex_unlock (priv->lock); | ||
1029 | + | ||
1030 | + if (priv->lock) { | ||
1031 | + g_mutex_free (priv->lock); | ||
1032 | + priv->lock = NULL; | ||
1033 | + } | ||
1034 | + | ||
1035 | + G_OBJECT_CLASS (gst_gl_window_parent_class)->finalize (object); | ||
1036 | +} | ||
1037 | + | ||
1038 | +static void | ||
1039 | +gst_gl_window_set_property (GObject * object, guint prop_id, | ||
1040 | + const GValue * value, GParamSpec * pspec) | ||
1041 | +{ | ||
1042 | + GstGLWindow *window; | ||
1043 | + GstGLWindowPrivate *priv; | ||
1044 | + | ||
1045 | + g_return_if_fail (GST_GL_IS_WINDOW (object)); | ||
1046 | + | ||
1047 | + window = GST_GL_WINDOW (object); | ||
1048 | + | ||
1049 | + priv = window->priv; | ||
1050 | + | ||
1051 | + switch (prop_id) { | ||
1052 | + case ARG_DISPLAY: | ||
1053 | + priv->display_name = g_strdup (g_value_get_string (value)); | ||
1054 | + break; | ||
1055 | + default: | ||
1056 | + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
1057 | + break; | ||
1058 | + } | ||
1059 | +} | ||
1060 | + | ||
1061 | +static void | ||
1062 | +gst_gl_window_get_property (GObject * object, guint prop_id, | ||
1063 | + GValue * value, GParamSpec * pspec) | ||
1064 | +{ | ||
1065 | + GstGLWindow *window; | ||
1066 | + GstGLWindowPrivate *priv; | ||
1067 | + | ||
1068 | + g_return_if_fail (GST_GL_IS_WINDOW (object)); | ||
1069 | + | ||
1070 | + window = GST_GL_WINDOW (object); | ||
1071 | + | ||
1072 | + priv = window->priv; | ||
1073 | + | ||
1074 | + switch (prop_id) { | ||
1075 | + case ARG_DISPLAY: | ||
1076 | + g_value_set_string (value, priv->display_name); | ||
1077 | + break; | ||
1078 | + default: | ||
1079 | + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
1080 | + break; | ||
1081 | + } | ||
1082 | +} | ||
1083 | + | ||
1084 | +static void | ||
1085 | +gst_gl_window_log_handler (const gchar * domain, GLogLevelFlags flags, | ||
1086 | + const gchar * message, gpointer user_data) | ||
1087 | +{ | ||
1088 | + if (_gst_gl_window_debug) { | ||
1089 | + g_log_default_handler (domain, flags, message, user_data); | ||
1090 | + } | ||
1091 | +} | ||
1092 | + | ||
1093 | +static void | ||
1094 | +gst_gl_window_class_init (GstGLWindowClass * klass) | ||
1095 | +{ | ||
1096 | + GObjectClass *obj_class = G_OBJECT_CLASS (klass); | ||
1097 | + | ||
1098 | + g_type_class_add_private (klass, sizeof (GstGLWindowPrivate)); | ||
1099 | + | ||
1100 | + obj_class->finalize = gst_gl_window_finalize; | ||
1101 | + obj_class->set_property = gst_gl_window_set_property; | ||
1102 | + obj_class->get_property = gst_gl_window_get_property; | ||
1103 | + | ||
1104 | + g_object_class_install_property (obj_class, ARG_DISPLAY, | ||
1105 | + g_param_spec_string ("display", "Display", "X Display name", NULL, | ||
1106 | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | ||
1107 | +} | ||
1108 | + | ||
1109 | +static void | ||
1110 | +gst_gl_window_init (GstGLWindow * window) | ||
1111 | +{ | ||
1112 | + GstGLWindowPrivate *priv = NULL; | ||
1113 | + window->priv = GST_GL_WINDOW_GET_PRIVATE (window); | ||
1114 | + priv = window->priv; | ||
1115 | + | ||
1116 | + if (g_getenv ("GST_GL_WINDOW_DEBUG") != NULL) | ||
1117 | + _gst_gl_window_debug = TRUE; | ||
1118 | + | ||
1119 | + g_log_set_handler ("GstGLWindow", G_LOG_LEVEL_DEBUG, | ||
1120 | + gst_gl_window_log_handler, NULL); | ||
1121 | + | ||
1122 | + priv->lock = NULL; | ||
1123 | + priv->cond_send_message = NULL; | ||
1124 | + priv->running = FALSE; | ||
1125 | + priv->allow_extra_expose_events = FALSE; | ||
1126 | + | ||
1127 | + priv->queue = NULL; | ||
1128 | + | ||
1129 | + /* X context */ | ||
1130 | + priv->display_name = NULL; | ||
1131 | + priv->device_width = 0; | ||
1132 | + priv->device_height = 0; | ||
1133 | + | ||
1134 | + /* EGL */ | ||
1135 | + priv->gl_context = EGL_NO_CONTEXT; | ||
1136 | + priv->gl_display = 0; | ||
1137 | + priv->gl_surface = EGL_NO_SURFACE; | ||
1138 | + | ||
1139 | + /* frozen callbacks */ | ||
1140 | + priv->draw_cb = NULL; | ||
1141 | + priv->draw_data = NULL; | ||
1142 | + priv->resize_cb = NULL; | ||
1143 | + priv->resize_data = NULL; | ||
1144 | + priv->close_cb = NULL; | ||
1145 | + priv->close_data = NULL; | ||
1146 | +} | ||
1147 | + | ||
1148 | +/* Must be called in the gl thread */ | ||
1149 | +GstGLWindow * | ||
1150 | +gst_gl_window_new (gulong external_gl_context) | ||
1151 | +{ | ||
1152 | + GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL); | ||
1153 | + GstGLWindowPrivate *priv = window->priv; | ||
1154 | + | ||
1155 | + EGLint config_attrib[] = { | ||
1156 | + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, | ||
1157 | + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, | ||
1158 | + EGL_DEPTH_SIZE, 16, | ||
1159 | + EGL_NONE | ||
1160 | + }; | ||
1161 | + | ||
1162 | + EGLint context_attrib[] = { | ||
1163 | + EGL_CONTEXT_CLIENT_VERSION, 2, | ||
1164 | + EGL_NONE | ||
1165 | + }; | ||
1166 | + | ||
1167 | + EGLint majorVersion; | ||
1168 | + EGLint minorVersion; | ||
1169 | + EGLint numConfigs; | ||
1170 | + EGLConfig config; | ||
1171 | + | ||
1172 | + int index = 0; | ||
1173 | + | ||
1174 | + setlocale (LC_NUMERIC, "C"); | ||
1175 | + | ||
1176 | + priv->lock = g_mutex_new (); | ||
1177 | + priv->cond_send_message = g_cond_new (); | ||
1178 | + priv->cond_queue_message = g_cond_new (); | ||
1179 | + priv->running = TRUE; | ||
1180 | + priv->allow_extra_expose_events = TRUE; | ||
1181 | + | ||
1182 | + g_mutex_lock (priv->lock); | ||
1183 | + | ||
1184 | + if (priv->display_name) | ||
1185 | + index = strtol (priv->display_name, NULL, 0); | ||
1186 | + | ||
1187 | + priv->device = fbGetDisplayByIndex (index); | ||
1188 | + | ||
1189 | + if (!priv->device) { | ||
1190 | + g_debug ("failed to get fb display by index %d\n", index); | ||
1191 | + goto failure; | ||
1192 | + } | ||
1193 | + | ||
1194 | + priv->internal_win_id = fbCreateWindow (priv->device, -1, -1, 0, 0); | ||
1195 | + | ||
1196 | + fbGetDisplayGeometry (priv->device, &priv->device_width, | ||
1197 | + &priv->device_height); | ||
1198 | + | ||
1199 | + priv->gl_display = eglGetDisplay (priv->device); | ||
1200 | + | ||
1201 | + if (eglInitialize (priv->gl_display, &majorVersion, &minorVersion)) | ||
1202 | + g_debug ("egl initialized: %d.%d\n", majorVersion, minorVersion); | ||
1203 | + else { | ||
1204 | + g_debug ("failed to initialize egl %ld, %s\n", (gulong) priv->gl_display, | ||
1205 | + EGLErrorString ()); | ||
1206 | + goto failure; | ||
1207 | + } | ||
1208 | + | ||
1209 | + if (eglChooseConfig (priv->gl_display, config_attrib, &config, 1, | ||
1210 | + &numConfigs)) | ||
1211 | + g_debug ("config set: %ld, %ld\n", (gulong) config, (gulong) numConfigs); | ||
1212 | + else { | ||
1213 | + g_debug ("failed to set config %ld, %s\n", (gulong) priv->gl_display, | ||
1214 | + EGLErrorString ()); | ||
1215 | + goto failure; | ||
1216 | + } | ||
1217 | + | ||
1218 | + priv->gl_surface = | ||
1219 | + eglCreateWindowSurface (priv->gl_display, config, priv->internal_win_id, | ||
1220 | + NULL); | ||
1221 | + if (priv->gl_surface != EGL_NO_SURFACE) | ||
1222 | + g_debug ("surface created: %ld\n", (gulong) priv->gl_surface); | ||
1223 | + else { | ||
1224 | + g_debug ("failed to create surface %ld, %ld, %ld, %s\n", | ||
1225 | + (gulong) priv->gl_display, (gulong) priv->gl_surface, | ||
1226 | + (gulong) priv->gl_display, EGLErrorString ()); | ||
1227 | + goto failure; | ||
1228 | + } | ||
1229 | + | ||
1230 | + g_debug ("about to create gl context\n"); | ||
1231 | + | ||
1232 | + priv->gl_context = | ||
1233 | + eglCreateContext (priv->gl_display, config, | ||
1234 | + (EGLContext) (guint) external_gl_context, context_attrib); | ||
1235 | + | ||
1236 | + if (priv->gl_context != EGL_NO_CONTEXT) | ||
1237 | + g_debug ("gl context created: %ld\n", (gulong) priv->gl_context); | ||
1238 | + else { | ||
1239 | + g_debug ("failed to create glcontext %ld, %ld, %s\n", | ||
1240 | + (gulong) priv->gl_context, (gulong) priv->gl_display, | ||
1241 | + EGLErrorString ()); | ||
1242 | + goto failure; | ||
1243 | + } | ||
1244 | + | ||
1245 | + if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, | ||
1246 | + priv->gl_context)) { | ||
1247 | + g_debug ("failed to make opengl context current %ld, %s\n", | ||
1248 | + (gulong) priv->gl_display, EGLErrorString ()); | ||
1249 | + goto failure; | ||
1250 | + } | ||
1251 | + | ||
1252 | + g_mutex_unlock (priv->lock); | ||
1253 | + printf ("device WxH:%dx%d\n", priv->device_width, priv->device_height); | ||
1254 | + return window; | ||
1255 | + | ||
1256 | +failure: | ||
1257 | + g_mutex_unlock (priv->lock); | ||
1258 | + g_object_unref (G_OBJECT (window)); | ||
1259 | + return NULL; | ||
1260 | +} | ||
1261 | + | ||
1262 | +GQuark | ||
1263 | +gst_gl_window_error_quark (void) | ||
1264 | +{ | ||
1265 | + return g_quark_from_static_string ("gst-gl-window-error"); | ||
1266 | +} | ||
1267 | + | ||
1268 | +gulong | ||
1269 | +gst_gl_window_get_internal_gl_context (GstGLWindow * window) | ||
1270 | +{ | ||
1271 | + GstGLWindowPrivate *priv = window->priv; | ||
1272 | + return (gulong) priv->gl_context; | ||
1273 | +} | ||
1274 | + | ||
1275 | +void | ||
1276 | +callback_activate_gl_context (GstGLWindowPrivate * priv) | ||
1277 | +{ | ||
1278 | + if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, | ||
1279 | + priv->gl_context)) | ||
1280 | + g_debug ("failed to activate opengl context %lud\n", | ||
1281 | + (gulong) priv->gl_context); | ||
1282 | +} | ||
1283 | + | ||
1284 | +void | ||
1285 | +callback_inactivate_gl_context (GstGLWindowPrivate * priv) | ||
1286 | +{ | ||
1287 | + if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1288 | + EGL_NO_CONTEXT)) | ||
1289 | + g_debug ("failed to inactivate opengl context %lud\n", | ||
1290 | + (gulong) priv->gl_context); | ||
1291 | +} | ||
1292 | + | ||
1293 | +void | ||
1294 | +gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate) | ||
1295 | +{ | ||
1296 | + GstGLWindowPrivate *priv = window->priv; | ||
1297 | + if (activate) | ||
1298 | + gst_gl_window_send_message (window, | ||
1299 | + GST_GL_WINDOW_CB (callback_activate_gl_context), priv); | ||
1300 | + else | ||
1301 | + gst_gl_window_send_message (window, | ||
1302 | + GST_GL_WINDOW_CB (callback_inactivate_gl_context), priv); | ||
1303 | +} | ||
1304 | + | ||
1305 | +/* Not called by the gl thread */ | ||
1306 | +void | ||
1307 | +gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id) | ||
1308 | +{ | ||
1309 | +} | ||
1310 | + | ||
1311 | +void | ||
1312 | +gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback, | ||
1313 | + gpointer data) | ||
1314 | +{ | ||
1315 | + GstGLWindowPrivate *priv = window->priv; | ||
1316 | + | ||
1317 | + g_mutex_lock (priv->lock); | ||
1318 | + | ||
1319 | + priv->draw_cb = callback; | ||
1320 | + priv->draw_data = data; | ||
1321 | + | ||
1322 | + g_mutex_unlock (priv->lock); | ||
1323 | +} | ||
1324 | + | ||
1325 | +void | ||
1326 | +gst_gl_window_set_resize_callback (GstGLWindow * window, | ||
1327 | + GstGLWindowCB2 callback, gpointer data) | ||
1328 | +{ | ||
1329 | + GstGLWindowPrivate *priv = window->priv; | ||
1330 | + | ||
1331 | + g_mutex_lock (priv->lock); | ||
1332 | + | ||
1333 | + priv->resize_cb = callback; | ||
1334 | + priv->resize_data = data; | ||
1335 | + | ||
1336 | + g_mutex_unlock (priv->lock); | ||
1337 | +} | ||
1338 | + | ||
1339 | +void | ||
1340 | +gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback, | ||
1341 | + gpointer data) | ||
1342 | +{ | ||
1343 | + GstGLWindowPrivate *priv = window->priv; | ||
1344 | + | ||
1345 | + g_mutex_lock (priv->lock); | ||
1346 | + | ||
1347 | + priv->close_cb = callback; | ||
1348 | + priv->close_data = data; | ||
1349 | + | ||
1350 | + g_mutex_unlock (priv->lock); | ||
1351 | +} | ||
1352 | + | ||
1353 | +/* Called in the gl thread */ | ||
1354 | +void | ||
1355 | +gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) | ||
1356 | +{ | ||
1357 | + GstGLWindowPrivate *priv = window->priv; | ||
1358 | + | ||
1359 | + if (priv->running && priv->allow_extra_expose_events) { | ||
1360 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
1361 | + event->type = FB_EVENT_DRAW; | ||
1362 | + priv->queue = g_list_append (priv->queue, event); | ||
1363 | + g_cond_signal (priv->cond_queue_message); | ||
1364 | + /* block until opengl calls have been executed in the gl thread */ | ||
1365 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
1366 | + } | ||
1367 | +} | ||
1368 | + | ||
1369 | +/* Not called by the gl thread */ | ||
1370 | +void | ||
1371 | +gst_gl_window_draw (GstGLWindow * window, gint width, gint height) | ||
1372 | +{ | ||
1373 | + if (window) { | ||
1374 | + GstGLWindowPrivate *priv = window->priv; | ||
1375 | + | ||
1376 | + g_mutex_lock (priv->lock); | ||
1377 | + | ||
1378 | + if (priv->running) { | ||
1379 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
1380 | + event->type = FB_EVENT_DRAW; | ||
1381 | + priv->queue = g_list_append (priv->queue, event); | ||
1382 | + g_cond_signal (priv->cond_queue_message); | ||
1383 | + /* block until opengl calls have been executed in the gl thread */ | ||
1384 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
1385 | + } | ||
1386 | + | ||
1387 | + g_mutex_unlock (priv->lock); | ||
1388 | + } | ||
1389 | +} | ||
1390 | + | ||
1391 | +static void | ||
1392 | +gst_gl_fb_queue_flush (GList * queue, GCond * cond) | ||
1393 | +{ | ||
1394 | + GstGLFbEvent *event; | ||
1395 | + GList *first; | ||
1396 | + | ||
1397 | + while ((first = g_list_first (queue))) { | ||
1398 | + event = first->data; | ||
1399 | + queue = g_list_delete_link (queue, first); | ||
1400 | + | ||
1401 | + if (event->type == FB_EVENT_CALLBACK) { | ||
1402 | + g_debug ("execute last pending custom x events\n"); | ||
1403 | + | ||
1404 | + if (!event->callback || !event->data) | ||
1405 | + g_debug ("custom cb not initialized\n"); | ||
1406 | + | ||
1407 | + event->callback (event->data); | ||
1408 | + | ||
1409 | + g_cond_signal (cond); | ||
1410 | + } | ||
1411 | + | ||
1412 | + g_slice_free (GstGLFbEvent, event); | ||
1413 | + } | ||
1414 | +} | ||
1415 | + | ||
1416 | +/* Called in the gl thread */ | ||
1417 | +void | ||
1418 | +gst_gl_window_run_loop (GstGLWindow * window) | ||
1419 | +{ | ||
1420 | + GstGLWindowPrivate *priv = window->priv; | ||
1421 | + GstGLFbEvent *event; | ||
1422 | + GList *first; | ||
1423 | + | ||
1424 | + g_debug ("begin loop\n"); | ||
1425 | + | ||
1426 | + g_mutex_lock (priv->lock); | ||
1427 | + | ||
1428 | + while (priv->running) { | ||
1429 | + | ||
1430 | + if (!priv->queue) | ||
1431 | + g_cond_wait (priv->cond_queue_message, priv->lock); | ||
1432 | + | ||
1433 | + first = g_list_first (priv->queue); | ||
1434 | + event = first->data; | ||
1435 | + priv->queue = g_list_delete_link (priv->queue, first); | ||
1436 | + | ||
1437 | + // use in generic/cube and other related uses | ||
1438 | + priv->allow_extra_expose_events = g_list_length (priv->queue) <= 2; | ||
1439 | + | ||
1440 | + switch (event->type) { | ||
1441 | + case FB_EVENT_CALLBACK: | ||
1442 | + { | ||
1443 | + if (priv->running) { | ||
1444 | + if (!event->callback || !event->data) | ||
1445 | + g_debug ("custom cb not initialized\n"); | ||
1446 | + event->callback (event->data); | ||
1447 | + g_cond_signal (priv->cond_send_message); | ||
1448 | + } | ||
1449 | + break; | ||
1450 | + } | ||
1451 | + | ||
1452 | + case FB_EVENT_QUIT: | ||
1453 | + { | ||
1454 | + g_debug ("Quit loop message %lud\n", (gulong) priv->internal_win_id); | ||
1455 | + | ||
1456 | + /* exit loop */ | ||
1457 | + priv->running = FALSE; | ||
1458 | + | ||
1459 | + /* make sure last pendings send message calls are executed */ | ||
1460 | + gst_gl_fb_queue_flush (priv->queue, priv->cond_send_message); | ||
1461 | + priv->queue = NULL; | ||
1462 | + | ||
1463 | + /* Finally we can destroy opengl ressources (texture/shaders/fbo) */ | ||
1464 | + if (!event->callback || !event->data) | ||
1465 | + g_debug ("destroy cb not correclty set\n"); | ||
1466 | + | ||
1467 | + event->callback (event->data); | ||
1468 | + g_cond_signal (priv->cond_send_message); | ||
1469 | + break; | ||
1470 | + } | ||
1471 | + | ||
1472 | + case FB_EVENT_DRAW: | ||
1473 | + if (priv->draw_cb) { | ||
1474 | + priv->draw_cb (priv->draw_data); | ||
1475 | + glFlush (); | ||
1476 | + eglSwapBuffers (priv->gl_display, priv->gl_surface); | ||
1477 | + g_cond_signal (priv->cond_send_message); | ||
1478 | + } | ||
1479 | + break; | ||
1480 | + | ||
1481 | + default: | ||
1482 | + g_debug ("unknown GstGLFbEvent type: %ud\n", event->type); | ||
1483 | + break; | ||
1484 | + } // switch | ||
1485 | + | ||
1486 | + g_slice_free (GstGLFbEvent, event); | ||
1487 | + | ||
1488 | + } // while running | ||
1489 | + | ||
1490 | + g_mutex_unlock (priv->lock); | ||
1491 | + | ||
1492 | + g_debug ("end loop\n"); | ||
1493 | +} | ||
1494 | + | ||
1495 | +/* Not called by the gl thread */ | ||
1496 | +void | ||
1497 | +gst_gl_window_quit_loop (GstGLWindow * window, GstGLWindowCB callback, | ||
1498 | + gpointer data) | ||
1499 | +{ | ||
1500 | + if (window) { | ||
1501 | + GstGLWindowPrivate *priv = window->priv; | ||
1502 | + | ||
1503 | + g_mutex_lock (priv->lock); | ||
1504 | + | ||
1505 | + if (priv->running) { | ||
1506 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
1507 | + event->type = FB_EVENT_QUIT; | ||
1508 | + event->callback = callback; | ||
1509 | + event->data = data; | ||
1510 | + priv->queue = g_list_append (priv->queue, event); | ||
1511 | + | ||
1512 | + g_cond_signal (priv->cond_queue_message); | ||
1513 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
1514 | + } | ||
1515 | + | ||
1516 | + g_mutex_unlock (priv->lock); | ||
1517 | + } | ||
1518 | +} | ||
1519 | + | ||
1520 | +/* Not called by the gl thread */ | ||
1521 | +void | ||
1522 | +gst_gl_window_send_message (GstGLWindow * window, GstGLWindowCB callback, | ||
1523 | + gpointer data) | ||
1524 | +{ | ||
1525 | + if (window) { | ||
1526 | + GstGLWindowPrivate *priv = window->priv; | ||
1527 | + | ||
1528 | + g_mutex_lock (priv->lock); | ||
1529 | + | ||
1530 | + if (priv->running) { | ||
1531 | + GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); | ||
1532 | + event->type = FB_EVENT_CALLBACK; | ||
1533 | + event->callback = callback; | ||
1534 | + event->data = data; | ||
1535 | + priv->queue = g_list_append (priv->queue, event); | ||
1536 | + g_cond_signal (priv->cond_queue_message); | ||
1537 | + | ||
1538 | + /* block until opengl calls have been executed in the gl thread */ | ||
1539 | + g_cond_wait (priv->cond_send_message, priv->lock); | ||
1540 | + } | ||
1541 | + | ||
1542 | + g_mutex_unlock (priv->lock); | ||
1543 | + } | ||
1544 | +} | ||
1545 | + | ||
1546 | +const gchar * | ||
1547 | +EGLErrorString () | ||
1548 | +{ | ||
1549 | + EGLint nErr = eglGetError (); | ||
1550 | + switch (nErr) { | ||
1551 | + case EGL_SUCCESS: | ||
1552 | + return "EGL_SUCCESS"; | ||
1553 | + case EGL_BAD_DISPLAY: | ||
1554 | + return "EGL_BAD_DISPLAY"; | ||
1555 | + case EGL_NOT_INITIALIZED: | ||
1556 | + return "EGL_NOT_INITIALIZED"; | ||
1557 | + case EGL_BAD_ACCESS: | ||
1558 | + return "EGL_BAD_ACCESS"; | ||
1559 | + case EGL_BAD_ALLOC: | ||
1560 | + return "EGL_BAD_ALLOC"; | ||
1561 | + case EGL_BAD_ATTRIBUTE: | ||
1562 | + return "EGL_BAD_ATTRIBUTE"; | ||
1563 | + case EGL_BAD_CONFIG: | ||
1564 | + return "EGL_BAD_CONFIG"; | ||
1565 | + case EGL_BAD_CONTEXT: | ||
1566 | + return "EGL_BAD_CONTEXT"; | ||
1567 | + case EGL_BAD_CURRENT_SURFACE: | ||
1568 | + return "EGL_BAD_CURRENT_SURFACE"; | ||
1569 | + case EGL_BAD_MATCH: | ||
1570 | + return "EGL_BAD_MATCH"; | ||
1571 | + case EGL_BAD_NATIVE_PIXMAP: | ||
1572 | + return "EGL_BAD_NATIVE_PIXMAP"; | ||
1573 | + case EGL_BAD_NATIVE_WINDOW: | ||
1574 | + return "EGL_BAD_NATIVE_WINDOW"; | ||
1575 | + case EGL_BAD_PARAMETER: | ||
1576 | + return "EGL_BAD_PARAMETER"; | ||
1577 | + case EGL_BAD_SURFACE: | ||
1578 | + return "EGL_BAD_SURFACE"; | ||
1579 | + default: | ||
1580 | + return "unknown"; | ||
1581 | + } | ||
1582 | +} | ||
1583 | diff --git a/gst-libs/gst/gl/gstglwindow_x11ES2.c b/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
1584 | index 260fd2e..65afb50 100644 | ||
1585 | --- a/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
1586 | +++ b/gst-libs/gst/gl/gstglwindow_x11ES2.c | ||
1587 | @@ -116,16 +116,16 @@ gst_gl_window_finalize (GObject * object) | ||
1588 | |||
1589 | if (priv->gl_context) { | ||
1590 | ret = | ||
1591 | - eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1592 | + eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1593 | EGL_NO_CONTEXT); | ||
1594 | if (!ret) | ||
1595 | g_debug ("failed to release opengl context\n"); | ||
1596 | |||
1597 | - eglDestroyContext (priv->device, priv->gl_context); | ||
1598 | + eglDestroyContext (priv->gl_display, priv->gl_context); | ||
1599 | } | ||
1600 | |||
1601 | - if (priv->device) | ||
1602 | - eglTerminate (priv->device); | ||
1603 | + if (priv->gl_display) | ||
1604 | + eglTerminate (priv->gl_display); | ||
1605 | |||
1606 | XFree (priv->visual_info); | ||
1607 | |||
1608 | @@ -510,7 +510,7 @@ callback_activate_gl_context (GstGLWindowPrivate * priv) | ||
1609 | void | ||
1610 | callback_inactivate_gl_context (GstGLWindowPrivate * priv) | ||
1611 | { | ||
1612 | - if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1613 | + if (!eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, | ||
1614 | EGL_NO_CONTEXT)) | ||
1615 | g_debug ("failed to inactivate opengl context %lud\n", | ||
1616 | (gulong) priv->gl_context); | ||
1617 | @@ -622,7 +622,7 @@ gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) | ||
1618 | |||
1619 | XSendEvent (priv->device, priv->internal_win_id, FALSE, ExposureMask, | ||
1620 | &event); | ||
1621 | - XSync (priv->disp_send, FALSE); | ||
1622 | + XSync (priv->device, FALSE); | ||
1623 | } | ||
1624 | } | ||
1625 | |||
1626 | diff --git a/gst/gl/gstglbumper.c b/gst/gl/gstglbumper.c | ||
1627 | index 12efe7d..2daec5b 100644 | ||
1628 | --- a/gst/gl/gstglbumper.c | ||
1629 | +++ b/gst/gl/gstglbumper.c | ||
1630 | @@ -157,7 +157,6 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) | ||
1631 | |||
1632 | png_structp png_ptr; | ||
1633 | png_infop info_ptr; | ||
1634 | - guint sig_read = 0; | ||
1635 | png_uint_32 width = 0; | ||
1636 | png_uint_32 height = 0; | ||
1637 | gint bit_depth = 0; | ||
1638 | @@ -209,7 +208,7 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) | ||
1639 | |||
1640 | png_init_io (png_ptr, fp); | ||
1641 | |||
1642 | - png_set_sig_bytes (png_ptr, sig_read); | ||
1643 | + png_set_sig_bytes (png_ptr, sizeof (magic)); | ||
1644 | |||
1645 | png_read_info (png_ptr, info_ptr); | ||
1646 | |||
1647 | diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c | ||
1648 | index d57f5b5..369d7f1 100644 | ||
1649 | --- a/gst/gl/gstglimagesink.c | ||
1650 | +++ b/gst/gl/gstglimagesink.c | ||
1651 | @@ -1,6 +1,6 @@ | ||
1652 | /* | ||
1653 | - * GStreamer | ||
1654 | - * Copyright (C) 2003 Julien Moutte <julien@moutte.net> | ||
1655 | + * GStreamerfor | ||
1656 | + * Copyright (C) 2003 Julien Moutte <julien@moutte.net>for | ||
1657 | * Copyright (C) 2005,2006,2007 David A. Schleef <ds@schleef.org> | ||
1658 | * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> | ||
1659 | * | ||
1660 | @@ -86,6 +86,9 @@ | ||
1661 | #include <gst/interfaces/xoverlay.h> | ||
1662 | |||
1663 | #include "gstglimagesink.h" | ||
1664 | +#ifdef GPU_VIVANTE | ||
1665 | +#include "gstglvivante.h" | ||
1666 | +#endif | ||
1667 | |||
1668 | GST_DEBUG_CATEGORY (gst_debug_glimage_sink); | ||
1669 | #define GST_CAT_DEFAULT gst_debug_glimage_sink | ||
1670 | @@ -137,11 +140,13 @@ static GstStaticPadTemplate gst_glimage_sink_template = | ||
1671 | GST_PAD_SINK, | ||
1672 | GST_PAD_ALWAYS, | ||
1673 | GST_STATIC_CAPS (GST_GL_VIDEO_CAPS ";" | ||
1674 | - GST_VIDEO_CAPS_RGB ";" | ||
1675 | - GST_VIDEO_CAPS_RGBx ";" | ||
1676 | - GST_VIDEO_CAPS_RGBA ";" | ||
1677 | - GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) | ||
1678 | - ); | ||
1679 | + GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" | ||
1680 | +#ifdef GPU_VIVANTE | ||
1681 | + GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") | ||
1682 | +#else | ||
1683 | + GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") | ||
1684 | +#endif | ||
1685 | + )); | ||
1686 | #endif | ||
1687 | |||
1688 | enum | ||
1689 | @@ -152,7 +157,8 @@ enum | ||
1690 | PROP_CLIENT_DRAW_CALLBACK, | ||
1691 | PROP_CLIENT_DATA, | ||
1692 | PROP_FORCE_ASPECT_RATIO, | ||
1693 | - PROP_PIXEL_ASPECT_RATIO | ||
1694 | + PROP_PIXEL_ASPECT_RATIO, | ||
1695 | + PROP_RENDERED_FRAMES | ||
1696 | }; | ||
1697 | |||
1698 | GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink, | ||
1699 | @@ -241,6 +247,10 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) | ||
1700 | "The pixel aspect ratio of the device", "1/1", | ||
1701 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | ||
1702 | |||
1703 | + g_object_class_install_property (gobject_class, PROP_RENDERED_FRAMES, | ||
1704 | + g_param_spec_int ("rendered", "rendered", | ||
1705 | + "Get the total rendered frames", 0, G_MAXINT, 0, G_PARAM_READABLE)); | ||
1706 | + | ||
1707 | gobject_class->finalize = gst_glimage_sink_finalize; | ||
1708 | |||
1709 | gstelement_class->change_state = gst_glimage_sink_change_state; | ||
1710 | @@ -261,6 +271,7 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink, | ||
1711 | glimage_sink->new_window_id = 0; | ||
1712 | glimage_sink->display = NULL; | ||
1713 | glimage_sink->stored_buffer = NULL; | ||
1714 | + glimage_sink->stored_input_buffer = NULL; | ||
1715 | glimage_sink->clientReshapeCallback = NULL; | ||
1716 | glimage_sink->clientDrawCallback = NULL; | ||
1717 | glimage_sink->client_data = NULL; | ||
1718 | @@ -370,6 +381,9 @@ gst_glimage_sink_get_property (GObject * object, guint prop_id, | ||
1719 | if (!g_value_transform (glimage_sink->par, value)) | ||
1720 | g_warning ("Could not transform string to aspect ratio"); | ||
1721 | break; | ||
1722 | + case PROP_RENDERED_FRAMES: | ||
1723 | + g_value_set_int (value, glimage_sink->rendered); | ||
1724 | + break; | ||
1725 | default: | ||
1726 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
1727 | break; | ||
1728 | @@ -435,6 +449,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) | ||
1729 | |||
1730 | return GST_STATE_CHANGE_FAILURE; | ||
1731 | } | ||
1732 | + glimage_sink->rendered = 0; | ||
1733 | } | ||
1734 | break; | ||
1735 | case GST_STATE_CHANGE_PAUSED_TO_PLAYING: | ||
1736 | @@ -456,6 +471,10 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) | ||
1737 | gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
1738 | glimage_sink->stored_buffer = NULL; | ||
1739 | } | ||
1740 | + if (glimage_sink->stored_input_buffer) { | ||
1741 | + gst_buffer_unref (glimage_sink->stored_input_buffer); | ||
1742 | + glimage_sink->stored_input_buffer = NULL; | ||
1743 | + } | ||
1744 | if (glimage_sink->display) { | ||
1745 | g_object_unref (glimage_sink->display); | ||
1746 | glimage_sink->display = NULL; | ||
1747 | @@ -533,6 +552,14 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) | ||
1748 | if (!ok) | ||
1749 | return FALSE; | ||
1750 | |||
1751 | +#ifdef GPU_VIVANTE | ||
1752 | + /* special case for format that vivante can't handle */ | ||
1753 | + if (format == GST_VIDEO_FORMAT_NV12 && | ||
1754 | + !gst_gl_vivante_check_format (glimage_sink->display->gpu_priv, format, | ||
1755 | + width, height)) | ||
1756 | + return FALSE; | ||
1757 | +#endif | ||
1758 | + | ||
1759 | /* init colorspace conversion if needed */ | ||
1760 | ok = gst_gl_display_init_upload (glimage_sink->display, format, | ||
1761 | width, height, width, height); | ||
1762 | @@ -609,6 +636,11 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) | ||
1763 | if (!glimage_sink->window_id && !glimage_sink->new_window_id) | ||
1764 | gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (glimage_sink)); | ||
1765 | |||
1766 | +#ifdef GPU_VIVANTE | ||
1767 | + if (glimage_sink->display->gpu_priv) | ||
1768 | + gst_gl_vivante_set_caps (glimage_sink->display->gpu_priv, caps); | ||
1769 | +#endif | ||
1770 | + | ||
1771 | return TRUE; | ||
1772 | } | ||
1773 | |||
1774 | @@ -617,11 +649,18 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
1775 | { | ||
1776 | GstGLImageSink *glimage_sink = NULL; | ||
1777 | GstGLBuffer *gl_buffer = NULL; | ||
1778 | + gint index; | ||
1779 | + GstFlowReturn res; | ||
1780 | |||
1781 | glimage_sink = GST_GLIMAGE_SINK (bsink); | ||
1782 | |||
1783 | GST_INFO ("buffer size: %d", GST_BUFFER_SIZE (buf)); | ||
1784 | |||
1785 | + if (buf == glimage_sink->stored_input_buffer) | ||
1786 | + return GST_FLOW_OK; | ||
1787 | + | ||
1788 | + glimage_sink->display->upload_buf_mapped = FALSE; | ||
1789 | + | ||
1790 | //is gl | ||
1791 | if (glimage_sink->is_gl) { | ||
1792 | //increment gl buffer ref before storage | ||
1793 | @@ -633,9 +672,16 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
1794 | gl_buffer = gst_gl_buffer_new (glimage_sink->display, | ||
1795 | glimage_sink->width, glimage_sink->height); | ||
1796 | |||
1797 | - //blocking call | ||
1798 | - gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, | ||
1799 | - glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); | ||
1800 | + index = G_N_ELEMENTS (buf->_gst_reserved) - 1; | ||
1801 | + | ||
1802 | + if (index >= 0) | ||
1803 | + //blocking call | ||
1804 | + gst_gl_display_do_upload_with_meta (glimage_sink->display, | ||
1805 | + gl_buffer->texture, glimage_sink->width, glimage_sink->height, | ||
1806 | + GST_BUFFER_DATA (buf), buf->_gst_reserved[index]); | ||
1807 | + else | ||
1808 | + gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, | ||
1809 | + glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); | ||
1810 | |||
1811 | //gl_buffer is created in this block, so the gl buffer is already referenced | ||
1812 | } | ||
1813 | @@ -645,26 +691,36 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) | ||
1814 | gst_gl_display_set_window_id (glimage_sink->display, | ||
1815 | glimage_sink->window_id); | ||
1816 | } | ||
1817 | - //the buffer is cleared when an other comes in | ||
1818 | - if (glimage_sink->stored_buffer) { | ||
1819 | - gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
1820 | - glimage_sink->stored_buffer = NULL; | ||
1821 | - } | ||
1822 | - //store current buffer | ||
1823 | - glimage_sink->stored_buffer = gl_buffer; | ||
1824 | - | ||
1825 | //redisplay opengl scene | ||
1826 | if (gl_buffer->texture && | ||
1827 | gst_gl_display_redisplay (glimage_sink->display, | ||
1828 | gl_buffer->texture, gl_buffer->width, gl_buffer->height, | ||
1829 | glimage_sink->window_width, glimage_sink->window_height, | ||
1830 | glimage_sink->keep_aspect_ratio)) | ||
1831 | - return GST_FLOW_OK; | ||
1832 | + res = GST_FLOW_OK; | ||
1833 | else { | ||
1834 | GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND, | ||
1835 | GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL)); | ||
1836 | - return GST_FLOW_ERROR; | ||
1837 | + res = GST_FLOW_ERROR; | ||
1838 | } | ||
1839 | + | ||
1840 | + //the buffer is cleared when an other comes in | ||
1841 | + if (glimage_sink->stored_buffer) { | ||
1842 | + gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); | ||
1843 | + glimage_sink->stored_buffer = NULL; | ||
1844 | + } | ||
1845 | + if (glimage_sink->stored_input_buffer) { | ||
1846 | + gst_buffer_unref (glimage_sink->stored_input_buffer); | ||
1847 | + glimage_sink->stored_input_buffer = NULL; | ||
1848 | + } | ||
1849 | + //store current buffer | ||
1850 | + glimage_sink->stored_buffer = gl_buffer; | ||
1851 | + if (glimage_sink->display->upload_buf_mapped) | ||
1852 | + glimage_sink->stored_input_buffer = gst_buffer_ref (buf); | ||
1853 | + | ||
1854 | + glimage_sink->rendered++; | ||
1855 | + | ||
1856 | + return res; | ||
1857 | } | ||
1858 | |||
1859 | |||
1860 | diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h | ||
1861 | index c61b5c5..bd40bc4 100644 | ||
1862 | --- a/gst/gl/gstglimagesink.h | ||
1863 | +++ b/gst/gl/gstglimagesink.h | ||
1864 | @@ -51,6 +51,7 @@ struct _GstGLImageSink | ||
1865 | |||
1866 | //properties | ||
1867 | gchar *display_name; | ||
1868 | + gint rendered; | ||
1869 | |||
1870 | gulong window_id; | ||
1871 | gulong new_window_id; | ||
1872 | @@ -67,6 +68,7 @@ struct _GstGLImageSink | ||
1873 | |||
1874 | GstGLDisplay *display; | ||
1875 | GstGLBuffer *stored_buffer; | ||
1876 | + GstBuffer *stored_input_buffer; | ||
1877 | |||
1878 | CRCB clientReshapeCallback; | ||
1879 | CDCB clientDrawCallback; | ||
1880 | diff --git a/gst/gl/gstglupload.c b/gst/gl/gstglupload.c | ||
1881 | index 09bc96d..8e12532 100644 | ||
1882 | --- a/gst/gl/gstglupload.c | ||
1883 | +++ b/gst/gl/gstglupload.c | ||
1884 | @@ -70,6 +70,9 @@ | ||
1885 | |||
1886 | #include "gstglupload.h" | ||
1887 | |||
1888 | +#ifdef GPU_VIVANTE | ||
1889 | +#include "gstglvivante.h" | ||
1890 | +#endif | ||
1891 | |||
1892 | #define GST_CAT_DEFAULT gst_gl_upload_debug | ||
1893 | GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); | ||
1894 | @@ -106,10 +109,13 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template = | ||
1895 | GST_PAD_SINK, | ||
1896 | GST_PAD_ALWAYS, | ||
1897 | GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";" | ||
1898 | - GST_VIDEO_CAPS_RGBx ";" | ||
1899 | - GST_VIDEO_CAPS_RGBA ";" | ||
1900 | - GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) | ||
1901 | - ); | ||
1902 | + GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" | ||
1903 | +#ifdef GPU_VIVANTE | ||
1904 | + GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") | ||
1905 | +#else | ||
1906 | + GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") | ||
1907 | +#endif | ||
1908 | + )); | ||
1909 | #endif | ||
1910 | |||
1911 | /* Properties */ | ||
1912 | @@ -504,6 +510,14 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps, | ||
1913 | GST_DEBUG ("caps connot be parsed"); | ||
1914 | return FALSE; | ||
1915 | } | ||
1916 | +#ifdef GPU_VIVANTE | ||
1917 | + /* special case for format that vivante can't handle */ | ||
1918 | + if (upload->video_format == GST_VIDEO_FORMAT_NV12 && | ||
1919 | + !gst_gl_vivante_check_format (upload->display->gpu_priv, | ||
1920 | + upload->video_format, upload->video_width, upload->video_height)) | ||
1921 | + return FALSE; | ||
1922 | +#endif | ||
1923 | + | ||
1924 | //init colorspace conversion if needed | ||
1925 | ret = gst_gl_display_init_upload (upload->display, upload->video_format, | ||
1926 | upload->gl_width, upload->gl_height, | ||
1927 | diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.am b/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
1928 | index 5a85bb4..b4a4932 100755 | ||
1929 | --- a/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
1930 | +++ b/tests/examples/cocoa/videoxoverlay/Makefile.am | ||
1931 | @@ -4,7 +4,7 @@ noinst_PROGRAMS = videoxoverlay | ||
1932 | |||
1933 | videoxoverlay_SOURCES = main.m | ||
1934 | |||
1935 | -videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ | ||
1936 | +videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ | ||
1937 | $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 | ||
1938 | videoxoverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ | ||
1939 | $(GL_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) | ||
1940 | diff --git a/common/check.mak b/common/check.mak | ||
1941 | index 30487f1..bc44620 100644 | ||
1942 | --- a/common/check.mak | ||
1943 | +++ b/common/check.mak | ||
1944 | @@ -24,6 +24,12 @@ LOOPS = 10 | ||
1945 | CK_DEFAULT_TIMEOUT=20 \ | ||
1946 | $* | ||
1947 | |||
1948 | +# just like 'check', but don't run it again if it fails (useful for debugging) | ||
1949 | +%.check-norepeat: % | ||
1950 | + @$(TESTS_ENVIRONMENT) \ | ||
1951 | + CK_DEFAULT_TIMEOUT=20 \ | ||
1952 | + $* | ||
1953 | + | ||
1954 | # run any given test in a loop | ||
1955 | %.torture: % | ||
1956 | @for i in `seq 1 $(LOOPS)`; do \ | ||
1957 | @@ -152,7 +158,8 @@ help: | ||
1958 | @echo | ||
1959 | @echo "make check -- run all checks" | ||
1960 | @echo "make torture -- run all checks $(LOOPS) times" | ||
1961 | - @echo "make (dir)/(test).check -- run the given check once" | ||
1962 | + @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" | ||
1963 | + @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" | ||
1964 | @echo "make (dir)/(test).forever -- run the given check forever" | ||
1965 | @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" | ||
1966 | @echo | ||
1967 | diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak | ||
1968 | index 8cc42e7..084f9ae 100644 | ||
1969 | --- a/common/gtk-doc-plugins.mak | ||
1970 | +++ b/common/gtk-doc-plugins.mak | ||
1971 | @@ -13,8 +13,7 @@ help: | ||
1972 | @echo | ||
1973 | |||
1974 | # update the stuff maintained by doc maintainers | ||
1975 | -update: | ||
1976 | - $(MAKE) scanobj-update | ||
1977 | +update: scanobj-update | ||
1978 | $(MAKE) check-outdated-docs | ||
1979 | |||
1980 | # We set GPATH here; this gives us semantics for GNU make | ||
1981 | @@ -130,7 +129,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) | ||
1982 | --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ | ||
1983 | echo " DOC Merging introspection data" && \ | ||
1984 | $(PYTHON) \ | ||
1985 | - $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ | ||
1986 | + $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ | ||
1987 | if test x"$(srcdir)" != x. ; then \ | ||
1988 | for f in $(SCANOBJ_FILES); \ | ||
1989 | do \ | ||
1990 | diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am | ||
1991 | index 2ddb8a7..856d6e3 100644 | ||
1992 | --- a/common/m4/Makefile.am | ||
1993 | +++ b/common/m4/Makefile.am | ||
1994 | @@ -8,7 +8,6 @@ EXTRA_DIST = \ | ||
1995 | as-gcc-inline-assembly.m4 \ | ||
1996 | as-libtool.m4 \ | ||
1997 | as-libtool-tags.m4 \ | ||
1998 | - as-objc.m4 \ | ||
1999 | as-python.m4 \ | ||
2000 | as-scrub-include.m4 \ | ||
2001 | as-version.m4 \ | ||
2002 | diff --git a/common/m4/as-compiler-flag.m4 b/common/m4/as-compiler-flag.m4 | ||
2003 | index 882a4c7..8bb853a 100644 | ||
2004 | --- a/common/m4/as-compiler-flag.m4 | ||
2005 | +++ b/common/m4/as-compiler-flag.m4 | ||
2006 | @@ -62,3 +62,35 @@ AC_DEFUN([AS_CXX_COMPILER_FLAG], | ||
2007 | AC_MSG_RESULT([$flag_ok]) | ||
2008 | ]) | ||
2009 | |||
2010 | +dnl AS_OBJC_COMPILER_FLAG(CPPFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) | ||
2011 | +dnl Tries to compile with the given CPPFLAGS. | ||
2012 | +dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags, | ||
2013 | +dnl and ACTION-IF-NOT-ACCEPTED otherwise. | ||
2014 | + | ||
2015 | +AC_DEFUN([AS_OBJC_COMPILER_FLAG], | ||
2016 | +[ | ||
2017 | + AC_REQUIRE([AC_PROG_OBJC]) | ||
2018 | + | ||
2019 | + AC_MSG_CHECKING([to see if Objective C compiler understands $1]) | ||
2020 | + | ||
2021 | + save_CPPFLAGS="$CPPFLAGS" | ||
2022 | + CPPFLAGS="$CPPFLAGS $1" | ||
2023 | + | ||
2024 | + AC_LANG_PUSH([Objective C]) | ||
2025 | + | ||
2026 | + AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no]) | ||
2027 | + CPPFLAGS="$save_CPPFLAGS" | ||
2028 | + | ||
2029 | + if test "X$flag_ok" = Xyes ; then | ||
2030 | + $2 | ||
2031 | + true | ||
2032 | + else | ||
2033 | + $3 | ||
2034 | + true | ||
2035 | + fi | ||
2036 | + | ||
2037 | + AC_LANG_POP([Objective C]) | ||
2038 | + | ||
2039 | + AC_MSG_RESULT([$flag_ok]) | ||
2040 | +]) | ||
2041 | + | ||
2042 | diff --git a/common/m4/as-objc.m4 b/common/m4/as-objc.m4 | ||
2043 | deleted file mode 100644 | ||
2044 | index 1e7066a..0000000 | ||
2045 | --- a/common/m4/as-objc.m4 | ||
2046 | +++ /dev/null | ||
2047 | @@ -1,56 +0,0 @@ | ||
2048 | - | ||
2049 | - | ||
2050 | -# AC_PROG_OBJC([LIST-OF-COMPILERS]) | ||
2051 | -# | ||
2052 | -AC_DEFUN([AS_PROG_OBJC], | ||
2053 | -[ | ||
2054 | -AC_CHECK_TOOLS(OBJC, | ||
2055 | - [m4_default([$1], [objcc objc gcc cc CC])], | ||
2056 | - none) | ||
2057 | -AC_SUBST(OBJC) | ||
2058 | -OBJC_LDFLAGS="-lobjc" | ||
2059 | -AC_SUBST(OBJC_LDFLAGS) | ||
2060 | -if test "x$OBJC" != xnone ; then | ||
2061 | - _AM_DEPENDENCIES(OBJC) | ||
2062 | - AC_MSG_CHECKING([if Objective C compiler works]) | ||
2063 | - cat >>conftest.m <<EOF | ||
2064 | -#include <objc/Object.h> | ||
2065 | -@interface Moo:Object | ||
2066 | -{ | ||
2067 | -} | ||
2068 | -- moo; | ||
2069 | -int main(); | ||
2070 | -@end | ||
2071 | - | ||
2072 | -@implementation Moo | ||
2073 | -- moo | ||
2074 | -{ | ||
2075 | - exit(0); | ||
2076 | -} | ||
2077 | - | ||
2078 | -int main() | ||
2079 | -{ | ||
2080 | - id moo; | ||
2081 | - moo = [[Moo new]]; | ||
2082 | - [[moo moo]]; | ||
2083 | - return 1; | ||
2084 | -} | ||
2085 | -@end | ||
2086 | -EOF | ||
2087 | - ${OBJC} conftest.m ${OBJC_LDFLAGS} >&5 2>&5 | ||
2088 | - if test -f a.out -o -f a.exe ; then | ||
2089 | - result=yes | ||
2090 | - else | ||
2091 | - result=no | ||
2092 | - echo failed program is: >&5 | ||
2093 | - cat conftest.m >&5 | ||
2094 | - fi | ||
2095 | - rm -f conftest.m a.out a.exe | ||
2096 | - AC_MSG_RESULT([$result]) | ||
2097 | -else | ||
2098 | - _AM_DEPENDENCIES(OBJC) | ||
2099 | -fi | ||
2100 | - | ||
2101 | -]) | ||
2102 | - | ||
2103 | - | ||
2104 | diff --git a/common/m4/gst-arch.m4 b/common/m4/gst-arch.m4 | ||
2105 | index 2e935d2..077a20b 100644 | ||
2106 | --- a/common/m4/gst-arch.m4 | ||
2107 | +++ b/common/m4/gst-arch.m4 | ||
2108 | @@ -5,32 +5,30 @@ dnl defines HOST_CPU | ||
2109 | |||
2110 | AC_DEFUN([AG_GST_ARCH], | ||
2111 | [ | ||
2112 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables | ||
2113 | - | ||
2114 | dnl Determine CPU | ||
2115 | - case "x${host_cpu}" in | ||
2116 | + case "x${target_cpu}" in | ||
2117 | xi?86 | xk? | xi?86_64) | ||
2118 | - case $host_os in | ||
2119 | + case $target_os in | ||
2120 | solaris*) | ||
2121 | AC_CHECK_DECL([__i386], [I386_ABI="yes"], [I386_ABI="no"]) | ||
2122 | AC_CHECK_DECL([__amd64], [AMD64_ABI="yes"], [AMD64_ABI="no"]) | ||
2123 | |||
2124 | if test "x$I386_ABI" = "xyes" ; then | ||
2125 | HAVE_CPU_I386=yes | ||
2126 | - AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) | ||
2127 | + AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) | ||
2128 | fi | ||
2129 | if test "x$AMD64_ABI" = "xyes" ; then | ||
2130 | HAVE_CPU_X86_64=yes | ||
2131 | - AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) | ||
2132 | + AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) | ||
2133 | fi | ||
2134 | ;; | ||
2135 | *) | ||
2136 | HAVE_CPU_I386=yes | ||
2137 | - AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) | ||
2138 | + AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) | ||
2139 | |||
2140 | dnl FIXME could use some better detection | ||
2141 | dnl (ie CPUID) | ||
2142 | - case "x${host_cpu}" in | ||
2143 | + case "x${target_cpu}" in | ||
2144 | xi386 | xi486) ;; | ||
2145 | *) | ||
2146 | AC_DEFINE(HAVE_RDTSC, 1, [Define if RDTSC is available]) ;; | ||
2147 | @@ -40,43 +38,43 @@ AC_DEFUN([AG_GST_ARCH], | ||
2148 | ;; | ||
2149 | xpowerpc) | ||
2150 | HAVE_CPU_PPC=yes | ||
2151 | - AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the host CPU is a PowerPC]) ;; | ||
2152 | + AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PowerPC]) ;; | ||
2153 | xpowerpc64) | ||
2154 | HAVE_CPU_PPC64=yes | ||
2155 | - AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the host CPU is a 64 bit PowerPC]) ;; | ||
2156 | + AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the target CPU is a 64 bit PowerPC]) ;; | ||
2157 | xalpha*) | ||
2158 | HAVE_CPU_ALPHA=yes | ||
2159 | - AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the host CPU is an Alpha]) ;; | ||
2160 | + AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;; | ||
2161 | xarm*) | ||
2162 | HAVE_CPU_ARM=yes | ||
2163 | - AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the host CPU is an ARM]) ;; | ||
2164 | + AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;; | ||
2165 | xsparc*) | ||
2166 | HAVE_CPU_SPARC=yes | ||
2167 | - AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the host CPU is a SPARC]) ;; | ||
2168 | + AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a SPARC]) ;; | ||
2169 | xmips*) | ||
2170 | HAVE_CPU_MIPS=yes | ||
2171 | - AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the host CPU is a MIPS]) ;; | ||
2172 | + AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the target CPU is a MIPS]) ;; | ||
2173 | xhppa*) | ||
2174 | HAVE_CPU_HPPA=yes | ||
2175 | - AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the host CPU is a HPPA]) ;; | ||
2176 | + AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the target CPU is a HPPA]) ;; | ||
2177 | xs390*) | ||
2178 | HAVE_CPU_S390=yes | ||
2179 | - AC_DEFINE(HAVE_CPU_S390, 1, [Define if the host CPU is a S390]) ;; | ||
2180 | + AC_DEFINE(HAVE_CPU_S390, 1, [Define if the target CPU is a S390]) ;; | ||
2181 | xia64*) | ||
2182 | HAVE_CPU_IA64=yes | ||
2183 | - AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the host CPU is a IA64]) ;; | ||
2184 | + AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the target CPU is a IA64]) ;; | ||
2185 | xm68k*) | ||
2186 | HAVE_CPU_M68K=yes | ||
2187 | - AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the host CPU is a M68K]) ;; | ||
2188 | + AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the target CPU is a M68K]) ;; | ||
2189 | xx86_64) | ||
2190 | HAVE_CPU_X86_64=yes | ||
2191 | - AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) ;; | ||
2192 | + AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) ;; | ||
2193 | xcris) | ||
2194 | HAVE_CPU_CRIS=yes | ||
2195 | - AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the host CPU is a CRIS]) ;; | ||
2196 | + AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the target CPU is a CRIS]) ;; | ||
2197 | xcrisv32) | ||
2198 | HAVE_CPU_CRISV32=yes | ||
2199 | - AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the host CPU is a CRISv32]) ;; | ||
2200 | + AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the target CPU is a CRISv32]) ;; | ||
2201 | esac | ||
2202 | |||
2203 | dnl Determine endianness | ||
2204 | @@ -98,6 +96,7 @@ AC_DEFUN([AG_GST_ARCH], | ||
2205 | AM_CONDITIONAL(HAVE_CPU_CRISV32, test "x$HAVE_CPU_CRISV32" = "xyes") | ||
2206 | |||
2207 | AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu", [the host CPU]) | ||
2208 | + AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu", [the target CPU]) | ||
2209 | ]) | ||
2210 | |||
2211 | dnl check if unaligned memory access works correctly | ||
2212 | diff --git a/common/m4/gst-args.m4 b/common/m4/gst-args.m4 | ||
2213 | index 030e7ac..e011ed4 100644 | ||
2214 | --- a/common/m4/gst-args.m4 | ||
2215 | +++ b/common/m4/gst-args.m4 | ||
2216 | @@ -19,6 +19,7 @@ dnl AG_GST_ARG_ENABLE_EXTERNAL | ||
2217 | dnl AG_GST_ARG_ENABLE_EXPERIMENTAL | ||
2218 | dnl AG_GST_ARG_ENABLE_BROKEN | ||
2219 | |||
2220 | +dnl AG_GST_ARG_DISABLE_FATAL_WARNINGS | ||
2221 | AC_DEFUN([AG_GST_ARG_DEBUG], | ||
2222 | [ | ||
2223 | dnl debugging stuff | ||
2224 | @@ -110,13 +111,13 @@ AC_DEFUN([AG_GST_ARG_GCOV], | ||
2225 | dnl if gcov is used, we do not want default -O2 CFLAGS | ||
2226 | if test "x$GST_GCOV_ENABLED" = "xyes" | ||
2227 | then | ||
2228 | - CFLAGS="-O0" | ||
2229 | + CFLAGS="$CFLAGS -O0" | ||
2230 | AC_SUBST(CFLAGS) | ||
2231 | - CXXFLAGS="-O0" | ||
2232 | + CXXFLAGS="$CXXFLAGS -O0" | ||
2233 | AC_SUBST(CXXFLAGS) | ||
2234 | - FFLAGS="-O0" | ||
2235 | + FFLAGS="$FFLAGS -O0" | ||
2236 | AC_SUBST(FFLAGS) | ||
2237 | - CCASFLAGS="-O0" | ||
2238 | + CCASFLAGS="$CCASFLAGS -O0" | ||
2239 | AC_SUBST(CCASFLAGS) | ||
2240 | AC_MSG_NOTICE([gcov enabled, setting CFLAGS and friends to $CFLAGS]) | ||
2241 | fi | ||
2242 | @@ -325,3 +326,20 @@ AC_DEFUN([AG_GST_ARG_ENABLE_BROKEN], | ||
2243 | AC_MSG_NOTICE([not building broken plug-ins]) | ||
2244 | ]) | ||
2245 | ]) | ||
2246 | + | ||
2247 | +dnl allow people (or build tools) to override default behaviour | ||
2248 | +dnl for fatal compiler warnings | ||
2249 | +AC_DEFUN([AG_GST_ARG_DISABLE_FATAL_WARNINGS], | ||
2250 | +[ | ||
2251 | + AC_ARG_ENABLE(fatal-warnings, | ||
2252 | + AC_HELP_STRING([--disable-fatal-warnings], | ||
2253 | + [Don't turn compiler warnings into fatal errors]), | ||
2254 | + [ | ||
2255 | + case "${enableval}" in | ||
2256 | + yes) FATAL_WARNINGS=yes ;; | ||
2257 | + no) FATAL_WARNINGS=no ;; | ||
2258 | + *) AC_MSG_ERROR(bad value ${enableval} for --disable-fatal-warnings) ;; | ||
2259 | + esac | ||
2260 | + ], | ||
2261 | + [FATAL_WARNINGS=$GST_GIT]) dnl Default value | ||
2262 | +]) | ||
2263 | diff --git a/common/m4/gst-check.m4 b/common/m4/gst-check.m4 | ||
2264 | index 3fd3acf..f3f39b4 100644 | ||
2265 | --- a/common/m4/gst-check.m4 | ||
2266 | +++ b/common/m4/gst-check.m4 | ||
2267 | @@ -117,6 +117,38 @@ AC_DEFUN([AG_GST_CHECK_GST_CHECK], | ||
2268 | ]) | ||
2269 | |||
2270 | dnl =========================================================================== | ||
2271 | +dnl AG_GST_CHECK_UNINSTALLED_SETUP([ACTION-IF-UNINSTALLED], [ACTION-IF-NOT]) | ||
2272 | +dnl | ||
2273 | +dnl ACTION-IF-UNINSTALLED (optional) extra actions to perform if the setup | ||
2274 | +dnl is an uninstalled setup | ||
2275 | +dnl ACTION-IF-NOT (optional) extra actions to perform if the setup | ||
2276 | +dnl is not an uninstalled setup | ||
2277 | +dnl =========================================================================== | ||
2278 | +AC_DEFUN([AG_GST_CHECK_UNINSTALLED_SETUP], | ||
2279 | +[ | ||
2280 | + AC_MSG_CHECKING([whether this is an uninstalled GStreamer setup]) | ||
2281 | + AC_CACHE_VAL(gst_cv_is_uninstalled_setup,[ | ||
2282 | + gst_cv_is_uninstalled_setup=no | ||
2283 | + if (set -u; : $GST_PLUGIN_SYSTEM_PATH) 2>/dev/null ; then | ||
2284 | + if test -z "$GST_PLUGIN_SYSTEM_PATH" \ | ||
2285 | + -a -n "$GST_PLUGIN_SCANNER" \ | ||
2286 | + -a -n "$GST_PLUGIN_PATH" \ | ||
2287 | + -a -n "$GST_REGISTRY" \ | ||
2288 | + -a -n "$DYLD_LIBRARY_PATH" \ | ||
2289 | + -a -n "$LD_LIBRARY_PATH"; then | ||
2290 | + gst_cv_is_uninstalled_setup=yes; | ||
2291 | + fi | ||
2292 | + fi | ||
2293 | + ]) | ||
2294 | + AC_MSG_RESULT($gst_cv_is_uninstalled_setup) | ||
2295 | + if test "x$gst_cv_is_uninstalled_setup" = "xyes"; then | ||
2296 | + ifelse([$1], , :, [$1]) | ||
2297 | + else | ||
2298 | + ifelse([$2], , :, [$2]) | ||
2299 | + fi | ||
2300 | +]) | ||
2301 | + | ||
2302 | +dnl =========================================================================== | ||
2303 | dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-MAJORMINOR], [MIN-VERSION], [REQUIRED]) | ||
2304 | dnl | ||
2305 | dnl Sets GST_PLUGINS_BASE_CFLAGS and GST_PLUGINS_BASE_LIBS. | ||
2306 | diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4 | ||
2307 | index f8f2364..e12a04c 100644 | ||
2308 | --- a/common/m4/gst-error.m4 | ||
2309 | +++ b/common/m4/gst-error.m4 | ||
2310 | @@ -196,6 +196,91 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS], | ||
2311 | AC_MSG_NOTICE([set ERROR_CXXFLAGS to $ERROR_CXXFLAGS]) | ||
2312 | ]) | ||
2313 | |||
2314 | +dnl Sets WARNING_OBJCFLAGS and ERROR_OBJCFLAGS to something the compiler | ||
2315 | +dnl will accept and AC_SUBST them so they are available in Makefile | ||
2316 | +dnl | ||
2317 | +dnl WARNING_OBJCFLAGS will contain flags to make the compiler emit more | ||
2318 | +dnl warnings. | ||
2319 | +dnl ERROR_OBJCFLAGS will contain flags to make those warnings fatal, | ||
2320 | +dnl unless ADD-WERROR is set to "no" | ||
2321 | +dnl | ||
2322 | +dnl If MORE_FLAGS is set, tries to add each of the given flags | ||
2323 | +dnl to WARNING_CFLAGS if the compiler supports them. Each flag is | ||
2324 | +dnl tested separately. | ||
2325 | +dnl | ||
2326 | +dnl These flags can be overridden at make time: | ||
2327 | +dnl make ERROR_OBJCFLAGS= | ||
2328 | +AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS], | ||
2329 | +[ | ||
2330 | + AC_REQUIRE([AC_PROG_OBJC]) | ||
2331 | + AC_REQUIRE([AS_OBJC_COMPILER_FLAG]) | ||
2332 | + | ||
2333 | + ERROR_OBJCFLAGS="" | ||
2334 | + WARNING_OBJCFLAGS="" | ||
2335 | + | ||
2336 | + dnl if we support -Wall, set it unconditionally | ||
2337 | + AS_OBJC_COMPILER_FLAG(-Wall, WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall") | ||
2338 | + | ||
2339 | + dnl if asked for, add -Werror if supported | ||
2340 | + if test "x$1" != "xno" | ||
2341 | + then | ||
2342 | + AS_OBJC_COMPILER_FLAG(-Werror, ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror") | ||
2343 | + | ||
2344 | + if test "x$ERROR_OBJCFLAGS" != "x" | ||
2345 | + then | ||
2346 | + dnl Add -fno-strict-aliasing for GLib versions before 2.19.8 | ||
2347 | + dnl as before G_LOCK and friends caused strict aliasing compiler | ||
2348 | + dnl warnings. | ||
2349 | + PKG_CHECK_EXISTS([glib-2.0 < 2.19.8], [ | ||
2350 | + AS_OBJC_COMPILER_FLAG([-fno-strict-aliasing], | ||
2351 | + ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing") | ||
2352 | + ]) | ||
2353 | + else | ||
2354 | + dnl if -Werror isn't suported, try -errwarn=%all | ||
2355 | + AS_OBJC_COMPILER_FLAG([-errwarn=%all], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all") | ||
2356 | + if test "x$ERROR_OBJCFLAGS" != "x"; then | ||
2357 | + dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, | ||
2358 | + dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, | ||
2359 | + dnl no%E_MACRO_REDEFINED (Sun Forte case) | ||
2360 | + dnl For Forte we need disable "empty declaration" warning produced by un-needed semicolon | ||
2361 | + dnl "statement not reached" disabled because there is g_assert_not_reached () in some places | ||
2362 | + dnl "macro redefined" because of gst/gettext.h | ||
2363 | + dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? | ||
2364 | + dnl FIXME: do any of these work with the c++ compiler? if not, why | ||
2365 | + dnl do we check at all? | ||
2366 | + for f in 'no%E_EMPTY_DECLARATION' \ | ||
2367 | + 'no%E_STATEMENT_NOT_REACHED' \ | ||
2368 | + 'no%E_ARGUEMENT_MISMATCH' \ | ||
2369 | + 'no%E_MACRO_REDEFINED' \ | ||
2370 | + 'no%E_LOOP_NOT_ENTERED_AT_TOP' | ||
2371 | + do | ||
2372 | + AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f") | ||
2373 | + done | ||
2374 | + fi | ||
2375 | + fi | ||
2376 | + fi | ||
2377 | + | ||
2378 | + if test "x$2" != "x" | ||
2379 | + then | ||
2380 | + UNSUPPORTED="" | ||
2381 | + list="$2" | ||
2382 | + for each in $list | ||
2383 | + do | ||
2384 | + AS_OBJC_COMPILER_FLAG($each, | ||
2385 | + WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each", | ||
2386 | + UNSUPPORTED="$UNSUPPORTED $each") | ||
2387 | + done | ||
2388 | + if test "X$UNSUPPORTED" != X ; then | ||
2389 | + AC_MSG_NOTICE([unsupported compiler flags: $UNSUPPORTED]) | ||
2390 | + fi | ||
2391 | + fi | ||
2392 | + | ||
2393 | + AC_SUBST(WARNING_OBJCFLAGS) | ||
2394 | + AC_SUBST(ERROR_OBJCFLAGS) | ||
2395 | + AC_MSG_NOTICE([set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS]) | ||
2396 | + AC_MSG_NOTICE([set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS]) | ||
2397 | +]) | ||
2398 | + | ||
2399 | dnl Sets the default error level for debugging messages | ||
2400 | AC_DEFUN([AG_GST_SET_LEVEL_DEFAULT], | ||
2401 | [ | ||
2402 | diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4 | ||
2403 | index c072c79..cff7f30 100644 | ||
2404 | --- a/common/m4/gst-feature.m4 | ||
2405 | +++ b/common/m4/gst-feature.m4 | ||
2406 | @@ -232,10 +232,11 @@ AC_DEFUN([AG_GST_CHECK_GST_DEBUG_DISABLED], | ||
2407 | save_CFLAGS="$CFLAGS" | ||
2408 | CFLAGS="$GST_CFLAGS $CFLAGS" | ||
2409 | AC_COMPILE_IFELSE([ | ||
2410 | + AC_LANG_SOURCE([[ | ||
2411 | #include <gst/gstconfig.h> | ||
2412 | #ifdef GST_DISABLE_GST_DEBUG | ||
2413 | #error "debugging disabled, make compiler fail" | ||
2414 | - #endif], [ debug_system_enabled=yes], [debug_system_enabled=no]) | ||
2415 | + #endif]])], [ debug_system_enabled=yes], [debug_system_enabled=no]) | ||
2416 | CFLAGS="$save_CFLAGS" | ||
2417 | AC_LANG_POP([C]) | ||
2418 | |||
2419 | diff --git a/common/m4/gst.m4 b/common/m4/gst.m4 | ||
2420 | index ddfde51..d4c53cb 100644 | ||
2421 | --- a/common/m4/gst.m4 | ||
2422 | +++ b/common/m4/gst.m4 | ||
2423 | @@ -3,10 +3,15 @@ dnl sets up use of GStreamer configure.ac macros | ||
2424 | dnl all GStreamer autoconf macros are prefixed | ||
2425 | dnl with AG_GST_ for public macros | ||
2426 | dnl with _AG_GST_ for private macros | ||
2427 | +dnl | ||
2428 | +dnl We call AC_CANONICAL_TARGET and AC_CANONICAL_HOST so that | ||
2429 | +dnl it is valid before AC_ARG_PROGRAM is called | ||
2430 | |||
2431 | AC_DEFUN([AG_GST_INIT], | ||
2432 | [ | ||
2433 | m4_pattern_forbid(^_?AG_GST_) | ||
2434 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables | ||
2435 | + AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables | ||
2436 | ]) | ||
2437 | |||
2438 | dnl AG_GST_PKG_CONFIG_PATH | ||
diff --git a/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend b/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend index 912e040..3cf5991 100644 --- a/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend +++ b/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend | |||
@@ -1,10 +1,10 @@ | |||
1 | # gst-plugins-gl for imx6 Vivante | 1 | # gst-plugins-gl for imx6 Vivante |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
4 | PRINC := "${@int(PRINC) + 3}" | 4 | PRINC := "${@int(PRINC) + 4}" |
5 | 5 | ||
6 | DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" | 6 | DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" |
7 | 7 | ||
8 | SRC_URI_append_mx6 = " file://0001-freescale-mx6-release-1.1.0.patch" | 8 | SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch" |
9 | 9 | ||
10 | CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS" | 10 | CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS" |