Merge remote-tracking branch 'upstream/openelec-4.2' into openelec-4.2

codesnake · Oct 5, 2014 · 37cda4d · 37cda4d
2 parents cc7c974 + 7fc61da
commit 37cda4d
Show file tree

Hide file tree

Showing 11 changed files with 275 additions and 122 deletions.
diff --git a/config/functions b/config/functions
@@ -82,11 +82,11 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1)
+    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
     if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
       . $_PKG_DIR/package.mk
     else
-      local _PKG_DIR=$(find $ROOT/packages -name $1)
+      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
       if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
         . $_PKG_DIR/package.mk
       fi

diff --git a/config/path b/config/path
@@ -69,7 +69,7 @@ SED="sed -i"
     # first check project folder for a package
     FOUND=0
     ALL_DIRS=""
-    for DIR in $ROOT/`find projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME ! -wholename \*\/source\/\* 2>/dev/null` ; do
+    for DIR in `find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME ! -wholename \*\/source\/\* 2>/dev/null` ; do
       # keep track of dirs with meta for debugging
       if [ -z "$ALL_DIRS" ] ; then
         ALL_DIRS="$DIR"
@@ -93,7 +93,7 @@ SED="sed -i"
     if [ $FOUND -eq 0 ] ; then
       FOUND=0
       ALL_DIRS=""
-      for DIR in $ROOT/`find $PACKAGES -type d -name $_PKG_ROOT_NAME ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      for DIR in `find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME ! -wholename \*\/source\/\* 2>/dev/null` ; do
         # keep track of dirs with meta for debugging
         if [ -z "$ALL_DIRS" ] ; then
           ALL_DIRS="$DIR"

diff --git a/config/version b/config/version
@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.2.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="4.2"

diff --git a/packages/audio/alsa-utils/scripts/soundconfig b/packages/audio/alsa-utils/scripts/soundconfig
@@ -126,8 +126,10 @@ else
 
 # and this for various Fusion devices like Zotac ZBOX
   mixer $card 'Front',0 100% on
+
+# NVidia CK804 sound devices
+  mixer $card 'IEC958 Playback AC97-SPSA' 100%
 fi
 
 exit 0
 )&
-
diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
@@ -36,6 +36,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
                            --without-cxx-binding \
                            --without-ada \
                            --without-progs \
+                           --with-curses-h \
                            --with-shared \
                            --with-normal \
                            --without-debug \

diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.35"
+PKG_VERSION="8.36"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="79acaf6"
+PKG_VERSION="f2275b9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="79acaf6"
+PKG_VERSION="f2275b9"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-ati"
-PKG_VERSION="7.4.0"
+PKG_VERSION="7.5.0"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"

diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk
@@ -16,8 +16,16 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
+# Notes: dont enable tearfree support in later versions, this causes stutter
+# for some people, see
+# http://openelec.tv/forum/120-news-announcements/73013-openelec-4-2-0-released?start=135#118846
+
+# Todo: at least version 2.99.916 causes hangs and stuttering XBMC Gui, this dont
+# happens with 2.99.911, so stick on this for now and figure out which version
+# breaks this.
+
 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.99.916"
+PKG_VERSION="2.99.911"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
@@ -46,10 +54,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \
                            --enable-sna \
                            --enable-uxa \
                            --disable-xvmc \
-                           --enable-glamor \
+                           --disable-glamor \
                            --disable-xaa \
                            --disable-dga \
-                           --enable-tear-free \
+                           --disable-tear-free \
                            --disable-rendernode \
                            --disable-create2 \
                            --disable-rotation \