New version 1.8.3

Spec cleanup
Add new files
This commit is contained in:
Andrey Bondrov 2016-09-30 13:37:58 +10:00
parent b0a247057e
commit bde8134b37
3 changed files with 154 additions and 154 deletions

View file

@ -1,2 +1,2 @@
sources:
gstreamer-1.6.3.tar.xz: 03d678ced697871a71ae229ef5f9c3ef18640898
gstreamer-1.8.3.tar.xz: c6500b6cecb323e54da0edc82588150767306001

View file

@ -1,7 +1,7 @@
diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst-inspect.c
--- gstreamer-0.11.94.orig/tools/gst-inspect.c 2012-09-01 18:02:10.000000000 -0400
+++ gstreamer-0.11.94/tools/gst-inspect.c 2012-09-14 08:04:52.690369047 -0400
@@ -1350,9 +1350,225 @@ print_element_info (GstElementFactory *
diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-inspect.c
--- gstreamer-1.8.3/tools/gst-inspect.c 2016-03-24 21:36:30.000000000 +1000
+++ gstreamer-1.8.3-patched/tools/gst-inspect.c 2016-09-30 13:14:34.765969760 +1000
@@ -1302,9 +1302,225 @@
return 0;
}
@ -228,7 +228,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{
GstPadDirection direction;
const gchar *type_name;
@@ -1377,6 +1593,12 @@ print_plugin_automatic_install_info_code
@@ -1330,6 +1546,12 @@
return;
}
@ -241,7 +241,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
@@ -1413,15 +1635,20 @@ print_plugin_automatic_install_info_code
@@ -1366,15 +1588,20 @@
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
@ -266,7 +266,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{
const gchar *const *protocols;
@@ -1430,13 +1657,19 @@ print_plugin_automatic_install_info_prot
@@ -1383,13 +1610,19 @@
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
while (*protocols != NULL) {
@ -288,7 +288,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
++protocols;
}
break;
@@ -1447,7 +1680,7 @@ print_plugin_automatic_install_info_prot
@@ -1400,7 +1633,7 @@
}
static void
@ -297,7 +297,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{
GList *features, *l;
@@ -1466,11 +1699,15 @@ print_plugin_automatic_install_info (Gst
@@ -1419,11 +1652,15 @@
if (feature_plugin == plugin) {
GstElementFactory *factory;
@ -316,7 +316,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
}
if (feature_plugin)
gst_object_unref (feature_plugin);
@@ -1492,7 +1729,7 @@ print_all_plugin_automatic_install_info
@@ -1445,7 +1682,7 @@
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
@ -325,7 +325,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
}
gst_plugin_list_free (orig_plugins);
}
@@ -1504,6 +1741,7 @@ main (int argc, char *argv[])
@@ -1457,6 +1694,7 @@
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
@ -333,7 +333,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE;
gchar *min_version = NULL;
@@ -1521,6 +1759,9 @@ main (int argc, char *argv[])
@@ -1474,6 +1712,9 @@
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@ -343,7 +343,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"exists", '\0', 0, G_OPTION_ARG_NONE, &check_exists,
@@ -1650,7 +1891,7 @@ main (int argc, char *argv[])
@@ -1610,7 +1851,7 @@
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@ -352,7 +352,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
@@ -1663,13 +1904,17 @@ main (int argc, char *argv[])
@@ -1623,13 +1864,16 @@
if (plugin) {
if (print_aii) {
@ -367,8 +367,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
+ if (!print_aii_rpm)
+ g_print (_("Could not load plugin file: %s\n"), error->message);
+ else
+ g_printerr (_("Could not load plugin file: %s\n"),
+ error->message);
g_error_free (error);
+ g_printerr (_("Could not load plugin file: %s\n"), error->message);
g_clear_error (&error);
return -1;
}

View file

@ -5,49 +5,47 @@
%define major 0
%define libname %mklibname %{oname} %{api} %{major}
%define gi_name %mklibname gst-gir %{api}
%define libnamedev %mklibname -d %{name}
%define build_docs 0
%define girname %mklibname gst-gir %{api}
%define devname %mklibname %{name} -d
Name: %{oname}%{api}
Summary: GStreamer Streaming-media framework runtime
Version: 1.6.3
Release: 1
License: LGPLv2+
Group: Sound
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gstreamer/%{oname}-%{version}.tar.xz
%bcond_with docs
Summary: GStreamer Streaming-media framework runtime
Name: %{oname}%{api}
Version: 1.8.3
Release: 1
License: LGPLv2+
Group: Sound
Url: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gstreamer/%{oname}-%{version}.tar.xz
Source1: gstreamer.prov
Patch0: gstreamer-inspect-rpm-format.patch
BuildRequires: pkgconfig(gio-2.0) >= 2.32.0
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
BuildRequires: pkgconfig(gmodule-no-export-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.9
BuildRequires: gobject-introspection-devel
BuildRequires: pkgconfig(popt)
Patch0: gstreamer-inspect-rpm-format.patch
BuildRequires: chrpath
BuildRequires: bison
BuildRequires: flex
%ifarch %{ix86}
BuildRequires: nasm
%endif
%if %{with docs}
BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-dtd42-xml
BuildRequires: ghostscript
BuildRequires: gtk-doc >= 0.7
BuildRequires: python-pyxml
BuildRequires: transfig
%endif
BuildRequires: gettext-devel
BuildRequires: libcheck-devel
BuildRequires: chrpath
BuildRequires: bison
BuildRequires: flex
%ifnarch %arm %mips
BuildRequires: valgrind-devel
%endif
%ifarch %ix86
BuildRequires: nasm => 0.90
%endif
%if %build_docs
BuildRequires: gtk-doc >= 0.7
BuildRequires: transfig
BuildRequires: docbook-dtd42-xml
BuildRequires: docbook-dtd412-xml
BuildRequires: ghostscript
BuildRequires: python-pyxml
BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(gio-2.0) >= 2.32.0
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
BuildRequires: pkgconfig(gmodule-no-export-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.9
BuildRequires: pkgconfig(popt)
%ifnarch %{arm} %{mips}
BuildRequires: pkgconfig(valgrind)
%endif
%description
@ -58,10 +56,12 @@ else media-related. Its plugin-based architecture means that new data
types or processing capabilities can be added simply by installing new
plugins.
#----------------------------------------------------------------------------
%package tools
Summary: GStreamer Streaming-media framework runtime
Group: Sound
Provides: %{vname}-tools = %{version}-%{release}
Provides: %{vname}-tools = %{EVRD}
%description tools
GStreamer is a streaming-media framework, based on graphs of filters which
@ -71,11 +71,29 @@ else media-related. Its plugin-based architecture means that new data
types or processing capabilities can be added simply by installing new
plugins.
%files tools -f %{oname}-%{api}.lang
%doc AUTHORS COPYING README NEWS
%dir %{_var}/cache/%{oname}-%{api}
%{_bindir}/gst-inspect-%{api}
%{_bindir}/gst-launch-%{api}
%{_bindir}/gst-stats-%{api}
%{_bindir}/gst-typefind-%{api}
%{_mandir}/man1/gst-inspect-%{api}.1*
%{_mandir}/man1/gst-launch-%{api}.1*
%{_mandir}/man1/gst-typefind-%{api}.1*
%{_datadir}/bash-completion/completions/gst-inspect-1.0
%{_datadir}/bash-completion/completions/gst-launch-1.0
%{_datadir}/bash-completion/helpers/gst
%{_datadir}/bash-completion/helpers/gst-completion-helper-1.0
%{_libdir}/gstreamer-1.0/gst-ptp-helper
#----------------------------------------------------------------------------
%package -n %{libname}
Summary: Libraries for GStreamer streaming-media framework
Group: System/Libraries
Requires: %{name}-tools >= %{version}-%{release}
Provides: libgstreamer%{api} = %{version}-%{release}
Requires: %{name}-tools
Provides: libgstreamer%{api} = %{EVRD}
%description -n %{libname}
GStreamer is a streaming-media framework, based on graphs of filters which
@ -87,22 +105,44 @@ plugins.
This package contains the libraries.
%package -n %{gi_name}
%files -n %{libname}
%dir %{_libdir}/%{oname}-%{api}
%{_libdir}/libgstbase-%{api}.so.%{major}*
%{_libdir}/libgstcheck-%{api}.so.%{major}*
%{_libdir}/libgstreamer-%{api}.so.%{major}*
%{_libdir}/libgstnet-%{api}.so.%{major}*
%{_libdir}/libgstcontroller-%{api}.so.%{major}*
%{_libdir}/%{oname}-%{api}/gst-plugin-scanner
%{_libdir}/%{oname}-%{api}/libgstcoreelements.so
%{_libdir}/%{oname}-%{api}/libgstcoretracers.so
#----------------------------------------------------------------------------
%package -n %{girname}
Summary: GObject Introspection interface libraries for %{name}
Group: System/Libraries
Requires: %{libname} = %{version}-%{release}
%description -n %{gi_name}
%description -n %{girname}
GObject Introspection interface libraries for %{name}.
%package -n %{libnamedev}
%files -n %{girname}
%{_libdir}/girepository-1.0/Gst-%{api}.typelib
%{_libdir}/girepository-1.0/GstBase-%{api}.typelib
%{_libdir}/girepository-1.0/GstCheck-%{api}.typelib
%{_libdir}/girepository-1.0/GstController-%{api}.typelib
%{_libdir}/girepository-1.0/GstNet-%{api}.typelib
#----------------------------------------------------------------------------
%package -n %{devname}
Summary: Libraries and include files for GStreamer streaming-media framework
Group: Development/C
Requires: %{libname} = %{version}-%{release}
Requires: %{name}-tools = %{version}-%{release}
Provides: gstreamer%{api}-devel = %{version}-%{release}
%description -n %{libnamedev}
%description -n %{devname}
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
@ -113,98 +153,11 @@ plugins.
This package contains the libraries and includes files necessary to develop
applications and plugins for GStreamer.
%prep
%setup -q -n %{oname}-%{version}
%apply_patches
%build
%configure2_5x \
--enable-debug \
--disable-static \
--disable-dependency-tracking \
--with-package-name='%_vendor %{name} package' \
--with-package-origin='http://bugs.%_vendor.org/' \
--disable-tests \
--disable-examples \
--disable-rpath \
%if %build_docs
--enable-docbook \
--enable-gtk-doc \
%else
--disable-docbook \
--disable-gtk-doc \
%endif
%ifarch %mips
--disable-valgrind \
%endif
--with-html-dir=%{_datadir}/gtk-doc/html
%make
%check
cd tests/check
# disable check as it will stall at build in iurt
#make check
%install
%makeinstall_std
mkdir -p %{buildroot}%{_var}/cache/%{oname}-%{api}
#clean the files we don't want to install
find %{buildroot} -name '*.la' -delete
%find_lang %{oname}-%{api}
%if %build_docs
mv %{buildroot}%{_datadir}/doc/%{oname}-%{api}/ installed-docs
%endif
#gw really remove rpath for rpmlint
chrpath -d %{buildroot}{%_bindir/gst-{inspect,launch,typefind}-1.0,%_libdir/{*.so,%{oname}-%api/*.so}}
# Add the provides script
install -m0755 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/%{_vendor}/%{name}.prov
%files tools -f %{oname}-%{api}.lang
%doc AUTHORS COPYING README NEWS
%dir %{_var}/cache/%{oname}-%{api}
%{_bindir}/gst-inspect-%{api}
%{_bindir}/gst-launch-%{api}
%{_bindir}/gst-typefind-%{api}
%{_mandir}/man1/gst-inspect-%{api}.1*
%{_mandir}/man1/gst-launch-%{api}.1*
%{_mandir}/man1/gst-typefind-%{api}.1*
%{_datadir}/bash-completion/completions/gst-inspect-1.0
%{_datadir}/bash-completion/completions/gst-launch-1.0
%{_datadir}/bash-completion/helpers/gst
%{_datadir}/bash-completion/helpers/gst-completion-helper-1.0
%{_libdir}/gstreamer-1.0/gst-ptp-helper
%files -n %{libname}
%dir %{_libdir}/%{oname}-%{api}
%{_libdir}/libgstbase-%{api}.so.%{major}*
%{_libdir}/libgstcheck-%{api}.so.%{major}*
%{_libdir}/libgstreamer-%{api}.so.%{major}*
%{_libdir}/libgstnet-%{api}.so.%{major}*
%{_libdir}/libgstcontroller-%{api}.so.%{major}*
%{_libdir}/%{oname}-%{api}/gst-plugin-scanner
%{_libdir}/%{oname}-%{api}/libgstcoreelements.so
%files -n %{gi_name}
%{_libdir}/girepository-1.0/Gst-%{api}.typelib
%{_libdir}/girepository-1.0/GstBase-%{api}.typelib
%{_libdir}/girepository-1.0/GstCheck-%{api}.typelib
%{_libdir}/girepository-1.0/GstController-%{api}.typelib
%{_libdir}/girepository-1.0/GstNet-%{api}.typelib
%files -n %{libnamedev}
%files -n %{devname}
%doc ChangeLog
%if %build_docs
%if %{with docs}
%doc installed-docs/*
%endif
%{_prefix}/lib/rpm/%{_vendor}/%{name}.prov
%dir %{_includedir}/%{oname}-%{api}
%dir %{_includedir}/%{oname}-%{api}/gst
@ -238,3 +191,51 @@ install -m0755 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/%{_vendor}/%{name}.p
%{_datadir}/gir-1.0/GstCheck-%{api}.gir
%{_datadir}/gir-1.0/GstController-%{api}.gir
%{_datadir}/gir-1.0/GstNet-%{api}.gir
#----------------------------------------------------------------------------
%prep
%setup -q -n %{oname}-%{version}
%apply_patches
%build
%configure2_5x \
--enable-debug \
--disable-static \
--disable-dependency-tracking \
--with-package-name='%{_vendor} %{name} package' \
--with-package-origin='http://bugs.%{_vendor}.org/' \
--disable-tests \
--disable-examples \
--disable-rpath \
%if %{with docs}
--enable-docbook \
--enable-gtk-doc \
%else
--disable-docbook \
--disable-gtk-doc \
%endif
%ifarch %{mips}
--disable-valgrind \
%endif
--with-html-dir=%{_datadir}/gtk-doc/html
%make
%install
%makeinstall_std
mkdir -p %{buildroot}%{_var}/cache/%{oname}-%{api}
%if %{with docs}
mv %{buildroot}%{_datadir}/doc/%{oname}-%{api}/ installed-docs
%endif
#gw really remove rpath for rpmlint
chrpath -d %{buildroot}{%{_bindir}/gst-{inspect,launch,typefind}-1.0,%{_libdir}/{*.so,%{oname}-%{api}/*.so}}
# Add the provides script
install -m0755 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/%{_vendor}/%{name}.prov
%find_lang %{oname}-%{api}