From 07219bb6c9eb77a0e06449be6b4339c68253284a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Sep 2013 18:39:11 +0200 Subject: fix alsa-lib compile, as usual with ideas and patches from sab0tage --- package/alsa-lib/Makefile | 8 ++++--- package/alsa-lib/patches/patch-configure | 6 ++--- package/alsa-lib/patches/patch-include_local_h | 22 +++++++++++++++++ package/alsa-lib/patches/patch-include_pcm_h | 28 ++++++++++++++++++++++ .../alsa-lib/patches/patch-include_sound_asound_h | 11 +++++++++ .../alsa-lib/patches/patch-src_compat_hsearch_r_c | 15 ++++++++++++ package/alsa-lib/patches/patch-src_conf_c | 13 ++++++++++ 7 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 package/alsa-lib/patches/patch-include_local_h create mode 100644 package/alsa-lib/patches/patch-include_pcm_h create mode 100644 package/alsa-lib/patches/patch-include_sound_asound_h create mode 100644 package/alsa-lib/patches/patch-src_compat_hsearch_r_c create mode 100644 package/alsa-lib/patches/patch-src_conf_c (limited to 'package/alsa-lib') diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index ad33d2a9e..fa01868b7 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.0.26 +PKG_VERSION:= 1.0.27.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2dfa35d28471d721e592b616beedf965 +PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b PKG_DESCR:= ALSA sound library PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org/ @@ -23,7 +23,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV})) -CONFIGURE_ARGS+= --disable-python +TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1 +CONFIGURE_ARGS+= --disable-python \ + --without-versioned alsa-lib-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa diff --git a/package/alsa-lib/patches/patch-configure b/package/alsa-lib/patches/patch-configure index 86124e79f..f2fb1e344 100644 --- a/package/alsa-lib/patches/patch-configure +++ b/package/alsa-lib/patches/patch-configure @@ -1,6 +1,6 @@ ---- alsa-lib-1.0.25.orig/configure 2012-01-25 10:29:38.000000000 +0100 -+++ alsa-lib-1.0.25/configure 2012-03-02 17:37:04.000000000 +0100 -@@ -19111,14 +19111,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN +--- alsa-lib-1.0.27.2.orig/configure 2013-07-08 14:32:46.000000000 +0200 ++++ alsa-lib-1.0.27.2/configure 2013-09-16 17:03:08.000000000 +0200 +@@ -11942,14 +11942,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN test "x$prefix" = xNONE && prefix=$ac_default_prefix diff --git a/package/alsa-lib/patches/patch-include_local_h b/package/alsa-lib/patches/patch-include_local_h new file mode 100644 index 000000000..5897edf59 --- /dev/null +++ b/package/alsa-lib/patches/patch-include_local_h @@ -0,0 +1,22 @@ +* added idea/patch from https://github.com/rofl0r/sabotage + +--- alsa-lib-1.0.27.2.orig/include/local.h 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/include/local.h 2013-09-17 09:53:17.000000000 +0200 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +@@ -116,7 +116,7 @@ + /* kill and replace kernel-specific types */ + #define __user + #define __force +-#define __kernel_off_t off_t ++//#define __kernel_off_t off_t + + #include + diff --git a/package/alsa-lib/patches/patch-include_pcm_h b/package/alsa-lib/patches/patch-include_pcm_h new file mode 100644 index 000000000..6fe117463 --- /dev/null +++ b/package/alsa-lib/patches/patch-include_pcm_h @@ -0,0 +1,28 @@ +* added idea/patch from https://github.com/rofl0r/sabotage + +--- alsa-lib-1.0.27.2.orig/include/pcm.h 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/include/pcm.h 2013-09-16 17:04:30.000000000 +0200 +@@ -33,6 +33,8 @@ + extern "C" { + #endif + ++#include ++ + /** + * \defgroup PCM PCM Interface + * See the \ref pcm page for more details. +@@ -1048,10 +1050,10 @@ int snd_pcm_format_width(snd_pcm_format_ + 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); diff --git a/package/alsa-lib/patches/patch-include_sound_asound_h b/package/alsa-lib/patches/patch-include_sound_asound_h new file mode 100644 index 000000000..ed7354094 --- /dev/null +++ b/package/alsa-lib/patches/patch-include_sound_asound_h @@ -0,0 +1,11 @@ +--- alsa-lib-1.0.27.2.orig/include/sound/asound.h 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/include/sound/asound.h 2013-09-17 09:40:33.000000000 +0200 +@@ -24,7 +24,7 @@ + #define _UAPI__SOUND_ASOUND_H + + #include +- ++#undef off_t + + /* + * protocol version diff --git a/package/alsa-lib/patches/patch-src_compat_hsearch_r_c b/package/alsa-lib/patches/patch-src_compat_hsearch_r_c new file mode 100644 index 000000000..bb2bef0b5 --- /dev/null +++ b/package/alsa-lib/patches/patch-src_compat_hsearch_r_c @@ -0,0 +1,15 @@ +* added idea/patch from https://github.com/rofl0r/sabotage + and https://bitbucket.org/GregorR/musl-pkgsrc-patches + +--- alsa-lib-1.0.27.2.orig/src/compat/hsearch_r.c 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/src/compat/hsearch_r.c 2013-09-17 18:14:02.000000000 +0200 +@@ -1,3 +1,4 @@ ++#if 0 + /* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1993. +@@ -234,3 +235,4 @@ hsearch_r (item, action, retval, htab) + *retval = NULL; + return 0; + } ++#endif diff --git a/package/alsa-lib/patches/patch-src_conf_c b/package/alsa-lib/patches/patch-src_conf_c new file mode 100644 index 000000000..a6f296614 --- /dev/null +++ b/package/alsa-lib/patches/patch-src_conf_c @@ -0,0 +1,13 @@ +* added idea/patch from https://github.com/rofl0r/sabotage + +--- alsa-lib-1.0.27.2.orig/src/conf.c 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/src/conf.c 2013-09-17 18:30:14.000000000 +0200 +@@ -428,7 +428,7 @@ beginning:

+ + #ifdef HAVE_LIBPTHREAD + static pthread_mutex_t snd_config_update_mutex = +- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++ {{{1,0,0,0,0,0,0,0,0,0}}}; + #endif + + struct _snd_config { -- cgit v1.2.3