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

10 files changed, 101 insertions, 56 deletions

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 2a372a564..26c882b11 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.4.3
+PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8da635baff57d7ab704b1daca5a99b47
 PKG_DESCR:=		record, convert and stream audio & video
@@ -132,6 +132,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-bzlib \
 			--disable-doc \
 			--disable-debug \
+			--disable-iconv \
 			--disable-yasm \
 			--disable-optimizations \
 			--disable-stripping \
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 267a259f5..1ddef1b2a 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		14.0rc3
+PKG_VERSION:=		14.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ab161aa0dee4ca77b977d3ca2f4ebdd5
 PKG_DESCR:=		software media player
@@ -27,8 +27,11 @@ PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug
 PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
 PKG_BUILDDEP+=		zip-host unzip-host
-PKG_URL:=		http://xbmc.org/
-PKG_SITES:=		http://www.openadk.org/distfiles/
+PKG_URL:=		http://kodi.tv/
+PKG_SITES:=		http://mirrors.kodi.tv/releases/source/
+
+DISTFILES:=		$(PKG_VERSION)-Helix.tar.gz
+WRKDIST=		$(WRKDIR)/xbmc-14.0-Helix
 
 PKG_CHOICES_KODI:=	WITH_LIBRESSL WITH_OPENSSL
 PKGCD_WITH_LIBRESSL:=	with libressl
@@ -67,6 +70,7 @@ PKGFB_WITH_BLURAY:=	libbluray
 PKGFS_WITH_BLURAY:=	libbluray
 PKGFD_WITH_WEBSERVER:=	enable internal webserver support
 
+# libiconv missing, freescale GL libraries linked against glibc
 PKG_LIBC_DEPENDS:=	glibc
 
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc libglew mesalib
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 3d7152bcc..8409e924d 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -4,16 +4,16 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
-PKG_VERSION:=		0.18.14
+PKG_VERSION:=		0.19.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c79e56483e49319f3a1f88dc9d03ee3b
 PKG_DESCR:=		music player daemon
 PKG_SECTION:=		mm/audio
-PKG_DEPENDS:=		glib libstdcxx libmpdclient librt
+PKG_DEPENDS:=		glib libstdcxx libmpdclient librt boost
 PKG_FDEPENDS:=		glib libstdcxx libmpdclient librt
-PKG_BUILDDEP:=		glib libmpdclient
+PKG_BUILDDEP:=		glib libmpdclient boost
 PKG_URL:=		http://www.musicpd.org/
-PKG_SITES:=		http://www.musicpd.org/download/mpd/0.18/
+PKG_SITES:=		http://www.musicpd.org/download/mpd/0.19/
 
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
@@ -143,6 +143,7 @@ CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-jack \
 			--disable-fifo \
 			--disable-oss \
+			--disable-icu \
 			--disable-bzip2 \
 			--disable-libwrap \
 			--disable-mpc \
diff --git a/package/mpd/patches/patch-src_thread_Id_hxx b/package/mpd/patches/patch-src_thread_Id_hxx
deleted file mode 100644
index 21dd19846..000000000
--- a/package/mpd/patches/patch-src_thread_Id_hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpd-0.18.9.orig/src/thread/Id.hxx	2013-12-11 20:51:53.000000000 +0100
-+++ mpd-0.18.9/src/thread/Id.hxx	2014-03-26 09:04:04.000000000 +0100
-@@ -84,7 +84,7 @@ public:
- #ifdef WIN32
- 		return id == other.id;
- #else
--		return ::pthread_equal(id, other.id);
-+		return pthread_equal(id, other.id);
- #endif
- 	}
- 
diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index 53fe3d4f8..b16130ed1 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		nginx
-PKG_VERSION:=		1.7.8
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fd5ab813fc1853cd8efe580ead577c3e
+PKG_VERSION:=		1.7.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a4debbe0ce0dd12b9c8f520bc3b66355
 PKG_DESCR:=		powerful http reverse proxy and webserver
 PKG_SECTION:=		net/http
 PKG_BUILDDEP:=		pcre zlib
@@ -16,8 +16,11 @@ PKG_SITES:=		http://nginx.org/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CHOICES_NGINX:=	WITHOUT_SSL WITH_OPENSSL
+PKG_CHOICES_NGINX:=	WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL
 PKGCD_WITHOUT_SSL:=	use no ssl
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCB_WITH_OPENSSL:=	openssl
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
@@ -43,11 +46,16 @@ CONFIGURE_ARGS:=        --prefix=/srv/www \
                         --http-log-path=/var/log/nginx-access.log \
                         --http-client-body-temp-path=/var/lib/nginx/body \
                         --http-proxy-temp-path=/var/lib/nginx/proxy \
