From 6c9b4153188ca47955db41aa0afac483b3636130 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:24:13 +0000 Subject: import gstreamer1-plugins-good-1.10.4-2.el7 --- diff --git a/.gitignore b/.gitignore index f4cc335..8681e63 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-good-1.4.5.tar.xz +SOURCES/gst-plugins-good-1.10.4.tar.xz diff --git a/.gstreamer1-plugins-good.metadata b/.gstreamer1-plugins-good.metadata index 4ffa833..bcca750 100644 --- a/.gstreamer1-plugins-good.metadata +++ b/.gstreamer1-plugins-good.metadata @@ -1 +1 @@ -9a416b2111429d22ff83fc492c46141d58aa3f2a SOURCES/gst-plugins-good-1.4.5.tar.xz +6ff3f3a7facae861c7687f27055fd9ced7c7fe10 SOURCES/gst-plugins-good-1.10.4.tar.xz diff --git a/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch b/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch deleted file mode 100644 index f7b5365..0000000 --- a/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a98341397d3522fdc7470c4220775035a2d1d790 Mon Sep 17 00:00:00 2001 -From: Youness Alaoui -Date: Thu, 7 Aug 2014 21:58:14 -0400 -Subject: [PATCH] jitterbuffer: Allow rtp caps without clock-rate - -The jitterbuffer shouldn't force clock-rate on its sink pad, this will cause a negotiation issue since rtpssrcdemux doesn't have the clock-rate and doesn't add it to the caps. The documentation states that the clock-rate can either be specified through the caps or through the request-pt-map signal, so we must remove clock-rate from the pad templates and we must accept the GST_EVENT_CAPS if the caps don't have the clock-rate. - -https://bugzilla.gnome.org/show_bug.cgi?id=734322 ---- - gst/rtpmanager/gstrtpjitterbuffer.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c -index c8c512e..0eccd1a 100644 ---- a/gst/rtpmanager/gstrtpjitterbuffer.c -+++ b/gst/rtpmanager/gstrtpjitterbuffer.c -@@ -342,9 +342,9 @@ static GstStaticPadTemplate gst_rtp_jitter_buffer_sink_template = - GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, -- GST_STATIC_CAPS ("application/x-rtp, " -- "clock-rate = (int) [ 1, 2147483647 ]" -- /* "payload = (int) , " -+ GST_STATIC_CAPS ("application/x-rtp" -+ /* "clock-rate = (int) [ 1, 2147483647 ], " -+ * "payload = (int) , " - * "encoding-name = (string) " - */ ) - ); -@@ -1364,9 +1364,7 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) - GstCaps *caps; - - gst_event_parse_caps (event, &caps); -- if (!gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps)) -- goto wrong_caps; -- -+ gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps); - break; - } - case GST_EVENT_SEGMENT: -@@ -1397,12 +1395,6 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) - return TRUE; - - /* ERRORS */ --wrong_caps: -- { -- GST_DEBUG_OBJECT (jitterbuffer, "received invalid caps"); -- gst_event_unref (event); -- return FALSE; -- } - newseg_wrong_format: - { - GST_DEBUG_OBJECT (jitterbuffer, "received non TIME newsegment"); --- -2.1.0 - diff --git a/SOURCES/0001-tests-souphttpsrc-update-ssl-key-cert-pair.patch b/SOURCES/0001-tests-souphttpsrc-update-ssl-key-cert-pair.patch deleted file mode 100644 index 217b2d3..0000000 --- a/SOURCES/0001-tests-souphttpsrc-update-ssl-key-cert-pair.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f825dcd7a5c66edbf32eb93e8ce821ef6bf16274 Mon Sep 17 00:00:00 2001 -From: Thiago Santos -Date: Wed, 4 Feb 2015 16:32:14 -0300 -Subject: [PATCH] tests: souphttpsrc: update ssl key/cert pair - -Our ones were expired. The new ones were copied from libsoup's -tests files. - -Also sets the property to use our own cert to validate the -server, otherwise the default system certs would be used -and it would fail. ---- - tests/check/elements/souphttpsrc.c | 1 + - tests/files/test-cert.pem | 35 +++++++++++++++-------------------- - tests/files/test-key.pem | 38 +++++++++++++++++++++++++------------- - 3 files changed, 41 insertions(+), 33 deletions(-) - -diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c -index dfb682b..d265d76 100644 ---- a/tests/check/elements/souphttpsrc.c -+++ b/tests/check/elements/souphttpsrc.c -@@ -126,6 +126,7 @@ run_test (const char *format, ...) - g_free (url); - - g_object_set (src, "automatic-redirect", redirect, NULL); -+ g_object_set (src, "ssl-ca-file", GST_TEST_FILES_PATH "/test-cert.pem", NULL); - if (cookies != NULL) - g_object_set (src, "cookies", cookies, NULL); - g_object_set (sink, "signal-handoffs", TRUE, NULL); -diff --git a/tests/files/test-cert.pem b/tests/files/test-cert.pem -index a6b6608..7f20626 100644 ---- a/tests/files/test-cert.pem -+++ b/tests/files/test-cert.pem -@@ -1,22 +1,17 @@ - -----BEGIN CERTIFICATE----- --MIIDjzCCAvigAwIBAgIBADANBgkqhkiG9w0BAQQFADCBkjELMAkGA1UEBhMCVVMx --FjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzANBgNVBAcTBkJvc3RvbjEPMA0GA1UE --ChMGWGltaWFuMRUwEwYDVQQLEwxTb3VwIEtpdGNoZW4xEjAQBgNVBAMTCWxvY2Fs --aG9zdDEeMBwGCSqGSIb3DQEJARYPc291cEB4aW1pYW4uY29tMB4XDTAzMDkyMzE4 --Mzc0MVoXDTEzMDkyMzE4Mzc0MVowgZIxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1N --YXNzYWNodXNldHRzMQ8wDQYDVQQHEwZCb3N0b24xDzANBgNVBAoTBlhpbWlhbjEV --MBMGA1UECxMMU291cCBLaXRjaGVuMRIwEAYDVQQDEwlsb2NhbGhvc3QxHjAcBgkq --hkiG9w0BCQEWD3NvdXBAeGltaWFuLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw --gYkCgYEAwzT/WxfdXqb2hbyjQav3FtN7tLxj3UbZKCKDYlizBsNLxb9exfebhV4h --CoAcaSNvLUnk3tAXnk+BDsIC1V4SbwqHYR17PnO3YZ8fkNwh5RGZwNx+zafdfFyu --+3Sh+mE03bljpDlTsgPL8CiFCd68MPRnuHoKt5iTpSyLC6Df0qcCAwEAAaOB8jCB --7zAdBgNVHQ4EFgQU9A9omrgBK5Kkl6FRxrgJU2voj4Uwgb8GA1UdIwSBtzCBtIAU --9A9omrgBK5Kkl6FRxrgJU2voj4WhgZikgZUwgZIxCzAJBgNVBAYTAlVTMRYwFAYD --VQQIEw1NYXNzYWNodXNldHRzMQ8wDQYDVQQHEwZCb3N0b24xDzANBgNVBAoTBlhp --bWlhbjEVMBMGA1UECxMMU291cCBLaXRjaGVuMRIwEAYDVQQDEwlsb2NhbGhvc3Qx --HjAcBgkqhkiG9w0BCQEWD3NvdXBAeGltaWFuLmNvbYIBADAMBgNVHRMEBTADAQH/ --MA0GCSqGSIb3DQEBBAUAA4GBAGCV56N7bEDNdE76T8i68gS00NIVVosVQjS39Ojd --ED+rvq0YYvuc2UXlzAonuCJfwFc73g4wSIjS0xijF5rnugZ+aay0LNv2y+Rf34CQ --RNswrwurFjlxgTOO+Wx2IM64mAnBfj43M8uKEZFqAiGKrZZ0xIqyUMlku0FgXDH2 --Jvpg -+MIICpDCCAYwCCQC8Suc8hjfgujANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDDAkx -+MjcuMC4wLjEwHhcNMTEwOTE5MTkyMjA1WhcNMjEwOTE2MTkyMjA1WjAUMRIwEAYD -+VQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr -+OH7kblu+5zkYTk/ZG21OgbIyltxhLDHPmUpl4yDUFqX5BEtoVfg0Ms4ZuaoeDi4t -+b2LV6Em3UDQwmwPMm2SakfJvRd3nfL6G3UkkBsVqT3V04M9u8fk6YgHPT8PN1Lj7 -+5bv9AMRyQRV1QIPondMhbt8JhlmCR6ALbxYtsXkbQF7qzbj7Y2cjvoHzPQSk0QpB -+rEUpj6Schm1NkPen48Z1X1faGL0F3roFHEsf6U1AjP5A4A/UGQsRtq35VzVnKgxW -+N7jumUevEMIvyqLjmvK864AHMIRVCOls9GcIta80bViuVqgtuGgVGM/7SoZfIvPF -+A10jIe7KQoXWAwRi4WclAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJfihY634dRr -+DeEA4SQ1e0/kB6EF8oeaC+5EuGOJxtoX+yXJfWJsEtmjRwobyOBVV997hdOtdZjo -+mdJOCKerOFKccO9PLNJZ+/l4+NHv9OwOcu4UqvrSsps/pmr/22SIyQswbLLJfPAT -+KjGTDLlj//zrLxzUGsu7lgGsY4s4fVbftFZv7P5AyErpwiFk8qM1BP0NMkn4XWSA -+uSyTeB6O+tWYdh3bA1BeKC2P85sl6xFJI2gxvNTxtdcg9beDqNuEheJ+mEtD3P4w -+HDG1vFaAX0MH1RJSDO/dIoJerN6LTjiTYYYg8yV0lmBxijv25Z/3Gi33OuG9jkdR -+vXDwJpC+/ko= - -----END CERTIFICATE----- -diff --git a/tests/files/test-key.pem b/tests/files/test-key.pem -index 9bea9bf..36bbcc2 100644 ---- a/tests/files/test-key.pem -+++ b/tests/files/test-key.pem -@@ -1,15 +1,27 @@ - -----BEGIN RSA PRIVATE KEY----- --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 - -----END RSA PRIVATE KEY----- --- -2.4.3 - diff --git a/SPECS/gstreamer1-plugins-good.spec b/SPECS/gstreamer1-plugins-good.spec index e9790c0..9a2b10b 100644 --- a/SPECS/gstreamer1-plugins-good.spec +++ b/SPECS/gstreamer1-plugins-good.spec @@ -8,15 +8,14 @@ %endif Name: gstreamer1-plugins-good -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.10.4 +Release: 2%{?dist} Summary: GStreamer plugins with good code and licensing License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ + Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz -Patch1: 0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch -Patch2: 0001-tests-souphttpsrc-update-ssl-key-cert-pair.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} @@ -28,6 +27,9 @@ BuildRequires: libpng-devel >= 1.2.0 BuildRequires: libshout-devel BuildRequires: libsoup-devel BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXdamage-devel +BuildRequires: libXfixes-devel BuildRequires: orc-devel BuildRequires: pulseaudio-libs-devel BuildRequires: speex-devel @@ -86,13 +88,11 @@ to be installed. %prep %setup -q -n gst-plugins-good-%{version} -%patch1 -p1 -%patch2 -p1 %build -%configure \ - --with-package-name='Fedora GStreamer-plugins-good package' \ - --with-package-origin='http://download.fedoraproject.org' \ +%configure --disable-silent-rules --disable-fatal-warnings \ + --with-package-name='GStreamer-plugins-good package' \ + --with-package-origin='http://www.redhat.com' \ --enable-experimental \ --enable-gtk-doc \ --enable-orc \ @@ -111,23 +111,76 @@ make %{?_smp_mflags} V=1 %install -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-good.appdata.xml < + + + gstreamer-good + CC0-1.0 + GStreamer Multimedia Codecs + Multimedia playback for APE, AVI, DV, FLAC, FLX, Flash, MKV, MP4, Speex, VP8, VP9 and WAV + +

+ This addon includes several good quality codecs that are well tested. + These codecs can be used to encode and decode media files where the + format is not patent encumbered. +

+

+ 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. +

+ + + APE + AVI + DV + FLAC + FLX + Flash + MKV + MP4 + Speex + VP8 + VP9 + WAV + + 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-good-%{majorminor} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files -f gst-plugins-good-%{majorminor}.lang -%doc AUTHORS COPYING README REQUIREMENTS +%license COPYING +%doc AUTHORS README REQUIREMENTS +%{_datadir}/appdata/*.appdata.xml %doc %{_datadir}/gtk-doc/html/gst-plugins-good-plugins-%{majorminor} -# Equaliser presets +# presets %dir %{_datadir}/gstreamer-%{majorminor}/presets/ %{_datadir}/gstreamer-%{majorminor}/presets/GstVP8Enc.prs %{_datadir}/gstreamer-%{majorminor}/presets/GstIirEqualizer10Bands.prs %{_datadir}/gstreamer-%{majorminor}/presets/GstIirEqualizer3Bands.prs +%{_datadir}/gstreamer-%{majorminor}/presets/GstQTMux.prs # non-core plugins without external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalaw.so @@ -206,9 +259,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Mar 09 2017 Wim Taymans - 1.10.4-2 +- Fix origin + Resolves: #1429577 + +* Mon Mar 06 2017 Wim Taymans - 1.10.4-1 +- Update to 1.10.4 + Resolves: #1429577 + * Tue Dec 06 2016 Wim Taymans - 1.4.5-3 - Remove insecure FLX plugin -Resolves: rhbz#1400892 +Resolves: rhbz#1400893 * Tue Jun 23 2015 Wim Taymans - 1.4.5-2 - update SSL certificates in unit test