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

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/12.2-49610fa/todo/xbmc-990.27-PR2232.patch.bk
	packages/mediacenter/xbmc/patches/12.2-49610fa/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk
	packages/mediacenter/xbmc/patches/12.2-49610fa/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-990.00-remove-windowed-display-mode.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-995.11-enable-vpp-deinterlacing.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch
	packages/mediacenter/xbmc/patches/12.2-49610fa/xbmc-995.13-vpp-fix-skipping.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/todo/xbmc-990.27-PR2232.patch.bk
	packages/mediacenter/xbmc/patches/12.2-8e4f924/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk
	packages/mediacenter/xbmc/patches/12.2-8e4f924/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-990.00-remove-windowed-display-mode.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-995.11-enable-vpp-deinterlacing.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch
	packages/mediacenter/xbmc/patches/12.2-8e4f924/xbmc-995.13-vpp-fix-skipping.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-990.27-PR2232.patch.bk
	packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk
	packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-990.00-remove-windowed-display-mode.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.11-enable-vpp-deinterlacing.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch
	packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.13-vpp-fix-skipping.patch

packages/databases/mysql/package.mk

@@ -19,98 +19,140 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.1.68"
+PKG_VERSION="5.6.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mysql.com"
-PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.1/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://cdn.mysql.com/Downloads/MySQL-5.6/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="zlib ncurses"
-PKG_BUILD_DEPENDS_HOST="toolchain zlib:host"
-PKG_BUILD_DEPENDS_TARGET="toolchain zlib ncurses mysql:host"
+PKG_BUILD_DEPENDS_HOST="toolchain zlib openssl ncurses"
+PKG_BUILD_DEPENDS_TARGET="toolchain zlib openssl ncurses mysql:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"
 PKG_SHORTDESC="mysql: A database server"
 PKG_LONGDESC="MySQL is a SQL (Structured Query Language) database server. SQL is the most popular database language in the world. MySQL is a client server implementation that consists of a server daemon mysqld and many different client programs/libraries."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
-TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -DPIC"
+pre_configure_host() {
+  sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" ../CMakeLists.txt
+  sed -i "s/ADD_SUBDIRECTORY(libmysql)/&\\nADD_SUBDIRECTORY(sql\/share)/" ../CMakeLists.txt
+  sed -i "s@data/test@\${INSTALL_MYSQLSHAREDIR}@g" ../sql/CMakeLists.txt
+  sed -i "s@data/mysql@\${INSTALL_MYSQLTESTDIR}@g" ../sql/CMakeLists.txt
+}
 
