rpms/gstreamer-plugins-base/devel 0001-Move-plugin-selector-to-gst-plugins-base.patch, NONE, 1.1 gstreamer-plugins-base.spec, 1.76, 1.77
Bastien Nocera
hadess at fedoraproject.org
Fri Jun 19 14:59:03 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21747
Modified Files:
gstreamer-plugins-base.spec
Added Files:
0001-Move-plugin-selector-to-gst-plugins-base.patch
Log Message:
* Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23-2
- Move input-selector plugin from -bad to -base (#506767)
0001-Move-plugin-selector-to-gst-plugins-base.patch:
--- NEW FILE 0001-Move-plugin-selector-to-gst-plugins-base.patch ---
>From 025bcf429927539d5183d4821bb74aee36915117 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 19 Jun 2009 15:31:50 +0100
Subject: [PATCH] Move plugin selector to gst-plugins-base
---
common | 2 +-
configure.ac | 1 +
gst/playback/Makefile.am | 2 +
gst/playback/selector/.gitignore | 2 +
gst/playback/selector/Makefile.am | 23 +
gst/playback/selector/gstinputselector.c | 1433 ++++++++++++++++++++++++
gst/playback/selector/gstinputselector.h | 84 ++
gst/playback/selector/gstoutputselector.c | 509 +++++++++
gst/playback/selector/gstoutputselector.h | 66 ++
gst/playback/selector/gstselector-marshal.list | 2 +
gst/playback/selector/gstselector.c | 44 +
gst/playback/selector/selector.vcproj | 148 +++
12 files changed, 2315 insertions(+), 1 deletions(-)
create mode 100644 gst/playback/selector/.gitignore
create mode 100644 gst/playback/selector/Makefile.am
create mode 100644 gst/playback/selector/gstinputselector.c
create mode 100644 gst/playback/selector/gstinputselector.h
create mode 100644 gst/playback/selector/gstoutputselector.c
create mode 100644 gst/playback/selector/gstoutputselector.h
create mode 100644 gst/playback/selector/gstselector-marshal.list
create mode 100644 gst/playback/selector/gstselector.c
create mode 100644 gst/playback/selector/selector.vcproj
diff --git a/configure.ac b/configure.ac
index 5ebf698..b337ba9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,6 +719,7 @@ gst/audiotestsrc/Makefile
gst/ffmpegcolorspace/Makefile
gst/gdp/Makefile
gst/playback/Makefile
+gst/playback/selector/Makefile
gst/audioresample/Makefile
gst/subparse/Makefile
gst/tcp/Makefile
diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index f4e4b6a..c2d4f31 100644
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -7,6 +7,8 @@ built_headers = gstplay-marshal.h
plugindir = $(libdir)/gstreamer- at GST_MAJORMINOR@
+SUBDIRS = selector
+
plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin.la libgstdecodebin2.la libgstqueue2.la
libgstplaybin_la_SOURCES = \
diff --git a/gst/playback/selector/.gitignore b/gst/playback/selector/.gitignore
new file mode 100644
index 0000000..1cf1f1b
--- /dev/null
+++ b/gst/playback/selector/.gitignore
@@ -0,0 +1,2 @@
+gstselector-marshal.c
+gstselector-marshal.h
diff --git a/gst/playback/selector/Makefile.am b/gst/playback/selector/Makefile.am
new file mode 100644
index 0000000..3196b93
--- /dev/null
+++ b/gst/playback/selector/Makefile.am
@@ -0,0 +1,23 @@
+glib_enum_prefix = gst_selector
+
+include $(top_srcdir)/common/glib-gen.mak
+
+built_sources = gstselector-marshal.c
+built_headers = gstselector-marshal.h
+
+BUILT_SOURCES = $(built_sources) $(built_headers)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = gstselector-marshal.list
+
+plugin_LTLIBRARIES = libgstselector.la
+
+libgstselector_la_SOURCES = gstselector.c gstinputselector.c gstoutputselector.c
+nodist_libgstselector_la_SOURCES = $(built_sources)
+libgstselector_la_CFLAGS = $(GST_CFLAGS)
+libgstselector_la_LIBADD =
+libgstselector_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstselector_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gstinputselector.h gstoutputselector.h
diff --git a/gst/playback/selector/gstinputselector.c b/gst/playback/selector/gstinputselector.c
new file mode 100644
index 0000000..832707d
--- /dev/null
+++ b/gst/playback/selector/gstinputselector.c
@@ -0,0 +1,1433 @@
+/* GStreamer
+ * Copyright (C) 2003 Julien Moutte <julien at moutte.net>
+ * Copyright (C) 2005 Ronald S. Bultje <rbultje at ronald.bitfreak.net>
+ * Copyright (C) 2005 Jan Schmidt <thaytan at mad.scientist.com>
+ * Copyright (C) 2007 Wim Taymans <wim.taymans at gmail.com>
+ * Copyright (C) 2007 Andy Wingo <wingo at pobox.com>
+ * Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost at nokia.com>)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * SECTION:element-input-selector
+ * @see_also: #GstOutputSelector
+ *
+ * Direct one out of N input streams to the output pad.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "gstinputselector.h"
+#include "gstselector-marshal.h"
+
+GST_DEBUG_CATEGORY_STATIC (input_selector_debug);
+#define GST_CAT_DEFAULT input_selector_debug
+
+static const GstElementDetails gst_input_selector_details =
+GST_ELEMENT_DETAILS ("Input selector",
+ "Generic",
+ "N-to-1 input stream selectoring",
+ "Julien Moutte <julien at moutte.net>\n"
+ "Ronald S. Bultje <rbultje at ronald.bitfreak.net>\n"
+ "Jan Schmidt <thaytan at mad.scientist.com>\n"
+ "Wim Taymans <wim.taymans at gmail.com>");
+
+static GstStaticPadTemplate gst_input_selector_sink_factory =
+GST_STATIC_PAD_TEMPLATE ("sink%d",
+ GST_PAD_SINK,
+ GST_PAD_REQUEST,
+ GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate gst_input_selector_src_factory =
+GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS_ANY);
+
+enum
+{
+ PROP_0,
+ PROP_N_PADS,
+ PROP_ACTIVE_PAD,
+ PROP_SELECT_ALL,
+ PROP_LAST
+};
+
+#define DEFAULT_PAD_ALWAYS_OK TRUE
+
+enum
+{
+ PROP_PAD_0,
+ PROP_PAD_RUNNING_TIME,
+ PROP_PAD_TAGS,
+ PROP_PAD_ACTIVE,
+ PROP_PAD_ALWAYS_OK,
+ PROP_PAD_LAST
+};
+
+enum
+{
+ /* methods */
+ SIGNAL_BLOCK,
+ SIGNAL_SWITCH,
+ LAST_SIGNAL
+};
+static guint gst_input_selector_signals[LAST_SIGNAL] = { 0 };
+
+static gboolean gst_input_selector_is_active_sinkpad (GstInputSelector * sel,
+ GstPad * pad);
+static GstPad *gst_input_selector_activate_sinkpad (GstInputSelector * sel,
+ GstPad * pad);
+static GstPad *gst_input_selector_get_linked_pad (GstPad * pad,
+ gboolean strict);
+static gboolean gst_input_selector_check_eos (GstElement * selector);
+
[...2023 lines suppressed...]
+ * Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost at nokia.com>)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+
+#include "gstinputselector.h"
+#include "gstoutputselector.h"
+
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+
+ return gst_element_register (plugin, "input-selector",
+ GST_RANK_NONE, GST_TYPE_INPUT_SELECTOR) &&
+ gst_element_register (plugin, "output-selector",
+ GST_RANK_NONE, GST_TYPE_OUTPUT_SELECTOR);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "selector",
+ "input/output stream selector elements",
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/playback/selector/selector.vcproj b/gst/playback/selector/selector.vcproj
new file mode 100644
index 0000000..f28880d
--- /dev/null
+++ b/gst/playback/selector/selector.vcproj
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="selector"
+ ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D678CF}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="../../win32/Debug"
+ IntermediateDirectory="../../win32/Debug"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;"../../gst-libs";../../../popt/include;../../../libxml2/include/libxml2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;selector_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
+ OutputFile="$(OutDir)/gstselector.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
+ ModuleDefinitionFile=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/selectro.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ ImportLibrary="$(OutDir)/gstselectro.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="../../win32/Release"
+ IntermediateDirectory="../../win32/Release"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;"../../gst-libs";../../../popt/include;../../../libxml2/include/libxml2"
+ PreprocessorDefinitions="WIN32;NDEBUG;GST_DISABLE_GST_DEBUG;_WINDOWS;_USRDLL;selector_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
+ OutputFile="$(OutDir)/gstselector.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="../../../gstreamer/win32/Release;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
+ ModuleDefinitionFile=""
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/gstselector.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\gstselector.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\gstselector.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
--
1.6.2.2
Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gstreamer-plugins-base.spec 11 May 2009 01:12:44 -0000 1.76
+++ gstreamer-plugins-base.spec 19 Jun 2009 14:58:33 -0000 1.77
@@ -5,7 +5,7 @@
Name: %{gstreamer}-plugins-base
Version: 0.10.23
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer streaming media framework base plug-ins
Group: Applications/Multimedia
@@ -15,6 +15,10 @@ Source: http://gstreamer.freedesktop.or
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gstpb-0.10.15-cd-speed.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=586356
+# https://bugzilla.redhat.com/show_bug.cgi?id=506767
+Patch1: 0001-Move-plugin-selector-to-gst-plugins-base.patch
+BuildRequires: automake autoconf libtool
Requires: %{gstreamer} >= %{_gst}
Requires: liboil >= 0.3.12-9
@@ -53,6 +57,9 @@ This package contains a set of well-main
%prep
%setup -q -n gst-plugins-base-%{version}
%patch0 -p1 -b .cd-speed
+%patch1 -p1 -b .input-selector
+libtoolize -f
+autoreconf
%build
%configure \
@@ -109,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstdecodebin.so
%{_libdir}/gstreamer-%{majorminor}/libgstdecodebin2.so
%{_libdir}/gstreamer-%{majorminor}/libgstplaybin.so
+%{_libdir}/gstreamer-%{majorminor}/libgstselector.so
%{_libdir}/gstreamer-%{majorminor}/libgsttypefindfunctions.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideotestsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudiorate.so
@@ -246,6 +254,9 @@ GStreamer Base Plugins library developme
%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
%changelog
+* Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23-2
+- Move input-selector plugin from -bad to -base (#506767)
+
* Mon May 11 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23-1
- Update to 0.10.23
More information about the fedora-extras-commits
mailing list