Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

packages/web/curl/build

@@ -26,6 +26,8 @@
   LDFLAGS="$LDFLAGS -lrt -lrtmp"
 
 cd $PKG_BUILD
+ac_cv_lib_rtmp_RTMP_Init=yes \
+ac_cv_header_librtmp_rtmp_h=yes \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -66,12 +68,12 @@ cd $PKG_BUILD
             --without-krb4 \
             --without-spnego \
             --without-gssapi \
-            --without-ssl \
+            --with-ssl \
             --with-zlib \
             --without-egd-socket \
             --enable-thread \
             --with-random=/dev/urandom \
-            --with-gnutls="$SYSROOT_PREFIX/usr" \
+            --without-gnutls \
             --without-polarssl \
             --without-nss \
             --with-ca-bundle="/etc/ssl/certs/ca-bundle.crt" \

packages/web/curl/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://curl.haxx.se"
 PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib gnutls rtmpdump"
-PKG_BUILD_DEPENDS="toolchain zlib gnutls rtmpdump"
+PKG_DEPENDS="zlib openssl rtmpdump"
+PKG_BUILD_DEPENDS="toolchain zlib openssl rtmpdump"
 PKG_PRIORITY="optional"
 PKG_SECTION="web"
 PKG_SHORTDESC="curl: Client and library for (HTTP, HTTPS, FTP, ...) transfers"

scripts/checkdeps

@@ -35,8 +35,8 @@ case $1 in
   build)
     deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
     deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
-    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h /usr/lib/perl5/XML/Parser.pm"
-    files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev perl-XML-Parser"
+    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h"
+    files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev"
     ;;
   qemu)
     if [ ! `which qemu` ]; then