-                        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi
+                        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+			--http-scgi-temp-path=/var/lib/nginx/uwsgi \
+			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi
 
 ifeq ($(ADK_PACKAGE_NGINX_WITH_OPENSSL),y)
 CONFIGURE_ARGS+=	--with-http_ssl_module
 endif
+ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y)
+CONFIGURE_ARGS+=	--with-http_ssl_module
+endif
 
 ALL_TARGET:=		
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf
index 0f30f6605..e92ace494 100644
--- a/package/nginx/patches/patch-auto_cc_conf
+++ b/package/nginx/patches/patch-auto_cc_conf
@@ -1,6 +1,6 @@
---- nginx-1.5.3.orig/auto/cc/conf	2013-07-30 15:27:55.000000000 +0200
-+++ nginx-1.5.3/auto/cc/conf	2013-08-20 09:50:31.872042697 +0200
-@@ -155,7 +155,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+--- nginx-1.7.9.orig/auto/cc/conf	2014-12-23 09:28:38.000000000 -0600
++++ nginx-1.7.9/auto/cc/conf	2014-12-25 00:19:14.557499365 -0600
+@@ -178,7 +178,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
      else
          ngx_feature="C99 variadic macros"
          ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
@@ -9,7 +9,7 @@
          ngx_feature_incs="#include <stdio.h>
  #define var(dummy, ...)  sprintf(__VA_ARGS__)"
          ngx_feature_path=
-@@ -169,7 +169,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -192,7 +192,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
  
      ngx_feature="gcc variadic macros"
      ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux
index 17cd3c99a..070345162 100644
--- a/package/nginx/patches/patch-auto_os_linux
+++ b/package/nginx/patches/patch-auto_os_linux
@@ -1,5 +1,5 @@
---- nginx-1.5.3.orig/auto/os/linux	2013-07-30 15:27:55.000000000 +0200
-+++ nginx-1.5.3/auto/os/linux	2013-08-20 10:00:37.444429620 +0200
+--- nginx-1.7.9.orig/auto/os/linux	2014-12-23 09:28:38.000000000 -0600
++++ nginx-1.7.9/auto/os/linux	2014-12-25 00:19:14.581499365 -0600
 @@ -48,7 +48,7 @@ fi
  
  ngx_feature="epoll"
@@ -9,7 +9,7 @@
  ngx_feature_incs="#include <sys/epoll.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -73,7 +73,7 @@ fi
+@@ -105,7 +105,7 @@ ngx_feature_test="int fd; struct stat sb
  CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
  ngx_feature="sendfile()"
  ngx_feature_name="NGX_HAVE_SENDFILE"
@@ -18,7 +18,7 @@
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -94,7 +94,7 @@ fi
+@@ -126,7 +126,7 @@ fi
  CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
  ngx_feature="sendfile64()"
  ngx_feature_name="NGX_HAVE_SENDFILE64"
@@ -27,7 +27,7 @@
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -112,7 +112,7 @@ ngx_include="sys/prctl.h"; . auto/includ
+@@ -144,7 +144,7 @@ ngx_include="sys/prctl.h"; . auto/includ
  
  ngx_feature="prctl(PR_SET_DUMPABLE)"
  ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
@@ -36,7 +36,7 @@
  ngx_feature_incs="#include <sys/prctl.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -133,20 +133,6 @@ ngx_feature_test="cpu_set_t mask;
+@@ -165,20 +165,6 @@ ngx_feature_test="cpu_set_t mask;
                    sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
  . auto/feature
  
