X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=5a84fe4b6e1d43eec1424203192fc9b16c881eda;hb=b8b5704445b831bc505a825cfef24ef30e00d5f0;hp=d38d876533a474a00ce702d087cde79a7d24420a;hpb=2b15ae4ecd75d479a469311aac165bff8be4af96;p=platform%2Fupstream%2Fgst-plugins-good.git diff --git a/configure.ac b/configure.ac index d38d876..5a84fe4 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, git and prerelease does -Werror too dnl use a three digit version number for releases, and four for git/pre -AC_INIT([GStreamer Good Plug-ins],[1.3.0.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-good]) +AC_INIT([GStreamer Good Plug-ins],[1.5.0.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-good]) AG_GST_INIT @@ -43,11 +43,11 @@ AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION", [GStreamer API Version]) AG_GST_LIBTOOL_PREPARE -AS_LIBTOOL(GST, 300, 0, 300) +AS_LIBTOOL(GST, 501, 0, 501) dnl *** required versions of GStreamer stuff *** -GST_REQ=1.3.0.1 -GSTPB_REQ=1.3.0.1 +GST_REQ=1.5.0.1 +GSTPB_REQ=1.5.0.1 dnl *** autotools stuff **** @@ -499,53 +499,17 @@ AG_GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosink, [ ]) dnl *** Video 4 Linux 2 *** -dnl for information about the header/define, see sys/v4l2/gstv4l2element.h dnl renamed to GST_V4L2 because of some conflict with kernel headers translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L2, true) -AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [ - AC_MSG_CHECKING([Checking for up to date v4l2 installation]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#ifdef __sun /* Solaris */ -#include -#include -#elif __FreeBSD__ -#include -#else /* Linux */ -#include -#define _LINUX_TIME_H -#define __user -#include -#endif -#if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION) -#error too early v4l2 version or no v4l2 at all -#endif - ]], [[ -return 0; - ]])],[ - HAVE_GST_V4L2="yes" - AC_MSG_RESULT(yes) - ],[ - HAVE_GST_V4L2="no" - AC_MSG_RESULT(no) - - HAVE_VIDEODEV=no - AC_CHECK_HEADER(linux/videodev2.h, [ HAVE_VIDEODEV=yes ], - [ - AC_CHECK_HEADER(sys/videodev2.h, [ HAVE_VIDEODEV=yes ]) - ]) - - if test "x$HAVE_VIDEODEV" = "xyes"; then - AC_MSG_WARN([video4linux2 headers were found, but they're old.]) - AC_MSG_WARN([Please update v4l2 to compile the v4l2 plugins]) - else - AC_MSG_WARN([video4linux2 was not found]) - fi - ]) - - if [ test x$HAVE_GST_V4L2 = xyes ]; then - dnl check for XOverlay libraries - AG_GST_CHECK_XV +HAVE_GST_V4L2=no +AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], video4linux2, [ + AC_MSG_CHECKING([Checking for video4linux2 header ...]) + AC_CHECK_HEADER(linux/videodev2.h, [ HAVE_GST_V4L2=yes ], + [ + AC_CHECK_HEADER(sys/videodev2.h, [ HAVE_GST_V4L2=yes ]) + ]) + if test "x$HAVE_VIDEODEV" = "xno"; then + AC_MSG_WARN([video4linux2 was not found]) fi ]) @@ -556,18 +520,14 @@ AC_ARG_WITH([gudev], [with_gudev=check]) if test x$HAVE_GST_V4L2 = xyes; then if test x$with_gudev != xno; then - PKG_CHECK_MODULES(GUDEV, [ gudev-1.0 >= 143 ], - [ have_gudev=yes - AC_DEFINE(HAVE_GUDEV, 1, - [Whether gudev is available for device detection]) - AC_DEFINE([G_UDEV_API_IS_SUBJECT_TO_CHANGE], 1, [I know the API is subject to change.]) - ], [ - have_gudev=no - ]) - else - have_gudev=no + PKG_CHECK_MODULES(GUDEV, [ gudev-1.0 >= 147 ], + [ AC_DEFINE(HAVE_GUDEV, 1, + [Whether gudev is available for device detection]) + ], + [true]) fi fi + AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_LIBS) @@ -590,49 +550,14 @@ if test x$HAVE_GST_V4L2 = xyes; then fi fi -# Check if v4l2 support dmabuf -if test x$HAVE_GST_V4L2 = xyes; then - AC_CHECK_DECLS(V4L2_MEMORY_DMABUF,,,[ - #include - #ifdef __sun /* Solaris */ - #include - #include - #elif __FreeBSD__ - #include - #else /* Linux */ - #include - #define _LINUX_TIME_H - #define __user - #include - #endif - ]) -fi - dnl Check for X11 translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) AG_GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesrc], [ - AC_PATH_XTRA - - dnl now try to find the HEADER - ac_cflags_save="$CFLAGS" - ac_cppflags_save="$CPPFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no") + AG_GST_CHECK_X - if test "x$HAVE_X" = "xno" + if test "x$HAVE_X" = "xyes" then - AC_MSG_NOTICE([cannot find X11 development files]) - else - dnl this is much more than we want - X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS" - dnl AC_PATH_XTRA only defines the path needed to find the X libs, - dnl it does not add the libs; therefore we add them here - X_LIBS="$X_LIBS -lX11" - AC_SUBST(X_CFLAGS) - AC_SUBST(X_LIBS) - dnl check for Xfixes PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no") if test "x$HAVE_XFIXES" = "xyes" @@ -651,9 +576,6 @@ AG_GST_CHECK_FEATURE(X, [X libraries and plugins], AC_SUBST(XDAMAGE_LIBS) AC_SUBST(XDAMAGE_CFLAGS) fi - AC_SUBST(HAVE_X) - CFLAGS="$ac_cflags_save" - CPPFLAGS="$ac_cppflags_save" ]) dnl FIXME: this should be rolled into the test above, it's just an additional @@ -683,13 +605,6 @@ AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], , [ AC_SUBST(XSHM_LIBS) ]) -dnl for V4L2, we also need to know if we have XVIDEO -translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true) -AG_GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], - [], [ - AG_GST_CHECK_XV -]) - dnl *** ext plug-ins *** dnl keep this list sorted alphabetically ! @@ -1005,7 +920,6 @@ AM_CONDITIONAL(USE_DIRECTSOUND, false) AM_CONDITIONAL(USE_DV1394, false) AM_CONDITIONAL(USE_FLAC, false) AM_CONDITIONAL(USE_GDK_PIXBUF, false) -AM_CONDITIONAL(USE_GST_V4L2, false) AM_CONDITIONAL(USE_JACK, false) AM_CONDITIONAL(USE_JPEG, false) AM_CONDITIONAL(USE_LIBCACA, false) @@ -1027,7 +941,6 @@ AM_CONDITIONAL(USE_WAVEFORM, false) AM_CONDITIONAL(USE_WAVPACK, false) AM_CONDITIONAL(USE_X, false) AM_CONDITIONAL(USE_XSHM, false) -AM_CONDITIONAL(USE_XVIDEO, false) AM_CONDITIONAL(USE_ZLIB, false) fi dnl of EXT plugins