-PKG_CONFIGURE_OPTS_HOST="--with-zlib-dir=$ROOT/$TOOLCHAIN"
-
-PKG_CONFIGURE_OPTS_TARGET="ac_cv_c_stack_direction=-1 \
-                           ac_cv_sys_restartable_syscalls=yes \
-                           --localstatedir=/storage/.mysql \
-                           --with-unix-socket-path=/var/tmp/mysql.socket \
-                           --with-tcp-port=3306 \
-                           --enable-static \
-                           --disable-shared \
-                           --with-low-memory \
-                           --enable-largefile \
-                           --with-big-tables \
-                           --with-mysqld-user=mysqld \
-                           --with-extra-charsets=all \
-                           --with-pthread \
-                           --with-named-thread-libs=-lpthread \
-                           --enable-thread-safe-client \
-                           --enable-assembler \
-                           --enable-local-infile \
-                           --without-debug \
-                           --without-docs \
-                           --without-man \
-                           --with-readline \
-                           --without-libwrap \
-                           --without-pstack \
-                           --without-server \
-                           --without-embedded-server \
-                           --without-libedit \
-                           --with-query-cache \
-                           --without-plugin-partition \
-                           --without-plugin-daemon_example \
-                           --without-plugin-ftexample \
-                           --without-plugin-archive \
-                           --without-plugin-blackhole \
-                           --without-plugin-example \
-                           --without-plugin-federated \
-                           --without-plugin-ibmdb2i \
-                           --without-plugin-innobase \
-                           --without-plugin-innodb_plugin \
-                           --without-plugin-ndbcluster"
+# package specific configure options
+configure_host() {
+  cmake -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN             \
+        -DCMAKE_BUILD_TYPE=Release                    \
+        -DWITHOUT_SERVER=OFF                          \
+        -DWITH_EMBEDDED_SERVER=OFF                    \
+        -DWITH_EXTRA_CHARSETS=none                    \
+        -DWITH_EDITLINE=bundled                       \
+        -DWITH_LIBEVENT=bundled                       \
+        -DWITH_SSL=bundled                            \
+        -DWITH_UNIT_TESTS=OFF                         \
+        -DWITH_ZLIB=bundled                           \
+        ..
+}
 
 make_host() {
-  make -C include my_config.h
-  make -C mysys libmysys.a
-  make -C strings libmystrings.a
-  make -C dbug factorial
-  make -C vio libvio.a
-  make -C dbug libdbug.a
-  make -C regex libregex.a
-  make -C sql gen_lex_hash
-  make -C scripts comp_sql
-  make -C extra comp_err
+  make comp_err
+  make gen_lex_hash
+  make comp_sql
+  make gen_pfs_lex_token
 }
 
 makeinstall_host() {
-  cp -PR dbug/factorial $ROOT/$TOOLCHAIN/bin/mysql-factorial
-  cp -PR sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin/mysql-gen_lex_hash
-  cp -PR scripts/comp_sql $ROOT/$TOOLCHAIN/bin/mysql-comp_sql
-  cp -PR extra/comp_err $ROOT/$TOOLCHAIN/bin/mysql-comp_err
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    cp -PR extra/comp_err $ROOT/$TOOLCHAIN/bin
+    cp -PR sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin
+    cp -PR scripts/comp_sql $ROOT/$TOOLCHAIN/bin
+    cp -PR storage/perfschema/gen_pfs_lex_token $ROOT/$TOOLCHAIN/bin
+}
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF            \
+        -DCMAKE_BUILD_TYPE=Release                    \
+        -DFEATURE_SET=community                       \
+        -DDISABLE_SHARED=ON                           \
+        -DCMAKE_INSTALL_PREFIX=/usr                   \
+        -DINSTALL_DOCDIR=share/doc/mysql              \
+        -DINSTALL_DOCREADMEDIR=share/doc/mysql        \
+        -DINSTALL_INCLUDEDIR=include/mysql            \
+        -DINSTALL_INFODIR=share/info                  \
+        -DINSTALL_MANDIR=share/man                    \
+        -DINSTALL_MYSQLDATADIR=/storage/.mysql        \
+        -DINSTALL_MYSQLSHAREDIR=share/mysql           \
+        -DINSTALL_MYSQLTESTDIR=share/mysql/test       \
+        -DINSTALL_PLUGINDIR=lib/mysql/plugin          \
+        -DINSTALL_SBINDIR=sbin                        \
+        -DINSTALL_SCRIPTDIR=bin                       \
+        -DINSTALL_SQLBENCHDIR=share/mysql/bench       \
+        -DINSTALL_SUPPORTFILESDIR=share/mysql/support \
+        -DMYSQL_DATADIR=/storage/.mysql               \
+        -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock     \
+        -DSYSCONFDIR=/etc/mysql                       \
+        -DWITHOUT_SERVER=OFF                          \
+        -DWITH_EMBEDDED_SERVER=OFF                    \
+        -DWITH_PARTITION_STORAGE_ENGINE=OFF           \
+        -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON           \
+        -DWITH_EXTRA_CHARSETS=all                     \
+        -DENABLE_DTRACE=OFF                           \
+        -DWITH_EDITLINE=bundled                       \
+        -DWITH_LIBEVENT=bundled                       \
+        -DWITH_SSL=system                             \
+        -DWITH_UNIT_TESTS=OFF                         \
+        -DWITH_ZLIB=system                            \
+        -DSTACK_DIRECTION=1                           \
+        ..
+}
+
+pre_make_target() {
+# copy host binaries back - should be fixed
+  cp -PR ../.$HOST_NAME/scripts/comp_sql ../scripts/comp_sql
 }
 
 post_makeinstall_target() {
   sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config
   sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config
-  cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin
-  ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config
 
-  for i in `ls -d $SYSROOT_PREFIX/usr/lib/mysql/*.a`; do 
-    ln -v -sf $i $SYSROOT_PREFIX/usr/lib
-  done
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    cp -PR scripts/mysql_config $ROOT/$TOOLCHAIN/bin
 
   rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/mysql-test
-  rm -rf $INSTALL/usr/share/mysql
-  rm -rf $INSTALL/usr/sql-bench
+  rm -rf $INSTALL/usr/sbin
+  rm -rf $INSTALL/usr/lib/mysql/plugin
+  rm -rf $INSTALL/usr/share/mysql/bench
+  rm -rf $INSTALL/usr/share/mysql/support
+  rm -rf $INSTALL/usr/share/mysql/test
+
+  if [ "$MYSQL_SERVER" = "yes" ]; then
+    mkdir -p $INSTALL/usr/bin
+      cp -P extra/resolveip $INSTALL/usr/bin
+      cp -P extra/my_print_defaults $INSTALL/usr/bin
+      cp -P client/mysql $INSTALL/usr/bin
+      cp -P client/mysqladmin $INSTALL/usr/bin
+      cp -P ../scripts/mysql_install_db.sh $INSTALL/usr/bin/mysql_install_db
+        chmod +x $INSTALL/usr/bin/mysql_install_db
+        sed -e 's,@localstatedir@,/storage/.mysql,g' \
+            -e 's,@bindir@,/usr/bin,g' \
+            -e 's,@prefix@,/usr,g' \
+            -e 's,@libexecdir@,/usr/sbin,g' \
+            -e 's,@pkgdatadir@,/usr/share/mysql,g' \
+            -e 's,@scriptdir@,/usr/bin,g' \
+            -e 's,^.basedir=.*,basedir="/usr",g' \
+            -e 's,@HOSTNAME@,cat /proc/sys/kernel/hostname,g' \
+            -i $INSTALL/usr/bin/mysql_install_db
+
+    mkdir -p $INSTALL/usr/sbin
+      cp -P sql/mysqld $INSTALL/usr/sbin
+
+    mkdir -p $INSTALL/etc/init.d
+      cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
+  else
+    rm -rf $INSTALL/usr/share/mysql
+  fi
 }

