diff options
Diffstat (limited to 'main/vlc/uclibc3.patch')
| -rw-r--r-- | main/vlc/uclibc3.patch | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/main/vlc/uclibc3.patch b/main/vlc/uclibc3.patch index bacad290a4..e57d6dd5f0 100644 --- a/main/vlc/uclibc3.patch +++ b/main/vlc/uclibc3.patch @@ -1,23 +1,6 @@ -diff --git a/src/control/vlm.c b/src/control/vlm.c -index 05417e5..46fa957 100644 ---- a/src/control/vlm.c -+++ b/src/control/vlm.c -@@ -25,6 +25,10 @@ - # include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <vlc/libvlc.h> - #include <vlc/libvlc_vlm.h> - #include <vlc_es.h> -diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c -index 1644ce6..1440e1c 100644 ---- a/src/misc/linux_specific.c -+++ b/src/misc/linux_specific.c -@@ -83,14 +83,14 @@ static struct +--- vlc-2.0.0-rc1.orig/src/posix/linux_specific.c ++++ vlc-2.0.0-rc1/src/posix/linux_specific.c +@@ -83,14 +83,14 @@ unsigned refs; } once = { VLC_STATIC_MUTEX, 0 }; @@ -27,10 +10,29 @@ index 1644ce6..1440e1c 100644 # include <stdlib.h> #endif - void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) + void system_Init (void) { -#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, +--- vlc-2.0.0-rc1.orig/src/posix/thread.c ++++ vlc-2.0.0-rc1/src/posix/thread.c +@@ -1165,6 +1165,16 @@ + return vlc_atomic_swap (&timer->overruns, 0); + } + ++#if defined(HAVE_SCHED_GETAFFINITY) && !defined(CPU_COUNT) ++static unsigned CPU_COUNT(cpu_set_t *cpu) ++{ ++ unsigned i, count = 0; ++ for (i = 0; i < CPU_SETSIZE; i++) ++ if (CPU_ISSET(i, cpu)) ++ count++; ++ return count; ++} ++#endif + + /** + * Count CPUs. |