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

lockers90 · Nov 9, 2014 · e25a9db · e25a9db
2 parents 95791cb + 9ef4973
commit e25a9db
Show file tree

Hide file tree

Showing 39 changed files with 2,557 additions and 27,817 deletions.
diff --git a/config/options b/config/options
@@ -24,6 +24,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # include versioning
   . config/version
 
+# read distro versioning if available
+ if [ -f "$PROJECT_DIR/version.$DISTRO" ]; then
+   . $PROJECT_DIR/version.$DISTRO
+ fi
+
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options

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.95.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="5.0"

diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk
@@ -17,12 +17,20 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.2.0"
+case "$KODIPLAYER_DRIVER" in
+  libfslvpuwrap)
+    PKG_VERSION="2.1.4"
+    PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz"
+    ;;
+  *)
+    PKG_VERSION="2.2.0"
+    PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
+    ;;
+esac
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd lockdev"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -23,7 +23,7 @@ case "$LINUX" in
     PKG_URL="https://dl.dropboxusercontent.com/u/18902170/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   imx6)
-    PKG_VERSION="cuboxi-3.14-e85332f"
+    PKG_VERSION="cuboxi-3.14-dc5edb8"
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   *)

diff --git a/packages/mediacenter/OpenELEC-settings/package.mk b/packages/mediacenter/OpenELEC-settings/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="OpenELEC-settings"
-PKG_VERSION="0.5.1"
+PKG_VERSION="0.5.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

diff --git a/packages/mediacenter/kodi-audioencoder-lame/package.mk b/packages/mediacenter/kodi-audioencoder-lame/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-lame"
-PKG_VERSION="90fb99b"
+PKG_VERSION="46592f8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/...ages/mediacenter/kodi-audioencoder-lame/patches/kodi-audioencoder-lame-xbmc-rebrand.patch b/...ages/mediacenter/kodi-audioencoder-lame/patches/kodi-audioencoder-lame-xbmc-rebrand.patch
diff --git a/packages/mediacenter/kodi-audioencoder-vorbis/package.mk b/packages/mediacenter/kodi-audioencoder-vorbis/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-vorbis"
-PKG_VERSION="a73ef7e"
+PKG_VERSION="f75f329"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/.../mediacenter/kodi-audioencoder-vorbis/patches/kodi-audioencoder-vorbis-xbmc-rebrand.patch b/.../mediacenter/kodi-audioencoder-vorbis/patches/kodi-audioencoder-vorbis-xbmc-rebrand.patch
diff --git a/packages/mediacenter/kodi-audioencoder-wav/package.mk b/packages/mediacenter/kodi-audioencoder-wav/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-wav"
-PKG_VERSION="b28ab95"
+PKG_VERSION="40aaedf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/mediacenter/kodi-audioencoder-wav/patches/kodi-audioencoder-wav-xbmc-rebrand.patch b/packages/mediacenter/kodi-audioencoder-wav/patches/kodi-audioencoder-wav-xbmc-rebrand.patch
diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="14-ba267af"
+PKG_VERSION="14-d6947be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="14-ba267af"
+PKG_VERSION="14-d6947be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"