summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2010-10-24 16:39:42 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2010-10-24 16:39:42 +0000
commit720e3827bb3deea96ad54e8f04810725beb9d768 (patch)
treefa6caed92113a4ed29fb25285626071545098f01 /legacy/emotion
parent59671af07302cd61cd5dd30fd9ff7652eb405db0 (diff)
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
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac2
-rw-r--r--legacy/emotion/m4/emotion_check.m418
-rw-r--r--legacy/emotion/src/lib/Makefile.am7
3 files changed, 1 insertions, 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:"
230echo " Xine...............: ${enable_xine}" 230echo " Xine...............: ${enable_xine}"
231echo " Vlc................: ${enable_vlc}" 231echo " Vlc................: ${enable_vlc}"
232echo " Gstreamer..........: ${enable_gstreamer}" 232echo " Gstreamer..........: ${enable_gstreamer}"
233echo " Gstreamer FFmpeg...: ${have_gst_ffmpeg}"
234echo " Gstreamer CDDA.....: ${have_gst_cdiocddasrc}"
235echo 233echo
236echo " Build emotion_test...: $have_emotion_test" 234echo " Build emotion_test...: $have_emotion_test"
237echo " edje_cc..............: ${edje_cc}" 235echo " 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
32GST_MAJORMINOR=0.10 32GST_MAJORMINOR=0.10
33 33
34requirement="" 34requirement=""
35have_gst_ffmpeg="no"
36have_gst_cdiocddasrc="no"
37
38PKG_CHECK_MODULES([GSTREAMER], 35PKG_CHECK_MODULES([GSTREAMER],
39 [gstreamer-$GST_MAJORMINOR >= $GST_REQS gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS evas >= 0.9.9], 36 [gstreamer-$GST_MAJORMINOR >= $GST_REQS gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS evas >= 0.9.9],
40 [ 37 [
@@ -43,21 +40,6 @@ PKG_CHECK_MODULES([GSTREAMER],
43 ], 40 ],
44 [have_dep="no"]) 41 [have_dep="no"])
45 42
46if test "x${have_dep}" = "xyes" ; then
47
48 AM_GST_ELEMENT_CHECK([ffmpeg], [have_gst_ffmpeg="yes"], [have_gst_ffmpeg="no"])
49
50 AM_GST_ELEMENT_CHECK([cdiocddasrc], [have_gst_cdiocddasrc="yes"], [have_gst_cdiocddasrc="no"])
51
52 if test "x${have_gst_ffmpeg}" = "xno" ; then
53 AC_MSG_WARN([You should install gst-ffmpeg to decode most of the video and uadio file formats])
54 fi
55
56 if test "x${have_gst_cdiocddasrc}" = "xno" ; then
57 AC_MSG_WARN([You should install gst-cdiocddasrc to decode CD Audio])
58 fi
59fi
60
61if test "x$1" = "xstatic" ; then 43if test "x$1" = "xstatic" ; then
62 requirement_emotion="${requirement} ${requirement_emotion}" 44 requirement_emotion="${requirement} ${requirement_emotion}"
63fi 45fi
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
38if EMOTION_STATIC_BUILD_GSTREAMER 38if EMOTION_STATIC_BUILD_GSTREAMER
39libemotion_la_SOURCES += \ 39libemotion_la_SOURCES += \
40$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \ 40$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
41$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c \ 41$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c
42$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c \
43$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c \
44$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c \
45$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c \
46$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_v4l.c
47endif 42endif
48 43
49if EMOTION_STATIC_BUILD_VLC 44if EMOTION_STATIC_BUILD_VLC