diff --git a/.gitignore b/.gitignore index 4889a6c..8af8386 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-base-1.4.5.tar.xz +SOURCES/gst-plugins-base-1.10.4.tar.xz diff --git a/.gstreamer1-plugins-base.metadata b/.gstreamer1-plugins-base.metadata index e04b868..87b4ebb 100644 --- a/.gstreamer1-plugins-base.metadata +++ b/.gstreamer1-plugins-base.metadata @@ -1 +1 @@ -3f7d493d61e286a913f3c8a13be08f41437d3f89 SOURCES/gst-plugins-base-1.4.5.tar.xz +c6749d515d49373f2e04e7a87f5fc5bcfa16d7ef SOURCES/gst-plugins-base-1.10.4.tar.xz diff --git a/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch b/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch deleted file mode 100644 index 85403f1..0000000 --- a/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1327829fb263bc485351ee1c1c1bb6addc211fd4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Fri, 24 Oct 2014 12:26:40 +0100 -Subject: [PATCH 1/2] tests: fix adder check on big-endian - ---- - tests/check/elements/adder.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/check/elements/adder.c b/tests/check/elements/adder.c -index 315bef4..d1a91a9 100644 ---- a/tests/check/elements/adder.c -+++ b/tests/check/elements/adder.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - static GMainLoop *main_loop; - -@@ -85,7 +86,7 @@ GST_START_TEST (test_filter_caps) - GstPad *pad; - - filter_caps = gst_caps_new_simple ("audio/x-raw", -- "format", G_TYPE_STRING, "F32LE", -+ "format", G_TYPE_STRING, GST_AUDIO_NE (F32), - "layout", G_TYPE_STRING, "interleaved", - "rate", G_TYPE_INT, 44100, "channels", G_TYPE_INT, 1, NULL); - --- -2.4.3 - diff --git a/SOURCES/0002-tests-fix-playbin-complex-test-on-big-endian.patch b/SOURCES/0002-tests-fix-playbin-complex-test-on-big-endian.patch deleted file mode 100644 index 9e10f01..0000000 --- a/SOURCES/0002-tests-fix-playbin-complex-test-on-big-endian.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 94ab7b84994fdf4a76bcfcefc91fda8fb36dd8d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Fri, 24 Oct 2014 13:09:42 +0100 -Subject: [PATCH 2/2] tests: fix playbin-complex test on big endian - ---- - tests/check/elements/playbin-complex.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/check/elements/playbin-complex.c b/tests/check/elements/playbin-complex.c -index 706cb47..f59a103 100644 ---- a/tests/check/elements/playbin-complex.c -+++ b/tests/check/elements/playbin-complex.c -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - - #ifndef GST_DISABLE_REGISTRY -@@ -521,7 +521,7 @@ gst_codec_demuxer_setup_pad (GstCodecDemuxer * demux, GstPad ** pad, - caps = gst_caps_new_empty_simple ("video/x-compressed"); - } else if (g_str_equal (streaminfo, "raw-audio")) { - caps = gst_caps_new_simple ("audio/x-raw", -- "format", G_TYPE_STRING, "S16LE", -+ "format", G_TYPE_STRING, GST_AUDIO_NE (S16), - "layout", G_TYPE_STRING, "interleaved", - "rate", G_TYPE_INT, 48000, "channels", G_TYPE_INT, 2, NULL); - } else { -@@ -1222,7 +1222,7 @@ GST_START_TEST (test_raw_single_audio_stream_manual_sink) - playbin = - create_playbin - ("caps:audio/x-raw," -- " format=(string)S16LE, " "layout=(string)interleaved, " -+ " format=(string)" GST_AUDIO_NE (S16) ", " "layout=(string)interleaved, " - " rate=(int)48000, " " channels=(int)2", TRUE); - - fail_unless_equals_int (gst_element_set_state (playbin, GST_STATE_READY), --- -2.4.3 - diff --git a/SPECS/gstreamer1-plugins-base.spec b/SPECS/gstreamer1-plugins-base.spec index b4bef8d..7b6dbd9 100644 --- a/SPECS/gstreamer1-plugins-base.spec +++ b/SPECS/gstreamer1-plugins-base.spec @@ -2,16 +2,14 @@ %global _hardened_build 1 Name: gstreamer1-plugins-base -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.10.4 +Release: 1%{?dist} Summary: GStreamer streaming media framework base plugins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch -Patch1: 0001-tests-fix-adder-check-on-big-endian.patch -Patch2: 0002-tests-fix-playbin-complex-test-on-big-endian.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gobject-introspection-devel >= 1.31.1 @@ -27,7 +25,7 @@ BuildRequires: libXv-devel BuildRequires: orc-devel >= 0.4.18 BuildRequires: pango-devel BuildRequires: pkgconfig - +BuildRequires: opus-devel BuildRequires: chrpath # documentation @@ -90,9 +88,6 @@ for the GStreamer Base Plugins library. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 - %build %configure \ @@ -108,6 +103,47 @@ make %{?_smp_mflags} V=1 rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# Register as an AppStream component to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-base.appdata.xml < + + + gstreamer-base + CC0-1.0 + GStreamer Multimedia Codecs - Base + Multimedia playback for Ogg, Theora and Vorbis + +

