xbmc: update to xbmc-12.2-9714e7e

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-10-08 06:11:14 +02:00
parent 7258392bb7
commit 5de64302a9
15 changed files with 2 additions and 44 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-49f61b4"
PKG_VERSION="12.2-9714e7e"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.2-49f61b4"
PKG_VERSION="12.2-9714e7e"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -1,17 +0,0 @@
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");

View File

@ -1,25 +0,0 @@
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