packages/databases/mysql/patches/mysql-010_crosscompiling.patch

@@ -1,128 +0,0 @@
-diff -Naur mysql-5.1.38/dbug/Makefile.am mysql-5.1.38.patch/dbug/Makefile.am
---- mysql-5.1.38/dbug/Makefile.am	2009-08-21 14:09:22.000000000 +0200
-+++ mysql-5.1.38.patch/dbug/Makefile.am	2009-09-10 02:57:59.000000000 +0200
-@@ -44,19 +44,19 @@
- 		-groff -mm user.r > $@
- 
- output1.r:      factorial
--		./factorial 1 2 3 4 5 | cat > $@
-+		mysql-factorial 1 2 3 4 5 | cat > $@
- 
- output2.r:      factorial
--		./factorial -\#t:o 2 3 | cat >$@
-+		mysql-factorial -\#t:o 2 3 | cat >$@
- 
- output3.r:      factorial
--		./factorial -\#d:t:o 3 | cat >$@
-+		mysql-factorial -\#d:t:o 3 | cat >$@
- 
- output4.r:      factorial
--		./factorial -\#d,result:o 4 | cat >$@
-+		mysql-factorial -\#d,result:o 4 | cat >$@
- 
- output5.r:      factorial
--		./factorial -\#d:f,factorial:F:L:o 3 | cat >$@
-+		mysql-factorial -\#d:f,factorial:F:L:o 3 | cat >$@
- .c.r:
- 		@RM@ -f $@
- 		@SED@ -e 's!\\!\\\\!g' $< > $@
-diff -Naur mysql-5.1.38/dbug/Makefile.in mysql-5.1.38.patch/dbug/Makefile.in
---- mysql-5.1.38/dbug/Makefile.in	2009-08-21 14:17:15.000000000 +0200
-+++ mysql-5.1.38.patch/dbug/Makefile.in	2009-09-10 02:58:14.000000000 +0200
-@@ -746,19 +746,19 @@
- 		-groff -mm user.r > $@
- 
- output1.r:      factorial
--		./factorial 1 2 3 4 5 | cat > $@
-+		mysql-factorial 1 2 3 4 5 | cat > $@
- 
- output2.r:      factorial
--		./factorial -\#t:o 2 3 | cat >$@
-+		mysql-factorial -\#t:o 2 3 | cat >$@
- 
- output3.r:      factorial
--		./factorial -\#d:t:o 3 | cat >$@
-+		mysql-factorial -\#d:t:o 3 | cat >$@
- 
- output4.r:      factorial
--		./factorial -\#d,result:o 4 | cat >$@
-+		mysql-factorial -\#d,result:o 4 | cat >$@
- 
- output5.r:      factorial
--		./factorial -\#d:f,factorial:F:L:o 3 | cat >$@
-+		mysql-factorial -\#d:f,factorial:F:L:o 3 | cat >$@
- .c.r:
- 		@RM@ -f $@
- 		@SED@ -e 's!\\!\\\\!g' $< > $@
-diff -Naur mysql-5.1.38/extra/Makefile.am mysql-5.1.38.patch/extra/Makefile.am
---- mysql-5.1.38/extra/Makefile.am	2009-08-21 14:09:23.000000000 +0200
-+++ mysql-5.1.38.patch/extra/Makefile.am	2009-09-10 02:53:50.000000000 +0200
-@@ -32,7 +32,7 @@
- $(top_builddir)/include/mysqld_error.h: comp_err.c \
- 			$(top_srcdir)/sql/share/errmsg.txt
- 	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
--	$(top_builddir)/extra/comp_err$(EXEEXT) \
-+	mysql-comp_err$(EXEEXT) \
- 	--charset=$(top_srcdir)/sql/share/charsets \
- 	--out-dir=$(top_builddir)/sql/share/ \
- 	--header_file=$(top_builddir)/include/mysqld_error.h \
-diff -Naur mysql-5.1.38/extra/Makefile.in mysql-5.1.38.patch/extra/Makefile.in
---- mysql-5.1.38/extra/Makefile.in	2009-08-21 14:17:16.000000000 +0200
-+++ mysql-5.1.38.patch/extra/Makefile.in	2009-09-10 02:53:16.000000000 +0200
-@@ -936,7 +936,7 @@
- $(top_builddir)/include/mysqld_error.h: comp_err.c \
- 			$(top_srcdir)/sql/share/errmsg.txt
- 	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
--	$(top_builddir)/extra/comp_err$(EXEEXT) \
-+	mysql-comp_err$(EXEEXT) \
- 	--charset=$(top_srcdir)/sql/share/charsets \
- 	--out-dir=$(top_builddir)/sql/share/ \
- 	--header_file=$(top_builddir)/include/mysqld_error.h \
-diff -Naur mysql-5.1.38/scripts/Makefile.am mysql-5.1.38.patch/scripts/Makefile.am
---- mysql-5.1.38/scripts/Makefile.am	2009-08-21 14:11:26.000000000 +0200
-+++ mysql-5.1.38.patch/scripts/Makefile.am	2009-09-10 02:57:01.000000000 +0200
-@@ -121,7 +121,7 @@
- mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
- 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
- 	sleep 2
--	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
-+	mysql-comp_sql$(EXEEXT) \
- 	  mysql_fix_privilege_tables \
- 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
- 
-diff -Naur mysql-5.1.38/scripts/Makefile.in mysql-5.1.38.patch/scripts/Makefile.in
---- mysql-5.1.38/scripts/Makefile.in	2009-08-21 14:17:23.000000000 +0200
-+++ mysql-5.1.38.patch/scripts/Makefile.in	2009-09-10 02:57:11.000000000 +0200
-@@ -802,7 +802,7 @@
- mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
- 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
- 	sleep 2
--	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
-+	mysql-comp_sql$(EXEEXT) \
- 	  mysql_fix_privilege_tables \
- 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
- 
-diff -Naur mysql-5.1.38/sql/Makefile.am mysql-5.1.38.patch/sql/Makefile.am
---- mysql-5.1.38/sql/Makefile.am	2009-08-21 14:12:24.000000000 +0200
-+++ mysql-5.1.38.patch/sql/Makefile.am	2009-09-10 02:55:09.000000000 +0200
-@@ -174,7 +174,7 @@
- # this avoid the rebuild of the built files in a source dist
- lex_hash.h:	gen_lex_hash.cc lex.h
- 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--		./gen_lex_hash$(EXEEXT) > $@-t
-+		mysql-gen_lex_hash$(EXEEXT) > $@-t
- 		$(MV) $@-t $@
- 
- # For testing of udf_example.so
-diff -Naur mysql-5.1.38/sql/Makefile.in mysql-5.1.38.patch/sql/Makefile.in
---- mysql-5.1.38/sql/Makefile.in	2009-08-21 14:17:25.000000000 +0200
-+++ mysql-5.1.38.patch/sql/Makefile.in	2009-09-10 02:55:22.000000000 +0200
-@@ -1302,7 +1302,7 @@
- # this avoid the rebuild of the built files in a source dist
- lex_hash.h:	gen_lex_hash.cc lex.h
- 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--		./gen_lex_hash$(EXEEXT) > $@-t
-+		mysql-gen_lex_hash$(EXEEXT) > $@-t
- 		$(MV) $@-t $@
- 
- # We might have some stuff not built in this build, but that we want to install