diff --git a/package/nginx/patches/patch-auto_types_sizeof b/package/nginx/patches/patch-auto_types_sizeof
index 219385d00..3cd1c0978 100644
--- a/package/nginx/patches/patch-auto_types_sizeof
+++ b/package/nginx/patches/patch-auto_types_sizeof
@@ -1,26 +1,68 @@
---- nginx-1.2.2.orig/auto/types/sizeof	2012-03-16 08:33:55.000000000 +0100
-+++ nginx-1.2.2/auto/types/sizeof	2012-07-16 09:28:44.000000000 +0200
-@@ -25,8 +25,13 @@ $NGX_INCLUDE_UNISTD_H
+--- nginx-1.7.9.orig/auto/types/sizeof	2014-12-23 09:28:38.000000000 -0600
++++ nginx-1.7.9/auto/types/sizeof	2014-12-25 00:19:43.665499238 -0600
+@@ -14,7 +14,7 @@ END
+ 
+ ngx_size=
+ 
+-cat << END > $NGX_AUTOTEST.c
++cat << _EOF > $NGX_AUTOTEST.c
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -25,29 +25,43 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
-+char object_code_block[] = {
-+	'\n', 'e', '4', 'V', 'A',
-+	'0', 'x', ('0' + sizeof($ngx_type)),
-+	'Y', '3', 'p', 'M', '\n'
-+};
-+
- int main() {
+-int main() {
 -    printf("%d", (int) sizeof($ngx_type));
++#if !defined( PASTE)
++#define PASTE2( x, y) x##y
++#define PASTE( x, y)  PASTE2( x, y)
++#endif /* PASTE */
++
++#define SAY_IF_SIZEOF( typename, type, size)   \\
++    static char PASTE( PASTE( PASTE( sizeof_, typename), _is_), size) \\
++    [(sizeof(type) == (size)) ? 1 : -1]
++
++SAY_IF_SIZEOF(TEST_TYPENAME, TEST_TYPE, TEST_SIZE);
++
++int main(void)
++{
      return 0;
  }
  
-@@ -40,7 +45,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&
+-END
+-
++_EOF
+ 
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+-          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
++_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'`
++ngx_size="-1"
++ngx_size=`for i in 1 2 4 8 16 ; do \
++    $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
++    -DTEST_TYPENAME="$_ngx_typename" -DTEST_TYPE="$ngx_type" -DTEST_SIZE="$i" \
++    $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
++    $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
++    echo $i ; break ; done`
+ 
+-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
++rm -rf $NGX_AUTOTEST*
  
++if test -z $ngx_size ; then
++    ngx_size=-1
++fi
  
- if [ -x $NGX_AUTOTEST ]; then
+-if [ -x $NGX_AUTOTEST ]; then
 -    ngx_size=`$NGX_AUTOTEST`
-+    ngx_size=`sed -ne 's/^e4VA0x\(.\)Y3pM$/\1/p' < $NGX_AUTOTEST`
++if [ $ngx_size -gt 0 ]; then
      echo " $ngx_size bytes"
  fi
  
+-
+-rm -rf $NGX_AUTOTEST*
+-
+-
+ case $ngx_size in
+     4)
+         if [ "$ngx_type"="long" ]; then
diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix
index 5a37087e6..6cee1a460 100644
--- a/package/nginx/patches/patch-auto_unix
+++ b/package/nginx/patches/patch-auto_unix
@@ -1,6 +1,6 @@
---- nginx-1.2.2.orig/auto/unix	2012-07-02 18:51:02.000000000 +0200
-+++ nginx-1.2.2/auto/unix	2012-07-16 09:27:16.000000000 +0200
-@@ -618,7 +618,7 @@ ngx_feature_test="void *p; p = memalign(
+--- nginx-1.7.9.orig/auto/unix	2014-12-23 09:28:38.000000000 -0600
++++ nginx-1.7.9/auto/unix	2014-12-25 00:19:14.593499364 -0600
+@@ -651,7 +651,7 @@ ngx_feature_test="void *p; p = memalign(
  
  ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
  ngx_feature_name="NGX_HAVE_MAP_ANON"
@@ -9,7 +9,7 @@
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -631,7 +631,7 @@ ngx_feature_test="void *p;
+@@ -664,7 +664,7 @@ ngx_feature_test="void *p;
  
  ngx_feature='mmap("/dev/zero", MAP_SHARED)'
  ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
@@ -18,7 +18,7 @@
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -646,7 +646,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -679,7 +679,7 @@ ngx_feature_test='void *p; int  fd;
  
  ngx_feature="System V shared memory"
  ngx_feature_name="NGX_HAVE_SYSVSHM"
@@ -27,7 +27,7 @@
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -660,7 +660,7 @@ ngx_feature_test="int  id;
+@@ -693,7 +693,7 @@ ngx_feature_test="int  id;
  
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 66a721e8d..45d7bb3cd 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -4,10 +4,10 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		ruby
-PKG_VERSION:=		2.1.4
+PKG_VERSION:=		2.1.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		89b2f4a197621346f6724a3c35535b19
-PKG_DESCR:=		ruby scripting language
+PKG_MD5SUM:=		df4c1b23f624a50513c7a78cb51a13dc
+PKG_DESCR:=		scripting language
 PKG_SECTION:=		dev/lang
 PKG_DEPENDS:=		librt libpthread
 PKG_BUILDDEP:=		ruby-host