xbmc (Gotham) update to xbmc-13.alpha-545fc25

packages/mediacenter/xbmc/package.mk

@@ -21,7 +21,7 @@
 PKG_NAME="xbmc"
 PKG_VERSION="12.2-cd71444"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="13.alpha-7f45288"
+  PKG_VERSION="13.alpha-545fc25"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi

packages/mediacenter/xbmc/patches/13.alpha-545fc25/xbmc-AML-XB9295c3f-02-udev-mount-add-cdrom-support.patch

@@ -0,0 +1,17 @@
+diff -Naur xbmc-12.2-5ba69b6/xbmc/storage/linux/UDevProvider.cpp xbmc-12.2-5ba69b6.patch/xbmc/storage/linux/UDevProvider.cpp
+--- xbmc-12.2-5ba69b6/xbmc/storage/linux/UDevProvider.cpp	2013-08-22 21:37:41.543830684 +0200
++++ xbmc-12.2-5ba69b6.patch/xbmc/storage/linux/UDevProvider.cpp	2013-08-22 21:37:34.557825148 +0200
+@@ -145,10 +145,12 @@
+       continue;
+     }
+ 
+-    // look for usb devices on the usb bus or mounted on /media/usbX (sdcards)
++    // look for usb devices on the usb bus, or mounted on /media/usbX (sdcards) or cdroms
+     const char *bus = udev_device_get_property_value(device, "ID_BUS");
++    const char *cdrom = udev_device_get_property_value(device, "ID_CDROM");
+     if (removable  &&
+       ((bus        && strstr(bus, "usb")) ||
++       (cdrom      && strstr(cdrom,"1"))  ||
+        (mountpoint && strstr(mountpoint, "usb"))))
+     {
+       const char *label = udev_device_get_property_value(device, "ID_FS_LABEL");

packages/mediacenter/xbmc/patches/13.alpha-545fc25/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/13.alpha-545fc25/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/mediacenter/xbmc/patches/13.alpha-545fc25/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch

@@ -0,0 +1,39 @@
+From 023acdbbe7b3766e3e1bf509e92d967903aee680 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 31 Aug 2013 18:19:43 +0300
+Subject: [PATCH] use udevil to umount. escape mountpath
+
+---
+ xbmc/linux/PosixMountProvider.cpp   |    2 +-
+ xbmc/storage/linux/UDevProvider.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
+index bbf47fa..2004b44 100644
+--- a/xbmc/linux/PosixMountProvider.cpp
++++ b/xbmc/linux/PosixMountProvider.cpp
+@@ -130,7 +130,7 @@ 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;
++  std::string cmd = "udevil umount \"" + mountpath + "\"";
+   system(cmd.c_str());
+ 
+   return true;
+diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
+index e9c86ab..2f3a5ea 100644
+--- a/xbmc/storage/linux/UDevProvider.cpp
++++ b/xbmc/storage/linux/UDevProvider.cpp
+@@ -183,7 +183,7 @@ bool CUDevProvider::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;
++  std::string cmd = "udevil umount \"" + mountpath + "\"";
+   system(cmd.c_str());
+ 
+   return true;
+-- 
+1.7.2.5
+