[packages/pipewire] upstream fix for spa headers not conforming to c90 standard; rel 2

atler atler at pld-linux.org
Tue Apr 26 00:09:26 CEST 2022


commit cc4c3f002cae2a353d268fab11c57f0daaa8ff7f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Apr 26 00:08:08 2022 +0200

    upstream fix for spa headers not conforming to c90 standard; rel 2

 c90_headers.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 pipewire.spec     |  4 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/pipewire.spec b/pipewire.spec
index 7ceec09..8267447 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -14,13 +14,14 @@ Summary:	PipeWire - server and user space API to deal with multimedia pipelines
 Summary(pl.UTF-8):	PipeWire - serwer i API przestrzeni użytkownika do obsługi potoków multimedialnych
 Name:		pipewire
 Version:	0.3.50
-Release:	1
+Release:	2
 License:	MIT, LGPL v2+, GPL v2
 Group:		Libraries
 #Source0Download: https://github.com/PipeWire/pipewire/releases
 Source0:	https://github.com/PipeWire/pipewire/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	3d86ae8629a86aaf6c92d200688421c2
 Patch0:		%{name}-gcc.patch
+Patch1:		c90_headers.patch
 URL:		https://pipewire.org/
 %if %{with jack}
 BuildRequires:	SDL2-devel >= 2
@@ -296,6 +297,7 @@ Wtyczka udostępniająca źródło i cel obrazu PipeWire dla GStreamera.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson build \
diff --git a/c90_headers.patch b/c90_headers.patch
new file mode 100644
index 0000000..5328279
--- /dev/null
+++ b/c90_headers.patch
@@ -0,0 +1,45 @@
+From d3ea3142e1a4de206e616bc18f63a529e6b4986a Mon Sep 17 00:00:00 2001
+From: psykose <alice at ayaya.dev>
+Date: Wed, 13 Apr 2022 21:57:49 +0000
+Subject: [PATCH] spa: fix c90 header include
+
+placing declarations after code is invalid under ISO c90
+
+Fixes !1211
+---
+ spa/include/spa/utils/string.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/spa/include/spa/utils/string.h b/spa/include/spa/utils/string.h
+index e80434537..43d19616c 100644
+--- a/spa/include/spa/utils/string.h
++++ b/spa/include/spa/utils/string.h
+@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	float v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtof(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	double v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtod(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+-- 
+GitLab
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pipewire.git/commitdiff/cc4c3f002cae2a353d268fab11c57f0daaa8ff7f



More information about the pld-cvs-commit mailing list