From a14d80857e6c3937a341ef47997c9d624213c3bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 6 Jun 2012 05:50:12 +0200 Subject: [PATCH] xbmc-rpi: update to xbmc-rpi-a017704 Signed-off-by: Stephan Raue --- .../xbmc-rpi-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- ...rpi-0bcbaa3-990.01-xml-read.patch.disabled | 147 ------------------ ...90.02-disabled_supported_codec_check.patch | 37 ----- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...i-a017704-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...-rpi-a017704-311-fix_rsxs_build-0.1.patch} | 0 ...17704-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-a017704-452-change_lcd_content-0.1.patch} | 0 ...04-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...i-a017704-454-disable_backslash-0.1.patch} | 0 ...017704-457-fix_connection_check-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...a017704-463-add_remote_devinput-0.1.patch} | 0 ...4-add_eject_keymapping_for_lirc-0.1.patch} | 0 ...7704-601-dont_show_unneeded_sysinfo.patch} | 0 ...c-rpi-a017704-981-toggleButtonState.patch} | 0 ...a017704-992.01-ffmpeg_compile_fixes.patch} | 0 19 files changed, 2 insertions(+), 186 deletions(-) delete mode 100644 packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.01-xml-read.patch.disabled delete mode 100644 packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.02-disabled_supported_codec_check.patch rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-rpi-a017704-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-rpi-a017704-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-311-fix_rsxs_build-0.1.patch => xbmc-rpi-a017704-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-rpi-a017704-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-rpi-a017704-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-452-change_lcd_content-0.1.patch => xbmc-rpi-a017704-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-rpi-a017704-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-454-disable_backslash-0.1.patch => xbmc-rpi-a017704-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-457-fix_connection_check-0.1.patch => xbmc-rpi-a017704-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-rpi-a017704-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-463-add_remote_devinput-0.1.patch => xbmc-rpi-a017704-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-rpi-a017704-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-601-dont_show_unneeded_sysinfo.patch => xbmc-rpi-a017704-601-dont_show_unneeded_sysinfo.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-981-toggleButtonState.patch => xbmc-rpi-a017704-981-toggleButtonState.patch} (100%) rename packages/mediacenter/xbmc-rpi/patches/{xbmc-rpi-0bcbaa3-992.01-ffmpeg_compile_fixes.patch => xbmc-rpi-a017704-992.01-ffmpeg_compile_fixes.patch} (100%) diff --git a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta b/packages/mediacenter/xbmc-rpi-theme-Confluence/meta index 88a5b963a6..d2b9f84eee 100644 --- a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-rpi-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-rpi-theme-Confluence" -PKG_VERSION="0bcbaa3" +PKG_VERSION="a017704" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index 9bd9dac0a3..318fd36d23 100644 --- a/packages/mediacenter/xbmc-rpi/meta +++ b/packages/mediacenter/xbmc-rpi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-rpi" -PKG_VERSION="0bcbaa3" +PKG_VERSION="a017704" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.01-xml-read.patch.disabled b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.01-xml-read.patch.disabled deleted file mode 100644 index 204804fc94..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.01-xml-read.patch.disabled +++ /dev/null @@ -1,147 +0,0 @@ -From 44f2703700af1685c8e5fdc71af80923853ee8f1 Mon Sep 17 00:00:00 2001 -From: theuni -Date: Sat, 19 May 2012 22:05:13 -0400 -Subject: [PATCH 1/3] xml: read whole file rather than streaming it - ---- - xbmc/utils/XBMCTinyXML.cpp | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/xbmc/utils/XBMCTinyXML.cpp b/xbmc/utils/XBMCTinyXML.cpp -index 82e2451..4a7374c 100644 ---- a/xbmc/utils/XBMCTinyXML.cpp -+++ b/xbmc/utils/XBMCTinyXML.cpp -@@ -63,8 +63,9 @@ bool CXBMCTinyXML::LoadFile(const CStdString &_filename, TiXmlEncoding encoding) - // Add an extra string to avoid the crash. - CStdString filename(_filename); - value = filename; -- -- XFILE::CFileStream file; -+ XFILE::CFile file; -+ const char *data = NULL; -+ int64_t length = 0, readSize = 0; - if (!file.Open(value)) - { - SetError(TIXML_ERROR_OPENING_FILE, NULL, NULL, TIXML_ENCODING_UNKNOWN); -@@ -74,13 +75,19 @@ bool CXBMCTinyXML::LoadFile(const CStdString &_filename, TiXmlEncoding encoding) - // Delete the existing data: - Clear(); - location.Clear(); -- -- CStdString data; -- data.reserve(8 * 1000); -- StreamIn(&file, &data); -+ length = file.GetLength(); -+ data = new char[file.GetLength()]; -+ readSize = file.Read((void*)data, length); - file.Close(); -+ if (readSize != length || !data) -+ { -+ SetError(TIXML_ERROR_OPENING_FILE, NULL, NULL, TIXML_ENCODING_UNKNOWN); -+ delete [] data; -+ return false; -+ } - - Parse(data, NULL, encoding); -+ delete [] data; - - if (Error()) - return false; --- -1.7.10 - - -From 0a56ce6be121e48547037bce07091ff27adade02 Mon Sep 17 00:00:00 2001 -From: theuni -Date: Mon, 21 May 2012 12:27:47 -0400 -Subject: [PATCH 2/3] xml: fix stupid c/p. Thanks vdrfan - ---- - xbmc/utils/XBMCTinyXML.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/utils/XBMCTinyXML.cpp b/xbmc/utils/XBMCTinyXML.cpp -index 4a7374c..ffc0845 100644 ---- a/xbmc/utils/XBMCTinyXML.cpp -+++ b/xbmc/utils/XBMCTinyXML.cpp -@@ -76,7 +76,7 @@ bool CXBMCTinyXML::LoadFile(const CStdString &_filename, TiXmlEncoding encoding) - Clear(); - location.Clear(); - length = file.GetLength(); -- data = new char[file.GetLength()]; -+ data = new char[length]; - readSize = file.Read((void*)data, length); - file.Close(); - if (readSize != length || !data) --- -1.7.10 - - -From dbaa317480a78c06eb21f72a96800207cec68412 Mon Sep 17 00:00:00 2001 -From: theuni -Date: Mon, 21 May 2012 16:00:53 -0400 -Subject: [PATCH 3/3] xml: fixed corrupt xml after last commit - -Due to non-native line-endings. We need to borrow tinyxml's hack for -normalizing EOLs. ---- - xbmc/utils/XBMCTinyXML.cpp | 24 ++++++++++++++++++++++++ - xbmc/utils/XBMCTinyXML.h | 1 + - 2 files changed, 25 insertions(+) - -diff --git a/xbmc/utils/XBMCTinyXML.cpp b/xbmc/utils/XBMCTinyXML.cpp -index ffc0845..ef3dbf6 100644 ---- a/xbmc/utils/XBMCTinyXML.cpp -+++ b/xbmc/utils/XBMCTinyXML.cpp -@@ -86,6 +86,7 @@ bool CXBMCTinyXML::LoadFile(const CStdString &_filename, TiXmlEncoding encoding) - return false; - } - -+ NormalizeEOL((char*)data, length); - Parse(data, NULL, encoding); - delete [] data; - -@@ -132,6 +133,29 @@ const char *CXBMCTinyXML::Parse(const char *_data, TiXmlParsingData *prevData, T - return Parse(data, prevData, encoding); - } - -+void CXBMCTinyXML::NormalizeEOL(char *data, int64_t length) -+{ -+ //Based on TinyXML's version in TiXmlDocument::LoadFile -+ -+ const char* p = data; -+ char* q = (char*) data; -+ const char CR = 0x0d; -+ const char LF = 0x0a; -+ -+ while( p != data+length) -+ { -+ if ( *p == CR ) -+ { -+ *q++ = LF; -+ p++; -+ if ( *p == LF ) -+ p++; -+ } -+ else -+ *q++ = *p++; -+ } -+} -+ - const char *CXBMCTinyXML::Parse(CStdString &data, TiXmlParsingData *prevData, TiXmlEncoding encoding) - { - // Preprocess string, replacing '&' with '& for invalid XML entities -diff --git a/xbmc/utils/XBMCTinyXML.h b/xbmc/utils/XBMCTinyXML.h -index c6b4fe2..0898be3 100644 ---- a/xbmc/utils/XBMCTinyXML.h -+++ b/xbmc/utils/XBMCTinyXML.h -@@ -66,5 +66,6 @@ class CXBMCTinyXML : public TiXmlDocument - bool SaveFile(const CStdString&) const; - const char *Parse(const char*, TiXmlParsingData *prevData = NULL, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING); - const char *Parse(CStdString&, TiXmlParsingData *prevData = NULL, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING); -+ void NormalizeEOL(char *data, int64_t length); - static bool Test(); - }; --- -1.7.10 - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.02-disabled_supported_codec_check.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.02-disabled_supported_codec_check.patch deleted file mode 100644 index 46417e1972..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-990.02-disabled_supported_codec_check.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 23ce92d80eebf17f22f352045163ceda896682f8 Mon Sep 17 00:00:00 2001 -From: gimli -Date: Sat, 2 Jun 2012 00:18:25 +0200 -Subject: [PATCH] [rbp] disabled supported codec check. doesn't work on the PI - ---- - xbmc/cores/omxplayer/OMXVideo.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index b29859b..7e4c097 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -290,6 +290,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b - } - - OMX_VIDEO_PARAM_PORTFORMATTYPE formatType; -+ /* - OMX_INIT_STRUCTURE(formatType); - formatType.nPortIndex = m_omx_decoder.GetInputPort(); - OMX_U32 nIndex = 1; -@@ -311,10 +312,10 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b - - if(!bFound) - { -- CLog::Log(LOGINFO, "COMXVideo::Open coding : %s supported\n", m_video_codec_name.c_str()); -- printf("COMXVideo::Open coding : %s supported\n", m_video_codec_name.c_str()); -+ CLog::Log(LOGINFO, "COMXVideo::Open coding : %s not supported\n", m_video_codec_name.c_str()); - return false; - } -+ */ - - if(clock == NULL) - return false; --- -1.7.10 - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-601-dont_show_unneeded_sysinfo.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-601-dont_show_unneeded_sysinfo.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-601-dont_show_unneeded_sysinfo.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-601-dont_show_unneeded_sysinfo.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-981-toggleButtonState.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-981-toggleButtonState.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-981-toggleButtonState.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-981-toggleButtonState.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-992.01-ffmpeg_compile_fixes.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-992.01-ffmpeg_compile_fixes.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-992.01-ffmpeg_compile_fixes.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-a017704-992.01-ffmpeg_compile_fixes.patch