+ This addon includes system codecs that are essential for the running system. +

+

+ A codec decodes audio and video for for playback or editing and is also + used for transmission or storage. + Different codecs are used in video-conferencing, streaming media and + video editing applications. +

+ + + Ogg + Theora + Vorbis + + GNOME + http://gstreamer.freedesktop.org/ + https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer + http://www.gnome.org/friends/ + http://gstreamer.freedesktop.org/documentation/ + + +EOF + %find_lang gst-plugins-base-%{majorminor} # Clean out files that should not be part of the rpm. @@ -139,6 +175,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstaudiore chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstaudioconvert.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstvideoconvert.so +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstvideorate.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstaudiotestsrc.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstadder.so chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-device-monitor-1.0 @@ -153,7 +190,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %files -f gst-plugins-base-%{majorminor}.lang -%doc AUTHORS COPYING README REQUIREMENTS +%license COPYING +%doc AUTHORS README REQUIREMENTS +%{_datadir}/appdata/*.appdata.xml %{_libdir}/libgstallocators-%{majorminor}.so.* %{_libdir}/libgstaudio-%{majorminor}.so.* %{_libdir}/libgstfft-%{majorminor}.so.* @@ -172,7 +211,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_libdir}/girepository-1.0/GstAudio-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstFft-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstPbutils-%{majorminor}.typelib -%{_libdir}/girepository-1.0/GstRiff-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRtp-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRtsp-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstSdp-%{majorminor}.typelib @@ -203,6 +241,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so %{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so %{_libdir}/gstreamer-%{majorminor}/libgstogg.so +%{_libdir}/gstreamer-%{majorminor}/libgstopus.so %{_libdir}/gstreamer-%{majorminor}/libgstpango.so %{_libdir}/gstreamer-%{majorminor}/libgsttheora.so %{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so @@ -223,15 +262,20 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %dir %{_includedir}/gstreamer-%{majorminor}/gst/allocators %{_includedir}/gstreamer-%{majorminor}/gst/allocators/allocators.h %{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstdmabuf.h +%{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstfdmemory.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/app %{_includedir}/gstreamer-%{majorminor}/gst/app/app.h %{_includedir}/gstreamer-%{majorminor}/gst/app/gstappsink.h %{_includedir}/gstreamer-%{majorminor}/gst/app/gstappsrc.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/audio %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-channels.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-channel-mixer.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-converter.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-format.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-info.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-enumtypes.h +%{_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/gstaudiobasesink.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiobasesrc.h @@ -258,6 +302,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/descriptions.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/encoding-profile.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/encoding-target.h +%{_includedir}/gstreamer-%{majorminor}/gst/pbutils/gstaudiovisualizer.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/gstdiscoverer.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/gstpluginsbaseversion.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/install-plugins.h @@ -275,6 +320,8 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbasedepayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbasepayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbuffer.h +%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpdefs.h +%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtp-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtphdrext.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtppayloads.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/rtp.h @@ -302,25 +349,33 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %dir %{_includedir}/gstreamer-%{majorminor}/gst/video %{_includedir}/gstreamer-%{majorminor}/gst/video/colorbalance.h %{_includedir}/gstreamer-%{majorminor}/gst/video/colorbalancechannel.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideoaffinetransformationmeta.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideodecoder.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideoencoder.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideofilter.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideometa.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideopool.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideosink.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideotimecode.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideoutils.h %{_includedir}/gstreamer-%{majorminor}/gst/video/navigation.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-blend.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-overlay-composition.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-chroma.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-color.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video-converter.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video-dither.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-event.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-format.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-frame.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-info.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video-multiview.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video-resampler.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video-scaler.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video-tile.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/videodirection.h %{_includedir}/gstreamer-%{majorminor}/gst/video/videoorientation.h %{_includedir}/gstreamer-%{majorminor}/gst/video/videooverlay.h @@ -344,7 +399,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %{_datadir}/gir-1.0/GstAudio-%{majorminor}.gir %{_datadir}/gir-1.0/GstFft-%{majorminor}.gir %{_datadir}/gir-1.0/GstPbutils-%{majorminor}.gir -%{_datadir}/gir-1.0/GstRiff-%{majorminor}.gir %{_datadir}/gir-1.0/GstRtp-%{majorminor}.gir %{_datadir}/gir-1.0/GstRtsp-%{majorminor}.gir %{_datadir}/gir-1.0/GstSdp-%{majorminor}.gir @@ -361,6 +415,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %changelog +* Fri Feb 24 2017 Wim Taymans - 1.10.4-1 +- Update to 1.10.4 +- Resolves: #1428918 + +* Wed Mar 30 2016 Wim Taymans 1.4.5-3 +- Fix unit test on ppc64 +- Resolves: #1265905 + * Mon Sep 7 2015 Wim Taymans 1.4.5-2 - fix unit test on s390x - Related: rhbz#1249506