Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb42069' into 'master'
[update] Update to 1.16.1. Switch to meson build. JB#42353

See merge request mer-core/gstreamer!8
  • Loading branch information
Andrew Branson committed Nov 14, 2019
2 parents ccb6fb4 + d9ba06b commit fd188e4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "gstreamer"]
path = gstreamer
url = git://anongit.freedesktop.org/gstreamer/gstreamer
url = https://git.sailfishos.org/mirror/gstreamer.git
2 changes: 1 addition & 1 deletion gstreamer
Submodule gstreamer updated from cba2c7 to de0a7c
43 changes: 21 additions & 22 deletions rpm/gstreamer.spec
Expand Up @@ -2,7 +2,7 @@
%define majorminor 1.0

Name: %{gstreamer}%{majorminor}
Version: 1.14.1
Version: 1.16.1
Release: 1
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
Expand All @@ -15,9 +15,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: bison
BuildRequires: flex
BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(libdw)
BuildRequires: python
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: meson
BuildRequires: libtool
BuildRequires: gettext-devel
Obsoletes: gst-av
Expand Down Expand Up @@ -69,26 +69,24 @@ This package contains some GStreamer useful tools
%patch1 -p1

%build
NOCONFIGURE=1 ./autogen.sh
%configure \
--with-package-name='SailfishOS GStreamer package' \
--with-package-origin='http://jolla.com' \
--enable-debug \
--enable-introspection=yes \
--disable-nls \
--disable-examples \
--enable-docbook=no \
--enable-gtk-doc=no \
--enable-gtk-doc-html=no \
--enable-gtk-doc-pdf=no \
--enable-trace \
--enable-alloc-trace

make %{?_smp_mflags}
%meson \
-Dpackage-name='SailfishOS GStreamer package' \
-Dpackage-origin='http://sailfishos.org/' \
-Dgst_debug=true \
-Dintrospection=enabled \
-Dnls=disabled \
-Dexamples=disabled \
-Dgtk_doc=disabled \
-Dbash-completion=disabled \
-Dtracer_hooks=true \
-Dlibunwind=disabled \
-Ddbghelp=disabled

%meson_build

%install
rm -rf $RPM_BUILD_ROOT
%make_install
%meson_install
install -m 644 -D %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/pulse/xpolicy.conf.d/gstreamer1.0.conf

# Clean out files that should not be part of the rpm.
Expand All @@ -100,8 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
rm -fr $RPM_BUILD_ROOT/%{_mandir}
rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper
rm -fr $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/gdb
rm -fr $RPM_BUILD_ROOT/%{_datadir}/gstreamer-%{majorminor}/gdb
rm -fr $RPM_BUILD_ROOT/%{_datadir}/gdb

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
Expand Down

0 comments on commit fd188e4

Please sign in to comment.