diff --git a/.gitignore b/.gitignore index bf58472..4889a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-base-1.0.7.tar.xz +SOURCES/gst-plugins-base-1.4.5.tar.xz diff --git a/.gstreamer1-plugins-base.metadata b/.gstreamer1-plugins-base.metadata index 91dba3f..e04b868 100644 --- a/.gstreamer1-plugins-base.metadata +++ b/.gstreamer1-plugins-base.metadata @@ -1 +1 @@ -c9e057774746c6dea07052fa0fec9cfc2519ceea SOURCES/gst-plugins-base-1.0.7.tar.xz +3f7d493d61e286a913f3c8a13be08f41437d3f89 SOURCES/gst-plugins-base-1.4.5.tar.xz diff --git a/SOURCES/0001-gstplaysink-pass-translated-color-balance-value-to-c.patch b/SOURCES/0001-gstplaysink-pass-translated-color-balance-value-to-c.patch deleted file mode 100644 index a236750..0000000 --- a/SOURCES/0001-gstplaysink-pass-translated-color-balance-value-to-c.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2731012d832b593c54a50492a27d328f2de9b596 Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Wed, 29 May 2013 10:33:48 -0600 -Subject: [PATCH] gstplaysink: pass translated color balance value to channel -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We found a case where untranslated values were being passed from the -proxy to the underlying channel, causing bad color balance values -in some setups. - -Thanks to Sebastian Dröge for clarifying how the code works, and -suggesting the fix. - -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=701202 ---- - gst/playback/gstplaysink.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -Index: gst-plugins-base-1.0.7/gst/playback/gstplaysink.c -=================================================================== ---- gst-plugins-base-1.0.7.orig/gst/playback/gstplaysink.c -+++ gst-plugins-base-1.0.7/gst/playback/gstplaysink.c -@@ -1540,6 +1540,7 @@ update_colorbalance (GstPlaySink * plays - GstColorBalanceChannel *proxy = l->data; - GstColorBalanceChannel *channel = NULL; - const GList *channels, *k; -+ gdouble new_val; - - channels = gst_color_balance_list_channels (balance); - for (k = channels; k; k = k->next) { -@@ -1553,8 +1554,18 @@ update_colorbalance (GstPlaySink * plays - - g_assert (channel); - -+ /* Convert to [0, 1] range */ -+ new_val = -+ ((gdouble) playsink->colorbalance_values[i] - -+ (gdouble) proxy->min_value) / ((gdouble) proxy->max_value - -+ (gdouble) proxy->min_value); -+ /* Convert to channel range */ -+ new_val = -+ channel->min_value + new_val * ((gdouble) channel->max_value - -+ (gdouble) channel->min_value); -+ - gst_color_balance_set_value (balance, channel, -- playsink->colorbalance_values[i]); -+ (gint) (new_val + 0.5)); - } - - g_signal_handlers_unblock_by_func (balance, diff --git a/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch b/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch new file mode 100644 index 0000000..85403f1 --- /dev/null +++ b/SOURCES/0001-tests-fix-adder-check-on-big-endian.patch @@ -0,0 +1,33 @@ +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 new file mode 100644 index 0000000..9e10f01 --- /dev/null +++ b/SOURCES/0002-tests-fix-playbin-complex-test-on-big-endian.patch @@ -0,0 +1,43 @@ +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 136741b..b4bef8d 100644 --- a/SPECS/gstreamer1-plugins-base.spec +++ b/SPECS/gstreamer1-plugins-base.spec @@ -2,15 +2,16 @@ %global _hardened_build 1 Name: gstreamer1-plugins-base -Version: 1.0.7 -Release: 5%{?dist} +Version: 1.4.5 +Release: 2%{?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-gstplaysink-pass-translated-color-balance-value-to-c.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 @@ -23,7 +24,7 @@ BuildRequires: libtheora-devel >= 1.1 BuildRequires: libvisual-devel BuildRequires: libvorbis-devel >= 1.0 BuildRequires: libXv-devel -BuildRequires: orc-devel >= 0.4.11 +BuildRequires: orc-devel >= 0.4.18 BuildRequires: pango-devel BuildRequires: pkgconfig @@ -90,6 +91,7 @@ for the GStreamer Base Plugins library. %setup -q -n gst-plugins-base-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -139,7 +141,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstaudioco chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstvideoconvert.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 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %post -p /sbin/ldconfig @@ -150,6 +154,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %files -f gst-plugins-base-%{majorminor}.lang %doc AUTHORS COPYING README REQUIREMENTS +%{_libdir}/libgstallocators-%{majorminor}.so.* %{_libdir}/libgstaudio-%{majorminor}.so.* %{_libdir}/libgstfft-%{majorminor}.so.* %{_libdir}/libgstriff-%{majorminor}.so.* @@ -162,6 +167,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %{_libdir}/libgstapp-%{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 @@ -206,10 +212,19 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %files tools %{_bindir}/gst-discoverer-%{majorminor} +%{_bindir}/gst-play-%{majorminor} +%{_bindir}/gst-device-monitor-%{majorminor} %{_mandir}/man1/gst-discoverer-*.gz +%{_mandir}/man1/gst-play-*.gz +%{_mandir}/man1/gst-device-monitor-*.gz + %files devel +%dir %{_includedir}/gstreamer-%{majorminor}/gst/allocators +%{_includedir}/gstreamer-%{majorminor}/gst/allocators/allocators.h +%{_includedir}/gstreamer-%{majorminor}/gst/allocators/gstdmabuf.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 @@ -232,6 +247,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosrc.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/streamvolume.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/fft +%{_includedir}/gstreamer-%{majorminor}/gst/fft/fft.h %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstfft.h %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstfftf32.h %{_includedir}/gstreamer-%{majorminor}/gst/fft/gstfftf64.h @@ -249,6 +265,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/pbutils-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/pbutils/pbutils.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/riff +%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-ids.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-media.h %{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-read.h @@ -258,8 +275,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-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/gstrtphdrext.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtppayloads.h +%{_includedir}/gstreamer-%{majorminor}/gst/rtp/rtp.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/rtsp +%{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtsp.h %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtsp-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtspconnection.h %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtspdefs.h @@ -268,9 +288,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtsprange.h %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtsptransport.h %{_includedir}/gstreamer-%{majorminor}/gst/rtsp/gstrtspurl.h +%{_includedir}/gstreamer-%{majorminor}/gst/rtsp/rtsp.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/sdp %{_includedir}/gstreamer-%{majorminor}/gst/sdp/gstsdp.h %{_includedir}/gstreamer-%{majorminor}/gst/sdp/gstsdpmessage.h +%{_includedir}/gstreamer-%{majorminor}/gst/sdp/gstmikey.h +%{_includedir}/gstreamer-%{majorminor}/gst/sdp/sdp.h %dir %{_includedir}/gstreamer-%{majorminor}/gst/tag %{_includedir}/gstreamer-%{majorminor}/gst/tag/gsttagdemux.h %{_includedir}/gstreamer-%{majorminor}/gst/tag/gsttagmux.h @@ -289,16 +312,19 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %{_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-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-tile.h %{_includedir}/gstreamer-%{majorminor}/gst/video/video.h %{_includedir}/gstreamer-%{majorminor}/gst/video/videoorientation.h %{_includedir}/gstreamer-%{majorminor}/gst/video/videooverlay.h +%{_libdir}/libgstallocators-%{majorminor}.so %{_libdir}/libgstaudio-%{majorminor}.so %{_libdir}/libgstriff-%{majorminor}.so %{_libdir}/libgstrtp-%{majorminor}.so @@ -313,6 +339,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %dir %{_datadir}/gst-plugins-base/%{majorminor}/ %{_datadir}/gst-plugins-base/%{majorminor}/license-translations.dict +%{_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 @@ -334,6 +361,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0 %changelog +* Mon Sep 7 2015 Wim Taymans 1.4.5-2 +- fix unit test on s390x +- Related: rhbz#1249506 + +* Wed Jan 28 2015 Bastien Nocera 1.4.5-1 +- Update to 1.4.5 +- Resolves: #1174395 + * Fri Jan 24 2014 Daniel Mach - 1.0.7-5 - Mass rebuild 2014-01-24