diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
commit | 9fddb4d5b41c0b5e69d5ee138297e95eff290302 (patch) | |
tree | b353402b4af0ac5b912dc78ca7d996c397b8e2e3 /unstable/vlc/uclibc.patch | |
parent | ccf26410d30adc8c1934dd553687157ed6e31d69 (diff) | |
parent | 8c1128e93e03012dabadb9a3f723dbd20eb60cd4 (diff) | |
download | aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.bz2 aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.xz |
Merged from Alpine main repository.
Merge
Conflicts:
main/abuild/APKBUILD
main/cramfs/APKBUILD
main/curl/APKBUILD
main/dialog/APKBUILD
main/libconfig/APKBUILD
main/snort/APKBUILD
main/syslinux/APKBUILD
Diffstat (limited to 'unstable/vlc/uclibc.patch')
-rw-r--r-- | unstable/vlc/uclibc.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/unstable/vlc/uclibc.patch b/unstable/vlc/uclibc.patch new file mode 100644 index 000000000..f71b189a4 --- /dev/null +++ b/unstable/vlc/uclibc.patch @@ -0,0 +1,65 @@ +--- a/src/misc/linux_specific.c 2009-07-08 09:29:41.000000000 +0000 ++++ b/src/misc/linux_specific.c 2009-07-08 09:30:47.000000000 +0000 +@@ -72,14 +72,14 @@ + } + #endif + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + # include <gnu/libc-version.h> + # include <stdlib.h> + #endif + + void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) + { +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + const char *glcv = gnu_get_libc_version (); + + /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing, +--- a/src/control/vlm.c 2009-07-09 09:21:55.000000000 +0000 ++++ b/src/control/vlm.c 2009-07-09 09:22:24.000000000 +0000 +@@ -21,6 +21,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include <vlc/libvlc.h> + #include <vlc/libvlc_vlm.h> + #include <vlc_es.h> +--- a/src/misc/mtime.c 2009-07-09 11:57:46.000000000 +0000 ++++ b/src/misc/mtime.c 2009-07-09 13:48:16.000000000 +0000 +@@ -78,7 +78,7 @@ + # define _POSIX_CLOCK_SELECTION (-1) + #endif + +-# if (_POSIX_CLOCK_SELECTION < 0) ++# if (_POSIX_CLOCK_SELECTION < 0) || defined(__UCLIBC__) + /* + * We cannot use the monotonic clock is clock selection is not available, + * as it would screw vlc_cond_timedwait() completely. Instead, we have to +--- a/src/misc/threads.c 2009-07-09 13:54:08.000000000 +0000 ++++ b/src/misc/threads.c 2009-07-09 13:54:32.000000000 +0000 +@@ -474,7 +474,7 @@ + /* Fairly outdated POSIX support (that was defined in 2001) */ + # define _POSIX_CLOCK_SELECTION (-1) + # endif +-# if (_POSIX_CLOCK_SELECTION >= 0) ++# if (_POSIX_CLOCK_SELECTION >= 0) && !defined(__UCLIBC__) + /* NOTE: This must be the same clock as the one in mtime.c */ + pthread_condattr_setclock (&attr, CLOCK_MONOTONIC); + # endif +--- a/modules/stream_filter/decomp.c 2009-07-09 14:10:09.000000000 +0000 ++++ b/modules/stream_filter/decomp.c 2009-07-09 14:11:37.000000000 +0000 +@@ -28,7 +28,7 @@ + #include <vlc_network.h> + #include <assert.h> + #include <unistd.h> +-#ifndef _POSIX_SPAWN ++#if !defined(_POSIX_SPAWN) || defined(__UCLIBC__) + # define _POSIX_SPAWN (-1) + #endif + #include <fcntl.h> |