From 008f70f4e6d904da8d0b412daefdbc625a221609 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 5 Oct 2019 16:31:46 +0300 Subject: [PATCH] gsl:ver.bump --- ...eamer-1.16.0-buffer_size_reset_fix-1.patch | 38 ------------------- science/mathematics/gsl/pspec.xml | 9 ++++- 2 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 multimedia/video/gstreamer/files/gstreamer-1.16.0-buffer_size_reset_fix-1.patch diff --git a/multimedia/video/gstreamer/files/gstreamer-1.16.0-buffer_size_reset_fix-1.patch b/multimedia/video/gstreamer/files/gstreamer-1.16.0-buffer_size_reset_fix-1.patch deleted file mode 100644 index 29da4498bf..0000000000 --- a/multimedia/video/gstreamer/files/gstreamer-1.16.0-buffer_size_reset_fix-1.patch +++ /dev/null @@ -1,38 +0,0 @@ -Submitted by: Xi Ruoyao -Date: 2019-08-18 -Initial Package Version: 1.16.0 -Upstream Status: Comitted -Origin: Upstream Git Repository -Description: Fix a bug in buffer size resetting code. - -diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c -index e5c7a5872ab7d0c81a7772b1c95d306714f792c0..619860e63ffa976251329ce89a86bcade364c5d3 100644 ---- a/gst/gstbufferpool.c -+++ b/gst/gstbufferpool.c -@@ -1222,8 +1222,11 @@ default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer) - GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE; - - /* if the memory is intact reset the size to the full size */ -- if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) -- gst_buffer_resize (buffer, 0, pool->priv->size); -+ if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) { -+ gsize offset; -+ gst_buffer_get_sizes (buffer, &offset, NULL); -+ gst_buffer_resize (buffer, -offset, pool->priv->size); -+ } - - /* remove all metadata without the POOLED flag */ - gst_buffer_foreach_meta (buffer, remove_meta_unpooled, pool); -diff --git a/tests/check/gst/gstbufferpool.c b/tests/check/gst/gstbufferpool.c -index f0c3c8d8e725ba48ef79eb7437fc6ed1fdfb57d1..dd9b2dc033099426ed5ee9626827fb9577acbce2 100644 ---- a/tests/check/gst/gstbufferpool.c -+++ b/tests/check/gst/gstbufferpool.c -@@ -190,7 +190,7 @@ GST_START_TEST (test_buffer_modify_discard) - gst_buffer_pool_acquire_buffer (pool, &buf, NULL); - buffer_track_destroy (buf, &dcount); - /* do resize, as we didn't modify the memory, pool should reuse this buffer */ -- gst_buffer_resize (buf, 5, 2); -+ gst_buffer_resize (buf, 8, 2); - gst_buffer_unref (buf); - - /* buffer should've gone back into pool */ diff --git a/science/mathematics/gsl/pspec.xml b/science/mathematics/gsl/pspec.xml index 2ba6f278fa..a65ae3d14b 100644 --- a/science/mathematics/gsl/pspec.xml +++ b/science/mathematics/gsl/pspec.xml @@ -12,7 +12,7 @@ library GNU scientific library The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. - https://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz + https://ftp.gnu.org/gnu/gsl/gsl-2.6.tar.gz @@ -41,6 +41,13 @@ + + 2019-10-05 + 2.6 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-31 2.4