From 5de64302a9786b92d932b5bbe0b3136a94fbea9a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 8 Oct 2013 06:11:14 +0200 Subject: [PATCH] xbmc: update to xbmc-12.2-9714e7e Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- ...5c3f-02-udev-mount-add-cdrom-support.patch | 17 ------------- ...-removable-disks-mounted-under-media.patch | 25 ------------------- ...ix_incorrect_usage_of_flag_talled.patch.bk | 0 ...Player-some_caching_fixes_for_pvr.patch.bk | 0 ...HONOPTIMIZE_with_external_Python-0.1.patch | 0 .../xbmc-452-change_lcd_content-0.1.patch | 0 ...bmc-453-add_openelec.tv_RSS_news-0.1.patch | 0 ...-990.00-remove-windowed-display-mode.patch | 0 ...eep-old-repo-content-if-update-fails.patch | 0 .../xbmc-990.29-alsa-LOGDEBUG.patch | 0 ...nd-wait-for-the-first-NIC-to-come-up.patch | 0 ...context-menu-remove-safely-selection.patch | 0 ...e-udevil-to-umount.-escape-mountpath.patch | 0 15 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-02-udev-mount-add-cdrom-support.patch delete mode 100644 packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-452-change_lcd_content-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-453-add_openelec.tv_RSS_news-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-990.00-remove-windowed-display-mode.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-990.26-keep-old-repo-content-if-update-fails.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-990.29-alsa-LOGDEBUG.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-49f61b4 => 12.2-9714e7e}/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index f5e15cf816..2563389d76 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -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 diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 562ab80f18..f9e6eee307 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -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 diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-02-udev-mount-add-cdrom-support.patch b/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-02-udev-mount-add-cdrom-support.patch deleted file mode 100644 index 35dfe80b6d..0000000000 --- a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-02-udev-mount-add-cdrom-support.patch +++ /dev/null @@ -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"); diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch b/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch deleted file mode 100644 index 17619f8ec2..0000000000 --- a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6d64d70a46b8f238d2706017a084f30bd681f291 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -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 - diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.26-keep-old-repo-content-if-update-fails.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.26-keep-old-repo-content-if-update-fails.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.26-keep-old-repo-content-if-update-fails.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.26-keep-old-repo-content-if-update-fails.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.29-alsa-LOGDEBUG.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.29-alsa-LOGDEBUG.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.29-alsa-LOGDEBUG.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.29-alsa-LOGDEBUG.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch b/packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-49f61b4/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch rename to packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch