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

packages/graphics/Mesa/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="7.11-ac8f59b"
+PKG_VERSION="7.11-b90c710"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/app/xrandr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xrandr"
-PKG_VERSION="1.3.4"
+PKG_VERSION="1.3.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/lib/libXrandr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libXrandr"
-PKG_VERSION="1.3.1"
+PKG_VERSION="1.3.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/proto/dri2proto/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dri2proto"
-PKG_VERSION="2.3"
+PKG_VERSION="2.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/proto/glproto/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="glproto"
-PKG_VERSION="1.4.12"
+PKG_VERSION="1.4.14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

projects/Ultra/linux/linux.x86_64.conf

@@ -1314,7 +1314,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_G760A is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
@@ -1458,15 +1458,15 @@ CONFIG_IR_JVC_DECODER=y
 CONFIG_IR_SONY_DECODER=y
 CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
-CONFIG_IR_ENE=m
+# CONFIG_IR_ENE is not set
-CONFIG_IR_IMON=m
+# CONFIG_IR_IMON is not set
-CONFIG_IR_MCEUSB=m
+# CONFIG_IR_MCEUSB is not set
-CONFIG_IR_ITE_CIR=m
+# CONFIG_IR_ITE_CIR is not set
-CONFIG_IR_FINTEK=m
+# CONFIG_IR_FINTEK is not set
-CONFIG_IR_NUVOTON=m
+CONFIG_IR_NUVOTON=y
-CONFIG_IR_REDRAT3=m
+# CONFIG_IR_REDRAT3 is not set
-CONFIG_IR_STREAMZAP=m
+# CONFIG_IR_STREAMZAP is not set
-CONFIG_IR_WINBOND_CIR=m
+# CONFIG_IR_WINBOND_CIR is not set
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=y
@@ -1832,14 +1832,15 @@ CONFIG_FONT_8x16=y
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=m
+CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
+CONFIG_SND_HWDEP=y
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -1896,19 +1897,20 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_HWDEP=y
-# CONFIG_SND_HDA_RECONFIG is not set
+CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
-# CONFIG_SND_HDA_INPUT_JACK is not set
+CONFIG_SND_HDA_INPUT_BEEP_MODE=2
-# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 # CONFIG_SND_HDA_CODEC_ANALOG is not set
 # CONFIG_SND_HDA_CODEC_SIGMATEL is not set
-CONFIG_SND_HDA_CODEC_VIA=y
+# CONFIG_SND_HDA_CODEC_VIA is not set
 CONFIG_SND_HDA_CODEC_HDMI=y
 # CONFIG_SND_HDA_CODEC_CIRRUS is not set
-CONFIG_SND_HDA_CODEC_CONEXANT=y
+# CONFIG_SND_HDA_CODEC_CONEXANT is not set
 # CONFIG_SND_HDA_CODEC_CA0110 is not set
 # CONFIG_SND_HDA_CODEC_CMEDIA is not set
 # CONFIG_SND_HDA_CODEC_SI3054 is not set

tools/mkpkg/mkpkg_Mesa-7.11

@@ -0,0 +1,43 @@
+#!/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
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d Mesa-7.11.git ]; then
+    git clone git://anongit.freedesktop.org/mesa/mesa -b 7.11 Mesa-7.11.git
+  fi
+
+  cd Mesa-7.11.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf Mesa-7.11-$GIT_REV
+  cp -R Mesa-7.11.git Mesa-7.11-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf Mesa-7.11-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf Mesa-7.11-$GIT_REV.tar.xz Mesa-7.11-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf Mesa-7.11-$GIT_REV