From 0e747e7e9979810f3c27abec5c110460055e51c3 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 25 Jul 2021 12:07:01 +0300 Subject: [PATCH] update mpg123 to 1.28.2 --- deps/mpg123/include/mpg123.h | 30 ++++++++++++------ .../cmake/mpg123/mpg123-config-version.cmake | 2 +- deps/mpg123/lib/libmpg123.a | Bin 797592 -> 797592 bytes deps/mpg123/lib/pkgconfig/libmpg123.pc | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/deps/mpg123/include/mpg123.h b/deps/mpg123/include/mpg123.h index a3e0e066..c7f8ecc8 100644 --- a/deps/mpg123/include/mpg123.h +++ b/deps/mpg123/include/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.28.0) + libmpg123: MPEG Audio Decoder library (version 1.28.2) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1 @@ -17,7 +17,9 @@ * This should be incremented at least each time a new symbol is added * to the header. */ +#ifndef MPG123_API_VERSION #define MPG123_API_VERSION 46 +#endif #ifndef MPG123_EXPORT /** Defines needed for MS Visual Studio(tm) DLL builds. @@ -41,13 +43,6 @@ #endif #endif -/* This is for Visual Studio, so this header works as distributed in the binary downloads */ -#if defined(_MSC_VER) && !defined(MPG123_DEF_SSIZE_T) -#define MPG123_DEF_SSIZE_T -#include -typedef ptrdiff_t ssize_t; -#endif - /** Earlier versions of libmpg123 put enums into public API calls, * thich is not exactly safe. There are ABI rules, but you can use * compiler switches to change the sizes of enums. It is safer not @@ -76,9 +71,22 @@ typedef ptrdiff_t ssize_t; #endif +/* You can use this file directly, avoiding the autoconf replacements. + Might have to set MPG123_NO_LARGENAME, too, in case you have + _FILE_OFFSET_BITS defined where it does not make sense. */ +#ifndef MPG123_NO_CONFIGURE + #include #include +/* A little hack to help MSVC not having ssize_t. */ +#ifdef _MSC_VER +#include +typedef ptrdiff_t mpg123_ssize_t; +#else +typedef ssize_t mpg123_ssize_t; +#endif + /* You can always enforce largefile hackery by setting MPG123_LARGESUFFIX. */ /* Otherwise, this header disables it if the build system decided so. */ #if !defined(MPG123_LARGESUFFIX) && 0 @@ -87,6 +95,8 @@ typedef ptrdiff_t ssize_t; #endif #endif +#endif /* MPG123_NO_CONFIGURE */ + /* Simplified large file handling. I used to have a check here that prevents building for a library with conflicting large file setup (application that uses 32 bit offsets with library that uses 64 bits). @@ -1959,7 +1969,7 @@ MPG123_EXPORT size_t mpg123_outblock(mpg123_handle *mh); * \return MPG123_OK on success */ MPG123_EXPORT int mpg123_replace_reader( mpg123_handle *mh -, ssize_t (*r_read) (int, void *, size_t) +, mpg123_ssize_t (*r_read) (int, void *, size_t) , off_t (*r_lseek)(int, off_t, int) ); @@ -1978,7 +1988,7 @@ MPG123_EXPORT int mpg123_replace_reader( mpg123_handle *mh * \return MPG123_OK on success */ MPG123_EXPORT int mpg123_replace_reader_handle( mpg123_handle *mh -, ssize_t (*r_read) (void *, void *, size_t) +, mpg123_ssize_t (*r_read) (void *, void *, size_t) , off_t (*r_lseek)(void *, off_t, int) , void (*cleanup)(void*) ); diff --git a/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake b/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake index 37fc8dde..48a7a834 100644 --- a/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake +++ b/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake @@ -7,7 +7,7 @@ # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "1.28.0") +set(PACKAGE_VERSION "1.28.2") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) diff --git a/deps/mpg123/lib/libmpg123.a b/deps/mpg123/lib/libmpg123.a index 34c63f3df53f65bf97ded6aa10169af14dc82e91..1594b59b260e56ab9990a250cd8f635824e5e85a 100644 GIT binary patch delta 2822 zcmds2ZEO@p7|v{WXLoP6t%ak#HZ7J4v?rAIuE5b2tvwZ*)xIDw{Arj z`T8rf17$1c0^OY9JMrRb1N1#pNvwds(rOH4qHj9Hc$D`Ayak-d-vb?ZaW`B=1~un| zZ(7Y0CRBMBnt*AyOQ)Eli_K zK^3M3)*SC~0B6hfmFUVmakFN9tbKA&-qYfDx)m50z8b0C#oGdXck9Mc5^edo!U8&Y ziUh|58%|9Gr6pt`zj{D6Dn2Ck8umoA>H|?kwaG-r^m{Ky4=BsC-gtHGX#V<5^xo(@Uf^ zCV+cOB&3xmL3Wfp1e&OQVFc9vi)ruH1qo6eFMwqfAu(xqYmLyvV!|O3<2)oBX1nsGqS|nHP#9r%P476k zCSI`s;qp1MZMbjZ_gs}b(YrDx(H$@e|NM;-!SQ;iEtr{K<%n2P=(xO5^D=YJvKM9z=mZFgaDdJJE1 zyx5-i&ob^C7_Pt#^TnP-nt9kOr{MBs;&@Zt&2DUeS+ww?_SzK`7T~s8v3@qW82>LJ zzs6&`Uo4tUTcIBV?{)EPf+6P*>@g#&Go{fC(u9X1XaE@7AKdDr&{+n znytz3X55e>E0E>2WXK1X8F_yp+Hc^|4RWVqM$c^Q@XENuYq>d}R{Aeg8xhqm#O>!S z1F=os_OoT5$`acjbV#XwxGg5rZwkN}*QTBU<=?RzU>< zxrUe)G179WLkmI$wL*;addNTtp&Aq0@<#$SKr}%8z@J9N0#c~KI5#`H>?UerLj2&D z-M7Da@Aqcjy!YGf=RMocdm87XylMH~8F~K5!iy6jv%T0m4?3gsva+WEPq=nzCw)dL zv!e4WW&vhS2_Jf4g$9P7s-#vlQt8l^GVnKhP&}S`1l|N5961WTq@)Wjql>YRL*Yrm zCpcSUFqmM;H|n*t33Ls#W`q~KU$0sC^liAs08w-wUK-1z`JnLRmVTNXv_73;VX8TJ z%nLl*u2tYmv(bi_wLkXA##85@Z-_z5Z&%m}{mJm@e3`DY4vfwUC z0i^U@kTSut-p~P7W>AjGC*>CHm4h#z6jeOANM6YS(p@CuSbFM|gU9xRM%_Ns58l+B zehA1r1rmP&{E}wL;JOQ*b5W;N3Bu>vD+jMyD;JPZqM+Z157#yeZW3?^(LB0YwNoBc z$dyuIQ=Ww?^tNzLwIHuH3BSi#kcMXAaqi>8;4W~H-ZtT^lVOt(tyc!;F3ODtbf@4Slm`D?xkbFM%4r-w1{t+{m6k9ah98J zfedwuOOo`D(yzsrW#DNZr?#=@L=rkB26_Mc!rm+w0cXWPA@|o#Too?~WgKBHbwO#H z;ZnCAxQTDK^dY|!UpO-CB131TTYS)XxxrOwyrq(O#XVUi&)ksO6`j2FpqnJ$mU^Kj z|NZ;YExn>Fzaqdv^PchA@lYkH2p*TrOe1zUWMxtuFj>}JVu#I7h2wP>MopRebP`-_ zqerXGhE3*VBqMr!GZt|lK4goXk&@{Nm@bG52NoN84(sF{P0Bq$RUP5I!;LzeV zO(u;MFiz4G+dq@ER>AU2ZQYM)N4ZE+J=~G2cfunQ?R%7u%73^qID^Q?;1(y($jTDw zhl|n;MgAA6O*Q-gX&8ousg?r_j7Du!|5>}kC$5*1&|GvhQIDj}>muc4D49#TpKWdP za%AK8UlmDC1Qkp-UrXIJbTUCx@dr72nOKLc$dK=((HcAw z{l3Zn9jv}Ca-&-QYz*Z#DL0|YoyHs5j|c8cF0yZnS$aUt;^is$aPGCH;|B1QTb5odr4F3%e2_P(CjzJoi$23|2g<^ zaT#*fAFfl#;X2!QbM=h>g>Yjk-1(&Klx3X))6*Sp)+cpK6cuaow=m$ z5Og1QubT(dYU5s67b=5lfzcIIBdMC+RNV$LE|ns!chn@~wpgy75p|Q%4GgLILp^68 zjJaH}uQW~?W5%sX_Vh!@e$+r&