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

Conflicts:
	packages/mediacenter/xbmc/build

config/options

@@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
 OPENELEC_VERSION=`cat VERSION`
 
 if [ "$OPENELEC_VERSION" = "devel" ]; then
-  OS_VERSION="0.99"
+  OS_VERSION="1.0"
 else
   OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
   OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`

packages/audio/alsa-plugins/install

@@ -24,3 +24,6 @@
 
 mkdir -p $INSTALL/usr/lib/alsa
   cp -P $PKG_BUILD/*/.libs/*.so $INSTALL/usr/lib/alsa
+
+mkdir -p $INSTALL/usr/share/alsa/pcm
+  cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm

packages/audio/alsa/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL=""
-PKG_DEPENDS="alsa-lib alsa-utils alsa-plugins"
+PKG_DEPENDS="alsa-lib alsa-utils"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/pulseaudio/install

@@ -16,9 +16,6 @@ mkdir -p $INSTALL/etc
 mkdir -p $INSTALL/etc/alsa
   cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
 
-mkdir -p $INSTALL/etc/alsa/pcm
-  cp -R $PKG_DIR/config/pcm/*.conf $INSTALL/etc/alsa/pcm
-
 mkdir -p $INSTALL/etc/pulse
   cp $PKG_BUILD/src/client.conf $INSTALL/etc/pulse
   cp $PKG_BUILD/src/daemon.conf $INSTALL/etc/pulse

packages/audio/pulseaudio/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
+PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl alsa-plugins"
 PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/mediacenter/xbmc/install

@@ -46,6 +46,18 @@ cd $PKG_BUILD
     -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
 cd -
 
+if [ ! "$XBMC_SCR_RSXS" = yes ]; then
+  rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/screensaver.rsxs.*
+fi
+
+if [ ! "$XBMC_VIS_PROJECTM" = yes ]; then
+  rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.projectm
+fi
+
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.dxspectrum
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.itunes
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop
+
 # overriding Splash image
 mkdir -p $INSTALL/usr/share/xbmc/media
   rm -rf $INSTALL/usr/share/xbmc/media/Splash.png

packages/mediacenter/xbmc/patches/xbmc-86683ca-311-fix_rsxs_build-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h
+--- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h	2011-09-27 15:56:19.000000000 +0200
++++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h	2011-10-16 02:13:13.805433847 +0200
+@@ -17,7 +17,7 @@
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ 
+-#if !_LIBC
++#if 0
+ /* This code is written for inclusion in gnu-libc, and uses names in the
+    namespace reserved for libc.  If we're not compiling in libc, define those
+    names to be the normal ones instead.  */

packages/network/wpa_supplicant/build

@@ -28,6 +28,6 @@ cp $ROOT/$PKG_DIR/config/makefile.config .config
 
 # echo "CONFIG_TLS=gnutls" >> .config
 # echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-[ "$DEBUG" = "no" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
+[ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
 
 make

packages/toolchain/lang/gcc-final/build

@@ -61,6 +61,11 @@ mkdir -p objdir-$1 && cd objdir-$1
 
 make
 
+if [ ! "$DEBUG" = yes ]; then
+  $STRIP `find . -name "*.so"`
+  $STRIP `find . -name "*.so.[0-9]*"`
+fi
+
 make install
 cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
 

packages/tools/installer/scripts/installer

@@ -488,7 +488,7 @@ do_poweroff() {
   BETA="yes"
   INSTALLER_VERSION="0.2.5"
   OS_VERSION=$(lsb_release)
-  BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - Operating System: $OS_VERSION"
+  BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - $OS_VERSION"
 
   TMPDIR="/tmp/installer"
   LOGFILE="$TMPDIR/install.log"

projects/Intel/options

@@ -122,12 +122,12 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
-# build and install 'ProjectM' Visualization (yes / no)
-  XBMC_VIS_PROJECTM="yes"
-
 # build and install 'RSXS' Screensaver (yes / no)
   XBMC_SCR_RSXS="no"
 
+# build and install 'ProjectM' Visualization (yes / no)
+  XBMC_VIS_PROJECTM="yes"
+
 # build and install 'GOOM' Visualization (yes / no)
   XBMC_VIS_GOOM="yes"
 

scripts/build

@@ -63,7 +63,7 @@ if [ ! -f $STAMP ]; then
 
   if [ -f $PKG_DIR/build ]; then
     $PKG_DIR/build $@ >&$VERBOSE_OUT
-    if [ "$DEBUG" = no ]; then
+    if [ ! "$DEBUG" = yes ]; then
      $STRIP `find $BUILD/$1* -name "*.so"` 2>/dev/null || \
       echo "Information: no *.so libs found"
      $STRIP `find $BUILD/$1* -name "*.so.[0-9]*"` 2>/dev/null ||\