packages/databases/mysql/scripts/54_mysql

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,28 +18,28 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+# start MySql Server
+#
+# runlevels: openelec, textmode
 
-add_user sshd x 74 74 "Privilege-separated SSH" "/var/empty/sshd" "/bin/sh"
-add_group sshd 74
+MYSQL_DATADIR="$CONFIG_CACHE/mysql"
 
-mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/ssh_config $INSTALL/etc
-  cp $PKG_DIR/config/sshd_config $INSTALL/etc
-  cp $PKG_BUILD/moduli $INSTALL/etc
+(
+  progress  "Starting MySql server"
+    mkdir -p /run/mysqld
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/scp $INSTALL/usr/bin/
-  cp $PKG_BUILD/ssh $INSTALL/usr/bin/
-  cp $PKG_BUILD/ssh-add $INSTALL/usr/bin/
-  cp $PKG_BUILD/ssh-agent $INSTALL/usr/bin/
-  cp $PKG_BUILD/ssh-keygen $INSTALL/usr/bin/
+    if [ ! -d "$MYSQL_DATADIR" ]; then
+      progress  "Creating MySql Database"
+      mkdir -p "$MYSQL_DATADIR"
+        mysql_install_db --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1
+        mysqld --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1 &
+        usleep 3000000
+        mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'openelec' WITH GRANT OPTION;" > /dev/null 2>&1
+        mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'openelec' WITH GRANT OPTION;" > /dev/null 2>&1
 
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/sshd $INSTALL/usr/sbin/
-
-if [ $SFTP_SERVER = "yes" ]; then
-  mkdir -p $INSTALL/usr/libexec
-    cp $PKG_BUILD/sftp-server $INSTALL/usr/libexec
-fi
+      killall mysqld
+      usleep 2000000
+    fi
 
+    mysqld --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1
+)&

packages/devel/dbus-glib-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain glib-host dbus-host"
+PKG_BUILD_DEPENDS="toolchain glib-host dbus:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"

packages/devel/ncurses/build

@@ -37,6 +37,7 @@ make -C progs tic
 
 cp progs/tic $ROOT/$TOOLCHAIN/bin
 cp lib/*.so* $ROOT/$TOOLCHAIN/lib
+make -C include install
 
 cd "$CWD"
 

packages/graphics/Mesa/package.mk

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="9.1.5"
+PKG_VERSION="9.1.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
-PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
@@ -35,6 +35,9 @@ PKG_LONGDESC="Mesa is a 3-D graphics library with an API which is very similar t
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+# configure GPU drivers and dependencies:
+  get_graphicdrivers
+
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET llvm"
   PKG_DEPENDS="$PKG_DEPENDS llvm"
@@ -57,8 +60,6 @@ if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
   PKG_DEPENDS="$PKG_DEPENDS libva"
 fi
 
-get_graphicdrivers
-
 XA_CONFIG="--disable-xa"
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = "vmware" ] && XA_CONFIG="--enable-xa"

packages/graphics/libdrm/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.45"
+PKG_VERSION="2.4.46"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/initramfs/sysutils/dosfstools-initramfs/install

@@ -25,6 +25,4 @@
 DOSFSTOOLS_DIR="$BUILD/dosfstools-*"
 
 mkdir -p $INSTALL/sbin
-  cp $DOSFSTOOLS_DIR/dosfsck $INSTALL/sbin
-    ln -sf dosfsck $INSTALL/sbin/fsck.vfat
-    ln -sf dosfsck $INSTALL/sbin/fsck.msdos
+  cp -PR $DOSFSTOOLS_DIR/.install_pkg/usr/sbin/fsck.* $INSTALL/sbin

packages/linux/firmware/radeon/LICENSE.radeon

@@ -1,4 +1,4 @@
-Copyright (C) 2009, 2010  Advanced Micro Devices, Inc. All rights reserved.
+Copyright (C) 2009-2013  Advanced Micro Devices, Inc. All rights reserved.
 
 REDISTRIBUTION: Permission is hereby granted, free of any license fees,
 to any person obtaining a copy of this microcode (the "Software"), to

packages/linux/meta

@@ -34,7 +34,7 @@ case "$LINUX" in
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
     ;;
   *)
-    PKG_VERSION="3.10.2"
+    PKG_VERSION="3.10.5"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac

packages/linux/patches/3.10.2/linux-999.02-drm-i915-correctly-restore-fences-with-objects-attached.patch

@@ -1,106 +0,0 @@
-From 94a335dba34ff47cad3d6d0c29b452d43a1be3c8 Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date: Wed, 17 Jul 2013 12:51:28 +0000
-Subject: drm/i915: correctly restore fences with objects attached
-
-To avoid stalls we delay tiling changes and especially hold of
-committing the new fence state for as long as possible.
-Synchronization points are in the execbuf code and in our gtt fault
-handler.
-
-Unfortunately we've missed that tricky detail when adding proper fence
-restore code in
-
-commit 19b2dbde5732170a03bd82cc8bd442cf88d856f7
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Wed Jun 12 10:15:12 2013 +0100
-
-    drm/i915: Restore fences after resume and GPU resets
-
-The result was that we've restored fences for objects with no tiling,
-since the object<->fence link still existed after resume. Now that
-wouldn't have been too bad since any subsequent access would have
-fixed things up, but if we've changed from tiled to untiled real havoc
-happened:
-
-The tiling stride is stored -1 in the fence register, so a stride of 0
-resulted in all 1s in the top 32bits, and so a completely bogus fence
-spanning everything from the start of the object to the top of the
-GTT. The tell-tale in the register dumps looks like:
-
-                 FENCE START 2: 0x0214d001
-                 FENCE END 2: 0xfffff3ff
-
-Bit 11 isn't set since the hw doesn't store it, even when writing all
-1s (at least on my snb here).
-
-To prevent such a gaffle in the future add a sanity check for fences
-with an untiled object attached in i915_gem_write_fence.
-
-v2: Fix the WARN, spotted by Chris.
-
-v3: Trying to reuse get_fences looked ugly and obfuscated the code.
-Instead reuse update_fence and to make it really dtrt also move the
-fence dirty state clearing into update_fence.
-
-Cc: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Stéphane Marchesin <marcheu@chromium.org>
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=60530
-Cc: stable@vger.kernel.org (for 3.10 only)
-Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Tested-by: Matthew Garrett <matthew.garrett@nebula.com>
-Tested-by: Björn Bidar <theodorstormgrade@gmail.com>
-Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
----
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 97afd26..d9e2208 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -2258,7 +2258,17 @@ void i915_gem_restore_fences(struct drm_device *dev)
- 
- 	for (i = 0; i < dev_priv->num_fence_regs; i++) {
- 		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];
--		i915_gem_write_fence(dev, i, reg->obj);
-+
-+		/*
-+		 * Commit delayed tiling changes if we have an object still
-+		 * attached to the fence, otherwise just clear the fence.
-+		 */
-+		if (reg->obj) {
-+			i915_gem_object_update_fence(reg->obj, reg,
-+						     reg->obj->tiling_mode);
-+		} else {
-+			i915_gem_write_fence(dev, i, NULL);
-+		}
- 	}
- }
- 
-@@ -2795,6 +2805,10 @@ static void i915_gem_write_fence(struct drm_device *dev, int reg,
- 	if (i915_gem_object_needs_mb(dev_priv->fence_regs[reg].obj))
- 		mb();
- 
-+	WARN(obj && (!obj->stride || !obj->tiling_mode),
-+	     "bogus fence setup with stride: 0x%x, tiling mode: %i\n",
-+	     obj->stride, obj->tiling_mode);
-+
- 	switch (INTEL_INFO(dev)->gen) {
- 	case 7:
- 	case 6:
-@@ -2836,6 +2850,7 @@ static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj,
- 		fence->obj = NULL;
- 		list_del_init(&fence->lru_list);
- 	}
-+	obj->fence_dirty = false;
- }
- 
- static int
-@@ -2965,7 +2980,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
- 		return 0;
- 
- 	i915_gem_object_update_fence(obj, reg, enable);
--	obj->fence_dirty = false;
- 
- 	return 0;
- }
---
-cgit v0.9.0.2-2-gbebe

