package/pulseaudio: remove musl fix

PATCH New Romain Naour 2 participants 2 messages Feb 13, 2016

Share & tools

Romain Naour

author

2016-02-13 13:07 UTC #0 lore raw

PATCH 1/1 package/pulseaudio: remove musl fix

A recent change in puseaudio 8.0 [1] removed the nonstandard __WORDSIZE define. So 0002-musl-fixes.patch is not needed anymore.

Also remove PULSEAUDIO_AUTORECONF.

Fixes:
http://autobuild.buildroot.net/results/dc6/dc6642b18a97f6e0ac1524fe836226a7ee23df86

[1] https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=7c1a5d61597b8a7b762f8295c7d791942dba3fb5

Signed-off-by Romain Naour <[email protected]>

Cc Bernd Kuhls <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
The fix was needed with pulseaudio 7.0 and I missed that It wasn't needed with pulseaudio 8.0 while reviewing Bernd's patch.

Build tested with a musl and Glibc toolchains

---
 package/pulseaudio/0002-musl-fixes.patch | 41 --------------------------------
 package/pulseaudio/pulseaudio.mk         |  2 --
 2 files changed, 43 deletions(-)
 delete mode 100644 package/pulseaudio/0002-musl-fixes.patch

package/pulseaudio/0002-musl-fixes.patch deleted +0 ~~-41~~

deleted file mode 100644
index fedb3a0..0000000
@@ -1,41 +0,0 @@
-Portability fixes for musl taken from voidlinux:
-
-- _WORDIZE is declared in <bits/user.h> via <sys/user.h>.
-
-	--xtraeme
-
-[Bernd: Downloaded from
-http://git.alpinelinux.org/cgit/aports/tree/testing/pulseaudio/musl-fixes.patch
-and adjusted paths.]
-Signed-off-by: Bernd Kuhls <[email protected]>
-[Thomas: remove xlocale.h part, it was fixed upstream.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
---- a/configure.ac.orig	2015-09-24 11:36:06.107661526 +0200
-+++ b/configure.ac	2015-09-24 11:36:40.420036775 +0200
-@@ -407,7 +407,7 @@ AC_HEADER_STDC
- # POSIX
- AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
-     netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
--    sys/mman.h sys/select.h sys/socket.h sys/wait.h \
-+    sys/mman.h sys/select.h sys/socket.h sys/wait.h sys/user.h \
-     sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
- AC_CHECK_HEADERS([netinet/ip.h], [], [],
-                  [#include <sys/types.h>
---- a/src/pulsecore/sample-util.h.orig	2015-09-24 11:37:57.773677238 +0200
-+++ b/src/pulsecore/sample-util.h	2015-09-24 11:38:46.668208677 +0200
-@@ -24,6 +24,14 @@
- #include <inttypes.h>
- #include <limits.h>
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef HAVE_SYS_USER_H
-+#include <sys/user.h>	/* required by _WORDIZE with musl */
-+#endif
-+
- #include <pulse/gccmacro.h>
- #include <pulse/sample.h>
- #include <pulse/volume.h>

package/pulseaudio/pulseaudio.mk +0 -2

index c51e1d7..86bbb2f 100644
@@ -7,8 +7,6 @@
 PULSEAUDIO_VERSION = 8.0
 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases
-# 0002-musl-fixes.patch patches configure.ac
-PULSEAUDIO_AUTORECONF = YES
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
 PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL

Signature · 1 line

2.4.3

Thomas Petazzoni

Applied

2016-02-13 15:42 UTC #1 lore raw

PATCH 1/1 package/pulseaudio: remove musl fix

Dear Romain Naour,

Quoted 11 lines · Romain Naour

A recent change in puseaudio 8.0 [1] removed the nonstandard __WORDSIZE define. So 0002-musl-fixes.patch is not needed anymore.
Also remove PULSEAUDIO_AUTORECONF.
Fixes:
http://autobuild.buildroot.net/results/dc6/dc6642b18a97f6e0ac1524fe836226a7ee23df86
[1] https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=7c1a5d61597b8a7b762f8295c7d791942dba3fb5

Quoted 7 lines

Signed-off-by Romain Naour <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
The fix was needed with pulseaudio 7.0 and I missed that It wasn't needed with pulseaudio 8.0 while reviewing Bernd's patch.

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com