diff --git a/patches/alsa-lib-1.1.4.1.local.patch b/patches/alsa-lib-1.1.4.1.local.patch index 4de9ff1..3171801 100644 --- a/patches/alsa-lib-1.1.4.1.local.patch +++ b/patches/alsa-lib-1.1.4.1.local.patch @@ -1,15 +1,3 @@ -diff -ru alsa-lib-1.1.4.1.orig/aserver/aserver.c alsa-lib-1.1.4.1/aserver/aserver.c ---- alsa-lib-1.1.4.1.orig/aserver/aserver.c 2017-06-01 08:27:36.000000000 +0200 -+++ alsa-lib-1.1.4.1/aserver/aserver.c 2017-08-07 19:59:05.000000000 +0200 -@@ -20,7 +20,7 @@ - - #include - #include --#include -+#include - #include - #include - #include diff -ru alsa-lib-1.1.4.1.orig/include/asoundlib-head.h alsa-lib-1.1.4.1/include/asoundlib-head.h --- alsa-lib-1.1.4.1.orig/include/asoundlib-head.h 2017-06-01 08:27:36.000000000 +0200 +++ alsa-lib-1.1.4.1/include/asoundlib-head.h 2017-08-08 21:10:17.989795195 +0200 @@ -66,24 +54,6 @@ diff -ru alsa-lib-1.1.4.1.orig/include/sound/asoc.h alsa-lib-1.1.4.1/include/sou __le16 reserved; /* for 32bit alignment */ __le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */ __le32 bclk_rate; /* BCLK freqency in Hz */ -diff -ru alsa-lib-1.1.4.1.orig/src/control/control.c alsa-lib-1.1.4.1/src/control/control.c ---- alsa-lib-1.1.4.1.orig/src/control/control.c 2017-06-01 08:27:36.000000000 +0200 -+++ alsa-lib-1.1.4.1/src/control/control.c 2017-08-08 21:08:21.870365353 +0200 -@@ -90,10 +90,13 @@ - #include - #include - #include --#include -+#include - #include - #include "control_local.h" - -+//ffs? -+#define DOXYGEN -+ - /** - * \brief get identifier of CTL handle - * \param ctl CTL handle diff -ru alsa-lib-1.1.4.1.orig/src/control/control_shm.c alsa-lib-1.1.4.1/src/control/control_shm.c --- alsa-lib-1.1.4.1.orig/src/control/control_shm.c 2017-06-01 08:27:36.000000000 +0200 +++ alsa-lib-1.1.4.1/src/control/control_shm.c 2017-08-07 20:05:09.000000000 +0200 @@ -96,18 +66,6 @@ diff -ru alsa-lib-1.1.4.1.orig/src/control/control_shm.c alsa-lib-1.1.4.1/src/co #include #include #include -diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm.c alsa-lib-1.1.4.1/src/pcm/pcm.c ---- alsa-lib-1.1.4.1.orig/src/pcm/pcm.c 2017-06-01 08:27:36.000000000 +0200 -+++ alsa-lib-1.1.4.1/src/pcm/pcm.c 2017-08-07 20:01:58.000000000 +0200 -@@ -651,7 +651,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "pcm_local.h" diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_direct.c alsa-lib-1.1.4.1/src/pcm/pcm_direct.c --- alsa-lib-1.1.4.1.orig/src/pcm/pcm_direct.c 2017-06-01 08:27:36.000000000 +0200 +++ alsa-lib-1.1.4.1/src/pcm/pcm_direct.c 2017-08-07 20:04:20.000000000 +0200 @@ -180,15 +138,94 @@ diff -ru alsa-lib-1.1.4.1.orig/src/shmarea.c alsa-lib-1.1.4.1/src/shmarea.c #include #include #include "list.h" -diff -ru alsa-lib-1.1.4.1.orig/src/timer/timer.c alsa-lib-1.1.4.1/src/timer/timer.c ---- alsa-lib-1.1.4.1.orig/src/timer/timer.c 2017-06-01 08:27:36.000000000 +0200 -+++ alsa-lib-1.1.4.1/src/timer/timer.c 2017-08-08 21:05:10.627280828 +0200 -@@ -71,6 +71,8 @@ +--- alsa-lib-1.1.4.1/include/alsa-symbols.h.orig 2017-06-01 06:27:36.000000000 +0000 ++++ alsa-lib-1.1.4.1/include/alsa-symbols.h 2017-09-13 16:07:27.720000000 +0000 +@@ -45,6 +45,8 @@ + #define use_default_symbol_version(real, name, version) \ + __asm__ (".weak " ASM_NAME(#name)); \ + __asm__ (ASM_NAME(#name) " = " ASM_NAME(#real)) ++#elif defined(__midipix__) ++#define use_default_symbol_version(real, name, version) /* nothing */ + #else + #define use_default_symbol_version(real, name, version) \ + __asm__ (".weak " ASM_NAME(#name)); \ +--- alsa-lib-1.1.4.1/src/control/control.c.orig 2017-06-01 06:27:36.000000000 +0000 ++++ alsa-lib-1.1.4.1/src/control/control.c 2017-09-13 16:19:34.464000000 +0000 +@@ -90,7 +90,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "control_local.h" +@@ -2504,11 +2504,7 @@ + * \param obj CTL element id/info + * \return zero value if no dimensions are defined, otherwise positive value with count of dimensions + */ +-#ifndef DOXYGEN +-int INTERNAL(snd_ctl_elem_info_get_dimensions)(const snd_ctl_elem_info_t *obj) +-#else + int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj) +-#endif + { + int i; + +@@ -2526,11 +2522,7 @@ + * \param idx The dimension index + * \return zero value if no dimension width is defined, otherwise positive value with with of specified dimension + */ +-#ifndef DOXYGEN +-int INTERNAL(snd_ctl_elem_info_get_dimension)(const snd_ctl_elem_info_t *obj, unsigned int idx) +-#else + int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int idx) +-#endif + { + assert(obj); + if (idx > 3) +--- alsa-lib-1.1.4.1/src/timer/timer.c.orig 2017-06-01 06:27:36.000000000 +0000 ++++ alsa-lib-1.1.4.1/src/timer/timer.c 2017-09-13 16:20:57.728000000 +0000 +@@ -736,11 +736,7 @@ + * \param params pointer to #snd_timer_params_t structure + * \param filter The event filter bits to set + */ +-#ifndef DOXYGEN +-void INTERNAL(snd_timer_params_set_filter)(snd_timer_params_t * params, unsigned int filter) +-#else + void snd_timer_params_set_filter(snd_timer_params_t * params, unsigned int filter) +-#endif + { + assert(params); + params->filter = filter; +--- alsa-lib-1.1.4.1/src/pcm/pcm.c.orig 2017-06-01 06:27:36.000000000 +0000 ++++ alsa-lib-1.1.4.1/src/pcm/pcm.c 2017-09-13 16:21:58.544000000 +0000 +@@ -651,7 +651,7 @@ + #include #include + #include +-#include ++#include + #include + #include + #include "pcm_local.h" +--- alsa-lib-1.1.4.1/aserver/aserver.c.orig 2017-06-01 06:27:36.000000000 +0000 ++++ alsa-lib-1.1.4.1/aserver/aserver.c 2017-09-13 16:24:10.272000000 +0000 +@@ -20,7 +20,7 @@ -+#define DOXYGEN -+ - static int snd_timer_open_conf(snd_timer_t **timer, - const char *name, snd_config_t *timer_root, - snd_config_t *timer_conf, int mode) + #include + #include +-#include ++#include + #include + #include + #include +@@ -473,7 +473,7 @@ + ctrl->result = snd_pcm_rewind(pcm, ctrl->u.rewind.frames); + break; + case SND_PCM_IOCTL_FORWARD: +- ctrl->result = snd_pcm_forward(pcm, ctrl->u.forward.frames); ++ ctrl->result = INTERNAL(snd_pcm_forward(pcm, ctrl->u.forward.frames)); + break; + case SNDRV_PCM_IOCTL_LINK: + { diff --git a/vars/build.vars b/vars/build.vars index 50ed4da..926d3f2 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -280,6 +280,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_ALSA_LIB_SHA256SUM:=91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76}; : ${PKG_ALSA_LIB_VERSION:=1.1.4.1}; : ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.4.1.tar.bz2}; +: ${PKG_ALSA_LIB_CONFIGURE_ARGS_EXTRA:=--with-versioned=no}; +: ${PKG_ALSA_LIB_MAKEFLAGS_BUILD_EXTRA:=V=99}; : ${PKG_APR_SHA256SUM:=09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd}; : ${PKG_APR_VERSION:=1.6.2}; : ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};