Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/lib/libdvbcsa/build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-shared \
+            --enable-static \
+            --with-sysroot=$SYSROOT_PREFIX \
+
+$MAKEINSTALL

packages/3rdparty/lib/libdvbcsa/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
+PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="lib"
+PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/build

@@ -36,5 +36,6 @@ cd $PKG_BUILD
        VDRSRC="../$VDR_DIR" \
        LIBDIR="." \
        LOCALEDIR="./locale" \
+       LIBDVBCSA=1 \
        CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 

packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="vdr openssl"
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,6 @@
+3.1.4
+- vdr-plugin-dvbapi: switch to libdvbcsa
+
 3.1.3
 - rebuild
 

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.1"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch

@@ -0,0 +1,25 @@
+From 6d64d70a46b8f238d2706017a084f30bd681f291 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 31 Aug 2013 13:44:53 +0300
+Subject: [PATCH] show all removable disks  mounted under /media
+
+---
+ xbmc/storage/linux/UDevProvider.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
+index c20facc..c1044c8 100644
+--- a/xbmc/storage/linux/UDevProvider.cpp
++++ b/xbmc/storage/linux/UDevProvider.cpp
+@@ -151,7 +151,7 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable)
+     if (removable  &&
+       ((bus        && strstr(bus, "usb")) ||
+        (cdrom      && strstr(cdrom,"1"))  ||
+-       (mountpoint && strstr(mountpoint, "usb"))))
++       (mountpoint && strstr(mountpoint, "/media/"))))
+     {
+       const char *label = udev_device_get_property_value(device, "ID_FS_LABEL");
+       if (!label)
+-- 
+1.7.2.5
+

packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch

@@ -0,0 +1,66 @@
+From 35400b9a93e5c2c9aa6dc389736af293fc623a5b Mon Sep 17 00:00:00 2001
+From: davilla <davilla@4pi.com>
+Date: Thu, 3 Jan 2013 11:20:22 -0500
+Subject: [PATCH] [aml] fixed context menu 'remove safely' selection
+
+---
+ xbmc/linux/PosixMountProvider.cpp   | 10 ++++++++++
+ xbmc/linux/PosixMountProvider.h     |  2 +-
+ xbmc/storage/linux/UDevProvider.cpp |  7 ++++++-
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
+index 2420491..27d639e 100644
+--- a/xbmc/linux/PosixMountProvider.cpp
++++ b/xbmc/linux/PosixMountProvider.cpp
+@@ -127,6 +127,16 @@ void CPosixMountProvider::GetDrives(VECSOURCES &drives)
+   return result;
+ }
+ 
++bool CPosixMountProvider::Eject(CStdString mountpath)
++{
++  // just go ahead and try to umount the disk
++  // if it does umount, life is good, if not, no loss.
++  std::string cmd = "umount " + mountpath;
++  system(cmd.c_str());
++
++  return true;
++}
++
+ bool CPosixMountProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
+ {
+   VECSOURCES drives;
+diff --git a/xbmc/linux/PosixMountProvider.h b/xbmc/linux/PosixMountProvider.h
+index da0506c..02ff302 100644
+--- a/xbmc/linux/PosixMountProvider.h
++++ b/xbmc/linux/PosixMountProvider.h
+@@ -34,7 +34,7 @@ class CPosixMountProvider : public IStorageProvider
+ 
+   virtual std::vector<CStdString> GetDiskUsage();
+ 
+-  virtual bool Eject(CStdString mountpath) { return false; }
++  virtual bool Eject(CStdString mountpath);
+ 
+   virtual bool PumpDriveChangeEvents(IStorageEventsCallback *callback);
+ private:
+diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
+index 21b6b50..d9e6a4f 100644
+--- a/xbmc/storage/linux/UDevProvider.cpp
++++ b/xbmc/storage/linux/UDevProvider.cpp
+@@ -179,7 +179,12 @@ void CUDevProvider::GetRemovableDrives(VECSOURCES &removableDrives)
+ 
+ bool CUDevProvider::Eject(CStdString mountpath)
+ {
+-  return false;
++  // just go ahead and try to umount the disk
++  // if it does umount, life is good, if not, no loss.
++  std::string cmd = "umount " + mountpath;
++  system(cmd.c_str());
++
++  return true;
+ }
+ 
+ std::vector<CStdString> CUDevProvider::GetDiskUsage()
+-- 
+1.8.4
+

packages/unofficial

@@ -1 +1 @@
-Subproject commit 3f2135d24d9c65513e387156164aef95958e298d
+Subproject commit 91337e2a39c4cd84eaad4b74cf4562aa82e17d7c