From 720e3827bb3deea96ad54e8f04810725beb9d768 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 24 Oct 2010 16:39:42 +0000 Subject: [PATCH] fix static modules build, remove useless checks. - custom pipelines are gone, remove from src/lib/Makefile.am - no need to check for ffmpeg/cdda anymore, they are handled by playbin2 SVN revision: 53837 --- legacy/emotion/configure.ac | 2 -- legacy/emotion/m4/emotion_check.m4 | 18 ------------------ legacy/emotion/src/lib/Makefile.am | 7 +------ 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac index 7d72c86626..217925186d 100644 --- a/legacy/emotion/configure.ac +++ b/legacy/emotion/configure.ac @@ -230,8 +230,6 @@ echo " Modules:" echo " Xine...............: ${enable_xine}" echo " Vlc................: ${enable_vlc}" echo " Gstreamer..........: ${enable_gstreamer}" -echo " Gstreamer FFmpeg...: ${have_gst_ffmpeg}" -echo " Gstreamer CDDA.....: ${have_gst_cdiocddasrc}" echo echo " Build emotion_test...: $have_emotion_test" echo " edje_cc..............: ${edje_cc}" diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4 index b25d48b37a..d763b04752 100644 --- a/legacy/emotion/m4/emotion_check.m4 +++ b/legacy/emotion/m4/emotion_check.m4 @@ -32,9 +32,6 @@ GSTPLUG_REQS=0.10.1 GST_MAJORMINOR=0.10 requirement="" -have_gst_ffmpeg="no" -have_gst_cdiocddasrc="no" - PKG_CHECK_MODULES([GSTREAMER], [gstreamer-$GST_MAJORMINOR >= $GST_REQS gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS evas >= 0.9.9], [ @@ -43,21 +40,6 @@ PKG_CHECK_MODULES([GSTREAMER], ], [have_dep="no"]) -if test "x${have_dep}" = "xyes" ; then - - AM_GST_ELEMENT_CHECK([ffmpeg], [have_gst_ffmpeg="yes"], [have_gst_ffmpeg="no"]) - - AM_GST_ELEMENT_CHECK([cdiocddasrc], [have_gst_cdiocddasrc="yes"], [have_gst_cdiocddasrc="no"]) - - if test "x${have_gst_ffmpeg}" = "xno" ; then - AC_MSG_WARN([You should install gst-ffmpeg to decode most of the video and uadio file formats]) - fi - - if test "x${have_gst_cdiocddasrc}" = "xno" ; then - AC_MSG_WARN([You should install gst-cdiocddasrc to decode CD Audio]) - fi -fi - if test "x$1" = "xstatic" ; then requirement_emotion="${requirement} ${requirement_emotion}" fi diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am index 862df5dc9d..96eabdd6b9 100644 --- a/legacy/emotion/src/lib/Makefile.am +++ b/legacy/emotion/src/lib/Makefile.am @@ -38,12 +38,7 @@ endif if EMOTION_STATIC_BUILD_GSTREAMER libemotion_la_SOURCES += \ $(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c \ -$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_v4l.c +$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c endif if EMOTION_STATIC_BUILD_VLC