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

config/options

@@ -85,9 +85,9 @@ get_graphicdrivers() {
     [ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
     [ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
     [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
+#    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+#    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
     [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
 
     if [ "$drv" = "i915" -o "$drv" = "i965" ]; then

packages/debug/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop mrxvt"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/debug/mrxvt/build

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+ac_cv_func_setpgrp_void=no \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-minimal \
+            --disable-frills \
+            --enable-keepscrolling \
+            --disable-selectionscrolling \
+            --enable-mousewheel \
+            --disable-mouseslipwheel \
+            --enable-rxvt-scroll \
+            --disable-half-shadow \
+            --enable-lastlog \
+            --enable-sessionmgr \
+            --enable-linespace \
+            --enable-24bits \
+            --enable-256colors \
+            --enable-cursor-blink \
+            --enable-pointer-blank \
+            --disable-text-shadow \
+            --enable-menubar \
+            --disable-transparency \
+            --disable-tinting \
+            --enable-xrender \
+            --disable-xpm \
+            --disable-jpeg \
+            --disable-png \
+            --enable-xft \
+            --enable-ttygid \
+            --enable-backspace-key \
+            --enable-delete-key \
+            --disable-resources \
+            --disable-swapscreen
+
+#            --x-includes=$SYSROOT_PREFIX/usr/include \
+#            --x-libraries=$SYSROOT_PREFIX/usr/lib \
+
+make
+
+$STRIP src/$1

packages/debug/mrxvt/install

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options
+
+mkdir -p $INSTALL/usr/bin
+  cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
+  cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin
+

packages/debug/mrxvt/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="mrxvt"
+PKG_VERSION="0.5.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://materm.sourceforge.net/"
+PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="libX11 libXrender freetype"
+PKG_BUILD_DEPENDS="toolchain libX11 libXrender freetype"
+PKG_PRIORITY="optional"
+PKG_SECTION="debug"
+PKG_SHORTDESC="mrxvt: Lightweight Xterm replacement"
+PKG_LONGDESC="Mrxvt (previously named as materm) is a lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm. It implements many useful features seen in some modern X terminal emulators, like gnome-terminal and konsole, but keep to be lightweight and independent from the GNOME and KDE desktop environment."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/debug/mrxvt/profile.d/terminal.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Core (PATH) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+TERMINAL="/usr/bin/mrxvt-session"
+
+export TERMINAL

packages/debug/mrxvt/scripts/mrxvt-session

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. /etc/profile
+
+# start Windowmanager by default
+  $WINDOWMANAGER -term mrxvt &
+
+# start terminal
+  mrxvt

packages/graphics/Mesa/build

@@ -33,7 +33,8 @@ get_graphicdrivers
   LDFLAGS=""
 
 MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
-MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
 
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = i915 ] && \
@@ -45,8 +46,13 @@ for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = radeon ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
 
+  [ "$drv" = r300 ] && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/disable-gallium-r300/'`
+
   [ "$drv" = r600 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
 
   [ "$drv" = nouveau ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \

packages/graphics/Mesa/meta

@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MESA_MASTER" = "yes" ]; then
-  PKG_VERSION="6067a2a"
+  PKG_VERSION="7.11-git2812b60"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi