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

7 files changed, 80 insertions, 8 deletions

diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib
index 2f53c152c..a361c1105 100644
--- a/package/MesaLib/patches/patch-bin_mklib
+++ b/package/MesaLib/patches/patch-bin_mklib
@@ -1,7 +1,7 @@
 diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
 --- Mesa-8.0.5.orig/bin/mklib	2012-10-24 21:03:58.000000000 +0200
-+++ Mesa-8.0.5/bin/mklib	2013-04-30 13:06:28.000000000 +0200
-@@ -333,12 +333,6 @@
++++ Mesa-8.0.5/bin/mklib	2013-09-19 11:59:49.000000000 +0200
+@@ -333,12 +333,6 @@ case $ARCH in
  	    # Check if objects are 32-bit and we're running in 64-bit
  	    # environment.  If so, pass -m32 flag to linker.
  	    set ${OBJECTS}
@@ -14,7 +14,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
  
              if [ "${ALTOPTS}" ] ; then
                  OPTS=${ALTOPTS}
-@@ -392,12 +386,6 @@
+@@ -392,12 +386,6 @@ case $ARCH in
  	    # Check if objects are 32-bit and we're running in 64-bit
  	    # environment.  If so, pass -m32 flag to linker.
  	    set ${OBJECTS}
@@ -27,7 +27,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
              if [ "${ALTOPTS}" ] ; then
                  OPTS=${ALTOPTS}
              fi
-@@ -466,12 +454,6 @@
+@@ -466,12 +454,6 @@ case $ARCH in
  		# Check if objects are 32-bit and we're running in 64-bit
  		# environment.  If so, pass -m32 flag to linker.
  		set ${OBJECTS}
diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
new file mode 100644
index 000000000..5726c5c91
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
@@ -0,0 +1,45 @@
+--- Mesa-8.0.5.orig/src/gallium/include/pipe/p_config.h	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/include/pipe/p_config.h	2013-09-19 12:27:54.000000000 +0200
+@@ -111,7 +111,6 @@
+  * Endian detection.
+  */
+ 
+-#ifdef __GLIBC__
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+@@ -120,34 +119,6 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+ 
+-#elif defined(__APPLE__)
+-#include <machine/endian.h>
+-
+-#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#elif defined(__sun)
+-#include <sys/isa_defs.h>
+-
+-#if defined(_LITTLE_ENDIAN)
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(_BIG_ENDIAN)
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#else
+-
+-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
+-#define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64)
+-#define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#endif
+-
+ #if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN)
+ #error Unknown Endianness
+ #endif
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_h b/package/MesaLib/patches/patch-src_mesa_main_imports_h
new file mode 100644
index 000000000..43896c847
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_h
@@ -0,0 +1,13 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.h	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.h	2013-09-19 12:39:53.000000000 +0200
+@@ -568,10 +568,8 @@ _mesa_init_sqrt_table(void);
+ 
+ #ifdef __GNUC__
+ 
+-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
+-#endif
+ 
+ #define _mesa_ffs(i)  ffs(i)
+ #define _mesa_ffsll(i)  ffsll(i)
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..f178bfef0
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
@@ -0,0 +1,11 @@
+--- Mesa-8.0.5.orig/src/mesa/main/querymatrix.c	2012-03-30 18:19:03.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/querymatrix.c	2013-09-19 12:19:01.000000000 +0200
+@@ -70,7 +70,7 @@ fpclassify(double x)
+     }
+ }
+ 
+-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
++#elif defined(fpclassify) || 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__)
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index d8b994ab1..2ecd71dd5 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -30,6 +30,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
 include $(TOPDIR)/mk/python.mk
 
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-lpthread
 ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),)
 CONFIGURE_ARGS+=	--with-python=${STAGING_DIR}/usr
 else
diff --git a/package/php/files/php.ini b/package/php/files/php.ini
index 903bb432e..c9b395ac1 100644
--- a/package/php/files/php.ini
+++ b/package/php/files/php.ini
@@ -106,7 +106,7 @@ error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
-display_errors = On
+display_errors = Off
 
 ; Even when display_errors is on, errors that occur during PHP's startup
 ; sequence are not displayed.  It's strongly recommended to keep
@@ -116,7 +116,7 @@ display_startup_errors = Off
 ; Log errors into a log file (server-specific log, stderr, or error_log (below))
 ; As stated above, you're strongly advised to use error logging in place of
 ; error displaying on production web sites.
-log_errors = Off
+log_errors = On
 
 ; Set maximum length of log_errors. In error_log information about the source is
 ; added. The default is 1024 and 0 allows to not apply any maximum length at all.
@@ -163,7 +163,7 @@ track_errors = Off
 ;error_log = filename
 
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
+error_log = syslog
 
 
 ;;;;;;;;;;;;;;;;;
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index cdffe1852..5efdbfb40 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		489f3877decae4e265ece54f9eaef0ba
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost-shared libffmpeg python2 libstdcxx 
+PKG_DEPENDS:=		boost boost-shared libffmpeg python2 libstdcxx 
 PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad
 PKG_DEPENDS+=		libjpeg libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
@@ -21,10 +21,12 @@ PKG_BUILDDEP+=		libmpeg2 libmad jpeg libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
+PKG_BUILDDEP+=		bcm2835-vc libgpg-error
 PKG_URL:=		http://xbmc.org/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
+PKG_LIBC_DEPENDS:=	eglibc glibc
 
 include $(TOPDIR)/mk/package.mk