From: Rogerio Nunes Date: Tue, 9 Jul 2013 23:29:48 +0000 (+0000) Subject: gst-plugins-gl: Upgrade to IMX_MMCODEC_3.0.35_4.0.0 X-Git-Tag: 2.1~1320 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3d9f4a0c6f033ab116d0462bc216bb5034e1d94e;p=meta-freescale.git gst-plugins-gl: Upgrade to IMX_MMCODEC_3.0.35_4.0.0 Change-Id: I95602c3e0d8036df29c7be089f36011801cde40f Signed-off-by: Rogerio Nunes --- diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch deleted file mode 100644 index dec7bfee..00000000 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch +++ /dev/null @@ -1,28588 +0,0 @@ -From cd4d8e46207f5151357030f3e785b1e58c968a9b Mon Sep 17 00:00:00 2001 -From: Jeremy Stashluk -Date: Fri, 25 Jan 2013 09:46:07 -0500 -Subject: freescale mx6 release 1.1.0 - -Updates to the Yocto/Poky package based on GStreamer release 0.10.3 to -match the Freescale BSP version 1.1.0 archive for i.MX6. - -Some generated files present in the Freescale release have been -purposely left out. - -Upstream-Status: Pending - -Signed-off-by: Jeremy Stashluk ---- - BUGS | 3 + - CMakeLists.txt | 113 ++ - GNUmakefile.gnustep | 37 + - Makefile.in | 89 +- - aclocal.m4 | 109 +- - autoregen.sh | 2 + - cmake/modules/FindATK.cmake | 11 + - cmake/modules/FindCairo.cmake | 11 + - cmake/modules/FindGTK2.cmake.off | 44 + - cmake/modules/FindGlew.cmake | 17 + - cmake/modules/FindGlib2.cmake | 43 + - cmake/modules/FindGstreamer.cmake | 130 ++ - cmake/modules/FindLibIconv.cmake | 11 + - cmake/modules/FindLibXml2.cmake.off | 11 + - cmake/modules/FindLibpng.cmake.off | 17 + - cmake/modules/FindOpenGL.cmake.off | 30 + - cmake/modules/FindZlib.cmake.off | 17 + - common/Makefile.in | 41 +- - common/check.mak | 9 +- - common/gen-changelog.py | 99 + - common/gst-glib-gen.mak | 45 + - common/gtk-doc-plugins.mak | 5 +- - common/hooks/post-receive.hook | 290 +++ - common/hooks/pre-commit.hook | 77 + - common/hooks/pre-receive.hook | 95 + - common/m4/Makefile.am | 1 - - common/m4/Makefile.in | 42 +- - common/m4/as-compiler-flag.m4 | 32 + - common/m4/gst-arch.m4 | 41 +- - common/m4/gst-args.m4 | 26 +- - common/m4/gst-check.m4 | 32 + - common/m4/gst-error.m4 | 85 + - common/m4/gst-feature.m4 | 3 +- - common/m4/gst.m4 | 5 + - common/update-common | 82 + - compile | 195 +- - config.guess | 49 +- - config.h.in | 37 +- - config.sub | 65 +- - configure | 2097 +++++++++++++------- - configure.ac | 86 +- - depcomp | 74 +- - docs/DEBUGGING | 73 + - docs/Makefile.in | 41 +- - docs/libs/Makefile.am | 2 +- - docs/libs/Makefile.in | 44 +- - docs/plugins/Makefile.in | 47 +- - docs/plugins/inspect/plugin-libvisual-gl.xml | 4 +- - docs/plugins/inspect/plugin-opengl.xml | 4 +- - ext/CMakeLists.txt | 1 + - ext/Makefile.in | 41 +- - ext/libvisual/CMakeLists.txt | 15 + - ext/libvisual/Makefile.in | 81 +- - gst-libs/CMakeLists.txt | 1 + - gst-libs/Makefile.in | 41 +- - gst-libs/gst/CMakeLists.txt | 1 + - gst-libs/gst/Makefile.in | 41 +- - gst-libs/gst/gl/CMakeLists.txt | 86 + - gst-libs/gst/gl/GNUmakefile.gnustep | 27 + - gst-libs/gst/gl/Makefile.am | 14 + - gst-libs/gst/gl/Makefile.in | 210 +- - gst-libs/gst/gl/gstgldisplay.c | 96 +- - gst-libs/gst/gl/gstgldisplay.h | 5 + - gst-libs/gst/gl/gstglshader.h | 4 + - gst-libs/gst/gl/gstglshadervariables.c | 4 + - gst-libs/gst/gl/gstglvivante.c | 218 ++ - gst-libs/gst/gl/gstglvivante.h | 41 + - gst-libs/gst/gl/gstglwindow.h | 4 + - gst-libs/gst/gl/gstglwindow_fbES2.c | 709 +++++++ - gst-libs/gst/gl/gstglwindow_x11ES2.c | 12 +- - gst/CMakeLists.txt | 1 + - gst/Makefile.in | 41 +- - gst/gl/BUGS | 3 + - gst/gl/CMakeLists.txt | 72 + - gst/gl/GNUmakefile.gnustep | 45 + - gst/gl/Makefile.in | 256 ++- - gst/gl/effects/GNUmakefile.gnustep | 38 + - gst/gl/gstglbumper.c | 3 +- - gst/gl/gstglimagesink.c | 98 +- - gst/gl/gstglimagesink.h | 2 + - gst/gl/gstglupload.c | 22 +- - install-sh | 29 +- - ltmain.sh | 95 +- - m4/Makefile.in | 41 +- - m4/codeset.m4 | 21 + - m4/glibc2.m4 | 30 + - m4/glibc21.m4 | 30 + - m4/intdiv0.m4 | 84 + - m4/intl.m4 | 285 +++ - m4/intldir.m4 | 19 + - m4/intmax.m4 | 33 + - m4/inttypes-pri.m4 | 36 + - m4/inttypes_h.m4 | 26 + - m4/lcmessage.m4 | 30 + - m4/libtool.m4 | 264 +-- - m4/lock.m4 | 316 +++ - m4/longlong.m4 | 109 + - m4/ltoptions.m4 | 19 +- - m4/ltversion.m4 | 10 +- - m4/printf-posix.m4 | 44 + - m4/size_max.m4 | 68 + - m4/stdint_h.m4 | 26 + - m4/uintmax_t.m4 | 30 + - m4/visibility.m4 | 52 + - m4/wchar_t.m4 | 20 + - m4/wint_t.m4 | 28 + - m4/xsize.m4 | 13 + - missing | 53 +- - pkgconfig/Makefile.in | 51 +- - po/Makefile.in.in.orig | 429 ++++ - po/Makevars.template | 41 + - po/gst-plugins-gl-0.10.pot | 21 - - stamp-h.in | 1 + - tests/Makefile.in | 41 +- - tests/check/Makefile.in | 115 +- - tests/examples/Makefile.in | 41 +- - tests/examples/clutter/Makefile.in | 104 +- - tests/examples/clutter/cluttershare.cbp | 77 + - tests/examples/cocoa/Makefile.in | 41 +- - .../cocoa/videoxoverlay/GNUmakefile.gnustep | 35 + - tests/examples/cocoa/videoxoverlay/Makefile.am | 2 +- - tests/examples/cocoa/videoxoverlay/Makefile.in | 82 +- - tests/examples/generic/Makefile.in | 41 +- - tests/examples/generic/cube/Makefile.in | 80 +- - tests/examples/generic/cube/cube.vcproj | 202 ++ - tests/examples/generic/cubeyuv/Makefile.in | 80 +- - tests/examples/generic/cubeyuv/cubeyuv.vcproj | 202 ++ - tests/examples/generic/doublecube/Makefile.in | 80 +- - .../examples/generic/doublecube/doublecube.vcproj | 202 ++ - tests/examples/generic/generic.sln | 38 + - tests/examples/generic/recordgraphic/Makefile | 47 + - tests/examples/generic/recordgraphic/main.cpp | 280 +++ - .../generic/recordgraphic/recordgraphic.vcproj | 202 ++ - tests/examples/gtk/Makefile.in | 75 +- - tests/examples/gtk/filternoxoverlay/Makefile.in | 80 +- - .../gtk/filternoxoverlay/filternoxoverlay.vcproj | 202 ++ - tests/examples/gtk/filterxoverlay/Makefile.in | 80 +- - .../gtk/filterxoverlay/filterxoverlay.vcproj | 210 ++ - tests/examples/gtk/fxtest/Makefile.in | 92 +- - tests/examples/gtk/fxtest/fxtest.vcproj | 210 ++ - tests/examples/gtk/gtk.sln | 50 + - tests/examples/gtk/gtkxoverlay/Makefile.in | 80 +- - tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj | 210 ++ - tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj | 210 ++ - tests/examples/gtk/switchxoverlay/Makefile.in | 80 +- - .../gtk/switchxoverlay/switchxoverlay.vcproj | 210 ++ - tests/examples/qt/Makefile.in | 41 +- - tests/examples/qt/mousexoverlay/gstthread.cpp | 67 + - tests/examples/qt/mousexoverlay/gstthread.h | 56 + - tests/examples/qt/mousexoverlay/main.cpp | 39 + - tests/examples/qt/mousexoverlay/mousexoverlay.pri | 10 + - tests/examples/qt/mousexoverlay/mousexoverlay.pro | 56 + - tests/examples/qt/mousexoverlay/mousexoverlay.sln | 26 + - .../examples/qt/mousexoverlay/mousexoverlay.vcproj | 321 +++ - tests/examples/qt/mousexoverlay/pipeline.cpp | 334 ++++ - tests/examples/qt/mousexoverlay/pipeline.h | 72 + - tests/examples/qt/mousexoverlay/qrenderer.cpp | 58 + - tests/examples/qt/mousexoverlay/qrenderer.h | 47 + - tests/examples/qt/qglwidgetxoverlay/gstthread.cpp | 62 + - tests/examples/qt/qglwidgetxoverlay/gstthread.h | 55 + - tests/examples/qt/qglwidgetxoverlay/main.cpp | 39 + - tests/examples/qt/qglwidgetxoverlay/pipeline.cpp | 332 ++++ - tests/examples/qt/qglwidgetxoverlay/pipeline.h | 70 + - .../examples/qt/qglwidgetxoverlay/qglrenderer.cpp | 52 + - tests/examples/qt/qglwidgetxoverlay/qglrenderer.h | 45 + - .../qt/qglwidgetxoverlay/qglwidgetxoverlay.pri | 10 + - .../qt/qglwidgetxoverlay/qglwidgetxoverlay.pro | 57 + - .../qt/qglwidgetxoverlay/qglwidgetxoverlay.sln | 26 + - .../qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj | 320 +++ - tests/examples/qt/qglwtextureshare/AsyncQueue.h | 77 + - .../examples/qt/qglwtextureshare/GstGLBufferDef.h | 40 + - tests/examples/qt/qglwtextureshare/README | 29 + - tests/examples/qt/qglwtextureshare/cocoa_utils.mm | 26 + - tests/examples/qt/qglwtextureshare/glcontextid.h | 64 + - tests/examples/qt/qglwtextureshare/gstthread.cpp | 66 + - tests/examples/qt/qglwtextureshare/gstthread.h | 56 + - tests/examples/qt/qglwtextureshare/main.cpp | 36 + - tests/examples/qt/qglwtextureshare/pipeline.cpp | 222 +++ - tests/examples/qt/qglwtextureshare/pipeline.h | 68 + - tests/examples/qt/qglwtextureshare/qglrenderer.cpp | 214 ++ - tests/examples/qt/qglwtextureshare/qglrenderer.h | 59 + - .../qt/qglwtextureshare/qglwtextureshare.pro | 81 + - tests/examples/qt/videoxoverlay/gstthread.cpp | 64 + - tests/examples/qt/videoxoverlay/gstthread.h | 55 + - tests/examples/qt/videoxoverlay/main.cpp | 40 + - tests/examples/qt/videoxoverlay/pipeline.cpp | 271 +++ - tests/examples/qt/videoxoverlay/pipeline.h | 66 + - tests/examples/qt/videoxoverlay/qrenderer.cpp | 57 + - tests/examples/qt/videoxoverlay/qrenderer.h | 48 + - tests/examples/qt/videoxoverlay/videoxoverlay.pri | 10 + - tests/examples/qt/videoxoverlay/videoxoverlay.pro | 53 + - tests/examples/qt/videoxoverlay/videoxoverlay.sln | 26 + - .../examples/qt/videoxoverlay/videoxoverlay.vcproj | 320 +++ - tests/examples/sdl/Makefile.in | 80 +- - tests/examples/sdl/sdl.sln | 20 + - tests/examples/sdl/sdlshare.vcproj | 199 ++ - tests/icles/Makefile.in | 41 +- - tests/pipelines | 79 + - unix/codeblocks/gstopengl/gstopengl.cbp | 236 +++ - unixES/codeblocks/gstopengl.cbp | 137 ++ - win32/codeblock/gstopengl.cbp | 242 +++ - win32/common/config.h | 232 +++ - win32/vs9/libgstopengl.vcproj | 508 +++++ - winCE/common/config.h | 226 +++ - winCE/common/config.h.in | 226 +++ - winCE/vs9/libgstopengl.vcproj | 336 ++++ - 206 files changed, 16992 insertions(+), 2704 deletions(-) - create mode 100644 BUGS - create mode 100644 CMakeLists.txt - create mode 100644 GNUmakefile.gnustep - create mode 100644 autoregen.sh - create mode 100644 cmake/modules/FindATK.cmake - create mode 100644 cmake/modules/FindCairo.cmake - create mode 100644 cmake/modules/FindGTK2.cmake.off - create mode 100644 cmake/modules/FindGlew.cmake - create mode 100644 cmake/modules/FindGlib2.cmake - create mode 100644 cmake/modules/FindGstreamer.cmake - create mode 100644 cmake/modules/FindLibIconv.cmake - create mode 100644 cmake/modules/FindLibXml2.cmake.off - create mode 100644 cmake/modules/FindLibpng.cmake.off - create mode 100644 cmake/modules/FindOpenGL.cmake.off - create mode 100644 cmake/modules/FindZlib.cmake.off - create mode 100644 common/gen-changelog.py - create mode 100644 common/gst-glib-gen.mak - create mode 100644 common/hooks/post-receive.hook - create mode 100644 common/hooks/pre-commit.hook - create mode 100644 common/hooks/pre-receive.hook - create mode 100644 common/update-common - create mode 100644 docs/DEBUGGING - create mode 100644 ext/CMakeLists.txt - create mode 100644 ext/libvisual/CMakeLists.txt - create mode 100644 gst-libs/CMakeLists.txt - create mode 100644 gst-libs/gst/CMakeLists.txt - create mode 100644 gst-libs/gst/gl/CMakeLists.txt - create mode 100644 gst-libs/gst/gl/GNUmakefile.gnustep - create mode 100644 gst-libs/gst/gl/gstglvivante.c - create mode 100644 gst-libs/gst/gl/gstglvivante.h - create mode 100644 gst-libs/gst/gl/gstglwindow_fbES2.c - create mode 100644 gst/CMakeLists.txt - create mode 100644 gst/gl/BUGS - create mode 100644 gst/gl/CMakeLists.txt - create mode 100644 gst/gl/GNUmakefile.gnustep - create mode 100644 gst/gl/effects/GNUmakefile.gnustep - create mode 100644 m4/codeset.m4 - create mode 100644 m4/glibc2.m4 - create mode 100644 m4/glibc21.m4 - create mode 100644 m4/intdiv0.m4 - create mode 100644 m4/intl.m4 - create mode 100644 m4/intldir.m4 - create mode 100644 m4/intmax.m4 - create mode 100644 m4/inttypes-pri.m4 - create mode 100644 m4/inttypes_h.m4 - create mode 100644 m4/lcmessage.m4 - create mode 100644 m4/lock.m4 - create mode 100644 m4/longlong.m4 - create mode 100644 m4/printf-posix.m4 - create mode 100644 m4/size_max.m4 - create mode 100644 m4/stdint_h.m4 - create mode 100644 m4/uintmax_t.m4 - create mode 100644 m4/visibility.m4 - create mode 100644 m4/wchar_t.m4 - create mode 100644 m4/wint_t.m4 - create mode 100644 m4/xsize.m4 - create mode 100644 po/Makefile.in.in.orig - create mode 100644 po/Makevars.template - delete mode 100644 po/gst-plugins-gl-0.10.pot - create mode 100644 stamp-h.in - create mode 100644 tests/examples/clutter/cluttershare.cbp - create mode 100644 tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep - create mode 100644 tests/examples/generic/cube/cube.vcproj - create mode 100644 tests/examples/generic/cubeyuv/cubeyuv.vcproj - create mode 100644 tests/examples/generic/doublecube/doublecube.vcproj - create mode 100644 tests/examples/generic/generic.sln - create mode 100644 tests/examples/generic/recordgraphic/Makefile - create mode 100644 tests/examples/generic/recordgraphic/main.cpp - create mode 100644 tests/examples/generic/recordgraphic/recordgraphic.vcproj - create mode 100644 tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj - create mode 100644 tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj - create mode 100644 tests/examples/gtk/fxtest/fxtest.vcproj - create mode 100644 tests/examples/gtk/gtk.sln - create mode 100644 tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj - create mode 100644 tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj - create mode 100644 tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj - create mode 100644 tests/examples/qt/mousexoverlay/gstthread.cpp - create mode 100644 tests/examples/qt/mousexoverlay/gstthread.h - create mode 100644 tests/examples/qt/mousexoverlay/main.cpp - create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.pri - create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.pro - create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.sln - create mode 100644 tests/examples/qt/mousexoverlay/mousexoverlay.vcproj - create mode 100644 tests/examples/qt/mousexoverlay/pipeline.cpp - create mode 100644 tests/examples/qt/mousexoverlay/pipeline.h - create mode 100644 tests/examples/qt/mousexoverlay/qrenderer.cpp - create mode 100644 tests/examples/qt/mousexoverlay/qrenderer.h - create mode 100644 tests/examples/qt/qglwidgetxoverlay/gstthread.cpp - create mode 100644 tests/examples/qt/qglwidgetxoverlay/gstthread.h - create mode 100644 tests/examples/qt/qglwidgetxoverlay/main.cpp - create mode 100644 tests/examples/qt/qglwidgetxoverlay/pipeline.cpp - create mode 100644 tests/examples/qt/qglwidgetxoverlay/pipeline.h - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglrenderer.h - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln - create mode 100644 tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj - create mode 100644 tests/examples/qt/qglwtextureshare/AsyncQueue.h - create mode 100644 tests/examples/qt/qglwtextureshare/GstGLBufferDef.h - create mode 100644 tests/examples/qt/qglwtextureshare/README - create mode 100644 tests/examples/qt/qglwtextureshare/cocoa_utils.mm - create mode 100644 tests/examples/qt/qglwtextureshare/glcontextid.h - create mode 100644 tests/examples/qt/qglwtextureshare/gstthread.cpp - create mode 100644 tests/examples/qt/qglwtextureshare/gstthread.h - create mode 100644 tests/examples/qt/qglwtextureshare/main.cpp - create mode 100644 tests/examples/qt/qglwtextureshare/pipeline.cpp - create mode 100644 tests/examples/qt/qglwtextureshare/pipeline.h - create mode 100644 tests/examples/qt/qglwtextureshare/qglrenderer.cpp - create mode 100644 tests/examples/qt/qglwtextureshare/qglrenderer.h - create mode 100644 tests/examples/qt/qglwtextureshare/qglwtextureshare.pro - create mode 100644 tests/examples/qt/videoxoverlay/gstthread.cpp - create mode 100644 tests/examples/qt/videoxoverlay/gstthread.h - create mode 100644 tests/examples/qt/videoxoverlay/main.cpp - create mode 100644 tests/examples/qt/videoxoverlay/pipeline.cpp - create mode 100644 tests/examples/qt/videoxoverlay/pipeline.h - create mode 100644 tests/examples/qt/videoxoverlay/qrenderer.cpp - create mode 100644 tests/examples/qt/videoxoverlay/qrenderer.h - create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.pri - create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.pro - create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.sln - create mode 100644 tests/examples/qt/videoxoverlay/videoxoverlay.vcproj - create mode 100644 tests/examples/sdl/sdl.sln - create mode 100644 tests/examples/sdl/sdlshare.vcproj - create mode 100644 tests/pipelines - create mode 100644 unix/codeblocks/gstopengl/gstopengl.cbp - create mode 100644 unixES/codeblocks/gstopengl.cbp - create mode 100644 win32/codeblock/gstopengl.cbp - create mode 100644 win32/common/config.h - create mode 100644 win32/vs9/libgstopengl.vcproj - create mode 100644 winCE/common/config.h - create mode 100644 winCE/common/config.h.in - create mode 100644 winCE/vs9/libgstopengl.vcproj - -diff --git a/BUGS b/BUGS -new file mode 100644 -index 0000000..37d1a26 ---- /dev/null -+++ b/BUGS -@@ -0,0 +1,3 @@ -+-- -+ -+-- -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..e633e59 ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,113 @@ -+cmake_minimum_required(VERSION "2.8.0") -+ -+# TODO: use pkg-config -+# --- -+# INCLUDE(FindPkgConfig) -+# pkg_check_modules(GLIB2 glib-2.0) -+# pkg_check_modules(GSTREAMER gstreamer-0.10) -+# --- -+ -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) -+ -+project (GST-PLUGINS-GL) -+ -+if (WIN32) -+ set(OSSBUILD_SDK_DIR $ENV{OSSBUILD_GSTREAMER_SDK_DIR}) -+ if (OSSBUILD_SDK_DIR) -+ set(OSSBUILD_SDK_INCLUDE_DIR ${OSSBUILD_SDK_DIR}/include) -+ #set(CMAKE_PREFIX_PATH ${OSSBUILD_SDK_DIR}) -+ set(CMAKE_INCLUDE_PATH ${OSSBUILD_SDK_INCLUDE_DIR}) -+ set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/glib-2.0) -+ set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/gstreamer-0.10) -+ set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${OSSBUILD_SDK_INCLUDE_DIR}/libxml2) -+ endif (OSSBUILD_SDK_DIR) -+ set(OSSBUILD_DIR $ENV{OSSBUILD_GSTREAMER_DIR}) -+ if (OSSBUILD_DIR) -+ #set(ENV{GSTREAMER_DIR} ${OSSBUILD_DIR}) -+ set(CMAKE_LIBRARY_PATH ${OSSBUILD_DIR}/bin) -+ set(JPEG_NAMES jpeg-8) -+ #set(FREETYPE_NAMES freetype-6) -+ message(STATUS ${CMAKE_LIBRARY_PATH}) -+ endif (OSSBUILD_DIR) -+endif (WIN32) -+ -+# built-in -+find_package(OpenGL REQUIRED) -+find_package(GTK2 REQUIRED) -+find_package(Glib2 REQUIRED) -+find_package(LibXml2 REQUIRED) -+find_package(JPEG REQUIRED) -+find_package(PNG REQUIRED) -+find_package(ZLIB REQUIRED) -+ -+# home made -+find_package(Glib2 REQUIRED) -+find_package(Gstreamer REQUIRED) -+find_package(Glew REQUIRED) -+find_package(LibIconv REQUIRED) -+find_package(ATK REQUIRED) -+find_package(Cairo REQUIRED) -+ -+function(check_package name LEVEL) -+ if (${name}_FOUND) -+ message(STATUS "Found ${name}... YES") -+ else (${name}_FOUND) -+ message(STATUS "Found ${name}... NO") -+ if (LEVEL) -+ if (WIN32) -+ message(FATAL_ERROR "You should set the env variable ${name}_DIR") -+ else (WIN32) -+ message(FATAL_ERROR "You should install ${name} dev package") -+ endif (WIN32) -+ endif (LEVEL) -+ endif (${name}_FOUND) -+endfunction(check_package) -+ -+# required packages -+check_package(GLIB2 1) -+check_package(GSTREAMER 1) -+check_package(OPENGL 1) -+check_package(GLEW 1) -+check_package(PNG 1) -+if (WIN32) -+check_package(ZLIB 1) -+endif (WIN32) -+ -+# conditionnal required packages -+INCLUDE (CheckIncludeFiles) -+CHECK_INCLUDE_FILES (${GSTREAMER_DIR}/include/gst/gstconfig.h GST_USING_BINARY_REGISTRY) -+if (NOT GST_USING_BINARY_REGISTRY) -+check_package(LIBXML2 1) -+check_package(LIBICONV 1) -+endif (NOT GST_USING_BINARY_REGISTRY) -+ -+# optionnal packages -+check_package(GTK2 0) -+check_package(ATK 0) -+check_package(CAIRO 0) -+ -+# debug -+#message("****" ${GLIB2_INCLUDE_DIR}) -+#message("****" ${GLIB2_LIBRARIES}) -+#message("****" ${LIBXML2_INCLUDE_DIR}) -+#message("****" ${LIBICONV_INCLUDE_DIR}) -+#message("****" ${GSTREAMER_INCLUDE_DIR}) -+#message("****" ${GSTREAMER_LIBRARIES}) -+#message("****" ${OPENGL_INCLUDE_DIR}) -+#message("****" ${OPENGL_LIBRARIES}) -+#message("****" ${GLEW_INCLUDE_DIR}) -+#message("****" ${GLEW_LIBRARY}) -+#message("****" ${PNG_INCLUDE_DIR}) -+#message("****" ${PNG_LIBRARY}) -+#message("****" ${GTK2_INCLUDE_DIR}) -+#message("****" ${GTK2_LIBRARIES}) -+#message("****" ${ATK_INCLUDE_DIR}) -+#message("****" ${CAIRO_INCLUDE_DIR}) -+ -+add_subdirectory (gst-libs) -+add_subdirectory (gst) -+ -+#add_dependencies(gstgl) -+ -+#FIXME: generate config.h -+add_definitions(-DHAVE_CONFIG_H) -diff --git a/GNUmakefile.gnustep b/GNUmakefile.gnustep -new file mode 100644 -index 0000000..2e45c73 ---- /dev/null -+++ b/GNUmakefile.gnustep -@@ -0,0 +1,37 @@ -+export MAKEFILE_NAME = GNUmakefile.gnustep -+ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+LIBRARY_NAME = libgstopengl -+ -+libgstopengl_VERSION = 1.0.0 -+ -+libgstopengl_SUBPROJECTS = gst-libs/gst/gl gst/gl gst/gl/effects -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+ libgstopengl_LIB_DIRS += \ -+ -LC:/gstreamer/bin -+endif -+ -+libgstopengl_TOOL_LIBS = \ -+ -lglib-2.0-0 \ -+ -lgobject-2.0-0 \ -+ -lgmodule-2.0-0 \ -+ -lgthread-2.0-0 \ -+ -lgstreamer-0.10 \ -+ -lgstbase-0.10 \ -+ -lgstvideo-0.10 \ -+ -lgstinterfaces-0.10 \ -+ -lgstcontroller-0.10 \ -+ -lpng \ -+ -lz -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+ libgstopengl_TOOL_LIBS += \ -+ -lglu32 \ -+ -lopengl32 \ -+ -lglew32 \ -+ -lgdi32 -+endif -+ -+include $(GNUSTEP_MAKEFILES)/library.make -diff --git a/Makefile.in b/Makefile.in -index 9a1fefa..14dc690 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -44,6 +44,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/gst-plugins-gl.spec.in \ -@@ -60,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -95,11 +95,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = gst-plugins-gl.spec win32/common/config.h - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -121,11 +121,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ -- if test -d "$(distdir)"; then \ -- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -rf "$(distdir)" \ -- || { sleep 5 && rm -rf "$(distdir)"; }; \ -- else :; fi -+ { test ! -d "$(distdir)" \ -+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr "$(distdir)"; }; } - am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -@@ -154,8 +152,6 @@ am__relativize = \ - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print --am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ -- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = -I m4 -I common/m4 -@@ -203,6 +199,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -234,6 +231,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -241,8 +240,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -315,7 +316,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -360,6 +361,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -425,7 +427,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -488,7 +494,7 @@ all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --am--refresh: Makefile -+am--refresh: - @: - $(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) - @for dep in $?; do \ -@@ -513,7 +519,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; --$(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: - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -@@ -525,8 +530,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - - config.h: stamp-h1 -- @if test ! -f $@; then rm -f stamp-h1; else :; fi -- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi -+ @if test ! -f $@; then \ -+ rm -f stamp-h1; \ -+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ -+ else :; fi - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 -@@ -761,11 +768,7 @@ dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - dist-bzip2: distdir -- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 -- $(am__remove_distdir) -- --dist-lzip: distdir -- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - dist-lzma: distdir -@@ -773,7 +776,7 @@ dist-lzma: distdir - $(am__remove_distdir) - - dist-xz: distdir -- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz -+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - - dist-tarZ: distdir -@@ -791,7 +794,7 @@ dist-zip: distdir - - dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then -@@ -805,8 +808,6 @@ distcheck: dist - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ -- *.tar.lz*) \ -- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ -@@ -827,7 +828,6 @@ distcheck: dist - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -- $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ -@@ -856,16 +856,8 @@ distcheck: dist - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: -- @test -n '$(distuninstallcheck_dir)' || { \ -- echo 'ERROR: trying to run $@ with an empty' \ -- '$$(distuninstallcheck_dir)' >&2; \ -- exit 1; \ -- }; \ -- $(am__cd) '$(distuninstallcheck_dir)' || { \ -- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ -- exit 1; \ -- }; \ -- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ -+ @$(am__cd) '$(distuninstallcheck_dir)' \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ -@@ -896,15 +888,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -@@ -993,8 +980,8 @@ uninstall-am: - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local am--refresh check check-am clean \ - clean-generic clean-libtool ctags ctags-recursive dist \ -- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ -- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ -+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ -+ dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ -diff --git a/aclocal.m4 b/aclocal.m4 -index ed8b8b0..0a6549d 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,8 +1,7 @@ --# generated automatically by aclocal 1.11.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, --# Inc. -+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -20,15 +19,12 @@ You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software --# Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- - # AM_AUTOMAKE_VERSION(VERSION) - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been -@@ -38,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], - [am__api_version='1.11' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11.3], [], -+m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -54,21 +50,19 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11.3])dnl -+[AM_AUTOMAKE_VERSION([1.11.1])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets - # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to - # `$srcdir', `$srcdir/..', or `$srcdir/../..'. -@@ -150,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE( - Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, --# 2010, 2011 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 12 -+# serial 10 - - # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, -@@ -197,7 +191,6 @@ AC_CACHE_CHECK([dependency style of $depcc], - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -- rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -262,7 +255,7 @@ AC_CACHE_CHECK([dependency style of $depcc], - break - fi - ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -327,13 +320,10 @@ AC_DEFUN([AM_DEP_TRACK], - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -- am__nodep='_no' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) - AC_SUBST([AMDEPBACKSLASH])dnl - _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl --AC_SUBST([am__nodep])dnl --_AM_SUBST_NOTMAKE([am__nodep])dnl - ]) - - # Generate code to set up dependency tracking. -*- Autoconf -*- -@@ -567,15 +557,12 @@ for _am_header in $config_headers :; do - done - echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - --# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, --# Inc. -+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- - # AM_PROG_INSTALL_SH - # ------------------ - # Define $install_sh. -@@ -615,8 +602,8 @@ AC_SUBST([am__leading_dot])]) - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- - # From Jim Meyering - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, --# 2011 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -636,7 +623,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) --AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful -@@ -782,15 +769,12 @@ else - fi - ]) - --# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, --# Inc. -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- - # AM_PROG_MKDIR_P - # --------------- - # Check for `mkdir -p'. -@@ -813,14 +797,13 @@ esac - - # Helper functions for option handling. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software --# Foundation, Inc. -+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 5 -+# serial 4 - - # _AM_MANGLE_OPTION(NAME) - # ----------------------- -@@ -828,13 +811,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], - [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - - # _AM_SET_OPTION(NAME) --# -------------------- -+# ------------------------------ - # Set option NAME. Presently that only means defining a flag for this option. - AC_DEFUN([_AM_SET_OPTION], - [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - - # _AM_SET_OPTIONS(OPTIONS) --# ------------------------ -+# ---------------------------------- - # OPTIONS is a space-separated list of Automake options. - AC_DEFUN([_AM_SET_OPTIONS], - [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -@@ -910,13 +893,13 @@ Check your system clock]) - fi - AC_MSG_RESULT(yes)]) - --# Copyright (C) 2009, 2011 Free Software Foundation, Inc. -+# Copyright (C) 2009 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 1 - - # AM_SILENT_RULES([DEFAULT]) - # -------------------------- -@@ -931,50 +914,18 @@ yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; - esac --dnl --dnl A few `make' implementations (e.g., NonStop OS and NextStep) --dnl do not support nested variable expansions. --dnl See automake bug#9928 and bug#10237. --am_make=${MAKE-make} --AC_CACHE_CHECK([whether $am_make supports nested variables], -- [am_cv_make_support_nested_variables], -- [if AS_ECHO([['TRUE=$(BAR$(V)) --BAR0=false --BAR1=true --V=1 --am__doit: -- @$(TRUE) --.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then -- am_cv_make_support_nested_variables=yes --else -- am_cv_make_support_nested_variables=no --fi]) --if test $am_cv_make_support_nested_variables = yes; then -- dnl Using `$V' instead of `$(V)' breaks IRIX make. -- AM_V='$(V)' -- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' --else -- AM_V=$AM_DEFAULT_VERBOSITY -- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY --fi --AC_SUBST([AM_V])dnl --AM_SUBST_NOTMAKE([AM_V])dnl --AC_SUBST([AM_DEFAULT_V])dnl --AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl - AC_SUBST([AM_DEFAULT_VERBOSITY])dnl - AM_BACKSLASH='\' - AC_SUBST([AM_BACKSLASH])dnl - _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl - ]) - --# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- - # AM_PROG_INSTALL_STRIP - # --------------------- - # One issue with vendor `install' (even GNU) is that you can't -@@ -997,13 +948,13 @@ fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. -+# Copyright (C) 2006, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 3 -+# serial 2 - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- -@@ -1012,13 +963,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) - AC_DEFUN([_AM_SUBST_NOTMAKE]) - - # AM_SUBST_NOTMAKE(VARIABLE) --# -------------------------- -+# --------------------------- - # Public sister of _AM_SUBST_NOTMAKE. - AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - - # Check how to create a tarball. -*- Autoconf -*- - --# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -1040,11 +991,10 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - # a tarball read from stdin. - # $(am__untar) < result.tar - AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. Yes, it's still used --# in the wild :-( We should find a proper way to deprecate it ... --AC_SUBST([AMTAR], ['$${TAR-tar}']) -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) - m4_if([$1], [v7], -- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) - AC_MSG_CHECKING([how to create a $1 tar archive]) -@@ -1117,7 +1067,6 @@ m4_include([common/m4/as-ac-expand.m4]) - m4_include([common/m4/as-auto-alt.m4]) - m4_include([common/m4/as-compiler-flag.m4]) - m4_include([common/m4/as-libtool.m4]) --m4_include([common/m4/as-objc.m4]) - m4_include([common/m4/as-python.m4]) - m4_include([common/m4/as-scrub-include.m4]) - m4_include([common/m4/as-version.m4]) -diff --git a/autoregen.sh b/autoregen.sh -new file mode 100644 -index 0000000..c67a299 ---- /dev/null -+++ b/autoregen.sh -@@ -0,0 +1,2 @@ -+#!/bin/sh -+./autogen.sh $@ -diff --git a/cmake/modules/FindATK.cmake b/cmake/modules/FindATK.cmake -new file mode 100644 -index 0000000..762e144 ---- /dev/null -+++ b/cmake/modules/FindATK.cmake -@@ -0,0 +1,11 @@ -+FILE(TO_CMAKE_PATH "$ENV{ATK_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${ATK_DIR}" TRY2_DIR) -+FILE(GLOB ATK_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(ATK_INCLUDE_DIR atk/atk.h -+ PATHS ${ATK_DIR}/include /usr/local/include/atk-1.0 /usr/include/atk-1.0 -+ ENV INCLUDE DOC "Directory containing atk/atk.h include file") -+ -+IF (ATK_INCLUDE_DIR) -+ SET(ATK_FOUND TRUE) -+ENDIF (ATK_INCLUDE_DIR) -diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake -new file mode 100644 -index 0000000..9ad0be4 ---- /dev/null -+++ b/cmake/modules/FindCairo.cmake -@@ -0,0 +1,11 @@ -+FILE(TO_CMAKE_PATH "$ENV{CAIRO_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${CAIRO_DIR}" TRY2_DIR) -+FILE(GLOB CAIRO_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(CAIRO_INCLUDE_DIR cairo.h -+ PATHS ${CAIRO_DIR}/include /usr/local/include/cairo /usr/include/cairo -+ ENV INCLUDE DOC "Directory containing cairo.h include file") -+ -+IF (CAIRO_INCLUDE_DIR) -+ SET(CAIRO_FOUND TRUE) -+ENDIF (CAIRO_INCLUDE_DIR) -diff --git a/cmake/modules/FindGTK2.cmake.off b/cmake/modules/FindGTK2.cmake.off -new file mode 100644 -index 0000000..58e8af4 ---- /dev/null -+++ b/cmake/modules/FindGTK2.cmake.off -@@ -0,0 +1,44 @@ -+FILE(TO_CMAKE_PATH "$ENV{GTK2_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${GTK2_DIR}" TRY2_DIR) -+FILE(GLOB GTK_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(GTK_gtk_2_INCLUDE_DIR gtk/gtk.h -+ PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 -+ ENV INCLUDE DOC "Directory containing gtk/gtk.h include file") -+ -+FIND_PATH(GTK_gdk_2_INCLUDE_DIR gdk/gdk.h -+ PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 -+ ENV INCLUDE DOC "Directory containing gdk/gdk.h include file") -+ -+FIND_PATH(GTK_gdkconfig_2_INCLUDE_DIR gdkconfig.h -+ 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 -+ ENV INCLUDE DOC "Directory containing gdkconfig.h include file") -+ -+FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 -+ PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "gdk_pixbuf library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GTK_gdk_2_LIBRARY NAMES gdk-win32-2.0 gdk-x11-2.0 -+ PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib -+ ENV LIB -+ DOC "gdk2 library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GTK_gtk_2_LIBRARY NAMES gtk-win32-2.0 gtk-x11-2.0 -+ PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib -+ ENV LIB -+ DOC "gtk2 library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+ -+IF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND -+ GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) -+ SET(GTK2_INCLUDE_DIR ${GTK_gtk_2_INCLUDE_DIR} ${GTK_gdk_2_INCLUDE_DIR} ${GTK_gdkconfig_2_INCLUDE_DIR}) -+ list(REMOVE_DUPLICATES GTK2_INCLUDE_DIR) -+ SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_2_LIBRARY} ${GTK_gtk_2_LIBRARY}) -+ list(REMOVE_DUPLICATES GTK2_LIBRARIES) -+ SET(GTK2_FOUND TRUE) -+ENDIF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND -+ GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) -diff --git a/cmake/modules/FindGlew.cmake b/cmake/modules/FindGlew.cmake -new file mode 100644 -index 0000000..463d705 ---- /dev/null -+++ b/cmake/modules/FindGlew.cmake -@@ -0,0 +1,17 @@ -+FILE(TO_CMAKE_PATH "$ENV{GLEW_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${GLEW_DIR}" TRY2_DIR) -+FILE(GLOB GLEW_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h -+ PATHS ${GLEW_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing GL/glew.h include file") -+ -+FIND_LIBRARY(GLEW_LIBRARY NAMES glew32 GLEW glew32s -+ PATHS ${GLEW_DIR}/bin ${GLEW_DIR}/win32/bin ${GLEW_DIR}/lib ${GLEW_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "glew library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) -+ SET(GLEW_FOUND TRUE) -+ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) -diff --git a/cmake/modules/FindGlib2.cmake b/cmake/modules/FindGlib2.cmake -new file mode 100644 -index 0000000..eaad1a8 ---- /dev/null -+++ b/cmake/modules/FindGlib2.cmake -@@ -0,0 +1,43 @@ -+FILE(TO_CMAKE_PATH "$ENV{GLIB2_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${GLIB2_DIR}" TRY2_DIR) -+FILE(GLOB GLIB2_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(GLIB_glib_2_INCLUDE_DIR glib.h -+ 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 -+ ENV INCLUDE DOC "Directory containing glib.h include file") -+ -+FIND_PATH(GLIB_glibconfig_2_INCLUDE_DIR glibconfig.h -+ 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 -+ ENV INCLUDE DOC "Directory containing glibconfig.h include file") -+ -+FIND_LIBRARY(GLIB_glib_2_LIBRARY NAMES glib-2.0 glib-2.0-0 -+ PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib -+ ENV LIB -+ DOC "glib library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GLIB_gmodule_2_LIBRARY NAMES gmodule-2.0 gmodule-2.0-0 -+ PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib -+ ENV LIB -+ DOC "gmodule library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GLIB_gobject_2_LIBRARY NAMES gobject-2.0 gobject-2.0-0 -+ PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib -+ ENV LIB -+ DOC "gobject library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GLIB_gthread_2_LIBRARY NAMES gthread-2.0 gthread-2.0-0 -+ PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib -+ ENV LIB -+ DOC "gthread library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+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) -+ SET(GLIB2_INCLUDE_DIR ${GLIB_glib_2_INCLUDE_DIR} ${GLIB_glibconfig_2_INCLUDE_DIR}) -+ list(REMOVE_DUPLICATES GLIB2_INCLUDE_DIR) -+ SET(GLIB2_LIBRARIES ${GLIB_glib_2_LIBRARY} ${GLIB_gmodule_2_LIBRARY} ${GLIB_gobject_2_LIBRARY} ${GLIB_gthread_2_LIBRARY}) -+ list(REMOVE_DUPLICATES GLIB2_LIBRARIES) -+ SET(GLIB2_FOUND TRUE) -+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) -diff --git a/cmake/modules/FindGstreamer.cmake b/cmake/modules/FindGstreamer.cmake -new file mode 100644 -index 0000000..d60fb68 ---- /dev/null -+++ b/cmake/modules/FindGstreamer.cmake -@@ -0,0 +1,130 @@ -+FILE(TO_CMAKE_PATH "$ENV{GSTREAMER_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${GSTREAMER_DIR}" TRY2_DIR) -+FILE(GLOB GSTREAMER_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(GSTREAMER_gst_INCLUDE_DIR gst/gst.h -+ PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/include/gstreamer-0.10 /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 -+ ENV INCLUDE DOC "Directory containing gst/gst.h include file") -+ -+FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h -+ 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 -+ ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") -+ -+FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-0.10 libgstaudio-0.10 gstaudio -+ 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 -+ ENV LIB -+ DOC "gstaudio library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstbase_LIBRARY NAMES gstbase-0.10 libgstbase-0.10 gstbase -+ 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 -+ ENV LIB -+ DOC "gstbase library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GLIB_gstcdda_LIBRARY NAMES gstcdda-0.10 libgstcdda-0.10 gstcdda -+ 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 -+ ENV LIB -+ DOC "gstcdda library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstcontroller_LIBRARY NAMES gstcontroller-0.10 libgstcontroller-0.10 gstcontroller -+ 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 -+ ENV LIB -+ DOC "gstcontroller library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstdataprotocol_LIBRARY NAMES gstdataprotocol-0.10 libgstdataprotocol-0.10 gstdataprotocol -+ 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 -+ ENV LIB -+ DOC "gstdataprotocol library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstinterfaces_LIBRARY NAMES gstinterfaces-0.10 libgstinterfaces-0.10 gstinterfaces -+ 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 -+ ENV LIB -+ DOC "gstinterfaces library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstnet_LIBRARY NAMES gstnet-0.10 libgstnet-0.10 gstnet -+ 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 -+ ENV LIB -+ DOC "gstnet library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstnetbuffer_LIBRARY NAMES gstnetbuffer-0.10 libgstnetbuffer-0.10 gstnetbuffer -+ 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 -+ ENV LIB -+ DOC "gstnetbuffer library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstpbutils_LIBRARY NAMES gstpbutils-0.10 libgstpbutils-0.10 gstpbutils -+ 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 -+ ENV LIB -+ DOC "gstpbutils library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstreamer_LIBRARY NAMES gstreamer-0.10 libgstreamer-0.10 gstreamer -+ 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 -+ ENV LIB -+ DOC "gstreamer library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstriff_LIBRARY NAMES gstriff-0.10 libgstriff-0.10 gstriff -+ 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 -+ ENV LIB -+ DOC "gstriff library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstrtp_LIBRARY NAMES gstrtp-0.10 libgstrtp-0.10 gstrtp -+ 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 -+ ENV LIB -+ DOC "gstrtp library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstrtsp_LIBRARY NAMES gstrtsp-0.10 libgstrtsp-0.10 gstrtsp -+ 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 -+ ENV LIB -+ DOC "gstrtsp library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstsdp_LIBRARY NAMES gstsdp-0.10 libgstsdp-0.10 -+ 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 -+ ENV LIB -+ DOC "gstsdp library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gsttag_LIBRARY NAMES gsttag-0.10 libgsttag-0.10 gsttag -+ 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 -+ ENV LIB -+ DOC "gsttag library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(GSTREAMER_gstvideo_LIBRARY NAMES gstvideo-0.10 libgstvideo-0.10 gstvideo -+ 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 -+ ENV LIB -+ DOC "gstvideo library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+ -+IF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND -+ GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND -+ GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND -+ GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND -+ GSTREAMER_gstriff_LIBRARY AND GSTREAMER_gstrtp_LIBRARY AND GSTREAMER_gstrtsp_LIBRARY AND GSTREAMER_gstsdp_LIBRARY AND -+ GSTREAMER_gsttag_LIBRARY AND GSTREAMER_gstvideo_LIBRARY) -+ SET(GSTREAMER_INCLUDE_DIR ${GSTREAMER_gst_INCLUDE_DIR} ${GSTREAMER_gstconfig_INCLUDE_DIR}) -+ list(REMOVE_DUPLICATES GSTREAMER_INCLUDE_DIR) -+ SET(GSTREAMER_LIBRARIES ${GSTREAMER_gstaudio_LIBRARY} ${GSTREAMER_gstbase_LIBRARY} -+ ${GSTREAMER_gstcontroller_LIBRARY} ${GSTREAMER_gstdataprotocol_LIBRARY} ${GSTREAMER_gstinterfaces_LIBRARY} -+ ${GSTREAMER_gstnet_LIBRARY} ${GSTREAMER_gstnetbuffer_LIBRARY} ${GSTREAMER_gstpbutils_LIBRARY} -+ ${GSTREAMER_gstreamer_LIBRARY} ${GSTREAMER_gstriff_LIBRARY} ${GSTREAMER_gstrtp_LIBRARY} -+ ${GSTREAMER_gstrtsp_LIBRARY} ${GSTREAMER_gstsdp_LIBRARY} ${GSTREAMER_gsttag_LIBRARY} ${GSTREAMER_gstvideo_LIBRARY}) -+ list(REMOVE_DUPLICATES GSTREAMER_LIBRARIES) -+ SET(GSTREAMER_FOUND TRUE) -+ENDIF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND -+ GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND -+ GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND -+ GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND -+ GSTREAMER_gstriff_LIBRARY AND GSTREAMER_gstrtp_LIBRARY AND GSTREAMER_gstrtsp_LIBRARY AND GSTREAMER_gstsdp_LIBRARY AND -+ GSTREAMER_gsttag_LIBRARY AND GSTREAMER_gstvideo_LIBRARY) -diff --git a/cmake/modules/FindLibIconv.cmake b/cmake/modules/FindLibIconv.cmake -new file mode 100644 -index 0000000..0934202 ---- /dev/null -+++ b/cmake/modules/FindLibIconv.cmake -@@ -0,0 +1,11 @@ -+FILE(TO_CMAKE_PATH "$ENV{LIBICONV_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${LIBICONV_DIR}" TRY2_DIR) -+FILE(GLOB LIBICONV_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(LIBICONV_INCLUDE_DIR iconv.h -+ PATHS ${LIBICONV_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing iconv.h include file") -+ -+IF (LIBICONV_INCLUDE_DIR) -+ SET(LIBICONV_FOUND TRUE) -+ENDIF (LIBICONV_INCLUDE_DIR) -diff --git a/cmake/modules/FindLibXml2.cmake.off b/cmake/modules/FindLibXml2.cmake.off -new file mode 100644 -index 0000000..399f5a2 ---- /dev/null -+++ b/cmake/modules/FindLibXml2.cmake.off -@@ -0,0 +1,11 @@ -+FILE(TO_CMAKE_PATH "$ENV{LIBXML2_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${LIBXML2_DIR}" TRY2_DIR) -+FILE(GLOB LIBXML2_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(LIBXML2_INCLUDE_DIR libxml/parser.h -+ PATHS ${LIBXML2_DIR}/include ${LIBXML2_DIR}/include/libxml2 /usr/local/include/libxml2 /usr/include/libxml2 -+ ENV INCLUDE DOC "Directory containing libxml/parser.h include file") -+ -+IF (LIBXML2_INCLUDE_DIR) -+ SET(LIBXML2_FOUND TRUE) -+ENDIF (LIBXML2_INCLUDE_DIR) -diff --git a/cmake/modules/FindLibpng.cmake.off b/cmake/modules/FindLibpng.cmake.off -new file mode 100644 -index 0000000..648db97 ---- /dev/null -+++ b/cmake/modules/FindLibpng.cmake.off -@@ -0,0 +1,17 @@ -+FILE(TO_CMAKE_PATH "$ENV{PNG_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${PNG_DIR}" TRY2_DIR) -+FILE(GLOB PNG_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(PNG_INCLUDE_DIR png.h -+ PATHS ${PNG_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing png.h include file") -+ -+FIND_LIBRARY(PNG_LIBRARY NAMES png12 png -+ PATHS ${PNG_DIR}/bin ${PNG_DIR}/win32/bin ${PNG_DIR}/lib ${PNG_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "png library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+IF (PNG_INCLUDE_DIR AND PNG_LIBRARY) -+ SET(PNG_FOUND TRUE) -+ENDIF (PNG_INCLUDE_DIR AND PNG_LIBRARY) -diff --git a/cmake/modules/FindOpenGL.cmake.off b/cmake/modules/FindOpenGL.cmake.off -new file mode 100644 -index 0000000..3dc7dd2 ---- /dev/null -+++ b/cmake/modules/FindOpenGL.cmake.off -@@ -0,0 +1,30 @@ -+FILE(TO_CMAKE_PATH "$ENV{OPENGL_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${OPENGL_DIR}" TRY2_DIR) -+FILE(GLOB OPENGL_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(OPENGL_gl_INCLUDE_DIR GL/gl.h -+ PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing GL/gl.h include file") -+ -+FIND_PATH(OPENGL_glu_INCLUDE_DIR GL/glu.h -+ PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing GL/glu.h include file") -+ -+FIND_LIBRARY(OPENGL_gl_LIBRARY NAMES opengl32 GL -+ PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "gl library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+FIND_LIBRARY(OPENGL_glu_LIBRARY NAMES glu32 GLU -+ PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "glu library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+IF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) -+ SET(OPENGL_INCLUDE_DIR ${OPENGL_gl_INCLUDE_DIR} ${OPENGL_glu_INCLUDE_DIR}) -+ list(REMOVE_DUPLICATES OPENGL_INCLUDE_DIR) -+ SET(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) -+ list(REMOVE_DUPLICATES OPENGL_LIBRARIES) -+ENDIF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) -diff --git a/cmake/modules/FindZlib.cmake.off b/cmake/modules/FindZlib.cmake.off -new file mode 100644 -index 0000000..e604b44 ---- /dev/null -+++ b/cmake/modules/FindZlib.cmake.off -@@ -0,0 +1,17 @@ -+FILE(TO_CMAKE_PATH "$ENV{ZLIB_DIR}" TRY1_DIR) -+FILE(TO_CMAKE_PATH "${ZLIB_DIR}" TRY2_DIR) -+FILE(GLOB ZLIB_DIR ${TRY1_DIR} ${TRY2_DIR}) -+ -+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h -+ PATHS ${ZLIB_DIR}/include /usr/local/include /usr/include -+ ENV INCLUDE DOC "Directory containing zlib.h include file") -+ -+FIND_LIBRARY(ZLIB_LIBRARY NAMES z -+ PATHS ${ZLIB_DIR}/bin ${ZLIB_DIR}/win32/bin ${ZLIB_DIR}/lib ${ZLIB_DIR}/win32/lib /usr/local/lib /usr/lib -+ ENV LIB -+ DOC "zlib library to link with" -+ NO_SYSTEM_ENVIRONMENT_PATH) -+ -+IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) -+ SET(ZLIB_FOUND TRUE) -+ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) -diff --git a/common/Makefile.in b/common/Makefile.in -index 2142d0f..b4544c2 100644 ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = common - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -280,7 +285,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -390,7 +396,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -664,15 +674,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/common/check.mak b/common/check.mak -index 30487f1..bc44620 100644 ---- a/common/check.mak -+++ b/common/check.mak -@@ -24,6 +24,12 @@ LOOPS = 10 - CK_DEFAULT_TIMEOUT=20 \ - $* - -+# just like 'check', but don't run it again if it fails (useful for debugging) -+%.check-norepeat: % -+ @$(TESTS_ENVIRONMENT) \ -+ CK_DEFAULT_TIMEOUT=20 \ -+ $* -+ - # run any given test in a loop - %.torture: % - @for i in `seq 1 $(LOOPS)`; do \ -@@ -152,7 +158,8 @@ help: - @echo - @echo "make check -- run all checks" - @echo "make torture -- run all checks $(LOOPS) times" -- @echo "make (dir)/(test).check -- run the given check once" -+ @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" -+ @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" - @echo "make (dir)/(test).forever -- run the given check forever" - @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" - @echo -diff --git a/common/gen-changelog.py b/common/gen-changelog.py -new file mode 100644 -index 0000000..c79e7d3 ---- /dev/null -+++ b/common/gen-changelog.py -@@ -0,0 +1,99 @@ -+#!/usr/bin/env python -+ -+import sys -+import subprocess -+import re -+ -+# Makes a GNU-Style ChangeLog from a git repository -+# Handles git-svn repositories also -+ -+# Arguments : same as for git log -+release_refs={} -+ -+def process_commit(lines, files): -+ # DATE NAME -+ # BLANK LINE -+ # Subject -+ # BLANK LINE -+ # ... -+ # FILES -+ fileincommit = False -+ lines = [x.strip() for x in lines if x.strip() and not x.startswith('git-svn-id')] -+ files = [x.strip() for x in files if x.strip()] -+ for l in lines: -+ if l.startswith('* ') and ':' in l: -+ fileincommit = True -+ break -+ -+ top_line = lines[0] -+ print top_line.strip() -+ print -+ if not fileincommit: -+ for f in files: -+ print '\t* %s:' % f -+ for l in lines[1:]: -+ print '\t ', l -+ print -+ -+def output_commits(): -+ cmd = ['git', 'log', '--pretty=format:--START-COMMIT--%H%n%ai %an <%ae>%n%n%s%n%b%n--END-COMMIT--', -+ '--date=short', '--name-only'] -+ -+ start_tag = find_start_tag() -+ -+ if start_tag is None: -+ cmd.extend(sys.argv[1:]) -+ else: -+ cmd.extend(["%s..HEAD" % (start_tag)]) -+ -+ p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) -+ buf = [] -+ files = [] -+ filemode = False -+ for lin in p.stdout.readlines(): -+ if lin.startswith("--START-COMMIT--"): -+ if buf != []: -+ process_commit(buf, files) -+ hash = lin[16:].strip() -+ try: -+ rel = release_refs[hash] -+ print "=== release %d.%d.%d ===\n" % (int(rel[0]), int(rel[1]), int(rel[2])) -+ except: -+ pass -+ buf = [] -+ files = [] -+ filemode = False -+ elif lin.startswith("--END-COMMIT--"): -+ filemode = True -+ elif filemode == True: -+ files.append(lin) -+ else: -+ buf.append(lin) -+ if buf != []: -+ process_commit(buf, files) -+ -+def get_rel_tags(): -+ # Populate the release_refs dict with the tags for previous releases -+ reltagre = re.compile("^([a-z0-9]{40}) refs\/tags\/RELEASE-([0-9]+)[-_.]([0-9]+)[-_.]([0-9]+)") -+ -+ cmd = ['git', 'show-ref', '--tags', '--dereference'] -+ p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) -+ for lin in p.stdout.readlines(): -+ match = reltagre.search (lin) -+ if match: -+ (sha, maj, min, nano) = match.groups() -+ release_refs[sha] = (maj, min, nano) -+ -+def find_start_tag(): -+ starttagre = re.compile("^([a-z0-9]{40}) refs\/tags\/CHANGELOG_START") -+ cmd = ['git', 'show-ref', '--tags'] -+ p = subprocess.Popen(args=cmd, shell=False, stdout=subprocess.PIPE) -+ for lin in p.stdout.readlines(): -+ match = starttagre.search (lin) -+ if match: -+ return match.group(1) -+ return None -+ -+if __name__ == "__main__": -+ get_rel_tags() -+ output_commits() -diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak -new file mode 100644 -index 0000000..cc82bbd ---- /dev/null -+++ b/common/gst-glib-gen.mak -@@ -0,0 +1,45 @@ -+# these are the variables your Makefile.am should set -+# the example is based on the colorbalance interface -+ -+#glib_enum_headers=$(colorbalance_headers) -+#glib_enum_define=GST_COLOR_BALANCE -+#glib_gen_prefix=gst_color_balance -+#glib_gen_basename=colorbalance -+ -+enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+ -+# these are all the rules generating the relevant files -+$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list -+ $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \ -+ mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h -+ -+$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list -+ $(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \ -+ glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \ -+ mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c -+ -+$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) -+ $(AM_V_GEN)glib-mkenums \ -+ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ -+ --fprod "\n/* enumerations from \"@filename@\" */\n" \ -+ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ -+ --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ -+ $^ > $@ -+ -+$(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) -+ @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi -+ $(AM_V_GEN)glib-mkenums \ -+ --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \ -+ --fprod "\n/* enumerations from \"@filename@\" */" \ -+ --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[] = {" \ -+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ -+ --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" \ -+ $^ > $@ -+ -+# a hack rule to make sure .Plo files exist because they get include'd -+# from Makefile's -+.deps/%-marshal.Plo: -+ @touch $@ -+ -+.deps/%-enumtypes.Plo: -+ @touch $@ -diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak -index 8cc42e7..084f9ae 100644 ---- a/common/gtk-doc-plugins.mak -+++ b/common/gtk-doc-plugins.mak -@@ -13,8 +13,7 @@ help: - @echo - - # update the stuff maintained by doc maintainers --update: -- $(MAKE) scanobj-update -+update: scanobj-update - $(MAKE) check-outdated-docs - - # We set GPATH here; this gives us semantics for GNU make -@@ -130,7 +129,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) - --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ - echo " DOC Merging introspection data" && \ - $(PYTHON) \ -- $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ -+ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ - if test x"$(srcdir)" != x. ; then \ - for f in $(SCANOBJ_FILES); \ - do \ -diff --git a/common/hooks/post-receive.hook b/common/hooks/post-receive.hook -new file mode 100644 -index 0000000..cf1fe56 ---- /dev/null -+++ b/common/hooks/post-receive.hook -@@ -0,0 +1,290 @@ -+#!/usr/bin/perl -w -+# -+# Copyright 2005 Alexandre Julliard -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+ -+use strict; -+use open ':utf8'; -+use Encode 'encode'; -+use Cwd 'realpath'; -+ -+binmode STDIN, ':utf8'; -+binmode STDOUT, ':utf8'; -+ -+sub git_config($); -+sub get_repos_name(); -+ -+# some parameters you may want to change -+ -+# set this to something that takes "-s" -+my $mailer = "/usr/bin/mail"; -+ -+# debug mode -+my $debug = 0; -+ -+# configuration parameters -+ -+# base URL of the gitweb repository browser -+my $gitweb_url = "http://cgit.freedesktop.org/gstreamer"; -+ -+# default repository name -+my $repos_name = get_repos_name(); -+ -+# max size of diffs in bytes -+my $max_diff_size = 10000; -+ -+# address for mail notices -+my $commitlist_address = 'gstreamer-commits@lists.freedesktop.org'; -+#my $commitlist_address = "bilboed"; -+ -+# max number of individual notices before falling back to a single global notice -+my $max_individual_notices = 100; -+ -+# format an integer date + timezone as string -+# algorithm taken from git's date.c -+sub format_date($$) -+{ -+ my ($time,$tz) = @_; -+ -+ if ($tz < 0) -+ { -+ my $minutes = (-$tz / 100) * 60 + (-$tz % 100); -+ $time -= $minutes * 60; -+ } -+ else -+ { -+ my $minutes = ($tz / 100) * 60 + ($tz % 100); -+ $time += $minutes * 60; -+ } -+ return gmtime($time) . sprintf " %+05d", $tz; -+} -+ -+# fetch a parameter from the git config file -+sub git_config($) -+{ -+ my ($param) = @_; -+ -+ open CONFIG, "-|" or exec "git", "config", $param; -+ my $ret = ; -+ chomp $ret if $ret; -+ close CONFIG or $ret = undef; -+ return $ret; -+} -+ -+# send an email notification -+sub mail_notification($$$@) -+{ -+ my ($name, $subject, $content_type, @text) = @_; -+ $subject = encode("MIME-Q",$subject); -+ if ($debug) -+ { -+ print "---------------------\n"; -+ print "To: $name\n"; -+ print "Subject: $subject\n"; -+ print "Content-Type: $content_type\n"; -+ print "\n", join("\n", @text), "\n"; -+ } -+ else -+ { -+ my $pid = open MAIL, "|-"; -+ return unless defined $pid; -+ if (!$pid) -+ { -+ exec $mailer, "-s", $subject, $name, or die "Cannot exec $mailer"; -+ } -+ print MAIL join("\n", @text), "\n"; -+ close MAIL; -+ } -+} -+ -+# get the default repository name -+sub get_repos_name() -+{ -+ my $dir = `git rev-parse --git-dir`; -+ chomp $dir; -+ my $repos = realpath($dir); -+ $repos =~ s/(.*?)((\.git\/)?\.git)$/$1/; -+ $repos =~ s/(.*)\/([^\/]+)\/?$/$2/; -+ return $repos; -+} -+ -+# extract the information from a commit or tag object and return a hash containing the various fields -+sub get_object_info($) -+{ -+ my $obj = shift; -+ my %info = (); -+ my @log = (); -+ my $do_log = 0; -+ -+ open TYPE, "-|" or exec "git", "cat-file", "-t", $obj or die "cannot run git-cat-file"; -+ my $type = ; -+ chomp $type; -+ close TYPE; -+ -+ open OBJ, "-|" or exec "git", "cat-file", $type, $obj or die "cannot run git-cat-file"; -+ while () -+ { -+ chomp; -+ if ($do_log) -+ { -+ last if /^-----BEGIN PGP SIGNATURE-----/; -+ push @log, $_; -+ } -+ elsif (/^(author|committer|tagger) ((.*)(<.*>)) (\d+) ([+-]\d+)$/) -+ { -+ $info{$1} = $2; -+ $info{$1 . "_name"} = $3; -+ $info{$1 . "_email"} = $4; -+ $info{$1 . "_date"} = $5; -+ $info{$1 . "_tz"} = $6; -+ } -+ elsif (/^tag (.*)$/) -+ { -+ $info{"tag"} = $1; -+ } -+ elsif (/^$/) { $do_log = 1; } -+ } -+ close OBJ; -+ -+ $info{"type"} = $type; -+ $info{"log"} = \@log; -+ return %info; -+} -+ -+# send a commit notice to a mailing list -+sub send_commit_notice($$) -+{ -+ my ($ref,$obj) = @_; -+ my %info = get_object_info($obj); -+ my @notice = (); -+ my $subject; -+ -+ printf "sending e-mail for $obj\n"; -+ -+ # TODO normal tags are not identified -+ if ($info{"type"} eq "tag") -+ { -+ push @notice, -+ "Module: $repos_name", -+ "Branch: $ref", -+ "Tag: $obj", -+ $gitweb_url ? "URL: $gitweb_url/tag/?id=$obj\n" : "", -+ "Tagger: " . $info{"tagger"}, -+ "Date: " . format_date($info{"tagger_date"},$info{"tagger_tz"}), -+ "", -+ join "\n", @{$info{"log"}}; -+ $subject = "Tag " . $info{"tag"} . ": " . ${$info{"log"}}[0]; -+ } -+ else -+ { -+ push @notice, -+ "Module: $repos_name", -+ "Branch: $ref", -+ "Commit: $obj", -+ $gitweb_url ? "URL: $gitweb_url/commit/?id=$obj\n" : "", -+ "Author: " . $info{"author"}, -+ "Date: " . format_date($info{"author_date"},$info{"author_tz"}), -+ "", -+ join "\n", @{$info{"log"}}, -+ "", -+ "---", -+ ""; -+ -+ open STAT, "-|" or exec "git", "diff-tree", "--stat", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; -+ push @notice, join("", ); -+ close STAT; -+ -+ open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; -+ my $diff = join( "", ); -+ close DIFF; -+ -+ if (($max_diff_size == -1) || (length($diff) < $max_diff_size)) -+ { -+ push @notice, $diff; -+ } -+ else -+ { -+ push @notice, "Diff: $gitweb_url/diff/?id=$obj" if $gitweb_url; -+ } -+ -+ if ($ref eq 'master') -+ { -+ $subject = $repos_name . ": " . ${$info{"log"}}[0]; -+ } -+ else -+ { -+ $subject = "[$ref] " . $repos_name . ": " . ${$info{"log"}}[0]; -+ } -+ } -+ -+ mail_notification($commitlist_address, $subject, "text/plain; charset=UTF-8", @notice); -+} -+ -+# send a global commit notice when there are too many commits for individual mails -+sub send_global_notice($$$) -+{ -+ my ($ref, $old_sha1, $new_sha1) = @_; -+ my @notice = (); -+ -+ open LIST, "-|" or exec "git", "rev-list", "--pretty", "^$old_sha1", "$new_sha1" or die "cannot exec git-rev-list"; -+ while () -+ { -+ chomp; -+ s/^commit /URL: $gitweb_url\/commit\/?id=/ if $gitweb_url; -+ push @notice, $_; -+ } -+ close LIST; -+ -+ mail_notification($commitlist_address, "New commits on branch $ref", "text/plain; charset=UTF-8", @notice); -+} -+ -+# send all the notices -+sub send_all_notices($$$) -+{ -+ my ($old_sha1, $new_sha1, $ref) = @_; -+ -+ $ref =~ s/^refs\/heads\///; -+ -+ if ($old_sha1 eq '0' x 40) # new ref -+ { -+ send_commit_notice( $ref, $new_sha1 ) if $commitlist_address; -+ return; -+ } -+ -+ my @commits = (); -+ -+ open LIST, "-|" or exec "git", "rev-list", "--topo-order", "^$old_sha1", "$new_sha1" or die "cannot exec git-rev-list"; -+ while () -+ { -+ chomp; -+ die "invalid commit $_" unless /^[0-9a-f]{40}$/; -+ unshift @commits, $_; -+ } -+ close LIST; -+ -+ if (@commits > $max_individual_notices) -+ { -+ send_global_notice( $ref, $old_sha1, $new_sha1 ) if $commitlist_address; -+ return; -+ } -+ -+ foreach my $commit (@commits) -+ { -+ send_commit_notice( $ref, $commit ) if $commitlist_address; -+ } -+} -+ -+# append repository path to URL -+$gitweb_url .= "/$repos_name" if $gitweb_url; -+ -+while (<>) -+{ -+ chomp; -+ if (/^([0-9a-f]{40}) ([0-9a-f]{40}) (.*)$/) { send_all_notices( $1, $2, $3 ); } -+} -+ -+exit 0; -diff --git a/common/hooks/pre-commit.hook b/common/hooks/pre-commit.hook -new file mode 100644 -index 0000000..aef1ce1 ---- /dev/null -+++ b/common/hooks/pre-commit.hook -@@ -0,0 +1,77 @@ -+#!/bin/sh -+# -+# Check that the code follows a consistant code style -+# -+ -+# Check for existence of indent, and error out if not present. -+# On some *bsd systems the binary seems to be called gnunindent, -+# so check for that first. -+ -+version=`gnuindent --version 2>/dev/null` -+if test "x$version" = "x"; then -+ version=`indent --version 2>/dev/null` -+ if test "x$version" = "x"; then -+ echo "GStreamer git pre-commit hook:" -+ echo "Did not find GNU indent, please install it before continuing." -+ exit 1 -+ fi -+ INDENT=indent -+else -+ INDENT=gnuindent -+fi -+ -+case `$INDENT --version` in -+ GNU*) -+ ;; -+ default) -+ echo "GStreamer git pre-commit hook:" -+ echo "Did not find GNU indent, please install it before continuing." -+ echo "(Found $INDENT, but it doesn't seem to be GNU indent)" -+ exit 1 -+ ;; -+esac -+ -+INDENT_PARAMETERS="--braces-on-if-line \ -+ --case-brace-indentation0 \ -+ --case-indentation2 \ -+ --braces-after-struct-decl-line \ -+ --line-length80 \ -+ --no-tabs \ -+ --cuddle-else \ -+ --dont-line-up-parentheses \ -+ --continuation-indentation4 \ -+ --honour-newlines \ -+ --tab-size8 \ -+ --indent-level2 \ -+ --leave-preprocessor-space" -+ -+echo "--Checking style--" -+for file in `git diff-index --cached --name-only HEAD --diff-filter=ACMR| grep "\.c$"` ; do -+ # nf is the temporary checkout. This makes sure we check against the -+ # revision in the index (and not the checked out version). -+ nf=`git checkout-index --temp ${file} | cut -f 1` -+ newfile=`mktemp /tmp/${nf}.XXXXXX` || exit 1 -+ $INDENT ${INDENT_PARAMETERS} \ -+ $nf -o $newfile 2>> /dev/null -+ # FIXME: Call indent twice as it tends to do line-breaks -+ # different for every second call. -+ $INDENT ${INDENT_PARAMETERS} \ -+ $newfile 2>> /dev/null -+ diff -u -p "${nf}" "${newfile}" -+ r=$? -+ rm "${newfile}" -+ rm "${nf}" -+ if [ $r != 0 ] ; then -+echo "=================================================================================================" -+echo " Code style error in: $file " -+echo " " -+echo " Please fix before committing. Don't forget to run git add before trying to commit again. " -+echo " If the whole file is to be committed, this should work (run from the top-level directory): " -+echo " " -+echo " gst-indent $file; git add $file; git commit" -+echo " " -+echo "=================================================================================================" -+ exit 1 -+ fi -+done -+echo "--Checking style pass--" -diff --git a/common/hooks/pre-receive.hook b/common/hooks/pre-receive.hook -new file mode 100644 -index 0000000..7aa72e5 ---- /dev/null -+++ b/common/hooks/pre-receive.hook -@@ -0,0 +1,95 @@ -+#!/usr/bin/env python -+import sys -+import os -+import subprocess -+ -+# This server-side pre-receive hook is to be put and activated in all modules -+# that depend on the common submodule. -+# -+# It will check whether any modifications to the common 'submodule file' has a -+# a valid commit SHA1 that exists in the common module. -+ -+def commit_exists(sha1, gitdir): -+ """Returns True if the sha1 is a valid commit in the given -+ git directory""" -+ # FIXME: We're using 'git show' for the time being, but there's a small -+ # risk that there might be a valid SHA1 for a non-commit object. -+ env = os.environ.copy() -+ env["GIT_DIR"] = gitdir -+ sub = subprocess.Popen(["git", "show", sha1], env=env, -+ stdout=subprocess.PIPE, -+ stderr=subprocess.PIPE) -+ while True: -+ res = sub.poll() -+ if res != None: -+ return res == 0 -+ -+# location of the common git module -+COMMON_GIT_DIR = "/git/gstreamer/common.git" -+ -+pushvalid = True -+error_badcommon = False -+error_badcommit = False -+ -+print "=> Checking for integrity of common submodule changes" -+print -+ -+for line in sys.stdin.readlines(): -+ # ref is the ref to be modified -+ # old is the old commit it was pointing to -+ # new is the new commit it was pointing to -+ old, new, ref = line.split(' ', 2) -+ -+ # 1. Get the latest change to common (if there was any changes) -+ sub = subprocess.Popen(["git", "diff", "%s..%s" % (old, new, ), "--", "common"], -+ stdout=subprocess.PIPE) -+ stdout, stderr = sub.communicate() -+ if stdout != "": -+ # Format of submodule special files -+ # Subproject commit -+ -+ # we get a diff, therefore only grab the last line -+ lastline = stdout.strip().rsplit('\n',1)[-1] -+ if not lastline.startswith("+Subproject commit"): -+ # this is bad, it means the diff has changed to something completely -+ # different -+ continue -+ subsha1 = lastline.rsplit(' ', 1)[-1] -+ print " Pack wants common to point to", subsha1 -+ if not commit_exists(subsha1, COMMON_GIT_DIR): -+ print " /!\\ Commit does not exist in common git module /!\\" -+ print " /!\\ for ref", ref -+ pushvalid = False -+ break -+ -+ # 2. Figure out if that commit exists in the common submodule -+ # (use GIT_DIR to execute commands in that directory) -+ -+ # Get the commit message -+ sub = subprocess.Popen(["git", "log", "--format=%s", -+ "%s..%s" % (old, new, )], stdout=subprocess.PIPE) -+ stdout, stderr = sub.communicate() -+ if stdout != "": -+ for line in stdout.strip().rsplit('\n',1): -+ if line.startswith("!"): -+ error_badcommit = True -+ pushvalid = False -+ break -+ -+if pushvalid: -+ print " Incoming packet valid, proceeding to actual commit" -+ sys.exit(0) -+else: -+ if error_badcommit: -+ print " Attempting to push commits with commit messages that start" -+ print " with '!'. Commit messages starting with '!' are reserved" -+ print " for private branches to prevent the commits from accidentally" -+ print " getting to the main repository." -+ if error_badcommon: -+ print " Attempting to push commits containing modifications to common" -+ print " that have not been commited to the actuall common module." -+ print -+ print " First push your changes to common/ before pushing the changes" -+ print " to the module using it." -+ sys.exit(-1) -+ -diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am -index 2ddb8a7..856d6e3 100644 ---- a/common/m4/Makefile.am -+++ b/common/m4/Makefile.am -@@ -8,7 +8,6 @@ EXTRA_DIST = \ - as-gcc-inline-assembly.m4 \ - as-libtool.m4 \ - as-libtool-tags.m4 \ -- as-objc.m4 \ - as-python.m4 \ - as-scrub-include.m4 \ - as-version.m4 \ -diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in -index 886deab..52fbfa3 100644 ---- a/common/m4/Makefile.in -+++ b/common/m4/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = common/m4 - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -240,7 +245,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -350,7 +356,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -364,7 +374,6 @@ EXTRA_DIST = \ - as-gcc-inline-assembly.m4 \ - as-libtool.m4 \ - as-libtool-tags.m4 \ -- as-objc.m4 \ - as-python.m4 \ - as-scrub-include.m4 \ - as-version.m4 \ -@@ -487,15 +496,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/common/m4/as-compiler-flag.m4 b/common/m4/as-compiler-flag.m4 -index 882a4c7..8bb853a 100644 ---- a/common/m4/as-compiler-flag.m4 -+++ b/common/m4/as-compiler-flag.m4 -@@ -62,3 +62,35 @@ AC_DEFUN([AS_CXX_COMPILER_FLAG], - AC_MSG_RESULT([$flag_ok]) - ]) - -+dnl AS_OBJC_COMPILER_FLAG(CPPFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) -+dnl Tries to compile with the given CPPFLAGS. -+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags, -+dnl and ACTION-IF-NOT-ACCEPTED otherwise. -+ -+AC_DEFUN([AS_OBJC_COMPILER_FLAG], -+[ -+ AC_REQUIRE([AC_PROG_OBJC]) -+ -+ AC_MSG_CHECKING([to see if Objective C compiler understands $1]) -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $1" -+ -+ AC_LANG_PUSH([Objective C]) -+ -+ AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no]) -+ CPPFLAGS="$save_CPPFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ $2 -+ true -+ else -+ $3 -+ true -+ fi -+ -+ AC_LANG_POP([Objective C]) -+ -+ AC_MSG_RESULT([$flag_ok]) -+]) -+ -diff --git a/common/m4/gst-arch.m4 b/common/m4/gst-arch.m4 -index 2e935d2..077a20b 100644 ---- a/common/m4/gst-arch.m4 -+++ b/common/m4/gst-arch.m4 -@@ -5,32 +5,30 @@ dnl defines HOST_CPU - - AC_DEFUN([AG_GST_ARCH], - [ -- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables -- - dnl Determine CPU -- case "x${host_cpu}" in -+ case "x${target_cpu}" in - xi?86 | xk? | xi?86_64) -- case $host_os in -+ case $target_os in - solaris*) - AC_CHECK_DECL([__i386], [I386_ABI="yes"], [I386_ABI="no"]) - AC_CHECK_DECL([__amd64], [AMD64_ABI="yes"], [AMD64_ABI="no"]) - - if test "x$I386_ABI" = "xyes" ; then - HAVE_CPU_I386=yes -- AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) -+ AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) - fi - if test "x$AMD64_ABI" = "xyes" ; then - HAVE_CPU_X86_64=yes -- AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) -+ AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) - fi - ;; - *) - HAVE_CPU_I386=yes -- AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) -+ AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) - - dnl FIXME could use some better detection - dnl (ie CPUID) -- case "x${host_cpu}" in -+ case "x${target_cpu}" in - xi386 | xi486) ;; - *) - AC_DEFINE(HAVE_RDTSC, 1, [Define if RDTSC is available]) ;; -@@ -40,43 +38,43 @@ AC_DEFUN([AG_GST_ARCH], - ;; - xpowerpc) - HAVE_CPU_PPC=yes -- AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the host CPU is a PowerPC]) ;; -+ AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PowerPC]) ;; - xpowerpc64) - HAVE_CPU_PPC64=yes -- AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the host CPU is a 64 bit PowerPC]) ;; -+ AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the target CPU is a 64 bit PowerPC]) ;; - xalpha*) - HAVE_CPU_ALPHA=yes -- AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the host CPU is an Alpha]) ;; -+ AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;; - xarm*) - HAVE_CPU_ARM=yes -- AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the host CPU is an ARM]) ;; -+ AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;; - xsparc*) - HAVE_CPU_SPARC=yes -- AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the host CPU is a SPARC]) ;; -+ AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a SPARC]) ;; - xmips*) - HAVE_CPU_MIPS=yes -- AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the host CPU is a MIPS]) ;; -+ AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the target CPU is a MIPS]) ;; - xhppa*) - HAVE_CPU_HPPA=yes -- AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the host CPU is a HPPA]) ;; -+ AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the target CPU is a HPPA]) ;; - xs390*) - HAVE_CPU_S390=yes -- AC_DEFINE(HAVE_CPU_S390, 1, [Define if the host CPU is a S390]) ;; -+ AC_DEFINE(HAVE_CPU_S390, 1, [Define if the target CPU is a S390]) ;; - xia64*) - HAVE_CPU_IA64=yes -- AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the host CPU is a IA64]) ;; -+ AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the target CPU is a IA64]) ;; - xm68k*) - HAVE_CPU_M68K=yes -- AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the host CPU is a M68K]) ;; -+ AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the target CPU is a M68K]) ;; - xx86_64) - HAVE_CPU_X86_64=yes -- AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) ;; -+ AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) ;; - xcris) - HAVE_CPU_CRIS=yes -- AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the host CPU is a CRIS]) ;; -+ AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the target CPU is a CRIS]) ;; - xcrisv32) - HAVE_CPU_CRISV32=yes -- AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the host CPU is a CRISv32]) ;; -+ AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the target CPU is a CRISv32]) ;; - esac - - dnl Determine endianness -@@ -98,6 +96,7 @@ AC_DEFUN([AG_GST_ARCH], - AM_CONDITIONAL(HAVE_CPU_CRISV32, test "x$HAVE_CPU_CRISV32" = "xyes") - - AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu", [the host CPU]) -+ AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu", [the target CPU]) - ]) - - dnl check if unaligned memory access works correctly -diff --git a/common/m4/gst-args.m4 b/common/m4/gst-args.m4 -index 030e7ac..e011ed4 100644 ---- a/common/m4/gst-args.m4 -+++ b/common/m4/gst-args.m4 -@@ -19,6 +19,7 @@ dnl AG_GST_ARG_ENABLE_EXTERNAL - dnl AG_GST_ARG_ENABLE_EXPERIMENTAL - dnl AG_GST_ARG_ENABLE_BROKEN - -+dnl AG_GST_ARG_DISABLE_FATAL_WARNINGS - AC_DEFUN([AG_GST_ARG_DEBUG], - [ - dnl debugging stuff -@@ -110,13 +111,13 @@ AC_DEFUN([AG_GST_ARG_GCOV], - dnl if gcov is used, we do not want default -O2 CFLAGS - if test "x$GST_GCOV_ENABLED" = "xyes" - then -- CFLAGS="-O0" -+ CFLAGS="$CFLAGS -O0" - AC_SUBST(CFLAGS) -- CXXFLAGS="-O0" -+ CXXFLAGS="$CXXFLAGS -O0" - AC_SUBST(CXXFLAGS) -- FFLAGS="-O0" -+ FFLAGS="$FFLAGS -O0" - AC_SUBST(FFLAGS) -- CCASFLAGS="-O0" -+ CCASFLAGS="$CCASFLAGS -O0" - AC_SUBST(CCASFLAGS) - AC_MSG_NOTICE([gcov enabled, setting CFLAGS and friends to $CFLAGS]) - fi -@@ -325,3 +326,20 @@ AC_DEFUN([AG_GST_ARG_ENABLE_BROKEN], - AC_MSG_NOTICE([not building broken plug-ins]) - ]) - ]) -+ -+dnl allow people (or build tools) to override default behaviour -+dnl for fatal compiler warnings -+AC_DEFUN([AG_GST_ARG_DISABLE_FATAL_WARNINGS], -+[ -+ AC_ARG_ENABLE(fatal-warnings, -+ AC_HELP_STRING([--disable-fatal-warnings], -+ [Don't turn compiler warnings into fatal errors]), -+ [ -+ case "${enableval}" in -+ yes) FATAL_WARNINGS=yes ;; -+ no) FATAL_WARNINGS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-fatal-warnings) ;; -+ esac -+ ], -+ [FATAL_WARNINGS=$GST_GIT]) dnl Default value -+]) -diff --git a/common/m4/gst-check.m4 b/common/m4/gst-check.m4 -index 3fd3acf..f3f39b4 100644 ---- a/common/m4/gst-check.m4 -+++ b/common/m4/gst-check.m4 -@@ -117,6 +117,38 @@ AC_DEFUN([AG_GST_CHECK_GST_CHECK], - ]) - - dnl =========================================================================== -+dnl AG_GST_CHECK_UNINSTALLED_SETUP([ACTION-IF-UNINSTALLED], [ACTION-IF-NOT]) -+dnl -+dnl ACTION-IF-UNINSTALLED (optional) extra actions to perform if the setup -+dnl is an uninstalled setup -+dnl ACTION-IF-NOT (optional) extra actions to perform if the setup -+dnl is not an uninstalled setup -+dnl =========================================================================== -+AC_DEFUN([AG_GST_CHECK_UNINSTALLED_SETUP], -+[ -+ AC_MSG_CHECKING([whether this is an uninstalled GStreamer setup]) -+ AC_CACHE_VAL(gst_cv_is_uninstalled_setup,[ -+ gst_cv_is_uninstalled_setup=no -+ if (set -u; : $GST_PLUGIN_SYSTEM_PATH) 2>/dev/null ; then -+ if test -z "$GST_PLUGIN_SYSTEM_PATH" \ -+ -a -n "$GST_PLUGIN_SCANNER" \ -+ -a -n "$GST_PLUGIN_PATH" \ -+ -a -n "$GST_REGISTRY" \ -+ -a -n "$DYLD_LIBRARY_PATH" \ -+ -a -n "$LD_LIBRARY_PATH"; then -+ gst_cv_is_uninstalled_setup=yes; -+ fi -+ fi -+ ]) -+ AC_MSG_RESULT($gst_cv_is_uninstalled_setup) -+ if test "x$gst_cv_is_uninstalled_setup" = "xyes"; then -+ ifelse([$1], , :, [$1]) -+ else -+ ifelse([$2], , :, [$2]) -+ fi -+]) -+ -+dnl =========================================================================== - dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-MAJORMINOR], [MIN-VERSION], [REQUIRED]) - dnl - dnl Sets GST_PLUGINS_BASE_CFLAGS and GST_PLUGINS_BASE_LIBS. -diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4 -index f8f2364..b7f9dd3 100644 ---- a/common/m4/gst-error.m4 -+++ b/common/m4/gst-error.m4 -@@ -196,6 +196,91 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS], - AC_MSG_NOTICE([set ERROR_CXXFLAGS to $ERROR_CXXFLAGS]) - ]) - -+dnl Sets WARNING_OBJCFLAGS and ERROR_OBJCFLAGS to something the compiler -+dnl will accept and AC_SUBST them so they are available in Makefile -+dnl -+dnl WARNING_OBJCFLAGS will contain flags to make the compiler emit more -+dnl warnings. -+dnl ERROR_OBJCFLAGS will contain flags to make those warnings fatal, -+dnl unless ADD-WERROR is set to "no" -+dnl -+dnl If MORE_FLAGS is set, tries to add each of the given flags -+dnl to WARNING_CFLAGS if the compiler supports them. Each flag is -+dnl tested separately. -+dnl -+dnl These flags can be overridden at make time: -+dnl make ERROR_OBJCFLAGS= -+AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS], -+[ -+ AC_REQUIRE([AC_PROG_OBJC]) -+ AC_REQUIRE([AS_OBJC_COMPILER_FLAG]) -+ -+ ERROR_OBJCFLAGS="" -+ WARNING_OBJCFLAGS="" -+ -+ dnl if we support -Wall, set it unconditionally -+ AS_OBJC_COMPILER_FLAG(-Wall, WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall") -+ -+ dnl if asked for, add -Werror if supported -+ if test "x$1" != "xno" -+ then -+ AS_OBJC_COMPILER_FLAG(-Werror, ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror") -+ -+ if test "x$ERROR_OBJCFLAGS" != "x" -+ then -+ dnl Add -fno-strict-aliasing for GLib versions before 2.19.8 -+ dnl as before G_LOCK and friends caused strict aliasing compiler -+ dnl warnings. -+ PKG_CHECK_EXISTS([glib-2.0 < 2.19.8], [ -+ AS_OBJC_COMPILER_FLAG([-fno-strict-aliasing], -+ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing") -+ ]) -+ else -+ dnl if -Werror isn't suported, try -errwarn=%all -+ AS_OBJC_COMPILER_FLAG([-errwarn=%all], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all") -+ if test "x$ERROR_OBJCFLAGS" != "x"; then -+ dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, -+ dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, -+ dnl no%E_MACRO_REDEFINED (Sun Forte case) -+ dnl For Forte we need disable "empty declaration" warning produced by un-needed semicolon -+ dnl "statement not reached" disabled because there is g_assert_not_reached () in some places -+ dnl "macro redefined" because of gst/gettext.h -+ dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? -+ dnl FIXME: do any of these work with the c++ compiler? if not, why -+ dnl do we check at all? -+ for f in 'no%E_EMPTY_DECLARATION' \ -+ 'no%E_STATEMENT_NOT_REACHED' \ -+ 'no%E_ARGUEMENT_MISMATCH' \ -+ 'no%E_MACRO_REDEFINED' \ -+ 'no%E_LOOP_NOT_ENTERED_AT_TOP' -+ do -+ AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f") -+ done -+ fi -+ fi -+ fi -+ -+ if test "x$2" != "x" -+ then -+ UNSUPPORTED="" -+ list="$2" -+ for each in $list -+ do -+ AS_OBJC_COMPILER_FLAG($each, -+ WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each", -+ UNSUPPORTED="$UNSUPPORTED $each") -+ done -+ if test "X$UNSUPPORTED" != X ; then -+ AC_MSG_NOTICE([unsupported compiler flags: $UNSUPPORTED]) -+ fi -+ fi -+ -+ AC_SUBST(WARNING_OBJCFLAGS) -+ AC_SUBST(ERROR_OBJCFLAGS) -+ AC_MSG_NOTICE([set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS]) -+ AC_MSG_NOTICE([set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS]) -+]) -+ - dnl Sets the default error level for debugging messages - AC_DEFUN([AG_GST_SET_LEVEL_DEFAULT], - [ -diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4 -index c072c79..cff7f30 100644 ---- a/common/m4/gst-feature.m4 -+++ b/common/m4/gst-feature.m4 -@@ -232,10 +232,11 @@ AC_DEFUN([AG_GST_CHECK_GST_DEBUG_DISABLED], - save_CFLAGS="$CFLAGS" - CFLAGS="$GST_CFLAGS $CFLAGS" - AC_COMPILE_IFELSE([ -+ AC_LANG_SOURCE([[ - #include - #ifdef GST_DISABLE_GST_DEBUG - #error "debugging disabled, make compiler fail" -- #endif], [ debug_system_enabled=yes], [debug_system_enabled=no]) -+ #endif]])], [ debug_system_enabled=yes], [debug_system_enabled=no]) - CFLAGS="$save_CFLAGS" - AC_LANG_POP([C]) - -diff --git a/common/m4/gst.m4 b/common/m4/gst.m4 -index ddfde51..d4c53cb 100644 ---- a/common/m4/gst.m4 -+++ b/common/m4/gst.m4 -@@ -3,10 +3,15 @@ dnl sets up use of GStreamer configure.ac macros - dnl all GStreamer autoconf macros are prefixed - dnl with AG_GST_ for public macros - dnl with _AG_GST_ for private macros -+dnl -+dnl We call AC_CANONICAL_TARGET and AC_CANONICAL_HOST so that -+dnl it is valid before AC_ARG_PROGRAM is called - - AC_DEFUN([AG_GST_INIT], - [ - m4_pattern_forbid(^_?AG_GST_) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables -+ AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables - ]) - - dnl AG_GST_PKG_CONFIG_PATH -diff --git a/common/update-common b/common/update-common -new file mode 100644 -index 0000000..bb7dcef ---- /dev/null -+++ b/common/update-common -@@ -0,0 +1,82 @@ -+#!/bin/bash -+# -+# This script will update all the modules listed below so that -+# common points to master in the common module. -+# -+# If you have many of the GStreamer modules checked out in a particular -+# directory, it's best to run this script from that directory. For -+# example, I check everything out in ~/gst, so this file is -+# ~/gst/common/update-common. To do an update, I do -+# 'cd ~/gst ; ./common/update-common'. This will automatically use -+# the refs in your existing checkout when cloning the temporary -+# checkout. Alternatively, you can use the reference variable below. -+# -+ -+# Set this variable to point to any directory containing existing -+# git # checkouts, and git will pull objects from there, decreasing -+# network usage. -+BRANCH=0.10 -+reference=~/gst -+PUSHURL=ssh://git.freedesktop.org/git/gstreamer -+ -+set -e -+set -x -+ -+modules="gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad \ -+ gst-plugins-ugly gst-ffmpeg gst-python \ -+ gnonlin gst-plugins-gl gst-rtsp-server gst-editing-services" -+ -+topdir=`pwd` -+dir=`mktemp -d $topdir/common-update-XXXXXX` -+ -+for module in $modules -+do -+ cd $dir -+ if test -e $reference/$module/.git ; then -+ pushd $reference/$module -+ PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'` -+ popd -+ git clone --reference $reference/$module/.git --shared ssh://git.freedesktop.org/git/gstreamer/$module -+ elif test -e $topdir/$module/.git ; then -+ pushd $topdir/$module -+ PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'` -+ popd -+ git clone --reference $topdir/$module/.git --shared $PUSHURL/$module -+ else -+ git clone $PUSHURL/$module -+ fi -+ cd $dir/$module -+ -+ # ignore modules that don't have such a branch -+ if ! git show-ref origin/$BRANCH >/dev/null; then -+ continue; -+ fi -+ -+ git checkout -b $BRANCH origin/$BRANCH -+ git submodule init -+ git submodule update -+ cd $dir/$module/common -+ ref_from=`git log --pretty=format:%h -n 1 HEAD` -+ git checkout -b $BRANCH origin/$BRANCH -+ git pull origin -+ ref_to=`git log --pretty=format:%h -n 1 HEAD` -+ echo updating common from $ref_from to $ref_to -+ if [ "$ref_from" != "$ref_to" ] ; then -+ cd $dir/$module -+ git add common -+ git commit -m "Automatic update of common submodule -+ -+From $ref_from to $ref_to" -+ fi -+ cd $dir -+done -+ -+for module in $modules -+do -+ cd $dir/$module -+ if git show-ref origin/$BRANCH >/dev/null; then -+ git push origin $BRANCH -+ fi -+done -+ -+rm -rf $dir -diff --git a/compile b/compile -index b1f4749..c0096a7 100755 ---- a/compile -+++ b/compile -@@ -1,10 +1,10 @@ - #! /bin/sh --# Wrapper for compilers which do not understand '-c -o'. -+# Wrapper for compilers which do not understand `-c -o'. - --scriptversion=2012-01-04.17; # UTC -+scriptversion=2009-10-06.20; # UTC - --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free --# Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -+# Foundation, Inc. - # Written by Tom Tromey . - # - # This program is free software; you can redistribute it and/or modify -@@ -29,186 +29,21 @@ scriptversion=2012-01-04.17; # UTC - # bugs to or send patches to - # . - --nl=' --' -- --# We need space, tab and new line, in precisely that order. Quoting is --# there to prevent tools from complaining about whitespace usage. --IFS=" "" $nl" -- --file_conv= -- --# func_file_conv build_file lazy --# Convert a $build file to $host form and store it in $file --# Currently only supports Windows hosts. If the determined conversion --# type is listed in (the comma separated) LAZY, no conversion will --# take place. --func_file_conv () --{ -- file=$1 -- case $file in -- / | /[!/]*) # absolute file, and not a UNC file -- if test -z "$file_conv"; then -- # lazily determine how to convert abs files -- case `uname -s` in -- MINGW*) -- file_conv=mingw -- ;; -- CYGWIN*) -- file_conv=cygwin -- ;; -- *) -- file_conv=wine -- ;; -- esac -- fi -- case $file_conv/,$2, in -- *,$file_conv,*) -- ;; -- mingw/*) -- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` -- ;; -- cygwin/*) -- file=`cygpath -m "$file" || echo "$file"` -- ;; -- wine/*) -- file=`winepath -w "$file" || echo "$file"` -- ;; -- esac -- ;; -- esac --} -- --# func_cl_wrapper cl arg... --# Adjust compile command to suit cl --func_cl_wrapper () --{ -- # Assume a capable shell -- lib_path= -- shared=: -- linker_opts= -- for arg -- do -- if test -n "$eat"; then -- eat= -- else -- case $1 in -- -o) -- # configure might choose to run compile as 'compile cc -o foo foo.c'. -- eat=1 -- case $2 in -- *.o | *.[oO][bB][jJ]) -- func_file_conv "$2" -- set x "$@" -Fo"$file" -- shift -- ;; -- *) -- func_file_conv "$2" -- set x "$@" -Fe"$file" -- shift -- ;; -- esac -- ;; -- -I*) -- func_file_conv "${1#-I}" mingw -- set x "$@" -I"$file" -- shift -- ;; -- -l*) -- lib=${1#-l} -- found=no -- save_IFS=$IFS -- IFS=';' -- for dir in $lib_path $LIB -- do -- IFS=$save_IFS -- if $shared && test -f "$dir/$lib.dll.lib"; then -- found=yes -- set x "$@" "$dir/$lib.dll.lib" -- break -- fi -- if test -f "$dir/$lib.lib"; then -- found=yes -- set x "$@" "$dir/$lib.lib" -- break -- fi -- done -- IFS=$save_IFS -- -- test "$found" != yes && set x "$@" "$lib.lib" -- shift -- ;; -- -L*) -- func_file_conv "${1#-L}" -- if test -z "$lib_path"; then -- lib_path=$file -- else -- lib_path="$lib_path;$file" -- fi -- linker_opts="$linker_opts -LIBPATH:$file" -- ;; -- -static) -- shared=false -- ;; -- -Wl,*) -- arg=${1#-Wl,} -- save_ifs="$IFS"; IFS=',' -- for flag in $arg; do -- IFS="$save_ifs" -- linker_opts="$linker_opts $flag" -- done -- IFS="$save_ifs" -- ;; -- -Xlinker) -- eat=1 -- linker_opts="$linker_opts $2" -- ;; -- -*) -- set x "$@" "$1" -- shift -- ;; -- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) -- func_file_conv "$1" -- set x "$@" -Tp"$file" -- shift -- ;; -- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) -- func_file_conv "$1" mingw -- set x "$@" "$file" -- shift -- ;; -- *) -- set x "$@" "$1" -- shift -- ;; -- esac -- fi -- shift -- done -- if test -n "$linker_opts"; then -- linker_opts="-link$linker_opts" -- fi -- exec "$@" $linker_opts -- exit 1 --} -- --eat= -- - case $1 in - '') -- echo "$0: No command. Try '$0 --help' for more information." 1>&2 -+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF - Usage: compile [--help] [--version] PROGRAM [ARGS] - --Wrapper for compilers which do not understand '-c -o'. --Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -+Wrapper for compilers which do not understand `-c -o'. -+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining - arguments, and rename the output as expected. - - If you are trying to build a whole package this is not the --right script to run: please start by reading the file 'INSTALL'. -+right script to run: please start by reading the file `INSTALL'. - - Report bugs to . - EOF -@@ -218,13 +53,11 @@ EOF - echo "compile $scriptversion" - exit $? - ;; -- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) -- func_cl_wrapper "$@" # Doesn't return... -- ;; - esac - - ofile= - cfile= -+eat= - - for arg - do -@@ -233,8 +66,8 @@ do - else - case $1 in - -o) -- # configure might choose to run compile as 'compile cc -o foo foo.c'. -- # So we strip '-o arg' only if arg is an object. -+ # configure might choose to run compile as `compile cc -o foo foo.c'. -+ # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) -@@ -261,10 +94,10 @@ do - done - - if test -z "$ofile" || test -z "$cfile"; then -- # If no '-o' option was seen then we might have been invoked from a -+ # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no -- # '.c' file was seen then we are probably linking. That is also -+ # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" - fi -@@ -273,7 +106,7 @@ fi - cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - - # Create the lock directory. --# Note: use '[/\\:.-]' here to ensure that we don't use the same name -+# Note: use `[/\\:.-]' here to ensure that we don't use the same name - # that we are using for the .o file. Also, base the name on the expected - # object file name, since that is what matters with a parallel build. - lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -diff --git a/config.guess b/config.guess -index d622a44..40eaed4 100755 ---- a/config.guess -+++ b/config.guess -@@ -2,9 +2,9 @@ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. -+# 2011 Free Software Foundation, Inc. - --timestamp='2012-02-10' -+timestamp='2011-05-11' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,7 +17,9 @@ timestamp='2012-02-10' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, see . -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -55,8 +57,8 @@ GNU config.guess ($timestamp) - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -143,7 +145,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -790,12 +792,13 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- UNAME_PROCESSOR=`/usr/bin/uname -p` -- case ${UNAME_PROCESSOR} in -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) -@@ -804,9 +807,6 @@ EOF - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -- i*:MSYS*:*) -- echo ${UNAME_MACHINE}-pc-msys -- exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 -@@ -861,13 +861,6 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -- aarch64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; -- aarch64_be:Linux:*:*) -- UNAME_MACHINE=aarch64_be -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -902,16 +895,13 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; -- hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo frv-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -953,7 +943,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo or32-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -988,13 +978,13 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-tilera-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -1325,9 +1315,6 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -- x86_64:VMkernel:*:*) -- echo ${UNAME_MACHINE}-unknown-esx -- exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -diff --git a/config.h.in b/config.h.in -index 135edc1..dd61833 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -25,6 +25,9 @@ - /* gettext package name */ - #undef GETTEXT_PACKAGE - -+/* Use Vivante GPU */ -+#undef GPU_VIVANTE -+ - /* macro to use to show function name */ - #undef GST_FUNCTION - -@@ -54,46 +57,46 @@ - the CoreFoundation framework. */ - #undef HAVE_CFPREFERENCESCOPYAPPVALUE - --/* Define if the host CPU is an Alpha */ -+/* Define if the target CPU is an Alpha */ - #undef HAVE_CPU_ALPHA - --/* Define if the host CPU is an ARM */ -+/* Define if the target CPU is an ARM */ - #undef HAVE_CPU_ARM - --/* Define if the host CPU is a CRIS */ -+/* Define if the target CPU is a CRIS */ - #undef HAVE_CPU_CRIS - --/* Define if the host CPU is a CRISv32 */ -+/* Define if the target CPU is a CRISv32 */ - #undef HAVE_CPU_CRISV32 - --/* Define if the host CPU is a HPPA */ -+/* Define if the target CPU is a HPPA */ - #undef HAVE_CPU_HPPA - --/* Define if the host CPU is an x86 */ -+/* Define if the target CPU is an x86 */ - #undef HAVE_CPU_I386 - --/* Define if the host CPU is a IA64 */ -+/* Define if the target CPU is a IA64 */ - #undef HAVE_CPU_IA64 - --/* Define if the host CPU is a M68K */ -+/* Define if the target CPU is a M68K */ - #undef HAVE_CPU_M68K - --/* Define if the host CPU is a MIPS */ -+/* Define if the target CPU is a MIPS */ - #undef HAVE_CPU_MIPS - --/* Define if the host CPU is a PowerPC */ -+/* Define if the target CPU is a PowerPC */ - #undef HAVE_CPU_PPC - --/* Define if the host CPU is a 64 bit PowerPC */ -+/* Define if the target CPU is a 64 bit PowerPC */ - #undef HAVE_CPU_PPC64 - --/* Define if the host CPU is a S390 */ -+/* Define if the target CPU is a S390 */ - #undef HAVE_CPU_S390 - --/* Define if the host CPU is a SPARC */ -+/* Define if the target CPU is a SPARC */ - #undef HAVE_CPU_SPARC - --/* Define if the host CPU is a x86_64 */ -+/* Define if the target CPU is a x86_64 */ - #undef HAVE_CPU_X86_64 - - /* Define if the GNU dcgettext() function is already present or preinstalled. -@@ -103,6 +106,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_DLFCN_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_EGL_EGLVIVANTE_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_EGL_EGL_H - -@@ -221,6 +227,9 @@ - /* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS - -+/* the target CPU */ -+#undef TARGET_CPU -+ - /* Version number of package */ - #undef VERSION - -diff --git a/config.sub b/config.sub -index c894da4..30fdca8 100755 ---- a/config.sub -+++ b/config.sub -@@ -2,9 +2,9 @@ - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. -+# 2011 Free Software Foundation, Inc. - --timestamp='2012-02-10' -+timestamp='2011-03-23' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,7 +21,9 @@ timestamp='2012-02-10' - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, see . -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -74,8 +76,8 @@ version="\ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -130,10 +132,6 @@ case $maybe_os in - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -249,22 +247,17 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -- | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -- | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ -@@ -298,7 +291,7 @@ case $basic_machine in - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rl78 | rx \ -+ | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -@@ -307,7 +300,7 @@ case $basic_machine in - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -+ | v850 | v850e \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) -@@ -322,7 +315,8 @@ case $basic_machine in - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) -+ # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -335,10 +329,7 @@ case $basic_machine in - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -- ;; -+ - xscaleeb) - basic_machine=armeb-unknown - ;; -@@ -361,13 +352,11 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -- | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -- | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -376,10 +365,8 @@ case $basic_machine in - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -@@ -413,7 +400,7 @@ case $basic_machine in - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -+ | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -@@ -421,11 +408,10 @@ case $basic_machine in - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -+ | tile-* | tilegx-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -+ | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ -@@ -725,6 +711,7 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -+# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -821,18 +808,10 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -- msys) -- basic_machine=i386-pc -- os=-msys -- ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -1141,8 +1120,13 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; - tile*) -- basic_machine=$basic_machine-unknown -+ basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) -@@ -1352,7 +1336,7 @@ case $os in - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ -@@ -1564,6 +1548,9 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -+ # This also exists in the configure program, but was not the -+ # default. -+ # os=-sunos4 - ;; - m68*-cisco) - os=-aout -diff --git a/configure b/configure -index 254ec9c..7e4f461 100755 ---- a/configure -+++ b/configure -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68 for GStreamer OpenGL Plug-ins 0.10.3. -+# Generated by GNU Autoconf 2.68 for GStreamer OpenGL Plug-ins 0.10.3.1. - # - # Report bugs to . - # -@@ -571,8 +571,8 @@ MAKEFLAGS= - # Identity of this package. - PACKAGE_NAME='GStreamer OpenGL Plug-ins' - PACKAGE_TARNAME='gst-plugins-gl' --PACKAGE_VERSION='0.10.3' --PACKAGE_STRING='GStreamer OpenGL Plug-ins 0.10.3' -+PACKAGE_VERSION='0.10.3.1' -+PACKAGE_STRING='GStreamer OpenGL Plug-ins 0.10.3.1' - PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' - PACKAGE_URL='' - -@@ -621,8 +621,10 @@ LIBOBJS - GST_PLUGIN_LDFLAGS - GST_LIB_LDFLAGS - GST_ALL_LDFLAGS -+GST_OBJCFLAGS - GST_CXXFLAGS - GST_PLUGINS_GL_CFLAGS -+GST_OPTION_OBJCFLAGS - GST_OPTION_CXXFLAGS - GST_OPTION_CFLAGS - DEPRECATED_CFLAGS -@@ -639,6 +641,8 @@ DEFAULT_VIDEOSINK - DEFAULT_AUDIOSRC - DEFAULT_AUDIOSINK - GST_LEVEL_DEFAULT -+ERROR_OBJCFLAGS -+WARNING_OBJCFLAGS - ERROR_CXXFLAGS - WARNING_CXXFLAGS - ERROR_CFLAGS -@@ -698,6 +702,10 @@ HAVE_PNG_TRUE - HAVE_PNG - LIBPNG_LIBS - LIBPNG_CFLAGS -+GST_FSL_LIBS -+GST_FSL_CFLAGS -+USE_VIVANTE_FALSE -+USE_VIVANTE_TRUE - GSTPB_PREFIX - GST_PREFIX - GLIB_PREFIX -@@ -723,6 +731,8 @@ GL_BACKEND_WIN32_FALSE - GL_BACKEND_WIN32_TRUE - GL_BACKEND_COCOA_FALSE - GL_BACKEND_COCOA_TRUE -+GL_BACKEND_FBES2_FALSE -+GL_BACKEND_FBES2_TRUE - GL_BACKEND_X11ES2_FALSE - GL_BACKEND_X11ES2_TRUE - GL_BACKEND_X11_FALSE -@@ -730,11 +740,11 @@ GL_BACKEND_X11_TRUE - OPENGL_ES2 - GL_BACKEND - GL_LIBS --HAVE_GLES2 --HAVE_EGL - HAVE_GLEW - HAVE_GLU - HAVE_GL -+HAVE_GLES2 -+HAVE_EGL - HAVE_X - X_EXTRA_LIBS - X_LIBS -@@ -844,8 +854,8 @@ ACLOCAL_AMFLAGS - am__fastdepOBJC_FALSE - am__fastdepOBJC_TRUE - OBJCDEPMODE --OBJC_LDFLAGS - ac_ct_OBJC -+OBJCFLAGS - OBJC - CPP - OTOOL64 -@@ -869,7 +879,6 @@ SED - am__fastdepCC_FALSE - am__fastdepCC_TRUE - CCDEPMODE --am__nodep - AMDEPBACKSLASH - AMDEP_FALSE - AMDEP_TRUE -@@ -895,16 +904,6 @@ GST_CURRENT - GST_MAJORMINOR - AM_BACKSLASH - AM_DEFAULT_VERBOSITY --AM_DEFAULT_V --AM_V --host_os --host_vendor --host_cpu --host --build_os --build_vendor --build_cpu --build - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE -@@ -936,6 +935,18 @@ am__isrc - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM -+target_os -+target_vendor -+target_cpu -+target -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build - target_alias - host_alias - build_alias -@@ -995,6 +1006,7 @@ enable_nls - enable_rpath - with_libiconv_prefix - with_libintl_prefix -+enable_fatal_warnings - enable_debug - enable_profiling - enable_valgrind -@@ -1029,6 +1041,8 @@ LDFLAGS - LIBS - CPPFLAGS - CPP -+OBJC -+OBJCFLAGS - PKG_CONFIG - VALGRIND_CFLAGS - VALGRIND_LIBS -@@ -1611,7 +1625,7 @@ if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures GStreamer OpenGL Plug-ins 0.10.3 to adapt to many kinds of systems. -+\`configure' configures GStreamer OpenGL Plug-ins 0.10.3.1 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1680,12 +1694,13 @@ X features: - System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -+ --target=TARGET configure for building compilers for TARGET [HOST] - _ACEOF - fi - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of GStreamer OpenGL Plug-ins 0.10.3:";; -+ short | recursive ) echo "Configuration of GStreamer OpenGL Plug-ins 0.10.3.1:";; - esac - cat <<\_ACEOF - -@@ -1706,6 +1721,8 @@ Optional Features: - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-nls do not use Native Language Support - --disable-rpath do not hardcode runtime library paths -+ --disable-fatal-warnings -+ Don't turn compiler warnings into fatal errors - --disable-debug disable addition of -g debugging info - --enable-profiling adds -pg to compiler commandline, for profiling - --disable-valgrind disable run-time valgrind detection -@@ -1725,7 +1742,7 @@ Optional Features: - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use -+ --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR -@@ -1769,6 +1786,8 @@ Some influential environment variables: - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor -+ OBJC Objective C compiler command -+ OBJCFLAGS Objective C compiler flags - PKG_CONFIG path to pkg-config utility - VALGRIND_CFLAGS - C compiler flags for VALGRIND, overriding pkg-config -@@ -1902,7 +1921,7 @@ fi - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --GStreamer OpenGL Plug-ins configure 0.10.3 -+GStreamer OpenGL Plug-ins configure 0.10.3.1 - generated by GNU Autoconf 2.68 - - Copyright (C) 2010 Free Software Foundation, Inc. -@@ -2177,6 +2196,44 @@ $as_echo "$ac_res" >&6; } - - } # ac_fn_c_check_func - -+# ac_fn_objc_try_compile LINENO -+# ----------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_objc_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_objc_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_objc_try_compile -+ - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES - # -------------------------------------------- - # Tries to find the compile-time value of EXPR in a program that includes -@@ -2616,7 +2673,7 @@ cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by GStreamer OpenGL Plug-ins $as_me 0.10.3, which was -+It was created by GStreamer OpenGL Plug-ins $as_me 0.10.3.1, which was - generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ -@@ -2966,12 +3023,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- --am__api_version='1.11' -- - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -3001,6 +3052,122 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. - ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -+# Make sure we can run config.sub. -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if ${ac_cv_build+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+esac -+build=$ac_cv_build -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if ${ac_cv_host+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+esac -+host=$ac_cv_host -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -+$as_echo_n "checking target system type... " >&6; } -+if ${ac_cv_target+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$target_alias" = x; then -+ ac_cv_target=$ac_cv_host -+else -+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -+$as_echo "$ac_cv_target" >&6; } -+case $ac_cv_target in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; -+esac -+target=$ac_cv_target -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_target -+shift -+target_cpu=$1 -+target_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+target_os=$* -+IFS=$ac_save_IFS -+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac -+ -+ -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+test -n "$target_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && -+ program_prefix=${target_alias}- -+ -+ -+ -+ -+am__api_version='1.11' -+ - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -3437,7 +3604,7 @@ fi - - # Define the identity of the package. - PACKAGE='gst-plugins-gl' -- VERSION='0.10.3' -+ VERSION='0.10.3.1' - - - cat >>confdefs.h <<_ACEOF -@@ -3467,11 +3634,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. --# Always define AMTAR for backward compatibility. Yes, it's still used --# in the wild :-( We should find a proper way to deprecate it ... --AMTAR='$${TAR-tar}' -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} - --am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - -@@ -3479,9 +3646,9 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - -- PACKAGE_VERSION_MAJOR=$(echo 0.10.3 | cut -d'.' -f1) -- PACKAGE_VERSION_MINOR=$(echo 0.10.3 | cut -d'.' -f2) -- PACKAGE_VERSION_MICRO=$(echo 0.10.3 | cut -d'.' -f3) -+ PACKAGE_VERSION_MAJOR=$(echo 0.10.3.1 | cut -d'.' -f1) -+ PACKAGE_VERSION_MINOR=$(echo 0.10.3.1 | cut -d'.' -f2) -+ PACKAGE_VERSION_MICRO=$(echo 0.10.3.1 | cut -d'.' -f3) - - - -@@ -3492,7 +3659,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 - $as_echo_n "checking nano version... " >&6; } - -- NANO=$(echo 0.10.3 | cut -d'.' -f4) -+ NANO=$(echo 0.10.3.1 | cut -d'.' -f4) - - if test x"$NANO" = x || test "x$NANO" = "x0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 -@@ -3546,76 +3713,6 @@ fi - - - --# Make sure we can run config.sub. --$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 --$as_echo_n "checking build system type... " >&6; } --if ${ac_cv_build+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_build_alias=$build_alias --test "x$ac_build_alias" = x && -- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` --test "x$ac_build_alias" = x && -- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 --ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 --$as_echo "$ac_cv_build" >&6; } --case $ac_cv_build in --*-*-*) ;; --*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; --esac --build=$ac_cv_build --ac_save_IFS=$IFS; IFS='-' --set x $ac_cv_build --shift --build_cpu=$1 --build_vendor=$2 --shift; shift --# Remember, the first character of IFS is used to create $*, --# except with old shells: --build_os=$* --IFS=$ac_save_IFS --case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 --$as_echo_n "checking host system type... " >&6; } --if ${ac_cv_host+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "x$host_alias" = x; then -- ac_cv_host=$ac_cv_build --else -- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 --$as_echo "$ac_cv_host" >&6; } --case $ac_cv_host in --*-*-*) ;; --*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; --esac --host=$ac_cv_host --ac_save_IFS=$IFS; IFS='-' --set x $ac_cv_host --shift --host_cpu=$1 --host_vendor=$2 --shift; shift --# Remember, the first character of IFS is used to create $*, --# except with old shells: --host_os=$* --IFS=$ac_save_IFS --case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -- - - - # Check whether --enable-silent-rules was given. -@@ -3628,33 +3725,6 @@ yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; - esac --am_make=${MAKE-make} --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 --$as_echo_n "checking whether $am_make supports nested variables... " >&6; } --if ${am_cv_make_support_nested_variables+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if $as_echo 'TRUE=$(BAR$(V)) --BAR0=false --BAR1=true --V=1 --am__doit: -- @$(TRUE) --.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then -- am_cv_make_support_nested_variables=yes --else -- am_cv_make_support_nested_variables=no --fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 --$as_echo "$am_cv_make_support_nested_variables" >&6; } --if test $am_cv_make_support_nested_variables = yes; then -- AM_V='$(V)' -- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' --else -- AM_V=$AM_DEFAULT_VERBOSITY -- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY --fi - AM_BACKSLASH='\' - - -@@ -3997,8 +4067,8 @@ esac - - - --macro_version='2.4.2' --macro_revision='1.3337' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4135,7 +4205,6 @@ fi - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -- am__nodep='_no' - fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= -@@ -4949,7 +5018,6 @@ else - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -- rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -5009,7 +5077,7 @@ else - break - fi - ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -5753,11 +5821,6 @@ else - lt_cv_sys_max_cmd_len=196608 - ;; - -- os2*) -- # The test takes a long time on OS/2. -- lt_cv_sys_max_cmd_len=8192 -- ;; -- - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -@@ -5797,7 +5860,7 @@ else - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do -@@ -6223,7 +6286,7 @@ irix5* | irix6* | nonstopux*) - lt_cv_deplibs_check_method=pass_all - ;; - --# This must be glibc/ELF. -+# This must be Linux ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -6861,13 +6924,13 @@ old_postuninstall_cmds= - if test -n "$RANLIB"; then - case $host_os in - openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - - case $host_os in -@@ -7014,7 +7077,6 @@ for ac_symprfx in "" "_"; do - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ - " {last_section=section; section=\$ 3};"\ --" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -@@ -7403,7 +7465,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } - CFLAGS="$SAVE_CFLAGS" - fi - ;; --*-*solaris*) -+sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -@@ -7414,20 +7476,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -- yes*) -- case $host in -- i?86-*-solaris*) -- LD="${LD-ld} -m elf_x86_64" -- ;; -- sparc*-*-solaris*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- # GNU ld 2.21 introduced _sol2 emulations. Use them if available. -- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -- LD="${LD-ld}_sol2" -- fi -- ;; -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" -@@ -8067,13 +8116,7 @@ else - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? -- # If there is a non-empty error log, and "single_module" -- # appears in it, assume the flag caused a linker warning -- if test -s conftest.err && $GREP single_module conftest.err; then -- cat conftest.err >&5 -- # Otherwise, if the output was created with a 0 exit code from -- # the compiler, it worked. -- elif test -f libconftest.dylib && test $_lt_result -eq 0; then -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 -@@ -8084,7 +8127,6 @@ else - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 - $as_echo "$lt_cv_apple_cc_single_mod" >&6; } -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 - $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } - if ${lt_cv_ld_exported_symbols_list+:} false; then : -@@ -8117,7 +8159,6 @@ rm -f core conftest.err conftest.$ac_objext \ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 - $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 - $as_echo_n "checking for -force_load linker flag... " >&6; } - if ${lt_cv_ld_force_load+:} false; then : -@@ -8139,9 +8180,7 @@ _LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? -- if test -s conftest.err && $GREP force_load conftest.err; then -- cat conftest.err >&5 -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 -@@ -8542,22 +8581,7 @@ fi - - # Check whether --with-pic was given. - if test "${with_pic+set}" = set; then : -- withval=$with_pic; lt_p=${PACKAGE-default} -- case $withval in -- yes|no) pic_mode=$withval ;; -- *) -- pic_mode=default -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for lt_pkg in $withval; do -- IFS="$lt_save_ifs" -- if test "X$lt_pkg" = "X$lt_p"; then -- pic_mode=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac -+ withval=$with_pic; pic_mode="$withval" - else - pic_mode=default - fi -@@ -8635,10 +8659,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - -- -- -- -- - test -z "$LN_S" && LN_S="ln -s" - - -@@ -9098,9 +9118,7 @@ lt_prog_compiler_static= - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' -- if test -n "$lt_prog_compiler_pic"; then -- lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" -- fi -+ lt_prog_compiler_pic='-Xcompiler -fPIC' - ;; - esac - else -@@ -9191,33 +9209,18 @@ lt_prog_compiler_static= - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) -+ *Sun\ F* | *Sun*Fortran*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; -- *Sun\ F* | *Sun*Fortran*) -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- lt_prog_compiler_wl='-Qoption ld ' -- ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; -- *Intel*\ [CF]*Compiler*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-fPIC' -- lt_prog_compiler_static='-static' -- ;; -- *Portland\ Group*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-fpic' -- lt_prog_compiler_static='-Bstatic' -- ;; - esac - ;; - esac -@@ -9579,6 +9582,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported -@@ -9831,7 +9835,8 @@ _LT_EOF - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ -@@ -10211,7 +10216,6 @@ fi - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes -- exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' -@@ -10257,7 +10261,6 @@ fi - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - 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\"`' -- - else - whole_archive_flag_spec='' - fi -@@ -10286,6 +10289,10 @@ fi - hardcode_shlibpath_var=no - ;; - -+ freebsd1*) -+ ld_shlibs=no -+ ;; -+ - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little -@@ -10298,7 +10305,7 @@ fi - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2.*) -+ freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes -@@ -10337,6 +10344,7 @@ fi - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes -@@ -10960,6 +10968,11 @@ esac - - - -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - -@@ -11049,7 +11062,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -11058,7 +11071,7 @@ aix3*) - ;; - - aix[4-9]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -11123,7 +11136,7 @@ beos*) - ;; - - bsdi[45]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -11262,7 +11275,7 @@ darwin* | rhapsody*) - ;; - - dgux*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -11270,6 +11283,10 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -11277,7 +11294,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[23].*) objformat=aout ;; -+ freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -11295,7 +11312,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2.*) -+ freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) -@@ -11315,7 +11332,7 @@ freebsd* | dragonfly*) - ;; - - gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -@@ -11326,7 +11343,7 @@ gnu*) - ;; - - haiku*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" -@@ -11387,7 +11404,7 @@ hpux9* | hpux10* | hpux11*) - ;; - - interix[3-9]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -11403,7 +11420,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - else - version_type=irix - fi ;; -@@ -11440,9 +11457,9 @@ linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - --# This must be glibc/ELF. -+# This must be Linux ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11536,7 +11553,7 @@ netbsd*) - ;; - - newsos6) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -11605,7 +11622,7 @@ rdos*) - ;; - - solaris*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11630,7 +11647,7 @@ sunos4*) - ;; - - sysv4 | sysv4.3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -11654,7 +11671,7 @@ sysv4 | sysv4.3*) - - sysv4*MP*) - if test -d /usr/nec ;then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -11685,7 +11702,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - - tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11695,7 +11712,7 @@ tpf*) - ;; - - uts4*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -12477,8 +12494,6 @@ CC="$lt_save_CC" - - - -- -- - ac_config_commands="$ac_config_commands libtool" - - -@@ -12487,9 +12502,13 @@ CC="$lt_save_CC" - # Only expand once: - - -- -+ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - if test -n "$ac_tool_prefix"; then -- for ac_prog in objcc objc gcc cc CC -+ for ac_prog in gcc objcc objc cc CC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -@@ -12533,7 +12552,7 @@ fi - fi - if test -z "$OBJC"; then - ac_ct_OBJC=$OBJC -- for ac_prog in objcc objc gcc cc CC -+ for ac_prog in gcc objcc objc cc CC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -12576,7 +12595,7 @@ fi - done - - if test "x$ac_ct_OBJC" = x; then -- OBJC="none" -+ OBJC="gcc" - else - case $cross_compiling:$ac_tool_warned in - yes:) -@@ -12588,175 +12607,151 @@ esac - fi - fi - -+# Provide some information about the compiler. -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --OBJC_LDFLAGS="-lobjc" -- --if test "x$OBJC" != xnone ; then -- --depcc="$OBJC" am_compiler_list='gcc3 gcc' -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } --if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } -+if ${ac_cv_objc_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- rm -rf conftest.dir -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -- -- am_cv_OBJC_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -- fi -- am__universal=false -- -- -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -- am__obj=sub/conftest.${OBJEXT-o} -- am__minus_obj="-o $am__obj" -- case $depmode in -- gcc) -- # This depmode causes a compiler race in universal mode. -- test "$am__universal" = false || continue -- ;; -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -- # not run yet. These depmodes are late enough in the game, and -- # so weak that their functioning should not be impacted. -- am__obj=conftest.${OBJEXT-o} -- am__minus_obj= -- ;; -- none) break ;; -- esac -- if depmode=$depmode \ -- source=sub/conftest.c object=$am__obj \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_OBJC_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif - -- cd .. -- rm -rf conftest.dir -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_objc_try_compile "$LINENO"; then : -+ ac_compiler_gnu=yes - else -- am_cv_OBJC_dependencies_compiler_type=none -+ ac_compiler_gnu=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_objc_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 --$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } --OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type -- -- if -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then -- am__fastdepOBJC_TRUE= -- am__fastdepOBJC_FALSE='#' -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5 -+$as_echo "$ac_cv_objc_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GOBJC=yes - else -- am__fastdepOBJC_TRUE='#' -- am__fastdepOBJC_FALSE= -+ GOBJC= - fi -+ac_test_OBJCFLAGS=${OBJCFLAGS+set} -+ac_save_OBJCFLAGS=$OBJCFLAGS -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 -+$as_echo_n "checking whether $OBJC accepts -g... " >&6; } -+if ${ac_cv_prog_objc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_save_objc_werror_flag=$ac_objc_werror_flag -+ ac_objc_werror_flag=yes -+ ac_cv_prog_objc_g=no -+ OBJCFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Objective C compiler works" >&5 --$as_echo_n "checking if Objective C compiler works... " >&6; } -- cat >>conftest.m < --@interface Moo:Object -+int -+main () - { -+ -+ ; -+ return 0; - } --- moo; --int main(); --@end -+_ACEOF -+if ac_fn_objc_try_compile "$LINENO"; then : -+ ac_cv_prog_objc_g=yes -+else -+ OBJCFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --@implementation Moo --- moo -+int -+main () - { -- exit(0); -+ -+ ; -+ return 0; - } -+_ACEOF -+if ac_fn_objc_try_compile "$LINENO"; then : -+ -+else -+ ac_objc_werror_flag=$ac_save_objc_werror_flag -+ OBJCFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --int main() -+int -+main () - { -- id moo; -- moo = [Moo new]; -- [moo moo]; -- return 1; -+ -+ ; -+ return 0; - } --@end --EOF -- ${OBJC} conftest.m ${OBJC_LDFLAGS} >&5 2>&5 -- if test -f a.out -o -f a.exe ; then -- result=yes -+_ACEOF -+if ac_fn_objc_try_compile "$LINENO"; then : -+ ac_cv_prog_objc_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_objc_werror_flag=$ac_save_objc_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5 -+$as_echo "$ac_cv_prog_objc_g" >&6; } -+if test "$ac_test_OBJCFLAGS" = set; then -+ OBJCFLAGS=$ac_save_OBJCFLAGS -+elif test $ac_cv_prog_objc_g = yes; then -+ if test "$GOBJC" = yes; then -+ OBJCFLAGS="-g -O2" - else -- result=no -- echo failed program is: >&5 -- cat conftest.m >&5 -+ OBJCFLAGS="-g" - fi -- rm -f conftest.m a.out a.exe -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 --$as_echo "$result" >&6; } - else -+ if test "$GOBJC" = yes; then -+ OBJCFLAGS="-O2" -+ else -+ OBJCFLAGS= -+ fi -+fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$OBJC" am_compiler_list='gcc3 gcc' - -@@ -12771,7 +12766,6 @@ else - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -- rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -12829,7 +12823,7 @@ else - break - fi - ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -12884,9 +12878,6 @@ else - fi - - --fi -- -- - - GST_REQ=0.10.35 - GSTPB_REQ=0.10.35 -@@ -14907,6 +14898,21 @@ _ACEOF - - - -+ # Check whether --enable-fatal-warnings was given. -+if test "${enable_fatal_warnings+set}" = set; then : -+ enableval=$enable_fatal_warnings; -+ case "${enableval}" in -+ yes) FATAL_WARNINGS=yes ;; -+ no) FATAL_WARNINGS=no ;; -+ *) as_fn_error $? "bad value ${enableval} for --disable-fatal-warnings" "$LINENO" 5 ;; -+ esac -+ -+else -+ FATAL_WARNINGS=$GST_GIT -+fi -+ -+ -+ - # Check whether --enable-debug was given. - if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -@@ -15246,13 +15252,13 @@ _ACEOF - - if test "x$GST_GCOV_ENABLED" = "xyes" - then -- CFLAGS="-O0" -+ CFLAGS="$CFLAGS -O0" - -- CXXFLAGS="-O0" -+ CXXFLAGS="$CXXFLAGS -O0" - -- FFLAGS="-O0" -+ FFLAGS="$FFLAGS -O0" - -- CCASFLAGS="-O0" -+ CCASFLAGS="$CCASFLAGS -O0" - - { $as_echo "$as_me:${as_lineno-$LINENO}: gcov enabled, setting CFLAGS and friends to $CFLAGS" >&5 - $as_echo "$as_me: gcov enabled, setting CFLAGS and friends to $CFLAGS" >&6;} -@@ -15521,10 +15527,9 @@ _ACEOF - - - -- -- case "x${host_cpu}" in -+ case "x${target_cpu}" in - xi?86 | xk? | xi?86_64) -- case $host_os in -+ case $target_os in - solaris*) - ac_fn_c_check_decl "$LINENO" "__i386" "ac_cv_have_decl___i386" "$ac_includes_default" - if test "x$ac_cv_have_decl___i386" = xyes; then : -@@ -15560,7 +15565,7 @@ $as_echo "#define HAVE_CPU_X86_64 1" >>confdefs.h - $as_echo "#define HAVE_CPU_I386 1" >>confdefs.h - - -- case "x${host_cpu}" in -+ case "x${target_cpu}" in - xi386 | xi486) ;; - *) - -@@ -15981,6 +15986,11 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - -+cat >>confdefs.h <<_ACEOF -+#define TARGET_CPU "$target_cpu" -+_ACEOF -+ -+ - - # Check whether --enable-largefile was given. - if test "${enable_largefile+set}" = set; then : -@@ -16735,7 +16745,6 @@ else - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -- rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -16795,7 +16804,7 @@ else - break - fi - ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -17413,7 +17422,6 @@ else - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -- rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -17473,7 +17481,7 @@ else - break - fi - ;; -- msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -17693,6 +17701,7 @@ export_dynamic_flag_spec_CXX= - hardcode_direct_CXX=no - hardcode_direct_absolute_CXX=no - hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_flag_spec_ld_CXX= - hardcode_libdir_separator_CXX= - hardcode_minus_L_CXX=no - hardcode_shlibpath_var_CXX=unsupported -@@ -18276,7 +18285,6 @@ fi - hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - 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\"`' -- - else - whole_archive_flag_spec_CXX='' - fi -@@ -18321,7 +18329,7 @@ fi - esac - ;; - -- freebsd2.*) -+ freebsd[12]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no -@@ -18997,7 +19005,6 @@ _lt_libdeps_save_CFLAGS=$CFLAGS - case "$CC $CFLAGS " in #( - *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; - *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; --*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; - esac - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -@@ -19787,9 +19794,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in -- cl*) -- exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -- ;; -+ cl*) ;; - *) - 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' - exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -@@ -19945,6 +19950,8 @@ esac - - - -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - -@@ -19970,7 +19977,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -19979,7 +19986,7 @@ aix3*) - ;; - - aix[4-9]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -20044,7 +20051,7 @@ beos*) - ;; - - bsdi[45]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -20181,7 +20188,7 @@ darwin* | rhapsody*) - ;; - - dgux*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -20189,6 +20196,10 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -20196,7 +20207,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[23].*) objformat=aout ;; -+ freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -20214,7 +20225,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2.*) -+ freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) -@@ -20234,7 +20245,7 @@ freebsd* | dragonfly*) - ;; - - gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -@@ -20245,7 +20256,7 @@ gnu*) - ;; - - haiku*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" -@@ -20306,7 +20317,7 @@ hpux9* | hpux10* | hpux11*) - ;; - - interix[3-9]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -20322,7 +20333,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - else - version_type=irix - fi ;; -@@ -20359,9 +20370,9 @@ linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - --# This must be glibc/ELF. -+# This must be Linux ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -20455,7 +20466,7 @@ netbsd*) - ;; - - newsos6) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -20524,7 +20535,7 @@ rdos*) - ;; - - solaris*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -20549,7 +20560,7 @@ sunos4*) - ;; - - sysv4 | sysv4.3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -20573,7 +20584,7 @@ sysv4 | sysv4.3*) - - sysv4*MP*) - if test -d /usr/nec ;then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -20604,7 +20615,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - - tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -20614,7 +20625,7 @@ tpf*) - ;; - - uts4*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -21724,7 +21735,7 @@ _ACEOF - - - -- GLIB_REQ=2.6 -+ GLIB_REQ=2.22 - if test "x$GLIB_REQ" = "x" - then - as_fn_error $? "Please specify a required version for GLib 2.0" "$LINENO" 5 -@@ -21895,7 +21906,57 @@ fi - echo host is $host - case $host in - *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+ save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fbGetDisplay in -lEGL" >&5 -+$as_echo_n "checking for fbGetDisplay in -lEGL... " >&6; } -+if ${ac_cv_lib_EGL_fbGetDisplay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lEGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char fbGetDisplay (); -+int -+main () -+{ -+return fbGetDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_EGL_fbGetDisplay=yes -+else -+ ac_cv_lib_EGL_fbGetDisplay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_fbGetDisplay" >&5 -+$as_echo "$ac_cv_lib_EGL_fbGetDisplay" >&6; } -+if test "x$ac_cv_lib_EGL_fbGetDisplay" = xyes; then : -+ HAVE_EGL_FB=yes -+else -+ HAVE_EGL_FB=no -+fi -+ -+ if test "x$HAVE_EGL_FB" = "xyes"; then -+ GL_LIBS="$LIBS -lGLESv2 -lEGL" -+ GL_BACKEND=fbES2 -+ GL_TYPE=gles -+ save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 - $as_echo_n "checking for X... " >&6; } - - -@@ -22608,12 +22669,159 @@ $as_echo "$as_me: cannot find X11 development files" >&6;} - CFLAGS="$ac_cflags_save" - CPPFLAGS="$ac_cppflags_save" - -- save_CPPFLAGS="$CPPFLAGS" -- save_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $X_CFLAGS" -- LIBS="$LIBS $X_LIBS" -- #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) -- for ac_header in GL/gl.h -+ CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" -+ LIBS="$LIBS $X_LIBS" -+ for ac_header in EGL/egl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" -+if test "x$ac_cv_header_EGL_egl_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_EGL_EGL_H 1 -+_ACEOF -+ HAVE_EGL=yes -+else -+ HAVE_EGL=no -+fi -+ -+done -+ -+ if test "x$HAVE_EGL" = "xyes"; then -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -lEGL" >&5 -+$as_echo_n "checking for eglGetError in -lEGL... " >&6; } -+if ${ac_cv_lib_EGL_eglGetError+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lEGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char eglGetError (); -+int -+main () -+{ -+return eglGetError (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_EGL_eglGetError=yes -+else -+ ac_cv_lib_EGL_eglGetError=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglGetError" >&5 -+$as_echo "$ac_cv_lib_EGL_eglGetError" >&6; } -+if test "x$ac_cv_lib_EGL_eglGetError" = xyes; then : -+ HAVE_EGL=yes -+else -+ HAVE_EGL=no -+fi -+ -+ if test "x$HAVE_EGL" = "xyes"; then -+ ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" -+if test "x$ac_cv_header_EGL_egl_h" = xyes; then : -+ : -+else -+ HAVE_EGL=no -+fi -+ -+ -+ if test "x$HAVE_EGL" = "xyes"; then -+ : -+ else -+ as_fn_error $? "EGL is required" "$LINENO" 5 -+ fi -+ else -+ as_fn_error $? "EGL is required" "$LINENO" 5 -+ fi -+ -+ -+ -+ s_LIBS="$LIBS" -+ LIBS="-lEGL $LIBS" -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGLESv2" >&5 -+$as_echo_n "checking for glTexImage2D in -lGLESv2... " >&6; } -+if ${ac_cv_lib_GLESv2_glTexImage2D+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lGLESv2 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char glTexImage2D (); -+int -+main () -+{ -+return glTexImage2D (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_GLESv2_glTexImage2D=yes -+else -+ ac_cv_lib_GLESv2_glTexImage2D=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glTexImage2D" >&5 -+$as_echo "$ac_cv_lib_GLESv2_glTexImage2D" >&6; } -+if test "x$ac_cv_lib_GLESv2_glTexImage2D" = xyes; then : -+ HAVE_GLES2=yes -+else -+ HAVE_GLES2=no -+fi -+ -+ if test "x$HAVE_GLES2" = "xyes"; then -+ ac_fn_c_check_header_mongrel "$LINENO" "GLES2/gl2.h" "ac_cv_header_GLES2_gl2_h" "$ac_includes_default" -+if test "x$ac_cv_header_GLES2_gl2_h" = xyes; then : -+ : -+else -+ HAVE_GLES2=no -+fi -+ -+ -+ if test "x$HAVE_GLES2" = "xyes"; then -+ : -+ else -+ as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 -+ fi -+ else -+ as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 -+ fi -+ -+ -+ -+ LIBS="$s_LIBS" -+ GL_LIBS="$LIBS -lGLESv2 -lEGL" -+ GL_BACKEND=x11ES2 -+ GL_TYPE=gles -+ save_CPPFLAGS="$save_CPPFLAGS -DLINUX" -+ else -+ #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) -+ for ac_header in GL/gl.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" - if test "x$ac_cv_header_GL_gl_h" = xyes; then : -@@ -22627,7 +22835,7 @@ fi - - done - -- if test "x$HAVE_GL" = "xyes"; then -+ if test "x$HAVE_GL" = "xyes"; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGL" >&5 - $as_echo_n "checking for glTexImage2D in -lGL... " >&6; } -@@ -22817,33 +23025,28 @@ fi - - - -- GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" -- GL_BACKEND=x11 -- GL_TYPE=gl -- else -- for ac_header in EGL/egl.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" --if test "x$ac_cv_header_EGL_egl_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_EGL_EGL_H 1 --_ACEOF -- HAVE_EGL=yes --else -- HAVE_EGL=no --fi -- --done -- -- if test "x$HAVE_EGL" = "xyes"; then -+ GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" -+ GL_BACKEND=x11 -+ GL_TYPE=gl -+ else -+ as_fn_error $? "GL or EGL is required, consider installing libgl1-mesa-dev" "$LINENO" 5 -+ fi -+ fi -+ fi -+ CPPFLAGS="$save_CPPFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ *-darwin*) -+ save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -lEGL" >&5 --$as_echo_n "checking for eglGetError in -lEGL... " >&6; } --if ${ac_cv_lib_EGL_eglGetError+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lGLEW" >&5 -+$as_echo_n "checking for glewInit in -lGLEW... " >&6; } -+if ${ac_cv_lib_GLEW_glewInit+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lEGL $LIBS" -+LIBS="-lGLEW $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -22853,169 +23056,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - #ifdef __cplusplus - extern "C" - #endif --char eglGetError (); -+char glewInit (); - int - main () - { --return eglGetError (); -+return glewInit (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_EGL_eglGetError=yes -+ ac_cv_lib_GLEW_glewInit=yes - else -- ac_cv_lib_EGL_eglGetError=no -+ ac_cv_lib_GLEW_glewInit=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglGetError" >&5 --$as_echo "$ac_cv_lib_EGL_eglGetError" >&6; } --if test "x$ac_cv_lib_EGL_eglGetError" = xyes; then : -- HAVE_EGL=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLEW_glewInit" >&5 -+$as_echo "$ac_cv_lib_GLEW_glewInit" >&6; } -+if test "x$ac_cv_lib_GLEW_glewInit" = xyes; then : -+ HAVE_GLEW=yes - else -- HAVE_EGL=no --fi -- -- if test "x$HAVE_EGL" = "xyes"; then -- ac_fn_c_check_header_mongrel "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" --if test "x$ac_cv_header_EGL_egl_h" = xyes; then : -- : --else -- HAVE_EGL=no --fi -- -- -- if test "x$HAVE_EGL" = "xyes"; then -- : -- else -- as_fn_error $? "EGL is required" "$LINENO" 5 -- fi -- else -- as_fn_error $? "EGL is required" "$LINENO" 5 -- fi -- -- -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexImage2D in -lGLESv2" >&5 --$as_echo_n "checking for glTexImage2D in -lGLESv2... " >&6; } --if ${ac_cv_lib_GLESv2_glTexImage2D+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lGLESv2 $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char glTexImage2D (); --int --main () --{ --return glTexImage2D (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_GLESv2_glTexImage2D=yes --else -- ac_cv_lib_GLESv2_glTexImage2D=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glTexImage2D" >&5 --$as_echo "$ac_cv_lib_GLESv2_glTexImage2D" >&6; } --if test "x$ac_cv_lib_GLESv2_glTexImage2D" = xyes; then : -- HAVE_GLES2=yes --else -- HAVE_GLES2=no --fi -- -- if test "x$HAVE_GLES2" = "xyes"; then -- ac_fn_c_check_header_mongrel "$LINENO" "GLES2/gl2.h" "ac_cv_header_GLES2_gl2_h" "$ac_includes_default" --if test "x$ac_cv_header_GLES2_gl2_h" = xyes; then : -- : --else -- HAVE_GLES2=no --fi -- -- -- if test "x$HAVE_GLES2" = "xyes"; then -- : -- else -- as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 -- fi -- else -- as_fn_error $? "OpenGLES2 is required" "$LINENO" 5 -- fi -- -- -- -- GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" -- GL_BACKEND=x11ES2 -- GL_TYPE=gles -- else -- as_fn_error $? "GL or EGL is required, consider installing libgl1-mesa-dev" "$LINENO" 5 -- fi -- fi -- CPPFLAGS="$save_CPPFLAGS" -- LIBS="$save_LIBS" -- ;; -- *-darwin*) -- save_CPPFLAGS="$CPPFLAGS" -- save_LIBS="$LIBS" -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lGLEW" >&5 --$as_echo_n "checking for glewInit in -lGLEW... " >&6; } --if ${ac_cv_lib_GLEW_glewInit+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lGLEW $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char glewInit (); --int --main () --{ --return glewInit (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_GLEW_glewInit=yes --else -- ac_cv_lib_GLEW_glewInit=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLEW_glewInit" >&5 --$as_echo "$ac_cv_lib_GLEW_glewInit" >&6; } --if test "x$ac_cv_lib_GLEW_glewInit" = xyes; then : -- HAVE_GLEW=yes --else -- HAVE_GLEW=no -+ HAVE_GLEW=no - fi - - if test "x$HAVE_GLEW" = "xyes"; then -@@ -23271,6 +23335,14 @@ else - GL_BACKEND_X11ES2_FALSE= - fi - -+ if test "x$GL_BACKEND" = "xfbES2"; then -+ GL_BACKEND_FBES2_TRUE= -+ GL_BACKEND_FBES2_FALSE='#' -+else -+ GL_BACKEND_FBES2_TRUE='#' -+ GL_BACKEND_FBES2_FALSE= -+fi -+ - if test "x$GL_BACKEND" = "xcocoa"; then - GL_BACKEND_COCOA_TRUE= - GL_BACKEND_COCOA_FALSE='#' -@@ -23855,6 +23927,40 @@ GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMI - - - -+GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" -+GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" -+for ac_header in EGL/eglvivante.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "EGL/eglvivante.h" "ac_cv_header_EGL_eglvivante_h" "$ac_includes_default" -+if test "x$ac_cv_header_EGL_eglvivante_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_EGL_EGLVIVANTE_H 1 -+_ACEOF -+ HAVE_VIVANTE=yes -+else -+ HAVE_VIVANTE=no -+fi -+ -+done -+ -+if test "x$HAVE_VIVANTE" = "xyes"; then -+ if test "x$GST_FSL_CFLAGS" = "x"; then -+ as_fn_error $? "gstreamer-fsl is required" "$LINENO" 5 -+ fi -+ -+$as_echo "#define GPU_VIVANTE 1" >>confdefs.h -+ -+fi -+ if test "x$HAVE_VIVANTE" = "xyes"; then -+ USE_VIVANTE_TRUE= -+ USE_VIVANTE_FALSE='#' -+else -+ USE_VIVANTE_TRUE='#' -+ USE_VIVANTE_FALSE= -+fi -+ -+ -+ - - - pkg_failed=no -@@ -23996,8 +24102,6 @@ else - HAVE_JPEG="no" - fi - --JPEG_LIBS="$LIBS -ljpeg-mmx" --LIBS="$OLD_LIBS" - if test x$HAVE_JPEG != xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_set_defaults in -ljpeg" >&5 - $as_echo_n "checking for jpeg_set_defaults in -ljpeg... " >&6; } -@@ -24041,10 +24145,15 @@ else - HAVE_JPEG="no" - fi - -- JPEG_LIBS="-ljpeg" -+ if test x$HAVE_JPEG = xyes; then -+ JPEG_LIBS="-ljpeg" - - $as_echo "#define HAVE_JPEG 1 " >>confdefs.h - -+ fi -+else -+ JPEG_LIBS="$LIBS -ljpeg-mmx" -+ LIBS="$OLD_LIBS" - fi - - -@@ -25115,7 +25224,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - $as_echo "$flag_ok" >&6; } - - -- if test "x$GST_GIT" != "xno" -+ if test "x$FATAL_WARNINGS" != "xno" - then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 -@@ -25192,11 +25301,406 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - 'no%E_LOOP_NOT_ENTERED_AT_TOP' - do - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all,$f" >&5 --$as_echo_n "checking to see if compiler understands -errwarn=%all,$f... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all,$f" >&5 -+$as_echo_n "checking to see if compiler understands -errwarn=%all,$f... " >&6; } -+ -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -errwarn=%all,$f" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$save_CFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ -+ ERROR_CFLAGS="$ERROR_CFLAGS,$f" -+ -+ true -+ else -+ -+ true -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ done -+ -+ true -+ else -+ -+ true -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fno-strict-aliasing" >&5 -+$as_echo_n "checking to see if compiler understands -fno-strict-aliasing... " >&6; } -+ -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -fno-strict-aliasing" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$save_CFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ ERROR_CFLAGS="$ERROR_CFLAGS -fno-strict-aliasing" -+ true -+ else -+ -+ true -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ -+fi -+ fi -+ fi -+ -+ if test "x" != "x" -+ then -+ UNSUPPORTED="" -+ list="" -+ for each in $list -+ do -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands $each" >&5 -+$as_echo_n "checking to see if compiler understands $each... " >&6; } -+ -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $each" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$save_CFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ WARNING_CFLAGS="$WARNING_CFLAGS $each" -+ true -+ else -+ UNSUPPORTED="$UNSUPPORTED $each" -+ true -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ done -+ if test "X$UNSUPPORTED" != X ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 -+$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} -+ fi -+ fi -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CFLAGS to $WARNING_CFLAGS" >&5 -+$as_echo "$as_me: set WARNING_CFLAGS to $WARNING_CFLAGS" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CFLAGS to $ERROR_CFLAGS" >&5 -+$as_echo "$as_me: set ERROR_CFLAGS to $ERROR_CFLAGS" >&6;} -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands " >&5 -+$as_echo_n "checking to see if c++ compiler understands ... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS " -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$save_CPPFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ -+ true -+ else -+ -+ true -+ fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ -+ -+ -+ -+ ERROR_CXXFLAGS="" -+ WARNING_CXXFLAGS="" -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wall" >&5 -+$as_echo_n "checking to see if c++ compiler understands -Wall... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -Wall" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$save_CPPFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ WARNING_CXXFLAGS="$WARNING_CXXFLAGS -Wall" -+ true -+ else -+ -+ true -+ fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ -+ if test "x$FATAL_WARNINGS" != "xno" -+ then -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Werror" >&5 -+$as_echo_n "checking to see if c++ compiler understands -Werror... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -Werror" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$save_CPPFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror" -+ true -+ else -+ -+ true -+ fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ -+ if test "x$ERROR_CXXFLAGS" != "x" -+ then -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wno-non-virtual-dtor" >&5 -+$as_echo_n "checking to see if c++ compiler understands -Wno-non-virtual-dtor... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -Wno-non-virtual-dtor" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ flag_ok=yes -+else -+ flag_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$save_CPPFLAGS" -+ -+ if test "X$flag_ok" = Xyes ; then -+ ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wno-non-virtual-dtor" -+ true -+ else -+ -+ true -+ fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 -+$as_echo "$flag_ok" >&6; } -+ -+ -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -fno-strict-aliasing" >&5 -+$as_echo_n "checking to see if c++ compiler understands -fno-strict-aliasing... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -errwarn=%all,$f" - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -25209,50 +25713,50 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -+ CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- -- ERROR_CFLAGS="$ERROR_CFLAGS,$f" -- -+ ERROR_CXXFLAGS="$ERROR_CXXFLAGS -fno-strict-aliasing" - true - else - - true - fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 --$as_echo "$flag_ok" >&6; } - -- done -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- true -- else - -- true -- fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 - $as_echo "$flag_ok" >&6; } - -+ -+fi - else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fno-strict-aliasing" >&5 --$as_echo_n "checking to see if compiler understands -fno-strict-aliasing... " >&6; } - -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-strict-aliasing" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all" >&5 -+$as_echo_n "checking to see if c++ compiler understands -errwarn=%all... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -errwarn=%all" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -25265,41 +25769,54 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -+ CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CFLAGS="$ERROR_CFLAGS -fno-strict-aliasing" -+ ERROR_CXXFLAGS="$ERROR_CXXFLAGS -errwarn=%all" - true - else - - true - fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 - $as_echo "$flag_ok" >&6; } - -+ if test "x$ERROR_CXXFLAGS" != "x"; then -+ for f in 'no%E_EMPTY_DECLARATION' \ -+ 'no%E_STATEMENT_NOT_REACHED' \ -+ 'no%E_ARGUEMENT_MISMATCH' \ -+ 'no%E_MACRO_REDEFINED' \ -+ 'no%E_LOOP_NOT_ENTERED_AT_TOP' -+ do - --fi -- fi -- fi - -- if test "x" != "x" -- then -- UNSUPPORTED="" -- list="" -- for each in $list -- do - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands $each" >&5 --$as_echo_n "checking to see if compiler understands $each... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all,$f" >&5 -+$as_echo_n "checking to see if c++ compiler understands -errwarn=%all,$f... " >&6; } -+ -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -errwarn=%all,$f" -+ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $each" - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -25312,46 +25829,51 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -+ CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- WARNING_CFLAGS="$WARNING_CFLAGS $each" -+ ERROR_CXXFLAGS="$ERROR_CXXFLAGS - true - else -- UNSUPPORTED="$UNSUPPORTED $each" -+ $f" - true - fi -+ -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 - $as_echo "$flag_ok" >&6; } - -- done -- if test "X$UNSUPPORTED" != X ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 --$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} -+ done -+ fi - fi - fi - -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CFLAGS to $WARNING_CFLAGS" >&5 --$as_echo "$as_me: set WARNING_CFLAGS to $WARNING_CFLAGS" >&6;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CFLAGS to $ERROR_CFLAGS" >&5 --$as_echo "$as_me: set ERROR_CFLAGS to $ERROR_CFLAGS" >&6;} -- -+ if test "x" != "x" -+ then -+ UNSUPPORTED="" -+ list="" -+ for each in $list -+ do - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands " >&5 --$as_echo_n "checking to see if c++ compiler understands ... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands $each" >&5 -+$as_echo_n "checking to see if c++ compiler understands $each... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS " -+ CPPFLAGS="$CPPFLAGS $each" - - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -25380,10 +25902,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- -+ WARNING_CXXFLAGS="$WARNING_CXXFLAGS $each" - true - else -- -+ UNSUPPORTED="$UNSUPPORTED $each" - true - fi - -@@ -25397,27 +25919,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 - $as_echo "$flag_ok" >&6; } - -+ done -+ if test "X$UNSUPPORTED" != X ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: unsupported compiler flags: $UNSUPPORTED" >&5 -+$as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} -+ fi -+ fi - - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&5 -+$as_echo "$as_me: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&5 -+$as_echo "$as_me: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&6;} - -- ERROR_CXXFLAGS="" -- WARNING_CXXFLAGS="" - - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wall" >&5 --$as_echo_n "checking to see if c++ compiler understands -Wall... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands " >&5 -+$as_echo_n "checking to see if Objective C compiler understands ... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -Wall" -+ CPPFLAGS="$CPPFLAGS " - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25431,7 +25961,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25440,7 +25970,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- WARNING_CXXFLAGS="$WARNING_CXXFLAGS -Wall" -+ - true - else - -@@ -25458,22 +25988,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - $as_echo "$flag_ok" >&6; } - - -- if test "x$GST_GIT" != "xno" -- then - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Werror" >&5 --$as_echo_n "checking to see if c++ compiler understands -Werror... " >&6; } -+ ERROR_OBJCFLAGS="" -+ WARNING_OBJCFLAGS="" -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -Wall" >&5 -+$as_echo_n "checking to see if Objective C compiler understands -Wall... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -Werror" -+ CPPFLAGS="$CPPFLAGS -Wall" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25487,7 +26021,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25496,7 +26030,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror" -+ WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall" - true - else - -@@ -25514,22 +26048,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - $as_echo "$flag_ok" >&6; } - - -- if test "x$ERROR_CXXFLAGS" != "x" -- then -+ if test "x$FATAL_WARNINGS" != "xno" -+ then - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -Wno-non-virtual-dtor" >&5 --$as_echo_n "checking to see if c++ compiler understands -Wno-non-virtual-dtor... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -Werror" >&5 -+$as_echo_n "checking to see if Objective C compiler understands -Werror... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -Wno-non-virtual-dtor" -+ CPPFLAGS="$CPPFLAGS -Werror" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25543,7 +26077,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25552,7 +26086,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wno-non-virtual-dtor" -+ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror" - true - else - -@@ -25570,6 +26104,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - $as_echo "$flag_ok" >&6; } - - -+ if test "x$ERROR_OBJCFLAGS" != "x" -+ then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 < 2.19.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 < 2.19.8") 2>&5 -@@ -25580,17 +26116,17 @@ $as_echo "$flag_ok" >&6; } - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -fno-strict-aliasing" >&5 --$as_echo_n "checking to see if c++ compiler understands -fno-strict-aliasing... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -fno-strict-aliasing" >&5 -+$as_echo_n "checking to see if Objective C compiler understands -fno-strict-aliasing... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25604,7 +26140,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25613,7 +26149,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CXXFLAGS="$ERROR_CXXFLAGS -fno-strict-aliasing" -+ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing" - true - else - -@@ -25636,17 +26172,17 @@ fi - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all" >&5 --$as_echo_n "checking to see if c++ compiler understands -errwarn=%all... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -errwarn=%all" >&5 -+$as_echo_n "checking to see if Objective C compiler understands -errwarn=%all... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -errwarn=%all" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25660,7 +26196,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25669,7 +26205,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CXXFLAGS="$ERROR_CXXFLAGS -errwarn=%all" -+ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all" - true - else - -@@ -25686,7 +26222,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 - $as_echo "$flag_ok" >&6; } - -- if test "x$ERROR_CXXFLAGS" != "x"; then -+ if test "x$ERROR_OBJCFLAGS" != "x"; then - for f in 'no%E_EMPTY_DECLARATION' \ - 'no%E_STATEMENT_NOT_REACHED' \ - 'no%E_ARGUEMENT_MISMATCH' \ -@@ -25696,17 +26232,17 @@ $as_echo "$flag_ok" >&6; } - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -errwarn=%all,$f" >&5 --$as_echo_n "checking to see if c++ compiler understands -errwarn=%all,$f... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands -errwarn=%all,$f" >&5 -+$as_echo_n "checking to see if Objective C compiler understands -errwarn=%all,$f... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -errwarn=%all,$f" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25720,7 +26256,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25729,7 +26265,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- ERROR_CXXFLAGS="$ERROR_CXXFLAGS -+ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS - true - else - $f" -@@ -25751,26 +26287,34 @@ $as_echo "$flag_ok" >&6; } - fi - fi - -- if test "x" != "x" -+ if test "x -+ -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -+ -Wwrite-strings -Wold-style-definition -+ -Winit-self -Wmissing-include-dirs -Wno-multichar -+ -Wnested-externs $NO_WARNINGS" != "x" - then - UNSUPPORTED="" -- list="" -+ list=" -+ -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -+ -Wwrite-strings -Wold-style-definition -+ -Winit-self -Wmissing-include-dirs -Wno-multichar -+ -Wnested-externs $NO_WARNINGS" - for each in $list - do - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands $each" >&5 --$as_echo_n "checking to see if c++ compiler understands $each... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if Objective C compiler understands $each" >&5 -+$as_echo_n "checking to see if Objective C compiler understands $each... " >&6; } - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $each" - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ ac_ext=m -+ac_cpp='$OBJCPP $CPPFLAGS' -+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_objc_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25784,7 +26328,7 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_objc_try_compile "$LINENO"; then : - flag_ok=yes - else - flag_ok=no -@@ -25793,7 +26337,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - - if test "X$flag_ok" = Xyes ; then -- WARNING_CXXFLAGS="$WARNING_CXXFLAGS $each" -+ WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each" - true - else - UNSUPPORTED="$UNSUPPORTED $each" -@@ -25819,10 +26363,10 @@ $as_echo "$as_me: unsupported compiler flags: $UNSUPPORTED" >&6;} - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&5 --$as_echo "$as_me: set WARNING_CXXFLAGS to $WARNING_CXXFLAGS" >&6;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&5 --$as_echo "$as_me: set ERROR_CXXFLAGS to $ERROR_CXXFLAGS" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS" >&5 -+$as_echo "$as_me: set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS" >&5 -+$as_echo "$as_me: set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS" >&6;} - - - -@@ -26253,6 +26797,8 @@ fi - - GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" - GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" -+GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" -+ - - - -@@ -26261,11 +26807,13 @@ GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$ - GST_PLUGINS_GL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs" - - -+GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" - GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" - GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" - - - -+ - GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" - - -@@ -26414,10 +26962,6 @@ if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then -- as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${GST_GCOV_ENABLED_TRUE}" && test -z "${GST_GCOV_ENABLED_FALSE}"; then - as_fn_error $? "conditional \"GST_GCOV_ENABLED\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -26523,6 +27067,10 @@ if test -z "${GL_BACKEND_X11ES2_TRUE}" && test -z "${GL_BACKEND_X11ES2_FALSE}"; - as_fn_error $? "conditional \"GL_BACKEND_X11ES2\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${GL_BACKEND_FBES2_TRUE}" && test -z "${GL_BACKEND_FBES2_FALSE}"; then -+ as_fn_error $? "conditional \"GL_BACKEND_FBES2\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${GL_BACKEND_COCOA_TRUE}" && test -z "${GL_BACKEND_COCOA_FALSE}"; then - as_fn_error $? "conditional \"GL_BACKEND_COCOA\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -26539,6 +27087,10 @@ if test -z "${HAVE_GST_CHECK_TRUE}" && test -z "${HAVE_GST_CHECK_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GST_CHECK\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${USE_VIVANTE_TRUE}" && test -z "${USE_VIVANTE_FALSE}"; then -+ as_fn_error $? "conditional \"USE_VIVANTE\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then - as_fn_error $? "conditional \"HAVE_PNG\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -27000,7 +27552,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by GStreamer OpenGL Plug-ins $as_me 0.10.3, which was -+This file was extended by GStreamer OpenGL Plug-ins $as_me 0.10.3.1, which was - generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -27066,7 +27618,7 @@ _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --GStreamer OpenGL Plug-ins config.status 0.10.3 -+GStreamer OpenGL Plug-ins config.status 0.10.3.1 - configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" - -@@ -27206,7 +27758,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' - enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' - SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' - ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' --PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' - host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' - host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' - host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -@@ -27287,6 +27838,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' - allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' - no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' - hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' - hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' - hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' - hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -@@ -27358,6 +27910,7 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' - allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' - no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -@@ -27399,7 +27952,6 @@ DLLTOOL \ - OBJDUMP \ - SHELL \ - ECHO \ --PATH_SEPARATOR \ - SED \ - GREP \ - EGREP \ -@@ -27448,6 +28000,7 @@ with_gnu_ld \ - allow_undefined_flag \ - no_undefined_flag \ - hardcode_libdir_flag_spec \ -+hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - exclude_expsyms \ - include_expsyms \ -@@ -27481,6 +28034,7 @@ with_gnu_ld_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ -+hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ -@@ -28334,8 +28888,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -28398,9 +28952,6 @@ SHELL=$lt_SHELL - # An echo program that protects backslashes. - ECHO=$lt_ECHO - --# The PATH separator for the build system. --PATH_SEPARATOR=$lt_PATH_SEPARATOR -- - # The host system. - host_alias=$host_alias - host=$host -@@ -28696,6 +29247,10 @@ no_undefined_flag=$lt_no_undefined_flag - # This must work even if \$libdir does not exist - hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+ - # Whether we need a single "-rpath" flag with a separated argument. - hardcode_libdir_separator=$lt_hardcode_libdir_separator - -@@ -29038,6 +29593,10 @@ no_undefined_flag=$lt_no_undefined_flag_CXX - # This must work even if \$libdir does not exist - hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+ - # Whether we need a single "-rpath" flag with a separated argument. - hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -diff --git a/configure.ac b/configure.ac -index 6a4efe0..fa277fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file - dnl initialize autoconf - dnl releases only do -Wall, git and prerelease does -Werror too - dnl use a three digit version number for releases, and four for git/prerelease --AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3, -+AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3.1, - http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, - gst-plugins-gl) - -@@ -61,7 +61,7 @@ dnl AS_LIBTOOL_TAGS - - AC_LIBTOOL_WIN32_DLL - AM_PROG_LIBTOOL --AS_PROG_OBJC -+AC_PROG_OBJC - - dnl *** required versions of GStreamer stuff *** - GST_REQ=0.10.35 -@@ -83,6 +83,8 @@ AG_GST_GETTEXT([gst-plugins-gl-$GST_MAJORMINOR]) - - dnl *** check for arguments to configure *** - -+AG_GST_ARG_DISABLE_FATAL_WARNINGS -+ - AG_GST_ARG_DEBUG - AG_GST_ARG_PROFILING - AG_GST_ARG_VALGRIND -@@ -160,36 +162,48 @@ AG_GST_CHECK_FUNCTION - dnl *** checks for dependency libraries *** - - dnl GLib is required --AG_GST_GLIB_CHECK([2.6]) -+AG_GST_GLIB_CHECK([2.22]) - - #dnl Check for OpenGL, GLU and GLEW - echo host is $host - case $host in - *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) -- AG_GST_CHECK_X - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $X_CFLAGS" -- LIBS="$LIBS $X_LIBS" -- #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) -- AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) -- if test "x$HAVE_GL" = "xyes"; then -- AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) -- AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) -- AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) -- GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" -- GL_BACKEND=x11 -- GL_TYPE=gl -+ AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_EGL_FB=yes, HAVE_EGL_FB=no) -+ if test "x$HAVE_EGL_FB" = "xyes"; then -+ GL_LIBS="$LIBS -lGLESv2 -lEGL" -+ GL_BACKEND=fbES2 -+ GL_TYPE=gles -+ save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" - else -+ AG_GST_CHECK_X -+ CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" -+ LIBS="$LIBS $X_LIBS" - AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no]) - if test "x$HAVE_EGL" = "xyes"; then - AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required])) -+ s_LIBS="$LIBS" -+ LIBS="-lEGL $LIBS" - AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required])) -- GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" -+ LIBS="$s_LIBS" -+ GL_LIBS="$LIBS -lGLESv2 -lEGL" - GL_BACKEND=x11ES2 - GL_TYPE=gles -+ save_CPPFLAGS="$save_CPPFLAGS -DLINUX" - else -- AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) -+ #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) -+ AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) -+ if test "x$HAVE_GL" = "xyes"; then -+ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) -+ AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) -+ AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) -+ GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" -+ GL_BACKEND=x11 -+ GL_TYPE=gl -+ else -+ AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) -+ fi - fi - fi - CPPFLAGS="$save_CPPFLAGS" -@@ -230,6 +244,7 @@ AC_SUBST(GL_BACKEND) - AC_SUBST(OPENGL_ES2) - AM_CONDITIONAL(GL_BACKEND_X11, test "x$GL_BACKEND" = "xx11") - AM_CONDITIONAL(GL_BACKEND_X11ES2, test "x$GL_BACKEND" = "xx11ES2") -+AM_CONDITIONAL(GL_BACKEND_FBES2, test "x$GL_BACKEND" = "xfbES2") - AM_CONDITIONAL(GL_BACKEND_COCOA, test "x$GL_BACKEND" = "xcocoa") - AM_CONDITIONAL(GL_BACKEND_WIN32, test "x$GL_BACKEND" = "xwin32") - AM_CONDITIONAL(GL_IS_OPENGL, test "x$GL_TYPE" = "xgl") -@@ -251,6 +266,18 @@ AC_SUBST(GLIB_PREFIX) - AC_SUBST(GST_PREFIX) - AC_SUBST(GSTPB_PREFIX) - -+GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" -+GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" -+AC_CHECK_HEADERS([EGL/eglvivante.h], HAVE_VIVANTE=[yes], HAVE_VIVANTE=[no]) -+if test "x$HAVE_VIVANTE" = "xyes"; then -+ if test "x$GST_FSL_CFLAGS" = "x"; then -+ AC_MSG_ERROR([gstreamer-fsl is required]) -+ fi -+ AC_DEFINE(GPU_VIVANTE, [1], [Use Vivante GPU]) -+fi -+AM_CONDITIONAL(USE_VIVANTE, test "x$HAVE_VIVANTE" = "xyes") -+AC_SUBST(GST_FSL_CFLAGS) -+AC_SUBST(GST_FSL_LIBS) - - dnl libpng is optional - PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no) -@@ -269,12 +296,15 @@ if test x$with_jpeg_mmx != x; then - LIBS="$LIBS -L$with_jpeg_mmx" - fi - AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") --JPEG_LIBS="$LIBS -ljpeg-mmx" --LIBS="$OLD_LIBS" - if test x$HAVE_JPEG != xyes; then - AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") -- JPEG_LIBS="-ljpeg" -- AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) -+ if test x$HAVE_JPEG = xyes; then -+ JPEG_LIBS="-ljpeg" -+ AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) -+ fi -+else -+ JPEG_LIBS="$LIBS -ljpeg-mmx" -+ LIBS="$OLD_LIBS" - fi - AC_SUBST(HAVE_JPEG) - AC_SUBST(JPEG_LIBS) -@@ -383,8 +413,14 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], - [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) - - dnl define an ERROR_CFLAGS Makefile variable --AG_GST_SET_ERROR_CFLAGS($GST_GIT) --AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) -+AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS) -+AG_GST_SET_ERROR_CXXFLAGS($FATAL_WARNINGS) -+dnl define an ERROR_OBJCFLAGS Makefile variable -+AG_GST_SET_ERROR_OBJCFLAGS($FATAL_WARNINGS, [ -+ -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -+ -Wwrite-strings -Wold-style-definition -+ -Winit-self -Wmissing-include-dirs -Wno-multichar -+ -Wnested-externs $NO_WARNINGS]) - - dnl define correct level for debugging messages - AG_GST_SET_LEVEL_DEFAULT($GST_GIT) -@@ -460,8 +496,10 @@ AC_SUBST(DEPRECATED_CFLAGS) - dnl every flag in GST_OPTION_CFLAGS can be overridden at make time - GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" - GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" -+GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" - AC_SUBST(GST_OPTION_CFLAGS) - AC_SUBST(GST_OPTION_CXXFLAGS) -+AC_SUBST(GST_OPTION_OBJCFLAGS) - - dnl our libraries need to be versioned correctly - AC_SUBST(GST_LT_LDFLAGS) -@@ -474,10 +512,12 @@ AC_SUBST(GST_PLUGINS_GL_CFLAGS) - - dnl FIXME: do we want to rename to GST_ALL_* ? - dnl add GST_OPTION_CFLAGS, but overridable -+GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" - GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" - GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" - AC_SUBST(GST_CFLAGS) - AC_SUBST(GST_CXXFLAGS) -+AC_SUBST(GST_OBJCFLAGS) - - dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage - GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" -diff --git a/depcomp b/depcomp -index bd0ac08..df8eea7 100755 ---- a/depcomp -+++ b/depcomp -@@ -1,10 +1,10 @@ - #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects - --scriptversion=2011-12-04.11; # UTC -+scriptversion=2009-04-28.21; # UTC - --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, --# 2011 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -+# Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -44,7 +44,7 @@ Environment variables: - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. -- tmpdepfile Temporary file to use when outputting dependencies. -+ tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - - Report bugs to . -@@ -90,18 +90,10 @@ if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' -+ cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp - fi - --if test "$depmode" = msvc7msys; then -- # This is just like msvc7 but w/o cygpath translation. -- # Just convert the backslash-escaped backslashes to single forward -- # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' -- depmode=msvc7 --fi -- - case "$depmode" in - gcc3) - ## gcc 3 implements dependency tracking that does exactly what -@@ -166,12 +158,10 @@ gcc) - ' < "$tmpdepfile" | - ## Some versions of gcc put a space before the `:'. On the theory - ## that the space means something, we add a space to the output as --## well. hp depmode also adds that space, but also prefixes the VPATH --## to the object. Take care to not repeat it in the output. -+## well. - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ -- | sed -e 's/$/ :/' >> "$depfile" -+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -415,52 +405,6 @@ tru64) - rm -f "$tmpdepfile" - ;; - --msvc7) -- if test "$libtool" = yes; then -- showIncludes=-Wc,-showIncludes -- else -- showIncludes=-showIncludes -- fi -- "$@" $showIncludes > "$tmpdepfile" -- stat=$? -- grep -v '^Note: including file: ' "$tmpdepfile" -- if test "$stat" = 0; then : -- else -- rm -f "$tmpdepfile" -- exit $stat -- fi -- rm -f "$depfile" -- echo "$object : \\" > "$depfile" -- # The first sed program below extracts the file names and escapes -- # backslashes for cygpath. The second sed program outputs the file -- # name when reading, but also accumulates all include files in the -- # hold buffer in order to output them again at the end. This only -- # works with sed implementations that can handle large buffers. -- sed < "$tmpdepfile" -n ' --/^Note: including file: *\(.*\)/ { -- s//\1/ -- s/\\/\\\\/g -- p --}' | $cygpath_u | sort -u | sed -n ' --s/ /\\ /g --s/\(.*\)/ \1 \\/p --s/.\(.*\) \\/\1:/ --H --$ { -- s/.*/ / -- G -- p --}' >> "$depfile" -- rm -f "$tmpdepfile" -- ;; -- --msvc7msys) -- # This case exists only to let depend.m4 do its work. It works by -- # looking at the text of this script. This case will never be run, -- # since it is checked for above. -- exit 1 -- ;; -- - #nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. -@@ -559,9 +503,7 @@ makedepend) - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" -- # makedepend may prepend the VPATH from the source file name to the object. -- # No need to regex-escape $object, excess matching of '.' is harmless. -- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" -+ cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' - ' | \ - ## Some versions of the HPUX 10.20 sed can't process this invocation -diff --git a/docs/DEBUGGING b/docs/DEBUGGING -new file mode 100644 -index 0000000..b304341 ---- /dev/null -+++ b/docs/DEBUGGING -@@ -0,0 +1,73 @@ -+ -+===== -+Notes -+===== -+ -+First on win32, if you are using msvc, you should check the glibconfig.h file: -+About line 130, you should have: -+ -+#else /* _MSC_VER */ -+/* varargs macros available since msvc8 (vs2005) */ -+# if _MSC_VER >= 1400 -+# define G_HAVE_ISO_VARARGS 1 -+# define __func__ __FUNCTION__ -+# endif -+#endif /* not _MSC_VER */ -+ -+ -+==================== -+OpenGL context infos -+==================== -+ -+#gst-launch-0.10 --gst-debug=gldisplay:N pipeline -+#N=1: errors -+#N=2: errors warnings -+#N=3: errors warnings infos -+#N=4: errors warnings infos -+#N=5: errors warnings infos logs -+ -+gst-launch-0.10 --gst-debug=gldisplay:3 videotestsrc ! glimagesink -+ -+ -+======= -+Shaders -+======= -+ -+win32: -+set GST_GL_SHADER_DEBUG=1 (or something else because setting it to 0 is NOT like to not setting it at all) -+gst-launch-0.10 videotestsrc ! glimagesink -+when you are done, just type "set GST_GL_SHADER_DEBUG=" to unset it. -+ -+unix: -+(Probably bash-specific, check your shell docs to know how to do it) -+ -+export GST_GL_SHADER_DEBUG=1 -+gst-launch-0.10 videotestsrc ! glimagesink -+when you are done, just type "export -n GST_GL_SHADER_DEBUG" to unset it. -+ -+or just prepend your app with GST_GL_SHADER_DEBUG=1 (no need to unset): -+GST_GL_SHADER_DEBUG=1 gst-launch-0.10 videotestsrc ! glimagesink -+Note: the "1" value is completely arbitrary, what matters here is whether the -+environment variable is set or not. -+ -+ -+=========== -+gl elements -+=========== -+ -+gst-launch-0.10 --gst-debug=gleffects:3 videotestsrc ! glupload ! gleffects effect=8 ! glimagesink -+gst-launch-0.10 --gst-debug=gleffects:3,gldisplay:3 videotestsrc ! glupload ! gleffects effect=8 ! glimagesink -+GST_DEBUG=gl*:5 gst-launch-0.10 videotestsrc ! glupload ! glimagesink -+ -+Look at "Running GStreamer Application" section in the GStreamer Core -+Reference Manual if you want more details about GStreamer debugging. -+ -+ -+======== -+Remarks: -+======== -+ -+If you are not already mind irreversible, or if you are still looking for a dev environment -+then you should try CodeBlocks which is available on both linux and windows, or vs8(9) on windows. -+Indeed, nowadays ponctual debug traces, like printf and others (I mean not definitive traces like GST_DEBUG), -+are forbidden. They have been replaced by break points which are useable only through a good IDE. -diff --git a/docs/Makefile.in b/docs/Makefile.in -index f6fde64..31dd279 100644 ---- a/docs/Makefile.in -+++ b/docs/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = docs - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.entities.in -@@ -41,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -74,11 +74,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = version.entities - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -281,7 +286,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -391,7 +397,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -646,15 +656,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am -index defa340..18016cf 100644 ---- a/docs/libs/Makefile.am -+++ b/docs/libs/Makefile.am -@@ -50,7 +50,7 @@ extra_files = - # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib - # contains GtkObjects/GObjects and you want to document signals and properties. - GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ -- -I$(top_srcdir)/gst-libs/gst/gl -+ -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX - GTKDOC_LIBS = \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ - $(GST_BASE_LIBS) -diff --git a/docs/libs/Makefile.in b/docs/libs/Makefile.in -index 6100d92..1ce1693 100644 ---- a/docs/libs/Makefile.in -+++ b/docs/libs/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -52,6 +52,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/common/gtk-doc.mak \ - $(top_srcdir)/common/upload-doc.mak -@@ -61,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -94,11 +94,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -149,6 +149,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -180,6 +181,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -187,8 +190,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -261,7 +266,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -306,6 +311,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -371,7 +377,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -430,7 +440,7 @@ extra_files = - # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib - # contains GtkObjects/GObjects and you want to document signals and properties. - GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ -- -I$(top_srcdir)/gst-libs/gst/gl -+ -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX - - GTKDOC_LIBS = \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ -@@ -508,7 +518,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; --$(top_srcdir)/common/upload-doc.mak $(top_srcdir)/common/gtk-doc.mak: - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -@@ -578,15 +587,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in -index 19e065d..929edba 100644 ---- a/docs/plugins/Makefile.in -+++ b/docs/plugins/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -50,6 +50,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/common/gtk-doc-plugins.mak \ - $(top_srcdir)/common/upload-doc.mak -@@ -59,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -92,11 +92,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -147,6 +147,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -178,6 +179,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -185,8 +188,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -259,7 +264,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -304,6 +309,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -369,7 +375,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -572,7 +582,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; --$(top_srcdir)/common/upload-doc.mak $(top_srcdir)/common/gtk-doc-plugins.mak: - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -@@ -642,15 +651,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -@@ -810,8 +814,7 @@ help: - @echo - - # update the stuff maintained by doc maintainers --update: -- $(MAKE) scanobj-update -+update: scanobj-update - $(MAKE) check-outdated-docs - - @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -@@ -845,7 +848,7 @@ update: - @ENABLE_GTK_DOC_TRUE@ --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ - @ENABLE_GTK_DOC_TRUE@ echo " DOC Merging introspection data" && \ - @ENABLE_GTK_DOC_TRUE@ $(PYTHON) \ --@ENABLE_GTK_DOC_TRUE@ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ -+@ENABLE_GTK_DOC_TRUE@ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ - @ENABLE_GTK_DOC_TRUE@ if test x"$(srcdir)" != x. ; then \ - @ENABLE_GTK_DOC_TRUE@ for f in $(SCANOBJ_FILES); \ - @ENABLE_GTK_DOC_TRUE@ do \ -diff --git a/docs/plugins/inspect/plugin-libvisual-gl.xml b/docs/plugins/inspect/plugin-libvisual-gl.xml -index da5a3d5..477c811 100644 ---- a/docs/plugins/inspect/plugin-libvisual-gl.xml -+++ b/docs/plugins/inspect/plugin-libvisual-gl.xml -@@ -3,10 +3,10 @@ - libvisual-gl visualization plugins - ../../ext/libvisual/.libs/libgstlibvisualgl.so - libgstlibvisualgl.so -- 0.10.3 -+ 0.10.3.1 - LGPL - gst-plugins-gl -- GStreamer OpenGL Plug-ins source release -+ GStreamer OpenGL Plug-ins git - Unknown package origin - - -diff --git a/docs/plugins/inspect/plugin-opengl.xml b/docs/plugins/inspect/plugin-opengl.xml -index dbfa9fb..9b7b663 100644 ---- a/docs/plugins/inspect/plugin-opengl.xml -+++ b/docs/plugins/inspect/plugin-opengl.xml -@@ -3,10 +3,10 @@ - OpenGL plugin - ../../gst/gl/.libs/libgstopengl.so - libgstopengl.so -- 0.10.3 -+ 0.10.3.1 - LGPL - gst-plugins-gl -- GStreamer OpenGL Plug-ins source release -+ GStreamer OpenGL Plug-ins git - Unknown package origin - - -diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -new file mode 100644 -index 0000000..63569a6 ---- /dev/null -+++ b/ext/CMakeLists.txt -@@ -0,0 +1 @@ -+add_subdirectory (libvisual) -diff --git a/ext/Makefile.in b/ext/Makefile.in -index f6594db..4f27867 100644 ---- a/ext/Makefile.in -+++ b/ext/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = ext - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -279,7 +284,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -389,7 +395,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -649,15 +659,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/ext/libvisual/CMakeLists.txt b/ext/libvisual/CMakeLists.txt -new file mode 100644 -index 0000000..490ed89 ---- /dev/null -+++ b/ext/libvisual/CMakeLists.txt -@@ -0,0 +1,15 @@ -+add_definitions(-DHAVE_CONFIG_H) -+ -+include_directories(AFTER -+ ${GSTREAMER_INCLUDE_DIR} -+ ${GLIB2_INCLUDE_DIR} -+ ../../gst-libs/gst/gl -+ ../../gst-libs -+ ../.. -+ .) -+ -+add_library (gstlibvisualgl SHARED -+ visual-gl.c) -+ -+target_link_libraries(gstlibvisualgl -+ general gstgl) -diff --git a/ext/libvisual/Makefile.in b/ext/libvisual/Makefile.in -index 56391ed..699e758 100644 ---- a/ext/libvisual/Makefile.in -+++ b/ext/libvisual/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = ext/libvisual - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -41,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -95,12 +95,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --am__uninstall_files_from_dir = { \ -- test -z "$$files" \ -- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -- $(am__cd) "$$dir" && rm -f $$files; }; \ -- } - am__installdirs = "$(DESTDIR)$(plugindir)" - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = -@@ -110,8 +104,8 @@ libgstlibvisualgl_la_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) - am_libgstlibvisualgl_la_OBJECTS = libgstlibvisualgl_la-visual-gl.lo - libgstlibvisualgl_la_OBJECTS = $(am_libgstlibvisualgl_la_OBJECTS) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - libgstlibvisualgl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(libgstlibvisualgl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -@@ -127,21 +121,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(libgstlibvisualgl_la_SOURCES) - DIST_SOURCES = $(libgstlibvisualgl_la_SOURCES) -@@ -194,6 +188,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -225,6 +220,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -232,8 +229,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -306,7 +305,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -351,6 +350,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -416,7 +416,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -497,7 +501,7 @@ clean-pluginLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libgstlibvisualgl.la: $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_DEPENDENCIES) $(EXTRA_libgstlibvisualgl_la_DEPENDENCIES) -+libgstlibvisualgl.la: $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgstlibvisualgl_la_LINK) -rpath $(plugindir) $(libgstlibvisualgl_la_OBJECTS) $(libgstlibvisualgl_la_LIBADD) $(LIBS) - - mostlyclean-compile: -@@ -511,30 +515,34 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libgstlibvisualgl_la-visual-gl.lo: visual-gl.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibvisualgl_la-visual-gl.Tpo $(DEPDIR)/libgstlibvisualgl_la-visual-gl.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='visual-gl.c' object='libgstlibvisualgl_la-visual-gl.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='visual-gl.c' object='libgstlibvisualgl_la-visual-gl.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - mostlyclean-libtool: - -rm -f *.lo -@@ -641,15 +649,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst-libs/CMakeLists.txt b/gst-libs/CMakeLists.txt -new file mode 100644 -index 0000000..1049a2d ---- /dev/null -+++ b/gst-libs/CMakeLists.txt -@@ -0,0 +1 @@ -+add_subdirectory (gst) -diff --git a/gst-libs/Makefile.in b/gst-libs/Makefile.in -index f37923d..cb69d9d 100644 ---- a/gst-libs/Makefile.in -+++ b/gst-libs/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = gst-libs - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -280,7 +285,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -390,7 +396,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -643,15 +653,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst-libs/gst/CMakeLists.txt b/gst-libs/gst/CMakeLists.txt -new file mode 100644 -index 0000000..3300d05 ---- /dev/null -+++ b/gst-libs/gst/CMakeLists.txt -@@ -0,0 +1 @@ -+add_subdirectory (gl) -diff --git a/gst-libs/gst/Makefile.in b/gst-libs/gst/Makefile.in -index 09f2186..10cf980 100644 ---- a/gst-libs/gst/Makefile.in -+++ b/gst-libs/gst/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = gst-libs/gst - DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -75,11 +75,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -171,6 +171,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -202,6 +203,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -209,8 +212,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -283,7 +288,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -328,6 +333,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -393,7 +399,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -650,15 +660,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst-libs/gst/gl/CMakeLists.txt b/gst-libs/gst/gl/CMakeLists.txt -new file mode 100644 -index 0000000..cbe95fe ---- /dev/null -+++ b/gst-libs/gst/gl/CMakeLists.txt -@@ -0,0 +1,86 @@ -+#FIXME: generate config.h -+add_definitions(-DHAVE_CONFIG_H) -+ -+include_directories(AFTER -+ . -+ ${GLEW_INCLUDE_DIR} -+ ${GSTREAMER_INCLUDE_DIR} -+ ${GLIB2_INCLUDE_DIR}) -+ -+if (NOT GST_USING_BINARY_REGISTRY) -+include_directories(AFTER -+ ${LIBXML2_INCLUDE_DIR} -+ ${LIBICONV_INCLUDE_DIR}) -+endif (NOT GST_USING_BINARY_REGISTRY) -+ -+if (WIN32) -+ -+include_directories(AFTER -+ ../../../win32/common) -+ -+add_library (gstgl STATIC -+ gstglwindow_win32.c -+ gstgldisplay.c -+ gstglbuffer.c -+ gstglfilter.c -+ gstglmixer.c -+ gstglshadervariables.c -+ gstglshader.c) -+ -+target_link_libraries(gstgl -+ general ${OPENGL_LIBRARIES} -+ general ${GLEW_LIBRARY} -+ general ${GLIB2_LIBRARIES} -+ general ${GSTREAMER_LIBRARIES} -+ gdi32 -+ winmm) -+ -+else (WIN32) -+ -+ if (APPLE) -+ -+ include_directories(AFTER -+ ../../..) -+ -+ add_library (gstgl STATIC -+ gstglwindow_cocoa.m -+ gstgldisplay.c -+ gstglbuffer.c -+ gstglfilter.c -+ gstglmixer.c -+ gstglshadervariables.c -+ gstglshader.c) -+ -+ target_link_libraries(gstgl -+ general ${OPENGL_LIBRARIES} -+ general ${GLEW_LIBRARY} -+ general ${GLIB2_LIBRARIES} -+ general ${GSTREAMER_LIBRARIES} -+ "-L/opt/local/lib" -+ "-lintl" -+ "-framework OpenGL" -+ "-framework Cocoa") -+ -+ else (APPLE) -+ -+ include_directories(AFTER -+ ../../..) -+ -+ add_library (gstgl STATIC -+ gstglwindow_x11.c -+ gstgldisplay.c -+ gstglbuffer.c -+ gstglfilter.c -+ gstglmixer.c -+ gstglshadervariables.c -+ gstglshader.c) -+ -+ target_link_libraries(gstgl -+ general ${OPENGL_LIBRARIES} -+ general ${GLEW_LIBRARY} -+ general ${GLIB2_LIBRARIES} -+ general ${GSTREAMER_LIBRARIES}) -+ -+ endif (APPLE) -+ -+endif (WIN32) -diff --git a/gst-libs/gst/gl/GNUmakefile.gnustep b/gst-libs/gst/gl/GNUmakefile.gnustep -new file mode 100644 -index 0000000..bb977f4 ---- /dev/null -+++ b/gst-libs/gst/gl/GNUmakefile.gnustep -@@ -0,0 +1,27 @@ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+SUBPROJECT_NAME = gstlibsgstgl -+ -+gstlibsgstgl_C_FILES = \ -+ gstgldisplay.c \ -+ gstglbuffer.c \ -+ gstglfilter.c \ -+ gstglmixer.c \ -+ gstglshadervariables.c \ -+ gstglshader.c -+ -+gstlibsgstgl_OBJC_FILES = gstglwindow_cocoa.m -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+gstlibsgstgl_INCLUDE_DIRS = \ -+ -I../../../win32/common \ -+ -IC:/gstreamer/include/libxml2 \ -+ -IC:/gstreamer/include/glib-2.0 \ -+ -IC:/gstreamer/lib/glib-2.0/include \ -+ -IC:/gstreamer/include \ -+ -IC:/gstreamer/include/gstreamer-0.10 -+endif -+ -+gstlibsgstgl_CFLAGS = -Wall -DHAVE_CONFIG_H -+ -+include $(GNUSTEP_MAKEFILES)/subproject.make -diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am -index 2ef7afc..d55a513 100644 ---- a/gst-libs/gst/gl/Makefile.am -+++ b/gst-libs/gst/gl/Makefile.am -@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la - EXTRA_DIST = \ - gstglwindow_x11.c \ - gstglwindow_x11ES2.c \ -+ gstglwindow_fbES2.c \ - gstglwindow_win32.c \ - gstglwindow_winCE.c \ - gstglwindow_cocoa.m -@@ -28,6 +29,13 @@ endif - if GL_BACKEND_X11ES2 - libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c - endif -+if GL_BACKEND_FBES2 -+libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_fbES2.c -+endif -+ -+if USE_VIVANTE -+libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglvivante.c -+endif - - libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl - libgstgl_@GST_MAJORMINOR@include_HEADERS = \ -@@ -41,13 +49,19 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \ - gstglshadervariables.h \ - gstglshader.h - -+if USE_VIVANTE -+libgstgl_@GST_MAJORMINOR@include_HEADERS += gstglvivante.h -+endif -+ - libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ -+ $(GST_FSL_LIBS) \ - $(GST_BASE_LIBS) $(GST_LIBS) \ - $(GL_LIBS) - - libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ - $(GL_CFLAGS) $(X_CFLAGS) \ -+ $(GST_FSL_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) - libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ - $(GL_CFLAGS) $(X_CFLAGS) \ -diff --git a/gst-libs/gst/gl/Makefile.in b/gst-libs/gst/gl/Makefile.in -index e38d211..3f97a17 100644 ---- a/gst-libs/gst/gl/Makefile.in -+++ b/gst-libs/gst/gl/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -35,19 +35,22 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - @GL_BACKEND_WIN32_TRUE@am__append_1 = gstglwindow_win32.c - @GL_BACKEND_COCOA_TRUE@am__append_2 = gstglwindow_cocoa.m - @GL_BACKEND_X11_TRUE@am__append_3 = gstglwindow_x11.c - @GL_BACKEND_X11ES2_TRUE@am__append_4 = gstglwindow_x11ES2.c -+@GL_BACKEND_FBES2_TRUE@am__append_5 = gstglwindow_fbES2.c -+@USE_VIVANTE_TRUE@am__append_6 = gstglvivante.c -+@USE_VIVANTE_TRUE@am__append_7 = gstglvivante.h - subdir = gst-libs/gst/gl --DIST_COMMON = $(libgstgl_@GST_MAJORMINOR@include_HEADERS) \ -+DIST_COMMON = $(am__libgstgl_@GST_MAJORMINOR@include_HEADERS_DIST) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -101,27 +104,24 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --am__uninstall_files_from_dir = { \ -- test -z "$$files" \ -- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -- $(am__cd) "$$dir" && rm -f $$files; }; \ -- } - am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__libgstgl_@GST_MAJORMINOR@_la_SOURCES_DIST = gstgldisplay.c \ - gstglbuffer.c gstglfilter.c gstglmixer.c gstglshader.c \ - gstglshadervariables.c gstglwindow_win32.c gstglwindow_cocoa.m \ -- gstglwindow_x11.c gstglwindow_x11ES2.c -+ gstglwindow_x11.c gstglwindow_x11ES2.c gstglwindow_fbES2.c \ -+ gstglvivante.c - @GL_BACKEND_WIN32_TRUE@am__objects_1 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo - @GL_BACKEND_COCOA_TRUE@am__objects_2 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo - @GL_BACKEND_X11_TRUE@am__objects_3 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo - @GL_BACKEND_X11ES2_TRUE@am__objects_4 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo -+@GL_BACKEND_FBES2_TRUE@am__objects_5 = libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo -+@USE_VIVANTE_TRUE@am__objects_6 = libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo - am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ - libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo \ - libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo \ -@@ -130,11 +130,11 @@ am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ - libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo \ - libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ -- $(am__objects_4) -+ $(am__objects_4) $(am__objects_5) $(am__objects_6) - libgstgl_@GST_MAJORMINOR@_la_OBJECTS = \ - $(am_libgstgl_@GST_MAJORMINOR@_la_OBJECTS) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - libgstgl_@GST_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \ - $(libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -@@ -151,18 +151,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; - OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -@@ -170,21 +170,25 @@ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_OBJCFLAGS) $(OBJCFLAGS) --AM_V_OBJC = $(am__v_OBJC_@AM_V@) --am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@) -+AM_V_OBJC = $(am__v_OBJC_$(V)) -+am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY)) - am__v_OBJC_0 = @echo " OBJC " $@; - OBJCLD = $(OBJC) - OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@) --am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@) -+AM_V_OBJCLD = $(am__v_OBJCLD_$(V)) -+am__v_OBJCLD_ = $(am__v_OBJCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_OBJCLD_0 = @echo " OBJCLD" $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(libgstgl_@GST_MAJORMINOR@_la_SOURCES) - DIST_SOURCES = $(am__libgstgl_@GST_MAJORMINOR@_la_SOURCES_DIST) -+am__libgstgl_@GST_MAJORMINOR@include_HEADERS_DIST = gstglwindow.h \ -+ gstgldisplay.h gstglbuffer.h gstgles2.h gstglfilter.h \ -+ gstglmixer.h gstglmixerpad.h gstglshadervariables.h \ -+ gstglshader.h gstglvivante.h - HEADERS = $(libgstgl_@GST_MAJORMINOR@include_HEADERS) - ETAGS = etags - CTAGS = ctags -@@ -235,6 +239,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -266,6 +271,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -273,8 +280,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -347,7 +356,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -392,6 +401,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -457,7 +467,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -465,6 +479,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la - EXTRA_DIST = \ - gstglwindow_x11.c \ - gstglwindow_x11ES2.c \ -+ gstglwindow_fbES2.c \ - gstglwindow_win32.c \ - gstglwindow_winCE.c \ - gstglwindow_cocoa.m -@@ -472,26 +487,22 @@ EXTRA_DIST = \ - libgstgl_@GST_MAJORMINOR@_la_SOURCES = gstgldisplay.c gstglbuffer.c \ - gstglfilter.c gstglmixer.c gstglshader.c \ - gstglshadervariables.c $(am__append_1) $(am__append_2) \ -- $(am__append_3) $(am__append_4) -+ $(am__append_3) $(am__append_4) $(am__append_5) \ -+ $(am__append_6) - libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl --libgstgl_@GST_MAJORMINOR@include_HEADERS = \ -- gstglwindow.h \ -- gstgldisplay.h \ -- gstglbuffer.h \ -- gstgles2.h \ -- gstglfilter.h \ -- gstglmixer.h \ -- gstglmixerpad.h \ -- gstglshadervariables.h \ -- gstglshader.h -- -+libgstgl_@GST_MAJORMINOR@include_HEADERS = gstglwindow.h \ -+ gstgldisplay.h gstglbuffer.h gstgles2.h gstglfilter.h \ -+ gstglmixer.h gstglmixerpad.h gstglshadervariables.h \ -+ gstglshader.h $(am__append_7) - libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ -+ $(GST_FSL_LIBS) \ - $(GST_BASE_LIBS) $(GST_LIBS) \ - $(GL_LIBS) - - libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ - $(GL_CFLAGS) $(X_CFLAGS) \ -+ $(GST_FSL_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) - - libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ -@@ -568,7 +579,7 @@ clean-libLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libgstgl-@GST_MAJORMINOR@.la: $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) $(EXTRA_libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) -+libgstgl-@GST_MAJORMINOR@.la: $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_DEPENDENCIES) - $(AM_V_OBJCLD)$(libgstgl_@GST_MAJORMINOR@_la_LINK) -rpath $(libdir) $(libgstgl_@GST_MAJORMINOR@_la_OBJECTS) $(libgstgl_@GST_MAJORMINOR@_la_LIBADD) $(LIBS) - - mostlyclean-compile: -@@ -583,7 +594,9 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Plo@am__quote@ -@@ -591,114 +604,146 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo: gstgldisplay.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldisplay.c' object='libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldisplay.c' object='libgstgl_@GST_MAJORMINOR@_la-gstgldisplay.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo: gstglbuffer.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglbuffer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglbuffer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglbuffer.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo: gstglfilter.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglfilter.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglfilter.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilter.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilter.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglfilter.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo: gstglmixer.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglmixer.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglmixer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglmixer.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglmixer.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo: gstglshader.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshader.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglshader.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglshader.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshader.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo: gstglshadervariables.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglshadervariables.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglshadervariables.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglshadervariables.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo: gstglwindow_win32.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_win32.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_win32.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_win32.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo: gstglwindow_x11.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_x11.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_x11.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo: gstglwindow_x11ES2.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglwindow_x11ES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_x11ES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_x11ES2.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@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 -+ -+libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo: gstglwindow_fbES2.c -+@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 -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.Plo -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglwindow_fbES2.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_fbES2.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 -+ -+libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo: gstglvivante.c -+@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 -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglvivante.Plo -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglvivante.c' object='libgstgl_@GST_MAJORMINOR@_la-gstglvivante.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@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 - - .m.o: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< -+@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $< - - .m.obj: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .m.lo: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $< -+@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $< - - libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo: gstglwindow_cocoa.m - @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 - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Tpo $(DEPDIR)/libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.Plo --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='gstglwindow_cocoa.m' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='gstglwindow_cocoa.m' object='libgstgl_@GST_MAJORMINOR@_la-gstglwindow_cocoa.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - mostlyclean-libtool: - -rm -f *.lo -@@ -722,7 +767,9 @@ uninstall-libgstgl_@GST_MAJORMINOR@includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgstgl_@GST_MAJORMINOR@include_HEADERS)'; test -n "$(libgstgl_@GST_MAJORMINOR@includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)'; $(am__uninstall_files_from_dir) -+ test -n "$$files" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(libgstgl_@GST_MAJORMINOR@includedir)" && rm -f $$files - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -823,15 +870,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c -index 64c6c2c..a2589cb 100644 ---- a/gst-libs/gst/gl/gstgldisplay.c -+++ b/gst-libs/gst/gl/gstgldisplay.c -@@ -28,6 +28,9 @@ - - #include - #include "gstgldisplay.h" -+#ifdef GPU_VIVANTE -+#include "gstglvivante.h" -+#endif - - #ifndef GLEW_VERSION_MAJOR - #define GLEW_VERSION_MAJOR 4 -@@ -468,6 +471,10 @@ gst_gl_display_init (GstGLDisplay * display, GstGLDisplayClass * klass) - #endif - - display->error_message = NULL; -+ -+#ifdef GPU_VIVANTE -+ display->gpu_priv = gst_gl_vivante_new (); -+#endif - } - - static void -@@ -539,6 +546,12 @@ gst_gl_display_finalize (GObject * object) - g_free (display->error_message); - display->error_message = NULL; - } -+#ifdef GPU_VIVANTE -+ if (display->gpu_priv) { -+ gst_gl_vivante_delete (display->gpu_priv); -+ display->gpu_priv = NULL; -+ } -+#endif - } - - -@@ -1135,6 +1148,17 @@ gst_gl_display_thread_init_upload (GstGLDisplay * display) - void - gst_gl_display_thread_do_upload (GstGLDisplay * display) - { -+ if (display->gpu_priv && -+ display->upload_width == display->upload_data_width && -+ display->upload_height == display->upload_data_height) { -+#ifdef GPU_VIVANTE -+ if (gst_gl_vivante_tex_upload (display->gpu_priv, display)) -+ return; -+#endif -+ } -+ -+ GST_WARNING ("%s: Fall into non direct uploading", __func__); -+ - gst_gl_display_thread_do_upload_fill (display); - - switch (display->upload_video_format) { -@@ -1950,14 +1974,13 @@ gst_gl_display_on_draw (GstGLDisplay * display) - - glBegin (GL_QUADS); - /* gst images are top-down while opengl plane is bottom-up */ -- glTexCoord2i (display->redisplay_texture_width, 0); -+ glTexCoord2i (1, 0); - glVertex2f (1.0f, 1.0f); - glTexCoord2i (0, 0); - glVertex2f (-1.0f, 1.0f); -- glTexCoord2i (0, display->redisplay_texture_height); -+ glTexCoord2i (0, 1); - glVertex2f (-1.0f, -1.0f); -- glTexCoord2i (display->redisplay_texture_width, -- display->redisplay_texture_height); -+ glTexCoord2i (1, 1); - glVertex2f (1.0f, -1.0f); - /*glTexCoord2i (display->redisplay_texture_width, 0); - glVertex2i (1, -1); -@@ -1974,7 +1997,8 @@ gst_gl_display_on_draw (GstGLDisplay * display) - - #else //OPENGL_ES2 - -- const GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, -+ GLfloat left, right, top, bottom; -+ GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, - 1.0f, 0.0f, - -1.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -@@ -1986,6 +2010,17 @@ gst_gl_display_on_draw (GstGLDisplay * display) - - GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; - -+#ifdef GPU_VIVANTE -+ if (display->gpu_priv) { -+ gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, -+ &bottom); -+ vVertices[3] = vVertices[18] = right; -+ vVertices[4] = vVertices[9] = bottom; -+ vVertices[8] = vVertices[13] = left; -+ vVertices[14] = vVertices[19] = top; -+ } -+#endif -+ - glClear (GL_COLOR_BUFFER_BIT); - - gst_gl_shader_use (display->redisplay_shader); -@@ -2067,6 +2102,9 @@ gst_gl_display_glgen_texture (GstGLDisplay * display, GLuint * pTexture, - case GST_VIDEO_FORMAT_I420: - case GST_VIDEO_FORMAT_YV12: - case GST_VIDEO_FORMAT_AYUV: -+#ifdef GPU_VIVANTE -+ case GST_VIDEO_FORMAT_NV12: -+#endif - glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, - width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); - break; -@@ -2350,8 +2388,13 @@ gst_gl_display_init_upload (GstGLDisplay * display, GstVideoFormat video_format, - display->upload_height = gl_height; - display->upload_data_width = video_width; - display->upload_data_height = video_height; -- gst_gl_window_send_message (display->gl_window, -- GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); -+ -+#ifdef GPU_VIVANTE -+ if (!gst_gl_vivante_check_format (display->gpu_priv, video_format, -+ video_width, video_height)) -+#endif -+ gst_gl_window_send_message (display->gl_window, -+ GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); - isAlive = display->isAlive; - gst_gl_display_unlock (display); - -@@ -2364,6 +2407,14 @@ gboolean - gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, - gint data_width, gint data_height, gpointer data) - { -+ return gst_gl_display_do_upload_with_meta (display, texture, data_width, -+ data_height, data, NULL); -+} -+ -+gboolean -+gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, -+ gint data_width, gint data_height, gpointer data, gpointer meta) -+{ - gboolean isAlive = TRUE; - - gst_gl_display_lock (display); -@@ -2373,6 +2424,7 @@ gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, - display->upload_data_width = data_width; - display->upload_data_height = data_height; - display->upload_data = data; -+ display->upload_meta = meta; - gst_gl_window_send_message (display->gl_window, - GST_GL_WINDOW_CB (gst_gl_display_thread_do_upload), display); - isAlive = display->isAlive; -@@ -2975,11 +3027,11 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) - - #ifdef OPENGL_ES2 - GLint viewport_dim[4]; -- -- const GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, -+ GLfloat left, right, top, bottom; -+ GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, - 1.0f, 0.0f, - -1.0f, -1.0f, 0.0f, -- 0.0f, .0f, -+ 0.0f, 0.0f, - -1.0f, 1.0f, 0.0f, - 0.0f, 1.0f, - 1.0f, 1.0f, 0.0f, -@@ -2987,6 +3039,18 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) - }; - - GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; -+ -+#ifdef GPU_VIVANTE -+ if (display->gpu_priv) { -+ gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, -+ &bottom); -+ vVertices[3] = vVertices[18] = right; -+ vVertices[4] = vVertices[9] = bottom; -+ vVertices[8] = vVertices[13] = left; -+ vVertices[14] = vVertices[19] = top; -+ } -+#endif -+ - #endif - - glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, display->upload_fbo); -@@ -3260,13 +3324,13 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) - - #ifndef OPENGL_ES2 - glBegin (GL_QUADS); -- glTexCoord2i (display->upload_data_width, 0); -+ glTexCoord2i (1, 0); - glVertex2f (1.0f, -1.0f); - glTexCoord2i (0, 0); - glVertex2f (-1.0f, -1.0f); -- glTexCoord2i (0, display->upload_data_height); -+ glTexCoord2i (0, 1); - glVertex2f (-1.0f, 1.0f); -- glTexCoord2i (display->upload_data_width, display->upload_data_height); -+ glTexCoord2i (1, 1); - glVertex2f (1.0f, 1.0f); - glEnd (); - -@@ -3554,11 +3618,11 @@ gst_gl_display_thread_do_download_draw_yuv (GstGLDisplay * display) - glBegin (GL_QUADS); - glTexCoord2i (0, 0); - glVertex2f (-1.0f, -1.0f); -- glTexCoord2i (width, 0); -+ glTexCoord2i (1, 0); - glVertex2f (1.0f, -1.0f); -- glTexCoord2i (width, height); -+ glTexCoord2i (1, 1); - glVertex2f (1.0f, 1.0f); -- glTexCoord2i (0, height); -+ glTexCoord2i (0, 1); - glVertex2f (-1.0f, 1.0f); - glEnd (); - -diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h -index f657e1e..31dfe26 100644 ---- a/gst-libs/gst/gl/gstgldisplay.h -+++ b/gst-libs/gst/gl/gstgldisplay.h -@@ -229,6 +229,9 @@ struct _GstGLDisplay - - gchar *error_message; - -+ gpointer gpu_priv; -+ gpointer upload_meta; -+ gboolean upload_buf_mapped; - }; - - -@@ -264,6 +267,8 @@ gboolean gst_gl_display_init_upload (GstGLDisplay * display, - gint video_width, gint video_height); - gboolean gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, - gint data_width, gint data_height, gpointer data); -+gboolean gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, -+ gint data_width, gint data_height, gpointer data, gpointer meta); - gboolean gst_gl_display_init_download (GstGLDisplay * display, - GstVideoFormat video_format, gint width, gint height); - gboolean gst_gl_display_do_download (GstGLDisplay * display, GLuint texture, -diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h -index ddeb99c..aec69f1 100644 ---- a/gst-libs/gst/gl/gstglshader.h -+++ b/gst-libs/gst/gl/gstglshader.h -@@ -21,6 +21,10 @@ - #ifndef __GST_GL_SHADER_H__ - #define __GST_GL_SHADER_H__ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - /* OpenGL 2.0 for Embedded Systems */ - #ifdef OPENGL_ES2 - #include -diff --git a/gst-libs/gst/gl/gstglshadervariables.c b/gst-libs/gst/gl/gstglshadervariables.c -index 69d5b75..be6e58c 100644 ---- a/gst-libs/gst/gl/gstglshadervariables.c -+++ b/gst-libs/gst/gl/gstglshadervariables.c -@@ -550,6 +550,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, - (float *) ret->value); - break; - -+#ifndef OPENGL_ES2 - case _mat2x3: - gst_gl_shader_set_uniform_matrix_2x3fv (shader, ret->name, ret->count, 0, - (float *) ret->value); -@@ -569,6 +570,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, - gst_gl_shader_set_uniform_matrix_4x2fv (shader, ret->name, ret->count, 0, - (float *) ret->value); - break; -+#endif - - case _mat3: - case _mat3x3: -@@ -576,6 +578,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, - (float *) ret->value); - break; - -+#ifndef OPENGL_ES2 - case _mat3x4: - gst_gl_shader_set_uniform_matrix_3x4fv (shader, ret->name, ret->count, 0, - (float *) ret->value); -@@ -585,6 +588,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, - gst_gl_shader_set_uniform_matrix_4x3fv (shader, ret->name, ret->count, 0, - (float *) ret->value); - break; -+#endif - - case _mat4: - case _mat4x4: -diff --git a/gst-libs/gst/gl/gstglvivante.c b/gst-libs/gst/gl/gstglvivante.c -new file mode 100644 -index 0000000..1451a4a ---- /dev/null -+++ b/gst-libs/gst/gl/gstglvivante.c -@@ -0,0 +1,218 @@ -+/* -+ * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+ -+#include "gstglvivante.h" -+#include -+ -+#define GL_GLEXT_PROTOTYPES -+#include -+ -+typedef struct -+{ -+ gfloat sampler_left; -+ gfloat sampler_right; -+ gfloat sampler_top; -+ gfloat sampler_bottom; -+} GstGLVivante; -+ -+gpointer -+gst_gl_vivante_new () -+{ -+ GstGLVivante *viv = g_new (GstGLVivante, 1); -+ -+ viv->sampler_left = 0.0f; -+ viv->sampler_right = 1.0f; -+ viv->sampler_top = 1.0f; -+ viv->sampler_bottom = 0.0f; -+ -+ return viv; -+} -+ -+void -+gst_gl_vivante_delete (gpointer gpu) -+{ -+ g_free (gpu); -+} -+ -+gboolean -+gst_gl_vivante_check_format (gpointer gpu, GstVideoFormat format, gint width, -+ gint height) -+{ -+ switch (format) { -+ case GST_VIDEO_FORMAT_YV12: -+ case GST_VIDEO_FORMAT_NV12: -+ if ((width & 15) == 0) -+ return TRUE; -+ break; -+ default: -+ GST_WARNING ("GstVideoFormat %d not supported by vivante", format); -+ } -+ GST_WARNING -+ ("Check format %d, width,height [%d, %d] failed, can't direct render", -+ format, width, height); -+ return FALSE; -+} -+ -+GLenum -+gst_gl_vivante_get_gl_format (gpointer gpu, GstVideoFormat format) -+{ -+ switch (format) { -+ case GST_VIDEO_FORMAT_YV12: -+ return GL_VIV_YV12; -+ case GST_VIDEO_FORMAT_NV12: -+ return GL_VIV_NV12; -+ default: -+ GST_WARNING ("GstVideoFormat %d not supported by vivante", format); -+ } -+ return GL_NONE; -+} -+ -+static gboolean -+format_is_yuv (GstVideoFormat format) -+{ -+ switch (format) { -+ case GST_VIDEO_FORMAT_YV12: -+ case GST_VIDEO_FORMAT_NV12: -+ return TRUE; -+ default: -+ return FALSE; -+ } -+} -+ -+static void -+copy_data_to_gpu (gpointer gpu, GstVideoFormat format, gpointer data, -+ gpointer planes[], gint width, gint height) -+{ -+ gint src_height; -+ gint src_y_size, src_uv_size; -+ gint dst_y_size, dst_uv_size; -+ -+ /* width is already 16 aligned */ -+ switch (format) { -+ case GST_VIDEO_FORMAT_YV12: -+ src_height = GST_ROUND_UP_2 (height); -+ src_y_size = width * src_height; -+ src_uv_size = src_y_size / 4; -+ dst_y_size = width * height; -+ dst_uv_size = dst_y_size / 4; -+ memcpy (planes[0], data, dst_y_size); -+ memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); -+ memcpy (planes[2], (gchar *) data + src_y_size + src_uv_size, -+ dst_uv_size); -+ break; -+ case GST_VIDEO_FORMAT_NV12: -+ src_height = GST_ROUND_UP_2 (height); -+ src_y_size = width * src_height; -+ dst_y_size = width * height; -+ dst_uv_size = dst_y_size / 2; -+ memcpy (planes[0], data, dst_y_size); -+ memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); -+ break; -+ default: -+ return; -+ } -+} -+ -+gboolean -+gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display) -+{ -+ GstVideoFormat format = display->upload_video_format; -+ gint width = display->upload_data_width; -+ gint height = display->upload_data_height; -+ gpointer data = display->upload_data; -+ GstBufferMeta *meta = GST_BUFFER_META (display->upload_meta); -+ gpointer planes[3]; -+ GLuint physical = meta ? (GLuint) (meta->physical_data) : ~0U; -+ -+ GST_INFO ("gst_gl_vivante_tex_upload physical address 0x%x, data %p, tex %d", -+ physical, data, display->upload_outtex); -+ -+ if (!gst_gl_vivante_check_format (gpu, format, width, height)) -+ return FALSE; -+ -+ glBindTexture (GL_TEXTURE_2D, display->upload_outtex); -+ -+ if (((guint) data & 0x3F) != 0) { /* not aligned, need additional copy */ -+ if (!format_is_yuv (format)) { /* rgb is left to default handler */ -+ GST_WARNING ("Format %d unaligned data is not supported for" -+ " direct rendering", format); -+ return FALSE; -+ } -+ -+ GST_WARNING ("Data not aligned, need additional copy"); -+ -+ glTexDirectVIV (GL_TEXTURE_2D, width, height, -+ gst_gl_vivante_get_gl_format (gpu, format), (GLvoid **) & planes); -+ if (glGetError () != GL_NO_ERROR) -+ return FALSE; -+ -+ copy_data_to_gpu (gpu, format, data, planes, width, height); -+ } else { -+ glTexDirectVIVMap (GL_TEXTURE_2D, width, height, -+ gst_gl_vivante_get_gl_format (gpu, format), &data, &physical); -+ if (glGetError () != GL_NO_ERROR) -+ return FALSE; -+ display->upload_buf_mapped = TRUE; -+ } -+ -+ glTexDirectInvalidateVIV (GL_TEXTURE_2D); -+ -+ return TRUE; -+} -+ -+void -+gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps) -+{ -+ GstVideoFormat format; -+ gint width; -+ gint height; -+ GstStructure *s; -+ gint left = 0, right = 0, top = 0, bottom = 0; -+ GstGLVivante *viv = (GstGLVivante *) gpu; -+ -+ s = gst_caps_get_structure (caps, 0); -+ gst_structure_get_int (s, "crop-left-by-pixel", &left); -+ gst_structure_get_int (s, "crop-top-by-pixel", &top); -+ gst_structure_get_int (s, "crop-right-by-pixel", &right); -+ gst_structure_get_int (s, "crop-bottom-by-pixel", &bottom); -+ -+ gst_video_format_parse_caps (caps, &format, &width, &height); -+ -+ viv->sampler_left = ((gfloat) left) / width; -+ viv->sampler_right = ((gfloat) (width - right)) / width; -+ viv->sampler_top = ((gfloat) (height - bottom)) / height; -+ viv->sampler_bottom = ((gfloat) top) / height; -+} -+ -+void -+gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat * left, gfloat * right, -+ gfloat * top, gfloat * bottom) -+{ -+ GstGLVivante *viv = (GstGLVivante *) gpu; -+ -+ *left = viv->sampler_left; -+ *right = viv->sampler_right; -+ *top = viv->sampler_top; -+ *bottom = viv->sampler_bottom; -+} -diff --git a/gst-libs/gst/gl/gstglvivante.h b/gst-libs/gst/gl/gstglvivante.h -new file mode 100644 -index 0000000..f763f80 ---- /dev/null -+++ b/gst-libs/gst/gl/gstglvivante.h -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __GST_GL_VIVANTE_H__ -+#define __GST_GL_VIVANTE_H__ -+ -+#include "gstgldisplay.h" -+#include -+ -+G_BEGIN_DECLS -+ -+gpointer gst_gl_vivante_new(); -+void gst_gl_vivante_delete(gpointer gpu); -+ -+gboolean gst_gl_vivante_check_format(gpointer gpu, GstVideoFormat format, gint width, gint height); -+GLenum gst_gl_vivante_get_gl_format(gpointer gpu, GstVideoFormat format); -+ -+gboolean gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display); -+void gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps); -+ -+void gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom); -+ -+G_END_DECLS -+ -+#endif /* __GST_GL_VIVANTE_H__ */ -diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h -index 499d47a..c3cafb2 100644 ---- a/gst-libs/gst/gl/gstglwindow.h -+++ b/gst-libs/gst/gl/gstglwindow.h -@@ -21,6 +21,10 @@ - #ifndef __GST_GL_WINDOW_H__ - #define __GST_GL_WINDOW_H__ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - /* OpenGL 2.0 for Embedded Systems */ - #ifdef OPENGL_ES2 - #undef UNICODE -diff --git a/gst-libs/gst/gl/gstglwindow_fbES2.c b/gst-libs/gst/gl/gstglwindow_fbES2.c -new file mode 100644 -index 0000000..57c02e1 ---- /dev/null -+++ b/gst-libs/gst/gl/gstglwindow_fbES2.c -@@ -0,0 +1,709 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "gstglwindow.h" -+#include "EGL/eglvivante.h" -+ -+#include -+#include -+#include -+ -+#define GST_GL_WINDOW_GET_PRIVATE(o) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_WINDOW, GstGLWindowPrivate)) -+ -+/* A gl window is created and deleted in a thread dedicated to opengl calls -+ The name contains "window" because an opengl context is used in cooperation -+ with a window */ -+ -+const gchar *EGLErrorString (); -+ -+enum -+{ -+ ARG_0, -+ ARG_DISPLAY -+}; -+ -+enum GstGLFbEventType -+{ -+ FB_EVENT_DRAW, -+ FB_EVENT_CALLBACK, -+ FB_EVENT_QUIT, -+}; -+ -+typedef struct _GstGLFbEvent -+{ -+ enum GstGLFbEventType type; -+ GstGLWindowCB callback; -+ gpointer data; -+} GstGLFbEvent; -+ -+struct _GstGLWindowPrivate -+{ -+ /* X is not thread safe */ -+ GMutex *lock; -+ GCond *cond_send_message; -+ GCond *cond_queue_message; -+ gboolean running; -+ gboolean allow_extra_expose_events; -+ -+ /* fb queue */ -+ GList *queue; -+ -+ /* X context */ -+ gchar *display_name; -+ gint device_width; -+ gint device_height; -+ -+ EGLNativeWindowType internal_win_id; -+ EGLNativeDisplayType device; -+ -+ /* EGL */ -+ EGLContext gl_context; -+ EGLDisplay gl_display; -+ EGLSurface gl_surface; -+ -+ /* frozen callbacks */ -+ GstGLWindowCB draw_cb; -+ gpointer draw_data; -+ GstGLWindowCB2 resize_cb; -+ gpointer resize_data; -+ GstGLWindowCB close_cb; -+ gpointer close_data; -+}; -+ -+G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT); -+ -+#undef G_LOG_DOMAIN -+#define G_LOG_DOMAIN "GstGLWindow" -+ -+gboolean _gst_gl_window_debug = FALSE; -+ -+void -+gst_gl_window_init_platform () -+{ -+} -+ -+static void -+free_event (gpointer event, gpointer data) -+{ -+ g_slice_free (GstGLFbEvent, event); -+} -+ -+/* Must be called in the gl thread */ -+static void -+gst_gl_window_finalize (GObject * object) -+{ -+ GstGLWindow *window = GST_GL_WINDOW (object); -+ GstGLWindowPrivate *priv = window->priv; -+ gboolean ret = TRUE; -+ -+ g_mutex_lock (priv->lock); -+ -+ g_debug ("about to finalize gl window\n"); -+ -+ if (priv->gl_context) { -+ ret = -+ eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, -+ EGL_NO_CONTEXT); -+ if (!ret) -+ g_debug ("failed to release opengl context\n"); -+ -+ eglDestroyContext (priv->gl_display, priv->gl_context); -+ } -+ -+ if (priv->gl_display) -+ eglTerminate (priv->gl_display); -+ -+ if (priv->device) -+ fbDestroyDisplay (priv->device); -+ -+ g_list_foreach (priv->queue, free_event, NULL); -+ g_list_free (priv->queue); -+ priv->queue = NULL; -+ -+ if (priv->cond_send_message) { -+ g_cond_free (priv->cond_send_message); -+ priv->cond_send_message = NULL; -+ } -+ -+ if (priv->cond_queue_message) { -+ g_cond_free (priv->cond_queue_message); -+ priv->cond_queue_message = NULL; -+ } -+ -+ g_mutex_unlock (priv->lock); -+ -+ if (priv->lock) { -+ g_mutex_free (priv->lock); -+ priv->lock = NULL; -+ } -+ -+ G_OBJECT_CLASS (gst_gl_window_parent_class)->finalize (object); -+} -+ -+static void -+gst_gl_window_set_property (GObject * object, guint prop_id, -+ const GValue * value, GParamSpec * pspec) -+{ -+ GstGLWindow *window; -+ GstGLWindowPrivate *priv; -+ -+ g_return_if_fail (GST_GL_IS_WINDOW (object)); -+ -+ window = GST_GL_WINDOW (object); -+ -+ priv = window->priv; -+ -+ switch (prop_id) { -+ case ARG_DISPLAY: -+ priv->display_name = g_strdup (g_value_get_string (value)); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+gst_gl_window_get_property (GObject * object, guint prop_id, -+ GValue * value, GParamSpec * pspec) -+{ -+ GstGLWindow *window; -+ GstGLWindowPrivate *priv; -+ -+ g_return_if_fail (GST_GL_IS_WINDOW (object)); -+ -+ window = GST_GL_WINDOW (object); -+ -+ priv = window->priv; -+ -+ switch (prop_id) { -+ case ARG_DISPLAY: -+ g_value_set_string (value, priv->display_name); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+gst_gl_window_log_handler (const gchar * domain, GLogLevelFlags flags, -+ const gchar * message, gpointer user_data) -+{ -+ if (_gst_gl_window_debug) { -+ g_log_default_handler (domain, flags, message, user_data); -+ } -+} -+ -+static void -+gst_gl_window_class_init (GstGLWindowClass * klass) -+{ -+ GObjectClass *obj_class = G_OBJECT_CLASS (klass); -+ -+ g_type_class_add_private (klass, sizeof (GstGLWindowPrivate)); -+ -+ obj_class->finalize = gst_gl_window_finalize; -+ obj_class->set_property = gst_gl_window_set_property; -+ obj_class->get_property = gst_gl_window_get_property; -+ -+ g_object_class_install_property (obj_class, ARG_DISPLAY, -+ g_param_spec_string ("display", "Display", "X Display name", NULL, -+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -+} -+ -+static void -+gst_gl_window_init (GstGLWindow * window) -+{ -+ GstGLWindowPrivate *priv = NULL; -+ window->priv = GST_GL_WINDOW_GET_PRIVATE (window); -+ priv = window->priv; -+ -+ if (g_getenv ("GST_GL_WINDOW_DEBUG") != NULL) -+ _gst_gl_window_debug = TRUE; -+ -+ g_log_set_handler ("GstGLWindow", G_LOG_LEVEL_DEBUG, -+ gst_gl_window_log_handler, NULL); -+ -+ priv->lock = NULL; -+ priv->cond_send_message = NULL; -+ priv->running = FALSE; -+ priv->allow_extra_expose_events = FALSE; -+ -+ priv->queue = NULL; -+ -+ /* X context */ -+ priv->display_name = NULL; -+ priv->device_width = 0; -+ priv->device_height = 0; -+ -+ /* EGL */ -+ priv->gl_context = EGL_NO_CONTEXT; -+ priv->gl_display = 0; -+ priv->gl_surface = EGL_NO_SURFACE; -+ -+ /* frozen callbacks */ -+ priv->draw_cb = NULL; -+ priv->draw_data = NULL; -+ priv->resize_cb = NULL; -+ priv->resize_data = NULL; -+ priv->close_cb = NULL; -+ priv->close_data = NULL; -+} -+ -+/* Must be called in the gl thread */ -+GstGLWindow * -+gst_gl_window_new (gulong external_gl_context) -+{ -+ GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL); -+ GstGLWindowPrivate *priv = window->priv; -+ -+ EGLint config_attrib[] = { -+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT, -+ EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, -+ EGL_DEPTH_SIZE, 16, -+ EGL_NONE -+ }; -+ -+ EGLint context_attrib[] = { -+ EGL_CONTEXT_CLIENT_VERSION, 2, -+ EGL_NONE -+ }; -+ -+ EGLint majorVersion; -+ EGLint minorVersion; -+ EGLint numConfigs; -+ EGLConfig config; -+ -+ int index = 0; -+ -+ setlocale (LC_NUMERIC, "C"); -+ -+ priv->lock = g_mutex_new (); -+ priv->cond_send_message = g_cond_new (); -+ priv->cond_queue_message = g_cond_new (); -+ priv->running = TRUE; -+ priv->allow_extra_expose_events = TRUE; -+ -+ g_mutex_lock (priv->lock); -+ -+ if (priv->display_name) -+ index = strtol (priv->display_name, NULL, 0); -+ -+ priv->device = fbGetDisplayByIndex (index); -+ -+ if (!priv->device) { -+ g_debug ("failed to get fb display by index %d\n", index); -+ goto failure; -+ } -+ -+ priv->internal_win_id = fbCreateWindow (priv->device, -1, -1, 0, 0); -+ -+ fbGetDisplayGeometry (priv->device, &priv->device_width, -+ &priv->device_height); -+ -+ priv->gl_display = eglGetDisplay (priv->device); -+ -+ if (eglInitialize (priv->gl_display, &majorVersion, &minorVersion)) -+ g_debug ("egl initialized: %d.%d\n", majorVersion, minorVersion); -+ else { -+ g_debug ("failed to initialize egl %ld, %s\n", (gulong) priv->gl_display, -+ EGLErrorString ()); -+ goto failure; -+ } -+ -+ if (eglChooseConfig (priv->gl_display, config_attrib, &config, 1, -+ &numConfigs)) -+ g_debug ("config set: %ld, %ld\n", (gulong) config, (gulong) numConfigs); -+ else { -+ g_debug ("failed to set config %ld, %s\n", (gulong) priv->gl_display, -+ EGLErrorString ()); -+ goto failure; -+ } -+ -+ priv->gl_surface = -+ eglCreateWindowSurface (priv->gl_display, config, priv->internal_win_id, -+ NULL); -+ if (priv->gl_surface != EGL_NO_SURFACE) -+ g_debug ("surface created: %ld\n", (gulong) priv->gl_surface); -+ else { -+ g_debug ("failed to create surface %ld, %ld, %ld, %s\n", -+ (gulong) priv->gl_display, (gulong) priv->gl_surface, -+ (gulong) priv->gl_display, EGLErrorString ()); -+ goto failure; -+ } -+ -+ g_debug ("about to create gl context\n"); -+ -+ priv->gl_context = -+ eglCreateContext (priv->gl_display, config, -+ (EGLContext) (guint) external_gl_context, context_attrib); -+ -+ if (priv->gl_context != EGL_NO_CONTEXT) -+ g_debug ("gl context created: %ld\n", (gulong) priv->gl_context); -+ else { -+ g_debug ("failed to create glcontext %ld, %ld, %s\n", -+ (gulong) priv->gl_context, (gulong) priv->gl_display, -+ EGLErrorString ()); -+ goto failure; -+ } -+ -+ if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, -+ priv->gl_context)) { -+ g_debug ("failed to make opengl context current %ld, %s\n", -+ (gulong) priv->gl_display, EGLErrorString ()); -+ goto failure; -+ } -+ -+ g_mutex_unlock (priv->lock); -+ printf ("device WxH:%dx%d\n", priv->device_width, priv->device_height); -+ return window; -+ -+failure: -+ g_mutex_unlock (priv->lock); -+ g_object_unref (G_OBJECT (window)); -+ return NULL; -+} -+ -+GQuark -+gst_gl_window_error_quark (void) -+{ -+ return g_quark_from_static_string ("gst-gl-window-error"); -+} -+ -+gulong -+gst_gl_window_get_internal_gl_context (GstGLWindow * window) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ return (gulong) priv->gl_context; -+} -+ -+void -+callback_activate_gl_context (GstGLWindowPrivate * priv) -+{ -+ if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, -+ priv->gl_context)) -+ g_debug ("failed to activate opengl context %lud\n", -+ (gulong) priv->gl_context); -+} -+ -+void -+callback_inactivate_gl_context (GstGLWindowPrivate * priv) -+{ -+ if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, -+ EGL_NO_CONTEXT)) -+ g_debug ("failed to inactivate opengl context %lud\n", -+ (gulong) priv->gl_context); -+} -+ -+void -+gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ if (activate) -+ gst_gl_window_send_message (window, -+ GST_GL_WINDOW_CB (callback_activate_gl_context), priv); -+ else -+ gst_gl_window_send_message (window, -+ GST_GL_WINDOW_CB (callback_inactivate_gl_context), priv); -+} -+ -+/* Not called by the gl thread */ -+void -+gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id) -+{ -+} -+ -+void -+gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback, -+ gpointer data) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ priv->draw_cb = callback; -+ priv->draw_data = data; -+ -+ g_mutex_unlock (priv->lock); -+} -+ -+void -+gst_gl_window_set_resize_callback (GstGLWindow * window, -+ GstGLWindowCB2 callback, gpointer data) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ priv->resize_cb = callback; -+ priv->resize_data = data; -+ -+ g_mutex_unlock (priv->lock); -+} -+ -+void -+gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback, -+ gpointer data) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ priv->close_cb = callback; -+ priv->close_data = data; -+ -+ g_mutex_unlock (priv->lock); -+} -+ -+/* Called in the gl thread */ -+void -+gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ -+ if (priv->running && priv->allow_extra_expose_events) { -+ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); -+ event->type = FB_EVENT_DRAW; -+ priv->queue = g_list_append (priv->queue, event); -+ g_cond_signal (priv->cond_queue_message); -+ /* block until opengl calls have been executed in the gl thread */ -+ g_cond_wait (priv->cond_send_message, priv->lock); -+ } -+} -+ -+/* Not called by the gl thread */ -+void -+gst_gl_window_draw (GstGLWindow * window, gint width, gint height) -+{ -+ if (window) { -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ if (priv->running) { -+ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); -+ event->type = FB_EVENT_DRAW; -+ priv->queue = g_list_append (priv->queue, event); -+ g_cond_signal (priv->cond_queue_message); -+ /* block until opengl calls have been executed in the gl thread */ -+ g_cond_wait (priv->cond_send_message, priv->lock); -+ } -+ -+ g_mutex_unlock (priv->lock); -+ } -+} -+ -+static void -+gst_gl_fb_queue_flush (GList * queue, GCond * cond) -+{ -+ GstGLFbEvent *event; -+ GList *first; -+ -+ while ((first = g_list_first (queue))) { -+ event = first->data; -+ queue = g_list_delete_link (queue, first); -+ -+ if (event->type == FB_EVENT_CALLBACK) { -+ g_debug ("execute last pending custom x events\n"); -+ -+ if (!event->callback || !event->data) -+ g_debug ("custom cb not initialized\n"); -+ -+ event->callback (event->data); -+ -+ g_cond_signal (cond); -+ } -+ -+ g_slice_free (GstGLFbEvent, event); -+ } -+} -+ -+/* Called in the gl thread */ -+void -+gst_gl_window_run_loop (GstGLWindow * window) -+{ -+ GstGLWindowPrivate *priv = window->priv; -+ GstGLFbEvent *event; -+ GList *first; -+ -+ g_debug ("begin loop\n"); -+ -+ g_mutex_lock (priv->lock); -+ -+ while (priv->running) { -+ -+ if (!priv->queue) -+ g_cond_wait (priv->cond_queue_message, priv->lock); -+ -+ first = g_list_first (priv->queue); -+ event = first->data; -+ priv->queue = g_list_delete_link (priv->queue, first); -+ -+ // use in generic/cube and other related uses -+ priv->allow_extra_expose_events = g_list_length (priv->queue) <= 2; -+ -+ switch (event->type) { -+ case FB_EVENT_CALLBACK: -+ { -+ if (priv->running) { -+ if (!event->callback || !event->data) -+ g_debug ("custom cb not initialized\n"); -+ event->callback (event->data); -+ g_cond_signal (priv->cond_send_message); -+ } -+ break; -+ } -+ -+ case FB_EVENT_QUIT: -+ { -+ g_debug ("Quit loop message %lud\n", (gulong) priv->internal_win_id); -+ -+ /* exit loop */ -+ priv->running = FALSE; -+ -+ /* make sure last pendings send message calls are executed */ -+ gst_gl_fb_queue_flush (priv->queue, priv->cond_send_message); -+ priv->queue = NULL; -+ -+ /* Finally we can destroy opengl ressources (texture/shaders/fbo) */ -+ if (!event->callback || !event->data) -+ g_debug ("destroy cb not correclty set\n"); -+ -+ event->callback (event->data); -+ g_cond_signal (priv->cond_send_message); -+ break; -+ } -+ -+ case FB_EVENT_DRAW: -+ if (priv->draw_cb) { -+ priv->draw_cb (priv->draw_data); -+ glFlush (); -+ eglSwapBuffers (priv->gl_display, priv->gl_surface); -+ g_cond_signal (priv->cond_send_message); -+ } -+ break; -+ -+ default: -+ g_debug ("unknown GstGLFbEvent type: %ud\n", event->type); -+ break; -+ } // switch -+ -+ g_slice_free (GstGLFbEvent, event); -+ -+ } // while running -+ -+ g_mutex_unlock (priv->lock); -+ -+ g_debug ("end loop\n"); -+} -+ -+/* Not called by the gl thread */ -+void -+gst_gl_window_quit_loop (GstGLWindow * window, GstGLWindowCB callback, -+ gpointer data) -+{ -+ if (window) { -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ if (priv->running) { -+ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); -+ event->type = FB_EVENT_QUIT; -+ event->callback = callback; -+ event->data = data; -+ priv->queue = g_list_append (priv->queue, event); -+ -+ g_cond_signal (priv->cond_queue_message); -+ g_cond_wait (priv->cond_send_message, priv->lock); -+ } -+ -+ g_mutex_unlock (priv->lock); -+ } -+} -+ -+/* Not called by the gl thread */ -+void -+gst_gl_window_send_message (GstGLWindow * window, GstGLWindowCB callback, -+ gpointer data) -+{ -+ if (window) { -+ GstGLWindowPrivate *priv = window->priv; -+ -+ g_mutex_lock (priv->lock); -+ -+ if (priv->running) { -+ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); -+ event->type = FB_EVENT_CALLBACK; -+ event->callback = callback; -+ event->data = data; -+ priv->queue = g_list_append (priv->queue, event); -+ g_cond_signal (priv->cond_queue_message); -+ -+ /* block until opengl calls have been executed in the gl thread */ -+ g_cond_wait (priv->cond_send_message, priv->lock); -+ } -+ -+ g_mutex_unlock (priv->lock); -+ } -+} -+ -+const gchar * -+EGLErrorString () -+{ -+ EGLint nErr = eglGetError (); -+ switch (nErr) { -+ case EGL_SUCCESS: -+ return "EGL_SUCCESS"; -+ case EGL_BAD_DISPLAY: -+ return "EGL_BAD_DISPLAY"; -+ case EGL_NOT_INITIALIZED: -+ return "EGL_NOT_INITIALIZED"; -+ case EGL_BAD_ACCESS: -+ return "EGL_BAD_ACCESS"; -+ case EGL_BAD_ALLOC: -+ return "EGL_BAD_ALLOC"; -+ case EGL_BAD_ATTRIBUTE: -+ return "EGL_BAD_ATTRIBUTE"; -+ case EGL_BAD_CONFIG: -+ return "EGL_BAD_CONFIG"; -+ case EGL_BAD_CONTEXT: -+ return "EGL_BAD_CONTEXT"; -+ case EGL_BAD_CURRENT_SURFACE: -+ return "EGL_BAD_CURRENT_SURFACE"; -+ case EGL_BAD_MATCH: -+ return "EGL_BAD_MATCH"; -+ case EGL_BAD_NATIVE_PIXMAP: -+ return "EGL_BAD_NATIVE_PIXMAP"; -+ case EGL_BAD_NATIVE_WINDOW: -+ return "EGL_BAD_NATIVE_WINDOW"; -+ case EGL_BAD_PARAMETER: -+ return "EGL_BAD_PARAMETER"; -+ case EGL_BAD_SURFACE: -+ return "EGL_BAD_SURFACE"; -+ default: -+ return "unknown"; -+ } -+} -diff --git a/gst-libs/gst/gl/gstglwindow_x11ES2.c b/gst-libs/gst/gl/gstglwindow_x11ES2.c -index 260fd2e..65afb50 100644 ---- a/gst-libs/gst/gl/gstglwindow_x11ES2.c -+++ b/gst-libs/gst/gl/gstglwindow_x11ES2.c -@@ -116,16 +116,16 @@ gst_gl_window_finalize (GObject * object) - - if (priv->gl_context) { - ret = -- eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, -+ eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, - EGL_NO_CONTEXT); - if (!ret) - g_debug ("failed to release opengl context\n"); - -- eglDestroyContext (priv->device, priv->gl_context); -+ eglDestroyContext (priv->gl_display, priv->gl_context); - } - -- if (priv->device) -- eglTerminate (priv->device); -+ if (priv->gl_display) -+ eglTerminate (priv->gl_display); - - XFree (priv->visual_info); - -@@ -510,7 +510,7 @@ callback_activate_gl_context (GstGLWindowPrivate * priv) - void - callback_inactivate_gl_context (GstGLWindowPrivate * priv) - { -- if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, -+ if (!eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, - EGL_NO_CONTEXT)) - g_debug ("failed to inactivate opengl context %lud\n", - (gulong) priv->gl_context); -@@ -622,7 +622,7 @@ gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) - - XSendEvent (priv->device, priv->internal_win_id, FALSE, ExposureMask, - &event); -- XSync (priv->disp_send, FALSE); -+ XSync (priv->device, FALSE); - } - } - -diff --git a/gst/CMakeLists.txt b/gst/CMakeLists.txt -new file mode 100644 -index 0000000..3300d05 ---- /dev/null -+++ b/gst/CMakeLists.txt -@@ -0,0 +1 @@ -+add_subdirectory (gl) -diff --git a/gst/Makefile.in b/gst/Makefile.in -index ff7b517..a86785b 100644 ---- a/gst/Makefile.in -+++ b/gst/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = gst - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -279,7 +284,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -389,7 +395,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -643,15 +653,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst/gl/BUGS b/gst/gl/BUGS -new file mode 100644 -index 0000000..7110c92 ---- /dev/null -+++ b/gst/gl/BUGS -@@ -0,0 +1,3 @@ -+ -+known issues: -+ -diff --git a/gst/gl/CMakeLists.txt b/gst/gl/CMakeLists.txt -new file mode 100644 -index 0000000..e57d77a ---- /dev/null -+++ b/gst/gl/CMakeLists.txt -@@ -0,0 +1,72 @@ -+add_definitions(-DHAVE_CONFIG_H) -+ -+include_directories(AFTER -+ ${GSTREAMER_INCLUDE_DIR} -+ ${GLIB2_INCLUDE_DIR} -+ ${PNG_INCLUDE_DIR} -+ ${ZLIB_INCLUDE_DIR} -+ ../../gst-libs/gst/gl -+ ${GLEW_INCLUDE_DIR} -+ ../../gst-libs -+ . -+ effects) -+ -+if (NOT GST_USING_BINARY_REGISTRY) -+include_directories(AFTER -+ ${LIBXML2_INCLUDE_DIR} -+ ${LIBICONV_INCLUDE_DIR}) -+endif (NOT GST_USING_BINARY_REGISTRY) -+ -+if (WIN32) -+ include_directories(AFTER -+ ../../win32/common -+ ../../../win32/common) -+endif (WIN32) -+ -+if (APPLE) -+ include_directories(AFTER ../..) -+endif (APPLE) -+ -+add_library (gstopengl MODULE -+ gstopengl.c -+ gstglimagesink.c -+ gstglupload.c -+ gstgldownload.c -+ gstglfilterblur.c -+ gstglfiltercube.c -+ gstglfilterlaplacian.c -+ gstglfiltersobel.c -+ gstglfilterglass.c -+ gstglfilterapp.c -+ gstglfilterreflectedscreen.c -+ gstglfiltershader.c -+ gstglcolorscale.c -+ gltestsrc.c -+ gstgltestsrc.c -+ gstgloverlay.c -+ gstgldeinterlace.c -+ gstgldifferencematte.c -+ gstglbumper.c -+ gstgleffects.c -+ gstglmosaic.c -+ effects/gstgleffectssources.c -+ effects/gstgleffectidentity.c -+ effects/gstgleffectmirror.c -+ effects/gstgleffectsqueeze.c -+ effects/gstgleffectstretch.c -+ effects/gstgleffecttunnel.c -+ effects/gstgleffectfisheye.c -+ effects/gstgleffecttwirl.c -+ effects/gstgleffectbulge.c -+ effects/gstgleffectsquare.c -+ effects/gstgleffectlumatocurve.c -+ effects/gstgleffectrgbtocurve.c -+ effects/gstgleffectsin.c -+ effects/gstgleffectglow.c -+ effects/gstgleffectxray.c) -+ -+target_link_libraries(gstopengl -+ general gstgl -+ general ${JPEG_LIBRARY} -+ general ${PNG_LIBRARY} -+ general ${ZLIB_LIBRARY}) -diff --git a/gst/gl/GNUmakefile.gnustep b/gst/gl/GNUmakefile.gnustep -new file mode 100644 -index 0000000..37df1d4 ---- /dev/null -+++ b/gst/gl/GNUmakefile.gnustep -@@ -0,0 +1,45 @@ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+SUBPROJECT_NAME = gstgl -+ -+gstgl_C_FILES += \ -+ gstopengl.c \ -+ gstglimagesink.c \ -+ gstglupload.c \ -+ gstgldownload.c \ -+ gstglfilterblur.c \ -+ gstglfiltercube.c \ -+ gstglfilterlaplacian.c \ -+ gstglfiltersobel.c \ -+ gstglfilterglass.c \ -+ gstglfilterapp.c \ -+ gstglfilterreflectedscreen.c \ -+ gstglfiltershader.c \ -+ gstglcolorscale.c \ -+ gltestsrc.c \ -+ gstgltestsrc.c \ -+ gstgloverlay.c \ -+ gstgldifferencematte.c \ -+ gstgldeinterlace.c \ -+ gstglbumper.c \ -+ gstgleffects.c \ -+ gstglmosaic.c -+ -+gstgl_INCLUDE_DIRS += \ -+ -I../../gst-libs \ -+ -I../../gst-libs/gst/gl \ -+ -Ieffects -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+ gstgl_INCLUDE_DIRS += \ -+ -I../../win32/common \ -+ -IC:/gstreamer/include/libxml2 \ -+ -IC:/gstreamer/include/glib-2.0 \ -+ -IC:/gstreamer/lib/glib-2.0/include \ -+ -IC:/gstreamer/include \ -+ -IC:/gstreamer/include/gstreamer-0.10 -+endif -+ -+gstgl_CFLAGS = -Wall -DHAVE_CONFIG_H -+ -+include $(GNUSTEP_MAKEFILES)/subproject.make -diff --git a/gst/gl/Makefile.in b/gst/gl/Makefile.in -index c95d83f..cf88d25 100644 ---- a/gst/gl/Makefile.in -+++ b/gst/gl/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@am__append_1 = \ - @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@ gstglbumper.c \ - @GL_IS_OPENGL_TRUE@@HAVE_PNG_TRUE@ gstglbumper.h \ -@@ -51,7 +52,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --am__uninstall_files_from_dir = { \ -- test -z "$$files" \ -- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -- $(am__cd) "$$dir" && rm -f $$files; }; \ -- } - am__installdirs = "$(DESTDIR)$(plugindir)" - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = -@@ -182,8 +176,8 @@ am_libgstopengl_la_OBJECTS = libgstopengl_la-gstopengl.lo \ - libgstopengl_la-gstgleffectmirror.lo \ - libgstopengl_la-gstgleffectsqueeze.lo $(am__objects_3) - libgstopengl_la_OBJECTS = $(am_libgstopengl_la_OBJECTS) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - libgstopengl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -@@ -199,21 +193,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(libgstopengl_la_SOURCES) - DIST_SOURCES = $(am__libgstopengl_la_SOURCES_DIST) -@@ -266,6 +260,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -297,6 +292,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -304,8 +301,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -378,7 +377,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -423,6 +422,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -488,7 +488,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -627,7 +631,7 @@ clean-pluginLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libgstopengl.la: $(libgstopengl_la_OBJECTS) $(libgstopengl_la_DEPENDENCIES) $(EXTRA_libgstopengl_la_DEPENDENCIES) -+libgstopengl.la: $(libgstopengl_la_OBJECTS) $(libgstopengl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgstopengl_la_LINK) -rpath $(plugindir) $(libgstopengl_la_OBJECTS) $(libgstopengl_la_LIBADD) $(LIBS) - - mostlyclean-compile: -@@ -676,275 +680,314 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libgstopengl_la-gstopengl.lo: gstopengl.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstopengl.Tpo $(DEPDIR)/libgstopengl_la-gstopengl.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopengl.c' object='libgstopengl_la-gstopengl.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstopengl.c' object='libgstopengl_la-gstopengl.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglimagesink.lo: gstglimagesink.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglimagesink.Tpo $(DEPDIR)/libgstopengl_la-gstglimagesink.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglimagesink.c' object='libgstopengl_la-gstglimagesink.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglimagesink.c' object='libgstopengl_la-gstglimagesink.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglupload.lo: gstglupload.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglupload.Tpo $(DEPDIR)/libgstopengl_la-gstglupload.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglupload.c' object='libgstopengl_la-gstglupload.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglupload.c' object='libgstopengl_la-gstglupload.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgldownload.lo: gstgldownload.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldownload.Tpo $(DEPDIR)/libgstopengl_la-gstgldownload.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldownload.c' object='libgstopengl_la-gstgldownload.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldownload.c' object='libgstopengl_la-gstgldownload.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfiltercube.lo: gstglfiltercube.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltercube.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltercube.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltercube.c' object='libgstopengl_la-gstglfiltercube.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltercube.c' object='libgstopengl_la-gstglfiltercube.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffects.lo: gstgleffects.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffects.Tpo $(DEPDIR)/libgstopengl_la-gstgleffects.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgleffects.c' object='libgstopengl_la-gstgleffects.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgleffects.c' object='libgstopengl_la-gstgleffects.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectssources.lo: effects/gstgleffectssources.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectssources.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectssources.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectssources.c' object='libgstopengl_la-gstgleffectssources.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectssources.c' object='libgstopengl_la-gstgleffectssources.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectidentity.lo: effects/gstgleffectidentity.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectidentity.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectidentity.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectidentity.c' object='libgstopengl_la-gstgleffectidentity.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectidentity.c' object='libgstopengl_la-gstgleffectidentity.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectmirror.lo: effects/gstgleffectmirror.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectmirror.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectmirror.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectmirror.c' object='libgstopengl_la-gstgleffectmirror.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectmirror.c' object='libgstopengl_la-gstgleffectmirror.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectsqueeze.lo: effects/gstgleffectsqueeze.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsqueeze.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsqueeze.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsqueeze.c' object='libgstopengl_la-gstgleffectsqueeze.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsqueeze.c' object='libgstopengl_la-gstgleffectsqueeze.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfiltershader.lo: gstglfiltershader.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltershader.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltershader.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltershader.c' object='libgstopengl_la-gstglfiltershader.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltershader.c' object='libgstopengl_la-gstglfiltershader.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfilterblur.lo: gstglfilterblur.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterblur.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterblur.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterblur.c' object='libgstopengl_la-gstglfilterblur.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterblur.c' object='libgstopengl_la-gstglfilterblur.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfiltersobel.lo: gstglfiltersobel.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfiltersobel.Tpo $(DEPDIR)/libgstopengl_la-gstglfiltersobel.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfiltersobel.c' object='libgstopengl_la-gstglfiltersobel.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfiltersobel.c' object='libgstopengl_la-gstglfiltersobel.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfilterlaplacian.lo: gstglfilterlaplacian.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterlaplacian.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterlaplacian.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterlaplacian.c' object='libgstopengl_la-gstglfilterlaplacian.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterlaplacian.c' object='libgstopengl_la-gstglfilterlaplacian.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfilterglass.lo: gstglfilterglass.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterglass.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterglass.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterglass.c' object='libgstopengl_la-gstglfilterglass.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterglass.c' object='libgstopengl_la-gstglfilterglass.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfilterapp.lo: gstglfilterapp.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterapp.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterapp.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterapp.c' object='libgstopengl_la-gstglfilterapp.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterapp.c' object='libgstopengl_la-gstglfilterapp.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglfilterreflectedscreen.lo: gstglfilterreflectedscreen.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglfilterreflectedscreen.Tpo $(DEPDIR)/libgstopengl_la-gstglfilterreflectedscreen.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglfilterreflectedscreen.c' object='libgstopengl_la-gstglfilterreflectedscreen.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglfilterreflectedscreen.c' object='libgstopengl_la-gstglfilterreflectedscreen.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglcolorscale.lo: gstglcolorscale.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglcolorscale.Tpo $(DEPDIR)/libgstopengl_la-gstglcolorscale.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglcolorscale.c' object='libgstopengl_la-gstglcolorscale.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglcolorscale.c' object='libgstopengl_la-gstglcolorscale.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgldeinterlace.lo: gstgldeinterlace.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldeinterlace.Tpo $(DEPDIR)/libgstopengl_la-gstgldeinterlace.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldeinterlace.c' object='libgstopengl_la-gstgldeinterlace.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldeinterlace.c' object='libgstopengl_la-gstgldeinterlace.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gltestsrc.lo: gltestsrc.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gltestsrc.Tpo $(DEPDIR)/libgstopengl_la-gltestsrc.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gltestsrc.c' object='libgstopengl_la-gltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gltestsrc.c' object='libgstopengl_la-gltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgltestsrc.lo: gstgltestsrc.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgltestsrc.Tpo $(DEPDIR)/libgstopengl_la-gstgltestsrc.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgltestsrc.c' object='libgstopengl_la-gstgltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgltestsrc.c' object='libgstopengl_la-gstgltestsrc.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglmosaic.lo: gstglmosaic.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglmosaic.Tpo $(DEPDIR)/libgstopengl_la-gstglmosaic.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglmosaic.c' object='libgstopengl_la-gstglmosaic.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglmosaic.c' object='libgstopengl_la-gstglmosaic.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectstretch.lo: effects/gstgleffectstretch.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectstretch.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectstretch.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectstretch.c' object='libgstopengl_la-gstgleffectstretch.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectstretch.c' object='libgstopengl_la-gstgleffectstretch.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffecttunnel.lo: effects/gstgleffecttunnel.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffecttunnel.Tpo $(DEPDIR)/libgstopengl_la-gstgleffecttunnel.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffecttunnel.c' object='libgstopengl_la-gstgleffecttunnel.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffecttunnel.c' object='libgstopengl_la-gstgleffecttunnel.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectfisheye.lo: effects/gstgleffectfisheye.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectfisheye.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectfisheye.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectfisheye.c' object='libgstopengl_la-gstgleffectfisheye.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectfisheye.c' object='libgstopengl_la-gstgleffectfisheye.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffecttwirl.lo: effects/gstgleffecttwirl.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffecttwirl.Tpo $(DEPDIR)/libgstopengl_la-gstgleffecttwirl.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffecttwirl.c' object='libgstopengl_la-gstgleffecttwirl.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffecttwirl.c' object='libgstopengl_la-gstgleffecttwirl.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectbulge.lo: effects/gstgleffectbulge.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectbulge.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectbulge.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectbulge.c' object='libgstopengl_la-gstgleffectbulge.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectbulge.c' object='libgstopengl_la-gstgleffectbulge.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectsquare.lo: effects/gstgleffectsquare.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsquare.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsquare.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsquare.c' object='libgstopengl_la-gstgleffectsquare.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsquare.c' object='libgstopengl_la-gstgleffectsquare.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectlumatocurve.lo: effects/gstgleffectlumatocurve.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectlumatocurve.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectlumatocurve.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectlumatocurve.c' object='libgstopengl_la-gstgleffectlumatocurve.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectlumatocurve.c' object='libgstopengl_la-gstgleffectlumatocurve.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectrgbtocurve.lo: effects/gstgleffectrgbtocurve.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectrgbtocurve.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectrgbtocurve.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectrgbtocurve.c' object='libgstopengl_la-gstgleffectrgbtocurve.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectrgbtocurve.c' object='libgstopengl_la-gstgleffectrgbtocurve.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectsin.lo: effects/gstgleffectsin.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectsin.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectsin.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectsin.c' object='libgstopengl_la-gstgleffectsin.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectsin.c' object='libgstopengl_la-gstgleffectsin.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectglow.lo: effects/gstgleffectglow.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectglow.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectglow.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectglow.c' object='libgstopengl_la-gstgleffectglow.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectglow.c' object='libgstopengl_la-gstgleffectglow.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgleffectxray.lo: effects/gstgleffectxray.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgleffectxray.Tpo $(DEPDIR)/libgstopengl_la-gstgleffectxray.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='effects/gstgleffectxray.c' object='libgstopengl_la-gstgleffectxray.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='effects/gstgleffectxray.c' object='libgstopengl_la-gstgleffectxray.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstglbumper.lo: gstglbumper.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstglbumper.Tpo $(DEPDIR)/libgstopengl_la-gstglbumper.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstglbumper.c' object='libgstopengl_la-gstglbumper.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstglbumper.c' object='libgstopengl_la-gstglbumper.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgldifferencematte.lo: gstgldifferencematte.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgldifferencematte.Tpo $(DEPDIR)/libgstopengl_la-gstgldifferencematte.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgldifferencematte.c' object='libgstopengl_la-gstgldifferencematte.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgldifferencematte.c' object='libgstopengl_la-gstgldifferencematte.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - libgstopengl_la-gstgloverlay.lo: gstgloverlay.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopengl_la-gstgloverlay.Tpo $(DEPDIR)/libgstopengl_la-gstgloverlay.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgloverlay.c' object='libgstopengl_la-gstgloverlay.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgloverlay.c' object='libgstopengl_la-gstgloverlay.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - mostlyclean-libtool: - -rm -f *.lo -@@ -1051,15 +1094,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/gst/gl/effects/GNUmakefile.gnustep b/gst/gl/effects/GNUmakefile.gnustep -new file mode 100644 -index 0000000..2a7859b ---- /dev/null -+++ b/gst/gl/effects/GNUmakefile.gnustep -@@ -0,0 +1,38 @@ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+SUBPROJECT_NAME = gstgleffects -+ -+gstgleffects_C_FILES = \ -+ gstgleffectssources.c \ -+ gstgleffectidentity.c \ -+ gstgleffectmirror.c \ -+ gstgleffectsqueeze.c \ -+ gstgleffectstretch.c \ -+ gstgleffecttunnel.c \ -+ gstgleffectfisheye.c \ -+ gstgleffecttwirl.c \ -+ gstgleffectbulge.c \ -+ gstgleffectsquare.c \ -+ gstgleffectlumatocurve.c \ -+ gstgleffectrgbtocurve.c \ -+ gstgleffectsin.c \ -+ gstgleffectglow.c \ -+ gstgleffectxray.c -+ -+gstgleffects_INCLUDE_DIRS = \ -+ -I.. \ -+ -I../../../gst-libs/gst/gl -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+ gstgleffects_INCLUDE_DIRS += \ -+ -I../../../win32/common \ -+ -IC:/gstreamer/include/libxml2 \ -+ -IC:/gstreamer/include/glib-2.0 \ -+ -IC:/gstreamer/lib/glib-2.0/include \ -+ -IC:/gstreamer/include \ -+ -IC:/gstreamer/include/gstreamer-0.10 -+endif -+ -+gstgleffects_CFLAGS = -Wall -DHAVE_CONFIG_H -+ -+include $(GNUSTEP_MAKEFILES)/subproject.make -diff --git a/gst/gl/gstglbumper.c b/gst/gl/gstglbumper.c -index 12efe7d..2daec5b 100644 ---- a/gst/gl/gstglbumper.c -+++ b/gst/gl/gstglbumper.c -@@ -157,7 +157,6 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) - - png_structp png_ptr; - png_infop info_ptr; -- guint sig_read = 0; - png_uint_32 width = 0; - png_uint_32 height = 0; - gint bit_depth = 0; -@@ -209,7 +208,7 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) - - png_init_io (png_ptr, fp); - -- png_set_sig_bytes (png_ptr, sig_read); -+ png_set_sig_bytes (png_ptr, sizeof (magic)); - - png_read_info (png_ptr, info_ptr); - -diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c -index d57f5b5..369d7f1 100644 ---- a/gst/gl/gstglimagesink.c -+++ b/gst/gl/gstglimagesink.c -@@ -1,6 +1,6 @@ - /* -- * GStreamer -- * Copyright (C) 2003 Julien Moutte -+ * GStreamerfor -+ * Copyright (C) 2003 Julien Moutte for - * Copyright (C) 2005,2006,2007 David A. Schleef - * Copyright (C) 2008 Julien Isorce - * -@@ -86,6 +86,9 @@ - #include - - #include "gstglimagesink.h" -+#ifdef GPU_VIVANTE -+#include "gstglvivante.h" -+#endif - - GST_DEBUG_CATEGORY (gst_debug_glimage_sink); - #define GST_CAT_DEFAULT gst_debug_glimage_sink -@@ -137,11 +140,13 @@ static GstStaticPadTemplate gst_glimage_sink_template = - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_GL_VIDEO_CAPS ";" -- GST_VIDEO_CAPS_RGB ";" -- GST_VIDEO_CAPS_RGBx ";" -- GST_VIDEO_CAPS_RGBA ";" -- GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) -- ); -+ GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" -+#ifdef GPU_VIVANTE -+ GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") -+#else -+ GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") -+#endif -+ )); - #endif - - enum -@@ -152,7 +157,8 @@ enum - PROP_CLIENT_DRAW_CALLBACK, - PROP_CLIENT_DATA, - PROP_FORCE_ASPECT_RATIO, -- PROP_PIXEL_ASPECT_RATIO -+ PROP_PIXEL_ASPECT_RATIO, -+ PROP_RENDERED_FRAMES - }; - - GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink, -@@ -241,6 +247,10 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) - "The pixel aspect ratio of the device", "1/1", - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - -+ g_object_class_install_property (gobject_class, PROP_RENDERED_FRAMES, -+ g_param_spec_int ("rendered", "rendered", -+ "Get the total rendered frames", 0, G_MAXINT, 0, G_PARAM_READABLE)); -+ - gobject_class->finalize = gst_glimage_sink_finalize; - - gstelement_class->change_state = gst_glimage_sink_change_state; -@@ -261,6 +271,7 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink, - glimage_sink->new_window_id = 0; - glimage_sink->display = NULL; - glimage_sink->stored_buffer = NULL; -+ glimage_sink->stored_input_buffer = NULL; - glimage_sink->clientReshapeCallback = NULL; - glimage_sink->clientDrawCallback = NULL; - glimage_sink->client_data = NULL; -@@ -370,6 +381,9 @@ gst_glimage_sink_get_property (GObject * object, guint prop_id, - if (!g_value_transform (glimage_sink->par, value)) - g_warning ("Could not transform string to aspect ratio"); - break; -+ case PROP_RENDERED_FRAMES: -+ g_value_set_int (value, glimage_sink->rendered); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -435,6 +449,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) - - return GST_STATE_CHANGE_FAILURE; - } -+ glimage_sink->rendered = 0; - } - break; - case GST_STATE_CHANGE_PAUSED_TO_PLAYING: -@@ -456,6 +471,10 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) - gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); - glimage_sink->stored_buffer = NULL; - } -+ if (glimage_sink->stored_input_buffer) { -+ gst_buffer_unref (glimage_sink->stored_input_buffer); -+ glimage_sink->stored_input_buffer = NULL; -+ } - if (glimage_sink->display) { - g_object_unref (glimage_sink->display); - glimage_sink->display = NULL; -@@ -533,6 +552,14 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) - if (!ok) - return FALSE; - -+#ifdef GPU_VIVANTE -+ /* special case for format that vivante can't handle */ -+ if (format == GST_VIDEO_FORMAT_NV12 && -+ !gst_gl_vivante_check_format (glimage_sink->display->gpu_priv, format, -+ width, height)) -+ return FALSE; -+#endif -+ - /* init colorspace conversion if needed */ - ok = gst_gl_display_init_upload (glimage_sink->display, format, - width, height, width, height); -@@ -609,6 +636,11 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) - if (!glimage_sink->window_id && !glimage_sink->new_window_id) - gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (glimage_sink)); - -+#ifdef GPU_VIVANTE -+ if (glimage_sink->display->gpu_priv) -+ gst_gl_vivante_set_caps (glimage_sink->display->gpu_priv, caps); -+#endif -+ - return TRUE; - } - -@@ -617,11 +649,18 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) - { - GstGLImageSink *glimage_sink = NULL; - GstGLBuffer *gl_buffer = NULL; -+ gint index; -+ GstFlowReturn res; - - glimage_sink = GST_GLIMAGE_SINK (bsink); - - GST_INFO ("buffer size: %d", GST_BUFFER_SIZE (buf)); - -+ if (buf == glimage_sink->stored_input_buffer) -+ return GST_FLOW_OK; -+ -+ glimage_sink->display->upload_buf_mapped = FALSE; -+ - //is gl - if (glimage_sink->is_gl) { - //increment gl buffer ref before storage -@@ -633,9 +672,16 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) - gl_buffer = gst_gl_buffer_new (glimage_sink->display, - glimage_sink->width, glimage_sink->height); - -- //blocking call -- gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, -- glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); -+ index = G_N_ELEMENTS (buf->_gst_reserved) - 1; -+ -+ if (index >= 0) -+ //blocking call -+ gst_gl_display_do_upload_with_meta (glimage_sink->display, -+ gl_buffer->texture, glimage_sink->width, glimage_sink->height, -+ GST_BUFFER_DATA (buf), buf->_gst_reserved[index]); -+ else -+ gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, -+ glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); - - //gl_buffer is created in this block, so the gl buffer is already referenced - } -@@ -645,26 +691,36 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) - gst_gl_display_set_window_id (glimage_sink->display, - glimage_sink->window_id); - } -- //the buffer is cleared when an other comes in -- if (glimage_sink->stored_buffer) { -- gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); -- glimage_sink->stored_buffer = NULL; -- } -- //store current buffer -- glimage_sink->stored_buffer = gl_buffer; -- - //redisplay opengl scene - if (gl_buffer->texture && - gst_gl_display_redisplay (glimage_sink->display, - gl_buffer->texture, gl_buffer->width, gl_buffer->height, - glimage_sink->window_width, glimage_sink->window_height, - glimage_sink->keep_aspect_ratio)) -- return GST_FLOW_OK; -+ res = GST_FLOW_OK; - else { - GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND, - GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL)); -- return GST_FLOW_ERROR; -+ res = GST_FLOW_ERROR; - } -+ -+ //the buffer is cleared when an other comes in -+ if (glimage_sink->stored_buffer) { -+ gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); -+ glimage_sink->stored_buffer = NULL; -+ } -+ if (glimage_sink->stored_input_buffer) { -+ gst_buffer_unref (glimage_sink->stored_input_buffer); -+ glimage_sink->stored_input_buffer = NULL; -+ } -+ //store current buffer -+ glimage_sink->stored_buffer = gl_buffer; -+ if (glimage_sink->display->upload_buf_mapped) -+ glimage_sink->stored_input_buffer = gst_buffer_ref (buf); -+ -+ glimage_sink->rendered++; -+ -+ return res; - } - - -diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h -index c61b5c5..bd40bc4 100644 ---- a/gst/gl/gstglimagesink.h -+++ b/gst/gl/gstglimagesink.h -@@ -51,6 +51,7 @@ struct _GstGLImageSink - - //properties - gchar *display_name; -+ gint rendered; - - gulong window_id; - gulong new_window_id; -@@ -67,6 +68,7 @@ struct _GstGLImageSink - - GstGLDisplay *display; - GstGLBuffer *stored_buffer; -+ GstBuffer *stored_input_buffer; - - CRCB clientReshapeCallback; - CDCB clientDrawCallback; -diff --git a/gst/gl/gstglupload.c b/gst/gl/gstglupload.c -index 09bc96d..8e12532 100644 ---- a/gst/gl/gstglupload.c -+++ b/gst/gl/gstglupload.c -@@ -70,6 +70,9 @@ - - #include "gstglupload.h" - -+#ifdef GPU_VIVANTE -+#include "gstglvivante.h" -+#endif - - #define GST_CAT_DEFAULT gst_gl_upload_debug - GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -@@ -106,10 +109,13 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template = - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";" -- GST_VIDEO_CAPS_RGBx ";" -- GST_VIDEO_CAPS_RGBA ";" -- GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) -- ); -+ GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" -+#ifdef GPU_VIVANTE -+ GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") -+#else -+ GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") -+#endif -+ )); - #endif - - /* Properties */ -@@ -504,6 +510,14 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps, - GST_DEBUG ("caps connot be parsed"); - return FALSE; - } -+#ifdef GPU_VIVANTE -+ /* special case for format that vivante can't handle */ -+ if (upload->video_format == GST_VIDEO_FORMAT_NV12 && -+ !gst_gl_vivante_check_format (upload->display->gpu_priv, -+ upload->video_format, upload->video_width, upload->video_height)) -+ return FALSE; -+#endif -+ - //init colorspace conversion if needed - ret = gst_gl_display_init_upload (upload->display, upload->video_format, - upload->gl_width, upload->gl_height, -diff --git a/install-sh b/install-sh -index a9244eb..6781b98 100755 ---- a/install-sh -+++ b/install-sh -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2011-01-19.21; # UTC -+scriptversion=2009-04-28.21; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -156,10 +156,6 @@ while test $# -ne 0; do - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 -- # Protect names problematic for `test' and other utilities. -- case $dst_arg in -- -* | [=\(\)!]) dst_arg=./$dst_arg;; -- esac - shift;; - - -T) no_target_directory=true;; -@@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - fi - shift # arg - dst_arg=$arg -- # Protect names problematic for `test' and other utilities. -- case $dst_arg in -- -* | [=\(\)!]) dst_arg=./$dst_arg;; -- esac - done - fi - -@@ -208,11 +200,7 @@ if test $# -eq 0; then - fi - - if test -z "$dir_arg"; then -- do_exit='(exit $ret); exit $ret' -- trap "ret=129; $do_exit" 1 -- trap "ret=130; $do_exit" 2 -- trap "ret=141; $do_exit" 13 -- trap "ret=143; $do_exit" 15 -+ trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. -@@ -240,9 +228,9 @@ fi - - for src - do -- # Protect names problematic for `test' and other utilities. -+ # Protect names starting with `-'. - case $src in -- -* | [=\(\)!]) src=./$src;; -+ -*) src=./$src;; - esac - - if test -n "$dir_arg"; then -@@ -264,7 +252,12 @@ do - echo "$0: no destination specified." >&2 - exit 1 - fi -+ - dst=$dst_arg -+ # Protect names starting with `-'. -+ case $dst in -+ -*) dst=./$dst;; -+ esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. -@@ -392,7 +385,7 @@ do - - case $dstdir in - /*) prefix='/';; -- [-=\(\)!]*) prefix='./';; -+ -*) prefix='./';; - *) prefix='';; - esac - -@@ -410,7 +403,7 @@ do - - for d - do -- test X"$d" = X && continue -+ test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then -diff --git a/ltmain.sh b/ltmain.sh -index c7d06c3..b4a3231 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,9 +1,9 @@ - --# libtool (GNU libtool) 2.4.2 -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -41,7 +41,6 @@ - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent - # print informational messages (default) --# --no-warn don't display warning messages - # --tag=TAG use configuration variables from tag TAG - # -v, --verbose print more informational messages than default - # --no-verbose don't print the extra informational messages -@@ -70,7 +69,7 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 -+# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 - # automake: $automake_version - # autoconf: $autoconf_version - # -@@ -80,9 +79,9 @@ - - PROGRAM=libtool - PACKAGE=libtool --VERSION="2.4.2 Debian-2.4.2-1" -+VERSION="2.4 Debian-2.4-2ubuntu1" - TIMESTAMP="" --package_revision=1.3337 -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -137,10 +136,15 @@ progpath="$0" - - : ${CP="cp -f"} - test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -+: ${EGREP="/bin/grep -E"} -+: ${FGREP="/bin/grep -F"} -+: ${GREP="/bin/grep"} -+: ${LN_S="ln -s"} - : ${MAKE="make"} - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -383,7 +387,7 @@ case $progpath in - ;; - *) - save_IFS="$IFS" -- IFS=${PATH_SEPARATOR-:} -+ IFS=: - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break -@@ -767,8 +771,8 @@ func_help () - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ -- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ -- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p - d - } -@@ -1048,7 +1052,6 @@ opt_finish=false - opt_help=false - opt_help_all=false - opt_silent=: --opt_warning=: - opt_verbose=: - opt_silent=false - opt_verbose=false -@@ -1117,10 +1120,6 @@ esac - opt_silent=false - func_append preserve_args " $opt" - ;; -- --no-warning|--no-warn) -- opt_warning=false --func_append preserve_args " $opt" -- ;; - --no-verbose) - opt_verbose=false - func_append preserve_args " $opt" -@@ -2060,7 +2059,7 @@ func_mode_compile () - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; -@@ -3202,13 +3201,11 @@ func_mode_install () - - # Set up the ranlib parameters. - oldlib="$destdir/$name" -- func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 -- tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then -- func_show_eval "$old_striplib $tool_oldlib" 'exit $?' -+ func_show_eval "$old_striplib $oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. -@@ -3473,7 +3470,7 @@ static const void *lt_preloaded_setup() { - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; -@@ -3985,17 +3982,14 @@ func_exec_program_core () - # launches target application with the remaining arguments. - func_exec_program () - { -- case \" \$* \" in -- *\\ --lt-*) -- for lt_wr_arg -- do -- case \$lt_wr_arg in -- --lt-*) ;; -- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -- esac -- shift -- done ;; -- esac -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done - func_exec_program_core \${1+\"\$@\"} - } - -@@ -5063,15 +5057,9 @@ void lt_dump_script (FILE* f) - { - EOF - func_emit_wrapper yes | -- $SED -n -e ' --s/^\(.\{79\}\)\(..*\)/\1\ --\2/ --h --s/\([\\"]\)/\\\1/g --s/$/\\n/ --s/\([^\n]*\).*/ fputs ("\1", f);/p --g --D' -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' -+ - cat <<"EOF" - } - EOF -@@ -5655,8 +5643,7 @@ func_mode_link () - continue - ;; - -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" -@@ -6163,8 +6150,7 @@ func_mode_link () - lib= - found=no - case $deplib in -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" -@@ -6848,7 +6834,7 @@ func_mode_link () - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$absdir" -+ add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in -@@ -7333,7 +7319,6 @@ func_mode_link () - # which has an extra 1 added just for fun - # - case $version_type in -- # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result -@@ -7453,7 +7438,7 @@ func_mode_link () - versuffix="$major.$revision" - ;; - -- linux) # correct to gnu/linux during the next big refactor -+ linux) - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" -@@ -8041,11 +8026,6 @@ EOF - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then -- # Remove ${wl} instances when linking with ld. -- # FIXME: should test the right _cmds variable. -- case $archive_cmds in -- *\$LD\ *) wl= ;; -- esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= -@@ -8076,7 +8056,7 @@ EOF - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) func_append perm_rpath " $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -8084,7 +8064,11 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$hardcode_libdir_flag_spec_ld"; then -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" -+ else -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. -@@ -9174,8 +9158,6 @@ EOF - esac - done - fi -- func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 -- tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" -@@ -9285,8 +9267,7 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- func_resolve_sysroot "$deplib" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -diff --git a/m4/Makefile.in b/m4/Makefile.in -index d36ada1..cc7ff44 100644 ---- a/m4/Makefile.in -+++ b/m4/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = m4 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -240,7 +245,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -350,7 +356,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -449,15 +459,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/m4/codeset.m4 b/m4/codeset.m4 -new file mode 100644 -index 0000000..223955b ---- /dev/null -+++ b/m4/codeset.m4 -@@ -0,0 +1,21 @@ -+# codeset.m4 serial 2 (gettext-0.16) -+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([AM_LANGINFO_CODESET], -+[ -+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, -+ [AC_TRY_LINK([#include ], -+ [char* cs = nl_langinfo(CODESET); return !cs;], -+ am_cv_langinfo_codeset=yes, -+ am_cv_langinfo_codeset=no) -+ ]) -+ if test $am_cv_langinfo_codeset = yes; then -+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1, -+ [Define if you have and nl_langinfo(CODESET).]) -+ fi -+]) -diff --git a/m4/glibc2.m4 b/m4/glibc2.m4 -new file mode 100644 -index 0000000..e8f5bfe ---- /dev/null -+++ b/m4/glibc2.m4 -@@ -0,0 +1,30 @@ -+# glibc2.m4 serial 1 -+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+# Test for the GNU C Library, version 2.0 or newer. -+# From Bruno Haible. -+ -+AC_DEFUN([gt_GLIBC2], -+ [ -+ AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, -+ ac_cv_gnu_library_2, -+ [AC_EGREP_CPP([Lucky GNU user], -+ [ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ >= 2) -+ Lucky GNU user -+ #endif -+#endif -+ ], -+ ac_cv_gnu_library_2=yes, -+ ac_cv_gnu_library_2=no) -+ ] -+ ) -+ AC_SUBST(GLIBC2) -+ GLIBC2="$ac_cv_gnu_library_2" -+ ] -+) -diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 -new file mode 100644 -index 0000000..d95fd98 ---- /dev/null -+++ b/m4/glibc21.m4 -@@ -0,0 +1,30 @@ -+# glibc21.m4 serial 3 -+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+# Test for the GNU C Library, version 2.1 or newer. -+# From Bruno Haible. -+ -+AC_DEFUN([gl_GLIBC21], -+ [ -+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, -+ ac_cv_gnu_library_2_1, -+ [AC_EGREP_CPP([Lucky GNU user], -+ [ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) -+ Lucky GNU user -+ #endif -+#endif -+ ], -+ ac_cv_gnu_library_2_1=yes, -+ ac_cv_gnu_library_2_1=no) -+ ] -+ ) -+ AC_SUBST(GLIBC21) -+ GLIBC21="$ac_cv_gnu_library_2_1" -+ ] -+) -diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 -new file mode 100644 -index 0000000..8c8a670 ---- /dev/null -+++ b/m4/intdiv0.m4 -@@ -0,0 +1,84 @@ -+# intdiv0.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gt_INTDIV0], -+[ -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], -+ gt_cv_int_divbyzero_sigfpe, -+ [ -+ gt_cv_int_divbyzero_sigfpe= -+changequote(,)dnl -+ case "$host_os" in -+ macos* | darwin[6-9]* | darwin[1-9][0-9]*) -+ # On MacOS X 10.2 or newer, just assume the same as when cross- -+ # compiling. If we were to perform the real test, 1 Crash Report -+ # dialog window would pop up. -+ case "$host_cpu" in -+ i[34567]86 | x86_64) -+ gt_cv_int_divbyzero_sigfpe="guessing yes" ;; -+ esac -+ ;; -+ esac -+changequote([,])dnl -+ if test -z "$gt_cv_int_divbyzero_sigfpe"; then -+ AC_TRY_RUN([ -+#include -+#include -+ -+static void -+sigfpe_handler (int sig) -+{ -+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ -+ exit (sig != SIGFPE); -+} -+ -+int x = 1; -+int y = 0; -+int z; -+int nan; -+ -+int main () -+{ -+ signal (SIGFPE, sigfpe_handler); -+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) -+ signal (SIGTRAP, sigfpe_handler); -+#endif -+/* Linux/SPARC yields signal SIGILL. */ -+#if defined (__sparc__) && defined (__linux__) -+ signal (SIGILL, sigfpe_handler); -+#endif -+ -+ z = x / y; -+ nan = y / y; -+ exit (1); -+} -+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, -+ [ -+ # Guess based on the CPU. -+changequote(,)dnl -+ case "$host_cpu" in -+ alpha* | i[34567]86 | x86_64 | m68k | s390*) -+ gt_cv_int_divbyzero_sigfpe="guessing yes";; -+ *) -+ gt_cv_int_divbyzero_sigfpe="guessing no";; -+ esac -+changequote([,])dnl -+ ]) -+ fi -+ ]) -+ case "$gt_cv_int_divbyzero_sigfpe" in -+ *yes) value=1;; -+ *) value=0;; -+ esac -+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, -+ [Define if integer division by zero raises signal SIGFPE.]) -+]) -diff --git a/m4/intl.m4 b/m4/intl.m4 -new file mode 100644 -index 0000000..934408b ---- /dev/null -+++ b/m4/intl.m4 -@@ -0,0 +1,285 @@ -+# intl.m4 serial 8 (gettext-0.17) -+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper , 1995-2000. -+dnl Bruno Haible , 2000-2006. -+ -+AC_PREREQ(2.52) -+ -+dnl Checks for all prerequisites of the intl subdirectory, -+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -+AC_DEFUN([AM_INTL_SUBDIR], -+[ -+ AC_REQUIRE([AC_PROG_INSTALL])dnl -+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ AC_REQUIRE([gt_GLIBC2])dnl -+ AC_REQUIRE([AC_PROG_RANLIB])dnl -+ AC_REQUIRE([gl_VISIBILITY])dnl -+ AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl -+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl -+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl -+ AC_REQUIRE([gt_TYPE_WINT_T])dnl -+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([gt_TYPE_INTMAX_T]) -+ AC_REQUIRE([gt_PRINTF_POSIX]) -+ AC_REQUIRE([gl_GLIBC21])dnl -+ AC_REQUIRE([gl_XSIZE])dnl -+ AC_REQUIRE([gt_INTL_MACOSX])dnl -+ -+ AC_CHECK_TYPE([ptrdiff_t], , -+ [AC_DEFINE([ptrdiff_t], [long], -+ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) -+ ]) -+ AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) -+ AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) -+ -+ dnl Use the _snprintf function only if it is declared (because on NetBSD it -+ dnl is defined as a weak alias of snprintf; we prefer to use the latter). -+ gt_CHECK_DECL(_snprintf, [#include ]) -+ gt_CHECK_DECL(_snwprintf, [#include ]) -+ -+ dnl Use the *_unlocked functions only if they are declared. -+ dnl (because some of them were defined without being declared in Solaris -+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built -+ dnl on Solaris 2.5.1 to run on Solaris 2.6). -+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. -+ gt_CHECK_DECL(getc_unlocked, [#include ]) -+ -+ case $gt_cv_func_printf_posix in -+ *yes) HAVE_POSIX_PRINTF=1 ;; -+ *) HAVE_POSIX_PRINTF=0 ;; -+ esac -+ AC_SUBST([HAVE_POSIX_PRINTF]) -+ if test "$ac_cv_func_asprintf" = yes; then -+ HAVE_ASPRINTF=1 -+ else -+ HAVE_ASPRINTF=0 -+ fi -+ AC_SUBST([HAVE_ASPRINTF]) -+ if test "$ac_cv_func_snprintf" = yes; then -+ HAVE_SNPRINTF=1 -+ else -+ HAVE_SNPRINTF=0 -+ fi -+ AC_SUBST([HAVE_SNPRINTF]) -+ if test "$ac_cv_func_wprintf" = yes; then -+ HAVE_WPRINTF=1 -+ else -+ HAVE_WPRINTF=0 -+ fi -+ AC_SUBST([HAVE_WPRINTF]) -+ -+ AM_LANGINFO_CODESET -+ gt_LC_MESSAGES -+ -+ dnl Compilation on mingw and Cygwin needs special Makefile rules, because -+ dnl 1. when we install a shared library, we must arrange to export -+ dnl auxiliary pointer variables for every exported variable, -+ dnl 2. when we install a shared library and a static library simultaneously, -+ dnl the include file specifies __declspec(dllimport) and therefore we -+ dnl must arrange to define the auxiliary pointer variables for the -+ dnl exported variables _also_ in the static library. -+ if test "$enable_shared" = yes; then -+ case "$host_os" in -+ mingw* | cygwin*) is_woe32dll=yes ;; -+ *) is_woe32dll=no ;; -+ esac -+ else -+ is_woe32dll=no -+ fi -+ WOE32DLL=$is_woe32dll -+ AC_SUBST([WOE32DLL]) -+ -+ dnl On mingw and Cygwin, we can activate special Makefile rules which add -+ dnl version information to the shared libraries and executables. -+ case "$host_os" in -+ mingw* | cygwin*) is_woe32=yes ;; -+ *) is_woe32=no ;; -+ esac -+ WOE32=$is_woe32 -+ AC_SUBST([WOE32]) -+ if test $WOE32 = yes; then -+ dnl Check for a program that compiles Windows resource files. -+ AC_CHECK_TOOL([WINDRES], [windres]) -+ fi -+ -+ dnl Determine whether when creating a library, "-lc" should be passed to -+ dnl libtool or not. On many platforms, it is required for the libtool option -+ dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool -+ dnl in the *.la files - makes it impossible to create multithreaded programs, -+ dnl because libtool also reorders the -lc to come before the -pthread, and -+ dnl this disables pthread_create() . -+ case "$host_os" in -+ hpux*) LTLIBC="" ;; -+ *) LTLIBC="-lc" ;; -+ esac -+ AC_SUBST([LTLIBC]) -+ -+ dnl Rename some macros and functions used for locking. -+ AH_BOTTOM([ -+#define __libc_lock_t gl_lock_t -+#define __libc_lock_define gl_lock_define -+#define __libc_lock_define_initialized gl_lock_define_initialized -+#define __libc_lock_init gl_lock_init -+#define __libc_lock_lock gl_lock_lock -+#define __libc_lock_unlock gl_lock_unlock -+#define __libc_lock_recursive_t gl_recursive_lock_t -+#define __libc_lock_define_recursive gl_recursive_lock_define -+#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -+#define __libc_lock_init_recursive gl_recursive_lock_init -+#define __libc_lock_lock_recursive gl_recursive_lock_lock -+#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -+#define glthread_in_use libintl_thread_in_use -+#define glthread_lock_init libintl_lock_init -+#define glthread_lock_lock libintl_lock_lock -+#define glthread_lock_unlock libintl_lock_unlock -+#define glthread_lock_destroy libintl_lock_destroy -+#define glthread_rwlock_init libintl_rwlock_init -+#define glthread_rwlock_rdlock libintl_rwlock_rdlock -+#define glthread_rwlock_wrlock libintl_rwlock_wrlock -+#define glthread_rwlock_unlock libintl_rwlock_unlock -+#define glthread_rwlock_destroy libintl_rwlock_destroy -+#define glthread_recursive_lock_init libintl_recursive_lock_init -+#define glthread_recursive_lock_lock libintl_recursive_lock_lock -+#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -+#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -+#define glthread_once libintl_once -+#define glthread_once_call libintl_once_call -+#define glthread_once_singlethreaded libintl_once_singlethreaded -+]) -+]) -+ -+ -+dnl Checks for the core files of the intl subdirectory: -+dnl dcigettext.c -+dnl eval-plural.h -+dnl explodename.c -+dnl finddomain.c -+dnl gettextP.h -+dnl gmo.h -+dnl hash-string.h hash-string.c -+dnl l10nflist.c -+dnl libgnuintl.h.in (except the *printf stuff) -+dnl loadinfo.h -+dnl loadmsgcat.c -+dnl localealias.c -+dnl log.c -+dnl plural-exp.h plural-exp.c -+dnl plural.y -+dnl Used by libglocale. -+AC_DEFUN([gt_INTL_SUBDIR_CORE], -+[ -+ AC_REQUIRE([AC_C_INLINE])dnl -+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl -+ AC_REQUIRE([gl_AC_HEADER_STDINT_H]) -+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl -+ AC_REQUIRE([AC_FUNC_MMAP])dnl -+ AC_REQUIRE([gt_INTDIV0])dnl -+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl -+ AC_REQUIRE([gt_INTTYPES_PRI])dnl -+ AC_REQUIRE([gl_LOCK])dnl -+ -+ AC_TRY_LINK( -+ [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], -+ [], -+ [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, -+ [Define to 1 if the compiler understands __builtin_expect.])]) -+ -+ AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) -+ AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ -+ stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ -+ argz_next __fsetlocking]) -+ -+ dnl Use the *_unlocked functions only if they are declared. -+ dnl (because some of them were defined without being declared in Solaris -+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built -+ dnl on Solaris 2.5.1 to run on Solaris 2.6). -+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. -+ gt_CHECK_DECL(feof_unlocked, [#include ]) -+ gt_CHECK_DECL(fgets_unlocked, [#include ]) -+ -+ AM_ICONV -+ -+ dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, -+ dnl and a _NL_LOCALE_NAME macro always. -+ AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, -+ [AC_TRY_LINK([#include -+#include ], -+ [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); -+ return !cs; -+ ], -+ gt_cv_nl_locale_name=yes, -+ gt_cv_nl_locale_name=no) -+ ]) -+ if test $gt_cv_nl_locale_name = yes; then -+ AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, -+ [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) -+ fi -+ -+ dnl intl/plural.c is generated from intl/plural.y. It requires bison, -+ dnl because plural.y uses bison specific features. It requires at least -+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't -+ dnl compile. -+ dnl bison is only needed for the maintainer (who touches plural.y). But in -+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put -+ dnl the rule in general Makefile. Now, some people carelessly touch the -+ dnl files or have a broken "make" program, hence the plural.c rule will -+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not -+ dnl present or too old. -+ AC_CHECK_PROGS([INTLBISON], [bison]) -+ if test -z "$INTLBISON"; then -+ ac_verc_fail=yes -+ else -+ dnl Found it, now check the version. -+ AC_MSG_CHECKING([version of bison]) -+changequote(<<,>>)dnl -+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` -+ case $ac_prog_version in -+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -+changequote([,])dnl -+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; -+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -+ esac -+ AC_MSG_RESULT([$ac_prog_version]) -+ fi -+ if test $ac_verc_fail = yes; then -+ INTLBISON=: -+ fi -+]) -+ -+ -+dnl gt_CHECK_DECL(FUNC, INCLUDES) -+dnl Check whether a function is declared. -+AC_DEFUN([gt_CHECK_DECL], -+[ -+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, -+ [AC_TRY_COMPILE([$2], [ -+#ifndef $1 -+ char *p = (char *) $1; -+#endif -+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) -+ if test $ac_cv_have_decl_$1 = yes; then -+ gt_value=1 -+ else -+ gt_value=0 -+ fi -+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], -+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) -+]) -diff --git a/m4/intldir.m4 b/m4/intldir.m4 -new file mode 100644 -index 0000000..7a28843 ---- /dev/null -+++ b/m4/intldir.m4 -@@ -0,0 +1,19 @@ -+# intldir.m4 serial 1 (gettext-0.16) -+dnl Copyright (C) 2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+AC_PREREQ(2.52) -+ -+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. -+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) -diff --git a/m4/intmax.m4 b/m4/intmax.m4 -new file mode 100644 -index 0000000..ce7a8a4 ---- /dev/null -+++ b/m4/intmax.m4 -@@ -0,0 +1,33 @@ -+# intmax.m4 serial 3 (gettext-0.16) -+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+dnl Test whether the system has the 'intmax_t' type, but don't attempt to -+dnl find a replacement if it is lacking. -+ -+AC_DEFUN([gt_TYPE_INTMAX_T], -+[ -+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([gl_AC_HEADER_STDINT_H]) -+ AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, -+ [AC_TRY_COMPILE([ -+#include -+#include -+#if HAVE_STDINT_H_WITH_UINTMAX -+#include -+#endif -+#if HAVE_INTTYPES_H_WITH_UINTMAX -+#include -+#endif -+], [intmax_t x = -1; -+ return !x;], -+ gt_cv_c_intmax_t=yes, -+ gt_cv_c_intmax_t=no)]) -+ if test $gt_cv_c_intmax_t = yes; then -+ AC_DEFINE(HAVE_INTMAX_T, 1, -+ [Define if you have the 'intmax_t' type in or .]) -+ fi -+]) -diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 -new file mode 100644 -index 0000000..7c7f894 ---- /dev/null -+++ b/m4/inttypes-pri.m4 -@@ -0,0 +1,36 @@ -+# inttypes-pri.m4 serial 4 (gettext-0.16) -+dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+AC_PREREQ(2.52) -+ -+# Define PRI_MACROS_BROKEN if exists and defines the PRI* -+# macros to non-string values. This is the case on AIX 4.3.3. -+ -+AC_DEFUN([gt_INTTYPES_PRI], -+[ -+ AC_CHECK_HEADERS([inttypes.h]) -+ if test $ac_cv_header_inttypes_h = yes; then -+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], -+ gt_cv_inttypes_pri_broken, -+ [ -+ AC_TRY_COMPILE([#include -+#ifdef PRId32 -+char *p = PRId32; -+#endif -+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) -+ ]) -+ fi -+ if test "$gt_cv_inttypes_pri_broken" = yes; then -+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, -+ [Define if exists and defines unusable PRI* macros.]) -+ PRI_MACROS_BROKEN=1 -+ else -+ PRI_MACROS_BROKEN=0 -+ fi -+ AC_SUBST([PRI_MACROS_BROKEN]) -+]) -diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 -new file mode 100644 -index 0000000..edc8ecb ---- /dev/null -+++ b/m4/inttypes_h.m4 -@@ -0,0 +1,26 @@ -+# inttypes_h.m4 serial 7 -+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([gl_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1; return !i;], -+ gl_cv_header_inttypes_h=yes, -+ gl_cv_header_inttypes_h=no)]) -+ if test $gl_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+ [Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) -diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 -new file mode 100644 -index 0000000..19aa77e ---- /dev/null -+++ b/m4/lcmessage.m4 -@@ -0,0 +1,30 @@ -+# lcmessage.m4 serial 4 (gettext-0.14.2) -+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper , 1995. -+ -+# Check whether LC_MESSAGES is available in . -+ -+AC_DEFUN([gt_LC_MESSAGES], -+[ -+ AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) -+ if test $gt_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+]) -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 828104c..8ff3c76 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1,8 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -11,8 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -146,8 +146,6 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl - AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl - AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - --_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl --dnl - _LT_DECL([], [host_alias], [0], [The host system])dnl - _LT_DECL([], [host], [0])dnl - _LT_DECL([], [host_os], [0])dnl -@@ -639,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2011 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -803,7 +801,6 @@ AC_DEFUN([LT_LANG], - m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], -- [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], -@@ -825,31 +822,6 @@ m4_defun([_LT_LANG], - ])# _LT_LANG - - --m4_ifndef([AC_PROG_GO], [ --############################################################ --# NOTE: This macro has been submitted for inclusion into # --# GNU Autoconf as AC_PROG_GO. When it is available in # --# a released version of Autoconf we should remove this # --# macro and use it instead. # --############################################################ --m4_defun([AC_PROG_GO], --[AC_LANG_PUSH(Go)dnl --AC_ARG_VAR([GOC], [Go compiler command])dnl --AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl --_AC_ARG_VAR_LDFLAGS()dnl --AC_CHECK_TOOL(GOC, gccgo) --if test -z "$GOC"; then -- if test -n "$ac_tool_prefix"; then -- AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) -- fi --fi --if test -z "$GOC"; then -- AC_CHECK_PROG(GOC, gccgo, gccgo, false) --fi --])#m4_defun --])#m4_ifndef -- -- - # _LT_LANG_DEFAULT_CONFIG - # ----------------------- - m4_defun([_LT_LANG_DEFAULT_CONFIG], -@@ -880,10 +852,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - --AC_PROVIDE_IFELSE([AC_PROG_GO], -- [LT_LANG(GO)], -- [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -- - AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -@@ -986,13 +954,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? -- # If there is a non-empty error log, and "single_module" -- # appears in it, assume the flag caused a linker warning -- if test -s conftest.err && $GREP single_module conftest.err; then -- cat conftest.err >&AS_MESSAGE_LOG_FD -- # Otherwise, if the output was created with a 0 exit code from -- # the compiler, it worked. -- elif test -f libconftest.dylib && test $_lt_result -eq 0; then -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD -@@ -1000,7 +962,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) -- - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no -@@ -1012,7 +973,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) -- - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -@@ -1030,9 +990,7 @@ _LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? -- if test -s conftest.err && $GREP force_load conftest.err; then -- cat conftest.err >&AS_MESSAGE_LOG_FD -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD -@@ -1077,8 +1035,8 @@ _LT_EOF - ]) - - --# _LT_DARWIN_LINKER_FEATURES([TAG]) --# --------------------------------- -+# _LT_DARWIN_LINKER_FEATURES -+# -------------------------- - # Checks for linker and compiler features on darwin - m4_defun([_LT_DARWIN_LINKER_FEATURES], - [ -@@ -1089,8 +1047,6 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _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\"`' -- m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], -- [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi -@@ -1374,27 +1330,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - CFLAGS="$SAVE_CFLAGS" - fi - ;; --*-*solaris*) -+sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -- yes*) -- case $host in -- i?86-*-solaris*) -- LD="${LD-ld} -m elf_x86_64" -- ;; -- sparc*-*-solaris*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- # GNU ld 2.21 introduced _sol2 emulations. Use them if available. -- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -- LD="${LD-ld}_sol2" -- fi -- ;; -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" -@@ -1471,13 +1414,13 @@ old_postuninstall_cmds= - if test -n "$RANLIB"; then - case $host_os in - openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - - case $host_os in -@@ -1657,11 +1600,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - lt_cv_sys_max_cmd_len=196608 - ;; - -- os2*) -- # The test takes a long time on OS/2. -- lt_cv_sys_max_cmd_len=8192 -- ;; -- - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -@@ -1701,7 +1639,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do -@@ -2247,7 +2185,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -2256,7 +2194,7 @@ aix3*) - ;; - - aix[[4-9]]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -2321,7 +2259,7 @@ beos*) - ;; - - bsdi[[45]]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -2460,7 +2398,7 @@ m4_if([$1], [],[ - ;; - - dgux*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -2468,6 +2406,10 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -2475,7 +2417,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[[23]].*) objformat=aout ;; -+ freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -2493,7 +2435,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2.*) -+ freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) -@@ -2513,7 +2455,7 @@ freebsd* | dragonfly*) - ;; - - gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -@@ -2524,7 +2466,7 @@ gnu*) - ;; - - haiku*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" -@@ -2585,7 +2527,7 @@ hpux9* | hpux10* | hpux11*) - ;; - - interix[[3-9]]*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -2601,7 +2543,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - else - version_type=irix - fi ;; -@@ -2638,9 +2580,9 @@ linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - --# This must be glibc/ELF. -+# This must be Linux ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2715,7 +2657,7 @@ netbsd*) - ;; - - newsos6) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -2784,7 +2726,7 @@ rdos*) - ;; - - solaris*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2809,7 +2751,7 @@ sunos4*) - ;; - - sysv4 | sysv4.3*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -2833,7 +2775,7 @@ sysv4 | sysv4.3*) - - sysv4*MP*) - if test -d /usr/nec ;then -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -2864,7 +2806,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - - tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2874,7 +2816,7 @@ tpf*) - ;; - - uts4*) -- version_type=linux # correct to gnu/linux during the next big refactor -+ version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -3296,7 +3238,7 @@ irix5* | irix6* | nonstopux*) - lt_cv_deplibs_check_method=pass_all - ;; - --# This must be glibc/ELF. -+# This must be Linux ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -3716,7 +3658,6 @@ for ac_symprfx in "" "_"; do - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ - " {last_section=section; section=\$ 3};"\ --" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -@@ -4301,9 +4242,7 @@ m4_if([$1], [CXX], [ - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' -- if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" -- fi -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' - ;; - esac - else -@@ -4395,33 +4334,18 @@ m4_if([$1], [CXX], [ - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) -+ *Sun\ F* | *Sun*Fortran*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; -- *Sun\ F* | *Sun*Fortran*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; -- *Intel*\ [[CF]]*Compiler*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- *Portland\ Group*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; - esac - ;; - esac -@@ -4581,9 +4505,7 @@ m4_if([$1], [CXX], [ - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in -- cl*) -- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -- ;; -+ cl*) ;; - *) - _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' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -@@ -4611,6 +4533,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -@@ -4864,7 +4787,8 @@ _LT_EOF - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -@@ -5160,7 +5084,6 @@ _LT_EOF - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _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' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -@@ -5207,6 +5130,10 @@ _LT_EOF - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - -+ freebsd1*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little -@@ -5219,7 +5146,7 @@ _LT_EOF - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2.*) -+ freebsd2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes -@@ -5258,6 +5185,7 @@ _LT_EOF - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -@@ -5699,6 +5627,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1], - _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -+ [[If ld is used when linking, flag to hardcode $libdir into a binary -+ during linking. This must work even if $libdir does not exist]]) - _LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) - _LT_TAGDECL([], [hardcode_direct], [0], -@@ -5856,6 +5787,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -@@ -6225,7 +6157,7 @@ if test "$_lt_caught_CXX_error" != yes; then - esac - ;; - -- freebsd2.*) -+ freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -6986,18 +6918,12 @@ public class foo { - } - }; - _LT_EOF --], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF --package foo --func foo() { --} --_LT_EOF - ]) - - _lt_libdeps_save_CFLAGS=$CFLAGS - case "$CC $CFLAGS " in #( - *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; - *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; --*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; - esac - - dnl Parse the compiler output and extract the necessary -@@ -7194,6 +7120,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=no -@@ -7326,6 +7253,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=no -@@ -7512,77 +7440,6 @@ CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - --# _LT_LANG_GO_CONFIG([TAG]) --# -------------------------- --# Ensure that the configuration variables for the GNU Go compiler --# are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. --m4_defun([_LT_LANG_GO_CONFIG], --[AC_REQUIRE([LT_PROG_GO])dnl --AC_LANG_SAVE -- --# Source file extension for Go test sources. --ac_ext=go -- --# Object file extension for compiled Go test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code="package main; func main() { }" -- --# Code to be used in simple link tests --lt_simple_link_test_code='package main; func main() { }' -- --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_TAG_COMPILER -- --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -- --# Allow CC to be a program name with arguments. --lt_save_CC=$CC --lt_save_CFLAGS=$CFLAGS --lt_save_GCC=$GCC --GCC=yes --CC=${GOC-"gccgo"} --CFLAGS=$GOFLAGS --compiler=$CC --_LT_TAGVAR(compiler, $1)=$CC --_LT_TAGVAR(LD, $1)="$LD" --_LT_CC_BASENAME([$compiler]) -- --# Go did not exist at the time GCC didn't implicitly link libc in. --_LT_TAGVAR(archive_cmds_need_lc, $1)=no -- --_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_TAGVAR(reload_flag, $1)=$reload_flag --_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -- --## CAVEAT EMPTOR: --## There is no encapsulation within the following macros, do not change --## the running order or otherwise move them around unless you know exactly --## what you are doing... --if test -n "$compiler"; then -- _LT_COMPILER_NO_RTTI($1) -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -- -- _LT_CONFIG($1) --fi -- --AC_LANG_RESTORE -- --GCC=$lt_save_GCC --CC=$lt_save_CC --CFLAGS=$lt_save_CFLAGS --])# _LT_LANG_GO_CONFIG -- -- - # _LT_LANG_RC_CONFIG([TAG]) - # ------------------------- - # Ensure that the configuration variables for the Windows resource compiler -@@ -7652,13 +7509,6 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - --# LT_PROG_GO --# ---------- --AC_DEFUN([LT_PROG_GO], --[AC_CHECK_TOOL(GOC, gccgo,) --]) -- -- - # LT_PROG_RC - # ---------- - AC_DEFUN([LT_PROG_RC], -diff --git a/m4/lock.m4 b/m4/lock.m4 -new file mode 100644 -index 0000000..9111933 ---- /dev/null -+++ b/m4/lock.m4 -@@ -0,0 +1,316 @@ -+# lock.m4 serial 7 (gettext-0.17) -+dnl Copyright (C) 2005-2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+dnl Tests for a multithreading library to be used. -+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, -+dnl USE_PTH_THREADS, USE_WIN32_THREADS -+dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use -+dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with -+dnl libtool). -+dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for -+dnl programs that really need multithread functionality. The difference -+dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak -+dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". -+dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for -+dnl multithread-safe programs. -+ -+AC_DEFUN([gl_LOCK_EARLY], -+[ -+ AC_REQUIRE([gl_LOCK_EARLY_BODY]) -+]) -+ -+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once. -+ -+AC_DEFUN([gl_LOCK_EARLY_BODY], -+[ -+ dnl Ordering constraints: This macro modifies CPPFLAGS in a way that -+ dnl influences the result of the autoconf tests that test for *_unlocked -+ dnl declarations, on AIX 5 at least. Therefore it must come early. -+ AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl -+ AC_BEFORE([$0], [gl_ARGP])dnl -+ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems. -+ dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes -+ dnl AC_GNU_SOURCE. -+ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], -+ [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], -+ [AC_REQUIRE([AC_GNU_SOURCE])]) -+ dnl Check for multithreading. -+ AC_ARG_ENABLE(threads, -+AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) -+AC_HELP_STRING([--disable-threads], [build without multithread safety]), -+ [gl_use_threads=$enableval], -+ [case "$host_os" in -+ dnl Disable multithreading by default on OSF/1, because it interferes -+ dnl with fork()/exec(): When msgexec is linked with -lpthread, its child -+ dnl process gets an endless segmentation fault inside execvp(). -+ osf*) gl_use_threads=no ;; -+ *) gl_use_threads=yes ;; -+ esac -+ ]) -+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then -+ # For using : -+ case "$host_os" in -+ osf*) -+ # On OSF/1, the compiler needs the flag -D_REENTRANT so that it -+ # groks . cc also understands the flag -pthread, but -+ # we don't use it because 1. gcc-2.95 doesn't understand -pthread, -+ # 2. putting a flag into CPPFLAGS that has an effect on the linker -+ # causes the AC_TRY_LINK test below to succeed unexpectedly, -+ # leading to wrong values of LIBTHREAD and LTLIBTHREAD. -+ CPPFLAGS="$CPPFLAGS -D_REENTRANT" -+ ;; -+ esac -+ # Some systems optimize for single-threaded programs by default, and -+ # need special flags to disable these optimizations. For example, the -+ # definition of 'errno' in . -+ case "$host_os" in -+ aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; -+ solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; -+ esac -+ fi -+]) -+ -+dnl The guts of gl_LOCK. Needs to be expanded only once. -+ -+AC_DEFUN([gl_LOCK_BODY], -+[ -+ AC_REQUIRE([gl_LOCK_EARLY_BODY]) -+ gl_threads_api=none -+ LIBTHREAD= -+ LTLIBTHREAD= -+ LIBMULTITHREAD= -+ LTLIBMULTITHREAD= -+ if test "$gl_use_threads" != no; then -+ dnl Check whether the compiler and linker support weak declarations. -+ AC_MSG_CHECKING([whether imported symbols can be declared weak]) -+ gl_have_weak=no -+ AC_TRY_LINK([extern void xyzzy (); -+#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) -+ AC_MSG_RESULT([$gl_have_weak]) -+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then -+ # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that -+ # it groks . It's added above, in gl_LOCK_EARLY_BODY. -+ AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) -+ if test "$gl_have_pthread_h" = yes; then -+ # Other possible tests: -+ # -lpthreads (FSU threads, PCthreads) -+ # -lgthreads -+ gl_have_pthread= -+ # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist -+ # in libc. IRIX 6.5 has the first one in both libc and libpthread, but -+ # the second one only in libpthread, and lock.c needs it. -+ AC_TRY_LINK([#include ], -+ [pthread_mutex_lock((pthread_mutex_t*)0); -+ pthread_mutexattr_init((pthread_mutexattr_t*)0);], -+ [gl_have_pthread=yes]) -+ # Test for libpthread by looking for pthread_kill. (Not pthread_self, -+ # since it is defined as a macro on OSF/1.) -+ if test -n "$gl_have_pthread"; then -+ # The program links fine without libpthread. But it may actually -+ # need to link with libpthread in order to create multiple threads. -+ AC_CHECK_LIB(pthread, pthread_kill, -+ [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread -+ # On Solaris and HP-UX, most pthread functions exist also in libc. -+ # Therefore pthread_in_use() needs to actually try to create a -+ # thread: pthread_create from libc will fail, whereas -+ # pthread_create will actually create a thread. -+ case "$host_os" in -+ solaris* | hpux*) -+ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, -+ [Define if the pthread_in_use() detection is hard.]) -+ esac -+ ]) -+ else -+ # Some library is needed. Try libpthread and libc_r. -+ AC_CHECK_LIB(pthread, pthread_kill, -+ [gl_have_pthread=yes -+ LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread -+ LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) -+ if test -z "$gl_have_pthread"; then -+ # For FreeBSD 4. -+ AC_CHECK_LIB(c_r, pthread_kill, -+ [gl_have_pthread=yes -+ LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r -+ LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) -+ fi -+ fi -+ if test -n "$gl_have_pthread"; then -+ gl_threads_api=posix -+ AC_DEFINE([USE_POSIX_THREADS], 1, -+ [Define if the POSIX multithreading library can be used.]) -+ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then -+ if test $gl_have_weak = yes; then -+ AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, -+ [Define if references to the POSIX multithreading library should be made weak.]) -+ LIBTHREAD= -+ LTLIBTHREAD= -+ fi -+ fi -+ # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the -+ # pthread_rwlock_* functions. -+ AC_CHECK_TYPE([pthread_rwlock_t], -+ [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, -+ [Define if the POSIX multithreading library has read/write locks.])], -+ [], -+ [#include ]) -+ # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. -+ AC_TRY_COMPILE([#include ], -+ [#if __FreeBSD__ == 4 -+error "No, in FreeBSD 4.0 recursive mutexes actually don't work." -+#else -+int x = (int)PTHREAD_MUTEX_RECURSIVE; -+return !x; -+#endif], -+ [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, -+ [Define if the defines PTHREAD_MUTEX_RECURSIVE.])]) -+ fi -+ fi -+ fi -+ if test -z "$gl_have_pthread"; then -+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then -+ gl_have_solaristhread= -+ gl_save_LIBS="$LIBS" -+ LIBS="$LIBS -lthread" -+ AC_TRY_LINK([#include -+#include ], -+ [thr_self();], -+ [gl_have_solaristhread=yes]) -+ LIBS="$gl_save_LIBS" -+ if test -n "$gl_have_solaristhread"; then -+ gl_threads_api=solaris -+ LIBTHREAD=-lthread -+ LTLIBTHREAD=-lthread -+ LIBMULTITHREAD="$LIBTHREAD" -+ LTLIBMULTITHREAD="$LTLIBTHREAD" -+ AC_DEFINE([USE_SOLARIS_THREADS], 1, -+ [Define if the old Solaris multithreading library can be used.]) -+ if test $gl_have_weak = yes; then -+ AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, -+ [Define if references to the old Solaris multithreading library should be made weak.]) -+ LIBTHREAD= -+ LTLIBTHREAD= -+ fi -+ fi -+ fi -+ fi -+ if test "$gl_use_threads" = pth; then -+ gl_save_CPPFLAGS="$CPPFLAGS" -+ AC_LIB_LINKFLAGS(pth) -+ gl_have_pth= -+ gl_save_LIBS="$LIBS" -+ LIBS="$LIBS -lpth" -+ AC_TRY_LINK([#include ], [pth_self();], gl_have_pth=yes) -+ LIBS="$gl_save_LIBS" -+ if test -n "$gl_have_pth"; then -+ gl_threads_api=pth -+ LIBTHREAD="$LIBPTH" -+ LTLIBTHREAD="$LTLIBPTH" -+ LIBMULTITHREAD="$LIBTHREAD" -+ LTLIBMULTITHREAD="$LTLIBTHREAD" -+ AC_DEFINE([USE_PTH_THREADS], 1, -+ [Define if the GNU Pth multithreading library can be used.]) -+ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then -+ if test $gl_have_weak = yes; then -+ AC_DEFINE([USE_PTH_THREADS_WEAK], 1, -+ [Define if references to the GNU Pth multithreading library should be made weak.]) -+ LIBTHREAD= -+ LTLIBTHREAD= -+ fi -+ fi -+ else -+ CPPFLAGS="$gl_save_CPPFLAGS" -+ fi -+ fi -+ if test -z "$gl_have_pthread"; then -+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then -+ if { case "$host_os" in -+ mingw*) true;; -+ *) false;; -+ esac -+ }; then -+ gl_threads_api=win32 -+ AC_DEFINE([USE_WIN32_THREADS], 1, -+ [Define if the Win32 multithreading API can be used.]) -+ fi -+ fi -+ fi -+ fi -+ AC_MSG_CHECKING([for multithread API to use]) -+ AC_MSG_RESULT([$gl_threads_api]) -+ AC_SUBST(LIBTHREAD) -+ AC_SUBST(LTLIBTHREAD) -+ AC_SUBST(LIBMULTITHREAD) -+ AC_SUBST(LTLIBMULTITHREAD) -+]) -+ -+AC_DEFUN([gl_LOCK], -+[ -+ AC_REQUIRE([gl_LOCK_EARLY]) -+ AC_REQUIRE([gl_LOCK_BODY]) -+ gl_PREREQ_LOCK -+]) -+ -+# Prerequisites of lib/lock.c. -+AC_DEFUN([gl_PREREQ_LOCK], [ -+ AC_REQUIRE([AC_C_INLINE]) -+]) -+ -+dnl Survey of platforms: -+dnl -+dnl Platform Available Compiler Supports test-lock -+dnl flavours option weak result -+dnl --------------- --------- --------- -------- --------- -+dnl Linux 2.4/glibc posix -lpthread Y OK -+dnl -+dnl GNU Hurd/glibc posix -+dnl -+dnl FreeBSD 5.3 posix -lc_r Y -+dnl posix -lkse ? Y -+dnl posix -lpthread ? Y -+dnl posix -lthr Y -+dnl -+dnl FreeBSD 5.2 posix -lc_r Y -+dnl posix -lkse Y -+dnl posix -lthr Y -+dnl -+dnl FreeBSD 4.0,4.10 posix -lc_r Y OK -+dnl -+dnl NetBSD 1.6 -- -+dnl -+dnl OpenBSD 3.4 posix -lpthread Y OK -+dnl -+dnl MacOS X 10.[123] posix -lpthread Y OK -+dnl -+dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK -+dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK -+dnl -+dnl HP-UX 11 posix -lpthread N (cc) OK -+dnl Y (gcc) -+dnl -+dnl IRIX 6.5 posix -lpthread Y 0.5 -+dnl -+dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK -+dnl -+dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK -+dnl -lpthread (gcc) Y -+dnl -+dnl Cygwin posix -lpthread Y OK -+dnl -+dnl Any of the above pth -lpth 0.0 -+dnl -+dnl Mingw win32 N OK -+dnl -+dnl BeOS 5 -- -+dnl -+dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is -+dnl turned off: -+dnl OK if all three tests terminate OK, -+dnl 0.5 if the first test terminates OK but the second one loops endlessly, -+dnl 0.0 if the first test already loops endlessly. -diff --git a/m4/longlong.m4 b/m4/longlong.m4 -new file mode 100644 -index 0000000..a72e53b ---- /dev/null -+++ b/m4/longlong.m4 -@@ -0,0 +1,109 @@ -+# longlong.m4 serial 13 -+dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_LONG_LONG_INT if 'long long int' works. -+# This fixes a bug in Autoconf 2.61, but can be removed once we -+# assume 2.62 everywhere. -+ -+# Note: If the type 'long long int' exists but is only 32 bits large -+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be -+# defined. In this case you can treat 'long long int' like 'long int'. -+ -+AC_DEFUN([AC_TYPE_LONG_LONG_INT], -+[ -+ AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], -+ [AC_LINK_IFELSE( -+ [_AC_TYPE_LONG_LONG_SNIPPET], -+ [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. -+ dnl If cross compiling, assume the bug isn't important, since -+ dnl nobody cross compiles for this platform as far as we know. -+ AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[@%:@include -+ @%:@ifndef LLONG_MAX -+ @%:@ define HALF \ -+ (1LL << (sizeof (long long int) * CHAR_BIT - 2)) -+ @%:@ define LLONG_MAX (HALF - 1 + HALF) -+ @%:@endif]], -+ [[long long int n = 1; -+ int i; -+ for (i = 0; ; i++) -+ { -+ long long int m = n << i; -+ if (m >> i != n) -+ return 1; -+ if (LLONG_MAX / 2 < m) -+ break; -+ } -+ return 0;]])], -+ [ac_cv_type_long_long_int=yes], -+ [ac_cv_type_long_long_int=no], -+ [ac_cv_type_long_long_int=yes])], -+ [ac_cv_type_long_long_int=no])]) -+ if test $ac_cv_type_long_long_int = yes; then -+ AC_DEFINE([HAVE_LONG_LONG_INT], 1, -+ [Define to 1 if the system has the type `long long int'.]) -+ fi -+]) -+ -+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -+# This fixes a bug in Autoconf 2.61, but can be removed once we -+# assume 2.62 everywhere. -+ -+# Note: If the type 'unsigned long long int' exists but is only 32 bits -+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT -+# will not be defined. In this case you can treat 'unsigned long long int' -+# like 'unsigned long int'. -+ -+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], -+[ -+ AC_CACHE_CHECK([for unsigned long long int], -+ [ac_cv_type_unsigned_long_long_int], -+ [AC_LINK_IFELSE( -+ [_AC_TYPE_LONG_LONG_SNIPPET], -+ [ac_cv_type_unsigned_long_long_int=yes], -+ [ac_cv_type_unsigned_long_long_int=no])]) -+ if test $ac_cv_type_unsigned_long_long_int = yes; then -+ AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, -+ [Define to 1 if the system has the type `unsigned long long int'.]) -+ fi -+]) -+ -+# Expands to a C program that can be used to test for simultaneous support -+# of 'long long' and 'unsigned long long'. We don't want to say that -+# 'long long' is available if 'unsigned long long' is not, or vice versa, -+# because too many programs rely on the symmetry between signed and unsigned -+# integer types (excluding 'bool'). -+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], -+[ -+ AC_LANG_PROGRAM( -+ [[/* Test preprocessor. */ -+ #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) -+ error in preprocessor; -+ #endif -+ #if ! (18446744073709551615ULL <= -1ull) -+ error in preprocessor; -+ #endif -+ /* Test literals. */ -+ long long int ll = 9223372036854775807ll; -+ long long int nll = -9223372036854775807LL; -+ unsigned long long int ull = 18446744073709551615ULL; -+ /* Test constant expressions. */ -+ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) -+ ? 1 : -1)]; -+ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 -+ ? 1 : -1)]; -+ int i = 63;]], -+ [[/* Test availability of runtime routines for shift and division. */ -+ long long int llmax = 9223372036854775807ll; -+ unsigned long long int ullmax = 18446744073709551615ull; -+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) -+ | (llmax / ll) | (llmax % ll) -+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) -+ | (ullmax / ull) | (ullmax % ull));]]) -+]) -diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 -index 5d9acd8..17cfd51 100644 ---- a/m4/ltoptions.m4 -+++ b/m4/ltoptions.m4 -@@ -326,24 +326,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - # MODE is either `yes' or `no'. If omitted, it defaults to `both'. - m4_define([_LT_WITH_PIC], - [AC_ARG_WITH([pic], -- [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], -+ [AS_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [lt_p=${PACKAGE-default} -- case $withval in -- yes|no) pic_mode=$withval ;; -- *) -- pic_mode=default -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for lt_pkg in $withval; do -- IFS="$lt_save_ifs" -- if test "X$lt_pkg" = "X$lt_p"; then -- pic_mode=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -+ [pic_mode="$withval"], - [pic_mode=default]) - - test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 -index 07a8602..9c7b5d4 100644 ---- a/m4/ltversion.m4 -+++ b/m4/ltversion.m4 -@@ -9,15 +9,15 @@ - - # @configure_input@ - --# serial 3337 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.4.2]) --m4_define([LT_PACKAGE_REVISION], [1.3337]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.4.2' --macro_revision='1.3337' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) -diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 -new file mode 100644 -index 0000000..14ba612 ---- /dev/null -+++ b/m4/printf-posix.m4 -@@ -0,0 +1,44 @@ -+# printf-posix.m4 serial 3 (gettext-0.17) -+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+dnl Test whether the printf() function supports POSIX/XSI format strings with -+dnl positions. -+ -+AC_DEFUN([gt_PRINTF_POSIX], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], -+ gt_cv_func_printf_posix, -+ [ -+ AC_TRY_RUN([ -+#include -+#include -+/* The string "%2$d %1$d", with dollar characters protected from the shell's -+ dollar expansion (possibly an autoconf bug). */ -+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -+static char buf[100]; -+int main () -+{ -+ sprintf (buf, format, 33, 55); -+ return (strcmp (buf, "55 33") != 0); -+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, -+ [ -+ AC_EGREP_CPP(notposix, [ -+#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ -+ notposix -+#endif -+ ], gt_cv_func_printf_posix="guessing no", -+ gt_cv_func_printf_posix="guessing yes") -+ ]) -+ ]) -+ case $gt_cv_func_printf_posix in -+ *yes) -+ AC_DEFINE(HAVE_POSIX_PRINTF, 1, -+ [Define if your printf() function supports format strings with positions.]) -+ ;; -+ esac -+]) -diff --git a/m4/size_max.m4 b/m4/size_max.m4 -new file mode 100644 -index 0000000..6cb4868 ---- /dev/null -+++ b/m4/size_max.m4 -@@ -0,0 +1,68 @@ -+# size_max.m4 serial 6 -+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gl_SIZE_MAX], -+[ -+ AC_CHECK_HEADERS(stdint.h) -+ dnl First test whether the system already has SIZE_MAX. -+ AC_MSG_CHECKING([for SIZE_MAX]) -+ AC_CACHE_VAL([gl_cv_size_max], [ -+ gl_cv_size_max= -+ AC_EGREP_CPP([Found it], [ -+#include -+#if HAVE_STDINT_H -+#include -+#endif -+#ifdef SIZE_MAX -+Found it -+#endif -+], gl_cv_size_max=yes) -+ if test -z "$gl_cv_size_max"; then -+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider -+ dnl than the type 'unsigned long'. Try hard to find a definition that can -+ dnl be used in a preprocessor #if, i.e. doesn't contain a cast. -+ AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], -+ [#include -+#include ], size_t_bits_minus_1=) -+ AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], -+ [#include ], fits_in_uint=) -+ if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then -+ if test $fits_in_uint = 1; then -+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type -+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. -+ AC_TRY_COMPILE([#include -+ extern size_t foo; -+ extern unsigned long foo; -+ ], [], fits_in_uint=0) -+ fi -+ dnl We cannot use 'expr' to simplify this expression, because 'expr' -+ dnl works only with 'long' integers in the host environment, while we -+ dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. -+ if test $fits_in_uint = 1; then -+ gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" -+ else -+ gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" -+ fi -+ else -+ dnl Shouldn't happen, but who knows... -+ gl_cv_size_max='((size_t)~(size_t)0)' -+ fi -+ fi -+ ]) -+ AC_MSG_RESULT([$gl_cv_size_max]) -+ if test "$gl_cv_size_max" != yes; then -+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], -+ [Define as the maximum value of type 'size_t', if the system doesn't define it.]) -+ fi -+]) -+ -+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -+dnl Remove this when we can assume autoconf >= 2.61. -+m4_ifdef([AC_COMPUTE_INT], [], [ -+ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -+]) -diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 -new file mode 100644 -index 0000000..db9a8ac ---- /dev/null -+++ b/m4/stdint_h.m4 -@@ -0,0 +1,26 @@ -+# stdint_h.m4 serial 6 -+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([gl_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1; return !i;], -+ gl_cv_header_stdint_h=yes, -+ gl_cv_header_stdint_h=no)]) -+ if test $gl_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+ [Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) -diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 -new file mode 100644 -index 0000000..641c489 ---- /dev/null -+++ b/m4/uintmax_t.m4 -@@ -0,0 +1,30 @@ -+# uintmax_t.m4 serial 10 -+dnl Copyright (C) 1997-2004, 2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Paul Eggert. -+ -+AC_PREREQ(2.13) -+ -+# Define uintmax_t to 'unsigned long' or 'unsigned long long' -+# if it is not already defined in or . -+ -+AC_DEFUN([gl_AC_TYPE_UINTMAX_T], -+[ -+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([gl_AC_HEADER_STDINT_H]) -+ if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then -+ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) -+ test $ac_cv_type_unsigned_long_long_int = yes \ -+ && ac_type='unsigned long long' \ -+ || ac_type='unsigned long' -+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -+ [Define to unsigned long or unsigned long long -+ if and don't define.]) -+ else -+ AC_DEFINE(HAVE_UINTMAX_T, 1, -+ [Define if you have the 'uintmax_t' type in or .]) -+ fi -+]) -diff --git a/m4/visibility.m4 b/m4/visibility.m4 -new file mode 100644 -index 0000000..2ff6330 ---- /dev/null -+++ b/m4/visibility.m4 -@@ -0,0 +1,52 @@ -+# visibility.m4 serial 1 (gettext-0.15) -+dnl Copyright (C) 2005 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+dnl Tests whether the compiler supports the command-line option -+dnl -fvisibility=hidden and the function and variable attributes -+dnl __attribute__((__visibility__("hidden"))) and -+dnl __attribute__((__visibility__("default"))). -+dnl Does *not* test for __visibility__("protected") - which has tricky -+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -+dnl MacOS X. -+dnl Does *not* test for __visibility__("internal") - which has processor -+dnl dependent semantics. -+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is -+dnl "really only recommended for legacy code". -+dnl Set the variable CFLAG_VISIBILITY. -+dnl Defines and sets the variable HAVE_VISIBILITY. -+ -+AC_DEFUN([gl_VISIBILITY], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ CFLAG_VISIBILITY= -+ HAVE_VISIBILITY=0 -+ if test -n "$GCC"; then -+ AC_MSG_CHECKING([for simple visibility declarations]) -+ AC_CACHE_VAL(gl_cv_cc_visibility, [ -+ gl_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -fvisibility=hidden" -+ AC_TRY_COMPILE( -+ [extern __attribute__((__visibility__("hidden"))) int hiddenvar; -+ extern __attribute__((__visibility__("default"))) int exportedvar; -+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); -+ extern __attribute__((__visibility__("default"))) int exportedfunc (void);], -+ [], -+ gl_cv_cc_visibility=yes, -+ gl_cv_cc_visibility=no) -+ CFLAGS="$gl_save_CFLAGS"]) -+ AC_MSG_RESULT([$gl_cv_cc_visibility]) -+ if test $gl_cv_cc_visibility = yes; then -+ CFLAG_VISIBILITY="-fvisibility=hidden" -+ HAVE_VISIBILITY=1 -+ fi -+ fi -+ AC_SUBST([CFLAG_VISIBILITY]) -+ AC_SUBST([HAVE_VISIBILITY]) -+ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], -+ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) -+]) -diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 -new file mode 100644 -index 0000000..cde2129 ---- /dev/null -+++ b/m4/wchar_t.m4 -@@ -0,0 +1,20 @@ -+# wchar_t.m4 serial 1 (gettext-0.12) -+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+dnl Test whether has the 'wchar_t' type. -+dnl Prerequisite: AC_PROG_CC -+ -+AC_DEFUN([gt_TYPE_WCHAR_T], -+[ -+ AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, -+ [AC_TRY_COMPILE([#include -+ wchar_t foo = (wchar_t)'\0';], , -+ gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) -+ if test $gt_cv_c_wchar_t = yes; then -+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) -+ fi -+]) -diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 -new file mode 100644 -index 0000000..af5ed93 ---- /dev/null -+++ b/m4/wint_t.m4 -@@ -0,0 +1,28 @@ -+# wint_t.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+dnl Test whether has the 'wint_t' type. -+dnl Prerequisite: AC_PROG_CC -+ -+AC_DEFUN([gt_TYPE_WINT_T], -+[ -+ AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, -+ [AC_TRY_COMPILE([ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be included -+ before . */ -+#include -+#include -+#include -+#include -+ wint_t foo = (wchar_t)'\0';], , -+ gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) -+ if test $gt_cv_c_wint_t = yes; then -+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) -+ fi -+]) -diff --git a/m4/xsize.m4 b/m4/xsize.m4 -new file mode 100644 -index 0000000..85bb721 ---- /dev/null -+++ b/m4/xsize.m4 -@@ -0,0 +1,13 @@ -+# xsize.m4 serial 3 -+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+AC_DEFUN([gl_XSIZE], -+[ -+ dnl Prerequisites of lib/xsize.h. -+ AC_REQUIRE([gl_SIZE_MAX]) -+ AC_REQUIRE([AC_C_INLINE]) -+ AC_CHECK_HEADERS(stdint.h) -+]) -diff --git a/missing b/missing -index 86a8fc3..28055d2 100755 ---- a/missing -+++ b/missing -@@ -1,10 +1,10 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. - --scriptversion=2012-01-06.13; # UTC -+scriptversion=2009-04-28.21; # UTC - - # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, --# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -+# 2008, 2009 Free Software Foundation, Inc. - # Originally by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify -@@ -84,6 +84,7 @@ Supported PROGRAM values: - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file -+ tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - - Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -@@ -121,6 +122,15 @@ case $1 in - # Not GNU programs, they don't have --version. - ;; - -+ tar*) -+ if test -n "$run"; then -+ echo 1>&2 "ERROR: \`tar' requires --run" -+ exit 1 -+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -+ exit 1 -+ fi -+ ;; -+ - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. -@@ -216,7 +226,7 @@ WARNING: \`$1' $msg. You should only need it if - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then -- eval LASTARG=\${$#} -+ eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` -@@ -246,7 +256,7 @@ WARNING: \`$1' is $msg. You should only need it if - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then -- eval LASTARG=\${$#} -+ eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` -@@ -308,6 +318,41 @@ WARNING: \`$1' is $msg. You should only need it if - touch $file - ;; - -+ tar*) -+ shift -+ -+ # We have already tried tar in the generic part. -+ # Look for gnutar/gtar before invocation to avoid ugly error -+ # messages. -+ if (gnutar --version > /dev/null 2>&1); then -+ gnutar "$@" && exit 0 -+ fi -+ if (gtar --version > /dev/null 2>&1); then -+ gtar "$@" && exit 0 -+ fi -+ firstarg="$1" -+ if shift; then -+ case $firstarg in -+ *o*) -+ firstarg=`echo "$firstarg" | sed s/o//` -+ tar "$firstarg" "$@" && exit 0 -+ ;; -+ esac -+ case $firstarg in -+ *h*) -+ firstarg=`echo "$firstarg" | sed s/h//` -+ tar "$firstarg" "$@" && exit 0 -+ ;; -+ esac -+ fi -+ -+ echo 1>&2 "\ -+WARNING: I can't seem to be able to run \`tar' with the given arguments. -+ You may want to install GNU tar or Free paxutils, or check the -+ command line arguments." -+ exit 1 -+ ;; -+ - *) - echo 1>&2 "\ - WARNING: \`$1' is needed, and is $msg. -diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in -index 6b97955..33f9c78 100644 ---- a/pkgconfig/Makefile.in -+++ b/pkgconfig/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = pkgconfig - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gstreamer-gl-uninstalled.pc.in \ -@@ -43,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -76,11 +76,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = gstreamer-gl.pc gstreamer-gl-uninstalled.pc - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --am__uninstall_files_from_dir = { \ -- test -z "$$files" \ -- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -- $(am__cd) "$$dir" && rm -f $$files; }; \ -- } - am__installdirs = "$(DESTDIR)$(pkgconfigdir)" - DATA = $(pkgconfig_DATA) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -160,6 +154,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -191,6 +186,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -198,8 +195,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -272,7 +271,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -317,6 +316,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -382,7 +382,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -456,7 +460,9 @@ uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) -+ test -n "$$files" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files - tags: TAGS - TAGS: - -@@ -511,15 +517,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/po/Makefile.in.in.orig b/po/Makefile.in.in.orig -new file mode 100644 -index 0000000..fecf500 ---- /dev/null -+++ b/po/Makefile.in.in.orig -@@ -0,0 +1,429 @@ -+# Makefile for PO directory in any package using GNU gettext. -+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU General Public -+# License but which still want to provide support for the GNU gettext -+# functionality. -+# Please note that the actual code of GNU gettext is covered by the GNU -+# General Public License and is *not* in the public domain. -+# -+# Origin: gettext-0.17 -+GETTEXT_MACRO_VERSION = 0.17 -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+ -+SHELL = /bin/sh -+@SET_MAKE@ -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datarootdir = @datarootdir@ -+datadir = @datadir@ -+localedir = @localedir@ -+gettextsrcdir = $(datadir)/gettext/po -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+# We use $(mkdir_p). -+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as -+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -+# @install_sh@ does not start with $(SHELL), so we add it. -+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined -+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake -+# versions, $(mkinstalldirs) and $(install_sh) are unused. -+mkinstalldirs = $(SHELL) @install_sh@ -d -+install_sh = $(SHELL) @install_sh@ -+MKDIR_P = @MKDIR_P@ -+mkdir_p = @mkdir_p@ -+ -+GMSGFMT_ = @GMSGFMT@ -+GMSGFMT_no = @GMSGFMT@ -+GMSGFMT_yes = @GMSGFMT_015@ -+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) -+MSGFMT_ = @MSGFMT@ -+MSGFMT_no = @MSGFMT@ -+MSGFMT_yes = @MSGFMT_015@ -+MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) -+XGETTEXT_ = @XGETTEXT@ -+XGETTEXT_no = @XGETTEXT@ -+XGETTEXT_yes = @XGETTEXT_015@ -+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -+MSGMERGE = msgmerge -+MSGMERGE_UPDATE = @MSGMERGE@ --update -+MSGINIT = msginit -+MSGCONV = msgconv -+MSGFILTER = msgfilter -+ -+POFILES = @POFILES@ -+GMOFILES = @GMOFILES@ -+UPDATEPOFILES = @UPDATEPOFILES@ -+DUMMYPOFILES = @DUMMYPOFILES@ -+DISTFILES.common = Makefile.in.in remove-potcdate.sin \ -+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) -+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ -+$(POFILES) $(GMOFILES) \ -+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) -+ -+POTFILES = \ -+ -+CATALOGS = @CATALOGS@ -+ -+# Makevars gets inserted here. (Don't remove this line!) -+ -+.SUFFIXES: -+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update -+ -+.po.mo: -+ @echo "$(MSGFMT) -c -o $@ $<"; \ -+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ -+ -+.po.gmo: -+ @lang=`echo $* | sed -e 's,.*/,,'`; \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ -+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo -+ -+.sin.sed: -+ sed -e '/^#/d' $< > t-$@ -+ mv t-$@ $@ -+ -+ -+all: check-macro-version all-@USE_NLS@ -+ -+all-yes: stamp-po -+all-no: -+ -+# Ensure that the gettext macros and this Makefile.in.in are in sync. -+check-macro-version: -+ @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ -+ || { 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; \ -+ exit 1; \ -+ } -+ -+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no -+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because -+# we don't want to bother translators with empty POT files). We assume that -+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -+# In this case, stamp-po is a nop (i.e. a phony target). -+ -+# stamp-po is a timestamp denoting the last time at which the CATALOGS have -+# been loosely updated. Its purpose is that when a developer or translator -+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -+# invocations of "make" will do nothing. This timestamp would not be necessary -+# if updating the $(CATALOGS) would always touch them; however, the rule for -+# $(POFILES) has been designed to not touch files that don't need to be -+# changed. -+stamp-po: $(srcdir)/$(DOMAIN).pot -+ test ! -f $(srcdir)/$(DOMAIN).pot || \ -+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) -+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \ -+ echo "touch stamp-po" && \ -+ echo timestamp > stamp-poT && \ -+ mv stamp-poT stamp-po; \ -+ } -+ -+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', -+# otherwise packages like GCC can not be built if only parts of the source -+# have been downloaded. -+ -+# This target rebuilds $(DOMAIN).pot; it is an expensive operation. -+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. -+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed -+ if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ -+ package_gnu='GNU '; \ -+ else \ -+ package_gnu=''; \ -+ fi; \ -+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ -+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ -+ else \ -+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ -+ fi; \ -+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ -+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ -+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ -+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ -+ --files-from=$(srcdir)/POTFILES.in \ -+ --copyright-holder='$(COPYRIGHT_HOLDER)' \ -+ --msgid-bugs-address="$$msgid_bugs_address" \ -+ ;; \ -+ *) \ -+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ -+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ -+ --files-from=$(srcdir)/POTFILES.in \ -+ --copyright-holder='$(COPYRIGHT_HOLDER)' \ -+ --package-name="$${package_gnu}@PACKAGE@" \ -+ --package-version='@VERSION@' \ -+ --msgid-bugs-address="$$msgid_bugs_address" \ -+ ;; \ -+ esac -+ test ! -f $(DOMAIN).po || { \ -+ if test -f $(srcdir)/$(DOMAIN).pot; then \ -+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ -+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ -+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ -+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ -+ else \ -+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ -+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ -+ fi; \ -+ else \ -+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ -+ fi; \ -+ } -+ -+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at -+# every "make" invocation, only create it when it is missing. -+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. -+$(srcdir)/$(DOMAIN).pot: -+ $(MAKE) $(DOMAIN).pot-update -+ -+# This target rebuilds a PO file if $(DOMAIN).pot has changed. -+# Note that a PO file is not touched if it doesn't need to be changed. -+$(POFILES): $(srcdir)/$(DOMAIN).pot -+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ -+ if test -f "$(srcdir)/$${lang}.po"; then \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ -+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ -+ else \ -+ $(MAKE) $${lang}.po-create; \ -+ fi -+ -+ -+install: install-exec install-data -+install-exec: -+install-data: install-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -+ for file in $(DISTFILES.common) Makevars.template; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file \ -+ $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ for file in Makevars; do \ -+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+install-data-no: all -+install-data-yes: all -+ $(mkdir_p) $(DESTDIR)$(datadir) -+ @catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ dir=$(localedir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ -+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ -+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ -+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ -+ if test -n "$$lc"; then \ -+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ -+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ -+ for file in *; do \ -+ if test -f $$file; then \ -+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ -+ fi; \ -+ done); \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ else \ -+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ -+ :; \ -+ else \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ fi; \ -+ fi; \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ -+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ -+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ -+ fi; \ -+ done; \ -+ done -+ -+install-strip: install -+ -+installdirs: installdirs-exec installdirs-data -+installdirs-exec: -+installdirs-data: installdirs-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -+ else \ -+ : ; \ -+ fi -+installdirs-data-no: -+installdirs-data-yes: -+ $(mkdir_p) $(DESTDIR)$(datadir) -+ @catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ dir=$(localedir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ -+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ -+ if test -n "$$lc"; then \ -+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ -+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ -+ for file in *; do \ -+ if test -f $$file; then \ -+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ -+ fi; \ -+ done); \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ else \ -+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ -+ :; \ -+ else \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ fi; \ -+ fi; \ -+ fi; \ -+ done; \ -+ done -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: uninstall-exec uninstall-data -+uninstall-exec: -+uninstall-data: uninstall-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ for file in $(DISTFILES.common) Makevars.template; do \ -+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+uninstall-data-no: -+uninstall-data-yes: -+ catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ done; \ -+ done -+ -+check: all -+ -+info dvi ps pdf html tags TAGS ctags CTAGS ID: -+ -+mostlyclean: -+ rm -f remove-potcdate.sed -+ rm -f stamp-poT -+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -+ rm -fr *.o -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES *.mo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f stamp-po $(GMOFILES) -+ -+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: -+ $(MAKE) update-po -+ @$(MAKE) dist2 -+# This is a separate target because 'update-po' must be executed before. -+dist2: stamp-po $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ dists="$$dists Makevars.template"; \ -+ fi; \ -+ if test -f $(srcdir)/$(DOMAIN).pot; then \ -+ dists="$$dists $(DOMAIN).pot stamp-po"; \ -+ fi; \ -+ if test -f $(srcdir)/ChangeLog; then \ -+ dists="$$dists ChangeLog"; \ -+ fi; \ -+ for i in 0 1 2 3 4 5 6 7 8 9; do \ -+ if test -f $(srcdir)/ChangeLog.$$i; then \ -+ dists="$$dists ChangeLog.$$i"; \ -+ fi; \ -+ done; \ -+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ -+ for file in $$dists; do \ -+ if test -f $$file; then \ -+ cp -p $$file $(distdir) || exit 1; \ -+ else \ -+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \ -+ fi; \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(DOMAIN).pot-update -+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) -+ $(MAKE) update-gmo -+ -+# General rule for creating PO files. -+ -+.nop.po-create: -+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ -+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ -+ exit 1 -+ -+# General rule for updating PO files. -+ -+.nop.po-update: -+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ -+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ -+ tmpdir=`pwd`; \ -+ echo "$$lang:"; \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ -+ cd $(srcdir); \ -+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ -+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.po failed!" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi -+ -+$(DUMMYPOFILES): -+ -+update-gmo: Makefile $(GMOFILES) -+ @: -+ -+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ -+ cd $(top_builddir) \ -+ && $(SHELL) ./config.status $(subdir)/$@.in po-directories -+ -+force: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff --git a/po/Makevars.template b/po/Makevars.template -new file mode 100644 -index 0000000..32692ab ---- /dev/null -+++ b/po/Makevars.template -@@ -0,0 +1,41 @@ -+# Makefile variables for PO directory in any package using GNU gettext. -+ -+# Usually the message domain is the same as the package name. -+DOMAIN = $(PACKAGE) -+ -+# These two variables depend on the location of this directory. -+subdir = po -+top_builddir = .. -+ -+# These options get passed to xgettext. -+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -+ -+# This is the copyright holder that gets inserted into the header of the -+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -+# package. (Note that the msgstr strings, extracted from the package's -+# sources, belong to the copyright holder of the package.) Translators are -+# expected to transfer the copyright for their translations to this person -+# or entity, or to disclaim their copyright. The empty string stands for -+# the public domain; in this case the translators are expected to disclaim -+# their copyright. -+COPYRIGHT_HOLDER = Free Software Foundation, Inc. -+ -+# This is the email address or URL to which the translators shall report -+# bugs in the untranslated strings: -+# - Strings which are not entire sentences, see the maintainer guidelines -+# in the GNU gettext documentation, section 'Preparing Strings'. -+# - Strings which use unclear terms or require additional context to be -+# understood. -+# - Strings which make invalid assumptions about notation of date, time or -+# money. -+# - Pluralisation problems. -+# - Incorrect English spelling. -+# - Incorrect formatting. -+# It can be your email address, or a mailing list address where translators -+# can write to without being subscribed, or the URL of a web page through -+# which the translators can contact you. -+MSGID_BUGS_ADDRESS = -+ -+# This is the list of locale categories, beyond LC_MESSAGES, for which the -+# message catalogs shall be used. It is usually empty. -+EXTRA_LOCALE_CATEGORIES = -diff --git a/po/gst-plugins-gl-0.10.pot b/po/gst-plugins-gl-0.10.pot -deleted file mode 100644 -index eb5fcf8..0000000 ---- a/po/gst-plugins-gl-0.10.pot -+++ /dev/null -@@ -1,21 +0,0 @@ --# SOME DESCRIPTIVE TITLE. --# This file is put in the public domain. --# FIRST AUTHOR , YEAR. --# --#, fuzzy --msgid "" --msgstr "" --"Project-Id-Version: gst-plugins-gl 0.10.3\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" --"POT-Creation-Date: 2012-05-11 09:09+0100\n" --"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" --"Language-Team: LANGUAGE \n" --"Language: \n" --"MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=CHARSET\n" --"Content-Transfer-Encoding: 8bit\n" -- --#: gst/gl/gstgltestsrc.c:602 --msgid "format wasn't negotiated before get function" --msgstr "" -diff --git a/stamp-h.in b/stamp-h.in -new file mode 100644 -index 0000000..9788f70 ---- /dev/null -+++ b/stamp-h.in -@@ -0,0 +1 @@ -+timestamp -diff --git a/tests/Makefile.in b/tests/Makefile.in -index c749303..1577ef9 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = tests - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -167,6 +167,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -198,6 +199,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -205,8 +208,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -279,7 +284,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -324,6 +329,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -389,7 +395,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -648,15 +658,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in -index 0ad30ec..deaa935 100644 ---- a/tests/check/Makefile.in -+++ b/tests/check/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/common/check.mak - check_PROGRAMS = generic/states$(EXEEXT) \ -@@ -43,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -81,8 +81,8 @@ generic_states_OBJECTS = states.$(OBJEXT) - generic_states_LDADD = $(LDADD) - am__DEPENDENCIES_1 = - generic_states_DEPENDENCIES = $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - am__dirstamp = $(am__leading_dot)dirstamp - pipelines_simple_launch_lines_SOURCES = \ -@@ -100,21 +100,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = generic/states.c pipelines/simple-launch-lines.c - DIST_SOURCES = generic/states.c pipelines/simple-launch-lines.c -@@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -281,7 +286,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -391,7 +397,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -456,7 +466,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; --$(top_srcdir)/common/check.mak: - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -@@ -478,13 +487,13 @@ clean-checkPROGRAMS: - generic/$(am__dirstamp): - @$(MKDIR_P) generic - @: > generic/$(am__dirstamp) --generic/states$(EXEEXT): $(generic_states_OBJECTS) $(generic_states_DEPENDENCIES) $(EXTRA_generic_states_DEPENDENCIES) generic/$(am__dirstamp) -+generic/states$(EXEEXT): $(generic_states_OBJECTS) $(generic_states_DEPENDENCIES) generic/$(am__dirstamp) - @rm -f generic/states$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(generic_states_OBJECTS) $(generic_states_LDADD) $(LIBS) - pipelines/$(am__dirstamp): - @$(MKDIR_P) pipelines - @: > pipelines/$(am__dirstamp) --pipelines/simple-launch-lines$(EXEEXT): $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_DEPENDENCIES) $(EXTRA_pipelines_simple_launch_lines_DEPENDENCIES) pipelines/$(am__dirstamp) -+pipelines/simple-launch-lines$(EXEEXT): $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_DEPENDENCIES) pipelines/$(am__dirstamp) - @rm -f pipelines/simple-launch-lines$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pipelines_simple_launch_lines_OBJECTS) $(pipelines_simple_launch_lines_LDADD) $(LIBS) - -@@ -500,51 +509,58 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - states.o: generic/states.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/states.Tpo $(DEPDIR)/states.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/states.c' object='states.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generic/states.c' object='states.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - states.obj: generic/states.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/states.Tpo $(DEPDIR)/states.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/states.c' object='states.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generic/states.c' object='states.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - simple-launch-lines.o: pipelines/simple-launch-lines.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simple-launch-lines.Tpo $(DEPDIR)/simple-launch-lines.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pipelines/simple-launch-lines.c' object='simple-launch-lines.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pipelines/simple-launch-lines.c' object='simple-launch-lines.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - simple-launch-lines.obj: pipelines/simple-launch-lines.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simple-launch-lines.Tpo $(DEPDIR)/simple-launch-lines.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pipelines/simple-launch-lines.c' object='simple-launch-lines.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pipelines/simple-launch-lines.c' object='simple-launch-lines.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -687,15 +703,14 @@ check-TESTS: $(TESTS) - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ -- col="$$grn"; \ -+ echo "$$grn$$dashes"; \ - else \ -- col="$$red"; \ -+ echo "$$red$$dashes"; \ - fi; \ -- echo "$${col}$$dashes$${std}"; \ -- echo "$${col}$$banner$${std}"; \ -- test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ -- test -z "$$report" || echo "$${col}$$report$${std}"; \ -- echo "$${col}$$dashes$${std}"; \ -+ echo "$$banner"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ -+ echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -@@ -745,15 +760,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -@@ -877,6 +887,12 @@ clean-local-check: - CK_DEFAULT_TIMEOUT=20 \ - $* - -+# just like 'check', but don't run it again if it fails (useful for debugging) -+%.check-norepeat: % -+ @$(TESTS_ENVIRONMENT) \ -+ CK_DEFAULT_TIMEOUT=20 \ -+ $* -+ - # run any given test in a loop - %.torture: % - @for i in `seq 1 $(LOOPS)`; do \ -@@ -1002,7 +1018,8 @@ help: - @echo - @echo "make check -- run all checks" - @echo "make torture -- run all checks $(LOOPS) times" -- @echo "make (dir)/(test).check -- run the given check once" -+ @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" -+ @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" - @echo "make (dir)/(test).forever -- run the given check forever" - @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" - @echo -diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in -index 47314e5..40a0d12 100644 ---- a/tests/examples/Makefile.in -+++ b/tests/examples/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - @GL_BACKEND_COCOA_TRUE@@GL_IS_OPENGL_TRUE@am__append_1 = cocoa - @GL_BACKEND_COCOA_FALSE@@GL_IS_OPENGL_TRUE@am__append_2 = generic qt - @GL_BACKEND_COCOA_FALSE@@GL_IS_OPENGL_TRUE@@HAVE_CLUTTER_TRUE@am__append_3 = clutter -@@ -45,7 +46,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -78,11 +78,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -173,6 +173,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -204,6 +205,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -211,8 +214,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -285,7 +290,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -330,6 +335,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -395,7 +401,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -649,15 +659,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/clutter/Makefile.in b/tests/examples/clutter/Makefile.in -index 5d3b8c3..f19800b 100644 ---- a/tests/examples/clutter/Makefile.in -+++ b/tests/examples/clutter/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) - - #works on win32 and X -@@ -46,7 +47,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -95,8 +95,8 @@ am__DEPENDENCIES_1 = - @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) \ - @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) \ - @HAVE_CLUTTER_GLX_TRUE@@HAVE_CLUTTER_X11_TRUE@@HAVE_XCOMPOSITE_TRUE@ $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - clutteractor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(clutteractor_CFLAGS) \ -@@ -135,21 +135,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(clutteractor_SOURCES) $(clutteractortee_SOURCES) \ - $(cluttershare_SOURCES) -@@ -205,6 +205,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -236,6 +237,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -243,8 +246,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -317,7 +322,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -362,6 +367,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -427,7 +433,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -501,13 +511,13 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --clutteractor$(EXEEXT): $(clutteractor_OBJECTS) $(clutteractor_DEPENDENCIES) $(EXTRA_clutteractor_DEPENDENCIES) -+clutteractor$(EXEEXT): $(clutteractor_OBJECTS) $(clutteractor_DEPENDENCIES) - @rm -f clutteractor$(EXEEXT) - $(AM_V_CCLD)$(clutteractor_LINK) $(clutteractor_OBJECTS) $(clutteractor_LDADD) $(LIBS) --clutteractortee$(EXEEXT): $(clutteractortee_OBJECTS) $(clutteractortee_DEPENDENCIES) $(EXTRA_clutteractortee_DEPENDENCIES) -+clutteractortee$(EXEEXT): $(clutteractortee_OBJECTS) $(clutteractortee_DEPENDENCIES) - @rm -f clutteractortee$(EXEEXT) - $(AM_V_CCLD)$(clutteractortee_LINK) $(clutteractortee_OBJECTS) $(clutteractortee_LDADD) $(LIBS) --cluttershare$(EXEEXT): $(cluttershare_OBJECTS) $(cluttershare_DEPENDENCIES) $(EXTRA_cluttershare_DEPENDENCIES) -+cluttershare$(EXEEXT): $(cluttershare_OBJECTS) $(cluttershare_DEPENDENCIES) - @rm -f cluttershare$(EXEEXT) - $(AM_V_CCLD)$(cluttershare_LINK) $(cluttershare_OBJECTS) $(cluttershare_LDADD) $(LIBS) - -@@ -524,65 +534,74 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - clutteractor-clutteractor.o: clutteractor.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractor-clutteractor.Tpo $(DEPDIR)/clutteractor-clutteractor.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractor.c' object='clutteractor-clutteractor.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractor.c' object='clutteractor-clutteractor.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - clutteractor-clutteractor.obj: clutteractor.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractor-clutteractor.Tpo $(DEPDIR)/clutteractor-clutteractor.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractor.c' object='clutteractor-clutteractor.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractor.c' object='clutteractor-clutteractor.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - clutteractortee-clutteractortee.o: clutteractortee.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractortee-clutteractortee.Tpo $(DEPDIR)/clutteractortee-clutteractortee.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractortee.c' object='clutteractortee-clutteractortee.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractortee.c' object='clutteractortee-clutteractortee.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - clutteractortee-clutteractortee.obj: clutteractortee.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clutteractortee-clutteractortee.Tpo $(DEPDIR)/clutteractortee-clutteractortee.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='clutteractortee.c' object='clutteractortee-clutteractortee.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clutteractortee.c' object='clutteractortee-clutteractortee.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - cluttershare-cluttershare.o: cluttershare.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cluttershare-cluttershare.Tpo $(DEPDIR)/cluttershare-cluttershare.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cluttershare.c' object='cluttershare-cluttershare.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cluttershare.c' object='cluttershare-cluttershare.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - cluttershare-cluttershare.obj: cluttershare.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cluttershare-cluttershare.Tpo $(DEPDIR)/cluttershare-cluttershare.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cluttershare.c' object='cluttershare-cluttershare.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cluttershare.c' object='cluttershare-cluttershare.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -686,15 +705,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/clutter/cluttershare.cbp b/tests/examples/clutter/cluttershare.cbp -new file mode 100644 -index 0000000..2661d1f ---- /dev/null -+++ b/tests/examples/clutter/cluttershare.cbp -@@ -0,0 +1,77 @@ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/cocoa/Makefile.in b/tests/examples/cocoa/Makefile.in -index 91aebcd..49f2ead 100644 ---- a/tests/examples/cocoa/Makefile.in -+++ b/tests/examples/cocoa/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = tests/examples/cocoa - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -280,7 +285,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -390,7 +396,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -643,15 +653,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep b/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep -new file mode 100644 -index 0000000..00d655f ---- /dev/null -+++ b/tests/examples/cocoa/videoxoverlay/GNUmakefile.gnustep -@@ -0,0 +1,35 @@ -+export MAKEFILE_NAME = GNUmakefile.gnustep -+ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+TOOL_NAME = videoxoverlay -+ -+videoxoverlay_OBJC_FILES = main.m -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+videoxoverlay_INCLUDE_DIRS = \ -+ -IC:/gstreamer/include/libxml2 \ -+ -IC:/gstreamer/include/glib-2.0 \ -+ -IC:/gstreamer/lib/glib-2.0/include \ -+ -IC:/gstreamer/include \ -+ -IC:/gstreamer/include/gstreamer-0.10 -+endif -+ -+ifeq ($(GNUSTEP_TARGET_OS), mingw32) -+ videoxoverlay_LIB_DIRS += \ -+ -LC:/gstreamer/bin -+endif -+ -+videoxoverlay_TOOL_LIBS = \ -+ -lglib-2.0-0 \ -+ -lgobject-2.0-0 \ -+ -lgmodule-2.0-0 \ -+ -lgthread-2.0-0 \ -+ -lgstreamer-0.10 \ -+ -lgstbase-0.10 \ -+ -lgstvideo-0.10 \ -+ -lgstinterfaces-0.10 -+ -+ADDITIONAL_TOOL_LIBS = -lgnustep-gui -+ -+include $(GNUSTEP_MAKEFILES)/tool.make -diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.am b/tests/examples/cocoa/videoxoverlay/Makefile.am -index 5a85bb4..b4a4932 100755 ---- a/tests/examples/cocoa/videoxoverlay/Makefile.am -+++ b/tests/examples/cocoa/videoxoverlay/Makefile.am -@@ -4,7 +4,7 @@ noinst_PROGRAMS = videoxoverlay - - videoxoverlay_SOURCES = main.m - --videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -+videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ - $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 - videoxoverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ - $(GL_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.in b/tests/examples/cocoa/videoxoverlay/Makefile.in -index 445c7c6..6b57456 100644 ---- a/tests/examples/cocoa/videoxoverlay/Makefile.in -+++ b/tests/examples/cocoa/videoxoverlay/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - @GL_BACKEND_COCOA_TRUE@noinst_PROGRAMS = videoxoverlay$(EXEEXT) - subdir = tests/examples/cocoa/videoxoverlay - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -85,8 +85,8 @@ am__DEPENDENCIES_1 = - @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) \ - @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) \ - @GL_BACKEND_COCOA_TRUE@ $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - videoxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) \ - $(videoxoverlay_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ -@@ -102,21 +102,21 @@ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_OBJCFLAGS) $(OBJCFLAGS) --AM_V_OBJC = $(am__v_OBJC_@AM_V@) --am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@) -+AM_V_OBJC = $(am__v_OBJC_$(V)) -+am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY)) - am__v_OBJC_0 = @echo " OBJC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - OBJCLD = $(OBJC) - OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@) --am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@) -+AM_V_OBJCLD = $(am__v_OBJCLD_$(V)) -+am__v_OBJCLD_ = $(am__v_OBJCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_OBJCLD_0 = @echo " OBJCLD" $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(videoxoverlay_SOURCES) - DIST_SOURCES = $(am__videoxoverlay_SOURCES_DIST) -@@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -281,7 +286,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -391,12 +397,16 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @GL_BACKEND_COCOA_TRUE@videoxoverlay_SOURCES = main.m --@GL_BACKEND_COCOA_TRUE@videoxoverlay_OBJCFLAGS = $(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -+@GL_BACKEND_COCOA_TRUE@videoxoverlay_OBJCFLAGS = $(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ - @GL_BACKEND_COCOA_TRUE@ $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 - - @GL_BACKEND_COCOA_TRUE@videoxoverlay_LDADD = $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ -@@ -446,7 +456,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --videoxoverlay$(EXEEXT): $(videoxoverlay_OBJECTS) $(videoxoverlay_DEPENDENCIES) $(EXTRA_videoxoverlay_DEPENDENCIES) -+videoxoverlay$(EXEEXT): $(videoxoverlay_OBJECTS) $(videoxoverlay_DEPENDENCIES) - @rm -f videoxoverlay$(EXEEXT) - $(AM_V_OBJCLD)$(videoxoverlay_LINK) $(videoxoverlay_OBJECTS) $(videoxoverlay_LDADD) $(LIBS) - -@@ -461,37 +471,42 @@ distclean-compile: - .m.o: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< -+@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $< - - .m.obj: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .m.lo: - @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $< -+@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $< - - videoxoverlay-main.o: main.m - @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 - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/videoxoverlay-main.Tpo $(DEPDIR)/videoxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='main.m' object='videoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='main.m' object='videoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - videoxoverlay-main.obj: main.m - @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` - @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/videoxoverlay-main.Tpo $(DEPDIR)/videoxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='main.m' object='videoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='main.m' object='videoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -595,15 +610,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/generic/Makefile.in b/tests/examples/generic/Makefile.in -index ad146a2..953cc6c 100644 ---- a/tests/examples/generic/Makefile.in -+++ b/tests/examples/generic/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = tests/examples/generic - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -168,6 +168,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -199,6 +200,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -206,8 +209,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -280,7 +285,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -325,6 +330,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -390,7 +396,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -643,15 +653,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/generic/cube/Makefile.in b/tests/examples/generic/cube/Makefile.in -index 495a646..cf722a7 100644 ---- a/tests/examples/generic/cube/Makefile.in -+++ b/tests/examples/generic/cube/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = cube$(EXEEXT) - subdir = tests/examples/generic/cube - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -80,8 +80,8 @@ am_cube_OBJECTS = cube-main.$(OBJEXT) - cube_OBJECTS = $(am_cube_OBJECTS) - am__DEPENDENCIES_1 = - cube_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - cube_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(cube_CXXFLAGS) \ -@@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(cube_SOURCES) - DIST_SOURCES = $(cube_SOURCES) -@@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -275,7 +280,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -385,7 +391,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -435,7 +445,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --cube$(EXEEXT): $(cube_OBJECTS) $(cube_DEPENDENCIES) $(EXTRA_cube_DEPENDENCIES) -+cube$(EXEEXT): $(cube_OBJECTS) $(cube_DEPENDENCIES) - @rm -f cube$(EXEEXT) - $(AM_V_CXXLD)$(cube_LINK) $(cube_OBJECTS) $(cube_LDADD) $(LIBS) - -@@ -450,37 +460,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - cube-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cube-main.Tpo $(DEPDIR)/cube-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cube-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cube-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - cube-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cube-main.Tpo $(DEPDIR)/cube-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cube-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cube-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -584,15 +599,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/generic/cube/cube.vcproj b/tests/examples/generic/cube/cube.vcproj -new file mode 100644 -index 0000000..83cfd27 ---- /dev/null -+++ b/tests/examples/generic/cube/cube.vcproj -@@ -0,0 +1,202 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/generic/cubeyuv/Makefile.in b/tests/examples/generic/cubeyuv/Makefile.in -index 9345de2..9e57d08 100644 ---- a/tests/examples/generic/cubeyuv/Makefile.in -+++ b/tests/examples/generic/cubeyuv/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = cubeyuv$(EXEEXT) - subdir = tests/examples/generic/cubeyuv - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -80,8 +80,8 @@ am_cubeyuv_OBJECTS = cubeyuv-main.$(OBJEXT) - cubeyuv_OBJECTS = $(am_cubeyuv_OBJECTS) - am__DEPENDENCIES_1 = - cubeyuv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - cubeyuv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(cubeyuv_CXXFLAGS) \ -@@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(cubeyuv_SOURCES) - DIST_SOURCES = $(cubeyuv_SOURCES) -@@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -275,7 +280,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -385,7 +391,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -435,7 +445,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --cubeyuv$(EXEEXT): $(cubeyuv_OBJECTS) $(cubeyuv_DEPENDENCIES) $(EXTRA_cubeyuv_DEPENDENCIES) -+cubeyuv$(EXEEXT): $(cubeyuv_OBJECTS) $(cubeyuv_DEPENDENCIES) - @rm -f cubeyuv$(EXEEXT) - $(AM_V_CXXLD)$(cubeyuv_LINK) $(cubeyuv_OBJECTS) $(cubeyuv_LDADD) $(LIBS) - -@@ -450,37 +460,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - cubeyuv-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cubeyuv-main.Tpo $(DEPDIR)/cubeyuv-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cubeyuv-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cubeyuv-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - cubeyuv-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cubeyuv-main.Tpo $(DEPDIR)/cubeyuv-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='cubeyuv-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='cubeyuv-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -584,15 +599,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/generic/cubeyuv/cubeyuv.vcproj b/tests/examples/generic/cubeyuv/cubeyuv.vcproj -new file mode 100644 -index 0000000..0b3ed75 ---- /dev/null -+++ b/tests/examples/generic/cubeyuv/cubeyuv.vcproj -@@ -0,0 +1,202 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/generic/doublecube/Makefile.in b/tests/examples/generic/doublecube/Makefile.in -index 05bd0d6..381eee9 100644 ---- a/tests/examples/generic/doublecube/Makefile.in -+++ b/tests/examples/generic/doublecube/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = doublecube$(EXEEXT) - subdir = tests/examples/generic/doublecube - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -80,8 +80,8 @@ am_doublecube_OBJECTS = doublecube-main.$(OBJEXT) - doublecube_OBJECTS = $(am_doublecube_OBJECTS) - am__DEPENDENCIES_1 = - doublecube_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - doublecube_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(doublecube_CXXFLAGS) \ -@@ -96,21 +96,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(doublecube_SOURCES) - DIST_SOURCES = $(doublecube_SOURCES) -@@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -194,6 +195,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -201,8 +204,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -275,7 +280,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -320,6 +325,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -385,7 +391,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -435,7 +445,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --doublecube$(EXEEXT): $(doublecube_OBJECTS) $(doublecube_DEPENDENCIES) $(EXTRA_doublecube_DEPENDENCIES) -+doublecube$(EXEEXT): $(doublecube_OBJECTS) $(doublecube_DEPENDENCIES) - @rm -f doublecube$(EXEEXT) - $(AM_V_CXXLD)$(doublecube_LINK) $(doublecube_OBJECTS) $(doublecube_LDADD) $(LIBS) - -@@ -450,37 +460,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - doublecube-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/doublecube-main.Tpo $(DEPDIR)/doublecube-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='doublecube-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='doublecube-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - doublecube-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/doublecube-main.Tpo $(DEPDIR)/doublecube-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='doublecube-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='doublecube-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -584,15 +599,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/generic/doublecube/doublecube.vcproj b/tests/examples/generic/doublecube/doublecube.vcproj -new file mode 100644 -index 0000000..d3f5aa0 ---- /dev/null -+++ b/tests/examples/generic/doublecube/doublecube.vcproj -@@ -0,0 +1,202 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/generic/generic.sln b/tests/examples/generic/generic.sln -new file mode 100644 -index 0000000..22e86f6 ---- /dev/null -+++ b/tests/examples/generic/generic.sln -@@ -0,0 +1,38 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cube", "cube\cube.vcproj", "{DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cubeyuv", "cubeyuv\cubeyuv.vcproj", "{6C94B86A-8E34-4163-840A-BFD5C80B1F2E}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublecube", "doublecube\doublecube.vcproj", "{4EC968E0-5B6C-418A-8A75-F390D56DFFE8}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recordgraphic", "recordgraphic\recordgraphic.vcproj", "{E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Debug|Win32.Build.0 = Debug|Win32 -+ {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Release|Win32.ActiveCfg = Release|Win32 -+ {DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}.Release|Win32.Build.0 = Release|Win32 -+ {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Debug|Win32.Build.0 = Debug|Win32 -+ {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Release|Win32.ActiveCfg = Release|Win32 -+ {6C94B86A-8E34-4163-840A-BFD5C80B1F2E}.Release|Win32.Build.0 = Release|Win32 -+ {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Debug|Win32.Build.0 = Debug|Win32 -+ {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Release|Win32.ActiveCfg = Release|Win32 -+ {4EC968E0-5B6C-418A-8A75-F390D56DFFE8}.Release|Win32.Build.0 = Release|Win32 -+ {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Debug|Win32.Build.0 = Debug|Win32 -+ {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Release|Win32.ActiveCfg = Release|Win32 -+ {E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/generic/recordgraphic/Makefile b/tests/examples/generic/recordgraphic/Makefile -new file mode 100644 -index 0000000..4c27d99 ---- /dev/null -+++ b/tests/examples/generic/recordgraphic/Makefile -@@ -0,0 +1,47 @@ -+SRC=main.cpp -+OBJ=$(SRC:.cpp=.o) -+EXE=recordgraphic -+ -+CPP=g++ -+CPPFLAGS=-Wall -Werror -O3 -march=i686 -msse2 -mfpmath=sse -+LDFLAGS= -+LIBS=-lgstreamer-0.10 -+RM=rm -+ -+ifeq ($(OS),Windows_NT) -+# Put Windows-specific stuff here (usefull for mingw32) -+REXE=$(EXE).exe -+CPPFLAGS=-I../../../../libxml2-2.6.30+.win32/include \ -+ -I../../../../libiconv/include \ -+ -I../../../../glib/include \ -+ -I../../../../gstreamer/include \ -+ -I../../../../glew/include -+#ld tool from mingw needs dll too -+LDFLAGS+=-L../../../../glib/lib \ -+ -L../../../../gstreamer/lib \ -+ -L../../../../glew/lib \ -+ -L../../../../glib/bin \ -+ -L../../../../gstreamer/bin/bin \ -+ -L../../../../glew/bin -+LIBS+=-lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 \ -+ -lopengl32 -lglu32 -lglew32 -lglew32s -+else -+# Put Linux-specific stuff here -+REXE=$(EXE) -+CPPFLAGS+=-I/usr/include/gstreamer-0.10 \ -+ -I/usr/include/glib-2.0 \ -+ -I/usr/lib/glib-2.0/include \ -+ -I/usr/include/libxml2 -+LIBS+=-lgstreamer-0.10 -lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lGLU -lGL -lGLEW -+endif -+ -+ -+.PHONY : all -+all: $(REXE) -+ -+$(REXE): $(OBJ) -+ $(CPP) $(OBJ) $(LDFLAGS) $(LIBS) -o $@ -+ -+.PHONY : clean -+clean: -+ -$(RM) $(OBJ) core -diff --git a/tests/examples/generic/recordgraphic/main.cpp b/tests/examples/generic/recordgraphic/main.cpp -new file mode 100644 -index 0000000..6e7e4f7 ---- /dev/null -+++ b/tests/examples/generic/recordgraphic/main.cpp -@@ -0,0 +1,280 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+ -+static gboolean bus_call (GstBus *bus, GstMessage *msg, gpointer data) -+{ -+ GMainLoop *loop = (GMainLoop*)data; -+ -+ switch (GST_MESSAGE_TYPE (msg)) -+ { -+ case GST_MESSAGE_EOS: -+ g_print ("End-of-stream\n"); -+ g_main_loop_quit (loop); -+ break; -+ case GST_MESSAGE_ERROR: -+ { -+ gchar *debug = NULL; -+ GError *err = NULL; -+ -+ gst_message_parse_error (msg, &err, &debug); -+ -+ g_print ("Error: %s\n", err->message); -+ g_error_free (err); -+ -+ if (debug) -+ { -+ g_print ("Debug deails: %s\n", debug); -+ g_free (debug); -+ } -+ -+ g_main_loop_quit (loop); -+ break; -+ } -+ default: -+ break; -+ } -+ -+ return TRUE; -+} -+ -+//client reshape callback -+void reshapeCallback (GLuint width, GLuint height) -+{ -+ glViewport(0, 0, width, height); -+ glMatrixMode(GL_PROJECTION); -+ glLoadIdentity(); -+ gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); -+ glMatrixMode(GL_MODELVIEW); -+} -+ -+ -+//client draw callback -+gboolean drawCallback (GLuint width, GLuint height, GLuint texture, gpointer data) -+{ -+ static GLfloat xrot = 0; -+ static GLfloat yrot = 0; -+ static GLfloat zrot = 0; -+ static GTimeVal current_time; -+ static glong last_sec = current_time.tv_sec; -+ static gint nbFrames = 0; -+ -+ g_get_current_time (¤t_time); -+ nbFrames++ ; -+ -+ if ((current_time.tv_sec - last_sec) >= 1) -+ { -+ std::cout << "GRPHIC FPS = " << nbFrames << std::endl; -+ nbFrames = 0; -+ last_sec = current_time.tv_sec; -+ } -+ -+ glEnable(GL_DEPTH_TEST); -+ -+ glEnable (GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); -+ -+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -+ glMatrixMode(GL_MODELVIEW); -+ glLoadIdentity(); -+ -+ glTranslatef(0.0f,0.0f,-5.0f); -+ -+ glRotatef(xrot,1.0f,0.0f,0.0f); -+ glRotatef(yrot,0.0f,1.0f,0.0f); -+ glRotatef(zrot,0.0f,0.0f,1.0f); -+ -+ //cube -+ glBegin(GL_QUADS); -+ // Front Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ // Back Face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ // Top Face -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ // Bottom Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); -+ // Right face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ // Left Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glEnd(); -+ -+ xrot+=0.3f; -+ yrot+=0.2f; -+ zrot+=0.4f; -+ -+ //return TRUE causes a postRedisplay -+ return FALSE; -+} -+ -+ -+//equivalent command line: -+//gst-launch-0.10 videotestsrc num_buffers=400 ! glupload ! gldownload ! -+//ffenc_mpeg4 ! avimux ! filesink location="record.avi" -+// or -+//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 ! -+//gldownload ! ffenc_mpeg4 ! avimux ! filesink location="record.avi" -+gint main (gint argc, gchar *argv[]) -+{ -+ GstStateChangeReturn ret; -+ GstElement *pipeline, *videosrc, *glupload, *glfilterapp, *gldownload, *ffenc_mpeg4, *avimux, *filesink; -+ GMainLoop *loop; -+ GstBus *bus; -+ -+ /* initialization */ -+ gst_init (&argc, &argv); -+ loop = g_main_loop_new (NULL, FALSE); -+ -+ /* create elements */ -+ pipeline = gst_pipeline_new ("pipeline"); -+ -+ /* watch for messages on the pipeline's bus (note that this will only -+ * work like this when a GLib main loop is running) */ -+ bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); -+ gst_bus_add_watch (bus, bus_call, loop); -+ gst_object_unref (bus); -+ -+ /* create elements */ -+ videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc0"); -+ glupload = gst_element_factory_make ("glupload", "glupload0"); -+ glfilterapp = gst_element_factory_make ("glfilterapp", "glfilterapp0"); -+ gldownload = gst_element_factory_make ("gldownload", "gldownload0"); -+ ffenc_mpeg4 = gst_element_factory_make ("ffenc_mpeg4", "ffenc_mpeg40"); -+ avimux = gst_element_factory_make ("avimux", "avimux0"); -+ filesink = gst_element_factory_make ("filesink", "filesink0"); -+ -+ -+ if (!videosrc || !glupload || !glfilterapp || !gldownload || !ffenc_mpeg4 || !avimux || !filesink) -+ { -+ g_print ("one element could not be found \n"); -+ return -1; -+ } -+ -+ /* change video source caps */ -+ GstCaps *caps = gst_caps_new_simple("video/x-raw-yuv", -+ "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'), -+ "width", G_TYPE_INT, 320, -+ "height", G_TYPE_INT, 240, -+ "framerate", GST_TYPE_FRACTION, 25, 1, -+ NULL) ; -+ -+ /* change video source caps */ -+ GstCaps *outcaps = gst_caps_new_simple("video/x-raw-yuv", -+ "width", G_TYPE_INT, 640, -+ "height", G_TYPE_INT, 480, -+ NULL) ; -+ -+ /* configure elements */ -+ g_object_set(G_OBJECT(videosrc), "num-buffers", 400, NULL); -+ g_object_set(G_OBJECT(glfilterapp), "client-reshape-callback", reshapeCallback, NULL); -+ g_object_set(G_OBJECT(glfilterapp), "client-draw-callback", drawCallback, NULL); -+ g_object_set(G_OBJECT(glfilterapp), "client-data", NULL, NULL); -+ g_object_set(G_OBJECT(filesink), "location", "record.avi", NULL); -+ -+ /* add elements */ -+ gst_bin_add_many (GST_BIN (pipeline), videosrc, glupload, glfilterapp, gldownload, -+ ffenc_mpeg4, avimux, filesink, NULL); -+ -+ /* link elements */ -+ gboolean link_ok = gst_element_link_filtered(videosrc, glupload, caps) ; -+ gst_caps_unref(caps) ; -+ if(!link_ok) -+ { -+ g_warning("Failed to link videosrc to glupload!\n") ; -+ return -1 ; -+ } -+ if (!gst_element_link_many(glupload, glfilterapp, gldownload, NULL)) -+ { -+ g_print ("Failed to link one or more elements!\n"); -+ return -1; -+ } -+ link_ok = gst_element_link_filtered(gldownload, ffenc_mpeg4, outcaps) ; -+ gst_caps_unref(outcaps) ; -+ if(!link_ok) -+ { -+ g_warning("Failed to link glvideomaker to ffenc_mpeg4!\n") ; -+ return -1 ; -+ } -+ if (!gst_element_link_many(ffenc_mpeg4, avimux, filesink, NULL)) -+ { -+ g_print ("Failed to link one or more elements!\n"); -+ return -1; -+ } -+ -+ -+ /* run */ -+ ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); -+ if (ret == GST_STATE_CHANGE_FAILURE) -+ { -+ g_print ("Failed to start up pipeline!\n"); -+ -+ /* check if there is an error message with details on the bus */ -+ GstMessage* msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0); -+ if (msg) -+ { -+ GError *err = NULL; -+ -+ gst_message_parse_error (msg, &err, NULL); -+ g_print ("ERROR: %s\n", err->message); -+ g_error_free (err); -+ gst_message_unref (msg); -+ } -+ return -1; -+ } -+ -+ g_main_loop_run (loop); -+ -+ /* clean up */ -+ gst_element_set_state (pipeline, GST_STATE_NULL); -+ gst_object_unref (pipeline); -+ -+ return 0; -+ -+} -diff --git a/tests/examples/generic/recordgraphic/recordgraphic.vcproj b/tests/examples/generic/recordgraphic/recordgraphic.vcproj -new file mode 100644 -index 0000000..825cbbd ---- /dev/null -+++ b/tests/examples/generic/recordgraphic/recordgraphic.vcproj -@@ -0,0 +1,202 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/Makefile.in b/tests/examples/gtk/Makefile.in -index f2d9542..51253c1 100644 ---- a/tests/examples/gtk/Makefile.in -+++ b/tests/examples/gtk/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - @GL_BACKEND_COCOA_TRUE@am__append_1 = -x objective-c - subdir = tests/examples/gtk - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -79,8 +79,8 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) - libgstgtkhelper_la_LIBADD = - am_libgstgtkhelper_la_OBJECTS = libgstgtkhelper_la-gstgtk.lo - libgstgtkhelper_la_OBJECTS = $(am_libgstgtkhelper_la_OBJECTS) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - libgstgtkhelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -@@ -96,21 +96,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(libgstgtkhelper_la_SOURCES) - DIST_SOURCES = $(libgstgtkhelper_la_SOURCES) -@@ -201,6 +201,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -232,6 +233,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -239,8 +242,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -313,7 +318,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -358,6 +363,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -423,7 +429,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -475,7 +485,7 @@ clean-noinstLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libgstgtkhelper.la: $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_DEPENDENCIES) $(EXTRA_libgstgtkhelper_la_DEPENDENCIES) -+libgstgtkhelper.la: $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgstgtkhelper_la_LINK) $(libgstgtkhelper_la_OBJECTS) $(libgstgtkhelper_la_LIBADD) $(LIBS) - - mostlyclean-compile: -@@ -489,30 +499,34 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libgstgtkhelper_la-gstgtk.lo: gstgtk.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstgtkhelper_la-gstgtk.Tpo $(DEPDIR)/libgstgtkhelper_la-gstgtk.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstgtk.c' object='libgstgtkhelper_la-gstgtk.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstgtk.c' object='libgstgtkhelper_la-gstgtk.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - mostlyclean-libtool: - -rm -f *.lo -@@ -728,15 +742,10 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/filternoxoverlay/Makefile.in b/tests/examples/gtk/filternoxoverlay/Makefile.in -index 43ff858..5be3a6a 100644 ---- a/tests/examples/gtk/filternoxoverlay/Makefile.in -+++ b/tests/examples/gtk/filternoxoverlay/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = filternoxoverlay$(EXEEXT) - subdir = tests/examples/gtk/filternoxoverlay - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = - filternoxoverlay_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - filternoxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(filternoxoverlay_SOURCES) - DIST_SOURCES = $(filternoxoverlay_SOURCES) -@@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -278,7 +283,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -388,7 +394,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -442,7 +452,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --filternoxoverlay$(EXEEXT): $(filternoxoverlay_OBJECTS) $(filternoxoverlay_DEPENDENCIES) $(EXTRA_filternoxoverlay_DEPENDENCIES) -+filternoxoverlay$(EXEEXT): $(filternoxoverlay_OBJECTS) $(filternoxoverlay_DEPENDENCIES) - @rm -f filternoxoverlay$(EXEEXT) - $(AM_V_CXXLD)$(filternoxoverlay_LINK) $(filternoxoverlay_OBJECTS) $(filternoxoverlay_LDADD) $(LIBS) - -@@ -457,37 +467,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - filternoxoverlay-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filternoxoverlay-main.Tpo $(DEPDIR)/filternoxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filternoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filternoxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - filternoxoverlay-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filternoxoverlay-main.Tpo $(DEPDIR)/filternoxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filternoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filternoxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -591,15 +606,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj b/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj -new file mode 100644 -index 0000000..fb91a55 ---- /dev/null -+++ b/tests/examples/gtk/filternoxoverlay/filternoxoverlay.vcproj -@@ -0,0 +1,202 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/filterxoverlay/Makefile.in b/tests/examples/gtk/filterxoverlay/Makefile.in -index 23e9e6c..b2edf09 100644 ---- a/tests/examples/gtk/filterxoverlay/Makefile.in -+++ b/tests/examples/gtk/filterxoverlay/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = filterxoverlay$(EXEEXT) - subdir = tests/examples/gtk/filterxoverlay - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = - filterxoverlay_DEPENDENCIES = ../libgstgtkhelper.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - filterxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(filterxoverlay_SOURCES) - DIST_SOURCES = $(filterxoverlay_SOURCES) -@@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -278,7 +283,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -388,7 +394,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -443,7 +453,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --filterxoverlay$(EXEEXT): $(filterxoverlay_OBJECTS) $(filterxoverlay_DEPENDENCIES) $(EXTRA_filterxoverlay_DEPENDENCIES) -+filterxoverlay$(EXEEXT): $(filterxoverlay_OBJECTS) $(filterxoverlay_DEPENDENCIES) - @rm -f filterxoverlay$(EXEEXT) - $(AM_V_CXXLD)$(filterxoverlay_LINK) $(filterxoverlay_OBJECTS) $(filterxoverlay_LDADD) $(LIBS) - -@@ -458,37 +468,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - filterxoverlay-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filterxoverlay-main.Tpo $(DEPDIR)/filterxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filterxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filterxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - filterxoverlay-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filterxoverlay-main.Tpo $(DEPDIR)/filterxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='filterxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='filterxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -592,15 +607,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj b/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj -new file mode 100644 -index 0000000..ce97ffe ---- /dev/null -+++ b/tests/examples/gtk/filterxoverlay/filterxoverlay.vcproj -@@ -0,0 +1,210 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/fxtest/Makefile.in b/tests/examples/gtk/fxtest/Makefile.in -index 9885033..34f28c9 100644 ---- a/tests/examples/gtk/fxtest/Makefile.in -+++ b/tests/examples/gtk/fxtest/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = fxtest$(EXEEXT) pixbufdrop$(EXEEXT) - subdir = tests/examples/gtk/fxtest - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = - fxtest_DEPENDENCIES = ../libgstgtkhelper.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - fxtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fxtest_CFLAGS) $(CFLAGS) \ -@@ -106,21 +106,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(fxtest_SOURCES) $(pixbufdrop_SOURCES) - DIST_SOURCES = $(fxtest_SOURCES) $(pixbufdrop_SOURCES) -@@ -173,6 +173,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -204,6 +205,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -211,8 +214,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -285,7 +290,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -330,6 +335,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -395,7 +401,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -458,10 +468,10 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --fxtest$(EXEEXT): $(fxtest_OBJECTS) $(fxtest_DEPENDENCIES) $(EXTRA_fxtest_DEPENDENCIES) -+fxtest$(EXEEXT): $(fxtest_OBJECTS) $(fxtest_DEPENDENCIES) - @rm -f fxtest$(EXEEXT) - $(AM_V_CCLD)$(fxtest_LINK) $(fxtest_OBJECTS) $(fxtest_LDADD) $(LIBS) --pixbufdrop$(EXEEXT): $(pixbufdrop_OBJECTS) $(pixbufdrop_DEPENDENCIES) $(EXTRA_pixbufdrop_DEPENDENCIES) -+pixbufdrop$(EXEEXT): $(pixbufdrop_OBJECTS) $(pixbufdrop_DEPENDENCIES) - @rm -f pixbufdrop$(EXEEXT) - $(AM_V_CCLD)$(pixbufdrop_LINK) $(pixbufdrop_OBJECTS) $(pixbufdrop_LDADD) $(LIBS) - -@@ -477,51 +487,58 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - fxtest-fxtest.o: fxtest.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fxtest-fxtest.Tpo $(DEPDIR)/fxtest-fxtest.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fxtest.c' object='fxtest-fxtest.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fxtest.c' object='fxtest-fxtest.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - fxtest-fxtest.obj: fxtest.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fxtest-fxtest.Tpo $(DEPDIR)/fxtest-fxtest.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fxtest.c' object='fxtest-fxtest.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fxtest.c' object='fxtest-fxtest.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - pixbufdrop-pixbufdrop.o: pixbufdrop.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo $(DEPDIR)/pixbufdrop-pixbufdrop.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - pixbufdrop-pixbufdrop.obj: pixbufdrop.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pixbufdrop-pixbufdrop.Tpo $(DEPDIR)/pixbufdrop-pixbufdrop.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixbufdrop.c' object='pixbufdrop-pixbufdrop.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -625,15 +642,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/fxtest/fxtest.vcproj b/tests/examples/gtk/fxtest/fxtest.vcproj -new file mode 100644 -index 0000000..47f0b5c ---- /dev/null -+++ b/tests/examples/gtk/fxtest/fxtest.vcproj -@@ -0,0 +1,210 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/gtk.sln b/tests/examples/gtk/gtk.sln -new file mode 100644 -index 0000000..9965c8a ---- /dev/null -+++ b/tests/examples/gtk/gtk.sln -@@ -0,0 +1,50 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterxoverlay", "filterxoverlay\filterxoverlay.vcproj", "{F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkxoverlay", "gtkxoverlay\gtkxoverlay.vcproj", "{E83070C2-58E4-48AE-AEB3-A4580EDE1212}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxtest", "fxtest\fxtest.vcproj", "{59075FDD-68CD-4F1A-948B-46D142800798}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixbufdrop", "pixbufdrop\pixbufdrop.vcproj", "{09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filternoxoverlay", "filternoxoverlay\filternoxoverlay.vcproj", "{F41F3034-3E0B-4630-8D1E-35E14C606863}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "switchxoverlay", "switchxoverlay\switchxoverlay.vcproj", "{BA78B4B4-3268-483E-9676-911E29FD2C69}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Debug|Win32.Build.0 = Debug|Win32 -+ {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Release|Win32.ActiveCfg = Release|Win32 -+ {F9CC027E-CC9F-4B34-AA8F-58852EC32CD0}.Release|Win32.Build.0 = Release|Win32 -+ {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Debug|Win32.Build.0 = Debug|Win32 -+ {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Release|Win32.ActiveCfg = Release|Win32 -+ {E83070C2-58E4-48AE-AEB3-A4580EDE1212}.Release|Win32.Build.0 = Release|Win32 -+ {59075FDD-68CD-4F1A-948B-46D142800798}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {59075FDD-68CD-4F1A-948B-46D142800798}.Debug|Win32.Build.0 = Debug|Win32 -+ {59075FDD-68CD-4F1A-948B-46D142800798}.Release|Win32.ActiveCfg = Release|Win32 -+ {59075FDD-68CD-4F1A-948B-46D142800798}.Release|Win32.Build.0 = Release|Win32 -+ {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Debug|Win32.Build.0 = Debug|Win32 -+ {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Release|Win32.ActiveCfg = Release|Win32 -+ {09F68B62-1D4C-4C24-A6AD-AA76A9F3237C}.Release|Win32.Build.0 = Release|Win32 -+ {F41F3034-3E0B-4630-8D1E-35E14C606863}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {F41F3034-3E0B-4630-8D1E-35E14C606863}.Debug|Win32.Build.0 = Debug|Win32 -+ {F41F3034-3E0B-4630-8D1E-35E14C606863}.Release|Win32.ActiveCfg = Release|Win32 -+ {F41F3034-3E0B-4630-8D1E-35E14C606863}.Release|Win32.Build.0 = Release|Win32 -+ {BA78B4B4-3268-483E-9676-911E29FD2C69}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {BA78B4B4-3268-483E-9676-911E29FD2C69}.Debug|Win32.Build.0 = Debug|Win32 -+ {BA78B4B4-3268-483E-9676-911E29FD2C69}.Release|Win32.ActiveCfg = Release|Win32 -+ {BA78B4B4-3268-483E-9676-911E29FD2C69}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/gtk/gtkxoverlay/Makefile.in b/tests/examples/gtk/gtkxoverlay/Makefile.in -index 44050e4..30a0f1d 100644 ---- a/tests/examples/gtk/gtkxoverlay/Makefile.in -+++ b/tests/examples/gtk/gtkxoverlay/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = gtkxoverlay$(EXEEXT) - subdir = tests/examples/gtk/gtkxoverlay - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = - gtkxoverlay_DEPENDENCIES = ../libgstgtkhelper.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - gtkxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(gtkxoverlay_CXXFLAGS) \ -@@ -98,21 +98,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(gtkxoverlay_SOURCES) - DIST_SOURCES = $(gtkxoverlay_SOURCES) -@@ -165,6 +165,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -196,6 +197,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -203,8 +206,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -277,7 +282,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -322,6 +327,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -387,7 +393,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -442,7 +452,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --gtkxoverlay$(EXEEXT): $(gtkxoverlay_OBJECTS) $(gtkxoverlay_DEPENDENCIES) $(EXTRA_gtkxoverlay_DEPENDENCIES) -+gtkxoverlay$(EXEEXT): $(gtkxoverlay_OBJECTS) $(gtkxoverlay_DEPENDENCIES) - @rm -f gtkxoverlay$(EXEEXT) - $(AM_V_CXXLD)$(gtkxoverlay_LINK) $(gtkxoverlay_OBJECTS) $(gtkxoverlay_LDADD) $(LIBS) - -@@ -457,37 +467,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - gtkxoverlay-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gtkxoverlay-main.Tpo $(DEPDIR)/gtkxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='gtkxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gtkxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - gtkxoverlay-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gtkxoverlay-main.Tpo $(DEPDIR)/gtkxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='gtkxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gtkxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -591,15 +606,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj b/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj -new file mode 100644 -index 0000000..3117f5f ---- /dev/null -+++ b/tests/examples/gtk/gtkxoverlay/gtkxoverlay.vcproj -@@ -0,0 +1,210 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj b/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj -new file mode 100644 -index 0000000..02abc45 ---- /dev/null -+++ b/tests/examples/gtk/pixbufdrop/pixbufdrop.vcproj -@@ -0,0 +1,210 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/gtk/switchxoverlay/Makefile.in b/tests/examples/gtk/switchxoverlay/Makefile.in -index e28a118..85f6218 100644 ---- a/tests/examples/gtk/switchxoverlay/Makefile.in -+++ b/tests/examples/gtk/switchxoverlay/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = switchxoverlay$(EXEEXT) - subdir = tests/examples/gtk/switchxoverlay - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -42,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -82,8 +82,8 @@ am__DEPENDENCIES_1 = - switchxoverlay_DEPENDENCIES = ../libgstgtkhelper.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - switchxoverlay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -99,21 +99,21 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) --AM_V_CXX = $(am__v_CXX_@AM_V@) --am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+AM_V_CXX = $(am__v_CXX_$(V)) -+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) - am__v_CXX_0 = @echo " CXX " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) --am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+AM_V_CXXLD = $(am__v_CXXLD_$(V)) -+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CXXLD_0 = @echo " CXXLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(switchxoverlay_SOURCES) - DIST_SOURCES = $(switchxoverlay_SOURCES) -@@ -166,6 +166,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -197,6 +198,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -204,8 +207,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -278,7 +283,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -323,6 +328,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -388,7 +394,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -443,7 +453,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --switchxoverlay$(EXEEXT): $(switchxoverlay_OBJECTS) $(switchxoverlay_DEPENDENCIES) $(EXTRA_switchxoverlay_DEPENDENCIES) -+switchxoverlay$(EXEEXT): $(switchxoverlay_OBJECTS) $(switchxoverlay_DEPENDENCIES) - @rm -f switchxoverlay$(EXEEXT) - $(AM_V_CXXLD)$(switchxoverlay_LINK) $(switchxoverlay_OBJECTS) $(switchxoverlay_LDADD) $(LIBS) - -@@ -458,37 +468,42 @@ distclean-compile: - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - switchxoverlay-main.o: main.cpp - @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 - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switchxoverlay-main.Tpo $(DEPDIR)/switchxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='switchxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='switchxoverlay-main.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - switchxoverlay-main.obj: main.cpp - @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` - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switchxoverlay-main.Tpo $(DEPDIR)/switchxoverlay-main.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='switchxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='switchxoverlay-main.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -592,15 +607,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj b/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj -new file mode 100644 -index 0000000..515aa45 ---- /dev/null -+++ b/tests/examples/gtk/switchxoverlay/switchxoverlay.vcproj -@@ -0,0 +1,210 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/qt/Makefile.in b/tests/examples/qt/Makefile.in -index e29ccd9..b915acb 100644 ---- a/tests/examples/qt/Makefile.in -+++ b/tests/examples/qt/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = tests/examples/qt - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -240,7 +245,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -350,7 +356,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -444,15 +454,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/qt/mousexoverlay/gstthread.cpp b/tests/examples/qt/mousexoverlay/gstthread.cpp -new file mode 100644 -index 0000000..55c5541 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/gstthread.cpp -@@ -0,0 +1,67 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "gstthread.h" -+ -+GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): -+ QThread(parent), -+ m_winId(winId), -+ m_videoLocation(videoLocation) -+{ -+} -+ -+GstThread::~GstThread() -+{ -+} -+ -+void GstThread::exposeRequested() -+{ -+ m_pipeline->exposeRequested(); -+} -+ -+void GstThread::onMouseMove() -+{ -+ m_pipeline->rotateRequested(); -+} -+ -+void GstThread::show() -+{ -+ emit showRequested(); -+} -+ -+void GstThread::stop() -+{ -+ m_pipeline->stop(); -+} -+ -+void GstThread::run() -+{ -+ m_pipeline = new Pipeline(m_winId, m_videoLocation); -+ connect(m_pipeline, SIGNAL(showRequested()), this, SLOT(show())); -+ m_pipeline->start(); //it runs the gmainloop on win32 -+ -+#ifndef WIN32 -+ //works like the gmainloop on linux (GstEvent are handled) -+ connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); -+ exec(); -+#endif -+ -+ m_pipeline->unconfigure(); -+} -diff --git a/tests/examples/qt/mousexoverlay/gstthread.h b/tests/examples/qt/mousexoverlay/gstthread.h -new file mode 100644 -index 0000000..f89593c ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/gstthread.h -@@ -0,0 +1,56 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef GSTTHREAD_H -+#define GSTTHREAD_H -+ -+#include -+#include -+ -+#include "pipeline.h" -+ -+class GstThread : public QThread -+{ -+ Q_OBJECT -+ -+public: -+ GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); -+ ~GstThread(); -+ -+public slots: -+ void exposeRequested(); -+ void onMouseMove(); -+ void show(); -+ void stop(); -+ -+signals: -+ void showRequested(); -+ -+protected: -+ void run(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ Pipeline* m_pipeline; -+ -+}; -+ -+#endif -diff --git a/tests/examples/qt/mousexoverlay/main.cpp b/tests/examples/qt/mousexoverlay/main.cpp -new file mode 100644 -index 0000000..40bdd67 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/main.cpp -@@ -0,0 +1,39 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "qrenderer.h" -+ -+int main(int argc, char *argv[]) -+{ -+ QApplication a(argc, argv); -+ a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); -+ -+ QString videolcoation = QFileDialog::getOpenFileName(0, "Select a video file", -+ ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); -+ -+ if (videolcoation.isEmpty()) -+ return -1; -+ -+ QRenderer w(videolcoation); -+ w.setWindowTitle("glimagesink implements the gstxoverlay interface"); -+ -+ return a.exec(); -+} -diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.pri b/tests/examples/qt/mousexoverlay/mousexoverlay.pri -new file mode 100644 -index 0000000..75b23cd ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/mousexoverlay.pri -@@ -0,0 +1,10 @@ -+#Header files -+HEADERS += ./gstthread.h \ -+ ./pipeline.h \ -+ ./qrenderer.h -+ -+#Source files -+SOURCES += ./gstthread.cpp \ -+ ./main.cpp \ -+ ./pipeline.cpp \ -+ ./qrenderer.cpp -diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.pro b/tests/examples/qt/mousexoverlay/mousexoverlay.pro -new file mode 100644 -index 0000000..411822b ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/mousexoverlay.pro -@@ -0,0 +1,56 @@ -+TEMPLATE = app -+TARGET = mousexoverlay -+DESTDIR = ./debug -+CONFIG += debug -+DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB -+ -+win32 { -+DEFINES += WIN32 -+INCLUDEPATH += ./GeneratedFiles \ -+ ./GeneratedFiles/Debug \ -+ C:/gstreamer/include \ -+ C:/gstreamer/include/libxml2 \ -+ C:/gstreamer/include/glib-2.0 \ -+ C:/gstreamer/lib/glib-2.0/include \ -+ C:/gstreamer/include/gstreamer-0.10 -+LIBS += -L"C:/gstreamer/lib" \ -+ -L"C:/gstreamer/bin" \ -+ -lgstreamer-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -llibgstinterfaces-0.10 \ -+ -lopengl32 \ -+ -lglu32 \ -+ -lglew32 -+} -+ -+unix { -+DEFINES += UNIX -+INCLUDEPATH += GeneratedFiles \ -+ GeneratedFiles/Debug \ -+ /usr/include/gstreamer-0.10 \ -+ /usr/local/include/gstreamer-0.10 \ -+ /usr/include/glib-2.0 \ -+ /usr/lib/glib-2.0/include \ -+ /usr/include/libxml2 -+LIBS += -lgstreamer-0.10 \ -+ -lgstinterfaces-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -lGLU \ -+ -lGL \ -+ -lGLEW -+} -+ -+DEPENDPATH += . -+MOC_DIR += ./GeneratedFiles/debug -+OBJECTS_DIR += debug -+UI_DIR += ./GeneratedFiles -+RCC_DIR += ./GeneratedFiles -+ -+#Include file(s) -+include(mousexoverlay.pri) -diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.sln b/tests/examples/qt/mousexoverlay/mousexoverlay.sln -new file mode 100644 -index 0000000..8916d56 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/mousexoverlay.sln -@@ -0,0 +1,26 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mousexoverlay", "mousexoverlay.vcproj", "{E94F8CAA-628F-4872-8E73-AD56D34899CB}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Debug|Win32.Build.0 = Debug|Win32 -+ {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Release|Win32.ActiveCfg = Release|Win32 -+ {E94F8CAA-628F-4872-8E73-AD56D34899CB}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj b/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj -new file mode 100644 -index 0000000..e413b53 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/mousexoverlay.vcproj -@@ -0,0 +1,321 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/qt/mousexoverlay/pipeline.cpp b/tests/examples/qt/mousexoverlay/pipeline.cpp -new file mode 100644 -index 0000000..6f00bbe ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/pipeline.cpp -@@ -0,0 +1,334 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include "pipeline.h" -+ -+Pipeline::Pipeline(const WId id, const QString videoLocation): -+ m_winId(id), -+ m_videoLocation(videoLocation), -+ m_loop(NULL), -+ m_bus(NULL), -+ m_pipeline(NULL), -+ m_glimagesink(NULL) -+{ -+ create(); -+} -+ -+Pipeline::~Pipeline() -+{ -+} -+ -+void Pipeline::create() -+{ -+ qDebug("Loading video: %s", m_videoLocation.toAscii().data()); -+ -+ gst_init (NULL, NULL); -+ -+#ifdef WIN32 -+ m_loop = g_main_loop_new (NULL, FALSE); -+#endif -+ m_pipeline = gst_pipeline_new ("pipeline"); -+ -+ m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); -+ gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); -+ gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); -+ gst_object_unref (m_bus); -+ -+ GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); -+ GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); -+ m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); -+ -+ if (!videosrc || !decodebin || !m_glimagesink ) -+ { -+ qDebug ("one element could not be found"); -+ return; -+ } -+ -+ g_object_set(G_OBJECT(videosrc), "num-buffers", 800, NULL); -+ g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); -+ g_object_set(G_OBJECT(m_glimagesink), "client-reshape-callback", reshapeCallback, NULL); -+ g_object_set(G_OBJECT(m_glimagesink), "client-draw-callback", drawCallback, NULL); -+ -+ gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glimagesink, NULL); -+ -+ gst_element_link_pads (videosrc, "src", decodebin, "sink"); -+ -+ g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), this); -+} -+ -+void Pipeline::start() -+{ -+ GstStateChangeReturn ret = gst_element_set_state (m_pipeline, GST_STATE_PLAYING); -+ if (ret == GST_STATE_CHANGE_FAILURE) -+ { -+ qDebug ("Failed to start up pipeline!"); -+ -+ /* check if there is an error message with details on the bus */ -+ GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); -+ if (msg) -+ { -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, NULL); -+ qDebug ("ERROR: %s", err->message); -+ g_error_free (err); -+ gst_message_unref (msg); -+ } -+ return; -+ } -+ -+#ifdef WIN32 -+ g_main_loop_run(m_loop); -+#endif -+} -+ -+//we don't want a thread safe stop in this example -+void Pipeline::stop() -+{ -+#ifdef WIN32 -+ g_main_loop_quit(m_loop); -+#else -+ emit stopRequested(); -+#endif -+} -+ -+void Pipeline::unconfigure() const -+{ -+ gst_element_set_state (m_pipeline, GST_STATE_NULL); -+ gst_object_unref (m_pipeline); -+} -+ -+void Pipeline::show() -+{ -+ emit showRequested(); -+} -+ -+//redraw the current frame in the drawable -+void Pipeline::doExpose() const -+{ -+ if (m_pipeline && m_glimagesink) -+ gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); -+} -+ -+//post message to g_main_loop in order to call expose -+//in the gt thread -+void Pipeline::exposeRequested() -+{ -+ g_idle_add(cb_expose, this); -+} -+ -+//rotate the cube -+void Pipeline::doRotate() -+{ -+ m_xrot += 3.0f; -+ m_yrot += 2.0f; -+ m_zrot += 4.0f; -+} -+ -+//post message to g_main_loop in order to call rotate -+//in the gt thread -+void Pipeline::rotateRequested() -+{ -+ g_idle_add(cb_rotate, this); -+} -+ -+//----------------------------------------------------------------------- -+//----------------------------- static members -------------------------- -+//----------------------------------------------------------------------- -+ -+float Pipeline::m_xrot = 0; -+float Pipeline::m_yrot = 0; -+float Pipeline::m_zrot = 0; -+ -+//client reshape callback -+void Pipeline::reshapeCallback (uint width, uint height) -+{ -+ glViewport(0, 0, width, height); -+ glMatrixMode(GL_PROJECTION); -+ glLoadIdentity(); -+ gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); -+ glMatrixMode(GL_MODELVIEW); -+} -+ -+//client draw callback -+gboolean Pipeline::drawCallback (uint texture, uint width, uint height) -+{ -+ static GTimeVal current_time; -+ static glong last_sec = current_time.tv_sec; -+ static gint nbFrames = 0; -+ -+ g_get_current_time (¤t_time); -+ nbFrames++ ; -+ -+ if ((current_time.tv_sec - last_sec) >= 1) -+ { -+ qDebug ("GRPHIC FPS = %d", nbFrames); -+ nbFrames = 0; -+ last_sec = current_time.tv_sec; -+ } -+ -+ glEnable(GL_DEPTH_TEST); -+ -+ glEnable (GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); -+ -+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -+ glMatrixMode(GL_MODELVIEW); -+ glLoadIdentity(); -+ -+ glTranslatef(0.0f,0.0f,-5.0f); -+ -+ glRotatef(m_xrot,1.0f,0.0f,0.0f); -+ glRotatef(m_yrot,0.0f,1.0f,0.0f); -+ glRotatef(m_zrot,0.0f,0.0f,1.0f); -+ -+ glBegin(GL_QUADS); -+ // Front Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ // Back Face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ // Top Face -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ // Bottom Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); -+ // Right face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ // Left Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glEnd(); -+ -+ //return TRUE causes a postRedisplay -+ return FALSE; -+} -+ -+gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) -+{ -+ switch (GST_MESSAGE_TYPE (msg)) -+ { -+ case GST_MESSAGE_EOS: -+ qDebug ("End-of-stream"); -+ p->stop(); -+ break; -+ case GST_MESSAGE_ERROR: -+ { -+ gchar *debug = NULL; -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, &debug); -+ qDebug ("Error: %s", err->message); -+ g_error_free (err); -+ if (debug) -+ { -+ qDebug ("Debug deails: %s", debug); -+ g_free (debug); -+ } -+ p->stop(); -+ break; -+ } -+ default: -+ break; -+ } -+ -+ return TRUE; -+} -+ -+void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p) -+{ -+ GstElement* glimagesink = p->getVideoSink(); -+ GstPad* glpad = gst_element_get_pad (glimagesink, "sink"); -+ -+ //only link once -+ if (GST_PAD_IS_LINKED (glpad)) -+ { -+ g_object_unref (glpad); -+ return; -+ } -+ -+ GstCaps* caps = gst_pad_get_caps (pad); -+ GstStructure* str = gst_caps_get_structure (caps, 0); -+ if (!g_strrstr (gst_structure_get_name (str), "video")) -+ { -+ gst_caps_unref (caps); -+ gst_object_unref (glpad); -+ return; -+ } -+ gst_caps_unref (caps); -+ -+ GstPadLinkReturn ret = gst_pad_link (pad, glpad); -+ if (ret != GST_PAD_LINK_OK) -+ g_warning ("Failed to link with decodebin!\n"); -+ -+ p->show(); -+} -+ -+gboolean Pipeline::cb_expose (gpointer data) -+{ -+ ((Pipeline*)data)->doExpose(); -+ return FALSE; -+} -+ -+gboolean Pipeline::cb_rotate (gpointer data) -+{ -+ ((Pipeline*)data)->doRotate(); -+ return FALSE; -+} -+ -+GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) -+{ -+ // ignore anything but 'prepare-xwindow-id' element messages -+ if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) -+ return GST_BUS_PASS; -+ -+ if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) -+ return GST_BUS_PASS; -+ -+ qDebug ("setting xwindow id"); -+ -+ //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. -+ //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. -+ gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); -+ -+ gst_message_unref (message); -+ -+ return GST_BUS_DROP; -+} -diff --git a/tests/examples/qt/mousexoverlay/pipeline.h b/tests/examples/qt/mousexoverlay/pipeline.h -new file mode 100644 -index 0000000..9c5d044 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/pipeline.h -@@ -0,0 +1,72 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef PIPELINE_H -+#define PIPELINE_H -+ -+#include -+#include -+//#include -+ -+class Pipeline : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ Pipeline(const WId windId, const QString videoLocation); -+ ~Pipeline(); -+ void start(); -+ void exposeRequested(); -+ void rotateRequested(); -+ void stop(); -+ void unconfigure() const; -+ void show(); -+ GstElement* getVideoSink() { return m_glimagesink; } ; -+ -+signals: -+ void showRequested(); -+ void stopRequested(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ GMainLoop* m_loop; -+ GstBus* m_bus; -+ GstElement* m_pipeline; -+ GstElement* m_glimagesink; -+ static float m_xrot; -+ static float m_yrot; -+ static float m_zrot; -+ -+ void create(); -+ WId winId() const { return m_winId; } -+ void doExpose() const; -+ void doRotate(); -+ -+ static void reshapeCallback (uint width, uint height); -+ static gboolean drawCallback (uint texture, uint width, uint height); -+ static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); -+ static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p); -+ static gboolean cb_expose (gpointer data); -+ static gboolean cb_rotate (gpointer data); -+ static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); -+}; -+ -+#endif -diff --git a/tests/examples/qt/mousexoverlay/qrenderer.cpp b/tests/examples/qt/mousexoverlay/qrenderer.cpp -new file mode 100644 -index 0000000..6263035 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/qrenderer.cpp -@@ -0,0 +1,58 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "qrenderer.h" -+ -+QRenderer::QRenderer(const QString videoLocation, QWidget *parent, Qt::WFlags flags) -+ : QWidget(parent, flags), -+ m_gt(winId(), videoLocation) -+{ -+ setAttribute(Qt::WA_NoSystemBackground); -+ setVisible(false); -+ move(20, 10); -+ resize(640, 480); -+ -+ QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); -+ QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); -+ QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); -+ QObject::connect(&m_gt, SIGNAL(showRequested()), this, SLOT(show())); -+ QObject::connect(this, SIGNAL(mouseMoved()), &m_gt, SLOT(onMouseMove())); -+ m_gt.start(); -+} -+ -+QRenderer::~QRenderer() -+{ -+} -+ -+void QRenderer::paintEvent(QPaintEvent* event) -+{ -+ emit exposeRequested(); -+} -+ -+void QRenderer::mouseMoveEvent(QMouseEvent* event) -+{ -+ emit mouseMoved(); -+} -+ -+void QRenderer::closeEvent(QCloseEvent* event) -+{ -+ emit closeRequested(); -+ m_gt.wait(); -+} -diff --git a/tests/examples/qt/mousexoverlay/qrenderer.h b/tests/examples/qt/mousexoverlay/qrenderer.h -new file mode 100644 -index 0000000..a5057b9 ---- /dev/null -+++ b/tests/examples/qt/mousexoverlay/qrenderer.h -@@ -0,0 +1,47 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef QRENDERER_H -+#define QRENDERER_H -+ -+#include -+#include "gstthread.h" -+ -+class QRenderer : public QWidget -+{ -+ Q_OBJECT -+ -+public: -+ QRenderer(const QString videoLocation, QWidget *parent = 0, Qt::WFlags flags = 0); -+ ~QRenderer(); -+ void paintEvent(QPaintEvent* event); -+ void mouseMoveEvent(QMouseEvent* event); -+ void closeEvent (QCloseEvent* event); -+ -+signals: -+ void exposeRequested(); -+ void closeRequested(); -+ void mouseMoved(); -+ -+private: -+ GstThread m_gt; -+}; -+ -+#endif // QRENDERER_H -diff --git a/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp b/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp -new file mode 100644 -index 0000000..4eebd30 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/gstthread.cpp -@@ -0,0 +1,62 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "gstthread.h" -+ -+GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): -+ QThread(parent), -+ m_winId(winId), -+ m_videoLocation(videoLocation) -+{ -+} -+ -+GstThread::~GstThread() -+{ -+} -+ -+void GstThread::exposeRequested() -+{ -+ m_pipeline->exposeRequested(); -+} -+ -+void GstThread::show() -+{ -+ emit showRequested(); -+} -+ -+void GstThread::stop() -+{ -+ m_pipeline->stop(); -+} -+ -+void GstThread::run() -+{ -+ m_pipeline = new Pipeline(m_winId, m_videoLocation); -+ connect(m_pipeline, SIGNAL(showRequested()), this, SLOT(show())); -+ m_pipeline->start(); //it runs the gmainloop on win32 -+ -+#ifndef WIN32 -+ //works like the gmainloop on linux (GstEvent are handled) -+ connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); -+ exec(); -+#endif -+ -+ m_pipeline->unconfigure(); -+} -diff --git a/tests/examples/qt/qglwidgetxoverlay/gstthread.h b/tests/examples/qt/qglwidgetxoverlay/gstthread.h -new file mode 100644 -index 0000000..1ee555c ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/gstthread.h -@@ -0,0 +1,55 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef GSTTHREAD_H -+#define GSTTHREAD_H -+ -+#include -+#include -+ -+#include "pipeline.h" -+ -+class GstThread : public QThread -+{ -+ Q_OBJECT -+ -+public: -+ GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); -+ ~GstThread(); -+ -+public slots: -+ void exposeRequested(); -+ void show(); -+ void stop(); -+ -+signals: -+ void showRequested(); -+ -+protected: -+ void run(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ Pipeline* m_pipeline; -+ -+}; -+ -+#endif -diff --git a/tests/examples/qt/qglwidgetxoverlay/main.cpp b/tests/examples/qt/qglwidgetxoverlay/main.cpp -new file mode 100644 -index 0000000..77a31a6 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/main.cpp -@@ -0,0 +1,39 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "qglrenderer.h" -+ -+int main(int argc, char *argv[]) -+{ -+ QApplication a(argc, argv); -+ a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); -+ -+ QString videolcoation = QFileDialog::getOpenFileName(0, "Select a video file", -+ ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); -+ -+ if (videolcoation.isEmpty()) -+ return -1; -+ -+ QGLRenderer w(videolcoation); -+ w.setWindowTitle("glimagesink implements the gstxoverlay interface"); -+ -+ return a.exec(); -+} -diff --git a/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp b/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp -new file mode 100644 -index 0000000..319eb3c ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/pipeline.cpp -@@ -0,0 +1,332 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include "pipeline.h" -+ -+Pipeline::Pipeline(const WId id, const QString videoLocation): -+ m_winId(id), -+ m_videoLocation(videoLocation), -+ m_loop(NULL), -+ m_bus(NULL), -+ m_pipeline(NULL), -+ m_glupload(NULL), -+ m_glimagesink(NULL) -+{ -+ create(); -+} -+ -+Pipeline::~Pipeline() -+{ -+} -+ -+void Pipeline::create() -+{ -+ qDebug("Loading video: %s", m_videoLocation.toAscii().data()); -+ -+ gst_init (NULL, NULL); -+ -+#ifdef WIN32 -+ m_loop = g_main_loop_new (NULL, FALSE); -+#endif -+ m_pipeline = gst_pipeline_new ("pipeline"); -+ -+ m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); -+ gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); -+ gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); -+ gst_object_unref (m_bus); -+ -+ GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); -+ GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); -+ m_glupload = gst_element_factory_make ("glupload", "glupload0"); -+ m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); -+ -+ if (!videosrc || !decodebin || !m_glupload || !m_glimagesink ) -+ { -+ qDebug ("one element could not be found"); -+ return; -+ } -+ -+ GstCaps *outcaps = gst_caps_new_simple("video/x-raw-gl", -+ "width", G_TYPE_INT, 800, -+ "height", G_TYPE_INT, 600, -+ NULL) ; -+ -+ g_object_set(G_OBJECT(videosrc), "num-buffers", 800, NULL); -+ g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); -+ g_object_set(G_OBJECT(m_glimagesink), "client-reshape-callback", reshapeCallback, NULL); -+ g_object_set(G_OBJECT(m_glimagesink), "client-draw-callback", drawCallback, NULL); -+ -+ gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glupload, m_glimagesink, NULL); -+ -+ gboolean link_ok = gst_element_link_filtered(m_glupload, m_glimagesink, outcaps) ; -+ gst_caps_unref(outcaps) ; -+ if(!link_ok) -+ { -+ qDebug("Failed to link glupload to glimagesink!\n") ; -+ return; -+ } -+ -+ gst_element_link_pads (videosrc, "src", decodebin, "sink"); -+ -+ g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), this); -+} -+ -+void Pipeline::start() -+{ -+ GstStateChangeReturn ret = gst_element_set_state (m_pipeline, GST_STATE_PLAYING); -+ if (ret == GST_STATE_CHANGE_FAILURE) -+ { -+ qDebug ("Failed to start up pipeline!"); -+ -+ /* check if there is an error message with details on the bus */ -+ GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); -+ if (msg) -+ { -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, NULL); -+ qDebug ("ERROR: %s", err->message); -+ g_error_free (err); -+ gst_message_unref (msg); -+ } -+ return; -+ } -+ -+#ifdef WIN32 -+ g_main_loop_run(m_loop); -+#endif -+} -+ -+//we don't want a thread safe stop in this example -+void Pipeline::stop() -+{ -+#ifdef WIN32 -+ g_main_loop_quit(m_loop); -+#else -+ emit stopRequested(); -+#endif -+} -+ -+void Pipeline::unconfigure() const -+{ -+ gst_element_set_state (m_pipeline, GST_STATE_NULL); -+ gst_object_unref (m_pipeline); -+} -+ -+void Pipeline::show() -+{ -+ emit showRequested(); -+} -+ -+//redraw the current frame in the drawable -+void Pipeline::doExpose() const -+{ -+ if (m_pipeline && m_glimagesink) -+ gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); -+} -+ -+//post message to g_main_loop in order to call expose -+//in the gt thread -+void Pipeline::exposeRequested() -+{ -+ g_idle_add(cb_expose, this); -+} -+ -+ -+//----------------------------------------------------------------------- -+//----------------------------- static members -------------------------- -+//----------------------------------------------------------------------- -+ -+//client reshape callback -+void Pipeline::reshapeCallback (uint width, uint height) -+{ -+ glViewport(0, 0, width, height); -+ glMatrixMode(GL_PROJECTION); -+ glLoadIdentity(); -+ gluPerspective(45, (gfloat)width/(gfloat)height, 0.1, 100); -+ glMatrixMode(GL_MODELVIEW); -+} -+ -+//client draw callback -+gboolean Pipeline::drawCallback (uint texture, uint width, uint height) -+{ -+ static GLfloat xrot = 0; -+ static GLfloat yrot = 0; -+ static GLfloat zrot = 0; -+ static GTimeVal current_time; -+ static glong last_sec = current_time.tv_sec; -+ static gint nbFrames = 0; -+ -+ g_get_current_time (¤t_time); -+ nbFrames++ ; -+ -+ if ((current_time.tv_sec - last_sec) >= 1) -+ { -+ qDebug ("GRPHIC FPS = %d", nbFrames); -+ nbFrames = 0; -+ last_sec = current_time.tv_sec; -+ } -+ -+ glEnable(GL_DEPTH_TEST); -+ -+ glEnable (GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -+ glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); -+ -+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -+ glMatrixMode(GL_MODELVIEW); -+ glLoadIdentity(); -+ -+ glTranslatef(0.0f,0.0f,-5.0f); -+ -+ glRotatef(xrot,1.0f,0.0f,0.0f); -+ glRotatef(yrot,0.0f,1.0f,0.0f); -+ glRotatef(zrot,0.0f,0.0f,1.0f); -+ -+ glBegin(GL_QUADS); -+ // Front Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ // Back Face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ // Top Face -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ // Bottom Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f((gfloat)width,(gfloat)height); glVertex3f(-1.0f, -1.0f, 1.0f); -+ // Right face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ // Left Face -+ glTexCoord2f((gfloat)width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, (gfloat)height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f((gfloat)width, (gfloat)height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glEnd(); -+ -+ xrot+=0.03f; -+ yrot+=0.02f; -+ zrot+=0.04f; -+ -+ //return TRUE causes a postRedisplay -+ return TRUE; -+} -+ -+gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) -+{ -+ switch (GST_MESSAGE_TYPE (msg)) -+ { -+ case GST_MESSAGE_EOS: -+ qDebug ("End-of-stream"); -+ p->stop(); -+ break; -+ case GST_MESSAGE_ERROR: -+ { -+ gchar *debug = NULL; -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, &debug); -+ qDebug ("Error: %s", err->message); -+ g_error_free (err); -+ if (debug) -+ { -+ qDebug ("Debug deails: %s", debug); -+ g_free (debug); -+ } -+ p->stop(); -+ break; -+ } -+ default: -+ break; -+ } -+ -+ return TRUE; -+} -+ -+void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p) -+{ -+ GstElement* glupload = p->getVideoSink(); -+ GstPad* glpad = gst_element_get_pad (glupload, "sink"); -+ -+ //only link once -+ if (GST_PAD_IS_LINKED (glpad)) -+ { -+ g_object_unref (glpad); -+ return; -+ } -+ -+ GstCaps* caps = gst_pad_get_caps (pad); -+ GstStructure* str = gst_caps_get_structure (caps, 0); -+ if (!g_strrstr (gst_structure_get_name (str), "video")) -+ { -+ gst_caps_unref (caps); -+ gst_object_unref (glpad); -+ return; -+ } -+ gst_caps_unref (caps); -+ -+ GstPadLinkReturn ret = gst_pad_link (pad, glpad); -+ if (ret != GST_PAD_LINK_OK) -+ g_warning ("Failed to link with decodebin!\n"); -+ -+ p->show(); -+} -+ -+gboolean Pipeline::cb_expose (gpointer data) -+{ -+ ((Pipeline*)data)->doExpose(); -+ return FALSE; -+} -+ -+GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) -+{ -+ // ignore anything but 'prepare-xwindow-id' element messages -+ if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) -+ return GST_BUS_PASS; -+ -+ if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) -+ return GST_BUS_PASS; -+ -+ qDebug ("setting xwindow id"); -+ -+ //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. -+ //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. -+ gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); -+ -+ gst_message_unref (message); -+ -+ return GST_BUS_DROP; -+} -diff --git a/tests/examples/qt/qglwidgetxoverlay/pipeline.h b/tests/examples/qt/qglwidgetxoverlay/pipeline.h -new file mode 100644 -index 0000000..0da6d32 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/pipeline.h -@@ -0,0 +1,70 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef PIPELINE_H -+#define PIPELINE_H -+ -+#include -+#include -+//#include -+ -+class Pipeline : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ Pipeline(const WId windId, const QString videoLocation); -+ ~Pipeline(); -+ void start(); -+ void exposeRequested(); -+ void stop(); -+ void unconfigure() const; -+ void show(); -+ GstElement* getVideoSink() { return m_glupload; } ; -+ -+signals: -+ void showRequested(); -+ void stopRequested(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ GMainLoop* m_loop; -+ GstBus* m_bus; -+ GstElement* m_pipeline; -+ GstElement* m_glupload; -+ GstElement* m_glimagesink; -+ static float m_xrot; -+ static float m_yrot; -+ static float m_zrot; -+ -+ void create(); -+ WId winId() const { return m_winId; } -+ void doExpose() const; -+ -+ static void reshapeCallback (uint width, uint height); -+ static gboolean drawCallback (uint texture, uint width, uint height); -+ static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); -+ static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, Pipeline* p); -+ static gboolean cb_expose (gpointer data); -+ static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); -+}; -+ -+#endif -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp -new file mode 100644 -index 0000000..dc01e1e ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.cpp -@@ -0,0 +1,52 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "qglrenderer.h" -+ -+QGLRenderer::QGLRenderer(const QString videoLocation, QWidget *parent) -+ : QGLWidget(parent), -+ m_gt(winId(), videoLocation) -+{ -+ setAttribute(Qt::WA_NoSystemBackground); -+ setVisible(false); -+ move(20, 10); -+ resize(640, 480); -+ -+ QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); -+ QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); -+ QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); -+ QObject::connect(&m_gt, SIGNAL(showRequested()), this, SLOT(show())); -+ m_gt.start(); -+} -+ -+QGLRenderer::~QGLRenderer() -+{ -+} -+ -+void QGLRenderer::paintEvent(QPaintEvent* event) -+{ -+ emit exposeRequested(); -+} -+ -+void QGLRenderer::closeEvent(QCloseEvent* event) -+{ -+ emit closeRequested(); -+ m_gt.wait(); -+} -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h -new file mode 100644 -index 0000000..855631e ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglrenderer.h -@@ -0,0 +1,45 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef QGLRENDERER_H -+#define QGLRENDERER_H -+ -+#include -+#include "gstthread.h" -+ -+class QGLRenderer : public QGLWidget -+{ -+ Q_OBJECT -+ -+public: -+ QGLRenderer(const QString videoLocation, QWidget *parent = 0); -+ ~QGLRenderer(); -+ void paintEvent(QPaintEvent* event); -+ void closeEvent (QCloseEvent* event); -+ -+signals: -+ void exposeRequested(); -+ void closeRequested(); -+ -+private: -+ GstThread m_gt; -+}; -+ -+#endif // QGLRENDERER_H -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri -new file mode 100644 -index 0000000..772d1d4 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pri -@@ -0,0 +1,10 @@ -+#Header files -+HEADERS += ./gstthread.h \ -+ ./pipeline.h \ -+ ./qglrenderer.h -+ -+#Source files -+SOURCES += ./gstthread.cpp \ -+ ./main.cpp \ -+ ./pipeline.cpp \ -+ ./qglrenderer.cpp -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro -new file mode 100644 -index 0000000..b272af3 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.pro -@@ -0,0 +1,57 @@ -+TEMPLATE = app -+TARGET = qglwidgetxoverlay -+DESTDIR = ./debug -+QT += opengl -+CONFIG += debug -+DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB -+ -+win32 { -+DEFINES += WIN32 -+INCLUDEPATH += ./GeneratedFiles \ -+ ./GeneratedFiles/Debug \ -+ C:/gstreamer/include \ -+ C:/gstreamer/include/libxml2 \ -+ C:/gstreamer/include/glib-2.0 \ -+ C:/gstreamer/lib/glib-2.0/include \ -+ C:/gstreamer/include/gstreamer-0.10 -+LIBS += -L"C:/gstreamer/lib" \ -+ -L"C:/gstreamer/bin" \ -+ -lgstreamer-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -llibgstinterfaces-0.10 \ -+ -lopengl32 \ -+ -lglu32 \ -+ -lglew32 -+} -+ -+unix { -+DEFINES += UNIX -+INCLUDEPATH += GeneratedFiles \ -+ GeneratedFiles/Debug \ -+ /usr/include/gstreamer-0.10 \ -+ /usr/local/include/gstreamer-0.10 \ -+ /usr/include/glib-2.0 \ -+ /usr/lib/glib-2.0/include \ -+ /usr/include/libxml2 -+LIBS += -lgstreamer-0.10 \ -+ -lgstinterfaces-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -lGLU \ -+ -lGL \ -+ -lGLEW -+} -+ -+DEPENDPATH += . -+MOC_DIR += ./GeneratedFiles/debug -+OBJECTS_DIR += debug -+UI_DIR += ./GeneratedFiles -+RCC_DIR += ./GeneratedFiles -+ -+#Include file(s) -+include(qglwidgetxoverlay.pri) -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln -new file mode 100644 -index 0000000..fe575f5 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.sln -@@ -0,0 +1,26 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qglwidgetxoverlay", "qglwidgetxoverlay.vcproj", "{F40D2D98-281E-465F-B63F-2D473E1C2616}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {F40D2D98-281E-465F-B63F-2D473E1C2616}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {F40D2D98-281E-465F-B63F-2D473E1C2616}.Debug|Win32.Build.0 = Debug|Win32 -+ {F40D2D98-281E-465F-B63F-2D473E1C2616}.Release|Win32.ActiveCfg = Release|Win32 -+ {F40D2D98-281E-465F-B63F-2D473E1C2616}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj -new file mode 100644 -index 0000000..127f293 ---- /dev/null -+++ b/tests/examples/qt/qglwidgetxoverlay/qglwidgetxoverlay.vcproj -@@ -0,0 +1,320 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/qt/qglwtextureshare/AsyncQueue.h b/tests/examples/qt/qglwtextureshare/AsyncQueue.h -new file mode 100644 -index 0000000..7c6e1af ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/AsyncQueue.h -@@ -0,0 +1,77 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ASYNCQUEUE_H -+#define __ASYNCQUEUE_H -+ -+#include -+#include -+#include -+ -+/** -+ * This is the thread safe implementation of the Queue. It can be -+ * used in classical producers/consumers multithreaded scenario. The -+ * template parameter is the class which can be put/get to/from the -+ * queue. -+ */ -+template -+class AsyncQueue -+{ -+public: -+ AsyncQueue() : waitingReaders(0) {} -+ -+ int size() -+ { -+ QMutexLocker locker(&mutex); -+ return this->buffer.size(); -+ } -+ -+ void put(const T& item) -+ { -+ QMutexLocker locker(&mutex); -+ this->buffer.push_back(item); -+ if(this->waitingReaders) -+ this->bufferIsNotEmpty.wakeOne(); -+ } -+ -+ T get() -+ { -+ QMutexLocker locker(&mutex); -+ while(this->buffer.size() == 0) -+ { -+ ++(this->waitingReaders); -+ this->bufferIsNotEmpty.wait(&mutex); -+ --(this->waitingReaders); -+ } -+ T item = this->buffer.front(); -+ this->buffer.pop_front(); -+ return item; -+ } -+ -+private: -+ typedef QList Container; -+ QMutex mutex; -+ QWaitCondition bufferIsNotEmpty; -+ Container buffer; -+ short waitingReaders; -+}; -+ -+ -+#endif // __ASYNCQUEUE_H -diff --git a/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h b/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h -new file mode 100644 -index 0000000..0d270cf ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/GstGLBufferDef.h -@@ -0,0 +1,40 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __GSTGLBUFFERDEF_H -+#define __GSTGLBUFFERDEF_H -+ -+#include -+ -+/* hack */ -+typedef struct _GstGLBuffer GstGLBuffer; -+struct _GstGLBuffer -+{ -+ GstBuffer buffer; -+ -+ GObject *obj; -+ -+ gint width; -+ gint height; -+ GLuint texture; -+}; -+ -+#endif // __GSTGLBUFFERDEF_H -diff --git a/tests/examples/qt/qglwtextureshare/README b/tests/examples/qt/qglwtextureshare/README -new file mode 100644 -index 0000000..b9cc88d ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/README -@@ -0,0 +1,29 @@ -+This example illustrates how to integrate Gstreamer GL plugin with -+Qt. In particular it uses glupload with fakesink elements to create -+texture with decoded video frame. This texture is shared with -+QGLWidget derived class, which paints a cube with video texture on -+each face. -+ -+To compile the example, include and library paths might be adjusted in -+.pro file according to your installation of the gstreamer and -+corresponding development files. Most probably, the adjustments will -+be necessary on Windows. -+ -+To run the example simply start executable file after compilation. If -+there is no command line arguments provided, then videotestsrc element -+will be used to generate video. The following pipeline will be created -+in this case: -+ -+videotestsrc ! video/x-raw-yuv, width=640, height=480, framerate=(fraction)30/1 ! glupload ! fakesink sync=1 -+ -+It is also possible to provide the video file name as a first command -+line parameter, i.e. ./qglwtextureshare myvideo.ogv . In this case, -+the following pipeline will be executed: -+ -+filesrc location=myvideo.ogv ! decodebin2 ! glupload ! fakesink sync=1 -+ -+I would appreciate any feedback and improvement suggestions for this -+example. -+ -+Have fun :-) -+Andrey Nechypurenko (andreynech@gmail.com) -diff --git a/tests/examples/qt/qglwtextureshare/cocoa_utils.mm b/tests/examples/qt/qglwtextureshare/cocoa_utils.mm -new file mode 100644 -index 0000000..b046b88 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/cocoa_utils.mm -@@ -0,0 +1,26 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2010 Julien Isorce -+ * Copyright (C) 2010 Nuno Santos -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#import -+void *qt_current_nsopengl_context() -+{ -+ return [NSOpenGLContext currentContext]; -+} -diff --git a/tests/examples/qt/qglwtextureshare/glcontextid.h b/tests/examples/qt/qglwtextureshare/glcontextid.h -new file mode 100644 -index 0000000..52550a9 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/glcontextid.h -@@ -0,0 +1,64 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * Copyright (C) 2010 Nuno Santos -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __GLCONTEXTID_H -+#define __GLCONTEXTID_H -+ -+#if defined(Q_OS_WIN32) -+ #define WIN32_LEAN_AND_MEAN -+ #include -+ #include -+ #include -+ #include -+#elif defined (Q_OS_MAC) -+ #include -+ class NSOpenGLContext; -+#else -+ #include -+ //#include -+ #include -+ #include -+#endif -+ -+ -+#if defined(Q_WS_WIN) -+ typedef struct _tagGLContextID -+ { -+ HGLRC contextId; -+ HDC dc; -+ } GLContextID; -+#elif defined(Q_WS_MAC) -+ typedef struct _tagGLContextID -+ { -+ NSOpenGLContext* contextId; -+ } GLContextID; -+#elif defined(Q_WS_X11) -+ typedef struct _tagGLContextID -+ { -+ GLXContext contextId; -+ Display *display; -+ Window wnd; -+ } GLContextID; -+#endif -+ -+#endif // __GLCONTEXTID_H -+ -diff --git a/tests/examples/qt/qglwtextureshare/gstthread.cpp b/tests/examples/qt/qglwtextureshare/gstthread.cpp -new file mode 100644 -index 0000000..94f35c9 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/gstthread.cpp -@@ -0,0 +1,66 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "pipeline.h" -+#include "gstthread.h" -+ -+ -+GstThread::GstThread(const GLContextID &ctxId, -+ const QString &videoLocation, -+ const char *renderer_slot, -+ QObject *parent): -+ QThread(parent), -+ contextId(ctxId), -+ m_videoLocation(videoLocation) -+{ -+ m_pipeline = new Pipeline(this->contextId, m_videoLocation, this); -+ QObject::connect(m_pipeline, SIGNAL(newFrameReady()), this->parent(), renderer_slot, Qt::QueuedConnection); -+} -+ -+GstThread::~GstThread() -+{ -+} -+ -+void GstThread::stop() -+{ -+ if(m_pipeline) -+ m_pipeline->stop(); -+} -+ -+void GstThread::run() -+{ -+ qDebug("Starting gst pipeline"); -+ m_pipeline->start(); //it runs the gmainloop on win32 -+ -+#ifndef Q_WS_WIN -+ //works like the gmainloop on linux (GstEvent are handled) -+ connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); -+ exec(); -+#endif -+ -+ m_pipeline->unconfigure(); -+ -+ m_pipeline = NULL; -+ // This is not a memory leak. Pipeline will be deleted -+ // when the parent object (this) will be destroyed. -+ // We set m_pipeline to NULL to prevent further attempts -+ // to stop already stopped pipeline -+} -diff --git a/tests/examples/qt/qglwtextureshare/gstthread.h b/tests/examples/qt/qglwtextureshare/gstthread.h -new file mode 100644 -index 0000000..76b68d6 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/gstthread.h -@@ -0,0 +1,56 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef GSTTHREAD_H -+#define GSTTHREAD_H -+ -+#include -+#include "glcontextid.h" -+ -+class Pipeline; -+ -+class GstThread : public QThread -+{ -+ Q_OBJECT -+ -+public: -+ GstThread(const GLContextID &ctxId, -+ const QString &videoLocation, -+ const char *renderer_slot, -+ QObject *parent = 0); -+ -+ ~GstThread(); -+ -+ Pipeline *getPipeline() {return this->m_pipeline;} -+ -+public Q_SLOTS: -+ void stop(); -+ -+protected: -+ void run(); -+ -+private: -+ const GLContextID contextId; -+ const QString m_videoLocation; -+ Pipeline* m_pipeline; -+}; -+ -+#endif -diff --git a/tests/examples/qt/qglwtextureshare/main.cpp b/tests/examples/qt/qglwtextureshare/main.cpp -new file mode 100644 -index 0000000..d3128ff ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/main.cpp -@@ -0,0 +1,36 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "qglrenderer.h" -+ -+ -+int -+main(int argc, char *argv[]) -+{ -+ QApplication a(argc, argv); -+ a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); -+ QGLRenderer w(argc > 1 ? argv[1] : ""); -+ w.setWindowTitle("Texture sharing example"); -+ w.show(); -+ return a.exec(); -+} -+ -diff --git a/tests/examples/qt/qglwtextureshare/pipeline.cpp b/tests/examples/qt/qglwtextureshare/pipeline.cpp -new file mode 100644 -index 0000000..ac9a560 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/pipeline.cpp -@@ -0,0 +1,222 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "pipeline.h" -+ -+ -+Pipeline::Pipeline(const GLContextID &ctx, -+ const QString &videoLocation, -+ QObject *parent) -+ : QObject(parent), -+ glctx(ctx), -+ m_videoLocation(videoLocation), -+ m_loop(NULL), -+ m_bus(NULL), -+ m_pipeline(NULL) -+{ -+ this->configure(); -+} -+ -+Pipeline::~Pipeline() -+{ -+} -+ -+void -+Pipeline::configure() -+{ -+ gst_init (NULL, NULL); -+ -+#ifdef Q_WS_WIN -+ m_loop = g_main_loop_new (NULL, FALSE); -+#endif -+ -+ if(m_videoLocation.isEmpty()) -+ { -+ qDebug("No video file specified. Using video test source."); -+ m_pipeline = -+ GST_PIPELINE (gst_parse_launch -+ ("videotestsrc ! " -+ "video/x-raw-yuv, width=640, height=480, " -+ "framerate=(fraction)30/1 ! " -+ "glupload ! gleffects effect=5 ! fakesink sync=1", -+ NULL)); -+ } -+ else -+ { -+ qDebug("Loading video: %s", m_videoLocation.toAscii().data()); -+ m_pipeline = -+ GST_PIPELINE (gst_parse_launch -+ (QString("filesrc location=%1 ! decodebin2 ! " -+ "glupload ! gleffects effect=5 ! " -+ "fakesink sync=1").arg(m_videoLocation).toAscii(), -+ NULL)); -+ } -+ -+ m_bus = gst_pipeline_get_bus(GST_PIPELINE(m_pipeline)); -+ gst_bus_add_watch(m_bus, (GstBusFunc) bus_call, this); -+ gst_object_unref(m_bus); -+ -+ /* Retrieve the last gl element */ -+ GstElement *gl_element = gst_bin_get_by_name(GST_BIN(m_pipeline), "gleffects0"); -+ if(!gl_element) -+ { -+ qDebug ("gl element could not be found"); -+ return; -+ } -+ g_object_set(G_OBJECT (gl_element), "external-opengl-context", -+ this->glctx.contextId, NULL); -+ g_object_unref(gl_element); -+ -+ gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_PAUSED); -+ GstState state = GST_STATE_PAUSED; -+ if(gst_element_get_state(GST_ELEMENT(this->m_pipeline), -+ &state, NULL, GST_CLOCK_TIME_NONE) -+ != GST_STATE_CHANGE_SUCCESS) -+ { -+ qDebug("failed to pause pipeline"); -+ return; -+ } -+} -+ -+void -+Pipeline::start() -+{ -+ // set a callback to retrieve the gst gl textures -+ GstElement *fakesink = gst_bin_get_by_name(GST_BIN(this->m_pipeline), -+ "fakesink0"); -+ g_object_set(G_OBJECT (fakesink), "signal-handoffs", TRUE, NULL); -+ g_signal_connect(fakesink, "handoff", G_CALLBACK (on_gst_buffer), this); -+ g_object_unref(fakesink); -+ -+ GstStateChangeReturn ret = -+ gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_PLAYING); -+ if (ret == GST_STATE_CHANGE_FAILURE) -+ { -+ qDebug("Failed to start up pipeline!"); -+ -+ /* check if there is an error message with details on the bus */ -+ GstMessage* msg = gst_bus_poll(this->m_bus, GST_MESSAGE_ERROR, 0); -+ if (msg) -+ { -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, NULL); -+ qDebug ("ERROR: %s", err->message); -+ g_error_free (err); -+ gst_message_unref (msg); -+ } -+ return; -+ } -+ -+#ifdef Q_WS_WIN -+ g_main_loop_run(m_loop); -+#endif -+} -+ -+/* fakesink handoff callback */ -+void -+Pipeline::on_gst_buffer(GstElement * element, -+ GstBuffer * buf, -+ GstPad * pad, -+ Pipeline* p) -+{ -+ Q_UNUSED(pad) -+ Q_UNUSED(element) -+ -+ /* ref then push buffer to use it in qt */ -+ gst_buffer_ref(buf); -+ p->queue_input_buf.put((GstGLBuffer*)buf); -+ -+ if (p->queue_input_buf.size() > 3) -+ p->notifyNewFrame(); -+ -+ /* pop then unref buffer we have finished to use in qt */ -+ if (p->queue_output_buf.size() > 3) -+ { -+ GstBuffer *buf_old = (GstBuffer*)(p->queue_output_buf.get()); -+ if (buf_old) -+ gst_buffer_unref(buf_old); -+ } -+} -+ -+void -+Pipeline::stop() -+{ -+#ifdef Q_WS_WIN -+ g_main_loop_quit(m_loop); -+#else -+ emit stopRequested(); -+#endif -+} -+ -+void -+Pipeline::unconfigure() -+{ -+ gst_element_set_state(GST_ELEMENT(this->m_pipeline), GST_STATE_NULL); -+ -+ GstBuffer *buf; -+ while(this->queue_input_buf.size()) -+ { -+ buf = (GstBuffer*)(this->queue_input_buf.get()); -+ gst_buffer_unref(buf); -+ } -+ while(this->queue_output_buf.size()) -+ { -+ buf = (GstBuffer*)(this->queue_output_buf.get()); -+ gst_buffer_unref(buf); -+ } -+ -+ gst_object_unref(m_pipeline); -+} -+ -+gboolean -+Pipeline::bus_call(GstBus *bus, GstMessage *msg, Pipeline* p) -+{ -+ Q_UNUSED(bus) -+ -+ switch(GST_MESSAGE_TYPE(msg)) -+ { -+ case GST_MESSAGE_EOS: -+ qDebug("End-of-stream received. Stopping."); -+ p->stop(); -+ break; -+ -+ case GST_MESSAGE_ERROR: -+ { -+ gchar *debug = NULL; -+ GError *err = NULL; -+ gst_message_parse_error(msg, &err, &debug); -+ qDebug("Error: %s", err->message); -+ g_error_free (err); -+ if(debug) -+ { -+ qDebug("Debug deails: %s", debug); -+ g_free(debug); -+ } -+ p->stop(); -+ break; -+ } -+ -+ default: -+ break; -+ } -+ -+ return TRUE; -+} -diff --git a/tests/examples/qt/qglwtextureshare/pipeline.h b/tests/examples/qt/qglwtextureshare/pipeline.h -new file mode 100644 -index 0000000..ce37175 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/pipeline.h -@@ -0,0 +1,68 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef PIPELINE_H -+#define PIPELINE_H -+ -+#include -+#include "glcontextid.h" -+#include "AsyncQueue.h" -+#include "GstGLBufferDef.h" -+ -+ -+class Pipeline : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ Pipeline(const GLContextID &ctx, -+ const QString &videoLocation, -+ QObject *parent); -+ ~Pipeline(); -+ -+ void configure(); -+ void start(); -+ void notifyNewFrame() {emit newFrameReady();} -+ void stop(); -+ void unconfigure(); -+ -+ AsyncQueue queue_input_buf; -+ AsyncQueue queue_output_buf; -+ -+Q_SIGNALS: -+ void newFrameReady(); -+ void stopRequested(); -+ -+private: -+ const GLContextID glctx; -+ const QString m_videoLocation; -+ GMainLoop* m_loop; -+ GstBus* m_bus; -+ GstPipeline* m_pipeline; -+ static float m_xrot; -+ static float m_yrot; -+ static float m_zrot; -+ -+ static void on_gst_buffer(GstElement * element, GstBuffer * buf, GstPad * pad, Pipeline* p); -+ static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); -+}; -+ -+#endif -diff --git a/tests/examples/qt/qglwtextureshare/qglrenderer.cpp b/tests/examples/qt/qglwtextureshare/qglrenderer.cpp -new file mode 100644 -index 0000000..a14f946 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/qglrenderer.cpp -@@ -0,0 +1,214 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * Copyright (C) 2010 Nuno Santos -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "gstthread.h" -+#include "qglrenderer.h" -+#include "pipeline.h" -+ -+#if defined(Q_WS_MAC) -+extern void *qt_current_nsopengl_context(); -+#endif -+ -+QGLRenderer::QGLRenderer(const QString &videoLocation, -+ QWidget *parent) -+ : QGLWidget(parent), -+ videoLoc(videoLocation), -+ gst_thread(NULL), -+ closing(false), -+ frame(NULL) -+{ -+ move(20, 10); -+ resize(640, 480); -+} -+ -+QGLRenderer::~QGLRenderer() -+{ -+} -+ -+void -+QGLRenderer::initializeGL() -+{ -+ GLContextID ctx; -+ -+#if defined(Q_WS_WIN) -+ ctx.contextId = wglGetCurrentContext(); -+ ctx.dc = wglGetCurrentDC(); -+#elif defined (Q_WS_MAC) -+ ctx.contextId = (NSOpenGLContext*) qt_current_nsopengl_context(); -+#elif defined(Q_WS_X11) -+ ctx.contextId = glXGetCurrentContext(); -+ const char *display_name = getenv("DISPLAY"); -+ if(display_name == NULL) -+ { -+ // actually we should look for --display command line parameter here -+ display_name = ":0.0"; -+ } -+ ctx.display = XOpenDisplay(display_name); -+ ctx.wnd = this->winId(); -+#endif -+ -+ // We need to unset Qt context before initializing gst-gl plugin. -+ // Otherwise the attempt to share gst-gl context with Qt will fail. -+ this->doneCurrent(); -+ this->gst_thread = -+ new GstThread(ctx, this->videoLoc, SLOT(newFrame()), this); -+ this->makeCurrent(); -+ -+ QObject::connect(this->gst_thread, SIGNAL(finished()), -+ this, SLOT(close())); -+ QObject::connect(this, SIGNAL(closeRequested()), -+ this->gst_thread, SLOT(stop()), Qt::QueuedConnection); -+ -+ qglClearColor(QApplication::palette().color(QPalette::Active, -+ QPalette::Window)); -+ //glShadeModel(GL_FLAT); -+ //glEnable(GL_DEPTH_TEST); -+ //glEnable(GL_CULL_FACE); -+ glEnable(GL_TEXTURE_RECTANGLE_ARB); // Enable Texture Mapping -+ -+ this->gst_thread->start(); -+} -+ -+void -+QGLRenderer::resizeGL(int width, int height) -+{ -+ // Reset The Current Viewport And Perspective Transformation -+ glViewport(0, 0, width, height); -+ -+ glMatrixMode(GL_PROJECTION); -+ glLoadIdentity(); -+ -+ gluPerspective(45.0f, (GLfloat)width/(GLfloat)height, 0.1f, 100.0f); -+ glMatrixMode(GL_MODELVIEW); -+} -+ -+void -+QGLRenderer::newFrame() -+{ -+ Pipeline *pipeline = this->gst_thread->getPipeline(); -+ if(!pipeline) -+ return; -+ -+ /* frame is initialized as null */ -+ if (this->frame) -+ pipeline->queue_output_buf.put(this->frame); -+ -+ this->frame = pipeline->queue_input_buf.get(); -+ -+ /* direct call to paintGL (no queued) */ -+ this->updateGL(); -+} -+ -+void -+QGLRenderer::paintGL() -+{ -+ static GLfloat xrot = 0; -+ static GLfloat yrot = 0; -+ static GLfloat zrot = 0; -+ -+ if (this->frame) -+ { -+ -+ GLfloat width = this->frame->width; -+ GLfloat height = this->frame->height; -+ -+ glEnable(GL_DEPTH_TEST); -+ -+ glEnable(GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->frame->texture); -+ if(glGetError () != GL_NO_ERROR) -+ { -+ qDebug ("failed to bind texture that comes from gst-gl"); -+ emit closeRequested(); -+ return; -+ } -+ -+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, -+ GL_CLAMP_TO_EDGE); -+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, -+ GL_CLAMP_TO_EDGE); -+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); -+ -+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -+ glMatrixMode(GL_MODELVIEW); -+ glLoadIdentity(); -+ -+ glTranslatef(0.0f,0.0f,-5.0f); -+ -+ glRotatef(xrot,1.0f,0.0f,0.0f); -+ glRotatef(yrot,0.0f,1.0f,0.0f); -+ glRotatef(zrot,0.0f,0.0f,1.0f); -+ -+ glBegin(GL_QUADS); -+ // Front Face -+ glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ // Back Face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f(width, height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f(width, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ // Top Face -+ glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ // Bottom Face -+ glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f( 1.0f, -1.0f, 1.0f); -+ glTexCoord2f(width,height); glVertex3f(-1.0f, -1.0f, 1.0f); -+ // Right face -+ glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f( 1.0f, 1.0f, -1.0f); -+ glTexCoord2f(width, height); glVertex3f( 1.0f, 1.0f, 1.0f); -+ glTexCoord2f(width, 0.0f); glVertex3f( 1.0f, -1.0f, 1.0f); -+ // Left Face -+ glTexCoord2f(width, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f); -+ glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, 1.0f); -+ glTexCoord2f(0.0f, height); glVertex3f(-1.0f, 1.0f, 1.0f); -+ glTexCoord2f(width, height); glVertex3f(-1.0f, 1.0f, -1.0f); -+ glEnd(); -+ -+ xrot+=0.3f; -+ yrot+=0.2f; -+ zrot+=0.4f; -+ -+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); -+ } -+} -+ -+void -+QGLRenderer::closeEvent(QCloseEvent* event) -+{ -+ if(this->closing == false) -+ { -+ this->closing = true; -+ emit closeRequested(); -+ event->ignore(); -+ } -+} -diff --git a/tests/examples/qt/qglwtextureshare/qglrenderer.h b/tests/examples/qt/qglwtextureshare/qglrenderer.h -new file mode 100644 -index 0000000..93622a0 ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/qglrenderer.h -@@ -0,0 +1,59 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2009 Julien Isorce -+ * Copyright (C) 2009 Andrey Nechypurenko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef QGLRENDERER_H -+#define QGLRENDERER_H -+ -+#include -+#include "GstGLBufferDef.h" -+ -+ -+class GstThread; -+ -+class QGLRenderer : public QGLWidget -+{ -+ Q_OBJECT -+ -+public: -+ QGLRenderer(const QString &videoLocation, QWidget *parent = 0); -+ ~QGLRenderer(); -+ -+ void closeEvent(QCloseEvent* event); -+ -+Q_SIGNALS: -+ void closeRequested(); -+ -+public Q_SLOTS: -+ void newFrame(); -+ -+protected: -+ virtual void initializeGL(); -+ virtual void resizeGL(int width, int height); -+ virtual void paintGL(); -+ -+private: -+ QString videoLoc; -+ GstThread *gst_thread; -+ bool closing; -+ GstGLBuffer *frame; -+}; -+ -+#endif // QGLRENDERER_H -diff --git a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro -new file mode 100644 -index 0000000..8e02c7a ---- /dev/null -+++ b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro -@@ -0,0 +1,81 @@ -+TEMPLATE = app -+TARGET = qglwtextureshare -+QT += opengl -+ -+# Add console to the CONFIG to see debug messages printed in -+# the console on Windows -+# CONFIG += console -+DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB -+ -+win32 { -+DEFINES += WIN32 -+INCLUDEPATH += \ -+ C:/gstreamer/include \ -+ C:/gstreamer/include/libxml2 \ -+ C:/gstreamer/include/glib-2.0 \ -+ C:/gstreamer/lib/glib-2.0/include \ -+ C:/gstreamer/include/gstreamer-0.10 -+LIBS += -L"C:/gstreamer/lib" \ -+ -L"C:/gstreamer/bin" \ -+ -lgstreamer-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -lgstinterfaces-0.10 \ -+ -lopengl32 \ -+ -lglu32 \ -+ -lglew32 -+} -+unix:!mac { -+ DEFINES += UNIX -+ INCLUDEPATH += /usr/include/gstreamer-0.10 \ -+ /usr/local/include/gstreamer-0.10 \ -+ /usr/include/glib-2.0 \ -+ /usr/lib/glib-2.0/include \ -+ /usr/include/libxml2 -+ LIBS += -lgstreamer-0.10 \ -+ -lgstinterfaces-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -lGLU \ -+ -lGL \ -+ -lGLEW -+} -+mac { -+ DEFINES += MACOSX -+ INCLUDEPATH += /opt/local/include/ \ -+ /opt/local/include/gstreamer-0.10/ \ -+ /opt/local/include/glib-2.0/ \ -+ /opt/local/lib/glib-2.0/include \ -+ /opt/local/include/libxml2 -+ LIBS += -L/opt/local/lib \ -+ -lGLEW \ -+ -lgstreamer-0.10 \ -+ -lgstapp-0.10 \ -+ -lgstvideo-0.10 \ -+ -lglib-2.0 \ -+ -lgobject-2.0 \ -+ -lcxcore \ -+ -lcvaux \ -+ -lcv -+ OBJECTIVE_SOURCES += cocoa_utils.mm -+ LIBS += -framework AppKit -+} -+DEPENDPATH += . -+ -+# Header files -+HEADERS += gstthread.h \ -+ pipeline.h \ -+ qglrenderer.h \ -+ AsyncQueue.h \ -+ GstGLBufferDef.h \ -+ glcontextid.h -+ -+# Source files -+SOURCES += gstthread.cpp \ -+ main.cpp \ -+ pipeline.cpp \ -+ qglrenderer.cpp -diff --git a/tests/examples/qt/videoxoverlay/gstthread.cpp b/tests/examples/qt/videoxoverlay/gstthread.cpp -new file mode 100644 -index 0000000..5a6370a ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/gstthread.cpp -@@ -0,0 +1,64 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "gstthread.h" -+ -+GstThread::GstThread(const WId winId, const QString videoLocation, QObject *parent): -+ QThread(parent), -+ m_winId(winId), -+ m_videoLocation(videoLocation) -+{ -+} -+ -+GstThread::~GstThread() -+{ -+} -+ -+void GstThread::exposeRequested() -+{ -+ m_pipeline->exposeRequested(); -+} -+ -+void GstThread::resize(int width, int height) -+{ -+ emit resizeRequested(width, height); -+} -+ -+void GstThread::stop() -+{ -+ m_pipeline->stop(); -+} -+ -+void GstThread::run() -+{ -+ m_pipeline = new Pipeline(m_winId, m_videoLocation); -+ connect(m_pipeline, SIGNAL(resizeRequested(int, int)), this, SLOT(resize(int, int))); -+ m_pipeline->start(); //it runs the gmainloop on win32 -+ -+ -+#ifndef WIN32 -+ //works like the gmainloop on linux (GstEvent are handled) -+ connect(m_pipeline, SIGNAL(stopRequested()), this, SLOT(quit())); -+ exec(); -+#endif -+ -+ -+ m_pipeline->unconfigure(); -+} -diff --git a/tests/examples/qt/videoxoverlay/gstthread.h b/tests/examples/qt/videoxoverlay/gstthread.h -new file mode 100644 -index 0000000..d548deb ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/gstthread.h -@@ -0,0 +1,55 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef GSTTHREAD_H -+#define GSTTHREAD_H -+ -+#include -+#include -+ -+#include "pipeline.h" -+ -+class GstThread : public QThread -+{ -+ Q_OBJECT -+ -+public: -+ GstThread(const WId winId, const QString videoLocation, QObject *parent = 0); -+ ~GstThread(); -+ -+public slots: -+ void exposeRequested(); -+ void resize(int width, int height); -+ void stop(); -+ -+signals: -+ void resizeRequested(int width, int height); -+ -+protected: -+ void run(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ Pipeline* m_pipeline; -+ -+}; -+ -+#endif -diff --git a/tests/examples/qt/videoxoverlay/main.cpp b/tests/examples/qt/videoxoverlay/main.cpp -new file mode 100644 -index 0000000..b10814e ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/main.cpp -@@ -0,0 +1,40 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "qrenderer.h" -+#include "gstthread.h" -+ -+int main(int argc, char *argv[]) -+{ -+ QApplication a(argc, argv); -+ a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); -+ -+ QString videolocation = QFileDialog::getOpenFileName(0, "Select a video file", -+ ".", "Format (*.avi *.mkv *.ogg *.asf *.mov)"); -+ -+ if (videolocation.isEmpty()) -+ return -1; -+ -+ QRenderer w(videolocation); -+ w.setWindowTitle("glimagesink implements the gstxoverlay interface"); -+ -+ return a.exec(); -+} -diff --git a/tests/examples/qt/videoxoverlay/pipeline.cpp b/tests/examples/qt/videoxoverlay/pipeline.cpp -new file mode 100644 -index 0000000..9719b12 ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/pipeline.cpp -@@ -0,0 +1,271 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include "pipeline.h" -+ -+Pipeline::Pipeline(const WId id, const QString videoLocation): -+ m_winId(id), -+ m_videoLocation(videoLocation), -+ m_loop(NULL), -+ m_bus(NULL), -+ m_pipeline(NULL), -+ m_glimagesink(NULL) -+{ -+ create(); -+} -+ -+Pipeline::~Pipeline() -+{ -+} -+ -+void Pipeline::create() -+{ -+ qDebug("Loading video: %s", m_videoLocation.toAscii().data()); -+ -+ gst_init (NULL, NULL); -+ -+#ifdef WIN32 -+ m_loop = g_main_loop_new (NULL, FALSE); -+#endif -+ m_pipeline = gst_pipeline_new ("pipeline"); -+ -+ m_bus = gst_pipeline_get_bus (GST_PIPELINE (m_pipeline)); -+ gst_bus_add_watch (m_bus, (GstBusFunc) bus_call, this); -+ gst_bus_set_sync_handler (m_bus, (GstBusSyncHandler) create_window, this); -+ gst_object_unref (m_bus); -+ -+ GstElement* videosrc = gst_element_factory_make ("filesrc", "filesrc0"); -+ GstElement* decodebin = gst_element_factory_make ("decodebin", "decodebin0"); -+ m_glimagesink = gst_element_factory_make ("glimagesink", "sink0"); -+ -+ if (!videosrc || !decodebin || !m_glimagesink ) -+ { -+ qDebug ("one element could not be found"); -+ return; -+ } -+ -+ g_object_set(G_OBJECT(videosrc), "location", m_videoLocation.toAscii().data(), NULL); -+ -+ gst_bin_add_many (GST_BIN (m_pipeline), videosrc, decodebin, m_glimagesink, NULL); -+ -+ gst_element_link_pads (videosrc, "src", decodebin, "sink"); -+ -+ g_signal_connect (decodebin, "new-decoded-pad", G_CALLBACK (cb_new_pad), m_glimagesink); -+ -+ GstPad* pad = gst_element_get_static_pad (m_glimagesink, "sink"); -+ g_signal_connect(pad, "notify::caps", G_CALLBACK(cb_video_size), this); -+ gst_object_unref (pad); -+} -+ -+void Pipeline::seek() -+{ -+ if (gst_element_seek( -+ m_pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, -+ GST_SEEK_TYPE_SET, 2 * GST_SECOND, -+ GST_SEEK_TYPE_SET, 20 * GST_SECOND) -+ ) -+ qDebug ("Success to seek"); -+ else -+ qDebug ("Failed to seek"); -+} -+ -+void Pipeline::setState(GstState state) -+{ -+ GstStateChangeReturn ret = gst_element_set_state (m_pipeline, state); -+ if (ret == GST_STATE_CHANGE_FAILURE) -+ { -+ qDebug ("Failed to start up pipeline!"); -+ -+ /* check if there is an error message with details on the bus */ -+ GstMessage* msg = gst_bus_poll (m_bus, GST_MESSAGE_ERROR, 0); -+ if (msg) -+ { -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, NULL); -+ qDebug ("ERROR: %s", err->message); -+ g_error_free (err); -+ gst_message_unref (msg); -+ } -+ return; -+ } -+} -+ -+void Pipeline::start() -+{ -+ setState(GST_STATE_PLAYING); -+ -+#ifdef WIN32 -+ g_main_loop_run(m_loop); -+#endif -+} -+ -+//we don't want a thread safe stop in this example -+void Pipeline::stop() -+{ -+#ifdef WIN32 -+ g_main_loop_quit(m_loop); -+#else -+ emit stopRequested(); -+#endif -+} -+ -+ -+void Pipeline::unconfigure() const -+{ -+ gst_element_set_state (m_pipeline, GST_STATE_NULL); -+ gst_object_unref (m_pipeline); -+} -+ -+//redraw the current frame in the drawable -+void Pipeline::doExpose() const -+{ -+ if (m_pipeline && m_glimagesink) -+ gst_x_overlay_expose (GST_X_OVERLAY (m_glimagesink)); -+} -+ -+//post message to g_main_loop in order to call expose -+//in the gt thread -+void Pipeline::exposeRequested() -+{ -+ g_idle_add(cb_expose, this); -+} -+ -+//post message to the Qt main loop in order to resize the renderer -+void Pipeline::resize(int width, int height) -+{ -+ emit resizeRequested(width, height); -+} -+ -+ -+//----------------------------------------------------------------------- -+//----------------------------- static members -------------------------- -+//----------------------------------------------------------------------- -+ -+ -+gboolean Pipeline::bus_call (GstBus *bus, GstMessage *msg, Pipeline* p) -+{ -+ -+ switch (GST_MESSAGE_TYPE (msg)) -+ { -+ case GST_MESSAGE_EOS: -+ qDebug ("End-of-stream"); -+ p->stop(); -+ break; -+ case GST_MESSAGE_ERROR: -+ { -+ gchar *debug = NULL; -+ GError *err = NULL; -+ gst_message_parse_error (msg, &err, &debug); -+ qDebug ("Error: %s", err->message); -+ g_error_free (err); -+ if (debug) -+ { -+ qDebug ("Debug deails: %s", debug); -+ g_free (debug); -+ } -+ p->stop(); -+ break; -+ } -+ case GST_MESSAGE_STATE_CHANGED: -+ { -+ GstState oldState = GST_STATE_NULL; -+ GstState currentState = GST_STATE_NULL; -+ GstState pendingState = GST_STATE_NULL; -+ gst_message_parse_state_changed (msg, &oldState, ¤tState, &pendingState); -+ if (oldState == GST_STATE_READY && currentState == GST_STATE_PAUSED && pendingState == GST_STATE_PLAYING) -+ p->seek(); -+ break; -+ } -+ default: -+ break; -+ } -+ -+ return TRUE; -+} -+ -+void Pipeline::cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, GstElement* glimagesink) -+{ -+ GstPad* glpad = gst_element_get_pad (glimagesink, "sink"); -+ -+ //only link once -+ if (GST_PAD_IS_LINKED (glpad)) -+ { -+ g_object_unref (glpad); -+ return; -+ } -+ -+ GstCaps* caps = gst_pad_get_caps (pad); -+ GstStructure* str = gst_caps_get_structure (caps, 0); -+ if (!g_strrstr (gst_structure_get_name (str), "video")) -+ { -+ gst_caps_unref (caps); -+ gst_object_unref (glpad); -+ return; -+ } -+ gst_caps_unref (caps); -+ -+ GstPadLinkReturn ret = gst_pad_link (pad, glpad); -+ if (ret != GST_PAD_LINK_OK) -+ g_warning ("Failed to link with decodebin!\n"); -+} -+ -+void Pipeline::cb_video_size (GstPad* pad, GParamSpec* pspec, Pipeline* p) -+{ -+ GstCaps* caps = gst_pad_get_negotiated_caps(pad); -+ if (caps) -+ { -+ qDebug ("negotiated caps : %s", gst_caps_to_string(caps)) ; -+ const GstStructure* str = gst_caps_get_structure (caps, 0); -+ gint width = 0; -+ gint height = 0; -+ if (gst_structure_get_int (str, "width", &width) && -+ gst_structure_get_int (str, "height", &height) ) -+ p->resize(width, height); -+ gst_caps_unref(caps) ; -+ } -+} -+ -+gboolean Pipeline::cb_expose (gpointer data) -+{ -+ ((Pipeline*)data)->doExpose(); -+ return FALSE; -+} -+ -+ -+GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const Pipeline* p) -+{ -+ // ignore anything but 'prepare-xwindow-id' element messages -+ if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) -+ return GST_BUS_PASS; -+ -+ if (!gst_structure_has_name (message->structure, "prepare-xwindow-id")) -+ return GST_BUS_PASS; -+ -+ qDebug ("setting xwindow id"); -+ -+ //Passing 0 as the xwindow_id will tell the overlay to stop using that window and create an internal one. -+ //In the directdrawsink's gst_x_overlay_set_window_handle implementation, xwindow_id (parameter 2) is casted to HWND before it used. -+ gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); -+ -+ gst_message_unref (message); -+ -+ return GST_BUS_DROP; -+} -diff --git a/tests/examples/qt/videoxoverlay/pipeline.h b/tests/examples/qt/videoxoverlay/pipeline.h -new file mode 100644 -index 0000000..139e16e ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/pipeline.h -@@ -0,0 +1,66 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef PIPELINE_H -+#define PIPELINE_H -+ -+#include -+#include -+//#include -+ -+class Pipeline : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ Pipeline(const WId windId, const QString videoLocation); -+ ~Pipeline(); -+ void start(); -+ void exposeRequested(); -+ void resize(int width, int height); -+ void stop(); -+ void unconfigure() const; -+ -+signals: -+ void resizeRequested(int width, int height); -+ void stopRequested(); -+ -+private: -+ const WId m_winId; -+ const QString m_videoLocation; -+ GMainLoop* m_loop; -+ GstBus* m_bus; -+ GstElement* m_pipeline; -+ GstElement* m_glimagesink; -+ -+ void create(); -+ void seek(); -+ void setState(GstState state); -+ WId winId() const { return m_winId; } -+ void doExpose () const; -+ -+ static gboolean bus_call (GstBus *bus, GstMessage *msg, Pipeline* p); -+ static void cb_new_pad (GstElement* decodebin, GstPad* pad, gboolean last, GstElement* glimagesink); -+ static void cb_video_size (GstPad* pad, GParamSpec* pspec, Pipeline* p); -+ static gboolean cb_expose (gpointer data); -+ static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, const Pipeline* pipeline); -+}; -+ -+#endif -diff --git a/tests/examples/qt/videoxoverlay/qrenderer.cpp b/tests/examples/qt/videoxoverlay/qrenderer.cpp -new file mode 100644 -index 0000000..d83a0ba ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/qrenderer.cpp -@@ -0,0 +1,57 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "qrenderer.h" -+ -+QRenderer::QRenderer(const QString videoLocation, QWidget *parent, Qt::WFlags flags) -+ : QWidget(parent, flags), -+ m_gt(winId(), videoLocation) -+{ -+ setAttribute(Qt::WA_NoSystemBackground); -+ setVisible(false); -+ move(20, 10); -+ -+ QObject::connect(&m_gt, SIGNAL(resizeRequested(int, int)), this, SLOT(resizeRequested(int, int))); -+ QObject::connect(&m_gt, SIGNAL(finished()), this, SLOT(close())); -+ QObject::connect(this, SIGNAL(exposeRequested()), &m_gt, SLOT(exposeRequested())); -+ QObject::connect(this, SIGNAL(closeRequested()), &m_gt, SLOT(stop()), Qt::DirectConnection); -+ m_gt.start(); -+} -+ -+QRenderer::~QRenderer() -+{ -+} -+ -+void QRenderer::paintEvent(QPaintEvent* event) -+{ -+ emit exposeRequested(); -+} -+ -+void QRenderer::closeEvent(QCloseEvent* event) -+{ -+ emit closeRequested(); -+ m_gt.wait(); -+} -+ -+void QRenderer::resizeRequested(int width, int height) -+{ -+ resize(width, height); -+ setVisible(true); -+} -diff --git a/tests/examples/qt/videoxoverlay/qrenderer.h b/tests/examples/qt/videoxoverlay/qrenderer.h -new file mode 100644 -index 0000000..d20cd13 ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/qrenderer.h -@@ -0,0 +1,48 @@ -+/* -+ * GStreamer -+ * Copyright (C) 2008-2009 Julien Isorce -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef QRENDERER_H -+#define QRENDERER_H -+ -+#include -+#include "gstthread.h" -+ -+class QRenderer : public QWidget -+{ -+ Q_OBJECT -+ -+public: -+ QRenderer(const QString videoLocation, QWidget *parent = 0, Qt::WFlags flags = 0); -+ ~QRenderer(); -+ void paintEvent(QPaintEvent* event); -+ void closeEvent (QCloseEvent* event); -+ -+public slots: -+ void resizeRequested(int width, int height); -+ -+signals: -+ void exposeRequested(); -+ void closeRequested(); -+ -+private: -+ GstThread m_gt; -+}; -+ -+#endif // QRENDERER_H -diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.pri b/tests/examples/qt/videoxoverlay/videoxoverlay.pri -new file mode 100644 -index 0000000..75b23cd ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/videoxoverlay.pri -@@ -0,0 +1,10 @@ -+#Header files -+HEADERS += ./gstthread.h \ -+ ./pipeline.h \ -+ ./qrenderer.h -+ -+#Source files -+SOURCES += ./gstthread.cpp \ -+ ./main.cpp \ -+ ./pipeline.cpp \ -+ ./qrenderer.cpp -diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.pro b/tests/examples/qt/videoxoverlay/videoxoverlay.pro -new file mode 100644 -index 0000000..15fd688 ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/videoxoverlay.pro -@@ -0,0 +1,53 @@ -+TEMPLATE = app -+TARGET = videoxoverlay -+DESTDIR = ./Debug -+CONFIG += debug -+DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB -+ -+win32 { -+DEFINES += WIN32 -+INCLUDEPATH += ./GeneratedFiles \ -+ ./GeneratedFiles/Debug \ -+ C:/gstreamer/include \ -+ C:/gstreamer/include/libxml2 \ -+ C:/gstreamer/include/glib-2.0 \ -+ C:/gstreamer/lib/glib-2.0/include \ -+ C:/gstreamer/include/gstreamer-0.10 -+LIBS += -L"C:/gstreamer/bin" \ -+ -L"C:/gstreamer/lib" \ -+ -lgstinterfaces-0.10 \ -+ -lgstreamer-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 -+} -+ -+unix { -+DEFINES += UNIX -+INCLUDEPATH += GeneratedFiles \ -+ GeneratedFiles/Debug \ -+ /usr/include/gstreamer-0.10 \ -+ /usr/local/include/gstreamer-0.10 \ -+ /usr/include/glib-2.0 \ -+ /usr/lib/glib-2.0/include \ -+ /usr/include/libxml2 -+LIBS += -lgstreamer-0.10 \ -+ -lgstinterfaces-0.10 \ -+ -lglib-2.0 \ -+ -lgmodule-2.0 \ -+ -lgobject-2.0 \ -+ -lgthread-2.0 \ -+ -lGLU \ -+ -lGL \ -+ -lGLEW -+} -+ -+DEPENDPATH += . -+MOC_DIR += ./GeneratedFiles/debug -+OBJECTS_DIR += debug -+UI_DIR += ./GeneratedFiles -+RCC_DIR += ./GeneratedFiles -+ -+#Include file(s) -+include(videoxoverlay.pri) -diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.sln b/tests/examples/qt/videoxoverlay/videoxoverlay.sln -new file mode 100644 -index 0000000..2c81e94 ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/videoxoverlay.sln -@@ -0,0 +1,26 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoxoverlay", "videoxoverlay.vcproj", "{7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Debug|Win32.Build.0 = Debug|Win32 -+ {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Release|Win32.ActiveCfg = Release|Win32 -+ {7B8654F9-23A9-4C88-A751-6BBE09ED4CAF}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+ GlobalSection(Qt) = preSolution -+ Integration = True -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj b/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj -new file mode 100644 -index 0000000..d61df7d ---- /dev/null -+++ b/tests/examples/qt/videoxoverlay/videoxoverlay.vcproj -@@ -0,0 +1,320 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/examples/sdl/Makefile.in b/tests/examples/sdl/Makefile.in -index d8ce596..528893d 100644 ---- a/tests/examples/sdl/Makefile.in -+++ b/tests/examples/sdl/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -34,6 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - noinst_PROGRAMS = $(am__EXEEXT_1) - - #works on win32 and X -@@ -45,7 +46,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -86,8 +86,8 @@ sdlshare_OBJECTS = $(am_sdlshare_OBJECTS) - am__DEPENDENCIES_1 = - @HAVE_SDL_TRUE@sdlshare_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - @HAVE_SDL_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --AM_V_lt = $(am__v_lt_@AM_V@) --am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+AM_V_lt = $(am__v_lt_$(V)) -+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - sdlshare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sdlshare_CFLAGS) \ -@@ -102,21 +102,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --AM_V_CC = $(am__v_CC_@AM_V@) --am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+AM_V_CC = $(am__v_CC_$(V)) -+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --AM_V_CCLD = $(am__v_CCLD_@AM_V@) --am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+AM_V_CCLD = $(am__v_CCLD_$(V)) -+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) - am__v_CCLD_0 = @echo " CCLD " $@; --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(sdlshare_SOURCES) - DIST_SOURCES = $(am__sdlshare_SOURCES_DIST) -@@ -169,6 +169,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -200,6 +201,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -207,8 +210,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -281,7 +286,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -326,6 +331,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -391,7 +397,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -445,7 +455,7 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --sdlshare$(EXEEXT): $(sdlshare_OBJECTS) $(sdlshare_DEPENDENCIES) $(EXTRA_sdlshare_DEPENDENCIES) -+sdlshare$(EXEEXT): $(sdlshare_OBJECTS) $(sdlshare_DEPENDENCIES) - @rm -f sdlshare$(EXEEXT) - $(AM_V_CCLD)$(sdlshare_LINK) $(sdlshare_OBJECTS) $(sdlshare_LDADD) $(LIBS) - -@@ -460,37 +470,42 @@ distclean-compile: - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - sdlshare-sdlshare.o: sdlshare.c - @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 - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sdlshare-sdlshare.Tpo $(DEPDIR)/sdlshare-sdlshare.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sdlshare.c' object='sdlshare-sdlshare.o' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdlshare.c' object='sdlshare-sdlshare.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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 -+@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 - - sdlshare-sdlshare.obj: sdlshare.c - @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` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sdlshare-sdlshare.Tpo $(DEPDIR)/sdlshare-sdlshare.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sdlshare.c' object='sdlshare-sdlshare.obj' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdlshare.c' object='sdlshare-sdlshare.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@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` -+@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` - - mostlyclean-libtool: - -rm -f *.lo -@@ -594,15 +609,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/examples/sdl/sdl.sln b/tests/examples/sdl/sdl.sln -new file mode 100644 -index 0000000..0ecdd00 ---- /dev/null -+++ b/tests/examples/sdl/sdl.sln -@@ -0,0 +1,20 @@ -+? -+Microsoft Visual Studio Solution File, Format Version 10.00 -+# Visual Studio 2008 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdlshare", "sdlshare.vcproj", "{2C29F5A2-5982-428A-8068-9A5788FD2277}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|Win32 = Debug|Win32 -+ Release|Win32 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {2C29F5A2-5982-428A-8068-9A5788FD2277}.Debug|Win32.ActiveCfg = Debug|Win32 -+ {2C29F5A2-5982-428A-8068-9A5788FD2277}.Debug|Win32.Build.0 = Debug|Win32 -+ {2C29F5A2-5982-428A-8068-9A5788FD2277}.Release|Win32.ActiveCfg = Release|Win32 -+ {2C29F5A2-5982-428A-8068-9A5788FD2277}.Release|Win32.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal -diff --git a/tests/examples/sdl/sdlshare.vcproj b/tests/examples/sdl/sdlshare.vcproj -new file mode 100644 -index 0000000..0a837af ---- /dev/null -+++ b/tests/examples/sdl/sdlshare.vcproj -@@ -0,0 +1,199 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/icles/Makefile.in b/tests/icles/Makefile.in -index 8680405..0b38f41 100644 ---- a/tests/icles/Makefile.in -+++ b/tests/icles/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,6 +33,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+target_triplet = @target@ - subdir = tests/icles - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -40,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ - $(top_srcdir)/common/m4/as-compiler-flag.m4 \ - $(top_srcdir)/common/m4/as-libtool.m4 \ -- $(top_srcdir)/common/m4/as-objc.m4 \ - $(top_srcdir)/common/m4/as-python.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ - $(top_srcdir)/common/m4/as-version.m4 \ -@@ -73,11 +73,11 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --AM_V_GEN = $(am__v_GEN_@AM_V@) --am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+AM_V_GEN = $(am__v_GEN_$(V)) -+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --AM_V_at = $(am__v_at_@AM_V@) --am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+AM_V_at = $(am__v_at_$(V)) -+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = -@@ -128,6 +128,7 @@ ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ - ERROR_CXXFLAGS = @ERROR_CXXFLAGS@ -+ERROR_OBJCFLAGS = @ERROR_OBJCFLAGS@ - EXEEXT = @EXEEXT@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ -@@ -159,6 +160,8 @@ GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@ - GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@ - GST_CURRENT = @GST_CURRENT@ - GST_CXXFLAGS = @GST_CXXFLAGS@ -+GST_FSL_CFLAGS = @GST_FSL_CFLAGS@ -+GST_FSL_LIBS = @GST_FSL_LIBS@ - GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@ - GST_LIBS = @GST_LIBS@ - GST_LIBVERSION = @GST_LIBVERSION@ -@@ -166,8 +169,10 @@ GST_LIB_LDFLAGS = @GST_LIB_LDFLAGS@ - GST_LICENSE = @GST_LICENSE@ - GST_LT_LDFLAGS = @GST_LT_LDFLAGS@ - GST_MAJORMINOR = @GST_MAJORMINOR@ -+GST_OBJCFLAGS = @GST_OBJCFLAGS@ - GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@ - GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@ -+GST_OPTION_OBJCFLAGS = @GST_OPTION_OBJCFLAGS@ - GST_PACKAGE_NAME = @GST_PACKAGE_NAME@ - GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@ - GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -@@ -240,7 +245,7 @@ NM = @NM@ - NMEDIT = @NMEDIT@ - OBJC = @OBJC@ - OBJCDEPMODE = @OBJCDEPMODE@ --OBJC_LDFLAGS = @OBJC_LDFLAGS@ -+OBJCFLAGS = @OBJCFLAGS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_ES2 = @OPENGL_ES2@ -@@ -285,6 +290,7 @@ VALGRIND_PATH = @VALGRIND_PATH@ - VERSION = @VERSION@ - WARNING_CFLAGS = @WARNING_CFLAGS@ - WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WARNING_OBJCFLAGS = @WARNING_OBJCFLAGS@ - XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ - XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ - XGETTEXT = @XGETTEXT@ -@@ -350,7 +356,11 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+target = @target@ - target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -444,15 +454,10 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- if test -z '$(STRIP)'; then \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- install; \ -- else \ -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -- fi -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -diff --git a/tests/pipelines b/tests/pipelines -new file mode 100644 -index 0000000..f0739ce ---- /dev/null -+++ b/tests/pipelines -@@ -0,0 +1,79 @@ -+//list of pipelines that show the gst-plugins-gl capabilities -+//(can use gst-launch-0.10 --gst-debug=gldisplay:3 pipeline) -+ -+gst-launch-0.10 videotestsrc ! glimagesink -+gst-launch-0.10 videotestsrc num_buffers = 200 ! glimagesink -+gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)I420, width=201, height=103" ! glimagesink -+gst-launch-0.10 videotestsrc ! "video/x-raw-rgb, width=640, height=480" ! glimagesink -+gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YV12" ! glimagesink -+ -+gst-launch-0.10 gltestsrc ! glimagesink -+gst-launch-0.10 gltestsrc ! "video/x-raw-gl, width=720, height=576" ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=720, height=576" ! glimagesink -+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 -+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 -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glfiltercube ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glimagesink force-aspect-ratio=1 -+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 -+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 -+gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=720, height=576" ! glfiltercube ! "video/x-raw-gl, width=320, height=240" ! glimagesink -+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 -+gst-launch-0.10 videotestsrc ! "video/x-raw-rgb, width=320, height=240" ! glupload ! "video/x-raw-gl, width=800, height=600" ! glimagesink -+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 -+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 -+gst-launch-0.10 gltestsrc ! glfiltercube ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfilterapp ! glimagesink -+gst-launch-0.10 gltestsrc ! glfilterapp ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glcolorscale ! ximagesink -+gst-launch-0.10 videotestsrc ! glcolorscale ! glimagesink -+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 -+gst-launch-0.10 gltestsrc ! gldownload ! glcolorscale ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! gldownload ! ximagesink -+gst-launch-0.10 videotestsrc ! glupload ! gldownload ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! gldownload ! "video/x-raw-yuv, format=(fourcc)UYVY" ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! gldownload ! "video/x-raw-yuv, format=(fourcc)AYUV" ! glimagesink -+ -+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" -+gst-launch-0.10 gltestsrc ! glfiltercube ! gldownload ! ximagesink -+gst-launch-0.10 videotestsrc ! glupload ! gldownload ! glupload ! gldownload ! glupload ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glimagesink t. ! queue ! glimagesink -+gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glupload ! glfiltercube ! glimagesink -+gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glupload ! glfiltercube ! glimagesink t. ! queue ! glcolorscale ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! glfilterlaplacian ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! glfilterlaplacian ! glfiltercube ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfilterblur ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfiltercube ! gleffects effect=3 ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glbumper location=normalmap.png ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! glbumper location=bumpwall.png ! "video/x-raw-gl, width=1200, height=800" ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! glupload ! glfilterglass ! glimagesink -+gst-launch-0.10 videotestsrc ! glupload ! "video/x-raw-gl, width=640, height=480" ! glfilterglass ! glimagesink -+ -+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. -+ -+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 -+ -+gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, pixel-aspect-ratio=(fraction)5/2" ! glimagesink -+ -+gst-launch-0.10 videotestsrc ! "video/x-raw-yuv,format=(fourcc)I420,width=720,height=576,pixel-aspect-ratio=(fraction)64/45" ! glupload ! glimagesink -+ -+gst-launch-0.10 audiotestsrc ! libvisual_gl_projectM ! "video/x-raw-gl,width=800, height=600" ! gleffects effect=tunnel ! glimagesink -+ -+gst-launch-0.10 audiotestsrc ! libvisual_gl_lv_gltest ! gldownload ! glimagesink -+ -+gst-launch-0.10 audiotestsrc ! libvisual_gl_lv_gltest ! gldownload ! ximagesink -+ -+// OPENGL ES 2.0 -+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 -diff --git a/unix/codeblocks/gstopengl/gstopengl.cbp b/unix/codeblocks/gstopengl/gstopengl.cbp -new file mode 100644 -index 0000000..7e5b6a6 ---- /dev/null -+++ b/unix/codeblocks/gstopengl/gstopengl.cbp -@@ -0,0 +1,236 @@ -+ -+ -+ -+ -+ -+ -diff --git a/unixES/codeblocks/gstopengl.cbp b/unixES/codeblocks/gstopengl.cbp -new file mode 100644 -index 0000000..4e4dec1 ---- /dev/null -+++ b/unixES/codeblocks/gstopengl.cbp -@@ -0,0 +1,137 @@ -+ -+ -+ -+ -+ -+ -diff --git a/win32/codeblock/gstopengl.cbp b/win32/codeblock/gstopengl.cbp -new file mode 100644 -index 0000000..2a1f875 ---- /dev/null -+++ b/win32/codeblock/gstopengl.cbp -@@ -0,0 +1,242 @@ -+ -+ -+ -+ -+ -+ -diff --git a/win32/common/config.h b/win32/common/config.h -new file mode 100644 -index 0000000..d02b566 ---- /dev/null -+++ b/win32/common/config.h -@@ -0,0 +1,232 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+/* This copy of config.h.in is specifically for win32 Visual Studio builds */ -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+#undef ENABLE_NLS -+ -+/* gettext package name */ -+#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" -+ -+/* PREFIX - specifically added for Windows for easier moving */ -+#define PREFIX "C:\\gstreamer" -+ -+/* Location of registry */ -+#define GST_CACHE_DIR PREFIX "\\var\\cache" -+ -+/* macro to use to show function name */ -+#undef GST_FUNCTION -+ -+/* Defined if gcov is enabled to force a rebuild due to config.h changing */ -+#undef GST_GCOV_ENABLED -+ -+/* Default errorlevel to use */ -+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR -+ -+/* GStreamer license */ -+#define GST_LICENSE "LGPL" -+ -+/* package name in plugins */ -+#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" -+ -+/* package origin */ -+#define GST_PACKAGE_ORIGIN "Unknown package origin" -+ -+/* Define if the host CPU is an Alpha */ -+#undef HAVE_CPU_ALPHA -+ -+/* Define if the host CPU is an ARM */ -+#undef HAVE_CPU_ARM -+ -+/* Define if the host CPU is a HPPA */ -+#undef HAVE_CPU_HPPA -+ -+/* Define if the host CPU is an x86 */ -+#undef HAVE_CPU_I386 -+ -+/* Define if the host CPU is a IA64 */ -+#undef HAVE_CPU_IA64 -+ -+/* Define if the host CPU is a M68K */ -+#undef HAVE_CPU_M68K -+ -+/* Define if the host CPU is a MIPS */ -+#undef HAVE_CPU_MIPS -+ -+/* Define if the host CPU is a PowerPC */ -+#undef HAVE_CPU_PPC -+ -+/* Define if the host CPU is a S390 */ -+#undef HAVE_CPU_S390 -+ -+/* Define if the host CPU is a SPARC */ -+#undef HAVE_CPU_SPARC -+ -+/* Define if the host CPU is a x86_64 */ -+#undef HAVE_CPU_X86_64 -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. -+ */ -+#undef HAVE_DCGETTEXT -+ -+/* Defined if we have dladdr () */ -+#undef HAVE_DLADDR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the `fgetpos' function. */ -+#define HAVE_FGETPOS 1 -+ -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ -+/* Define to 1 if you have the `fsetpos' function. */ -+#define HAVE_FSETPOS 1 -+ -+/* Define to 1 if you have the `ftello' function. */ -+#undef HAVE_FTELLO -+ -+/* defined if the compiler implements __func__ */ -+#undef HAVE_FUNC -+ -+/* defined if the compiler implements __FUNCTION__ */ -+#undef HAVE_FUNCTION -+ -+/* Define to 1 if you have the `getpagesize' function. */ -+#undef HAVE_GETPAGESIZE -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#undef HAVE_GETTEXT -+ -+/* Define if you have the iconv() function. */ -+#undef HAVE_ICONV -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define if libxml2 is available */ -+#define HAVE_LIBXML2 1 -+ -+/* defined if we have makecontext () */ -+#undef HAVE_MAKECONTEXT -+ -+/* Use libjpeg */ -+#define HAVE_JPEG 1 -+ -+/* Use libpng */ -+#define HAVE_PNG 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have a working `mmap' system call. */ -+#undef HAVE_MMAP -+ -+/* defined if the compiler implements __PRETTY_FUNCTION__ */ -+#undef HAVE_PRETTY_FUNCTION -+ -+/* Defined if we have register_printf_function () */ -+#undef HAVE_PRINTF_EXTENSION -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_PROCESS_H 1 -+ -+/* Define if RDTSC is available */ -+#undef HAVE_RDTSC -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#undef HAVE_SIGACTION -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_SOCKET_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UCONTEXT_H -+ -+/* defined if unaligned memory access works correctly */ -+#undef HAVE_UNALIGNED_ACCESS -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define if valgrind should be used */ -+#undef HAVE_VALGRIND -+ -+/* Defined if compiling for Windows */ -+#define HAVE_WIN32 1 -+ -+/* library dir */ -+#define LIBDIR PREFIX "\\lib" -+ -+/* gettext locale dir */ -+#define LOCALEDIR PREFIX "\\share\\locale" -+ -+/* Name of package */ -+#define PACKAGE "gst-plugins-gl" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* directory where plugins are located */ -+#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define if we should poison deallocated memory */ -+#undef USE_POISONING -+ -+/* Version number of package */ -+#define VERSION "0.10.0.1" -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+#undef WORDS_BIGENDIAN -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+/* #undef inline */ -+ -+#define GST_PACKAGE "Gst-plugins-gl" -+#define PACKAGE "gst-plugins-gl" -+#define GST_ORIGIN "gstreamer.freedesktop.org" -diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj -new file mode 100644 -index 0000000..a7810db ---- /dev/null -+++ b/win32/vs9/libgstopengl.vcproj -@@ -0,0 +1,508 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/winCE/common/config.h b/winCE/common/config.h -new file mode 100644 -index 0000000..d8a79d5 ---- /dev/null -+++ b/winCE/common/config.h -@@ -0,0 +1,226 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+/* This copy of config.h.in is specifically for win32 Visual Studio builds */ -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+#undef ENABLE_NLS -+ -+/* gettext package name */ -+#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" -+ -+/* PREFIX - specifically added for Windows for easier moving */ -+#define PREFIX "C:\\gstreamer" -+ -+/* Location of registry */ -+#define GST_CACHE_DIR PREFIX "\\var\\cache" -+ -+/* macro to use to show function name */ -+#undef GST_FUNCTION -+ -+/* Defined if gcov is enabled to force a rebuild due to config.h changing */ -+#undef GST_GCOV_ENABLED -+ -+/* Default errorlevel to use */ -+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR -+ -+/* GStreamer license */ -+#define GST_LICENSE "LGPL" -+ -+/* package name in plugins */ -+#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" -+ -+/* package origin */ -+#define GST_PACKAGE_ORIGIN "Unknown package origin" -+ -+/* Define if the host CPU is an Alpha */ -+#undef HAVE_CPU_ALPHA -+ -+/* Define if the host CPU is an ARM */ -+#undef HAVE_CPU_ARM -+ -+/* Define if the host CPU is a HPPA */ -+#undef HAVE_CPU_HPPA -+ -+/* Define if the host CPU is an x86 */ -+#undef HAVE_CPU_I386 -+ -+/* Define if the host CPU is a IA64 */ -+#undef HAVE_CPU_IA64 -+ -+/* Define if the host CPU is a M68K */ -+#undef HAVE_CPU_M68K -+ -+/* Define if the host CPU is a MIPS */ -+#undef HAVE_CPU_MIPS -+ -+/* Define if the host CPU is a PowerPC */ -+#undef HAVE_CPU_PPC -+ -+/* Define if the host CPU is a S390 */ -+#undef HAVE_CPU_S390 -+ -+/* Define if the host CPU is a SPARC */ -+#undef HAVE_CPU_SPARC -+ -+/* Define if the host CPU is a x86_64 */ -+#undef HAVE_CPU_X86_64 -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. -+ */ -+#undef HAVE_DCGETTEXT -+ -+/* Defined if we have dladdr () */ -+#undef HAVE_DLADDR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the `fgetpos' function. */ -+#define HAVE_FGETPOS 1 -+ -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ -+/* Define to 1 if you have the `fsetpos' function. */ -+#define HAVE_FSETPOS 1 -+ -+/* Define to 1 if you have the `ftello' function. */ -+#undef HAVE_FTELLO -+ -+/* defined if the compiler implements __func__ */ -+#undef HAVE_FUNC -+ -+/* defined if the compiler implements __FUNCTION__ */ -+#undef HAVE_FUNCTION -+ -+/* Define to 1 if you have the `getpagesize' function. */ -+#undef HAVE_GETPAGESIZE -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#undef HAVE_GETTEXT -+ -+/* Define if you have the iconv() function. */ -+#undef HAVE_ICONV -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define if libxml2 is available */ -+#define HAVE_LIBXML2 1 -+ -+/* defined if we have makecontext () */ -+#undef HAVE_MAKECONTEXT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have a working `mmap' system call. */ -+#undef HAVE_MMAP -+ -+/* defined if the compiler implements __PRETTY_FUNCTION__ */ -+#undef HAVE_PRETTY_FUNCTION -+ -+/* Defined if we have register_printf_function () */ -+#undef HAVE_PRINTF_EXTENSION -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_PROCESS_H 1 -+ -+/* Define if RDTSC is available */ -+#undef HAVE_RDTSC -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#undef HAVE_SIGACTION -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_SOCKET_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UCONTEXT_H -+ -+/* defined if unaligned memory access works correctly */ -+#undef HAVE_UNALIGNED_ACCESS -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define if valgrind should be used */ -+#undef HAVE_VALGRIND -+ -+/* Defined if compiling for Windows */ -+#define HAVE_WIN32 1 -+ -+/* library dir */ -+#define LIBDIR PREFIX "\\lib" -+ -+/* gettext locale dir */ -+#define LOCALEDIR PREFIX "\\share\\locale" -+ -+/* Name of package */ -+#define PACKAGE "gst-plugins-gl" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* directory where plugins are located */ -+#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define if we should poison deallocated memory */ -+#undef USE_POISONING -+ -+/* Version number of package */ -+#define VERSION "0.10.0.1" -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+#undef WORDS_BIGENDIAN -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+/* #undef inline */ -+ -+#define GST_PACKAGE "Gst-plugins-gl" -+#define PACKAGE "gst-plugins-gl" -+#define GST_ORIGIN "gstreamer.freedesktop.org" -diff --git a/winCE/common/config.h.in b/winCE/common/config.h.in -new file mode 100644 -index 0000000..d8a79d5 ---- /dev/null -+++ b/winCE/common/config.h.in -@@ -0,0 +1,226 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+/* This copy of config.h.in is specifically for win32 Visual Studio builds */ -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+#undef ENABLE_NLS -+ -+/* gettext package name */ -+#define GETTEXT_PACKAGE "gst-plugins-gl-0.10" -+ -+/* PREFIX - specifically added for Windows for easier moving */ -+#define PREFIX "C:\\gstreamer" -+ -+/* Location of registry */ -+#define GST_CACHE_DIR PREFIX "\\var\\cache" -+ -+/* macro to use to show function name */ -+#undef GST_FUNCTION -+ -+/* Defined if gcov is enabled to force a rebuild due to config.h changing */ -+#undef GST_GCOV_ENABLED -+ -+/* Default errorlevel to use */ -+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR -+ -+/* GStreamer license */ -+#define GST_LICENSE "LGPL" -+ -+/* package name in plugins */ -+#define GST_PACKAGE_NAME "GStreamer OpengGL Plug-ins GIT/prerelease" -+ -+/* package origin */ -+#define GST_PACKAGE_ORIGIN "Unknown package origin" -+ -+/* Define if the host CPU is an Alpha */ -+#undef HAVE_CPU_ALPHA -+ -+/* Define if the host CPU is an ARM */ -+#undef HAVE_CPU_ARM -+ -+/* Define if the host CPU is a HPPA */ -+#undef HAVE_CPU_HPPA -+ -+/* Define if the host CPU is an x86 */ -+#undef HAVE_CPU_I386 -+ -+/* Define if the host CPU is a IA64 */ -+#undef HAVE_CPU_IA64 -+ -+/* Define if the host CPU is a M68K */ -+#undef HAVE_CPU_M68K -+ -+/* Define if the host CPU is a MIPS */ -+#undef HAVE_CPU_MIPS -+ -+/* Define if the host CPU is a PowerPC */ -+#undef HAVE_CPU_PPC -+ -+/* Define if the host CPU is a S390 */ -+#undef HAVE_CPU_S390 -+ -+/* Define if the host CPU is a SPARC */ -+#undef HAVE_CPU_SPARC -+ -+/* Define if the host CPU is a x86_64 */ -+#undef HAVE_CPU_X86_64 -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. -+ */ -+#undef HAVE_DCGETTEXT -+ -+/* Defined if we have dladdr () */ -+#undef HAVE_DLADDR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the `fgetpos' function. */ -+#define HAVE_FGETPOS 1 -+ -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ -+/* Define to 1 if you have the `fsetpos' function. */ -+#define HAVE_FSETPOS 1 -+ -+/* Define to 1 if you have the `ftello' function. */ -+#undef HAVE_FTELLO -+ -+/* defined if the compiler implements __func__ */ -+#undef HAVE_FUNC -+ -+/* defined if the compiler implements __FUNCTION__ */ -+#undef HAVE_FUNCTION -+ -+/* Define to 1 if you have the `getpagesize' function. */ -+#undef HAVE_GETPAGESIZE -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#undef HAVE_GETTEXT -+ -+/* Define if you have the iconv() function. */ -+#undef HAVE_ICONV -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define if libxml2 is available */ -+#define HAVE_LIBXML2 1 -+ -+/* defined if we have makecontext () */ -+#undef HAVE_MAKECONTEXT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have a working `mmap' system call. */ -+#undef HAVE_MMAP -+ -+/* defined if the compiler implements __PRETTY_FUNCTION__ */ -+#undef HAVE_PRETTY_FUNCTION -+ -+/* Defined if we have register_printf_function () */ -+#undef HAVE_PRINTF_EXTENSION -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_PROCESS_H 1 -+ -+/* Define if RDTSC is available */ -+#undef HAVE_RDTSC -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#undef HAVE_SIGACTION -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_SOCKET_H -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UCONTEXT_H -+ -+/* defined if unaligned memory access works correctly */ -+#undef HAVE_UNALIGNED_ACCESS -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define if valgrind should be used */ -+#undef HAVE_VALGRIND -+ -+/* Defined if compiling for Windows */ -+#define HAVE_WIN32 1 -+ -+/* library dir */ -+#define LIBDIR PREFIX "\\lib" -+ -+/* gettext locale dir */ -+#define LOCALEDIR PREFIX "\\share\\locale" -+ -+/* Name of package */ -+#define PACKAGE "gst-plugins-gl" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* directory where plugins are located */ -+#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define if we should poison deallocated memory */ -+#undef USE_POISONING -+ -+/* Version number of package */ -+#define VERSION "0.10.0.1" -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+#undef WORDS_BIGENDIAN -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+/* #undef inline */ -+ -+#define GST_PACKAGE "Gst-plugins-gl" -+#define PACKAGE "gst-plugins-gl" -+#define GST_ORIGIN "gstreamer.freedesktop.org" -diff --git a/winCE/vs9/libgstopengl.vcproj b/winCE/vs9/libgstopengl.vcproj -new file mode 100644 -index 0000000..2dac7f7 ---- /dev/null -+++ b/winCE/vs9/libgstopengl.vcproj -@@ -0,0 +1,336 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -1.7.9.5 - diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch new file mode 100644 index 00000000..d4f5576b --- /dev/null +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch @@ -0,0 +1,2438 @@ +diff --git a/configure.ac b/configure.ac +index 6a4efe0..fa277fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file + dnl initialize autoconf + dnl releases only do -Wall, git and prerelease does -Werror too + dnl use a three digit version number for releases, and four for git/prerelease +-AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3, ++AC_INIT(GStreamer OpenGL Plug-ins, 0.10.3.1, + http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, + gst-plugins-gl) + +@@ -61,7 +61,7 @@ dnl AS_LIBTOOL_TAGS + + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL +-AS_PROG_OBJC ++AC_PROG_OBJC + + dnl *** required versions of GStreamer stuff *** + GST_REQ=0.10.35 +@@ -83,6 +83,8 @@ AG_GST_GETTEXT([gst-plugins-gl-$GST_MAJORMINOR]) + + dnl *** check for arguments to configure *** + ++AG_GST_ARG_DISABLE_FATAL_WARNINGS ++ + AG_GST_ARG_DEBUG + AG_GST_ARG_PROFILING + AG_GST_ARG_VALGRIND +@@ -160,36 +162,48 @@ AG_GST_CHECK_FUNCTION + dnl *** checks for dependency libraries *** + + dnl GLib is required +-AG_GST_GLIB_CHECK([2.6]) ++AG_GST_GLIB_CHECK([2.22]) + + #dnl Check for OpenGL, GLU and GLEW + echo host is $host + case $host in + *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) +- AG_GST_CHECK_X + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- LIBS="$LIBS $X_LIBS" +- #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) +- AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) +- if test "x$HAVE_GL" = "xyes"; then +- AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) +- AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) +- AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) +- GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" +- GL_BACKEND=x11 +- GL_TYPE=gl ++ AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_EGL_FB=yes, HAVE_EGL_FB=no) ++ if test "x$HAVE_EGL_FB" = "xyes"; then ++ GL_LIBS="$LIBS -lGLESv2 -lEGL" ++ GL_BACKEND=fbES2 ++ GL_TYPE=gles ++ save_CPPFLAGS="$save_CPPFLAGS -DLINUX -DEGL_API_FB" + else ++ AG_GST_CHECK_X ++ CPPFLAGS="$CPPFLAGS $X_CFLAGS -DLINUX" ++ LIBS="$LIBS $X_LIBS" + AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no]) + if test "x$HAVE_EGL" = "xyes"; then + AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required])) ++ s_LIBS="$LIBS" ++ LIBS="-lEGL $LIBS" + AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required])) +- GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2" ++ LIBS="$s_LIBS" ++ GL_LIBS="$LIBS -lGLESv2 -lEGL" + GL_BACKEND=x11ES2 + GL_TYPE=gles ++ save_CPPFLAGS="$save_CPPFLAGS -DLINUX" + else +- AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) ++ #PKG_CHECK_MODULES(GL, gl, HAVE_GL=yes, HAVE_GL=no) ++ AC_CHECK_HEADERS([GL/gl.h], [HAVE_GL=yes], [HAVE_GL=no]) ++ if test "x$HAVE_GL" = "xyes"; then ++ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h,, AC_MSG_ERROR([OpenGL is required])) ++ AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h,, AC_MSG_ERROR([GLU is required])) ++ AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h,, AC_MSG_ERROR([GLEW is required])) ++ GL_LIBS="$LIBS $X_LIBS -lGL -lGLU -lGLEW" ++ GL_BACKEND=x11 ++ GL_TYPE=gl ++ else ++ AC_MSG_ERROR([GL or EGL is required, consider installing libgl1-mesa-dev]) ++ fi + fi + fi + CPPFLAGS="$save_CPPFLAGS" +@@ -230,6 +244,7 @@ AC_SUBST(GL_BACKEND) + AC_SUBST(OPENGL_ES2) + AM_CONDITIONAL(GL_BACKEND_X11, test "x$GL_BACKEND" = "xx11") + AM_CONDITIONAL(GL_BACKEND_X11ES2, test "x$GL_BACKEND" = "xx11ES2") ++AM_CONDITIONAL(GL_BACKEND_FBES2, test "x$GL_BACKEND" = "xfbES2") + AM_CONDITIONAL(GL_BACKEND_COCOA, test "x$GL_BACKEND" = "xcocoa") + AM_CONDITIONAL(GL_BACKEND_WIN32, test "x$GL_BACKEND" = "xwin32") + AM_CONDITIONAL(GL_IS_OPENGL, test "x$GL_TYPE" = "xgl") +@@ -251,6 +266,18 @@ AC_SUBST(GLIB_PREFIX) + AC_SUBST(GST_PREFIX) + AC_SUBST(GSTPB_PREFIX) + ++GST_FSL_CFLAGS="`$PKG_CONFIG --cflags gstreamer-fsl-$GST_MAJORMINOR`" ++GST_FSL_LIBS="`$PKG_CONFIG --libs gstreamer-fsl-$GST_MAJORMINOR`" ++AC_CHECK_HEADERS([EGL/eglvivante.h], HAVE_VIVANTE=[yes], HAVE_VIVANTE=[no]) ++if test "x$HAVE_VIVANTE" = "xyes"; then ++ if test "x$GST_FSL_CFLAGS" = "x"; then ++ AC_MSG_ERROR([gstreamer-fsl is required]) ++ fi ++ AC_DEFINE(GPU_VIVANTE, [1], [Use Vivante GPU]) ++fi ++AM_CONDITIONAL(USE_VIVANTE, test "x$HAVE_VIVANTE" = "xyes") ++AC_SUBST(GST_FSL_CFLAGS) ++AC_SUBST(GST_FSL_LIBS) + + dnl libpng is optional + PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no) +@@ -269,12 +296,15 @@ if test x$with_jpeg_mmx != x; then + LIBS="$LIBS -L$with_jpeg_mmx" + fi + AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") +-JPEG_LIBS="$LIBS -ljpeg-mmx" +-LIBS="$OLD_LIBS" + if test x$HAVE_JPEG != xyes; then + AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") +- JPEG_LIBS="-ljpeg" +- AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) ++ if test x$HAVE_JPEG = xyes; then ++ JPEG_LIBS="-ljpeg" ++ AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg]) ++ fi ++else ++ JPEG_LIBS="$LIBS -ljpeg-mmx" ++ LIBS="$OLD_LIBS" + fi + AC_SUBST(HAVE_JPEG) + AC_SUBST(JPEG_LIBS) +@@ -383,8 +413,14 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], + [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) + + dnl define an ERROR_CFLAGS Makefile variable +-AG_GST_SET_ERROR_CFLAGS($GST_GIT) +-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) ++AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS) ++AG_GST_SET_ERROR_CXXFLAGS($FATAL_WARNINGS) ++dnl define an ERROR_OBJCFLAGS Makefile variable ++AG_GST_SET_ERROR_OBJCFLAGS($FATAL_WARNINGS, [ ++ -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls ++ -Wwrite-strings -Wold-style-definition ++ -Winit-self -Wmissing-include-dirs -Wno-multichar ++ -Wnested-externs $NO_WARNINGS]) + + dnl define correct level for debugging messages + AG_GST_SET_LEVEL_DEFAULT($GST_GIT) +@@ -460,8 +496,10 @@ AC_SUBST(DEPRECATED_CFLAGS) + dnl every flag in GST_OPTION_CFLAGS can be overridden at make time + GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" + GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" ++GST_OPTION_OBJCFLAGS="\$(WARNING_OBJCFLAGS) \$(ERROR_OBJCFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" + AC_SUBST(GST_OPTION_CFLAGS) + AC_SUBST(GST_OPTION_CXXFLAGS) ++AC_SUBST(GST_OPTION_OBJCFLAGS) + + dnl our libraries need to be versioned correctly + AC_SUBST(GST_LT_LDFLAGS) +@@ -474,10 +512,12 @@ AC_SUBST(GST_PLUGINS_GL_CFLAGS) + + dnl FIXME: do we want to rename to GST_ALL_* ? + dnl add GST_OPTION_CFLAGS, but overridable ++GST_OBJCFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_OBJCFLAGS)" + GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_CXXFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" + GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" + AC_SUBST(GST_CFLAGS) + AC_SUBST(GST_CXXFLAGS) ++AC_SUBST(GST_OBJCFLAGS) + + dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage + GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" +diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am +index defa340..18016cf 100644 +--- a/docs/libs/Makefile.am ++++ b/docs/libs/Makefile.am +@@ -50,7 +50,7 @@ extra_files = + # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib + # contains GtkObjects/GObjects and you want to document signals and properties. + GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ +- -I$(top_srcdir)/gst-libs/gst/gl ++ -I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir) -DHAVE_CONFIG_H -DLINUX + GTKDOC_LIBS = \ + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) +diff --git a/docs/plugins/inspect/plugin-libvisual-gl.xml b/docs/plugins/inspect/plugin-libvisual-gl.xml +index da5a3d5..477c811 100644 +--- a/docs/plugins/inspect/plugin-libvisual-gl.xml ++++ b/docs/plugins/inspect/plugin-libvisual-gl.xml +@@ -3,10 +3,10 @@ + libvisual-gl visualization plugins + ../../ext/libvisual/.libs/libgstlibvisualgl.so + libgstlibvisualgl.so +- 0.10.3 ++ 0.10.3.1 + LGPL + gst-plugins-gl +- GStreamer OpenGL Plug-ins source release ++ GStreamer OpenGL Plug-ins git + Unknown package origin + + +diff --git a/docs/plugins/inspect/plugin-opengl.xml b/docs/plugins/inspect/plugin-opengl.xml +index dbfa9fb..9b7b663 100644 +--- a/docs/plugins/inspect/plugin-opengl.xml ++++ b/docs/plugins/inspect/plugin-opengl.xml +@@ -3,10 +3,10 @@ + OpenGL plugin + ../../gst/gl/.libs/libgstopengl.so + libgstopengl.so +- 0.10.3 ++ 0.10.3.1 + LGPL + gst-plugins-gl +- GStreamer OpenGL Plug-ins source release ++ GStreamer OpenGL Plug-ins git + Unknown package origin + + +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index 2ef7afc..d55a513 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la + EXTRA_DIST = \ + gstglwindow_x11.c \ + gstglwindow_x11ES2.c \ ++ gstglwindow_fbES2.c \ + gstglwindow_win32.c \ + gstglwindow_winCE.c \ + gstglwindow_cocoa.m +@@ -28,6 +29,13 @@ endif + if GL_BACKEND_X11ES2 + libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c + endif ++if GL_BACKEND_FBES2 ++libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_fbES2.c ++endif ++ ++if USE_VIVANTE ++libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglvivante.c ++endif + + libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl + libgstgl_@GST_MAJORMINOR@include_HEADERS = \ +@@ -41,13 +49,19 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \ + gstglshadervariables.h \ + gstglshader.h + ++if USE_VIVANTE ++libgstgl_@GST_MAJORMINOR@include_HEADERS += gstglvivante.h ++endif ++ + libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ ++ $(GST_FSL_LIBS) \ + $(GST_BASE_LIBS) $(GST_LIBS) \ + $(GL_LIBS) + + libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ + $(GL_CFLAGS) $(X_CFLAGS) \ ++ $(GST_FSL_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) + libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \ + $(GL_CFLAGS) $(X_CFLAGS) \ +diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c +index 64c6c2c..da2e602 100644 +--- a/gst-libs/gst/gl/gstgldisplay.c ++++ b/gst-libs/gst/gl/gstgldisplay.c +@@ -28,6 +28,9 @@ + + #include + #include "gstgldisplay.h" ++#ifdef GPU_VIVANTE ++#include "gstglvivante.h" ++#endif + + #ifndef GLEW_VERSION_MAJOR + #define GLEW_VERSION_MAJOR 4 +@@ -468,6 +471,10 @@ gst_gl_display_init (GstGLDisplay * display, GstGLDisplayClass * klass) + #endif + + display->error_message = NULL; ++ ++#ifdef GPU_VIVANTE ++ display->gpu_priv = gst_gl_vivante_new (); ++#endif + } + + static void +@@ -539,6 +546,12 @@ gst_gl_display_finalize (GObject * object) + g_free (display->error_message); + display->error_message = NULL; + } ++#ifdef GPU_VIVANTE ++ if (display->gpu_priv) { ++ gst_gl_vivante_delete (display->gpu_priv); ++ display->gpu_priv = NULL; ++ } ++#endif + } + + +@@ -1135,6 +1148,17 @@ gst_gl_display_thread_init_upload (GstGLDisplay * display) + void + gst_gl_display_thread_do_upload (GstGLDisplay * display) + { ++ if (display->gpu_priv && ++ display->upload_width == display->upload_data_width && ++ display->upload_height == display->upload_data_height) { ++#ifdef GPU_VIVANTE ++ if (gst_gl_vivante_tex_upload (display->gpu_priv, display)) ++ return; ++#endif ++ } ++ ++ GST_WARNING ("%s: Fall into non direct uploading", __func__); ++ + gst_gl_display_thread_do_upload_fill (display); + + switch (display->upload_video_format) { +@@ -1950,14 +1974,13 @@ gst_gl_display_on_draw (GstGLDisplay * display) + + glBegin (GL_QUADS); + /* gst images are top-down while opengl plane is bottom-up */ +- glTexCoord2i (display->redisplay_texture_width, 0); ++ glTexCoord2i (1, 0); + glVertex2f (1.0f, 1.0f); + glTexCoord2i (0, 0); + glVertex2f (-1.0f, 1.0f); +- glTexCoord2i (0, display->redisplay_texture_height); ++ glTexCoord2i (0, 1); + glVertex2f (-1.0f, -1.0f); +- glTexCoord2i (display->redisplay_texture_width, +- display->redisplay_texture_height); ++ glTexCoord2i (1, 1); + glVertex2f (1.0f, -1.0f); + /*glTexCoord2i (display->redisplay_texture_width, 0); + glVertex2i (1, -1); +@@ -1974,7 +1997,8 @@ gst_gl_display_on_draw (GstGLDisplay * display) + + #else //OPENGL_ES2 + +- const GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, ++ GLfloat left, right, top, bottom; ++ GLfloat vVertices[] = { 1.0f, 1.0f, 0.0f, + 1.0f, 0.0f, + -1.0f, 1.0f, 0.0f, + 0.0f, 0.0f, +@@ -1986,6 +2010,17 @@ gst_gl_display_on_draw (GstGLDisplay * display) + + GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; + ++#ifdef GPU_VIVANTE ++ if (display->gpu_priv) { ++ gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, ++ &bottom); ++ vVertices[3] = vVertices[18] = right; ++ vVertices[4] = vVertices[9] = bottom; ++ vVertices[8] = vVertices[13] = left; ++ vVertices[14] = vVertices[19] = top; ++ } ++#endif ++ + glClear (GL_COLOR_BUFFER_BIT); + + gst_gl_shader_use (display->redisplay_shader); +@@ -2067,6 +2102,9 @@ gst_gl_display_glgen_texture (GstGLDisplay * display, GLuint * pTexture, + case GST_VIDEO_FORMAT_I420: + case GST_VIDEO_FORMAT_YV12: + case GST_VIDEO_FORMAT_AYUV: ++#ifdef GPU_VIVANTE ++ case GST_VIDEO_FORMAT_NV12: ++#endif + glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, + width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + break; +@@ -2177,11 +2215,11 @@ gst_gl_display_check_framebuffer_status (void) + GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"); + break; + +-#if defined(GL_ARB_framebuffer_object) ++/* + case GL_FRAMEBUFFER_UNDEFINED: + GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED"); + break; +-#endif ++*/ + + default: + GST_ERROR ("General FBO error"); +@@ -2350,8 +2388,13 @@ gst_gl_display_init_upload (GstGLDisplay * display, GstVideoFormat video_format, + display->upload_height = gl_height; + display->upload_data_width = video_width; + display->upload_data_height = video_height; +- gst_gl_window_send_message (display->gl_window, +- GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); ++ ++#ifdef GPU_VIVANTE ++ if (!gst_gl_vivante_check_format (display->gpu_priv, video_format, ++ video_width, video_height)) ++#endif ++ gst_gl_window_send_message (display->gl_window, ++ GST_GL_WINDOW_CB (gst_gl_display_thread_init_upload), display); + isAlive = display->isAlive; + gst_gl_display_unlock (display); + +@@ -2364,6 +2407,14 @@ gboolean + gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, + gint data_width, gint data_height, gpointer data) + { ++ return gst_gl_display_do_upload_with_meta (display, texture, data_width, ++ data_height, data, NULL); ++} ++ ++gboolean ++gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, ++ gint data_width, gint data_height, gpointer data, gpointer meta) ++{ + gboolean isAlive = TRUE; + + gst_gl_display_lock (display); +@@ -2373,6 +2424,7 @@ gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, + display->upload_data_width = data_width; + display->upload_data_height = data_height; + display->upload_data = data; ++ display->upload_meta = meta; + gst_gl_window_send_message (display->gl_window, + GST_GL_WINDOW_CB (gst_gl_display_thread_do_upload), display); + isAlive = display->isAlive; +@@ -2975,11 +3027,11 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) + + #ifdef OPENGL_ES2 + GLint viewport_dim[4]; +- +- const GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, ++ GLfloat left, right, top, bottom; ++ GLfloat vVertices[] = { 1.0f, -1.0f, 0.0f, + 1.0f, 0.0f, + -1.0f, -1.0f, 0.0f, +- 0.0f, .0f, ++ 0.0f, 0.0f, + -1.0f, 1.0f, 0.0f, + 0.0f, 1.0f, + 1.0f, 1.0f, 0.0f, +@@ -2987,6 +3039,18 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) + }; + + GLushort indices[] = { 0, 1, 2, 0, 2, 3 }; ++ ++#ifdef GPU_VIVANTE ++ if (display->gpu_priv) { ++ gst_gl_vivante_get_sampler_rect (display->gpu_priv, &left, &right, &top, ++ &bottom); ++ vVertices[3] = vVertices[18] = right; ++ vVertices[4] = vVertices[9] = bottom; ++ vVertices[8] = vVertices[13] = left; ++ vVertices[14] = vVertices[19] = top; ++ } ++#endif ++ + #endif + + glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, display->upload_fbo); +@@ -3260,13 +3324,13 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay * display) + + #ifndef OPENGL_ES2 + glBegin (GL_QUADS); +- glTexCoord2i (display->upload_data_width, 0); ++ glTexCoord2i (1, 0); + glVertex2f (1.0f, -1.0f); + glTexCoord2i (0, 0); + glVertex2f (-1.0f, -1.0f); +- glTexCoord2i (0, display->upload_data_height); ++ glTexCoord2i (0, 1); + glVertex2f (-1.0f, 1.0f); +- glTexCoord2i (display->upload_data_width, display->upload_data_height); ++ glTexCoord2i (1, 1); + glVertex2f (1.0f, 1.0f); + glEnd (); + +@@ -3554,11 +3618,11 @@ gst_gl_display_thread_do_download_draw_yuv (GstGLDisplay * display) + glBegin (GL_QUADS); + glTexCoord2i (0, 0); + glVertex2f (-1.0f, -1.0f); +- glTexCoord2i (width, 0); ++ glTexCoord2i (1, 0); + glVertex2f (1.0f, -1.0f); +- glTexCoord2i (width, height); ++ glTexCoord2i (1, 1); + glVertex2f (1.0f, 1.0f); +- glTexCoord2i (0, height); ++ glTexCoord2i (0, 1); + glVertex2f (-1.0f, 1.0f); + glEnd (); + +diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h +index f657e1e..31dfe26 100644 +--- a/gst-libs/gst/gl/gstgldisplay.h ++++ b/gst-libs/gst/gl/gstgldisplay.h +@@ -229,6 +229,9 @@ struct _GstGLDisplay + + gchar *error_message; + ++ gpointer gpu_priv; ++ gpointer upload_meta; ++ gboolean upload_buf_mapped; + }; + + +@@ -264,6 +267,8 @@ gboolean gst_gl_display_init_upload (GstGLDisplay * display, + gint video_width, gint video_height); + gboolean gst_gl_display_do_upload (GstGLDisplay * display, GLuint texture, + gint data_width, gint data_height, gpointer data); ++gboolean gst_gl_display_do_upload_with_meta (GstGLDisplay * display, GLuint texture, ++ gint data_width, gint data_height, gpointer data, gpointer meta); + gboolean gst_gl_display_init_download (GstGLDisplay * display, + GstVideoFormat video_format, gint width, gint height); + gboolean gst_gl_display_do_download (GstGLDisplay * display, GLuint texture, +diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h +index ddeb99c..aec69f1 100644 +--- a/gst-libs/gst/gl/gstglshader.h ++++ b/gst-libs/gst/gl/gstglshader.h +@@ -21,6 +21,10 @@ + #ifndef __GST_GL_SHADER_H__ + #define __GST_GL_SHADER_H__ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + /* OpenGL 2.0 for Embedded Systems */ + #ifdef OPENGL_ES2 + #include +diff --git a/gst-libs/gst/gl/gstglshadervariables.c b/gst-libs/gst/gl/gstglshadervariables.c +index 69d5b75..be6e58c 100644 +--- a/gst-libs/gst/gl/gstglshadervariables.c ++++ b/gst-libs/gst/gl/gstglshadervariables.c +@@ -550,6 +550,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, + (float *) ret->value); + break; + ++#ifndef OPENGL_ES2 + case _mat2x3: + gst_gl_shader_set_uniform_matrix_2x3fv (shader, ret->name, ret->count, 0, + (float *) ret->value); +@@ -569,6 +570,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, + gst_gl_shader_set_uniform_matrix_4x2fv (shader, ret->name, ret->count, 0, + (float *) ret->value); + break; ++#endif + + case _mat3: + case _mat3x3: +@@ -576,6 +578,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, + (float *) ret->value); + break; + ++#ifndef OPENGL_ES2 + case _mat3x4: + gst_gl_shader_set_uniform_matrix_3x4fv (shader, ret->name, ret->count, 0, + (float *) ret->value); +@@ -585,6 +588,7 @@ gst_gl_shadervariable_set (GstGLShader * shader, + gst_gl_shader_set_uniform_matrix_4x3fv (shader, ret->name, ret->count, 0, + (float *) ret->value); + break; ++#endif + + case _mat4: + case _mat4x4: +diff --git a/gst-libs/gst/gl/gstglvivante.c b/gst-libs/gst/gl/gstglvivante.c +new file mode 100644 +index 0000000..2b8c9ae +--- /dev/null ++++ b/gst-libs/gst/gl/gstglvivante.c +@@ -0,0 +1,218 @@ ++/* ++ * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include ++ ++#include "gstglvivante.h" ++#include ++ ++#define GL_GLEXT_PROTOTYPES ++#include ++ ++typedef struct ++{ ++ gfloat sampler_left; ++ gfloat sampler_right; ++ gfloat sampler_top; ++ gfloat sampler_bottom; ++} GstGLVivante; ++ ++gpointer ++gst_gl_vivante_new () ++{ ++ GstGLVivante *viv = g_new (GstGLVivante, 1); ++ ++ viv->sampler_left = 0.0f; ++ viv->sampler_right = 1.0f; ++ viv->sampler_top = 1.0f; ++ viv->sampler_bottom = 0.0f; ++ ++ return viv; ++} ++ ++void ++gst_gl_vivante_delete (gpointer gpu) ++{ ++ g_free (gpu); ++} ++ ++gboolean ++gst_gl_vivante_check_format (gpointer gpu, GstVideoFormat format, gint width, ++ gint height) ++{ ++ switch (format) { ++ case GST_VIDEO_FORMAT_YV12: ++ case GST_VIDEO_FORMAT_NV12: ++ if ((width & 15) == 0) ++ return TRUE; ++ break; ++ default: ++ GST_WARNING ("GstVideoFormat %d not supported by vivante", format); ++ } ++ GST_WARNING ++ ("Check format %d, width,height [%d, %d] failed, can't direct render", ++ format, width, height); ++ return FALSE; ++} ++ ++GLenum ++gst_gl_vivante_get_gl_format (gpointer gpu, GstVideoFormat format) ++{ ++ switch (format) { ++ case GST_VIDEO_FORMAT_YV12: ++ return GL_VIV_YV12; ++ case GST_VIDEO_FORMAT_NV12: ++ return GL_VIV_NV12; ++ default: ++ GST_WARNING ("GstVideoFormat %d not supported by vivante", format); ++ } ++ return GL_NONE; ++} ++ ++static gboolean ++format_is_yuv (GstVideoFormat format) ++{ ++ switch (format) { ++ case GST_VIDEO_FORMAT_YV12: ++ case GST_VIDEO_FORMAT_NV12: ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++static void ++copy_data_to_gpu (gpointer gpu, GstVideoFormat format, gpointer data, ++ gpointer planes[], gint width, gint height) ++{ ++ gint src_height; ++ gint src_y_size, src_uv_size; ++ gint dst_y_size, dst_uv_size; ++ ++ /* width is already 16 aligned */ ++ switch (format) { ++ case GST_VIDEO_FORMAT_YV12: ++ src_height = GST_ROUND_UP_2 (height); ++ src_y_size = width * src_height; ++ src_uv_size = src_y_size / 4; ++ dst_y_size = width * height; ++ dst_uv_size = dst_y_size / 4; ++ memcpy (planes[0], data, dst_y_size); ++ memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); ++ memcpy (planes[2], (gchar *) data + src_y_size + src_uv_size, ++ dst_uv_size); ++ break; ++ case GST_VIDEO_FORMAT_NV12: ++ src_height = GST_ROUND_UP_2 (height); ++ src_y_size = width * src_height; ++ dst_y_size = width * height; ++ dst_uv_size = dst_y_size / 2; ++ memcpy (planes[0], data, dst_y_size); ++ memcpy (planes[1], (gchar *) data + src_y_size, dst_uv_size); ++ break; ++ default: ++ return; ++ } ++} ++ ++gboolean ++gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display) ++{ ++ GstVideoFormat format = display->upload_video_format; ++ gint width = display->upload_data_width; ++ gint height = display->upload_data_height; ++ gpointer data = display->upload_data; ++ GstBufferMeta *meta = GST_BUFFER_META (display->upload_meta); ++ gpointer planes[3]; ++ GLuint physical = meta ? (GLuint) (meta->physical_data) : ~0U; ++ ++ GST_INFO ("gst_gl_vivante_tex_upload physical address 0x%x, data %p, tex %d", ++ physical, data, display->upload_outtex); ++ ++ if (!gst_gl_vivante_check_format (gpu, format, width, height)) ++ return FALSE; ++ ++ glBindTexture (GL_TEXTURE_2D, display->upload_outtex); ++ ++ if (((guint) data & 0x3F) != 0) { /* not aligned, need additional copy */ ++ if (!format_is_yuv (format)) { /* rgb is left to default handler */ ++ GST_WARNING ("Format %d unaligned data is not supported for" ++ " direct rendering", format); ++ return FALSE; ++ } ++ ++ GST_WARNING ("Data not aligned, need additional copy"); ++ ++ glTexDirectVIV (GL_TEXTURE_2D, width, height, ++ gst_gl_vivante_get_gl_format (gpu, format), (GLvoid **) & planes); ++ if (glGetError () != GL_NO_ERROR) ++ return FALSE; ++ ++ copy_data_to_gpu (gpu, format, data, planes, width, height); ++ } else { ++ glTexDirectVIVMap (GL_TEXTURE_2D, width, height, ++ gst_gl_vivante_get_gl_format (gpu, format), &data, &physical); ++ if (glGetError () != GL_NO_ERROR) ++ return FALSE; ++ display->upload_buf_mapped = TRUE; ++ } ++ ++ glTexDirectInvalidateVIV (GL_TEXTURE_2D); ++ ++ return TRUE; ++} ++ ++void ++gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps) ++{ ++ GstVideoFormat format; ++ gint width; ++ gint height; ++ GstStructure *s; ++ gint left = 0, right = 0, top = 0, bottom = 0; ++ GstGLVivante *viv = (GstGLVivante *) gpu; ++ ++ s = gst_caps_get_structure (caps, 0); ++ gst_structure_get_int (s, "crop-left", &left); ++ gst_structure_get_int (s, "crop-top", &top); ++ gst_structure_get_int (s, "crop-right", &right); ++ gst_structure_get_int (s, "crop-bottom", &bottom); ++ ++ gst_video_format_parse_caps (caps, &format, &width, &height); ++ ++ viv->sampler_left = ((gfloat) left) / width; ++ viv->sampler_right = ((gfloat) (width - right)) / width; ++ viv->sampler_top = ((gfloat) (height - bottom)) / height; ++ viv->sampler_bottom = ((gfloat) top) / height; ++} ++ ++void ++gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat * left, gfloat * right, ++ gfloat * top, gfloat * bottom) ++{ ++ GstGLVivante *viv = (GstGLVivante *) gpu; ++ ++ *left = viv->sampler_left; ++ *right = viv->sampler_right; ++ *top = viv->sampler_top; ++ *bottom = viv->sampler_bottom; ++} +diff --git a/gst-libs/gst/gl/gstglvivante.h b/gst-libs/gst/gl/gstglvivante.h +new file mode 100644 +index 0000000..f763f80 +--- /dev/null ++++ b/gst-libs/gst/gl/gstglvivante.h +@@ -0,0 +1,41 @@ ++/* ++ * Copyright (c) 2012, Freescale Semiconductor, Inc. All rights reserved. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __GST_GL_VIVANTE_H__ ++#define __GST_GL_VIVANTE_H__ ++ ++#include "gstgldisplay.h" ++#include ++ ++G_BEGIN_DECLS ++ ++gpointer gst_gl_vivante_new(); ++void gst_gl_vivante_delete(gpointer gpu); ++ ++gboolean gst_gl_vivante_check_format(gpointer gpu, GstVideoFormat format, gint width, gint height); ++GLenum gst_gl_vivante_get_gl_format(gpointer gpu, GstVideoFormat format); ++ ++gboolean gst_gl_vivante_tex_upload (gpointer gpu, GstGLDisplay * display); ++void gst_gl_vivante_set_caps (gpointer gpu, GstCaps * caps); ++ ++void gst_gl_vivante_get_sampler_rect (gpointer gpu, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom); ++ ++G_END_DECLS ++ ++#endif /* __GST_GL_VIVANTE_H__ */ +diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h +index 499d47a..c3cafb2 100644 +--- a/gst-libs/gst/gl/gstglwindow.h ++++ b/gst-libs/gst/gl/gstglwindow.h +@@ -21,6 +21,10 @@ + #ifndef __GST_GL_WINDOW_H__ + #define __GST_GL_WINDOW_H__ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + /* OpenGL 2.0 for Embedded Systems */ + #ifdef OPENGL_ES2 + #undef UNICODE +diff --git a/gst-libs/gst/gl/gstglwindow_fbES2.c b/gst-libs/gst/gl/gstglwindow_fbES2.c +new file mode 100644 +index 0000000..57c02e1 +--- /dev/null ++++ b/gst-libs/gst/gl/gstglwindow_fbES2.c +@@ -0,0 +1,709 @@ ++/* ++ * GStreamer ++ * Copyright (C) 2008 Julien Isorce ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include "gstglwindow.h" ++#include "EGL/eglvivante.h" ++ ++#include ++#include ++#include ++ ++#define GST_GL_WINDOW_GET_PRIVATE(o) \ ++ (G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_WINDOW, GstGLWindowPrivate)) ++ ++/* A gl window is created and deleted in a thread dedicated to opengl calls ++ The name contains "window" because an opengl context is used in cooperation ++ with a window */ ++ ++const gchar *EGLErrorString (); ++ ++enum ++{ ++ ARG_0, ++ ARG_DISPLAY ++}; ++ ++enum GstGLFbEventType ++{ ++ FB_EVENT_DRAW, ++ FB_EVENT_CALLBACK, ++ FB_EVENT_QUIT, ++}; ++ ++typedef struct _GstGLFbEvent ++{ ++ enum GstGLFbEventType type; ++ GstGLWindowCB callback; ++ gpointer data; ++} GstGLFbEvent; ++ ++struct _GstGLWindowPrivate ++{ ++ /* X is not thread safe */ ++ GMutex *lock; ++ GCond *cond_send_message; ++ GCond *cond_queue_message; ++ gboolean running; ++ gboolean allow_extra_expose_events; ++ ++ /* fb queue */ ++ GList *queue; ++ ++ /* X context */ ++ gchar *display_name; ++ gint device_width; ++ gint device_height; ++ ++ EGLNativeWindowType internal_win_id; ++ EGLNativeDisplayType device; ++ ++ /* EGL */ ++ EGLContext gl_context; ++ EGLDisplay gl_display; ++ EGLSurface gl_surface; ++ ++ /* frozen callbacks */ ++ GstGLWindowCB draw_cb; ++ gpointer draw_data; ++ GstGLWindowCB2 resize_cb; ++ gpointer resize_data; ++ GstGLWindowCB close_cb; ++ gpointer close_data; ++}; ++ ++G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT); ++ ++#undef G_LOG_DOMAIN ++#define G_LOG_DOMAIN "GstGLWindow" ++ ++gboolean _gst_gl_window_debug = FALSE; ++ ++void ++gst_gl_window_init_platform () ++{ ++} ++ ++static void ++free_event (gpointer event, gpointer data) ++{ ++ g_slice_free (GstGLFbEvent, event); ++} ++ ++/* Must be called in the gl thread */ ++static void ++gst_gl_window_finalize (GObject * object) ++{ ++ GstGLWindow *window = GST_GL_WINDOW (object); ++ GstGLWindowPrivate *priv = window->priv; ++ gboolean ret = TRUE; ++ ++ g_mutex_lock (priv->lock); ++ ++ g_debug ("about to finalize gl window\n"); ++ ++ if (priv->gl_context) { ++ ret = ++ eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ EGL_NO_CONTEXT); ++ if (!ret) ++ g_debug ("failed to release opengl context\n"); ++ ++ eglDestroyContext (priv->gl_display, priv->gl_context); ++ } ++ ++ if (priv->gl_display) ++ eglTerminate (priv->gl_display); ++ ++ if (priv->device) ++ fbDestroyDisplay (priv->device); ++ ++ g_list_foreach (priv->queue, free_event, NULL); ++ g_list_free (priv->queue); ++ priv->queue = NULL; ++ ++ if (priv->cond_send_message) { ++ g_cond_free (priv->cond_send_message); ++ priv->cond_send_message = NULL; ++ } ++ ++ if (priv->cond_queue_message) { ++ g_cond_free (priv->cond_queue_message); ++ priv->cond_queue_message = NULL; ++ } ++ ++ g_mutex_unlock (priv->lock); ++ ++ if (priv->lock) { ++ g_mutex_free (priv->lock); ++ priv->lock = NULL; ++ } ++ ++ G_OBJECT_CLASS (gst_gl_window_parent_class)->finalize (object); ++} ++ ++static void ++gst_gl_window_set_property (GObject * object, guint prop_id, ++ const GValue * value, GParamSpec * pspec) ++{ ++ GstGLWindow *window; ++ GstGLWindowPrivate *priv; ++ ++ g_return_if_fail (GST_GL_IS_WINDOW (object)); ++ ++ window = GST_GL_WINDOW (object); ++ ++ priv = window->priv; ++ ++ switch (prop_id) { ++ case ARG_DISPLAY: ++ priv->display_name = g_strdup (g_value_get_string (value)); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gst_gl_window_get_property (GObject * object, guint prop_id, ++ GValue * value, GParamSpec * pspec) ++{ ++ GstGLWindow *window; ++ GstGLWindowPrivate *priv; ++ ++ g_return_if_fail (GST_GL_IS_WINDOW (object)); ++ ++ window = GST_GL_WINDOW (object); ++ ++ priv = window->priv; ++ ++ switch (prop_id) { ++ case ARG_DISPLAY: ++ g_value_set_string (value, priv->display_name); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gst_gl_window_log_handler (const gchar * domain, GLogLevelFlags flags, ++ const gchar * message, gpointer user_data) ++{ ++ if (_gst_gl_window_debug) { ++ g_log_default_handler (domain, flags, message, user_data); ++ } ++} ++ ++static void ++gst_gl_window_class_init (GstGLWindowClass * klass) ++{ ++ GObjectClass *obj_class = G_OBJECT_CLASS (klass); ++ ++ g_type_class_add_private (klass, sizeof (GstGLWindowPrivate)); ++ ++ obj_class->finalize = gst_gl_window_finalize; ++ obj_class->set_property = gst_gl_window_set_property; ++ obj_class->get_property = gst_gl_window_get_property; ++ ++ g_object_class_install_property (obj_class, ARG_DISPLAY, ++ g_param_spec_string ("display", "Display", "X Display name", NULL, ++ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); ++} ++ ++static void ++gst_gl_window_init (GstGLWindow * window) ++{ ++ GstGLWindowPrivate *priv = NULL; ++ window->priv = GST_GL_WINDOW_GET_PRIVATE (window); ++ priv = window->priv; ++ ++ if (g_getenv ("GST_GL_WINDOW_DEBUG") != NULL) ++ _gst_gl_window_debug = TRUE; ++ ++ g_log_set_handler ("GstGLWindow", G_LOG_LEVEL_DEBUG, ++ gst_gl_window_log_handler, NULL); ++ ++ priv->lock = NULL; ++ priv->cond_send_message = NULL; ++ priv->running = FALSE; ++ priv->allow_extra_expose_events = FALSE; ++ ++ priv->queue = NULL; ++ ++ /* X context */ ++ priv->display_name = NULL; ++ priv->device_width = 0; ++ priv->device_height = 0; ++ ++ /* EGL */ ++ priv->gl_context = EGL_NO_CONTEXT; ++ priv->gl_display = 0; ++ priv->gl_surface = EGL_NO_SURFACE; ++ ++ /* frozen callbacks */ ++ priv->draw_cb = NULL; ++ priv->draw_data = NULL; ++ priv->resize_cb = NULL; ++ priv->resize_data = NULL; ++ priv->close_cb = NULL; ++ priv->close_data = NULL; ++} ++ ++/* Must be called in the gl thread */ ++GstGLWindow * ++gst_gl_window_new (gulong external_gl_context) ++{ ++ GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL); ++ GstGLWindowPrivate *priv = window->priv; ++ ++ EGLint config_attrib[] = { ++ EGL_SURFACE_TYPE, EGL_WINDOW_BIT, ++ EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, ++ EGL_DEPTH_SIZE, 16, ++ EGL_NONE ++ }; ++ ++ EGLint context_attrib[] = { ++ EGL_CONTEXT_CLIENT_VERSION, 2, ++ EGL_NONE ++ }; ++ ++ EGLint majorVersion; ++ EGLint minorVersion; ++ EGLint numConfigs; ++ EGLConfig config; ++ ++ int index = 0; ++ ++ setlocale (LC_NUMERIC, "C"); ++ ++ priv->lock = g_mutex_new (); ++ priv->cond_send_message = g_cond_new (); ++ priv->cond_queue_message = g_cond_new (); ++ priv->running = TRUE; ++ priv->allow_extra_expose_events = TRUE; ++ ++ g_mutex_lock (priv->lock); ++ ++ if (priv->display_name) ++ index = strtol (priv->display_name, NULL, 0); ++ ++ priv->device = fbGetDisplayByIndex (index); ++ ++ if (!priv->device) { ++ g_debug ("failed to get fb display by index %d\n", index); ++ goto failure; ++ } ++ ++ priv->internal_win_id = fbCreateWindow (priv->device, -1, -1, 0, 0); ++ ++ fbGetDisplayGeometry (priv->device, &priv->device_width, ++ &priv->device_height); ++ ++ priv->gl_display = eglGetDisplay (priv->device); ++ ++ if (eglInitialize (priv->gl_display, &majorVersion, &minorVersion)) ++ g_debug ("egl initialized: %d.%d\n", majorVersion, minorVersion); ++ else { ++ g_debug ("failed to initialize egl %ld, %s\n", (gulong) priv->gl_display, ++ EGLErrorString ()); ++ goto failure; ++ } ++ ++ if (eglChooseConfig (priv->gl_display, config_attrib, &config, 1, ++ &numConfigs)) ++ g_debug ("config set: %ld, %ld\n", (gulong) config, (gulong) numConfigs); ++ else { ++ g_debug ("failed to set config %ld, %s\n", (gulong) priv->gl_display, ++ EGLErrorString ()); ++ goto failure; ++ } ++ ++ priv->gl_surface = ++ eglCreateWindowSurface (priv->gl_display, config, priv->internal_win_id, ++ NULL); ++ if (priv->gl_surface != EGL_NO_SURFACE) ++ g_debug ("surface created: %ld\n", (gulong) priv->gl_surface); ++ else { ++ g_debug ("failed to create surface %ld, %ld, %ld, %s\n", ++ (gulong) priv->gl_display, (gulong) priv->gl_surface, ++ (gulong) priv->gl_display, EGLErrorString ()); ++ goto failure; ++ } ++ ++ g_debug ("about to create gl context\n"); ++ ++ priv->gl_context = ++ eglCreateContext (priv->gl_display, config, ++ (EGLContext) (guint) external_gl_context, context_attrib); ++ ++ if (priv->gl_context != EGL_NO_CONTEXT) ++ g_debug ("gl context created: %ld\n", (gulong) priv->gl_context); ++ else { ++ g_debug ("failed to create glcontext %ld, %ld, %s\n", ++ (gulong) priv->gl_context, (gulong) priv->gl_display, ++ EGLErrorString ()); ++ goto failure; ++ } ++ ++ if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, ++ priv->gl_context)) { ++ g_debug ("failed to make opengl context current %ld, %s\n", ++ (gulong) priv->gl_display, EGLErrorString ()); ++ goto failure; ++ } ++ ++ g_mutex_unlock (priv->lock); ++ printf ("device WxH:%dx%d\n", priv->device_width, priv->device_height); ++ return window; ++ ++failure: ++ g_mutex_unlock (priv->lock); ++ g_object_unref (G_OBJECT (window)); ++ return NULL; ++} ++ ++GQuark ++gst_gl_window_error_quark (void) ++{ ++ return g_quark_from_static_string ("gst-gl-window-error"); ++} ++ ++gulong ++gst_gl_window_get_internal_gl_context (GstGLWindow * window) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ return (gulong) priv->gl_context; ++} ++ ++void ++callback_activate_gl_context (GstGLWindowPrivate * priv) ++{ ++ if (!eglMakeCurrent (priv->gl_display, priv->gl_surface, priv->gl_surface, ++ priv->gl_context)) ++ g_debug ("failed to activate opengl context %lud\n", ++ (gulong) priv->gl_context); ++} ++ ++void ++callback_inactivate_gl_context (GstGLWindowPrivate * priv) ++{ ++ if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ EGL_NO_CONTEXT)) ++ g_debug ("failed to inactivate opengl context %lud\n", ++ (gulong) priv->gl_context); ++} ++ ++void ++gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ if (activate) ++ gst_gl_window_send_message (window, ++ GST_GL_WINDOW_CB (callback_activate_gl_context), priv); ++ else ++ gst_gl_window_send_message (window, ++ GST_GL_WINDOW_CB (callback_inactivate_gl_context), priv); ++} ++ ++/* Not called by the gl thread */ ++void ++gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id) ++{ ++} ++ ++void ++gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback, ++ gpointer data) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ priv->draw_cb = callback; ++ priv->draw_data = data; ++ ++ g_mutex_unlock (priv->lock); ++} ++ ++void ++gst_gl_window_set_resize_callback (GstGLWindow * window, ++ GstGLWindowCB2 callback, gpointer data) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ priv->resize_cb = callback; ++ priv->resize_data = data; ++ ++ g_mutex_unlock (priv->lock); ++} ++ ++void ++gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback, ++ gpointer data) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ priv->close_cb = callback; ++ priv->close_data = data; ++ ++ g_mutex_unlock (priv->lock); ++} ++ ++/* Called in the gl thread */ ++void ++gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ ++ if (priv->running && priv->allow_extra_expose_events) { ++ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); ++ event->type = FB_EVENT_DRAW; ++ priv->queue = g_list_append (priv->queue, event); ++ g_cond_signal (priv->cond_queue_message); ++ /* block until opengl calls have been executed in the gl thread */ ++ g_cond_wait (priv->cond_send_message, priv->lock); ++ } ++} ++ ++/* Not called by the gl thread */ ++void ++gst_gl_window_draw (GstGLWindow * window, gint width, gint height) ++{ ++ if (window) { ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ if (priv->running) { ++ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); ++ event->type = FB_EVENT_DRAW; ++ priv->queue = g_list_append (priv->queue, event); ++ g_cond_signal (priv->cond_queue_message); ++ /* block until opengl calls have been executed in the gl thread */ ++ g_cond_wait (priv->cond_send_message, priv->lock); ++ } ++ ++ g_mutex_unlock (priv->lock); ++ } ++} ++ ++static void ++gst_gl_fb_queue_flush (GList * queue, GCond * cond) ++{ ++ GstGLFbEvent *event; ++ GList *first; ++ ++ while ((first = g_list_first (queue))) { ++ event = first->data; ++ queue = g_list_delete_link (queue, first); ++ ++ if (event->type == FB_EVENT_CALLBACK) { ++ g_debug ("execute last pending custom x events\n"); ++ ++ if (!event->callback || !event->data) ++ g_debug ("custom cb not initialized\n"); ++ ++ event->callback (event->data); ++ ++ g_cond_signal (cond); ++ } ++ ++ g_slice_free (GstGLFbEvent, event); ++ } ++} ++ ++/* Called in the gl thread */ ++void ++gst_gl_window_run_loop (GstGLWindow * window) ++{ ++ GstGLWindowPrivate *priv = window->priv; ++ GstGLFbEvent *event; ++ GList *first; ++ ++ g_debug ("begin loop\n"); ++ ++ g_mutex_lock (priv->lock); ++ ++ while (priv->running) { ++ ++ if (!priv->queue) ++ g_cond_wait (priv->cond_queue_message, priv->lock); ++ ++ first = g_list_first (priv->queue); ++ event = first->data; ++ priv->queue = g_list_delete_link (priv->queue, first); ++ ++ // use in generic/cube and other related uses ++ priv->allow_extra_expose_events = g_list_length (priv->queue) <= 2; ++ ++ switch (event->type) { ++ case FB_EVENT_CALLBACK: ++ { ++ if (priv->running) { ++ if (!event->callback || !event->data) ++ g_debug ("custom cb not initialized\n"); ++ event->callback (event->data); ++ g_cond_signal (priv->cond_send_message); ++ } ++ break; ++ } ++ ++ case FB_EVENT_QUIT: ++ { ++ g_debug ("Quit loop message %lud\n", (gulong) priv->internal_win_id); ++ ++ /* exit loop */ ++ priv->running = FALSE; ++ ++ /* make sure last pendings send message calls are executed */ ++ gst_gl_fb_queue_flush (priv->queue, priv->cond_send_message); ++ priv->queue = NULL; ++ ++ /* Finally we can destroy opengl ressources (texture/shaders/fbo) */ ++ if (!event->callback || !event->data) ++ g_debug ("destroy cb not correclty set\n"); ++ ++ event->callback (event->data); ++ g_cond_signal (priv->cond_send_message); ++ break; ++ } ++ ++ case FB_EVENT_DRAW: ++ if (priv->draw_cb) { ++ priv->draw_cb (priv->draw_data); ++ glFlush (); ++ eglSwapBuffers (priv->gl_display, priv->gl_surface); ++ g_cond_signal (priv->cond_send_message); ++ } ++ break; ++ ++ default: ++ g_debug ("unknown GstGLFbEvent type: %ud\n", event->type); ++ break; ++ } // switch ++ ++ g_slice_free (GstGLFbEvent, event); ++ ++ } // while running ++ ++ g_mutex_unlock (priv->lock); ++ ++ g_debug ("end loop\n"); ++} ++ ++/* Not called by the gl thread */ ++void ++gst_gl_window_quit_loop (GstGLWindow * window, GstGLWindowCB callback, ++ gpointer data) ++{ ++ if (window) { ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ if (priv->running) { ++ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); ++ event->type = FB_EVENT_QUIT; ++ event->callback = callback; ++ event->data = data; ++ priv->queue = g_list_append (priv->queue, event); ++ ++ g_cond_signal (priv->cond_queue_message); ++ g_cond_wait (priv->cond_send_message, priv->lock); ++ } ++ ++ g_mutex_unlock (priv->lock); ++ } ++} ++ ++/* Not called by the gl thread */ ++void ++gst_gl_window_send_message (GstGLWindow * window, GstGLWindowCB callback, ++ gpointer data) ++{ ++ if (window) { ++ GstGLWindowPrivate *priv = window->priv; ++ ++ g_mutex_lock (priv->lock); ++ ++ if (priv->running) { ++ GstGLFbEvent *event = g_slice_new0 (GstGLFbEvent); ++ event->type = FB_EVENT_CALLBACK; ++ event->callback = callback; ++ event->data = data; ++ priv->queue = g_list_append (priv->queue, event); ++ g_cond_signal (priv->cond_queue_message); ++ ++ /* block until opengl calls have been executed in the gl thread */ ++ g_cond_wait (priv->cond_send_message, priv->lock); ++ } ++ ++ g_mutex_unlock (priv->lock); ++ } ++} ++ ++const gchar * ++EGLErrorString () ++{ ++ EGLint nErr = eglGetError (); ++ switch (nErr) { ++ case EGL_SUCCESS: ++ return "EGL_SUCCESS"; ++ case EGL_BAD_DISPLAY: ++ return "EGL_BAD_DISPLAY"; ++ case EGL_NOT_INITIALIZED: ++ return "EGL_NOT_INITIALIZED"; ++ case EGL_BAD_ACCESS: ++ return "EGL_BAD_ACCESS"; ++ case EGL_BAD_ALLOC: ++ return "EGL_BAD_ALLOC"; ++ case EGL_BAD_ATTRIBUTE: ++ return "EGL_BAD_ATTRIBUTE"; ++ case EGL_BAD_CONFIG: ++ return "EGL_BAD_CONFIG"; ++ case EGL_BAD_CONTEXT: ++ return "EGL_BAD_CONTEXT"; ++ case EGL_BAD_CURRENT_SURFACE: ++ return "EGL_BAD_CURRENT_SURFACE"; ++ case EGL_BAD_MATCH: ++ return "EGL_BAD_MATCH"; ++ case EGL_BAD_NATIVE_PIXMAP: ++ return "EGL_BAD_NATIVE_PIXMAP"; ++ case EGL_BAD_NATIVE_WINDOW: ++ return "EGL_BAD_NATIVE_WINDOW"; ++ case EGL_BAD_PARAMETER: ++ return "EGL_BAD_PARAMETER"; ++ case EGL_BAD_SURFACE: ++ return "EGL_BAD_SURFACE"; ++ default: ++ return "unknown"; ++ } ++} +diff --git a/gst-libs/gst/gl/gstglwindow_x11ES2.c b/gst-libs/gst/gl/gstglwindow_x11ES2.c +index 260fd2e..65afb50 100644 +--- a/gst-libs/gst/gl/gstglwindow_x11ES2.c ++++ b/gst-libs/gst/gl/gstglwindow_x11ES2.c +@@ -116,16 +116,16 @@ gst_gl_window_finalize (GObject * object) + + if (priv->gl_context) { + ret = +- eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT); + if (!ret) + g_debug ("failed to release opengl context\n"); + +- eglDestroyContext (priv->device, priv->gl_context); ++ eglDestroyContext (priv->gl_display, priv->gl_context); + } + +- if (priv->device) +- eglTerminate (priv->device); ++ if (priv->gl_display) ++ eglTerminate (priv->gl_display); + + XFree (priv->visual_info); + +@@ -510,7 +510,7 @@ callback_activate_gl_context (GstGLWindowPrivate * priv) + void + callback_inactivate_gl_context (GstGLWindowPrivate * priv) + { +- if (!eglMakeCurrent (priv->device, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ if (!eglMakeCurrent (priv->gl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT)) + g_debug ("failed to inactivate opengl context %lud\n", + (gulong) priv->gl_context); +@@ -622,7 +622,7 @@ gst_gl_window_draw_unlocked (GstGLWindow * window, gint width, gint height) + + XSendEvent (priv->device, priv->internal_win_id, FALSE, ExposureMask, + &event); +- XSync (priv->disp_send, FALSE); ++ XSync (priv->device, FALSE); + } + } + +diff --git a/gst/gl/gstglbumper.c b/gst/gl/gstglbumper.c +index 12efe7d..2daec5b 100644 +--- a/gst/gl/gstglbumper.c ++++ b/gst/gl/gstglbumper.c +@@ -157,7 +157,6 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) + + png_structp png_ptr; + png_infop info_ptr; +- guint sig_read = 0; + png_uint_32 width = 0; + png_uint_32 height = 0; + gint bit_depth = 0; +@@ -209,7 +208,7 @@ gst_gl_bumper_init_resources (GstGLFilter * filter) + + png_init_io (png_ptr, fp); + +- png_set_sig_bytes (png_ptr, sig_read); ++ png_set_sig_bytes (png_ptr, sizeof (magic)); + + png_read_info (png_ptr, info_ptr); + +diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c +index d57f5b5..369d7f1 100644 +--- a/gst/gl/gstglimagesink.c ++++ b/gst/gl/gstglimagesink.c +@@ -1,6 +1,6 @@ + /* +- * GStreamer +- * Copyright (C) 2003 Julien Moutte ++ * GStreamerfor ++ * Copyright (C) 2003 Julien Moutte for + * Copyright (C) 2005,2006,2007 David A. Schleef + * Copyright (C) 2008 Julien Isorce + * +@@ -86,6 +86,9 @@ + #include + + #include "gstglimagesink.h" ++#ifdef GPU_VIVANTE ++#include "gstglvivante.h" ++#endif + + GST_DEBUG_CATEGORY (gst_debug_glimage_sink); + #define GST_CAT_DEFAULT gst_debug_glimage_sink +@@ -137,11 +140,13 @@ static GstStaticPadTemplate gst_glimage_sink_template = + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (GST_GL_VIDEO_CAPS ";" +- GST_VIDEO_CAPS_RGB ";" +- GST_VIDEO_CAPS_RGBx ";" +- GST_VIDEO_CAPS_RGBA ";" +- GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) +- ); ++ GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" ++#ifdef GPU_VIVANTE ++ GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") ++#else ++ GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") ++#endif ++ )); + #endif + + enum +@@ -152,7 +157,8 @@ enum + PROP_CLIENT_DRAW_CALLBACK, + PROP_CLIENT_DATA, + PROP_FORCE_ASPECT_RATIO, +- PROP_PIXEL_ASPECT_RATIO ++ PROP_PIXEL_ASPECT_RATIO, ++ PROP_RENDERED_FRAMES + }; + + GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink, +@@ -241,6 +247,10 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) + "The pixel aspect ratio of the device", "1/1", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + ++ g_object_class_install_property (gobject_class, PROP_RENDERED_FRAMES, ++ g_param_spec_int ("rendered", "rendered", ++ "Get the total rendered frames", 0, G_MAXINT, 0, G_PARAM_READABLE)); ++ + gobject_class->finalize = gst_glimage_sink_finalize; + + gstelement_class->change_state = gst_glimage_sink_change_state; +@@ -261,6 +271,7 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink, + glimage_sink->new_window_id = 0; + glimage_sink->display = NULL; + glimage_sink->stored_buffer = NULL; ++ glimage_sink->stored_input_buffer = NULL; + glimage_sink->clientReshapeCallback = NULL; + glimage_sink->clientDrawCallback = NULL; + glimage_sink->client_data = NULL; +@@ -370,6 +381,9 @@ gst_glimage_sink_get_property (GObject * object, guint prop_id, + if (!g_value_transform (glimage_sink->par, value)) + g_warning ("Could not transform string to aspect ratio"); + break; ++ case PROP_RENDERED_FRAMES: ++ g_value_set_int (value, glimage_sink->rendered); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -435,6 +449,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) + + return GST_STATE_CHANGE_FAILURE; + } ++ glimage_sink->rendered = 0; + } + break; + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: +@@ -456,6 +471,10 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) + gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); + glimage_sink->stored_buffer = NULL; + } ++ if (glimage_sink->stored_input_buffer) { ++ gst_buffer_unref (glimage_sink->stored_input_buffer); ++ glimage_sink->stored_input_buffer = NULL; ++ } + if (glimage_sink->display) { + g_object_unref (glimage_sink->display); + glimage_sink->display = NULL; +@@ -533,6 +552,14 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) + if (!ok) + return FALSE; + ++#ifdef GPU_VIVANTE ++ /* special case for format that vivante can't handle */ ++ if (format == GST_VIDEO_FORMAT_NV12 && ++ !gst_gl_vivante_check_format (glimage_sink->display->gpu_priv, format, ++ width, height)) ++ return FALSE; ++#endif ++ + /* init colorspace conversion if needed */ + ok = gst_gl_display_init_upload (glimage_sink->display, format, + width, height, width, height); +@@ -609,6 +636,11 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) + if (!glimage_sink->window_id && !glimage_sink->new_window_id) + gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (glimage_sink)); + ++#ifdef GPU_VIVANTE ++ if (glimage_sink->display->gpu_priv) ++ gst_gl_vivante_set_caps (glimage_sink->display->gpu_priv, caps); ++#endif ++ + return TRUE; + } + +@@ -617,11 +649,18 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) + { + GstGLImageSink *glimage_sink = NULL; + GstGLBuffer *gl_buffer = NULL; ++ gint index; ++ GstFlowReturn res; + + glimage_sink = GST_GLIMAGE_SINK (bsink); + + GST_INFO ("buffer size: %d", GST_BUFFER_SIZE (buf)); + ++ if (buf == glimage_sink->stored_input_buffer) ++ return GST_FLOW_OK; ++ ++ glimage_sink->display->upload_buf_mapped = FALSE; ++ + //is gl + if (glimage_sink->is_gl) { + //increment gl buffer ref before storage +@@ -633,9 +672,16 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) + gl_buffer = gst_gl_buffer_new (glimage_sink->display, + glimage_sink->width, glimage_sink->height); + +- //blocking call +- gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, +- glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); ++ index = G_N_ELEMENTS (buf->_gst_reserved) - 1; ++ ++ if (index >= 0) ++ //blocking call ++ gst_gl_display_do_upload_with_meta (glimage_sink->display, ++ gl_buffer->texture, glimage_sink->width, glimage_sink->height, ++ GST_BUFFER_DATA (buf), buf->_gst_reserved[index]); ++ else ++ gst_gl_display_do_upload (glimage_sink->display, gl_buffer->texture, ++ glimage_sink->width, glimage_sink->height, GST_BUFFER_DATA (buf)); + + //gl_buffer is created in this block, so the gl buffer is already referenced + } +@@ -645,26 +691,36 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf) + gst_gl_display_set_window_id (glimage_sink->display, + glimage_sink->window_id); + } +- //the buffer is cleared when an other comes in +- if (glimage_sink->stored_buffer) { +- gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); +- glimage_sink->stored_buffer = NULL; +- } +- //store current buffer +- glimage_sink->stored_buffer = gl_buffer; +- + //redisplay opengl scene + if (gl_buffer->texture && + gst_gl_display_redisplay (glimage_sink->display, + gl_buffer->texture, gl_buffer->width, gl_buffer->height, + glimage_sink->window_width, glimage_sink->window_height, + glimage_sink->keep_aspect_ratio)) +- return GST_FLOW_OK; ++ res = GST_FLOW_OK; + else { + GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND, + GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL)); +- return GST_FLOW_ERROR; ++ res = GST_FLOW_ERROR; + } ++ ++ //the buffer is cleared when an other comes in ++ if (glimage_sink->stored_buffer) { ++ gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); ++ glimage_sink->stored_buffer = NULL; ++ } ++ if (glimage_sink->stored_input_buffer) { ++ gst_buffer_unref (glimage_sink->stored_input_buffer); ++ glimage_sink->stored_input_buffer = NULL; ++ } ++ //store current buffer ++ glimage_sink->stored_buffer = gl_buffer; ++ if (glimage_sink->display->upload_buf_mapped) ++ glimage_sink->stored_input_buffer = gst_buffer_ref (buf); ++ ++ glimage_sink->rendered++; ++ ++ return res; + } + + +diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h +index c61b5c5..bd40bc4 100644 +--- a/gst/gl/gstglimagesink.h ++++ b/gst/gl/gstglimagesink.h +@@ -51,6 +51,7 @@ struct _GstGLImageSink + + //properties + gchar *display_name; ++ gint rendered; + + gulong window_id; + gulong new_window_id; +@@ -67,6 +68,7 @@ struct _GstGLImageSink + + GstGLDisplay *display; + GstGLBuffer *stored_buffer; ++ GstBuffer *stored_input_buffer; + + CRCB clientReshapeCallback; + CDCB clientDrawCallback; +diff --git a/gst/gl/gstglupload.c b/gst/gl/gstglupload.c +index 09bc96d..8e12532 100644 +--- a/gst/gl/gstglupload.c ++++ b/gst/gl/gstglupload.c +@@ -70,6 +70,9 @@ + + #include "gstglupload.h" + ++#ifdef GPU_VIVANTE ++#include "gstglvivante.h" ++#endif + + #define GST_CAT_DEFAULT gst_gl_upload_debug + GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); +@@ -106,10 +109,13 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template = + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";" +- GST_VIDEO_CAPS_RGBx ";" +- GST_VIDEO_CAPS_RGBA ";" +- GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) +- ); ++ GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBA ";" ++#ifdef GPU_VIVANTE ++ GST_VIDEO_CAPS_YUV ("{ NV12, I420, YV12, YUY2, UYVY, AYUV }") ++#else ++ GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }") ++#endif ++ )); + #endif + + /* Properties */ +@@ -504,6 +510,14 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps, + GST_DEBUG ("caps connot be parsed"); + return FALSE; + } ++#ifdef GPU_VIVANTE ++ /* special case for format that vivante can't handle */ ++ if (upload->video_format == GST_VIDEO_FORMAT_NV12 && ++ !gst_gl_vivante_check_format (upload->display->gpu_priv, ++ upload->video_format, upload->video_width, upload->video_height)) ++ return FALSE; ++#endif ++ + //init colorspace conversion if needed + ret = gst_gl_display_init_upload (upload->display, upload->video_format, + upload->gl_width, upload->gl_height, +diff --git a/tests/examples/cocoa/videoxoverlay/Makefile.am b/tests/examples/cocoa/videoxoverlay/Makefile.am +index 5a85bb4..b4a4932 100755 +--- a/tests/examples/cocoa/videoxoverlay/Makefile.am ++++ b/tests/examples/cocoa/videoxoverlay/Makefile.am +@@ -4,7 +4,7 @@ noinst_PROGRAMS = videoxoverlay + + videoxoverlay_SOURCES = main.m + +-videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ ++videoxoverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJCFLAGS) \ + $(GL_CFLAGS) -I/usr/local/include/gstreamer-0.10 + videoxoverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GL_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) +diff --git a/common/check.mak b/common/check.mak +index 30487f1..bc44620 100644 +--- a/common/check.mak ++++ b/common/check.mak +@@ -24,6 +24,12 @@ LOOPS = 10 + CK_DEFAULT_TIMEOUT=20 \ + $* + ++# just like 'check', but don't run it again if it fails (useful for debugging) ++%.check-norepeat: % ++ @$(TESTS_ENVIRONMENT) \ ++ CK_DEFAULT_TIMEOUT=20 \ ++ $* ++ + # run any given test in a loop + %.torture: % + @for i in `seq 1 $(LOOPS)`; do \ +@@ -152,7 +158,8 @@ help: + @echo + @echo "make check -- run all checks" + @echo "make torture -- run all checks $(LOOPS) times" +- @echo "make (dir)/(test).check -- run the given check once" ++ @echo "make (dir)/(test).check -- run the given check once, repeat with GST_DEBUG=*:2 if it fails" ++ @echo "make (dir)/(test).check-norepeat -- run the given check once, but don't run it again if it fails" + @echo "make (dir)/(test).forever -- run the given check forever" + @echo "make (dir)/(test).torture -- run the given check $(LOOPS) times" + @echo +diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak +index 8cc42e7..084f9ae 100644 +--- a/common/gtk-doc-plugins.mak ++++ b/common/gtk-doc-plugins.mak +@@ -13,8 +13,7 @@ help: + @echo + + # update the stuff maintained by doc maintainers +-update: +- $(MAKE) scanobj-update ++update: scanobj-update + $(MAKE) check-outdated-docs + + # We set GPATH here; this gives us semantics for GNU make +@@ -130,7 +129,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) + --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ + echo " DOC Merging introspection data" && \ + $(PYTHON) \ +- $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ ++ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE) || exit 1; \ + if test x"$(srcdir)" != x. ; then \ + for f in $(SCANOBJ_FILES); \ + do \ +diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am +index 2ddb8a7..856d6e3 100644 +--- a/common/m4/Makefile.am ++++ b/common/m4/Makefile.am +@@ -8,7 +8,6 @@ EXTRA_DIST = \ + as-gcc-inline-assembly.m4 \ + as-libtool.m4 \ + as-libtool-tags.m4 \ +- as-objc.m4 \ + as-python.m4 \ + as-scrub-include.m4 \ + as-version.m4 \ +diff --git a/common/m4/as-compiler-flag.m4 b/common/m4/as-compiler-flag.m4 +index 882a4c7..8bb853a 100644 +--- a/common/m4/as-compiler-flag.m4 ++++ b/common/m4/as-compiler-flag.m4 +@@ -62,3 +62,35 @@ AC_DEFUN([AS_CXX_COMPILER_FLAG], + AC_MSG_RESULT([$flag_ok]) + ]) + ++dnl AS_OBJC_COMPILER_FLAG(CPPFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) ++dnl Tries to compile with the given CPPFLAGS. ++dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags, ++dnl and ACTION-IF-NOT-ACCEPTED otherwise. ++ ++AC_DEFUN([AS_OBJC_COMPILER_FLAG], ++[ ++ AC_REQUIRE([AC_PROG_OBJC]) ++ ++ AC_MSG_CHECKING([to see if Objective C compiler understands $1]) ++ ++ save_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $1" ++ ++ AC_LANG_PUSH([Objective C]) ++ ++ AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no]) ++ CPPFLAGS="$save_CPPFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ $2 ++ true ++ else ++ $3 ++ true ++ fi ++ ++ AC_LANG_POP([Objective C]) ++ ++ AC_MSG_RESULT([$flag_ok]) ++]) ++ +diff --git a/common/m4/as-objc.m4 b/common/m4/as-objc.m4 +deleted file mode 100644 +index 1e7066a..0000000 +--- a/common/m4/as-objc.m4 ++++ /dev/null +@@ -1,56 +0,0 @@ +- +- +-# AC_PROG_OBJC([LIST-OF-COMPILERS]) +-# +-AC_DEFUN([AS_PROG_OBJC], +-[ +-AC_CHECK_TOOLS(OBJC, +- [m4_default([$1], [objcc objc gcc cc CC])], +- none) +-AC_SUBST(OBJC) +-OBJC_LDFLAGS="-lobjc" +-AC_SUBST(OBJC_LDFLAGS) +-if test "x$OBJC" != xnone ; then +- _AM_DEPENDENCIES(OBJC) +- AC_MSG_CHECKING([if Objective C compiler works]) +- cat >>conftest.m < +-@interface Moo:Object +-{ +-} +-- moo; +-int main(); +-@end +- +-@implementation Moo +-- moo +-{ +- exit(0); +-} +- +-int main() +-{ +- id moo; +- moo = [[Moo new]]; +- [[moo moo]]; +- return 1; +-} +-@end +-EOF +- ${OBJC} conftest.m ${OBJC_LDFLAGS} >&5 2>&5 +- if test -f a.out -o -f a.exe ; then +- result=yes +- else +- result=no +- echo failed program is: >&5 +- cat conftest.m >&5 +- fi +- rm -f conftest.m a.out a.exe +- AC_MSG_RESULT([$result]) +-else +- _AM_DEPENDENCIES(OBJC) +-fi +- +-]) +- +- +diff --git a/common/m4/gst-arch.m4 b/common/m4/gst-arch.m4 +index 2e935d2..077a20b 100644 +--- a/common/m4/gst-arch.m4 ++++ b/common/m4/gst-arch.m4 +@@ -5,32 +5,30 @@ dnl defines HOST_CPU + + AC_DEFUN([AG_GST_ARCH], + [ +- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables +- + dnl Determine CPU +- case "x${host_cpu}" in ++ case "x${target_cpu}" in + xi?86 | xk? | xi?86_64) +- case $host_os in ++ case $target_os in + solaris*) + AC_CHECK_DECL([__i386], [I386_ABI="yes"], [I386_ABI="no"]) + AC_CHECK_DECL([__amd64], [AMD64_ABI="yes"], [AMD64_ABI="no"]) + + if test "x$I386_ABI" = "xyes" ; then + HAVE_CPU_I386=yes +- AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) ++ AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) + fi + if test "x$AMD64_ABI" = "xyes" ; then + HAVE_CPU_X86_64=yes +- AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) ++ AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) + fi + ;; + *) + HAVE_CPU_I386=yes +- AC_DEFINE(HAVE_CPU_I386, 1, [Define if the host CPU is an x86]) ++ AC_DEFINE(HAVE_CPU_I386, 1, [Define if the target CPU is an x86]) + + dnl FIXME could use some better detection + dnl (ie CPUID) +- case "x${host_cpu}" in ++ case "x${target_cpu}" in + xi386 | xi486) ;; + *) + AC_DEFINE(HAVE_RDTSC, 1, [Define if RDTSC is available]) ;; +@@ -40,43 +38,43 @@ AC_DEFUN([AG_GST_ARCH], + ;; + xpowerpc) + HAVE_CPU_PPC=yes +- AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the host CPU is a PowerPC]) ;; ++ AC_DEFINE(HAVE_CPU_PPC, 1, [Define if the target CPU is a PowerPC]) ;; + xpowerpc64) + HAVE_CPU_PPC64=yes +- AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the host CPU is a 64 bit PowerPC]) ;; ++ AC_DEFINE(HAVE_CPU_PPC64, 1, [Define if the target CPU is a 64 bit PowerPC]) ;; + xalpha*) + HAVE_CPU_ALPHA=yes +- AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the host CPU is an Alpha]) ;; ++ AC_DEFINE(HAVE_CPU_ALPHA, 1, [Define if the target CPU is an Alpha]) ;; + xarm*) + HAVE_CPU_ARM=yes +- AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the host CPU is an ARM]) ;; ++ AC_DEFINE(HAVE_CPU_ARM, 1, [Define if the target CPU is an ARM]) ;; + xsparc*) + HAVE_CPU_SPARC=yes +- AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the host CPU is a SPARC]) ;; ++ AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a SPARC]) ;; + xmips*) + HAVE_CPU_MIPS=yes +- AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the host CPU is a MIPS]) ;; ++ AC_DEFINE(HAVE_CPU_MIPS, 1, [Define if the target CPU is a MIPS]) ;; + xhppa*) + HAVE_CPU_HPPA=yes +- AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the host CPU is a HPPA]) ;; ++ AC_DEFINE(HAVE_CPU_HPPA, 1, [Define if the target CPU is a HPPA]) ;; + xs390*) + HAVE_CPU_S390=yes +- AC_DEFINE(HAVE_CPU_S390, 1, [Define if the host CPU is a S390]) ;; ++ AC_DEFINE(HAVE_CPU_S390, 1, [Define if the target CPU is a S390]) ;; + xia64*) + HAVE_CPU_IA64=yes +- AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the host CPU is a IA64]) ;; ++ AC_DEFINE(HAVE_CPU_IA64, 1, [Define if the target CPU is a IA64]) ;; + xm68k*) + HAVE_CPU_M68K=yes +- AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the host CPU is a M68K]) ;; ++ AC_DEFINE(HAVE_CPU_M68K, 1, [Define if the target CPU is a M68K]) ;; + xx86_64) + HAVE_CPU_X86_64=yes +- AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the host CPU is a x86_64]) ;; ++ AC_DEFINE(HAVE_CPU_X86_64, 1, [Define if the target CPU is a x86_64]) ;; + xcris) + HAVE_CPU_CRIS=yes +- AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the host CPU is a CRIS]) ;; ++ AC_DEFINE(HAVE_CPU_CRIS, 1, [Define if the target CPU is a CRIS]) ;; + xcrisv32) + HAVE_CPU_CRISV32=yes +- AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the host CPU is a CRISv32]) ;; ++ AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the target CPU is a CRISv32]) ;; + esac + + dnl Determine endianness +@@ -98,6 +96,7 @@ AC_DEFUN([AG_GST_ARCH], + AM_CONDITIONAL(HAVE_CPU_CRISV32, test "x$HAVE_CPU_CRISV32" = "xyes") + + AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu", [the host CPU]) ++ AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu", [the target CPU]) + ]) + + dnl check if unaligned memory access works correctly +diff --git a/common/m4/gst-args.m4 b/common/m4/gst-args.m4 +index 030e7ac..e011ed4 100644 +--- a/common/m4/gst-args.m4 ++++ b/common/m4/gst-args.m4 +@@ -19,6 +19,7 @@ dnl AG_GST_ARG_ENABLE_EXTERNAL + dnl AG_GST_ARG_ENABLE_EXPERIMENTAL + dnl AG_GST_ARG_ENABLE_BROKEN + ++dnl AG_GST_ARG_DISABLE_FATAL_WARNINGS + AC_DEFUN([AG_GST_ARG_DEBUG], + [ + dnl debugging stuff +@@ -110,13 +111,13 @@ AC_DEFUN([AG_GST_ARG_GCOV], + dnl if gcov is used, we do not want default -O2 CFLAGS + if test "x$GST_GCOV_ENABLED" = "xyes" + then +- CFLAGS="-O0" ++ CFLAGS="$CFLAGS -O0" + AC_SUBST(CFLAGS) +- CXXFLAGS="-O0" ++ CXXFLAGS="$CXXFLAGS -O0" + AC_SUBST(CXXFLAGS) +- FFLAGS="-O0" ++ FFLAGS="$FFLAGS -O0" + AC_SUBST(FFLAGS) +- CCASFLAGS="-O0" ++ CCASFLAGS="$CCASFLAGS -O0" + AC_SUBST(CCASFLAGS) + AC_MSG_NOTICE([gcov enabled, setting CFLAGS and friends to $CFLAGS]) + fi +@@ -325,3 +326,20 @@ AC_DEFUN([AG_GST_ARG_ENABLE_BROKEN], + AC_MSG_NOTICE([not building broken plug-ins]) + ]) + ]) ++ ++dnl allow people (or build tools) to override default behaviour ++dnl for fatal compiler warnings ++AC_DEFUN([AG_GST_ARG_DISABLE_FATAL_WARNINGS], ++[ ++ AC_ARG_ENABLE(fatal-warnings, ++ AC_HELP_STRING([--disable-fatal-warnings], ++ [Don't turn compiler warnings into fatal errors]), ++ [ ++ case "${enableval}" in ++ yes) FATAL_WARNINGS=yes ;; ++ no) FATAL_WARNINGS=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-fatal-warnings) ;; ++ esac ++ ], ++ [FATAL_WARNINGS=$GST_GIT]) dnl Default value ++]) +diff --git a/common/m4/gst-check.m4 b/common/m4/gst-check.m4 +index 3fd3acf..f3f39b4 100644 +--- a/common/m4/gst-check.m4 ++++ b/common/m4/gst-check.m4 +@@ -117,6 +117,38 @@ AC_DEFUN([AG_GST_CHECK_GST_CHECK], + ]) + + dnl =========================================================================== ++dnl AG_GST_CHECK_UNINSTALLED_SETUP([ACTION-IF-UNINSTALLED], [ACTION-IF-NOT]) ++dnl ++dnl ACTION-IF-UNINSTALLED (optional) extra actions to perform if the setup ++dnl is an uninstalled setup ++dnl ACTION-IF-NOT (optional) extra actions to perform if the setup ++dnl is not an uninstalled setup ++dnl =========================================================================== ++AC_DEFUN([AG_GST_CHECK_UNINSTALLED_SETUP], ++[ ++ AC_MSG_CHECKING([whether this is an uninstalled GStreamer setup]) ++ AC_CACHE_VAL(gst_cv_is_uninstalled_setup,[ ++ gst_cv_is_uninstalled_setup=no ++ if (set -u; : $GST_PLUGIN_SYSTEM_PATH) 2>/dev/null ; then ++ if test -z "$GST_PLUGIN_SYSTEM_PATH" \ ++ -a -n "$GST_PLUGIN_SCANNER" \ ++ -a -n "$GST_PLUGIN_PATH" \ ++ -a -n "$GST_REGISTRY" \ ++ -a -n "$DYLD_LIBRARY_PATH" \ ++ -a -n "$LD_LIBRARY_PATH"; then ++ gst_cv_is_uninstalled_setup=yes; ++ fi ++ fi ++ ]) ++ AC_MSG_RESULT($gst_cv_is_uninstalled_setup) ++ if test "x$gst_cv_is_uninstalled_setup" = "xyes"; then ++ ifelse([$1], , :, [$1]) ++ else ++ ifelse([$2], , :, [$2]) ++ fi ++]) ++ ++dnl =========================================================================== + dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-MAJORMINOR], [MIN-VERSION], [REQUIRED]) + dnl + dnl Sets GST_PLUGINS_BASE_CFLAGS and GST_PLUGINS_BASE_LIBS. +diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4 +index f8f2364..e12a04c 100644 +--- a/common/m4/gst-error.m4 ++++ b/common/m4/gst-error.m4 +@@ -196,6 +196,91 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS], + AC_MSG_NOTICE([set ERROR_CXXFLAGS to $ERROR_CXXFLAGS]) + ]) + ++dnl Sets WARNING_OBJCFLAGS and ERROR_OBJCFLAGS to something the compiler ++dnl will accept and AC_SUBST them so they are available in Makefile ++dnl ++dnl WARNING_OBJCFLAGS will contain flags to make the compiler emit more ++dnl warnings. ++dnl ERROR_OBJCFLAGS will contain flags to make those warnings fatal, ++dnl unless ADD-WERROR is set to "no" ++dnl ++dnl If MORE_FLAGS is set, tries to add each of the given flags ++dnl to WARNING_CFLAGS if the compiler supports them. Each flag is ++dnl tested separately. ++dnl ++dnl These flags can be overridden at make time: ++dnl make ERROR_OBJCFLAGS= ++AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS], ++[ ++ AC_REQUIRE([AC_PROG_OBJC]) ++ AC_REQUIRE([AS_OBJC_COMPILER_FLAG]) ++ ++ ERROR_OBJCFLAGS="" ++ WARNING_OBJCFLAGS="" ++ ++ dnl if we support -Wall, set it unconditionally ++ AS_OBJC_COMPILER_FLAG(-Wall, WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS -Wall") ++ ++ dnl if asked for, add -Werror if supported ++ if test "x$1" != "xno" ++ then ++ AS_OBJC_COMPILER_FLAG(-Werror, ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -Werror") ++ ++ if test "x$ERROR_OBJCFLAGS" != "x" ++ then ++ dnl Add -fno-strict-aliasing for GLib versions before 2.19.8 ++ dnl as before G_LOCK and friends caused strict aliasing compiler ++ dnl warnings. ++ PKG_CHECK_EXISTS([glib-2.0 < 2.19.8], [ ++ AS_OBJC_COMPILER_FLAG([-fno-strict-aliasing], ++ ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -fno-strict-aliasing") ++ ]) ++ else ++ dnl if -Werror isn't suported, try -errwarn=%all ++ AS_OBJC_COMPILER_FLAG([-errwarn=%all], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS -errwarn=%all") ++ if test "x$ERROR_OBJCFLAGS" != "x"; then ++ dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, ++ dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, ++ dnl no%E_MACRO_REDEFINED (Sun Forte case) ++ dnl For Forte we need disable "empty declaration" warning produced by un-needed semicolon ++ dnl "statement not reached" disabled because there is g_assert_not_reached () in some places ++ dnl "macro redefined" because of gst/gettext.h ++ dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? ++ dnl FIXME: do any of these work with the c++ compiler? if not, why ++ dnl do we check at all? ++ for f in 'no%E_EMPTY_DECLARATION' \ ++ 'no%E_STATEMENT_NOT_REACHED' \ ++ 'no%E_ARGUEMENT_MISMATCH' \ ++ 'no%E_MACRO_REDEFINED' \ ++ 'no%E_LOOP_NOT_ENTERED_AT_TOP' ++ do ++ AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f") ++ done ++ fi ++ fi ++ fi ++ ++ if test "x$2" != "x" ++ then ++ UNSUPPORTED="" ++ list="$2" ++ for each in $list ++ do ++ AS_OBJC_COMPILER_FLAG($each, ++ WARNING_OBJCFLAGS="$WARNING_OBJCFLAGS $each", ++ UNSUPPORTED="$UNSUPPORTED $each") ++ done ++ if test "X$UNSUPPORTED" != X ; then ++ AC_MSG_NOTICE([unsupported compiler flags: $UNSUPPORTED]) ++ fi ++ fi ++ ++ AC_SUBST(WARNING_OBJCFLAGS) ++ AC_SUBST(ERROR_OBJCFLAGS) ++ AC_MSG_NOTICE([set WARNING_OBJCFLAGS to $WARNING_OBJCFLAGS]) ++ AC_MSG_NOTICE([set ERROR_OBJCFLAGS to $ERROR_OBJCFLAGS]) ++]) ++ + dnl Sets the default error level for debugging messages + AC_DEFUN([AG_GST_SET_LEVEL_DEFAULT], + [ +diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4 +index c072c79..cff7f30 100644 +--- a/common/m4/gst-feature.m4 ++++ b/common/m4/gst-feature.m4 +@@ -232,10 +232,11 @@ AC_DEFUN([AG_GST_CHECK_GST_DEBUG_DISABLED], + save_CFLAGS="$CFLAGS" + CFLAGS="$GST_CFLAGS $CFLAGS" + AC_COMPILE_IFELSE([ ++ AC_LANG_SOURCE([[ + #include + #ifdef GST_DISABLE_GST_DEBUG + #error "debugging disabled, make compiler fail" +- #endif], [ debug_system_enabled=yes], [debug_system_enabled=no]) ++ #endif]])], [ debug_system_enabled=yes], [debug_system_enabled=no]) + CFLAGS="$save_CFLAGS" + AC_LANG_POP([C]) + +diff --git a/common/m4/gst.m4 b/common/m4/gst.m4 +index ddfde51..d4c53cb 100644 +--- a/common/m4/gst.m4 ++++ b/common/m4/gst.m4 +@@ -3,10 +3,15 @@ dnl sets up use of GStreamer configure.ac macros + dnl all GStreamer autoconf macros are prefixed + dnl with AG_GST_ for public macros + dnl with _AG_GST_ for private macros ++dnl ++dnl We call AC_CANONICAL_TARGET and AC_CANONICAL_HOST so that ++dnl it is valid before AC_ARG_PROGRAM is called + + AC_DEFUN([AG_GST_INIT], + [ + m4_pattern_forbid(^_?AG_GST_) ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables ++ AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables + ]) + + dnl AG_GST_PKG_CONFIG_PATH diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend index 912e040f..3cf5991a 100644 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend @@ -1,10 +1,10 @@ # gst-plugins-gl for imx6 Vivante FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 3}" +PRINC := "${@int(PRINC) + 4}" DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" -SRC_URI_append_mx6 = " file://0001-freescale-mx6-release-1.1.0.patch" +SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch" CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS"