Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/SDL_gfx/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		sdl
 PKG_URL:=		http://www.ferzkopp.net/joomla/content/view/19/14/
 PKG_SITES:=		http://www.ferzkopp.net/Software/SDL_gfx-2.0/
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 PKG_SUBPKGS:=		LIBSDL_GFX LIBSDL_GFX_DEV
 PKGSD_LIBSDL_GFX_DEV:=	development files for SDL_gfx
 PKGSC_LIBSDL_GFX_DEV:=	devel

package/SDL_ttf/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		sdl freetype gettext-tiny
 PKG_URL:=		http://www.libsdl.org/projects/SDL_ttf/
 PKG_SITES:=		http://www.libsdl.org/projects/SDL_ttf/release/
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 PKG_SUBPKGS:=		LIBSDL_TTF LIBSDL_TTF_DEV
 PKGSD_LIBSDL_TTF_DEV:=	development files
 PKGSC_LIBSDL_TTF_DEV:=	devel

package/alsa-lib/Makefile

@@ -12,6 +12,8 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 PKG_SUBPKGS:=		ALSA_LIB ALSA_LIB_DEV
 PKGSD_ALSA_LIB_DEV:=	development files for ALSA
 PKGSC_ALSA_LIB_DEV:=	devel

package/alsa-utils/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		alsa-lib
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/utils/
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 PKG_FLAVOURS_ALSA_UTILS:=WITH_ALSAMIXER
 PKGFS_WITH_ALSAMIXER:=	libncurses
 PKGFD_WITH_ALSAMIXER:=	include alsamixer ncurses applet

package/firefox/Makefile

@@ -5,17 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
 PKG_VERSION:=		24.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
 PKG_DEPENDS+=		nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
 PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt libgcc
-PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates
+PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates libevent
 PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
-PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2
+PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -66,6 +66,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-nspr \
 			--with-system-pango \
 			--with-system-libvpx \
+			--with-system-libevent=${STAGING_TARGET_DIR}/usr \
 			--enable-system-ffi \
 			--enable-system-sqlite \
 			--disable-libnotify \
@@ -115,7 +116,7 @@ firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \
 		$(IDIR_FIREFOX)/usr/lib
-	$(CP) $(WRKINST)/usr/bin/firefox \
+	$(CP) ./files/firefox \
 		$(IDIR_FIREFOX)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/firefox/files/firefox

@@ -0,0 +1,2 @@
+#!/bin/sh
+env LD_LIBRARY_PATH=/usr/lib/firefox-24.0 /usr/lib/firefox-24.0/firefox

package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc

@@ -0,0 +1,13 @@
+--- 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
+@@ -5,7 +5,9 @@
+ #include "build/build_config.h"
+ #include "base/debug_util.h"
+ 
+-#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__))
+ 
+ #include <errno.h>
+ #include <fcntl.h>

package/firefox/patches/patch-js_src_Makefile_in

@@ -0,0 +1,11 @@
+--- mozilla-release.orig/js/src/Makefile.in	2013-09-11 01:15:04.000000000 +0200
++++ mozilla-release/js/src/Makefile.in	2013-10-14 12:36:25.000000000 +0200
+@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES
+ VPATH += $(srcdir)/ctypes
+ 
+ ifdef MOZ_NATIVE_FFI
+-LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
++LOCAL_INCLUDES =
+ else
+ LOCAL_INCLUDES = -Ictypes/libffi/include
+ endif

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc

@@ -0,0 +1,23 @@
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-09-11 01:15:18.000000000 +0200
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-10-15 12:21:59.000000000 +0200
+@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+     WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+                  "Available number of cores:%d", number_of_cores_);
+ 
+-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
+-    number_of_cores_ = get_nprocs();
+-    WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+-                 "Available number of cores:%d", number_of_cores_);
+-
+ #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
+     int name[] = {
+       CTL_HW,
+@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+                    "Failed to get number of cores");
+       number_of_cores_ = 1;
+     }
+-#elif defined(_SC_NPROCESSORS_ONLN)
+-    _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+     WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
+                  "No function to get number of cores");

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp

