From 31ecc2523d1509c50655002b0c92a0805f78f657 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:42:26 +0000 Subject: import gstreamer1-plugins-good-1.4.5-2.el7 --- diff --git a/.gitignore b/.gitignore index 21f2e58..f4cc335 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-good-1.0.7.tar.xz +SOURCES/gst-plugins-good-1.4.5.tar.xz diff --git a/.gstreamer1-plugins-good.metadata b/.gstreamer1-plugins-good.metadata index 14a7c05..4ffa833 100644 --- a/.gstreamer1-plugins-good.metadata +++ b/.gstreamer1-plugins-good.metadata @@ -1 +1 @@ -14ddd7b87045920f6a394bd018a39c42503561fd SOURCES/gst-plugins-good-1.0.7.tar.xz +9a416b2111429d22ff83fc492c46141d58aa3f2a SOURCES/gst-plugins-good-1.4.5.tar.xz diff --git a/SOURCES/0001-effectv-fix-doc-section-of-revtv-element.patch b/SOURCES/0001-effectv-fix-doc-section-of-revtv-element.patch deleted file mode 100644 index 36cb62b..0000000 --- a/SOURCES/0001-effectv-fix-doc-section-of-revtv-element.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c3accce1b80e9d330bdbecb47660eaf583acd426 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 6 Feb 2014 12:21:07 +0100 -Subject: [PATCH] effectv: fix doc section of revtv element - ---- - gst/effectv/gstrev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c -index 23a8866..a003a56 100644 ---- a/gst/effectv/gstrev.c -+++ b/gst/effectv/gstrev.c -@@ -41,7 +41,7 @@ - */ - - /** -- * SECTION:element-quarktv -+ * SECTION:element-revtv - * - * RevTV acts like a video waveform monitor for each line of video - * processed. This creates a pseudo 3D effect based on the brightness --- -1.8.5.3 - diff --git a/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch b/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch new file mode 100644 index 0000000..f7b5365 --- /dev/null +++ b/SOURCES/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch @@ -0,0 +1,56 @@ +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 new file mode 100644 index 0000000..217b2d3 --- /dev/null +++ b/SOURCES/0001-tests-souphttpsrc-update-ssl-key-cert-pair.patch @@ -0,0 +1,119 @@ +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/SOURCES/0001-v4l2src-Check-for-obj-pool-NULL.patch b/SOURCES/0001-v4l2src-Check-for-obj-pool-NULL.patch deleted file mode 100644 index f3c0081..0000000 --- a/SOURCES/0001-v4l2src-Check-for-obj-pool-NULL.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5f41f4683d50fce293d770ae35f3f9a0083744a6 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 6 Nov 2012 19:49:45 +0100 -Subject: [PATCH] v4l2src: Check for obj->pool == NULL - -Not sure how it could happen and can not reproduce it either, but it -did happen once during a VoIP call and the backtrace lays the blame -on obj->pool being NULL. - -https://bugzilla.gnome.org/show_bug.cgi?id=687793 ---- - sys/v4l2/gstv4l2src.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c -index 6197f78..58ff481 100644 ---- a/sys/v4l2/gstv4l2src.c -+++ b/sys/v4l2/gstv4l2src.c -@@ -763,11 +763,14 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf) - { - GstV4l2Src *v4l2src = GST_V4L2SRC (src); - GstV4l2Object *obj = v4l2src->v4l2object; -- GstFlowReturn ret; -+ GstFlowReturn ret = GST_FLOW_ERROR; - GstClock *clock; - GstClockTime abs_time, base_time, timestamp, duration; - GstClockTime delay; - -+ if (G_UNLIKELY (obj->pool == NULL)) -+ goto error; -+ - ret = - gst_v4l2_buffer_pool_process (GST_V4L2_BUFFER_POOL_CAST (obj->pool), buf); - --- -1.7.12.1 - diff --git a/SPECS/gstreamer1-plugins-good.spec b/SPECS/gstreamer1-plugins-good.spec index f44bd69..10ebbfc 100644 --- a/SPECS/gstreamer1-plugins-good.spec +++ b/SPECS/gstreamer1-plugins-good.spec @@ -8,15 +8,15 @@ %endif Name: gstreamer1-plugins-good -Version: 1.0.7 -Release: 5%{?dist} +Version: 1.4.5 +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 -Patch3: 0001-v4l2src-Check-for-obj-pool-NULL.patch -Patch4: 0001-effectv-fix-doc-section-of-revtv-element.patch +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} @@ -86,9 +86,8 @@ to be installed. %prep %setup -q -n gst-plugins-good-%{version} -%patch3 -p1 -%patch4 -p1 - +%patch1 -p1 +%patch2 -p1 %build %configure \ @@ -142,6 +141,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/gstreamer-%{majorminor}/libgstcutter.so %{_libdir}/gstreamer-%{majorminor}/libgstdebug.so %{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so +%{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so %{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so %{_libdir}/gstreamer-%{majorminor}/libgstequalizer.so %{_libdir}/gstreamer-%{majorminor}/libgstflv.so @@ -206,6 +206,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jun 23 2015 Wim Taymans - 1.4.5-2 +- update SSL certificates in unit test +- Resolves: #1174398 + +* Wed Jan 28 2015 Bastien Nocera - 1.4.5-1 +- Update to 1.4.5 +- Resolves: #1174398 + * Thu Feb 6 2014 Wim Taymans - 1.0.7-5 - Fix wrong reference in docs (#884492) - Disable the cairo plugin, we don't package it (#1048513)