apply Jeroens patch to move us to mpeg2dec 0.3.1, also update REQ file and spec file.

[platform/upstream/gstreamer.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 905b35c..071c471 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -704,24 +704,10 @@ GST_CHECK_FEATURE(MJPEGTOOLS, [mjpegtools], jpegmmxenc jpegmmxdec, [
 dnl *** mpeg2dec ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
 GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
-  PKG_CHECK_MODULES(LIBMPEG2, libmpeg2 >= 0.3.0,
-      HAVE_LIBMPEG2="yes", HAVE_LIBMPEG2="no")
-  AC_SUBST(LIBMPEG2_CFLAGS)
-  AC_SUBST(LIBMPEG2_LIBS)
-
-  PKG_CHECK_MODULES(LIBCPUACCEL, libcpuaccel >= 0.3.0,
-      HAVE_LIBCPUACCEL="yes", HAVE_LIBCPUACCEL="no")
-  AC_SUBST(LIBCPUACCEL_CFLAGS)
-  AC_SUBST(LIBCPUACCEL_LIBS)
-
-  HAVE_MPEG2DEC="no"
-  if test x$HAVE_LIBMPEG2 = xyes -a x$HAVE_LIBCPUACCEL = xyes; then
-    HAVE_MPEG2DEC="yes"
-    MPEG2DEC_CFLAGS="$LIBMPEG2_CFLAGS $LIBCPUACCEL_CFLAGS"
-    MPEG2DEC_LIBS="$LIBMPEG2_LIBS $LIBCPUACCEL_LIBS"
-    AC_SUBST(MPEG2DEC_CFLAGS)
-    AC_SUBST(MPEG2DEC_LIBS)
-  fi
+  PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.3.0,
+      HAVE_MPEG2DEC="yes", HAVE_MPEG2DEC="no")
+  AC_SUBST(MPEG2DEC_CFLAGS)
+  AC_SUBST(MPEG2DEC_LIBS)
 ])
 
 dnl *** openquicktime ***