Skip to content

Commit

Permalink
Merge branch 'jb35950' into 'master'
Browse files Browse the repository at this point in the history
[gstreamer] Update to 1.10.2. Contributes JB#35950

See merge request !3
  • Loading branch information
Andrew Branson committed Jan 16, 2017
2 parents f3c19b5 + 45cc5c6 commit df72047
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion gstreamer
Submodule gstreamer updated from dd7e23 to 922202
16 changes: 2 additions & 14 deletions rpm/gstreamer.spec
Expand Up @@ -2,7 +2,7 @@
%define majorminor 1.0

Name: %{gstreamer}%{majorminor}
Version: 1.8.3
Version: 1.10.2
Release: 1
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
Expand All @@ -11,7 +11,6 @@ URL: http://gstreamer.freedesktop.org/
Source: %{name}-%{version}.tar.gz
Source1: gstreamer1.0.conf
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: bison
BuildRequires: flex
BuildRequires: pkgconfig(check)
Expand Down Expand Up @@ -72,7 +71,7 @@ NOCONFIGURE=1 ./autogen.sh
--with-package-name='SailfishOS GStreamer package' \
--with-package-origin='http://jolla.com' \
--enable-debug \
--enable-introspection=yes \
--disable-introspection \
--disable-nls \
--disable-examples \
--enable-docbook=no \
Expand Down Expand Up @@ -115,11 +114,6 @@ rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
%{_libdir}/gstreamer-%{majorminor}/libgstcoretracers.so
%{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
%{_libexecdir}/gstreamer-%{majorminor}/gst-ptp-helper
%{_libdir}/girepository-1.0/Gst-1.0.typelib
%{_libdir}/girepository-1.0/GstBase-1.0.typelib
%{_libdir}/girepository-1.0/GstCheck-1.0.typelib
%{_libdir}/girepository-1.0/GstController-1.0.typelib
%{_libdir}/girepository-1.0/GstNet-1.0.typelib

%files devel
%defattr(-, root, root, -)
Expand All @@ -128,7 +122,6 @@ rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
%{_includedir}/gstreamer-%{majorminor}/gst/check
%{_includedir}/gstreamer-%{majorminor}/gst/controller
%{_includedir}/gstreamer-%{majorminor}/gst/net
%{_libdir}/gstreamer-%{majorminor}/include/gst/gstconfig.h
%{_libdir}/libgstreamer-%{majorminor}.so
%{_libdir}/libgstbase-%{majorminor}.so
%{_libdir}/libgstcheck-%{majorminor}.so*
Expand All @@ -140,11 +133,6 @@ rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
%{_libdir}/pkgconfig/gstreamer-controller-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-check-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc
%{_datadir}/gir-1.0/Gst-1.0.gir
%{_datadir}/gir-1.0/GstBase-1.0.gir
%{_datadir}/gir-1.0/GstCheck-1.0.gir
%{_datadir}/gir-1.0/GstController-1.0.gir
%{_datadir}/gir-1.0/GstNet-1.0.gir

%files tools
%defattr(-, root, root, -)
Expand Down

0 comments on commit df72047

Please sign in to comment.