From 390621f8de27467709897c92e5fec4605d96be75 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 5 Sep 2005 15:10:18 +0000 Subject: [PATCH] cleaning up bad Original commit message from CVS: cleaning up bad --- Makefile.am | 36 +--- configure.ac | 6 +- ext/faad/gstfaad.c | 23 +-- gst-plugins-bad.spec.in | 493 ++++++++++++++++++++++++++++++++++++++++++++++++ gst/qtdemux/qtdemux.c | 13 +- po/POTFILES.in | 2 - 6 files changed, 520 insertions(+), 53 deletions(-) create mode 100644 gst-plugins-bad.spec.in diff --git a/Makefile.am b/Makefile.am index ae2e7da..861c257 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,38 +1,10 @@ -# if USE_GCONFTOOL -# GCONF_DIR = gconf -# else -GCONF_DIR = -# endif - -SUBDIRS = \ - gst sys ext gst-libs \ - $(GCONF_DIR) \ - m4 common po -# disabled -# $(SUBDIRS_DOCS) - -DIST_SUBDIRS = \ - gst sys ext gst-libs \ +SUBDIRS = \ + gst sys ext \ m4 common po EXTRA_DIST = \ - gst-plugins.spec depcomp \ - AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \ + gst-plugins-bad.spec depcomp \ + AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \ ChangeLog autogen.sh DISTCLEANFILES = _stdint.h - -# check that no marshal or enumtypes files are included -# this in turn ensures that distcheck fails for missing .list files which is currently -# shadowed when the corresponding .c and .h files are included. -distcheck-hook: - @test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \ - test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \ - ( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball." && \ - $(ECHO) "*** Make sure the following files are not disted:" && \ - find $(distdir) -name \*-enumtypes.[ch] && \ - find $(distdir) -name \*-marshal.[ch] && \ - false ) - -# include $(top_srcdir)/common/release.mak -# include $(top_srcdir)/common/po.mak diff --git a/configure.ac b/configure.ac index 19d9551..b239b25 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,13 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 9, 0, 1, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gst-plugins, GST_PLUGINS_BAD_VERSION, 0, 9, 0, 1, + GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR +GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR dnl we override it here if we need to for the release candidate of new series GST_MAJORMINOR=0.9 AC_SUBST(GST_MAJORMINOR) @@ -441,6 +442,7 @@ ext/gsm/Makefile common/Makefile common/m4/Makefile m4/Makefile +po/Makefile.in ) AC_OUTPUT diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 0ad592b..686ce1d 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -94,7 +94,8 @@ static gboolean gst_faad_setcaps (GstPad * pad, GstCaps * caps); static GstCaps *gst_faad_srcgetcaps (GstPad * pad); static gboolean gst_faad_event (GstPad * pad, GstEvent * event); static GstFlowReturn gst_faad_chain (GstPad * pad, GstBuffer * buffer); -static GstElementStateReturn gst_faad_change_state (GstElement * element); +static GstStateChangeReturn gst_faad_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class; /* NULL */ @@ -888,16 +889,16 @@ out: return ret; } -static GstElementStateReturn -gst_faad_change_state (GstElement * element) +static GstStateChangeReturn +gst_faad_change_state (GstElement * element, GstStateChange transition) { GstFaad *faad = GST_FAAD (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: { if (!(faad->handle = faacDecOpen ())) - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; else { faacDecConfiguration *conf; @@ -906,11 +907,11 @@ gst_faad_change_state (GstElement * element) /* conf->dontUpSampleImplicitSBR = 1; */ conf->outputFormat = FAAD_FMT_16BIT; if (faacDecSetConfiguration (faad->handle, conf) == 0) - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } break; } - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: faad->samplerate = -1; faad->channels = -1; faad->need_channel_setup = TRUE; @@ -919,7 +920,7 @@ gst_faad_change_state (GstElement * element) faad->channel_positions = NULL; faad->next_ts = 0; break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: faacDecClose (faad->handle); faad->handle = NULL; if (faad->tempbuf) { @@ -932,9 +933,9 @@ gst_faad_change_state (GstElement * element) } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } static gboolean diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in new file mode 100644 index 0000000..25a0e98 --- /dev/null +++ b/gst-plugins-bad.spec.in @@ -0,0 +1,493 @@ +%define majorminor @GST_MAJORMINOR@ +%define gstreamer gstreamer09 +%define gstregister %{_bindir}/gst-register-%{majorminor} +%define register %{gstregister} > /dev/null 2>&1 || : + +%define gst_minver 0.9.1 + +Name: %{gstreamer}-plugins-bad +Version: @VERSION@ +Release: @GST_PLUGINS_BAD_VERSION_RELEASE@.gst +Summary: GStreamer plug-ins of bad quality + +%define majorminor @GST_MAJORMINOR@ + +Group: Applications/Multimedia +License: LGPL +URL: http://gstreamer.freedesktop.org/ +Vendor: GStreamer Backpackers Team +Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: %{gstreamer} >= %{gst_minver} +BuildRequires: %{gstreamer}-devel >= %{gst_minver} +Requires(post): %{gstregister} +Requires(postun): %{gstregister} + +BuildRequires: gcc-c++ + +# @USE_AUDIOFILE_TRUE@Requires: audiofile >= 0.2.1 +# @USE_AUDIOFILE_TRUE@BuildRequires: audiofile-devel >= 0.2.1 +@USE_FAAD_TRUE@BuildRequires: faad2-devel >= 2.0 +# @USE_GSM_TRUE@BuildRequires: gsm-devel >= 1.0.10 +# @USE_HERMES_TRUE@Requires: Hermes >= 1.3.0 +# @USE_HERMES_TRUE@BuildRequires: Hermes-devel >= 1.3.0 +# @USE_LIBFAME_TRUE@BuildRequires: libfame-devel >= 0.9.0 +# @USE_SDL_TRUE@Requires: SDL >= 1.2.0 +# @USE_SDL_TRUE@BuildRequires: SDL-devel >= 1.2.0 +# @USE_SDL_TRUE@#SDL-devel should require XFree86-devel because it links to it +# @USE_SDL_TRUE@#only it doesn't seem to do that currently +# @USE_SDL_TRUE@BuildRequires: XFree86-devel +# @USE_SWFDEC_TRUE@BuildRequires: swfdec-devel + +@USE_FAAD_TRUE@Provides: gstreamer-faad = %{version}-%{release} +# @USE_GSM_TRUE@Provides: gstreamer-gsm = %{version}-%{release} +# @USE_LIBFAME_TRUE@Provides: gstreamer-libfame = %{version}-%{release} +# @USE_SWFDEC_TRUE@Provides: gstreamer-swfdec = %{version}-%{release} + +%description +GStreamer is a streaming media framework, based on graphs of filters which +operate on media data. Applications using this library can do anything +from real-time sound processing to playing videos, and just about anything +else media-related. Its plugin-based architecture means that new data +types or processing capabilities can be added simply by installing new +plug-ins. + +This package contains GStreamer Plugins that are considered to be of bad +quality, even though they might work. + +%prep +%setup -q -n gst-plugins-bad-%{version} + +%build +%configure + +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall + +# Clean out files that should not be part of the rpm. +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +%find_lang gst-plugins-bad-%{majorminor} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{register} + +%postun +%{register} + +%files -f gst-plugins-bad-%{majorminor} +%defattr(-, root, root) +%doc AUTHORS COPYING README REQUIREMENTS + +# non-core plugins without external dependencies +%{_libdir}/gstreamer-%{majorminor}/libgstqtdemux.so +%{_libdir}/gstreamer-%{majorminor}/libgstmpegaudioparse.so + +# gstreamer-plugins with external dependencies but in the main package +# @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so +# @USE_ARTSC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstartsdsink.so +# @USE_AUDIOFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaudiofile.so +# @USE_DIRAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so +@USE_FAAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so +# @USE_GSM_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so +# @USE_HERMES_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsthermescolorspace.so +# @USE_LIBFAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlibfame.so +# @USE_MUSICBRAINZ_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so +# @USE_OPENGL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstglimagesink.so +# @USE_POLYP_TRUE@%{_libdir}/gstreamer-%{majorminor}/libpolypaudio.so +# @USE_SDL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsdlvideosink.so +# @USE_SNDFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so +# @USE_SWFDEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so + +## DXR3 ### +# @USE_DXR3_TRUE@%package -n gstreamer-plugins-dxr3 +# @USE_DXR3_TRUE@Summary: GStreamer plug-in for playback using dxr3 card. +# @USE_DXR3_TRUE@Group: Applications/Multimedia +# @USE_DXR3_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_DXR3_TRUE@Requires: em8300 >= 0.12.0 +# @USE_DXR3_TRUE@BuildRequires: em8300-devel >= 0.12.0 +# @USE_DXR3_TRUE@Obsoletes: gstreamer-dxr3 +# @USE_DXR3_TRUE@ +# @USE_DXR3_TRUE@%description -n gstreamer-plugins-dxr3 +# @USE_DXR3_TRUE@Plug-in supporting DVD playback using cards +# @USE_DXR3_TRUE@with the dxr3 chipset like Hollywood Plus +# @USE_DXR3_TRUE@and Creative Labs DVD cards. +# @USE_DXR3_TRUE@ +# @USE_DXR3_TRUE@%files -n gstreamer-plugins-dxr3 +# @USE_DXR3_TRUE@%defattr(-, root, root) +# @USE_DXR3_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdxr3.so +# @USE_DXR3_TRUE@ +# @USE_DXR3_TRUE@%post -n gstreamer-plugins-dxr3 +# @USE_DXR3_TRUE@%{register} +# @USE_DXR3_TRUE@ +# @USE_DXR3_TRUE@%postun -n gstreamer-plugins-dxr3 +# @USE_DXR3_TRUE@%{register} + +### FAAC ### +# @USE_FAAC_TRUE@%package -n gstreamer-plugins-faac +# @USE_FAAC_TRUE@Summary:GStreamer plug-ins for AAC audio playback. +# @USE_FAAC_TRUE@Group: Applications/Multimedia +# @USE_FAAC_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_FAAC_TRUE@Requires: faac >= 1.23 +# @USE_FAAC_TRUE@BuildRequires: faac-devel >= 1.23 +# @USE_FAAC_TRUE@Obsoletes: gstreamer-faac +# @USE_FAAC_TRUE@ +# @USE_FAAC_TRUE@%description -n gstreamer-plugins-faac +# @USE_FAAC_TRUE@Plug-ins for playing AAC audio +# @USE_FAAC_TRUE@ +# @USE_FAAC_TRUE@%files -n gstreamer-plugins-faac +# @USE_FAAC_TRUE@%defattr(-, root, root) +# @USE_FAAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstfaac.so +# @USE_FAAC_TRUE@%post -n gstreamer-faac +# @USE_FAAC_TRUE@%{register} +# @USE_FAAC_TRUE@ +# @USE_FAAC_TRUE@%postun -n gstreamer-plugins-faac +# @USE_FAAC_TRUE@%{register} + +#### JACK AUDIO CONNECTION KIT ### +# @USE_JACK_TRUE@%package -n gstreamer-plugins-jack +# @USE_JACK_TRUE@Summary: GStreamer plug-in for the Jack Sound Server. +# @USE_JACK_TRUE@Group: Applications/Multimedia +# @USE_JACK_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_JACK_TRUE@Requires: jack-audio-connection-kit >= 0.28.0 +# @USE_JACK_TRUE@ +# @USE_JACK_TRUE@Provides: gstreamer-audiosrc +# @USE_JACK_TRUE@Provides: gstreamer-audiosink +# @USE_JACK_TRUE@Obsoletes: gstreamer-jack +# @USE_JACK_TRUE@ +# @USE_JACK_TRUE@%description -n gstreamer-plugins-jack +# @USE_JACK_TRUE@Plug-in for the JACK professional sound server. +# @USE_JACK_TRUE@ +# @USE_JACK_TRUE@%files -n gstreamer-plugins-jack +# @USE_JACK_TRUE@%defattr(-, root, root) +# @USE_JACK_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjack.so +# @USE_JACK_TRUE@ +# @USE_JACK_TRUE@%post -n gstreamer-plugins-jack +# @USE_JACK_TRUE@%{register} +# @USE_JACK_TRUE@ +# @USE_JACK_TRUE@%postun -n gstreamer-plugins-jack +# @USE_JACK_TRUE@%{register} + +#### NETWORK AUDIO SYSTEM ### +# @USE_NAS_TRUE@%package -n gstreamer-plugins-nas +# @USE_NAS_TRUE@Summary: GStreamer plug-in for the Network Audio System. +# @USE_NAS_TRUE@Group: Applications/Multimedia +# @USE_NAS_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_NAS_TRUE@Requires: libnas2 >= 1.6 +# @USE_NAS_TRUE@Obsolotes:gstreamer-nas +# @USE_NAS_TRUE@ +# @USE_NAS_TRUE@%description -n gstreamer-plugins-nas +# @USE_NAS_TRUE@Plug-in for the Network Audio System sound server. +# @USE_NAS_TRUE@ +# @USE_NAS_TRUE@%files -n gstreamer-plugins-nas +# @USE_NAS_TRUE@%defattr(-, root, root) +# @USE_NAS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstnassink.so +# @USE_NAS_TRUE@ +# @USE_NAS_TRUE@%post -n gstreamer-plugins-nas +# @USE_NAS_TRUE@%{register} +# @USE_NAS_TRUE@ +# @USE_NAS_TRUE@%postun -n gstreamer-plugins-nas +# @USE_NAS_TRUE@%{register} + +#### MMS Protocol support #### +# @USE_LIBMMS_TRUE@%package -n gstreamer-plugins-mms +# @USE_LIBMMS_TRUE@Summary: GStreamer plug-in for MMS protocol support +# @USE_LIBMMS_TRUE@Group: Applications/Multimedia +# @USE_LIBMMS_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_LIBMMS_TRUE@Requires: libmms >= 0.1 +# @USE_LIBMMS_TRUE@Obsoletes:gstreamer-mms +# @USE_LIBMMS_TRUE@ +# @USE_LIBMMS_TRUE@%description -n gstreamer-plugins-mms +# @USE_LIBMMS_TRUE@Plug-in for the MMS protocol used by Microsoft +# @USE_LIBMMS_TRUE@ +# @USE_LIBMMS_TRUE@%files -n gstreamer-plugins-mms +# @USE_LIBMMS_TRUE@%defattr(-, root, root) +# @USE_LIBMMS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmms.so +# @USE_LIBMMS_TRUE@ +# @USE_LIBMMS_TRUE@%post -n gstreamer-plugins-mms +# @USE_LIBMMS_TRUE@%{register} +# @USE_LIBMMS_TRUE@ +# @USE_LIBMMS_TRUE@%postun -n gstreamer-plugins-mms +# @USE_LIBMMS_TRUE@%{register} + +### VIDEO 4 LINUX 2 ### +# @USE_GST_V4L2_TRUE@%package -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@Summary: GStreamer Video for Linux 2 plug-in. +# @USE_GST_V4L2_TRUE@Group: Applications/Multimedia +# @USE_GST_V4L2_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_GST_V4L2_TRUE@BuildRequires: glibc-devel +# @USE_GST_V4L2_TRUE@Obsoletes: gstreamer-v4l2 +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%description -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@Plug-in for accessing Video for Linux devices. +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%files -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%defattr(-, root, root) +# @USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%post -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%{register} +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%postun -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%{register} + +### XVID ### +# @USE_XVID_TRUE@%package -n gstreamer-plugins-xvid +# @USE_XVID_TRUE@Summary: GStreamer XVID plug-in. +# @USE_XVID_TRUE@Group: Applications/Multimedia +# @USE_XVID_TRUE@Requires: gstreamer-plugins = %{version} +# @USE_XVID_TRUE@BuildRequires: glibc-devel +# @USE_XVID_TRUE@Obsoletes: gstreamer-xvid +# @USE_XVID_TRUE@ +# @USE_XVID_TRUE@%description -n gstreamer-plugins-xvid +# @USE_XVID_TRUE@Plug-in for decoding XVID files. +# @USE_XVID_TRUE@ +# @USE_XVID_TRUE@%files -n gstreamer-plugins-xvid +# @USE_XVID_TRUE@%defattr(-, root, root) +# @USE_XVID_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so +# @USE_XVID_TRUE@ +# @USE_XVID_TRUE@%post -n gstreamer-plugins-xvid +# @USE_XVID_TRUE@%{register} +# @USE_XVID_TRUE@ +# @USE_XVID_TRUE@%postun -n gstreamer-plugins-xvid +# @USE_XVID_TRUE@%{register} + + +%changelog +* Mon Feb 14 2005 Christian Schaller +- Add vnc plugin + +* Wed Jan 19 2005 Christian Schaller +- add dv1394 plugin + +* Wed Dec 22 2004 Christian Schaller +- Add -plugins- to plugin names + +* Thu Dec 9 2004 Christian Schaller +- Add the mms plugin + +* Wed Oct 06 2004 Christian Schaller +- Add Wim's new mng decoder plugin +- add shout2 plugin for Zaheer, hope it is correctly done :) + +* Wed Sep 29 2004 Christian Schaller +- Fix USE statement for V4L2 + +* Thu Sep 28 2004 Christian Schaller +- Remove kio plugin (as it was broken) + +* Wed Sep 21 2004 Christian Schaller +- Reorganize SPEC to fit better with fedora.us and freshrpms.net packages +- Make sure gstinterfaces.so is in the package +- Add all new plugins + +* Mon Mar 15 2004 Thomas Vander Stichele +- put back media-info +- add ffmpegcolorspace plugin + +* Sun Mar 07 2004 Christian Schaller +- Remove rm commands for media-info stuff +- Add libdir/* + +* Thu Mar 04 2004 Christian Schaller +- Add missing gconf schema install in %post + +* Tue Mar 02 2004 Thomas Vander Stichele +- Libraries/Multimedia doesn't exist, remove it + +* Tue Mar 02 2004 Thomas Vander Stichele +- added speex plugin. + +* Mon Mar 01 2004 Thomas Vander Stichele +- Cleaned up the mess. Could we PLEASE keep this sort of organized and +- alphabetic for easy lookup ? + +* Fri Feb 13 2004 Christian Schaller +- Added latest new headers + +* Wed Jan 21 2004 Christian Schaller +- added NAS plugin +- added i18n locale dir + +* Fri Jan 16 2004 Christian Schaller +- added libcaca plugin +- added libgstcolorspace - fixed name of libgsthermescolorspace + +* Wed Jan 14 2004 Christian Schaller +- Add gamma plugin +- Have the pixbuf plugin deleted for now + +* Wed Dec 18 2003 Christian Schaller +- remove gsttagediting.h as it is gone +- replace it with gst/tag/tag.h + +* Sun Nov 23 2003 Christian Schaller +- Update spec file for latest changes +- add faad plugin + +* Thu Oct 16 2003 Christian Schaller +- Add new colorbalance and tuner and xoverlay stuff +- Change name of kde-audio-devel to arts-devel + +* Sat Sep 27 2003 Christian Schaller +- Add majorminor to man page names +- add navigation lib to package + +* Tue Sep 11 2003 Christian Schaller +- Add -%{majorminor} to each instance of gst-register + +* Tue Aug 19 2003 Christian Schaller +- Add new plugins + +* Sat Jul 12 2003 Thomas Vander Stichele +- move gst/ mpeg plugins to base package +- remove hermes conditional from snapshot +- remove one instance of resample plugin +- fix up silly versioned plugins efence and rmdemux + +* Sat Jul 05 2003 Christian Schaller +- Major overhaul of SPEC file to make it compatible with what Red Hat ships + as default +- Probably a little less sexy, but cross-distro SPEC files are a myth anyway + so making it convenient for RH users wins out +- Keeping conditionals even with new re-org so that developers building the + RPMS don't need everything installed +- Add bunch of obsoletes to ease migration from earlier official GStreamer RPMS +- Remove plugins that doesn't exist anymore + +* Sun Mar 02 2003 Christian Schaller +- Remove USE_RTP statement from RTP plugin +- Move RTP plugin to no-deps section + +* Sat Mar 01 2003 Christian Schaller +- Remove videosink from SPEC +* Thu Jan 23 2003 Thomas Vander Stichele +- various fixes +- make video output packages provide gstreamer-videosink + +* Thu Jan 23 2003 Thomas Vander Stichele +- split out ffmpeg stuff to separate plugin + +* Fri Dec 27 2002 Thomas Vander Stichele +- add virtual provides for audio sources and sinks + +* Sun Dec 15 2002 Christian Schaller +- Update mpeg2dec REQ to be 0.3.1 + +* Tue Dec 10 2002 Thomas Vander Stichele +- only install schema once +- move out devel lib stuff to -devel package + +* Sun Dec 08 2002 Thomas Vander Stichele +- fix location of libgstpng +- changes for parallel installability + +* Thu Nov 28 2002 Christian Schaller +- Put in libgstpng plugin +- rm the libgstmedia-info stuff until thomas think they are ready + +* Fri Nov 01 2002 Thomas Vander Stichele +- don't use compprep until ABI issues can be fixed + +* Wed Oct 30 2002 Thomas Vander Stichele +- added smpte plugin +- split out dvdnavread package +- fixed snapshot deps and added hermes conditionals + +* Tue Oct 29 2002 Thomas Vander Stichele +- added -play package, libs, and .pc files + +* Thu Oct 24 2002 Christian Schaller +- Added wavenc to audio formats package + +* Sat Oct 20 2002 Christian Scchaller +- Removed all .la files +- added separate non-openquicktime demuxer plugin +- added snapshot plugin +- added videotest plugin +- Split avi plugin out to avi and windec plugins since aviplugin do not depend on avifile +- Added cdplayer plugin + +* Fri Sep 20 2002 Thomas Vander Stichele +- added gst-compprep calls + +* Wed Sep 18 2002 Thomas Vander Stichele +- add gst-register-%{majorminor} calls everywhere again since auto-reregister doesn't work +- added gstreamer-audio-formats to mad's requires since it needs the typefind + to work properly + +* Mon Sep 9 2002 Christian Schaller +- Added v4l2 plugin +* Thu Aug 27 2002 Christian Schaller +- Fixed USE_DV_TRUE to USE_LIBDV_TRUE +- Added Gconf and floatcast headers to gstreamer-plugins-devel package +- Added mixmatrix plugin to audio-effects package + +* Thu Jul 11 2002 Thomas Vander Stichele +- fixed oss package to buildrequire instead of require glibc headers + +* Mon Jul 08 2002 Thomas Vander Stichele +- fixed -devel package group + +* Fri Jul 05 2002 Thomas Vander Stichele +- release 0.4.0 ! +- added gstreamer-libs.pc +- removed all gst-register-%{majorminor} calls since this should be done automatically now + +* Thu Jul 04 2002 Thomas Vander Stichele +- fix issue with SDL package +- make all packages STRICTLY require the right version to avoid + ABI issues +- make gst-plugins obsolete gst-plugin-libs +- also send output of gst-register-%{majorminor} to /dev/null to lower the noise + +* Wed Jul 03 2002 Thomas Vander Stichele +- require glibc-devel instead of glibc-kernheaders since the latter is only + since 7.3 and glibc-devel pulls in the right package anyway + +* Sun Jun 23 2002 Thomas Vander Stichele +- changed header location of plug-in libs + +* Mon Jun 17 2002 Thomas Vander Stichele +- major cleanups +- adding gst-register-%{majorminor} on postun everywhere +- remove ldconfig since we don't actually install libs in system dirs +- removed misc package +- added video-effects +- dot every Summary +- uniformify all descriptions a little + +* Thu Jun 06 2002 Thomas Vander Stichele +- various BuildRequires: additions + +* Tue Jun 04 2002 Thomas Vander Stichele +- added USE_LIBADSPA_TRUE bits to ladspa package + +* Mon Jun 03 2002 Thomas Vander Stichele +- Added libfame package + +* Mon May 12 2002 Christian Fredrik Kalager Schaller +- Added jack, dxr3, http packages +- Added visualisation plug-ins, effecttv and synaesthesia +- Created devel package +- Removed gstreamer-plugins-libs package (moved it into gstreamer-plugins) +- Replaced prefix/dirname with _macros + +* Mon May 06 2002 Thomas Vander Stichele +- added gstreamer-GConf package + +* Wed Mar 13 2002 Thomas Vander Stichele +- added more BuildRequires and Requires +- rearranged some plug-ins +- added changelog ;) diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 3d09ef8..d31505b 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -153,7 +153,8 @@ static GstElementClass *parent_class = NULL; static void gst_qtdemux_class_init (GstQTDemuxClass * klass); static void gst_qtdemux_base_init (GstQTDemuxClass * klass); static void gst_qtdemux_init (GstQTDemux * quicktime_demux); -static GstElementStateReturn gst_qtdemux_change_state (GstElement * element); +static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element, + GstStateChange transition); static void gst_qtdemux_loop_header (GstPad * pad); static gboolean qtdemux_sink_activate (GstPad * sinkpad); static gboolean qtdemux_sink_activate_pull (GstPad * sinkpad, gboolean active); @@ -463,13 +464,13 @@ gst_qtdemux_handle_sink_event (GstQTDemux * qtdemux) } #endif -static GstElementStateReturn -gst_qtdemux_change_state (GstElement * element) +static GstStateChangeReturn +gst_qtdemux_change_state (GstElement * element, GstStateChange transition) { GstQTDemux *qtdemux = GST_QTDEMUX (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_PAUSED_TO_READY:{ + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY:{ gint n; qtdemux->state = QTDEMUX_STATE_HEADER; @@ -489,7 +490,7 @@ gst_qtdemux_change_state (GstElement * element) break; } - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); } static void diff --git a/po/POTFILES.in b/po/POTFILES.in index 9ea84a0..a7fd82e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,6 @@ ext/audiofile/gstafsink.c ext/audiofile/gstafsrc.c ext/sndfile/gstsf.c -gst/avi/gstavimux.c sys/dxr3/dxr3audiosink.c sys/dxr3/dxr3audiosink.c sys/dxr3/dxr3videosink.c -sys/oss/gstossmixer.c -- 2.7.4