diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
commit | a74b8da459dcdee1d1fc633d9d1856fdb89fd7bd (patch) | |
tree | 291ff6b5793e74c8994696a7fe26e82f6f646601 | |
parent | 33adad70313bb73464cbd002370cd14bade79a54 (diff) |
fix musl compile, when xorg package collection is selected. X still does not work with musl
37 files changed, 545 insertions, 23 deletions
diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c new file mode 100644 index 000000000..4ca3a2708 --- /dev/null +++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c @@ -0,0 +1,11 @@ +--- Mesa-9.2.2.orig/src/mesa/main/querymatrix.c 2013-04-08 20:21:04.000000000 +0200 ++++ Mesa-9.2.2/src/mesa/main/querymatrix.c 2013-10-24 17:06:31.000000000 +0200 +@@ -74,7 +74,7 @@ fpclassify(double x) + #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ + defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ + (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ +- (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) ++ (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) || 1 + + /* fpclassify is available. */ + diff --git a/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h b/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h new file mode 100644 index 000000000..5b361b846 --- /dev/null +++ b/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h @@ -0,0 +1,11 @@ +--- mozilla-release.orig/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h 2013-09-11 01:15:00.000000000 +0200 ++++ mozilla-release/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h 2013-10-24 11:28:30.000000000 +0200 +@@ -33,6 +33,8 @@ + + #ifndef alloc_hooks_h__ + #define alloc_hooks_h__ ++/* prevent free/calloc from sched.h to be included */ ++#undef _GNU_SOURCE + + /** + * This file is force-included in hunspell code. Its purpose is to add memory diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc index 53abb7933..8537bed9a 100644 --- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc +++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc @@ -1,5 +1,5 @@ --- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc 2013-09-11 01:15:04.000000000 +0200 -+++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc 2013-10-14 18:04:28.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc 2013-10-23 16:28:38.000000000 +0200 @@ -5,7 +5,9 @@ #include "build/build_config.h" #include "base/debug_util.h" @@ -7,7 +7,7 @@ -#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID)) +#include <features.h> + -+#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID) && !defined(__UCLIBC__)) ++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID) && !defined(__UCLIBC__)) && defined(__GLIBC__) #include <errno.h> #include <fcntl.h> diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h new file mode 100644 index 000000000..137efacd8 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h @@ -0,0 +1,23 @@ +--- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-09-11 01:15:04.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/base/file_util.h 2013-10-23 16:28:38.000000000 +0200 +@@ -16,7 +16,11 @@ + #include <sys/stat.h> + #elif defined(OS_POSIX) + #include <sys/types.h> ++#ifndef __GLIBC__ ++#define NO_FTS ++#else + #include <fts.h> ++#endif + #include <sys/stat.h> + #endif + +@@ -466,7 +470,7 @@ class FileEnumerator { + #if defined(OS_WIN) + WIN32_FIND_DATA find_data_; + HANDLE find_handle_; +-#elif defined(ANDROID) ++#elif defined(NO_FTS) + void *fts_; + #elif defined(OS_POSIX) + FTS* fts_; diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc new file mode 100644 index 000000000..6721e44f8 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc @@ -0,0 +1,75 @@ +--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc 2013-09-11 01:15:04.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -8,13 +8,16 @@ + #include <errno.h> + #include <fcntl.h> + #include <fnmatch.h> +-#ifndef ANDROID ++#ifndef __GLIBC__ ++#define NO_FTS ++#endif ++#ifndef NO_FTS + #include <fts.h> + #endif + #include <libgen.h> + #include <stdio.h> + #include <string.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <sys/mman.h> + #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures + #include <sys/stat.h> +@@ -121,7 +124,7 @@ bool Delete(const FilePath& path, bool r + if (!recursive) + return (rmdir(path_str) == 0); + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else +@@ -194,7 +197,7 @@ bool CopyDirectory(const FilePath& from_ + return false; + } + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else +@@ -415,7 +418,7 @@ bool CreateNewTempDirectory(const FilePa + return false; + tmpdir = tmpdir.Append(kTempFileName); + std::string tmpdir_string = tmpdir.value(); +-#ifdef ANDROID ++#ifdef NO_FTS + char* dtemp = NULL; + #else + // this should be OK since mkdtemp just replaces characters in place +@@ -613,7 +616,7 @@ FileEnumerator::FileEnumerator(const Fil + } + + FileEnumerator::~FileEnumerator() { +-#ifndef ANDROID ++#ifndef NO_FTS + if (fts_) + fts_close(fts_); + #endif +@@ -625,7 +628,7 @@ void FileEnumerator::GetFindInfo(FindInf + if (!is_in_find_op_) + return; + +-#ifndef ANDROID ++#ifndef NO_FTS + memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat)); + info->filename.assign(fts_ent_->fts_name); + #endif +@@ -636,7 +639,7 @@ void FileEnumerator::GetFindInfo(FindInf + // large directories with many files this can be quite deep. + // TODO(erikkay) - get rid of this recursive pattern + FilePath FileEnumerator::Next() { +-#ifdef ANDROID ++#ifdef NO_FTS + return FilePath(); + #else + if (!is_in_find_op_) { diff --git a/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c b/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c new file mode 100644 index 000000000..f681a127a --- /dev/null +++ b/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c @@ -0,0 +1,10 @@ +--- mozilla-release.orig/media/libcubeb/src/cubeb_alsa.c 2013-09-11 01:15:15.000000000 +0200 ++++ mozilla-release/media/libcubeb/src/cubeb_alsa.c 2013-10-23 16:28:38.000000000 +0200 +@@ -5,6 +5,7 @@ + * accompanying file LICENSE for details. + */ + #undef NDEBUG ++#define _POSIX_SOURCE + #define _BSD_SOURCE + #define _XOPEN_SOURCE 500 + #include <pthread.h> diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c new file mode 100644 index 000000000..f422715dd --- /dev/null +++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c @@ -0,0 +1,11 @@ +--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-09-11 01:15:16.000000000 +0200 ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-10-23 16:28:38.000000000 +0200 +@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id: + #include <net/if_dl.h> + #include <net/if_types.h> + #include <sys/sockio.h> +-#else ++#elif 0 + #include <linux/if.h> + #endif + #include <net/route.h> diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_audio_device_impl_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_audio_device_impl_cc new file mode 100644 index 000000000..0ef4e5714 --- /dev/null +++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_audio_device_impl_cc @@ -0,0 +1,11 @@ +--- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc 2013-09-11 01:15:17.000000000 +0200 ++++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -8,6 +8,8 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + ++#define _POSIX_SOURCE ++ + #include "audio_device_impl.h" + #include "audio_device_config.h" + #include "common_audio/signal_processing/include/signal_processing_library.h" diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_device_alsa_linux_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_device_alsa_linux_cc new file mode 100644 index 000000000..a5fd50511 --- /dev/null +++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_device_alsa_linux_cc @@ -0,0 +1,11 @@ +--- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc 2013-09-11 01:15:17.000000000 +0200 ++++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -8,6 +8,8 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + ++#define _POSIX_SOURCE ++ + #include <cassert> + + #include "audio_device_utility.h" diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_mixer_manager_alsa_linux_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_mixer_manager_alsa_linux_cc new file mode 100644 index 000000000..2544d6c08 --- /dev/null +++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio_device_linux_audio_mixer_manager_alsa_linux_cc @@ -0,0 +1,11 @@ +--- mozilla-release.orig/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc 2013-09-11 01:15:17.000000000 +0200 ++++ mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -8,6 +8,8 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + ++#define _POSIX_SOURCE ++ + #include <cassert> + + #include "audio_mixer_manager_alsa_linux.h" diff --git a/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_bsd_addr_c b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_bsd_addr_c new file mode 100644 index 000000000..b64787d88 --- /dev/null +++ b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_bsd_addr_c @@ -0,0 +1,15 @@ +--- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_bsd_addr.c 2013-09-11 01:15:20.000000000 +0200 ++++ mozilla-release/netwerk/sctp/src/netinet/sctp_bsd_addr.c 2013-10-23 16:28:38.000000000 +0200 +@@ -49,11 +49,10 @@ __FBSDID("$FreeBSD: head/sys/netinet/sct + #include <netinet/sctp_sysctl.h> + #include <netinet/sctp_indata.h> + #if !defined(__Userspace_os_Windows) ++#include <unistd.h> + #if defined(ANDROID) + #include <unistd.h> + #include <ifaddrs-android-ext.h> +-#else +-#include <sys/unistd.h> + #endif + #endif + diff --git a/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_os_userspace_h b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_os_userspace_h new file mode 100644 index 000000000..c3965834f --- /dev/null +++ b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_os_userspace_h @@ -0,0 +1,22 @@ +--- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_os_userspace.h 2013-09-11 01:15:20.000000000 +0200 ++++ mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h 2013-10-23 16:28:38.000000000 +0200 +@@ -381,9 +381,8 @@ struct udphdr { + }; + + #else /* !defined(Userspace_os_Windows) */ +-#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */ + #include <sys/socket.h> +-#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) ++#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) || 1 + #include <pthread.h> + #endif + typedef pthread_mutex_t userland_mutex_t; +@@ -406,7 +405,7 @@ struct sx {int dummy;}; + /* #include <sys/param.h> in FreeBSD defines MSIZE */ + /* #include <sys/ktr.h> */ + /* #include <sys/systm.h> */ +-#if defined(__Userspace_os_Windows) ++#if defined(__Userspace_os_Windows) || 1 + #include <user_queue.h> + #else + #include <sys/queue.h> diff --git a/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_pcb_c b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_pcb_c new file mode 100644 index 000000000..bee5b1c64 --- /dev/null +++ b/package/firefox/patches/patch-netwerk_sctp_src_netinet_sctp_pcb_c @@ -0,0 +1,25 @@ +--- mozilla-release.orig/netwerk/sctp/src/netinet/sctp_pcb.c 2013-09-11 01:15:20.000000000 +0200 ++++ mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c 2013-10-23 16:28:38.000000000 +0200 +@@ -30,6 +30,8 @@ + * THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#define _BSD_SOURCE /* for IPPORT_RESERVED */ ++ + #ifdef __FreeBSD__ + #include <sys/cdefs.h> + __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 246687 2013-02-11 21:02:49Z tuexen $"); +@@ -69,11 +71,10 @@ __FBSDID("$FreeBSD: head/sys/netinet/sct + #endif + #if defined(__Userspace__) + #if !defined(__Userspace_os_Windows) +-#if defined(ANDROID) ++#include <netdb.h> + #include <unistd.h> ++#if defined(ANDROID) + #include <ifaddrs-android-ext.h> +-#else +-#include <sys/unistd.h> + #endif + #endif + #include <user_socketvar.h> diff --git a/package/firefox/patches/patch-netwerk_sctp_src_user_queue_h b/package/firefox/patches/patch-netwerk_sctp_src_user_queue_h new file mode 100644 index 000000000..0a5f30d28 --- /dev/null +++ b/package/firefox/patches/patch-netwerk_sctp_src_user_queue_h @@ -0,0 +1,12 @@ +--- mozilla-release.orig/netwerk/sctp/src/user_queue.h 2013-09-11 01:15:20.000000000 +0200 ++++ mozilla-release/netwerk/sctp/src/user_queue.h 2013-10-23 16:28:38.000000000 +0200 +@@ -31,9 +31,6 @@ + #ifndef _USER_QUEUE_H_ + #define _USER_QUEUE_H_ + +-#if !defined (__Userspace_os_Windows) +-#include <sys/cdefs.h> +-#endif + /* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc new file mode 100644 index 000000000..3cc0045eb --- /dev/null +++ b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc @@ -0,0 +1,11 @@ +--- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2013-09-11 01:15:25.000000000 +0200 ++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2013-10-24 12:01:36.000000000 +0200 +@@ -46,6 +46,8 @@ + #include <sys/stat.h> + #include <unistd.h> + ++#include <libgen.h> ++ + #include <iostream> + #include <set> + #include <string> diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc index 2b27e8c72..e8f7afc99 100644 --- a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc +++ b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc @@ -1,6 +1,6 @@ --- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-09-11 01:15:25.000000000 +0200 -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-10-17 10:55:17.000000000 +0200 -@@ -34,7 +34,20 @@ ++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-10-24 12:08:16.000000000 +0200 +@@ -34,13 +34,31 @@ #include "common/stabs_reader.h" #include <assert.h> @@ -21,3 +21,14 @@ #include <string.h> #include <string> + + #include "common/using_std_string.h" + ++#ifndef N_UNDF ++#define N_UNDF 0 ++#endif ++ ++ + using std::vector; + + namespace google_breakpad { diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h new file mode 100644 index 000000000..5130adea9 --- /dev/null +++ b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h @@ -0,0 +1,11 @@ +--- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2013-09-11 01:15:25.000000000 +0200 ++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2013-10-24 11:58:13.000000000 +0200 +@@ -53,7 +53,7 @@ + #include <config.h> + #endif + +-#ifdef HAVE_A_OUT_H ++#if 0 + #include <a.out.h> + #endif + #ifdef HAVE_MACH_O_NLIST_H diff --git a/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp b/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp new file mode 100644 index 000000000..75c073d55 --- /dev/null +++ b/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp @@ -0,0 +1,10 @@ +--- mozilla-release.orig/tools/profiler/UnwinderThread2.cpp 2013-09-11 01:15:26.000000000 +0200 ++++ mozilla-release/tools/profiler/UnwinderThread2.cpp 2013-10-23 16:28:38.000000000 +0200 +@@ -3,6 +3,7 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#include <sys/types.h> + #include <stdio.h> + #include <signal.h> + #include <string.h> diff --git a/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc b/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc new file mode 100644 index 000000000..12d413718 --- /dev/null +++ b/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc @@ -0,0 +1,10 @@ +--- mozilla-release.orig/tools/profiler/local_debug_info_symbolizer.cc 2013-09-11 01:15:26.000000000 +0200 ++++ mozilla-release/tools/profiler/local_debug_info_symbolizer.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -3,6 +3,7 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#include <sys/types.h> + #include "PlatformMacros.h" + #include "nsAutoPtr.h" + diff --git a/package/firefox/patches/patch-tools_profiler_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_platform-linux_cc index 10287f11c..7e9a44eba 100644 --- a/package/firefox/patches/patch-tools_profiler_platform-linux_cc +++ b/package/firefox/patches/patch-tools_profiler_platform-linux_cc @@ -1,5 +1,5 @@ --- mozilla-release.orig/tools/profiler/platform-linux.cc 2013-09-11 01:15:26.000000000 +0200 -+++ mozilla-release/tools/profiler/platform-linux.cc 2013-10-16 10:09:54.000000000 +0200 ++++ mozilla-release/tools/profiler/platform-linux.cc 2013-10-23 16:28:38.000000000 +0200 @@ -53,7 +53,7 @@ #include <sys/stat.h> // open #include <fcntl.h> // open @@ -9,3 +9,19 @@ #include <execinfo.h> // backtrace, backtrace_symbols #endif // def __GLIBC__ #include <strings.h> // index +@@ -73,14 +73,12 @@ + + #define SIGNAL_SAVE_PROFILE SIGUSR2 + +-#if defined(__GLIBC__) +-// glibc doesn't implement gettid(2). ++// glibc/musl doesn't implement gettid(2). + #include <sys/syscall.h> + pid_t gettid() + { + return (pid_t) syscall(SYS_gettid); + } +-#endif + + #if !defined(ANDROID) + // Keep track of when any of our threads calls fork(), so we can diff --git a/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc new file mode 100644 index 000000000..8ffa06228 --- /dev/null +++ b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc @@ -0,0 +1,11 @@ +--- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc 2013-09-11 01:15:26.000000000 +0200 ++++ mozilla-release/tools/profiler/shared-libraries-linux.cc 2013-10-23 16:28:38.000000000 +0200 +@@ -14,7 +14,7 @@ + #include "platform.h" + #include "shared-libraries.h" + +-#ifndef __GLIBC__ ++#if 0 + /* a crapy version of getline, because it's not included in bionic */ + static ssize_t getline(char **lineptr, size_t *n, FILE *stream) + { diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h index 5a1a81c06..b275a14ec 100644 --- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h +++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h @@ -1,6 +1,6 @@ --- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2013-09-11 01:15:27.000000000 +0200 -+++ mozilla-release/xpcom/ds/nsMathUtils.h 2013-10-14 14:05:43.000000000 +0200 -@@ -98,7 +98,7 @@ inline NS_HIDDEN_(bool) NS_finite(double ++++ mozilla-release/xpcom/ds/nsMathUtils.h 2013-10-23 16:28:38.000000000 +0200 +@@ -98,12 +98,16 @@ inline NS_HIDDEN_(bool) NS_finite(double #ifdef WIN32 // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. return !!_finite(d); @@ -9,3 +9,13 @@ // Darwin has deprecated |finite| and recommends |isfinite|. The former is // not present in the iOS SDK. return std::isfinite(d); + #else +- return finite(d); ++#ifdef _GLIBCXX_CMATH ++ return std::isfinite(d); ++#else ++ return isfinite(d); ++#endif + #endif + } + diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index 6ac4edc26..e2b5feccb 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXxf86dga -PKG_VERSION:= 1.1.3 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 3d58873171c7765956ce257e6a7e4865 +PKG_VERSION:= 1.1.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8ed1c8674e730e8d333dfe4b9f2097d9 PKG_DESCR:= client library for the XFree86-DGA extension PKG_SECTION:= x11/libs PKG_BUILDDEP:= xf86dgaproto libXext libXaw diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index c4a6872f2..2a6b2533f 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.1 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac7bf1cfedc1c5c24bfc83107eefb1d9 +PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile index bb8529c8c..ac5d6285b 100644 --- a/package/mplayer/patches/patch-Makefile +++ b/package/mplayer/patches/patch-Makefile @@ -1,14 +1,14 @@ ---- mplayer-1.0-32749.orig/Makefile 2011-01-03 11:27:11.000000000 +0100 -+++ mplayer-1.0-32749/Makefile 2011-07-29 17:44:21.073424743 +0200 -@@ -185,7 +185,6 @@ SRCS_COMMON-$(NEED_STRSEP) += - SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c - SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c +--- MPlayer-1.1.1.orig/Makefile 2012-05-30 23:21:46.000000000 +0200 ++++ MPlayer-1.1.1/Makefile 2013-11-14 13:20:30.000000000 +0100 +@@ -190,7 +190,6 @@ SRCS_COMMON-$(NATIVE_RTSP) += + stream/librtsp/rtsp_session.c \ + SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \ - stream/asf_mmst_streaming.c \ stream/asf_streaming.c \ stream/cookies.c \ stream/http.c \ -@@ -816,7 +815,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +@@ -794,7 +793,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h diff --git a/package/mplayer/patches/patch-libao2_ao_alsa_c b/package/mplayer/patches/patch-libao2_ao_alsa_c index 26d0832dc..b943dc8a9 100644 --- a/package/mplayer/patches/patch-libao2_ao_alsa_c +++ b/package/mplayer/patches/patch-libao2_ao_alsa_c @@ -1,6 +1,6 @@ ---- mplayer-1.0-32749.orig/libao2/ao_alsa.c 2011-01-03 11:26:52.000000000 +0100 -+++ mplayer-1.0-32749/libao2/ao_alsa.c 2011-09-14 20:52:35.457990653 +0200 -@@ -760,8 +760,9 @@ static int play(void* data, int len, int +--- MPlayer-1.1.1.orig/libao2/ao_alsa.c 2012-04-10 15:17:49.000000000 +0200 ++++ MPlayer-1.1.1/libao2/ao_alsa.c 2013-11-14 13:20:30.000000000 +0100 +@@ -756,8 +756,9 @@ static int play(void* data, int len, int { int num_frames; snd_pcm_sframes_t res = 0; diff --git a/package/mplayer/patches/patch-loader_ldt_keeper_c b/package/mplayer/patches/patch-loader_ldt_keeper_c new file mode 100644 index 000000000..d2f42d46a --- /dev/null +++ b/package/mplayer/patches/patch-loader_ldt_keeper_c @@ -0,0 +1,11 @@ +--- MPlayer-1.1.1.orig/loader/ldt_keeper.c 2011-05-24 21:51:38.000000000 +0200 ++++ MPlayer-1.1.1/loader/ldt_keeper.c 2013-11-14 13:24:09.000000000 +0100 +@@ -210,7 +210,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) + array.seg_not_present=0; + array.contents=MODIFY_LDT_CONTENTS_DATA; + array.limit_in_pages=0; +-#ifdef __linux__ ++#if defined(__linux__) && (__GLIBC__) + //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s)); + ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); + if(ret<0) diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile new file mode 100644 index 000000000..83f2827e9 --- /dev/null +++ b/package/util-macros/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= util-macros +PKG_VERSION:= 1.8.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fe73a69d02bd0be6cdf7c773bfd72041 +PKG_DESCR:= xorg macros +PKG_SECTION:= x11/misc +PKG_BUILDDEP:= autotool util-macros-host +PKG_URL:= http://cgit.freedesktop.org/xorg/util/macros +PKG_SITES:= http://xorg.freedesktop.org/archive/individual/util/ +PKG_OPTS:= dev devonly + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +HOST_STYLE:= auto +AUTOTOOL_STYLE:= autoreconf + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-macros/patches/patch-Makefile_am b/package/util-macros/patches/patch-Makefile_am new file mode 100644 index 000000000..40e2951d5 --- /dev/null +++ b/package/util-macros/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- util-macros-1.8.0.orig/Makefile.am 2010-03-29 17:47:02.000000000 +0200 ++++ util-macros-1.8.0/Makefile.am 2013-10-28 18:08:50.000000000 +0100 +@@ -29,7 +29,7 @@ dist_pkgdata_DATA = INSTALL + install-data-hook: + rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xorg-macros.pc + + .PHONY: ChangeLog diff --git a/package/util-macros/patches/patch-Makefile_in b/package/util-macros/patches/patch-Makefile_in new file mode 100644 index 000000000..1d472707b --- /dev/null +++ b/package/util-macros/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- util-macros-1.8.0.orig/Makefile.in 2010-05-27 21:02:01.000000000 +0200 ++++ util-macros-1.8.0/Makefile.in 2013-10-28 18:32:09.000000000 +0100 +@@ -167,7 +167,7 @@ top_srcdir = @top_srcdir@ + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xorg-macros.m4 + dist_pkgdata_DATA = INSTALL +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xorg-macros.pc + all: all-am + diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index fa8d08c99..b285bba94 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-cirrus PKG_VERSION:= 1.4.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 439e3f5e29161f503bcfe23229dc7b17 PKG_DESCR:= X11 driver for Cirrus VGA chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server -PKG_BUILDDEP:= xorg-server +PKG_BUILDDEP:= xorg-server autotool util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 @@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,xf86-video-cirrus,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + xf86-video-cirrus-install: ${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \ diff --git a/package/xf86-video-cirrus/patches/patch-src_Makefile_am b/package/xf86-video-cirrus/patches/patch-src_Makefile_am new file mode 100644 index 000000000..b95028dc3 --- /dev/null +++ b/package/xf86-video-cirrus/patches/patch-src_Makefile_am @@ -0,0 +1,28 @@ +--- xf86-video-cirrus-1.4.0.orig/src/Makefile.am 2012-03-24 02:48:16.000000000 +0100 ++++ xf86-video-cirrus-1.4.0/src/Makefile.am 2013-11-14 14:21:47.000000000 +0100 +@@ -34,23 +34,13 @@ cirrus_drv_la_SOURCES = \ + cir.h \ + CirrusClk.c \ + cir_shadow.c \ +- cir_pcirename.h +- +-cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la +-cirrus_alpine_la_LDFLAGS = -module -avoid-version +-cirrus_alpine_ladir = @moduledir@/drivers +-cirrus_alpine_la_SOURCES = \ ++ cir_pcirename.h \ + alp_driver.c \ + alp.h \ + alp_hwcurs.c \ + alp_i2c.c \ + alp_xaa.c \ +- alp_xaam.c +- +-cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la +-cirrus_laguna_la_LDFLAGS = -module -avoid-version +-cirrus_laguna_ladir = @moduledir@/drivers +-cirrus_laguna_la_SOURCES = \ ++ alp_xaam.c \ + lg_driver.c \ + lg.h \ + lg_hwcurs.c \ diff --git a/package/xf86-video-cirrus/patches/patch-src_cir_driver_c b/package/xf86-video-cirrus/patches/patch-src_cir_driver_c new file mode 100644 index 000000000..9fe658863 --- /dev/null +++ b/package/xf86-video-cirrus/patches/patch-src_cir_driver_c @@ -0,0 +1,48 @@ +--- xf86-video-cirrus-1.4.0.orig/src/cir_driver.c 2012-03-24 02:48:17.000000000 +0100 ++++ xf86-video-cirrus-1.4.0/src/cir_driver.c 2013-11-14 14:22:54.000000000 +0100 +@@ -206,25 +206,6 @@ CIRProbe(DriverPtr drv, int flags) + ErrorF("CirProbe\n"); + #endif + +- /* +- * For PROBE_DETECT, make sure both sub-modules are loaded before +- * calling xf86MatchPciInstances(), because the AvailableOptions() +- * functions may be called before xf86MatchPciInstances() returns. +- */ +- +- if (flags & PROBE_DETECT) { +- if (!lg_loaded) { +- if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) { +- lg_loaded = TRUE; +- } +- } +- if (!alp_loaded) { +- if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) { +- alp_loaded = TRUE; +- } +- } +- } +- + if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME, + &devSections)) <= 0) { + return FALSE; +@@ -261,19 +242,8 @@ CIRProbe(DriverPtr drv, int flags) + PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 || + PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464BD || + PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5465)) { +- +- if (!lg_loaded) { +- if (!xf86LoadDrvSubModule(drv, "cirrus_laguna")) +- continue; +- lg_loaded = TRUE; +- } + pScrn = LgProbe(usedChips[i]); + } else { +- if (!alp_loaded) { +- if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) +- continue; +- alp_loaded = TRUE; +- } + pScrn = AlpProbe(usedChips[i]); + } + diff --git a/package/xinit/Makefile b/package/xinit/Makefile index a623b1830..d9988a1e2 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_POSIX_SOURCE CONFIGURE_ARGS:= --without-launchd XAKE_FLAGS+= RAWCPP="$(TARGET_CROSS)cpp" diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index c37014d5c..3faa23e49 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -119,5 +119,9 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions endif + # add m4 file to host directory + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal + $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ + $(STAGING_HOST_DIR)/usr/share/aclocal include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h new file mode 100644 index 000000000..cd1c5c15c --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h @@ -0,0 +1,14 @@ +--- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h 2012-05-17 19:09:03.000000000 +0200 ++++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h 2013-10-29 15:23:18.000000000 +0100 +@@ -178,11 +178,7 @@ + #include <sys/types.h> + #include <assert.h> + +-#ifdef __linux__ +-#include <termio.h> +-#else /* __GLIBC__ */ + #include <termios.h> +-#endif + #ifdef __sparc__ + #include <sys/param.h> + #endif diff --git a/toolchain/musl/patches/i386-syscall.patch b/toolchain/musl/patches/i386-syscall.patch new file mode 100644 index 000000000..d70701983 --- /dev/null +++ b/toolchain/musl/patches/i386-syscall.patch @@ -0,0 +1,27 @@ +diff -Nur musl-0.9.14.orig/arch/i386/bits/syscall.h musl-0.9.14/arch/i386/bits/syscall.h +--- musl-0.9.14.orig/arch/i386/bits/syscall.h 2013-09-23 23:01:11.000000000 +0200 ++++ musl-0.9.14/arch/i386/bits/syscall.h 2013-10-22 10:36:44.000000000 +0200 +@@ -333,6 +333,11 @@ + #define __NR_inotify_init1 332 + #define __NR_preadv 333 + #define __NR_pwritev 334 ++#define __NR_rt_tgsigqueueinfo 335 ++#define __NR_perf_event_open 336 ++#define __NR_recvmmsg 337 ++#define __NR_fanotify_init 338 ++#define __NR_fanotify_mark 339 + #define __NR_prlimit64 340 + #define __NR_name_to_handle_at 341 + #define __NR_open_by_handle_at 342 +@@ -683,6 +688,11 @@ + #define SYS_inotify_init1 332 + #define SYS_preadv 333 + #define SYS_pwritev 334 ++#define SYS_rt_tgsigqueueinfo 335 ++#define SYS_perf_event_open 336 ++#define SYS_recvmmsg 337 ++#define SYS_fanotify_init 338 ++#define SYS_fanotify_mark 339 + #define SYS_prlimit64 340 + #define SYS_name_to_handle_at 341 + #define SYS_open_by_handle_at 342 |