packages/linux/patches/3.10.5/linux-058.06-hid_sony-add_SMK_link.patch

@@ -0,0 +1,47 @@
+commit 5a601d61d36236a667cc7d170b300d18dd6240c6
+Author: Juan J. Sierralta <sierralta@gmail.com>
+Date:   Sun Jul 28 09:26:04 2013 +0300
+
+    Add support for SMK-Link PS3 remote
+
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 396d24d..9eb7129 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1686,6 +1686,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index dd0511e..2801df1 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -734,6 +734,7 @@
+ #define USB_VENDOR_ID_SKYCABLE			0x1223
+ #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
+ 
++#define USB_VENDOR_ID_SMK			0x0609
+ #define USB_VENDOR_ID_SONY			0x054c
+ #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b
+ #define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374
+diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
+index 8f425e2..614f057 100644
+--- a/drivers/hid/hid-sony.c
++++ b/drivers/hid/hid-sony.c
+@@ -728,8 +728,12 @@ static const struct hid_device_id sony_devices[] = {
+ 	/* Logitech Harmony Adapter for PS3 */
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),
+ 		.driver_data = PS3REMOTE },
++	/* SMK-Link Universal Remote Control VP3700 */
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SONY_PS3_BDREMOTE),
++		.driver_data = PS3REMOTE },
+ 	{ }
+ };
++
+ MODULE_DEVICE_TABLE(hid, sony_devices);
+ 
+ static struct hid_driver sony_driver = {

packages/linux/patches/3.10.5/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch

@@ -0,0 +1,84 @@
+This reverts
+https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=9d3ce4af3be0235d4cf41ea9fd774205a32e58a2
+
+From 9d3ce4af3be0235d4cf41ea9fd774205a32e58a2 Mon Sep 17 00:00:00 2001
+From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
+Date: Thu, 11 Jul 2013 22:15:37 +0000
+Subject: cpufreq: Revert commit a66b2e to fix suspend/resume regression
+
+commit aae760ed21cd690fe8a6db9f3a177ad55d7e12ab upstream.
+
+commit a66b2e (cpufreq: Preserve sysfs files across suspend/resume)
+has unfortunately caused several things in the cpufreq subsystem to
+break subtly after a suspend/resume cycle.
+
+The intention of that patch was to retain the file permissions of the
+cpufreq related sysfs files across suspend/resume.  To achieve that,
+the commit completely removed the calls to cpufreq_add_dev() and
+__cpufreq_remove_dev() during suspend/resume transitions.  But the
+problem is that those functions do 2 kinds of things:
+  1. Low-level initialization/tear-down that are critical to the
+     correct functioning of cpufreq-core.
+  2. Kobject and sysfs related initialization/teardown.
+
+Ideally we should have reorganized the code to cleanly separate these
+two responsibilities, and skipped only the sysfs related parts during
+suspend/resume.  Since we skipped the entire callbacks instead (which
+also included some CPU and cpufreq-specific critical components),
+cpufreq subsystem started behaving erratically after suspend/resume.
+
+So revert the commit to fix the regression.  We'll revisit and address
+the original goal of that commit separately, since it involves quite a
+bit of careful code reorganization and appears to be non-trivial.
+
+(While reverting the commit, note that another commit f51e1eb
+ (cpufreq: Fix cpufreq regression after suspend/resume) already
+ reverted part of the original set of changes.  So revert only the
+ remaining ones).
+
+Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Tested-by: Paul Bolle <pebolle@tiscali.nl>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+diff -Naur linux-3.10.4/drivers/cpufreq/cpufreq.c linux-3.10.4.patch/drivers/cpufreq/cpufreq.c
+--- linux-3.10.4/drivers/cpufreq/cpufreq.c	2013-07-29 01:30:49.000000000 +0200
++++ linux-3.10.4.patch/drivers/cpufreq/cpufreq.c	2013-07-30 08:08:08.016815021 +0200
+@@ -1837,15 +1837,13 @@
+ 	if (dev) {
+ 		switch (action) {
+ 		case CPU_ONLINE:
+-		case CPU_ONLINE_FROZEN:
+ 			cpufreq_add_dev(dev, NULL);
+ 			break;
+ 		case CPU_DOWN_PREPARE:
+-		case CPU_DOWN_PREPARE_FROZEN:
++		case CPU_UP_CANCELED_FROZEN:
+ 			__cpufreq_remove_dev(dev, NULL);
+ 			break;
+ 		case CPU_DOWN_FAILED:
+-		case CPU_DOWN_FAILED_FROZEN:
+ 			cpufreq_add_dev(dev, NULL);
+ 			break;
+ 		}
+diff -Naur linux-3.10.4/drivers/cpufreq/cpufreq_stats.c linux-3.10.4.patch/drivers/cpufreq/cpufreq_stats.c
+--- linux-3.10.4/drivers/cpufreq/cpufreq_stats.c	2013-07-29 01:30:49.000000000 +0200
++++ linux-3.10.4.patch/drivers/cpufreq/cpufreq_stats.c	2013-07-30 08:08:08.016815021 +0200
+@@ -353,11 +353,13 @@
+ 		cpufreq_update_policy(cpu);
+ 		break;
+ 	case CPU_DOWN_PREPARE:
+-	case CPU_DOWN_PREPARE_FROZEN:
+ 		cpufreq_stats_free_sysfs(cpu);
+ 		break;
+ 	case CPU_DEAD:
+-	case CPU_DEAD_FROZEN:
++		cpufreq_stats_free_table(cpu);
++		break;
++	case CPU_UP_CANCELED_FROZEN:
++		cpufreq_stats_free_sysfs(cpu);
+ 		cpufreq_stats_free_table(cpu);
+ 		break;
+ 	}

packages/mediacenter/service.openelec.settings/unpack

@@ -27,3 +27,10 @@ ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
 
 mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
   unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done