@@ -0,0 +1,14 @@
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-09-11 01:15:18.000000000 +0200
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-10-15 16:05:38.000000000 +0200
+@@ -21,6 +21,11 @@ Scott McMurray
+ #include "constants.hpp"
+ #include <cstring>
+ 
++#include <features.h>
++#if defined(__UCLIBC__)
++#undef getchar
++#endif
++
+ namespace boost {
+   namespace detail {
+   	//This only works on unsigned data types

package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc

@@ -0,0 +1,23 @@
+--- 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 @@
+ #include "common/stabs_reader.h"
+ 
+ #include <assert.h>
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <stab.h>
++#else
++#define __define_stab(NAME, CODE, STRING) NAME=CODE,
++enum __stab_debug_code
++{
++__define_stab (N_FUN, 0x24, "FUN")
++__define_stab (N_SLINE, 0x44, "SLINE")
++__define_stab (N_SOL, 0x84, "SOL")
++__define_stab (N_SO, 0x64, "SO")
++LAST_UNUSED_STAB_CODE
++};
++#undef __define_stab
++#endif
+ #include <string.h>
+ 
+ #include <string>

package/firefox/patches/patch-tools_profiler_platform-linux_cc

@@ -0,0 +1,11 @@
+--- 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
+@@ -53,7 +53,7 @@
+ #include <sys/stat.h>   // open
+ #include <fcntl.h>      // open
+ #include <unistd.h>     // sysconf
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && ! defined(__UCLIBC__)
+ #include <execinfo.h>   // backtrace, backtrace_symbols
+ #endif  // def __GLIBC__
+ #include <strings.h>    // index

package/firefox/patches/patch-xpcom_ds_nsMathUtils_h

@@ -0,0 +1,11 @@
+--- 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
+ #ifdef WIN32
+     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+     return !!_finite(d);
+-#elif defined(XP_DARWIN)
++#elif defined(XP_DARWIN) || defined(__UCLIBC__)
+     // Darwin has deprecated |finite| and recommends |isfinite|. The former is
+     // not present in the iOS SDK.
+     return std::isfinite(d);

package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp

@@ -0,0 +1,16 @@
+--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-09-11 01:15:27.000000000 +0200
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2013-10-14 14:33:08.000000000 +0200
+@@ -1256,8 +1256,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+        && dq.dqb_bhardlimit)
+     {
+         int64_t QuotaSpaceAvailable = 0;
++#if defined(__UCLIBC__)
++	if (dq.dqb_bhardlimit > dq.dqb_curblocks)
++	    QuotaSpaceAvailable = PRInt64(fs_buf.f_bsize * (dq.dqb_bhardlimit - dq.dqb_curblocks));
++#else
+         if (dq.dqb_bhardlimit > dq.dqb_curspace)
+             QuotaSpaceAvailable = int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace));
++#endif
+         if(QuotaSpaceAvailable < *aDiskSpaceAvailable) {
+             *aDiskSpaceAvailable = QuotaSpaceAvailable;
+         }

package/firefox/patches/patch-xpcom_threads_nsThread_cpp

@@ -0,0 +1,17 @@
+--- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-09-11 01:15:27.000000000 +0200
++++ mozilla-release/xpcom/threads/nsThread.cpp	2013-10-14 15:49:25.000000000 +0200
+@@ -20,11 +20,13 @@
+                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
+                       !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+ 
++#include <features.h>
+ #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
+   && defined(_GNU_SOURCE)
+-# define MOZ_CANARY
+ # include <unistd.h>
++#if !defined(__UCLIBC__)
+ # include <execinfo.h>
++#endif
+ # include <signal.h>
+ # include <fcntl.h>
+ # include "nsXULAppAPI.h"

package/madplay/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://www.underbit.com/products/mad
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mad/}  \
 			ftp://ftp.mars.org/pub/mpeg/
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MADPLAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/motion/Makefile

@@ -15,6 +15,8 @@ PKG_BUILDDEP:=		jpeg sdl
 PKG_URL:=		http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=motion/}
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/mpd/Makefile

@@ -15,7 +15,7 @@ PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.17/
 
-PKG_ARCH_DEPENDS:=	!avr32
+PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 

package/mpg123/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		alsa-lib
 PKG_URL:=		http://www.mpg123.de/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mpg123/}
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk

package/sdl-image/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://www.libsdl.org/
 PKG_SITES:=		http://www.libsdl.org/projects/SDL_image/release/
 PKG_NEED_CXX:=		1
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 PKG_SUBPKGS:=		LIBSDL_IMAGE LIBSDL_IMAGE_DEV
 PKGSD_LIBSDL_IMAGE_DEV:=development files for sdlimage
 PKGSC_LIBSDL_IMAGE_DEV:=devel

package/sdl/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libusb alsa-lib libX11 libXext
 PKG_URL:=		http://www.libsdl.org/
 PKG_SITES:=		http://www.libsdl.org/release/
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 PKG_FLAVOURS_LIBSDL:=	WITH_TSLIB
 PKGFD_WITH_TSLIB:=	enable touchscreen support
 PKGFS_WITH_TSLIB:=	tslib

package/sox/Makefile

@@ -14,6 +14,8 @@ PKG_DEPENDS:=		zlib libmad liblame alsa-lib libid3tag
 PKG_URL:=		http://sox.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sox/}
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

scripts/scan-pkgs.sh

@@ -23,6 +23,13 @@ out=0
 
 . $topdir/.config
 
+uname -a|grep '\(Debian\|Ubuntu\)' >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	if [[ -n $ADK_COMPILE_PYTHON2 ]]; then
+		NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2"
+	fi
+fi
+
 if [[ -n $ADK_NATIVE ]];then
 	if [[ -n $ADK_PACKAGE_NEON ]];then
 		NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon"
@@ -490,6 +497,13 @@ if [[ -n $NEED_MAKEDEPEND ]]; then
 	fi
 fi
 
+if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then
+	if ! which dpkg-architecture >/dev/null 2>&1; then
+		echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE
+		out=1
+	fi
+fi
+
 if [[ -n $ADK_USE_CCACHE ]]; then
         if ! which ccache >/dev/null 2>&1; then
                 echo >&2 You have selected to build with ccache, but ccache could not be found.

target/m68k/uclibc.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Version: 0.9.33.2
-# Thu Oct 17 09:03:34 2013
+# Thu Oct 17 12:35:12 2013
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -77,11 +77,10 @@ LDSO_LD_LIBRARY_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
+LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=y
+# UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_TLS=y
 # PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
@@ -195,7 +194,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
@@ -236,6 +234,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set