Removing avifile and http plugins, also fixing some disting issues

Original commit message from CVS:
Removing avifile and http plugins, also fixing some disting issues

diff --git a/configure.ac b/configure.ac
index 5ce2ea7..b3e0fb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -465,18 +465,6 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [
   AC_CHECK_LIB(audiofile, afOpenVirtualFile, , HAVE_AUDIOFILE="no")
 ])
 
-dnl *** avifile ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_AVIFILE, true)
-GST_CHECK_FEATURE(AVIFILE, [avifile], winenc windec, [
-  if test "x$no_x" = "xyes"; then
-    AC_MSG_WARN([No X libraries found, avifile test might fail compilation])
-  fi
-  if test "x$HAVE_CXX" != "xyes"; then
-    AC_MSG_WARN([No C++ compiler found, avifile test will fail compilation])
-  fi
-  AS_AVIFILE(0.7.0)
-])
-
 dnl *** CDParanoia ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
 GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
@@ -1171,7 +1159,6 @@ ext/alsa/Makefile
 ext/arts/Makefile
 ext/artsd/Makefile
 ext/audiofile/Makefile
-ext/avifile/Makefile
 ext/cdparanoia/Makefile
 ext/divx/Makefile
 ext/dv/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index cc849f9..79b9c52 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -34,12 +34,6 @@ else
 AUDIOFILE_DIR=
 endif
 
-if USE_AVIFILE
-AVIFILE_DIR=avifile
-else
-AVIFILE_DIR=
-endif
-
 if USE_CDPARANOIA
 CDPARANOIA_DIR=cdparanoia
 else
@@ -112,12 +106,6 @@ else
 HERMES_DIR=
 endif
 
-if USE_HTTP
-HTTP_DIR=http
-else
-HTTP_DIR=
-endif
-
 if USE_JACK
 JACK_DIR=jack
 else
@@ -270,10 +258,10 @@ endif
 
 SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
-       $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DIVX_DIR) \
+       $(CDPARANOIA_DIR) $(DIVX_DIR) \
        $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) $(MAS_DIR) \
        $(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
-       $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
+       $(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \
        $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
        $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \
        $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
@@ -284,8 +272,8 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
 
 DIST_SUBDIRS=\
        a52dec aalib alsa \
-       arts artsd avifile \
-       audiofile cdparanoia dv \
+       arts artsd \
+       audiofile cdparanoia divx dv \
        dvdread dvdnav esd mas ffmpeg \
        flac gnomevfs gsm \
        hermes http ivorbis jack jpeg \
@@ -294,4 +282,4 @@ DIST_SUBDIRS=\
        openquicktime raw1394 \
        sdl snapshot shout shout2 sidplay \
        smoothwave swfdec tarkin vorbis \
-       xmms xvid
+       xmms xvid 

diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c
index 3be0998..f0883c7 100644 (file)
--- a/gst-libs/gst/play/play.old.c
+++ b/gst-libs/gst/play/play.old.c
@@ -224,6 +224,7 @@ gst_play_get_length_callback (GstPlay *play)
                g_mutex_lock(play->audio_bin_mutex);
                query_worked = gst_element_query (play->audio_sink_element, GST_QUERY_TOTAL, &format, &value);
                g_mutex_unlock(play->audio_bin_mutex);
+               g_message ("getting length from audio sink");
        }
        else if (       (play->video_sink_element != NULL) &&
                                (GST_IS_ELEMENT (play->video_sink_element)) ) {

diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in
index c51b08b..c1c7916 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
@@ -324,30 +324,6 @@ Plug-ins for playback of AVI format media files.
 %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
 ### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-### AVIFILE ###
-@USE_AVIFILE_TRUE@%package -n gstreamer-windec
-@USE_AVIFILE_TRUE@Summary:       GStreamer plug-in for Windows DLL loading
-@USE_AVIFILE_TRUE@Group:         Libraries/Multimedia
-@USE_AVIFILE_TRUE@Requires:      gstreamer-plugins = %{version}
-@USE_AVIFILE_TRUE@Requires:      avifile
-@USE_AVIFILE_TRUE@BuildRequires: avifile-devel
-@USE_AVIFILE_TRUE@
-@USE_AVIFILE_TRUE@%description -n gstreamer-windec
-@USE_AVIFILE_TRUE@Plug-ins for playback for loading window DLL files. 
-@USE_AVIFILE_TRUE@Needed for playback of some  AVI format media files.
-@USE_AVIFILE_TRUE@
-@USE_AVIFILE_TRUE@%files -n gstreamer-windec
-@USE_AVIFILE_TRUE@%defattr(-, root, root)
-@USE_AVIFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstwincodec.so
-@USE_AVIFILE_TRUE@
-@USE_AVIFILE_TRUE@%post -n gstreamer-windec
-@USE_AVIFILE_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
-@USE_AVIFILE_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_AVIFILE_TRUE@
-@USE_AVIFILE_TRUE@%postun -n gstreamer-windec
-@USE_AVIFILE_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
-@USE_AVIFILE_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-
 ### CDPARANOIA ###
 @USE_CDPARANOIA_TRUE@%package -n gstreamer-cdparanoia
 @USE_CDPARANOIA_TRUE@Summary:       GStreamer plug-in for CD audio input using CDParanoia IV.