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

package/libdrm/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		205fbaedfab827a874265420d38547f0
 PKG_DESCR:=		DRM library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libpthread-stubs cairo
+PKG_BUILDDEP:=		libpthread-stubs cairo libpciaccess
 PKG_URL:=		http://dri.freedesktop.org/wiki/
 PKG_SITES:=		http://dri.freedesktop.org/libdrm/
 PKG_OPTS:=		dev

package/libpciaccess/patches/patch-src_linux_sysfs_c

@@ -0,0 +1,10 @@
+--- libpciaccess-0.13.1.orig/src/linux_sysfs.c	2012-04-09 19:02:57.000000000 +0200
++++ libpciaccess-0.13.1/src/linux_sysfs.c	2013-10-21 15:25:14.000000000 +0200
+@@ -34,6 +34,7 @@
+ 
+ #define _GNU_SOURCE
+ 
++#include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>

package/mesa-demos/Makefile

@@ -13,6 +13,8 @@ PKG_DEPENDS:=		mesalib
 PKG_BUILDDEP:=		MesaLib libglew
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/
 
+PKG_ARCH_DEPENDS:=      x86 x86_64 mips mipsel mips64 mips64el arm
+
 PKG_SUBPKGS:=		GLXINFO
 PKGSD_GLXINFO:=		glxinfo
 PKGSS_GLXINFO:=		libxt libxau libxdmcp libxcb libx11 libxext libglew

package/nspr/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nspr
 PKG_VERSION:=		4.9.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		62b1e9d376d503d972f90c3c0031d879
 PKG_DESCR:=		Netscape Portable Runtime library
 PKG_SECTION:=		libs

package/nspr/patches/patch-mozilla_nsprpub_configure

@@ -1,6 +1,6 @@
---- nspr-4.9.5.orig/mozilla/nsprpub/configure	2012-12-19 20:21:31.000000000 +0100
-+++ nspr-4.9.5/mozilla/nsprpub/configure	2013-02-27 16:43:20.000000000 +0100
-@@ -2848,7 +2849,7 @@ esac
+--- nspr-4.9.6.orig/mozilla/nsprpub/configure	2013-03-14 18:34:31.000000000 +0100
++++ nspr-4.9.6/mozilla/nsprpub/configure	2013-10-21 15:29:36.000000000 +0200
+@@ -2855,7 +2855,7 @@ esac
  if test "$cross_compiling"  = "yes"; then
      CROSS_COMPILE=1
  else

package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c

@@ -0,0 +1,16 @@
+* patch from alpinelinux
+
+--- nspr-4.9.6.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2012-09-28 16:33:48.000000000 +0200
++++ nspr-4.9.6/mozilla/nsprpub/pr/src/misc/prnetdb.c	2013-10-21 18:07:57.000000000 +0200
+@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif
+ 
+-#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+-	|| (defined(LINUX) && defined(_REENTRANT) \
+-        && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+-        && !defined(ANDROID))
++#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif