From 0a3fadb24678e4000a8630e7908d4dee4a837673 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Feb 2018 13:45:35 -0600 Subject: [PATCH] tigten subpkg deps fix rpaths update %files use %ldconfig_scriptlets %make_build %make_install %build: --disable-fatal-warnings --disable-silent-rules --- gstreamer1-plugins-base.spec | 54 ++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index d2418a8..5879ad1 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -6,7 +6,7 @@ Name: gstreamer1-plugins-base Version: 1.13.1 -Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework base plugins License: LGPLv2+ @@ -36,6 +36,8 @@ BuildRequires: orc-devel >= 0.4.18 BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: opus-devel +# for autogen.sh +BuildRequires: automake gettext-devel libtool BuildRequires: chrpath BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLES-devel @@ -61,8 +63,7 @@ This package contains a set of well-maintained base plug-ins. %package tools Summary: Tools for GStreamer streaming media framework base plugins -Requires: %{name} = %{version}-%{release} - +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools GStreamer is a streaming media framework, based on graphs of filters which @@ -80,8 +81,7 @@ These include: %package devel Summary: GStreamer Base Plugins Development files -Requires: %{name} = %{version}-%{release} - +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files @@ -93,7 +93,6 @@ Summary: Developer documentation for GStreamer Base plugins library Requires: %{name} = %{version}-%{release} BuildArch: noarch - %description devel-docs This %{name}-devel-docs package contains developer documentation for the GStreamer Base Plugins library. @@ -105,18 +104,24 @@ for the GStreamer Base Plugins library. %patch1 -p1 %build +# die rpath (method of modifying libtool fails here) +NOCONFIGURE=1 \ +./autogen.sh + %configure \ --with-package-name='Fedora GStreamer-plugins-base package' \ --with-package-origin='http://download.fedoraproject.org' \ --enable-experimental \ + --disable-fatal-warnings \ + --disable-silent-rules \ --enable-gtk-doc \ --enable-orc -make %{?_smp_mflags} V=1 + +%make_build V=1 %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Register as an AppStream component to be visible in the software center # @@ -162,10 +167,12 @@ EOF %find_lang gst-plugins-base-%{majorminor} # Clean out files that should not be part of the rpm. -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' #rm -f $RPM_BUILD_ROOT%{_bindir}/gst-visualise* #rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gst-visualise* +# Using a more robus approach above, avoids manual error-prone lists like below --rex +%if 0 # Remove rpath. chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstvideotestsrc.so @@ -197,13 +204,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstadder.s chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-device-monitor-1.0 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 +%endif -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - +%ldconfig_scriptlets %files -f gst-plugins-base-%{majorminor}.lang %license COPYING @@ -220,12 +224,13 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_libdir}/libgstrtsp-%{majorminor}.so.* %{_libdir}/libgstsdp-%{majorminor}.so.* %{_libdir}/libgstapp-%{majorminor}.so.* +%{_libdir}/libgstgl-%{majorminor}.so.* # gobject-introspection files %{_libdir}/girepository-1.0/GstAllocators-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstApp-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstAudio-%{majorminor}.typelib -%{_libdir}/girepository-1.0/GstFft-%{majorminor}.typelib +%{_libdir}/girepository-1.0/GstGL-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstPbutils-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRtp-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRtsp-%{majorminor}.typelib @@ -237,6 +242,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_libdir}/gstreamer-%{majorminor}/libgstadder.so %{_libdir}/gstreamer-%{majorminor}/libgstapp.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioconvert.so +%{_libdir}/gstreamer-%{majorminor}/libgstaudiomixer.so %{_libdir}/gstreamer-%{majorminor}/libgstaudiorate.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so %{_libdir}/gstreamer-%{majorminor}/libgstaudiotestsrc.so @@ -257,6 +263,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 # base plugins with dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so %{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so +%{_libdir}/gstreamer-%{majorminor}/libgstopengl.so %{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so %{_libdir}/gstreamer-%{majorminor}/libgstogg.so %{_libdir}/gstreamer-%{majorminor}/libgstopus.so @@ -281,6 +288,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/allocators/allocators.h %{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstdmabuf.h %{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstfdmemory.h +%{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstphysmemory.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/app %{_includedir}/gstreamer-%{majorminor}/gst/app/app.h %{_includedir}/gstreamer-%{majorminor}/gst/app/app-enumtypes.h @@ -296,6 +304,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-quantize.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-resampler.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioaggregator.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiobasesink.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiobasesrc.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiocdsrc.h @@ -308,6 +317,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioringbuffer.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosink.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosrc.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiostreamalign.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/streamvolume.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/fft %{_includedir}/gstreamer-%{majorminor}/gst/fft/fft.h @@ -316,6 +326,8 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstfftf64.h %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstffts16.h %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstffts32.h +%{_includedir}/gstreamer-%{majorminor}/gst/gl/ +%{_libdir}/gstreamer-%{majorminor}/include/gst/gl/ %dir %{_includedir}/gstreamer-%{majorminor}/gst/pbutils %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/codec-utils.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/descriptions.h @@ -410,6 +422,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_libdir}/libgstsdp-%{majorminor}.so %{_libdir}/libgstfft-%{majorminor}.so %{_libdir}/libgstapp-%{majorminor}.so +%{_libdir}/libgstgl-%{majorminor}.so %dir %{_datadir}/gst-plugins-base/%{majorminor}/ %{_datadir}/gst-plugins-base/%{majorminor}/license-translations.dict @@ -417,7 +430,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_datadir}/gir-1.0/GstAllocators-%{majorminor}.gir %{_datadir}/gir-1.0/GstApp-%{majorminor}.gir %{_datadir}/gir-1.0/GstAudio-%{majorminor}.gir -%{_datadir}/gir-1.0/GstFft-%{majorminor}.gir +%{_datadir}/gir-1.0/GstGL-%{majorminor}.gir %{_datadir}/gir-1.0/GstPbutils-%{majorminor}.gir %{_datadir}/gir-1.0/GstRtp-%{majorminor}.gir %{_datadir}/gir-1.0/GstRtsp-%{majorminor}.gir @@ -435,6 +448,13 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %changelog +* Sat Feb 24 2018 Rex Dieter - 1.13.1-2 +- tigten subpkg deps +- fix rpaths +- update %%files +- use %%ldconfig_scriptlets %%make_build %%make_install +- %%build: --disable-fatal-warnings --disable-silent-rules + * Thu Feb 22 2018 Wim Taymans - 1.13.1-1 - Update to 1.13.1 - Add patch to fix aliasing compilation error