Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,33 +0,0 @@
|
||||
Fix musl-related build errors in packages depending on alsa, in our case
|
||||
this fixes openal.
|
||||
|
||||
Downloaded from
|
||||
http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib_pcm_h.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
--- alsa-lib-1.0.25/include/pcm.h
|
||||
+++ alsa-lib-1.0.25.patched/include/pcm.h
|
||||
@@ -33,6 +33,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#include <stdint.h>
|
||||
/**
|
||||
* \defgroup PCM PCM Interface
|
||||
* See the \ref pcm page for more details.
|
||||
@@ -941,10 +942,10 @@
|
||||
int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
|
||||
snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
|
||||
ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
|
||||
-u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
|
||||
-u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
|
||||
-u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
|
||||
-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
|
||||
+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
|
||||
+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
|
||||
+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
|
||||
+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
|
||||
int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
|
||||
|
||||
snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
|
||||
@@ -1,67 +0,0 @@
|
||||
Linking currently fails on powerpc64 and powerpc64le when configured
|
||||
with --without-versioned, as follows:
|
||||
../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first'
|
||||
(And many similar messages.)
|
||||
|
||||
This appears to be due to a very old (2003) workaround for powerpc64,
|
||||
(introduced by commit 06221f86) in include/alsa-symbols.h which alters
|
||||
symbol names. While it was probably necessary at the time, it does not
|
||||
appear to be necessary now and removing it fixes the build.
|
||||
|
||||
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
|
||||
---
|
||||
include/alsa-symbols.h | 25 ++++---------------------
|
||||
1 file changed, 4 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h
|
||||
index 51cb982..0cb0b9f 100644
|
||||
--- a/include/alsa-symbols.h
|
||||
+++ b/include/alsa-symbols.h
|
||||
@@ -29,19 +29,10 @@
|
||||
#define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
|
||||
#define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
|
||||
|
||||
-#ifdef __powerpc64__
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
|
||||
-#else
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
-#endif
|
||||
+#define symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
+#define default_symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
|
||||
#ifdef USE_VERSIONED_SYMBOLS
|
||||
#define use_symbol_version(real, name, version) \
|
||||
@@ -50,13 +41,6 @@
|
||||
default_symbol_version(real, name, version)
|
||||
#else
|
||||
#define use_symbol_version(real, name, version) /* nothing */
|
||||
-#ifdef __powerpc64__
|
||||
-#define use_default_symbol_version(real, name, version) \
|
||||
- __asm__ (".weak " ASM_NAME(#name)); \
|
||||
- __asm__ (".weak ." ASM_NAME(#name)); \
|
||||
- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \
|
||||
- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
|
||||
-#else
|
||||
#if defined(__alpha__) || defined(__mips__)
|
||||
#define use_default_symbol_version(real, name, version) \
|
||||
__asm__ (".weak " ASM_NAME(#name)); \
|
||||
@@ -67,6 +51,5 @@
|
||||
__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
|
||||
#endif
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
#endif /* __ALSA_SYMBOLS_H */
|
||||
--
|
||||
2.10.0.297.gf6727b0
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Wed, 21 Dec 2016 19:41:26 -0300
|
||||
Subject: [PATCH] ucm: parser needs limits.h
|
||||
|
||||
It's using PATH_MAX which is defined there, otherwise the build fails on
|
||||
musl libc.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Patch status: sent to alsa-devel ML.
|
||||
|
||||
src/ucm/parser.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
||||
index c98373a..f520abc 100644
|
||||
--- a/src/ucm/parser.c
|
||||
+++ b/src/ucm/parser.c
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "ucm_local.h"
|
||||
#include <dirent.h>
|
||||
+#include <limits.h>
|
||||
|
||||
/** The name of the environment variable containing the UCM directory */
|
||||
#define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -3,18 +3,18 @@ comment "alsa-lib needs a toolchain w/ threads"
|
||||
|
||||
menuconfig BR2_PACKAGE_ALSA_LIB
|
||||
bool "alsa-lib"
|
||||
# Temporary until
|
||||
# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
|
||||
# is fixed
|
||||
select BR2_PACKAGE_ALSA_LIB_PCM
|
||||
# Even though some parts of alsa-lib use threads only when
|
||||
# available, some PCM plugins use them unconditionally. Since
|
||||
# the usage of alsa-lib on no-thread systems is pretty
|
||||
# unlikely, just require thread support globally for alsa-lib.
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# Temporary until
|
||||
# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
|
||||
# is fixed
|
||||
select BR2_PACKAGE_ALSA_LIB_PCM
|
||||
help
|
||||
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
|
||||
functionality to the Linux operating system.
|
||||
The Advanced Linux Sound Architecture (ALSA) provides audio
|
||||
and MIDI functionality to the Linux operating system.
|
||||
|
||||
http://www.alsa-project.org/
|
||||
|
||||
@@ -68,8 +68,8 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
|
||||
|
||||
config BR2_PACKAGE_ALSA_LIB_ALISP
|
||||
bool "alisp"
|
||||
depends on BR2_USE_MMU
|
||||
default y
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
|
||||
bool "old-symbols"
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c alsa-lib-1.1.3.tar.bz2
|
||||
sha256 f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6 alsa-lib-1.1.5.tar.bz2
|
||||
sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING
|
||||
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.1.3
|
||||
ALSA_LIB_VERSION = 1.1.5
|
||||
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
|
||||
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
|
||||
ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPLv2+ (aserver)
|
||||
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
|
||||
ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING
|
||||
ALSA_LIB_INSTALL_STAGING = YES
|
||||
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user