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

TODO

@@ -1,5 +1,2 @@
 ncurses-5.8/5.9:
   - segfaults in nano and dialog -> using ncurses-5.7
-
-bison-2.6:
-  - libaacs-0.4.0 dont compile with bison-2.6

packages/audio/pulseaudio/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="pulseaudio"
 #PKG_VERSION="1.1"
-PKG_VERSION="1.99.1"
+PKG_VERSION="2.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/pulseaudio/patches/pulseaudio-2.0-new-udev.patch

@@ -0,0 +1,75 @@
+From 54718450dfd1e7fc9b5946f62765f7451a854385 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 17 May 2012 20:50:22 +0000
+Subject: udev: Don't use deprecated udev_get_*_path() functions
+
+[These symbols were removed in libudev.so.1.0.0. Replace them with
+hardcoded strings. -- heftig]
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
+index 1192194..31416bd 100644
+--- a/src/modules/module-udev-detect.c
++++ b/src/modules/module-udev-detect.c
+@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
+         goto finish;
+     }
+ 
+-    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
++    t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx);
+     card = udev_device_new_from_syspath(udev, t);
+     pa_xfree(t);
+ 
+@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
+     pa_assert(u);
+     pa_assert(d);
+ 
+-    cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path));
++    cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path));
+     accessible = access(cd, R_OK|W_OK) >= 0;
+     pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
+ 
+@@ -621,7 +621,6 @@ fail:
+ }
+ 
+ static int setup_inotify(struct userdata *u) {
+-    char *dev_snd;
+     int r;
+ 
+     if (u->inotify_fd >= 0)
+@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
+         return -1;
+     }
+ 
+-    dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
+-    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
+-    pa_xfree(dev_snd);
++    r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
+ 
+     if (r < 0) {
+         int saved_errno = errno;
+diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
+index 2f18bc4..b0bb17d 100644
+--- a/src/modules/udev-util.c
++++ b/src/modules/udev-util.c
+@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
+         goto finish;
+     }
+ 
+-    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
++    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
+     card = udev_device_new_from_syspath(udev, t);
+     pa_xfree(t);
+ 
+@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
+         goto finish;
+     }
+ 
+-    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
++    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
+     card = udev_device_new_from_syspath(udev, t);
+     pa_xfree(t);
+ 
+--
+cgit v0.9.0.2-2-gbebe

packages/devel/libcec/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="ab37938"
+PKG_VERSION="1.7.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="systemd lockdev"
 PKG_BUILD_DEPENDS="toolchain systemd lockdev"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc-frodo-theme-Confluence/meta

@@ -22,7 +22,7 @@ PKG_NAME="xbmc-frodo-theme-Confluence"
 if [ "$PVR" = yes ]; then
   PKG_VERSION="pvr-8f0c91b"
 else
-  PKG_VERSION="60b0903"
+  PKG_VERSION="58abd46"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/mediacenter/xbmc-frodo/meta

@@ -22,7 +22,7 @@ PKG_NAME="xbmc-frodo"
 if [ "$PVR" = yes ]; then
   PKG_VERSION="pvr-8f0c91b"
 else
-  PKG_VERSION="60b0903"
+  PKG_VERSION="58abd46"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/multimedia/libaacs/patches/libaacs-0.4.0-bison_2.6.patch

@@ -0,0 +1,30 @@
+diff -Naur libaacs-0.4.0-old/src/file/keydbcfg-parser.y libaacs-0.4.0-new/src/file/keydbcfg-parser.y
+--- libaacs-0.4.0-old/src/file/keydbcfg-parser.y	2012-05-04 04:23:42.000000000 -0700
++++ libaacs-0.4.0-new/src/file/keydbcfg-parser.y	2012-07-21 19:20:14.000000000 -0700
+@@ -1,4 +1,8 @@
+-%{
++%code requires {
++#include "file/keydbcfg.h"
++}
++
++%code {
+ /*
+  * This file is part of libaacs
+  * Copyright (C) 2010  gates
+@@ -18,7 +22,6 @@
+  * <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include "file/keydbcfg.h"
+ #include "util/macro.h"
+ 
+ #include <stdio.h>
+@@ -85,7 +88,7 @@
+ 
+ /* uncomment the line below for debugging */
+ // int yydebug = 1;
+-%}
++}
+ /* Options set to generate a reentrant parser that is POSIX yacc compatible
+  * The basic 'scanner' parameters are set. Also, another parameter is set
+  * to pass in a title entry list struct used to hold all title entries.

packages/toolchain/devel/bison/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bison"
-PKG_VERSION="2.5.1"
+PKG_VERSION="2.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/toolchain/lang/nasm/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nasm"
-PKG_VERSION="2.10.01"
+PKG_VERSION="2.10.02"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/toolchain/math/mpc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mpc"
-PKG_VERSION="0.9"
+PKG_VERSION="1.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/x11/driver/xf86-video-intel/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.20.0"
+PKG_VERSION="2.20.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"