diff options
8 files changed, 51 insertions, 25 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 51a2e0047..2d37ef8ac 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_ PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= x86 x86_64 mips64 mips64el native +PKG_ARCH_DEPENDS:= x86 x86_64 mips native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 @@ -32,16 +32,6 @@ $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D # disable honour cflags stuff XAKE_FLAGS+= GCC_HONOUR_COPTS=s -ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) -CONFIGURE_ARGS+= --disable-ipc -else ifeq (${ADK_TARGET_LIB_UCLIBC},y) -CONFIGURE_ARGS+= --disable-ipc -else -CONFIGURE_ARGS+= --enable-ipc -endif - -TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib - CONFIGURE_ENV+= CROSS_COMPILE=1 \ HOST_CC="${CC_FOR_BUILD}" \ HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 221ae4c83..291e6fbc0 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,6 +1,6 @@ ---- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100 -+++ mozilla-2.0/configure 2011-04-24 06:37:26.000000000 +0200 -@@ -23503,6 +23503,9 @@ fi +--- mozilla-release.orig/configure 2011-07-08 03:30:27.000000000 +0200 ++++ mozilla-release/configure 2011-07-29 15:50:35.000000000 +0200 +@@ -23504,6 +23504,9 @@ fi fi fi @@ -9,4 +9,4 @@ + if test -n "$CROSS_COMPILE"; then case "$target" in - *-mingw*|*-cygwin*|*-msvc*|*-mks*) + *-mingw*) diff --git a/package/firefox/patches/patch-content_base_public_nsContentUtils_h b/package/firefox/patches/patch-content_base_public_nsContentUtils_h index 2cd2821c7..7f4a8f0dd 100644 --- a/package/firefox/patches/patch-content_base_public_nsContentUtils_h +++ b/package/firefox/patches/patch-content_base_public_nsContentUtils_h @@ -1,6 +1,6 @@ ---- mozilla-2.0.orig/content/base/public/nsContentUtils.h 2011-03-19 00:33:33.000000000 +0100 -+++ mozilla-2.0/content/base/public/nsContentUtils.h 2011-06-15 20:05:44.538202220 +0200 -@@ -1942,7 +1942,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini +--- mozilla-release.orig/content/base/public/nsContentUtils.h 2011-07-08 03:15:15.000000000 +0200 ++++ mozilla-release/content/base/public/nsContentUtils.h 2011-07-29 15:50:34.000000000 +0200 +@@ -1928,7 +1928,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini #ifdef WIN32 return _finite(f); #else diff --git a/package/firefox/patches/patch-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp index 7f052849c..23525db87 100644 --- a/package/firefox/patches/patch-content_media_nsAudioStream_cpp +++ b/package/firefox/patches/patch-content_media_nsAudioStream_cpp @@ -1,6 +1,6 @@ ---- mozilla-2.0.orig/content/media/nsAudioStream.cpp 2011-03-19 00:33:34.000000000 +0100 -+++ mozilla-2.0/content/media/nsAudioStream.cpp 2011-04-23 23:18:01.000000000 +0200 -@@ -570,7 +570,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff +--- mozilla-release.orig/content/media/nsAudioStream.cpp 2011-07-08 03:15:16.000000000 +0200 ++++ mozilla-release/content/media/nsAudioStream.cpp 2011-07-29 15:50:34.000000000 +0200 +@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff #if defined(XP_WIN) positionType = SA_POSITION_WRITE_HARDWARE; #endif diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h new file mode 100644 index 000000000..ef7d44628 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h @@ -0,0 +1,21 @@ +--- mozilla-release.orig/ipc/chromium/src/base/process_util.h 2011-07-08 03:15:22.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/base/process_util.h 2011-07-29 16:26:23.000000000 +0200 +@@ -62,7 +62,8 @@ enum ProcessArchitecture { + PROCESS_ARCH_I386 = 0x1, + PROCESS_ARCH_X86_64 = 0x2, + PROCESS_ARCH_PPC = 0x4, +- PROCESS_ARCH_ARM = 0x8 ++ PROCESS_ARCH_ARM = 0x8, ++ PROCESS_ARCH_MIPS = 0xf + }; + + static ProcessArchitecture GetCurrentProcessArchitecture() +@@ -76,6 +77,8 @@ static ProcessArchitecture GetCurrentPro + currentArchitecture = base::PROCESS_ARCH_PPC; + #elif defined(ARCH_CPU_ARMEL) + currentArchitecture = base::PROCESS_ARCH_ARM; ++#elif defined(ARCH_CPU_MIPS) ++ currentArchitecture = base::PROCESS_ARCH_MIPS; + #endif + return currentArchitecture; + } diff --git a/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h b/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h new file mode 100644 index 000000000..a281ad81e --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h @@ -0,0 +1,15 @@ +--- mozilla-release.orig/ipc/chromium/src/build/build_config.h 2011-07-08 03:15:22.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/build/build_config.h 2011-07-29 16:23:31.000000000 +0200 +@@ -60,6 +60,12 @@ + #elif defined(__ppc__) + #define ARCH_CPU_PPC 1 + #define ARCH_CPU_32_BITS 1 ++#elif defined(__mips__) ++#define ARCH_CPU_MIPS 1 ++#define ARCH_CPU_32_BITS 1 ++#elif defined(__mips64__) ++#define ARCH_CPU_MIPS 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in index 483f95418..f2dc6e8df 100644 --- a/package/firefox/patches/patch-js_src_Makefile_in +++ b/package/firefox/patches/patch-js_src_Makefile_in @@ -1,6 +1,6 @@ ---- mozilla-2.0.orig/js/src/Makefile.in 2011-03-19 00:33:47.000000000 +0100 -+++ mozilla-2.0/js/src/Makefile.in 2011-04-24 19:54:11.707672834 +0200 -@@ -375,7 +375,7 @@ CPPSRCS += checks.cc \ +--- mozilla-release.orig/js/src/Makefile.in 2011-07-08 03:15:23.000000000 +0200 ++++ mozilla-release/js/src/Makefile.in 2011-07-29 15:50:36.000000000 +0200 +@@ -391,7 +391,7 @@ CPPSRCS += checks.cc \ # END enclude sources for V8 dtoa ############################################# diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 8d2311990..f953d434f 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -105,7 +105,7 @@ xorg-server-install: $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) ${CP} ./files/xorg.conf.lemote-yeelong \ - $(IDIR_XORG_SERVER)/etc/X11 + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ |