Sync from SUSE:SLFO:Main libshout revision c6280d4346d7d9d4cfe97faebf377d43

This commit is contained in:
Adrian Schröter 2024-10-03 17:33:00 +02:00
parent ce17e9c24d
commit f79fc888ac
4 changed files with 61 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 8ab2de318d55c9d0987ffae7d9b94b365af732c1 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <ajanni@videolabs.io>
Date: Wed, 14 Sep 2022 16:29:22 +0200
Subject: [PATCH 1/2] icy: include stdlib.h and stdio.h
malloc, free, and snprintf had no valid previous declaration, making the
build fail with clang.
---
src/icy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/icy.c b/src/icy.c
index 8e83552..4de3c14 100644
--- a/src/icy.c
+++ b/src/icy.c
@@ -24,6 +24,8 @@
#endif
#include <stdbool.h>
+#include <stdlib.h> /* for free() and malloc() */
+#include <stdio.h> /* for snprintf() */
#include <string.h>
#include <shout/shout.h>
--
GitLab

View File

@ -0,0 +1,25 @@
From 600fa105a799986efcccddfedfdfd3e9a1988cd0 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <ajanni@videolabs.io>
Date: Wed, 14 Sep 2022 16:30:03 +0200
Subject: [PATCH 2/2] legacy: include stdlib.h
free() had no previous declaration, making the build fail with clang.
---
src/legacy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/legacy.c b/src/legacy.c
index 3e1d3d7..e0ed961 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -28,6 +28,8 @@
#include "shout_private.h"
#include "util.h"
+#include <stdlib.h> /* for free() */
+
int shout_set_format(shout_t *self, unsigned int format)
{
if (!self)
--
GitLab

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 6 09:10:38 UTC 2024 - Takashi Iwai <tiwai@suse.com>
- Fix build errors with gcc14 (bsc#1220975):
0001-icy-include-stdlib-h-and-stdio-h.patch
0002-legacy-include-stdlib-h.patch
-------------------------------------------------------------------
Thu May 5 10:11:54 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
#
# spec file for package libshout
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,8 @@ URL: https://icecast.org/
#Git-Clone: https://gitlab.xiph.org/xiph/icecast-libshout/
Source: https://downloads.xiph.org/releases/libshout/%name-%version.tar.gz
Source1: baselibs.conf
Patch1: 0001-icy-include-stdlib-h-and-stdio-h.patch
Patch2: 0002-legacy-include-stdlib-h.patch
BuildRequires: libtool
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(theora)