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
This commit is contained in:
parent
59671af073
commit
720e3827bb
|
@ -230,8 +230,6 @@ echo " Modules:"
|
||||||
echo " Xine...............: ${enable_xine}"
|
echo " Xine...............: ${enable_xine}"
|
||||||
echo " Vlc................: ${enable_vlc}"
|
echo " Vlc................: ${enable_vlc}"
|
||||||
echo " Gstreamer..........: ${enable_gstreamer}"
|
echo " Gstreamer..........: ${enable_gstreamer}"
|
||||||
echo " Gstreamer FFmpeg...: ${have_gst_ffmpeg}"
|
|
||||||
echo " Gstreamer CDDA.....: ${have_gst_cdiocddasrc}"
|
|
||||||
echo
|
echo
|
||||||
echo " Build emotion_test...: $have_emotion_test"
|
echo " Build emotion_test...: $have_emotion_test"
|
||||||
echo " edje_cc..............: ${edje_cc}"
|
echo " edje_cc..............: ${edje_cc}"
|
||||||
|
|
|
@ -32,9 +32,6 @@ GSTPLUG_REQS=0.10.1
|
||||||
GST_MAJORMINOR=0.10
|
GST_MAJORMINOR=0.10
|
||||||
|
|
||||||
requirement=""
|
requirement=""
|
||||||
have_gst_ffmpeg="no"
|
|
||||||
have_gst_cdiocddasrc="no"
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES([GSTREAMER],
|
PKG_CHECK_MODULES([GSTREAMER],
|
||||||
[gstreamer-$GST_MAJORMINOR >= $GST_REQS gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS evas >= 0.9.9],
|
[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"])
|
[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
|
if test "x$1" = "xstatic" ; then
|
||||||
requirement_emotion="${requirement} ${requirement_emotion}"
|
requirement_emotion="${requirement} ${requirement_emotion}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -38,12 +38,7 @@ endif
|
||||||
if EMOTION_STATIC_BUILD_GSTREAMER
|
if EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
libemotion_la_SOURCES += \
|
libemotion_la_SOURCES += \
|
||||||
$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
|
$(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.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
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if EMOTION_STATIC_BUILD_VLC
|
if EMOTION_STATIC_BUILD_VLC
|
||||||
|
|
Loading…
Reference in New Issue