From 2b9eef89a7a4ab2ffe101e1f2d53a9baee0c2576 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Sep 12 2017 17:53:44 +0000 Subject: vars/build.vars: adds alsa-lib v1.1.4.1, aria2 v1.32.0, and patchutils v0.3.4 (via Redfoxmoon.) patches/alsa-lib-1.1.4.1.local.patch: via Redfoxmoon. --- diff --git a/patches/alsa-lib-1.1.4.1.local.patch b/patches/alsa-lib-1.1.4.1.local.patch new file mode 100644 index 0000000..4de9ff1 --- /dev/null +++ b/patches/alsa-lib-1.1.4.1.local.patch @@ -0,0 +1,194 @@ +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 +@@ -35,6 +35,6 @@ + #include + #include + #include +-#include ++#include + #include + #include +diff -ru alsa-lib-1.1.4.1.orig/include/local.h alsa-lib-1.1.4.1/include/local.h +--- alsa-lib-1.1.4.1.orig/include/local.h 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/include/local.h 2017-08-07 19:47:39.843855153 +0200 +@@ -47,7 +47,7 @@ + #error Header defining endianness not defined + #endif + #include +-#include ++#include + #include + #include + #if defined(__linux__) +@@ -254,8 +254,10 @@ + /* + */ + #define HAVE_GNU_LD ++#ifndef __midipix__ + #define HAVE_ELF + #define HAVE_ASM_PREVIOUS_DIRECTIVE ++#endif + + /* Stolen from libc-symbols.h in GNU glibc */ + +diff -ru alsa-lib-1.1.4.1.orig/include/sound/asoc.h alsa-lib-1.1.4.1/include/sound/asoc.h +--- alsa-lib-1.1.4.1.orig/include/sound/asoc.h 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/include/sound/asoc.h 2017-08-07 19:53:15.000000000 +0200 +@@ -300,12 +300,12 @@ + __le32 size; /* in bytes of this structure */ + __le32 id; /* unique ID - - used to match */ + __le32 fmt; /* SND_SOC_DAI_FORMAT_ format value */ +- __u8 clock_gated; /* 1 if clock can be gated to save power */ +- __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ +- __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ +- __u8 bclk_master; /* 1 for master of BCLK, 0 for slave */ +- __u8 fsync_master; /* 1 for master of FSYNC, 0 for slave */ +- __u8 mclk_direction; /* 0 for input, 1 for output */ ++ uint8_t clock_gated; /* 1 if clock can be gated to save power */ ++ uint8_t invert_bclk; /* 1 for inverted BCLK, 0 for normal */ ++ uint8_t invert_fsync; /* 1 for inverted frame clock, 0 for normal */ ++ uint8_t bclk_master; /* 1 for master of BCLK, 0 for slave */ ++ uint8_t fsync_master; /* 1 for master of FSYNC, 0 for slave */ ++ uint8_t mclk_direction; /* 0 for input, 1 for output */ + __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 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #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 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.4.1/src/pcm/pcm_mmap.c +--- alsa-lib-1.1.4.1.orig/src/pcm/pcm_mmap.c 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/src/pcm/pcm_mmap.c 2017-08-07 20:02:18.000000000 +0200 +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #ifdef HAVE_SYS_SHM_H + #include +diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_share.c alsa-lib-1.1.4.1/src/pcm/pcm_share.c +--- alsa-lib-1.1.4.1.orig/src/pcm/pcm_share.c 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/src/pcm/pcm_share.c 2017-08-07 20:02:49.000000000 +0200 +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "pcm_local.h" + +diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_shm.c alsa-lib-1.1.4.1/src/pcm/pcm_shm.c +--- alsa-lib-1.1.4.1.orig/src/pcm/pcm_shm.c 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/src/pcm/pcm_shm.c 2017-08-07 20:02:33.000000000 +0200 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -ru alsa-lib-1.1.4.1.orig/src/seq/seq.c alsa-lib-1.1.4.1/src/seq/seq.c +--- alsa-lib-1.1.4.1.orig/src/seq/seq.c 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/src/seq/seq.c 2017-08-07 20:00:54.000000000 +0200 +@@ -777,7 +777,7 @@ + + */ + +-#include ++#include + #include "seq_local.h" + + /**************************************************************************** +diff -ru alsa-lib-1.1.4.1.orig/src/shmarea.c alsa-lib-1.1.4.1/src/shmarea.c +--- alsa-lib-1.1.4.1.orig/src/shmarea.c 2017-06-01 08:27:36.000000000 +0200 ++++ alsa-lib-1.1.4.1/src/shmarea.c 2017-08-07 19:57:44.000000000 +0200 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #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 @@ + + #include + ++#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) diff --git a/vars/build.vars b/vars/build.vars index d20662e..2b0f2ca 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -255,10 +255,10 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LIB_PACKAGES_PACKAGES_LEAVES=" -expat libxml2 apr apr_util bzip2 curl libz libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre libffi_host -glib_host glib gzip libarchive libatomic_ops libpipeline libressl libevent libfetch -libgpg_error libassuan imlib2 libcaca libfirm libgcrypt libksba lua ncurses -ncursestw ncursesw npth sqlite3 xz"; +expat libxml2 alsa_lib apr apr_util bzip2 curl libz libpng libjpeg_turbo tiff giflib +libffi gdbm geoip pcre libffi_host glib_host glib gzip libarchive libatomic_ops +libpipeline libressl libevent libfetch libgpg_error libassuan imlib2 libcaca libfirm +libgcrypt libksba lua ncurses ncursestw ncursesw npth sqlite3 xz"; LIB_PACKAGES_PACKAGES_X11=" inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm @@ -277,6 +277,9 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LIBXML2_VERSION:=2.9.4}; : ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz}; : ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"}; +: ${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_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}; @@ -360,7 +363,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_GZIP_CONFIGURE_ARGS:=--host=${TARGET} --prefix= --target=${TARGET}}; : ${PKG_GZIP_MAKEFLAGS_BUILD_EXTRA:=OBJA= prefix=}; : ${PKG_GZIP_MAKEFLAGS_INSTALL_EXTRA:=OBJA= prefix=}; -: ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde}; : ${PKG_LIBARCHIVE_SHA256SUM:=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f}; : ${PKG_LIBARCHIVE_VERSION:=3.2.2}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; @@ -572,11 +574,11 @@ LEAF_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targ LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LEAF_PACKAGES_PACKAGES=" -apk_tools bash bc bdwgc bind bison chicken clang_host coreutils cparser cron dash datamash diffutils -dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi -john ldns less lighttpd lynx make man_db mc mksh mtr m4 nano netcat nginx openlitespeed openssh p7zip -pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat st tar tcsh the_silver_searcher -tmux toilet util_linux vim weechat wget which whois xeyes xwd zsh"; +apk_tools aria2 bash bc bdwgc bind bison chicken clang_host coreutils cparser cron dash datamash diffutils +dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip +irssi john ldns less lighttpd lynx make man_db mc mksh mtr m4 nano netcat nginx openlitespeed openssh p7zip +pacman patch patchutils perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat st tar tcsh +the_silver_searcher tmux toilet util_linux vim weechat wget which whois xeyes xwd zsh"; if [ -n "$(which ruby 2>/dev/null)" ]; then LEAF_PACKAGES_PACKAGES="${LEAF_PACKAGES_PACKAGES:+${LEAF_PACKAGES_PACKAGES} }ruby"; fi; @@ -587,6 +589,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_BUILD_DIR:=apk-tools-${PKG_APK_TOOLS_VERSION}}; : ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}:PKG_CONFIG=${TARGET}-pkg-config}; : ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:=MANDIR=/share/man DOCDIR=/share/doc/apk}; +: ${PKG_ARIA2_SHA256SUM:=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50}; +: ${PKG_ARIA2_VERSION:=1.32.0}; +: ${PKH_ARIA2_URL:=https://github.com/aria2/aria2/releases/download/release-${PKG_ARIA2_VERSION}/aria2-${PKG_ARIA2_VERSION}.tar.xz}; : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb}; : ${PKG_BASH_VERSION:=4.4}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; @@ -831,6 +836,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PATCH_SHA256SUM:=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f}; : ${PKG_PATCH_VERSION:=2.7.5}; : ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz}; +: ${PKG_PATCHUTILS_SHA256SUM:=cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876}; +: ${PKG_PATCHUTILS_VERSION:=0.3.4}; +: ${PKG_PATCHUTILS_URL:=http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PKG_PATCHUTILS_VERSION}.tar.xz}; : ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27}; : ${PKG_PERL_VERSION:=5.22.1}; : ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz};