From 37e2092899c3165fc8e7fea0b13fb39a6e53c5f0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 20 Jan 2012 15:09:36 +0100 Subject: [PATCH] xbmc: update to xbmc-9ddc38a Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...13-reenable_lcd_config_settings-0.1.patch} | 0 ...c-9ddc38a-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...xbmc-9ddc38a-311-fix_rsxs_build-0.1.patch} | 0 ...dc38a-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-9ddc38a-404-add_lame_check-0.6.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-9ddc38a-452-change_lcd_content-0.1.patch} | 0 ...8a-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...c-9ddc38a-454-disable_backslash-0.1.patch} | 0 ...ddc38a-457-fix_connection_check-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...9ddc38a-463-add_remote_devinput-0.1.patch} | 0 ...4-add_eject_keymapping_for_lirc-0.1.patch} | 0 ...patch => xbmc-9ddc38a-801-cec-PR570.patch} | 0 ...d5b4988582b041b97c88903e1d771bdbc33.patch} | 0 ... xbmc-9ddc38a-981-toggleButtonState.patch} | 0 ...hanged-don-t-use-x-parameter-with-df.patch | 55 ------------------- 20 files changed, 2 insertions(+), 57 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-9ddc38a-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-013-reenable_lcd_config_settings-0.1.patch => xbmc-9ddc38a-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-9ddc38a-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-311-fix_rsxs_build-0.1.patch => xbmc-9ddc38a-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-9ddc38a-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-404-add_lame_check-0.6.patch => xbmc-9ddc38a-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-9ddc38a-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-452-change_lcd_content-0.1.patch => xbmc-9ddc38a-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-9ddc38a-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-454-disable_backslash-0.1.patch => xbmc-9ddc38a-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-457-fix_connection_check-0.1.patch => xbmc-9ddc38a-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-9ddc38a-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-463-add_remote_devinput-0.1.patch => xbmc-9ddc38a-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-9ddc38a-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-801-cec-PR570.patch => xbmc-9ddc38a-801-cec-PR570.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch => xbmc-9ddc38a-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-fd08f6d-981-toggleButtonState.patch => xbmc-9ddc38a-981-toggleButtonState.patch} (100%) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-fd08f6d-990-changed-don-t-use-x-parameter-with-df.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 7e2f400f28..2a4de2c2fd 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="fd08f6d" +PKG_VERSION="9ddc38a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 10d04e88f1..83c36e4b2b 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="fd08f6d" +PKG_VERSION="9ddc38a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-801-cec-PR570.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-801-cec-PR570.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-801-cec-PR570.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-801-cec-PR570.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-981-toggleButtonState.patch b/packages/mediacenter/xbmc/patches/xbmc-9ddc38a-981-toggleButtonState.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-fd08f6d-981-toggleButtonState.patch rename to packages/mediacenter/xbmc/patches/xbmc-9ddc38a-981-toggleButtonState.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-990-changed-don-t-use-x-parameter-with-df.patch b/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-990-changed-don-t-use-x-parameter-with-df.patch deleted file mode 100644 index 3ae04e2623..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-fd08f6d-990-changed-don-t-use-x-parameter-with-df.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b368f01a3c2db51272e96941c936c8b170792066 Mon Sep 17 00:00:00 2001 -From: spiff -Date: Sat, 3 Dec 2011 10:47:01 +0100 -Subject: [PATCH] changed: don't use -x parameter with 'df' - -we instead filter the list ourself. the busybox df does not support -x ---- - xbmc/addons/Scraper.cpp | 206 ++++++++++++++--------- - xbmc/interfaces/python/xbmcmodule/listitem.cpp | 34 ++++- - xbmc/linux/PosixMountProvider.cpp | 16 ++- - xbmc/utils/ScraperUrl.h | 19 +++ - 4 files changed, 191 insertions(+), 84 deletions(-) - -diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp -index 4cdfd59..54061a0 100644 -diff --git a/xbmc/interfaces/python/xbmcmodule/listitem.cpp b/xbmc/interfaces/python/xbmcmodule/listitem.cpp -index f116674..ae65f3e 100644 -diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp -index aa3986c..beae9e8 100644 ---- a/xbmc/linux/PosixMountProvider.cpp -+++ b/xbmc/linux/PosixMountProvider.cpp -@@ -101,14 +101,26 @@ std::vector CPosixMountProvider::GetDiskUsage() - #elif defined(__FreeBSD__) - FILE* pipe = popen("df -h -t ufs,cd9660,hfs,udf,zfs", "r"); - #else -- FILE* pipe = popen("df -hx tmpfs", "r"); -+ FILE* pipe = popen("df -h", "r"); - #endif -+ -+ static const char* excludes[] = {"rootfs","devtmpfs","tmpfs","none","/dev/loop", "udev", NULL}; - - if (pipe) - { - while (fgets(line, sizeof(line) - 1, pipe)) - { -- result.push_back(line); -+ bool ok=true; -+ for (int i=0;excludes[i];++i) -+ { -+ if (strstr(line,excludes[i])) -+ { -+ ok=false; -+ break; -+ } -+ } -+ if (ok) -+ result.push_back(line); - } - pclose(pipe); - } -diff --git a/xbmc/utils/ScraperUrl.h b/xbmc/utils/ScraperUrl.h -index abe34e9..8ff35b6 100644 --- -1.7.5.4 -