diff options
| -rw-r--r-- | patches/mpg123-1.25.10.local.patch | 79 | ||||
| -rw-r--r-- | vars/build.vars | 12 | ||||
| -rw-r--r-- | vars/nano.vars | 10 |
3 files changed, 98 insertions, 3 deletions
diff --git a/patches/mpg123-1.25.10.local.patch b/patches/mpg123-1.25.10.local.patch new file mode 100644 index 00000000..6525ec62 --- /dev/null +++ b/patches/mpg123-1.25.10.local.patch @@ -0,0 +1,79 @@ +diff -ru mpg123-1.25.10.orig/configure mpg123-1.25.10/configure +--- mpg123-1.25.10.orig/configure 2018-02-27 11:34:50.000000000 +0100 ++++ mpg123-1.25.10/configure 2018-11-04 00:56:56.667103853 +0100 +@@ -6497,6 +6497,10 @@ + #error Cygwin should use dlopen + #endif + ++#ifdef __midipix__ ++#error midipix has dlopen(3) ++#endif ++ + #include <windows.h> + + int main() { +@@ -6595,7 +6599,7 @@ + + fi + if test x"$modules" = xenabled -a x"$have_dl" = xno; then +- as_fn_error $? "Modules enabled but no runtime loader found! This will not work..." "$LINENO" 5 ++ echo "Buggy modules detection... this should be properly fixed, someday..." + fi + if test x"$modules" = xauto; then + if test x"$have_dl" = xyes; then +@@ -19133,7 +19137,7 @@ + + + # Check if we want Unicode for Win32. Cygwin does not need _wopen +-if test x$ac_cv_header_windows_h = xyes && test "x$host_os" != "xcygwin"; then ++if test x$ac_cv_header_windows_h = xyes && test "x$host_os" != "xcygwin" && test "x$host_os" != "xmidipix"; then + win32_specific_codes=enabled + else + win32_specific_codes=disabled +diff -ru mpg123-1.25.10.orig/src/intsym.h mpg123-1.25.10/src/intsym.h +--- mpg123-1.25.10.orig/src/intsym.h 2018-02-27 11:26:38.000000000 +0100 ++++ mpg123-1.25.10/src/intsym.h 2018-11-04 01:04:36.017552210 +0100 +@@ -3,6 +3,7 @@ + /* Mapping of internal mpg123 symbols to something that is less likely to + conflict in case of static linking. */ + #include "config.h" ++#ifndef __midipix__ + #define COS9 INT123_COS9 + #define tfcos36 INT123_tfcos36 + #define pnts INT123_pnts +@@ -358,3 +359,4 @@ + #define strerror INT123_strerror + #endif + #endif ++#endif +diff -ru mpg123-1.25.10.orig/src/libout123/modules/win32.c mpg123-1.25.10/src/libout123/modules/win32.c +--- mpg123-1.25.10.orig/src/libout123/modules/win32.c 2018-02-27 11:26:38.000000000 +0100 ++++ mpg123-1.25.10/src/libout123/modules/win32.c 2018-11-04 12:29:01.346944126 +0100 +@@ -11,8 +11,27 @@ + + #include "out123_int.h" + #include <windows.h> ++#include <mmsystem.h> + #include "debug.h" + ++/* temporary stuffs :D */ ++#define WAVE_MAPPER ((UINT)-1) ++ ++#define WAVE_FORMAT_PCM 1 ++ ++#define INFINITE 0xffffffff ++ ++#define WAVERR_BASE 32 ++#define WAVERR_BADFORMAT (WAVERR_BASE + 0) ++ ++#define MMSYSERR_BASE 0 ++#define MMSYSERR_NOERROR 0 ++#define MMSYSERR_ALLOCATED (MMSYSERR_BASE + 4) ++#define MMSYSERR_NODRIVER (MMSYSERR_BASE + 6) ++#define MMSYSERR_NOMEM (MMSYSERR_BASE + 7) ++/* hello there! */ ++ ++ + /* + Buffer size and number of buffers in the playback ring + NOTE: This particular num/size combination performs best under heavy diff --git a/vars/build.vars b/vars/build.vars index 1397c735..6f9b8b16 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -910,7 +910,7 @@ DEV_PACKAGES_PYTHON="${PREFIX}/bin/python"; # Packages list native_packages_cmdline NATIVE_PACKAGES_CMDLINE_PACKAGES=" bash bc busybox coreutils dash datamash dos2unix ed figlet findutils -gawk grep mksh ksh_openbsd moon_buggy ninvaders rc sbase sed sloccount tar tcsh +gawk grep mksh ksh_openbsd moon_buggy mpg123 ninvaders rc sbase sed sloccount tar tcsh the_silver_searcher toilet tree terminally_tetris ubase which zsh"; : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb}; : ${PKG_BASH_VERSION:=4.4}; @@ -980,6 +980,12 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh"; : ${PKG_MOON_BUGGY_URL:=https://m.seehuhn.de/programs/moon-buggy-${PKG_MOON_BUGGY_VERSION}.tar.gz}; : ${PKG_MOON_BUGGY_CONFIGURE_ARGS_EXTRA:="--sharedstatedir=/etc"}; : ${PKG_MOON_BUGGY_IN_TREE:=1}; +: ${PKG_MPG123_SHA256SUM:=6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023}; +: ${PKG_MPG123_VERSION:=1.25.10}; +: ${PKG_MPG123_URL:=https://mpg123.de/download/mpg123-${PKG_MPG123_VERSION}.tar.bz2}; +: ${PKG_MPG123_CONFIGURE_ARGS_EXTRA:="--enable-modules --with-cpu=generic_dither --with-audio=win32"}; +: ${PKG_MPG123_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/w32api.ports -DWINAPI_UTF16_DEFAULT"}; +: ${PKG_MPG123_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -lkernel32"}; : ${PKG_NINVADERS_SHA256SUM:=bfbc5c378704d9cf5e7fed288dac88859149bee5ed0850175759d310b61fd30b}; : ${PKG_NINVADERS_VERSION:=0.1.1}; : ${PKG_NINVADERS_URL:=http://http.debian.net/debian/pool/main/n/ninvaders/ninvaders_${PKG_NINVADERS_VERSION}.orig.tar.gz}; @@ -1217,8 +1223,8 @@ fi; : ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"}; : ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"}; : ${PKG_MC_LDFLAGS_BUILD_EXTRA:=-ltinfo}; -: ${PKG_NANO_SHA256SUM:=07192c320b74c1fb78437021e9affa6a9d55b806ee012de601902392eaa03601}; -: ${PKG_NANO_VERSION:=2.9.8}; +: ${PKG_NANO_SHA256SUM:=cc99372b6e3f38a86617143cbf5987f33641f541334070146dc2648aba1fa42f}; +: ${PKG_NANO_VERSION:=3.1}; : ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz}; : ${PKG_NCDU_SHA256SUM:=f4d9285c38292c2de05e444d0ba271cbfe1a705eee37c2b23ea7c448ab37255a}; : ${PKG_NCDU_VERSION:=1.13}; diff --git a/vars/nano.vars b/vars/nano.vars new file mode 100644 index 00000000..d127c956 --- /dev/null +++ b/vars/nano.vars @@ -0,0 +1,10 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_NANO_CONFIG_CACHE_EXTRA:=" +am_cv_func_working_getline=yes +gl_cv_func_working_getdelim=yes +gl_cv_func_memchr_works=yes"}; + +# vim:filetype=sh |