Update to 1.11.2

This commit is contained in:
Wim Taymans 2017-02-24 19:35:06 +01:00
parent eec26b9ad7
commit 88bc55421a
5 changed files with 7 additions and 99 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/gstreamer-1.10.1.tar.xz
/gstreamer-1.10.2.tar.xz
/gstreamer-1.11.1.tar.xz
/gstreamer-1.11.2.tar.xz

View File

@ -1,25 +0,0 @@
From 8697997e332e8e128a71d83f7be471ee78b5c18a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 20 Feb 2017 10:49:46 +0100
Subject: [PATCH] deviceproviderfactory: fix empty class check
---
gst/gstdeviceproviderfactory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst/gstdeviceproviderfactory.c b/gst/gstdeviceproviderfactory.c
index 305e214..4835f99 100644
--- a/gst/gstdeviceproviderfactory.c
+++ b/gst/gstdeviceproviderfactory.c
@@ -498,7 +498,7 @@ gst_device_provider_factory_has_classesv (GstDeviceProviderFactory * factory,
const gchar *found;
guint len;
- if (classes[0] == '\0')
+ if (classes[0][0] == '\0')
continue;
found = strstr (klass, classes[0]);
--
2.9.3

View File

@ -1,66 +0,0 @@
From a15f7ad8f86d6331272024530b940577de6c74e3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 20 Feb 2017 12:16:32 +0100
Subject: [PATCH] info: put () around macro arguments
Put braces around macro arguments or else we might run into problems
with operater precedence.
---
gst/gstinfo.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index f8be4d2..31992b7 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -434,16 +434,16 @@ void gst_printerrln (const gchar * format, ...) G_GNUC_PRINT
* see https://bugzilla.gnome.org/show_bug.cgi?id=764526 */
#define gst_debug_add_log_function(func,data,notify) \
G_STMT_START{ \
- if (func == (void *) gst_debug_log_default) { \
+ if ((func) == (void *) gst_debug_log_default) { \
gst_debug_add_log_function(NULL,data,notify); \
} else { \
gst_debug_add_log_function(func,data,notify); \
} \
}G_STMT_END
-#define gst_debug_remove_log_function(func) \
- (func == (void *) gst_debug_log_default) ? \
- gst_debug_remove_log_function(NULL) : \
+#define gst_debug_remove_log_function(func) \
+ ((func) == (void *) gst_debug_log_default) ? \
+ gst_debug_remove_log_function(NULL) : \
gst_debug_remove_log_function(func)
/**
@@ -563,7 +563,7 @@ GST_EXPORT GstDebugLevel _gst_debug_min;
*/
#ifdef G_HAVE_ISO_VARARGS
#define GST_CAT_LEVEL_LOG(cat,level,object,...) G_STMT_START{ \
- if (G_UNLIKELY (level <= GST_LEVEL_MAX && level <= _gst_debug_min)) { \
+ if (G_UNLIKELY ((level) <= GST_LEVEL_MAX && (level) <= _gst_debug_min)) { \
gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__, \
(GObject *) (object), __VA_ARGS__); \
} \
@@ -571,7 +571,7 @@ GST_EXPORT GstDebugLevel _gst_debug_min;
#else /* G_HAVE_GNUC_VARARGS */
#ifdef G_HAVE_GNUC_VARARGS
#define GST_CAT_LEVEL_LOG(cat,level,object,args...) G_STMT_START{ \
- if (G_UNLIKELY (level <= GST_LEVEL_MAX && level <= _gst_debug_min)) { \
+ if (G_UNLIKELY ((level) <= GST_LEVEL_MAX && (level) <= _gst_debug_min)) { \
gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__, \
(GObject *) (object), ##args ); \
} \
@@ -581,7 +581,7 @@ static inline void
GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
GstDebugLevel level, gpointer object, const char *format, va_list varargs)
{
- if (G_UNLIKELY (level <= GST_LEVEL_MAX && level <= _gst_debug_min)) {
+ if (G_UNLIKELY ((level) <= GST_LEVEL_MAX && (level) <= _gst_debug_min)) {
gst_debug_log_valist (cat, level, "", "", 0, (GObject *) object, format,
varargs);
}
--
2.9.3

View File

@ -9,8 +9,8 @@
%global _gobject_introspection 1.31.1
Name: gstreamer1
Version: 1.11.1
Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist}
Version: 1.11.2
Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist}
Summary: GStreamer streaming media framework runtime
License: LGPLv2+
@ -24,8 +24,6 @@ Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{versi
%endif
## For GStreamer RPM provides
Patch0: gstreamer-inspect-rpm-format.patch
Patch1: 0001-deviceproviderfactory-fix-empty-class-check.patch
Patch2: 0001-info-put-around-macro-arguments.patch
Source1: gstreamer1.prov
Source2: gstreamer1.attr
@ -94,9 +92,6 @@ GStreamer streaming media framework.
%prep
%setup -q -n gstreamer-%{version}
%patch0 -p1 -b .rpm-provides
%patch1 -p1 -b .0001
%patch2 -p1 -b .0002
%build
%configure \
@ -218,6 +213,9 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog
* Fri Feb 24 2017 Wim Taymans <wtaymans@redhat.com> - 1.11.2-1
- Update to 1.11.2
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
- fix build

View File

@ -1 +1 @@
SHA512 (gstreamer-1.11.1.tar.xz) = 3f9409f78643fac536c9a7ee24b95461c888a7abcb7f92a2eb96ec100e86d6f4ca23e102e69759c6f58a75d33a0caeb5594e095495542bf41d5ee04484aa822a
SHA512 (gstreamer-1.11.2.tar.xz) = 6ca3a504331e063ebcdf95d9d04943ebf9e9a80ab0c17f4823cfb78f73624222fbf650d6f1aa8041a61efb36678d51e3cbf1bb3b6dcd75467c78c5f31f6d12fa