mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 13:21:05 +00:00
update mpg123 to 1.28.2
This commit is contained in:
parent
aa6f778f9d
commit
0e747e7e99
4 changed files with 22 additions and 12 deletions
30
deps/mpg123/include/mpg123.h
vendored
30
deps/mpg123/include/mpg123.h
vendored
|
@ -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
|
copyright 1995-2015 by the mpg123 project
|
||||||
free software under the terms of the LGPL 2.1
|
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
|
* This should be incremented at least each time a new symbol is added
|
||||||
* to the header.
|
* to the header.
|
||||||
*/
|
*/
|
||||||
|
#ifndef MPG123_API_VERSION
|
||||||
#define MPG123_API_VERSION 46
|
#define MPG123_API_VERSION 46
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MPG123_EXPORT
|
#ifndef MPG123_EXPORT
|
||||||
/** Defines needed for MS Visual Studio(tm) DLL builds.
|
/** Defines needed for MS Visual Studio(tm) DLL builds.
|
||||||
|
@ -41,13 +43,6 @@
|
||||||
#endif
|
#endif
|
||||||
#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 <stddef.h>
|
|
||||||
typedef ptrdiff_t ssize_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** Earlier versions of libmpg123 put enums into public API calls,
|
/** Earlier versions of libmpg123 put enums into public API calls,
|
||||||
* thich is not exactly safe. There are ABI rules, but you can use
|
* 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
|
* compiler switches to change the sizes of enums. It is safer not
|
||||||
|
@ -76,9 +71,22 @@ typedef ptrdiff_t ssize_t;
|
||||||
|
|
||||||
#endif
|
#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 <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
/* A little hack to help MSVC not having ssize_t. */
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <stddef.h>
|
||||||
|
typedef ptrdiff_t mpg123_ssize_t;
|
||||||
|
#else
|
||||||
|
typedef ssize_t mpg123_ssize_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* You can always enforce largefile hackery by setting MPG123_LARGESUFFIX. */
|
/* You can always enforce largefile hackery by setting MPG123_LARGESUFFIX. */
|
||||||
/* Otherwise, this header disables it if the build system decided so. */
|
/* Otherwise, this header disables it if the build system decided so. */
|
||||||
#if !defined(MPG123_LARGESUFFIX) && 0
|
#if !defined(MPG123_LARGESUFFIX) && 0
|
||||||
|
@ -87,6 +95,8 @@ typedef ptrdiff_t ssize_t;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* MPG123_NO_CONFIGURE */
|
||||||
|
|
||||||
/* Simplified large file handling.
|
/* Simplified large file handling.
|
||||||
I used to have a check here that prevents building for a library with conflicting large file setup
|
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).
|
(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
|
* \return MPG123_OK on success
|
||||||
*/
|
*/
|
||||||
MPG123_EXPORT int mpg123_replace_reader( mpg123_handle *mh
|
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)
|
, 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
|
* \return MPG123_OK on success
|
||||||
*/
|
*/
|
||||||
MPG123_EXPORT int mpg123_replace_reader_handle( mpg123_handle *mh
|
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)
|
, off_t (*r_lseek)(void *, off_t, int)
|
||||||
, void (*cleanup)(void*) );
|
, void (*cleanup)(void*) );
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# 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)
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
|
|
BIN
deps/mpg123/lib/libmpg123.a
vendored
BIN
deps/mpg123/lib/libmpg123.a
vendored
Binary file not shown.
2
deps/mpg123/lib/pkgconfig/libmpg123.pc
vendored
2
deps/mpg123/lib/pkgconfig/libmpg123.pc
vendored
|
@ -6,7 +6,7 @@ includedir=${prefix}/include
|
||||||
Name: libmpg123
|
Name: libmpg123
|
||||||
Description: An optimised MPEG Audio decoder
|
Description: An optimised MPEG Audio decoder
|
||||||
Requires:
|
Requires:
|
||||||
Version: 1.28.0
|
Version: 1.28.2
|
||||||
Libs: -L${libdir} -lmpg123
|
Libs: -L${libdir} -lmpg123
|
||||||
Libs.private:
|
Libs.private:
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in a new issue