gst-plugins-gl: Upgrade to IMX_MMCODEC_3.0.35_4.0.0
PATCH 1/2 gst-plugins-gl: Upgrade to IMX_MMCODEC_3.0.35_4.0.0
From: Rogerio Nunes <[email protected]>
Signed-off-by Rogerio Nunes <[email protected]>
--- .../0001-freescale-mx6-release-1.1.0.patch |28588 -------------------- .../gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch | 2438 ++ .../gstreamer/gst-plugins-gl_0.10.3.bbappend | 4 +- 3 files changed, 2440 insertions(+), 28590 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch create mode 100644 recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch
recipes-multimedia/gstreamer/gst-plugins-gl/0001-freescale-mx6-release-1.1.0.patch deleted +0 -28588
@@ -1,28588 +0,0 @@ -From cd4d8e46207f5151357030f3e785b1e58c968a9b Mon Sep 17 00:00:00 2001 -From: Jeremy Stashluk <[email protected]> -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 <[email protected]> ---- - 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 <glib-object.h>\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 = '[email protected]'; -+#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 = <CONFIG>; -+ 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 = <TYPE>; -+ chomp $type; -+ close TYPE; -+ -+ open OBJ, "-|" or exec "git", "cat-file", $type, $obj or die "cannot run git-cat-file"; -+ while (<OBJ>) -+ { -+ 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("", <STAT>); -+ 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( "", <DIFF> ); -+ 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 (<LIST>) -+ { -+ 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 (<LIST>) -+ { -+ 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 <SHA1> -+ -+ # 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 <gst/gstconfig.h> - #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 <[email protected]>. - # - # This program is free software; you can redistribute it and/or modify -@@ -29,186 +29,21 @@ scriptversion=2012-01-04.17; # UTC - # bugs to <[email protected]> or send patches to - # <[email protected]>. - --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 -- ;;
Lines of this file are not shown. View the raw message.
recipes-multimedia/gstreamer/gst-plugins-gl/IMX_MMCODEC_3.0.35_4.0.0.patch new file +2438 -0
2,438 lines not on this page · raw message
recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 2/2 gst-plugins-gl: Enforce glib2 deprecated API support
From: Rogerio Nunes <[email protected]>
With newer version of the glib2 recipe in poky, deprecated APIs have been enforced disabled, so we need to re-enable them in the meta-fsl-arm layer while they are still in use.
Signed-off-by Rogerio Nunes <[email protected]>
--- .../gstreamer/gst-plugins-gl_0.10.3.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend +1 -1
@@ -7,4 +7,4 @@ DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch" -CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS" +CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS -UG_DISABLE_DEPRECATED"
Signature · 1 line
1.7.9.5