From 829cddcc578eec5af7c7c9196d0f0fcff2491bac Mon Sep 17 00:00:00 2001 From: Gregor Fuis Date: Sun, 16 Sep 2012 15:25:08 +0200 Subject: [PATCH 01/47] xbmc: add patches for XVBA/VDPAU fixes --- ...Requirement_for_forced_deinterlacing.patch | 26 +++++++++++++++ ...o_prevent_from_double_de-interlacing.patch | 32 +++++++++++++++++++ .../xbmc-11.0.2-902.24-xvba_oopsie.patch | 25 +++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.22-videoplayer_fix_calcDropRequirement_for_forced_deinterlacing.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.23-vdpau_fix_AutoInterlaceMethod_to_prevent_from_double_de-interlacing.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.24-xvba_oopsie.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.22-videoplayer_fix_calcDropRequirement_for_forced_deinterlacing.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.22-videoplayer_fix_calcDropRequirement_for_forced_deinterlacing.patch new file mode 100644 index 0000000000..01043f4e81 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.22-videoplayer_fix_calcDropRequirement_for_forced_deinterlacing.patch @@ -0,0 +1,26 @@ +From 66a8245d4e7d02469f03c6a1b3e295dde346645f Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Sat, 15 Sep 2012 17:24:30 +0200 +Subject: [PATCH] videoplayer: fix calcDropRequirement for forced + deinterlacing + +--- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +index db0fb1f..81e0012 100644 +--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp ++++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +@@ -1702,7 +1702,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) + + bNewFrame = iDecoderPts != m_droppingStats.m_lastDecoderPts; + +- if (interlaced) ++ if (interlaced || iSkippedDeint) + iInterval = 2/m_fFrameRate*(double)DVD_TIME_BASE; + else + iInterval = 1/m_fFrameRate*(double)DVD_TIME_BASE; +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.23-vdpau_fix_AutoInterlaceMethod_to_prevent_from_double_de-interlacing.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.23-vdpau_fix_AutoInterlaceMethod_to_prevent_from_double_de-interlacing.patch new file mode 100644 index 0000000000..620eb0a651 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.23-vdpau_fix_AutoInterlaceMethod_to_prevent_from_double_de-interlacing.patch @@ -0,0 +1,32 @@ +From f0bf2b7dff16ac6ee875770b390accf71660a662 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Sun, 16 Sep 2012 08:27:06 +0200 +Subject: [PATCH] vdpau: fix AutoInterlaceMethod to prevent from double + de-interlacing + +--- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +index f25252c..374d75d 100644 +--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp ++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +@@ -3743,14 +3743,7 @@ EINTERLACEMETHOD CLinuxRendererGL::AutoInterlaceMethod() + return VS_INTERLACEMETHOD_NONE; + + if(m_renderMethod & RENDER_VDPAU) +- { +-#ifdef HAVE_LIBVDPAU +- VDPAU::CVdpauRenderPicture *vdpauPic = m_buffers[m_iYV12RenderBuffer].vdpau; +- if(vdpauPic && vdpauPic->vdpau) +- return vdpauPic->vdpau->AutoInterlaceMethod(); +-#endif + return VS_INTERLACEMETHOD_NONE; +- } + + if(Supports(VS_INTERLACEMETHOD_RENDER_BOB)) + return VS_INTERLACEMETHOD_RENDER_BOB; +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.24-xvba_oopsie.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.24-xvba_oopsie.patch new file mode 100644 index 0000000000..9139fd4ddc --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.24-xvba_oopsie.patch @@ -0,0 +1,25 @@ +From a7d40418f3aaf35f5df1de8987ce14afd59fb04f Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Sun, 16 Sep 2012 12:19:27 +0200 +Subject: [PATCH] xvba: oopsie :) + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp +index d4cf6cf..bd7cc3d 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp +@@ -768,6 +768,7 @@ void CDecoder::DestroySession() + XVBA_Destroy_Decode_Buffers_Input bufInput; + bufInput.size = sizeof(bufInput); + bufInput.num_of_buffers_in_list = 1; ++ bufInput.session = m_xvbaConfig.xvbaSession; + + for (unsigned int i=0; i Date: Mon, 17 Sep 2012 20:09:52 +0200 Subject: [PATCH 02/47] xbmc: add patch VDPAU fix upscaling settings --- ...2-902.25-vdpau_fix_upscaling_setting.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.25-vdpau_fix_upscaling_setting.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.25-vdpau_fix_upscaling_setting.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.25-vdpau_fix_upscaling_setting.patch new file mode 100644 index 0000000000..053f8f716f --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.25-vdpau_fix_upscaling_setting.patch @@ -0,0 +1,48 @@ +From c01c0fa9c84f50191e0fffd95527ae2b400e021c Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Sun, 16 Sep 2012 18:38:01 +0200 +Subject: [PATCH] vdpau: fix upscaling setting + +--- + xbmc/settings/AdvancedSettings.cpp | 4 ++-- + xbmc/settings/AdvancedSettings.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index 61ccf85..3556b7d 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -98,7 +98,7 @@ void CAdvancedSettings::Initialize() + m_videoIgnoreSecondsAtStart = 3*60; + m_videoIgnorePercentAtEnd = 8.0f; + m_videoPlayCountMinimumPercent = 90.0f; +- m_videoVDPAUScaling = false; ++ m_videoVDPAUScaling = -1; + m_videoNonLinStretchRatio = 0.5f; + m_videoEnableHighQualityHwScalers = false; + m_videoAutoScaleMaxFps = 30.0f; +@@ -492,7 +492,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) + XMLUtils::GetString(pElement,"cleandatetime", m_videoCleanDateTimeRegExp); + XMLUtils::GetString(pElement,"ppffmpegdeinterlacing",m_videoPPFFmpegDeint); + XMLUtils::GetString(pElement,"ppffmpegpostprocessing",m_videoPPFFmpegPostProc); +- XMLUtils::GetBoolean(pElement,"vdpauscaling",m_videoVDPAUScaling); ++ XMLUtils::GetInt(pElement,"vdpauscaling",m_videoVDPAUScaling); + XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); + XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); + XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index b3a54ff..f50151a 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -152,7 +152,7 @@ class CAdvancedSettings + CStdString m_audioHost; + bool m_audioApplyDrc; + +- bool m_videoVDPAUScaling; ++ int m_videoVDPAUScaling; + float m_videoNonLinStretchRatio; + bool m_videoEnableHighQualityHwScalers; + float m_videoAutoScaleMaxFps; +-- +1.7.10 + From 465c27ffec4259cfbea51e1855ce1e5de0a4046e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:45:53 +0200 Subject: [PATCH 03/47] linux: update to linux-3.2.29 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- ...0_crosscompile.patch => linux-3.2.29-000_crosscompile.patch} | 0 ..._dev_console.patch => linux-3.2.29-003-no_dev_console.patch} | 0 ...atch => linux-3.2.29-004_lower_undefined_mode_timeout.patch} | 0 ...006_enable_utf8.patch => linux-3.2.29-006_enable_utf8.patch} | 0 ...e_floppy_die.patch => linux-3.2.29-007_die_floppy_die.patch} | 0 ... => linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch} | 0 ...0.1.patch => linux-3.2.29-052-aureal_remote_quirk-0.1.patch} | 0 ...e-0.1.patch => linux-3.2.29-053-spinelplus-remote-0.1.patch} | 0 ...voton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} | 0 ...Formosa-IR606.patch => linux-3.2.29-056-Formosa-IR606.patch} | 0 ...-media-ati_remote-allow-specifying-a-default-keymap-s.patch} | 0 ...-media-ati_remote-add-support-for-Medion-X10-Digitain.patch} | 0 ...-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch} | 0 ...-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch} | 0 ...patch => linux-3.2.29-071-silence_i915_agp-module-0.1.patch} | 0 ...drm_cea_modes.patch => linux-3.2.29-081-drm_cea_modes.patch} | 0 ....patch => linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch} | 0 ...0.1.patch => linux-3.2.29-202-add_HVR930C_support-0.1.patch} | 0 ...ch => linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch} | 0 ... linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch} | 0 ..._support.patch => linux-3.2.29-210-add_DVBSky_support.patch} | 0 ...port.patch => linux-3.2.29-211-add_TeVii_s471_support.patch} | 0 ....patch => linux-3.2.29-212-mantis_stb0899_faster_lock.patch} | 0 ...s2_usb_r2.patch => linux-3.2.29-213-cinergy_s2_usb_r2.patch} | 0 ...4-hdtv-hvr930c.patch => linux-3.2.29-214-hdtv-hvr930c.patch} | 0 ....0_support.patch => linux-3.2.29-251-acpi-5.0_support.patch} | 0 ...e33263e.patch => linux-3.2.29-601-RPi_support-e33263e.patch} | 0 ..._bluetooth.patch => linux-3.2.29-901_broken_bluetooth.patch} | 0 ...920_add_rtl8168.patch => linux-3.2.29-920_add_rtl8168.patch} | 0 ...ux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch} | 0 ...-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch} | 0 32 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{linux-3.2.28-000_crosscompile.patch => linux-3.2.29-000_crosscompile.patch} (100%) rename packages/linux/patches/{linux-3.2.28-003-no_dev_console.patch => linux-3.2.29-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-3.2.28-004_lower_undefined_mode_timeout.patch => linux-3.2.29-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-3.2.28-006_enable_utf8.patch => linux-3.2.29-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-3.2.28-007_die_floppy_die.patch => linux-3.2.29-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-3.2.28-009_disable_i8042_check_on_apple_mac.patch => linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-3.2.28-052-aureal_remote_quirk-0.1.patch => linux-3.2.29-052-aureal_remote_quirk-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.28-053-spinelplus-remote-0.1.patch => linux-3.2.29-053-spinelplus-remote-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.28-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch => linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} (100%) rename packages/linux/patches/{linux-3.2.28-056-Formosa-IR606.patch => linux-3.2.29-056-Formosa-IR606.patch} (100%) rename packages/linux/patches/{linux-3.2.28-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch => linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch} (100%) rename packages/linux/patches/{linux-3.2.28-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch => linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch} (100%) rename packages/linux/patches/{linux-3.2.28-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch => linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch} (100%) rename packages/linux/patches/{linux-3.2.28-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch => linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch} (100%) rename packages/linux/patches/{linux-3.2.28-071-silence_i915_agp-module-0.1.patch => linux-3.2.29-071-silence_i915_agp-module-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.28-081-drm_cea_modes.patch => linux-3.2.29-081-drm_cea_modes.patch} (100%) rename packages/linux/patches/{linux-3.2.28-201-add_Anysee_T2C_support-0.1.patch => linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.28-202-add_HVR930C_support-0.1.patch => linux-3.2.29-202-add_HVR930C_support-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.28-203-stb0899_enable_low_symbol_rate.patch => linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch} (100%) rename packages/linux/patches/{linux-3.2.28-204-add_Formosa_eHome_Infrared_Receiver.patch => linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch} (100%) rename packages/linux/patches/{linux-3.2.28-210-add_DVBSky_support.patch => linux-3.2.29-210-add_DVBSky_support.patch} (100%) rename packages/linux/patches/{linux-3.2.28-211-add_TeVii_s471_support.patch => linux-3.2.29-211-add_TeVii_s471_support.patch} (100%) rename packages/linux/patches/{linux-3.2.28-212-mantis_stb0899_faster_lock.patch => linux-3.2.29-212-mantis_stb0899_faster_lock.patch} (100%) rename packages/linux/patches/{linux-3.2.28-213-cinergy_s2_usb_r2.patch => linux-3.2.29-213-cinergy_s2_usb_r2.patch} (100%) rename packages/linux/patches/{linux-3.2.28-214-hdtv-hvr930c.patch => linux-3.2.29-214-hdtv-hvr930c.patch} (100%) rename packages/linux/patches/{linux-3.2.28-251-acpi-5.0_support.patch => linux-3.2.29-251-acpi-5.0_support.patch} (100%) rename packages/linux/patches/{linux-3.2.28-601-RPi_support-e33263e.patch => linux-3.2.29-601-RPi_support-e33263e.patch} (100%) rename packages/linux/patches/{linux-3.2.28-901_broken_bluetooth.patch => linux-3.2.29-901_broken_bluetooth.patch} (100%) rename packages/linux/patches/{linux-3.2.28-920_add_rtl8168.patch => linux-3.2.29-920_add_rtl8168.patch} (100%) rename packages/linux/patches/{linux-3.2.28-990-xc5000_add_support_for_get_if_frequency.patch => linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch} (100%) rename packages/linux/patches/{linux-3.2.28-999-fix-iMon-Knob-event-interpretation-issues.patch => linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch} (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 205b8f2515..1a8ae5e028 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.2.28" +PKG_VERSION="3.2.29" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.2.28-000_crosscompile.patch b/packages/linux/patches/linux-3.2.29-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-000_crosscompile.patch rename to packages/linux/patches/linux-3.2.29-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.2.28-003-no_dev_console.patch b/packages/linux/patches/linux-3.2.29-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-003-no_dev_console.patch rename to packages/linux/patches/linux-3.2.29-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.2.28-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.2.29-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.2.29-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.2.28-006_enable_utf8.patch b/packages/linux/patches/linux-3.2.29-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-006_enable_utf8.patch rename to packages/linux/patches/linux-3.2.29-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.2.28-007_die_floppy_die.patch b/packages/linux/patches/linux-3.2.29-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.2.29-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.2.28-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.2.28-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.2.29-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.2.29-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.2.28-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.2.29-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.2.29-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.2.28-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.2.28-056-Formosa-IR606.patch b/packages/linux/patches/linux-3.2.29-056-Formosa-IR606.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-056-Formosa-IR606.patch rename to packages/linux/patches/linux-3.2.29-056-Formosa-IR606.patch diff --git a/packages/linux/patches/linux-3.2.28-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch b/packages/linux/patches/linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch rename to packages/linux/patches/linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch diff --git a/packages/linux/patches/linux-3.2.28-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch b/packages/linux/patches/linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch rename to packages/linux/patches/linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch diff --git a/packages/linux/patches/linux-3.2.28-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch b/packages/linux/patches/linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch rename to packages/linux/patches/linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch diff --git a/packages/linux/patches/linux-3.2.28-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch b/packages/linux/patches/linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch rename to packages/linux/patches/linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch diff --git a/packages/linux/patches/linux-3.2.28-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.2.29-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.2.29-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.2.28-081-drm_cea_modes.patch b/packages/linux/patches/linux-3.2.29-081-drm_cea_modes.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-081-drm_cea_modes.patch rename to packages/linux/patches/linux-3.2.29-081-drm_cea_modes.patch diff --git a/packages/linux/patches/linux-3.2.28-201-add_Anysee_T2C_support-0.1.patch b/packages/linux/patches/linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-201-add_Anysee_T2C_support-0.1.patch rename to packages/linux/patches/linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.28-202-add_HVR930C_support-0.1.patch b/packages/linux/patches/linux-3.2.29-202-add_HVR930C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-202-add_HVR930C_support-0.1.patch rename to packages/linux/patches/linux-3.2.29-202-add_HVR930C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.28-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.2.28-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.2.28-210-add_DVBSky_support.patch b/packages/linux/patches/linux-3.2.29-210-add_DVBSky_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-210-add_DVBSky_support.patch rename to packages/linux/patches/linux-3.2.29-210-add_DVBSky_support.patch diff --git a/packages/linux/patches/linux-3.2.28-211-add_TeVii_s471_support.patch b/packages/linux/patches/linux-3.2.29-211-add_TeVii_s471_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-211-add_TeVii_s471_support.patch rename to packages/linux/patches/linux-3.2.29-211-add_TeVii_s471_support.patch diff --git a/packages/linux/patches/linux-3.2.28-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.2.29-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/linux-3.2.29-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/linux-3.2.28-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/linux-3.2.29-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/linux-3.2.29-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch b/packages/linux/patches/linux-3.2.29-214-hdtv-hvr930c.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch rename to packages/linux/patches/linux-3.2.29-214-hdtv-hvr930c.patch diff --git a/packages/linux/patches/linux-3.2.28-251-acpi-5.0_support.patch b/packages/linux/patches/linux-3.2.29-251-acpi-5.0_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-251-acpi-5.0_support.patch rename to packages/linux/patches/linux-3.2.29-251-acpi-5.0_support.patch diff --git a/packages/linux/patches/linux-3.2.28-601-RPi_support-e33263e.patch b/packages/linux/patches/linux-3.2.29-601-RPi_support-e33263e.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-601-RPi_support-e33263e.patch rename to packages/linux/patches/linux-3.2.29-601-RPi_support-e33263e.patch diff --git a/packages/linux/patches/linux-3.2.28-901_broken_bluetooth.patch b/packages/linux/patches/linux-3.2.29-901_broken_bluetooth.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-901_broken_bluetooth.patch rename to packages/linux/patches/linux-3.2.29-901_broken_bluetooth.patch diff --git a/packages/linux/patches/linux-3.2.28-920_add_rtl8168.patch b/packages/linux/patches/linux-3.2.29-920_add_rtl8168.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-920_add_rtl8168.patch rename to packages/linux/patches/linux-3.2.29-920_add_rtl8168.patch diff --git a/packages/linux/patches/linux-3.2.28-990-xc5000_add_support_for_get_if_frequency.patch b/packages/linux/patches/linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-990-xc5000_add_support_for_get_if_frequency.patch rename to packages/linux/patches/linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch diff --git a/packages/linux/patches/linux-3.2.28-999-fix-iMon-Knob-event-interpretation-issues.patch b/packages/linux/patches/linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch similarity index 100% rename from packages/linux/patches/linux-3.2.28-999-fix-iMon-Knob-event-interpretation-issues.patch rename to packages/linux/patches/linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch From e1eb2a2399899686fa68051e08d6cf9c8fff2086 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:46:50 +0200 Subject: [PATCH 04/47] libxml2: update to libxml2-2.9.0 Signed-off-by: Stephan Raue --- packages/textproc/libxml2/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/textproc/libxml2/meta b/packages/textproc/libxml2/meta index c9de9c632c..c3b03c2400 100644 --- a/packages/textproc/libxml2/meta +++ b/packages/textproc/libxml2/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libxml2" -PKG_VERSION="2.8.0" +PKG_VERSION="2.9.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" From 1457bb1f59c2328b83863338a574e00168fa3b0c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:47:08 +0200 Subject: [PATCH 05/47] kmod: update to kmod-10 Signed-off-by: Stephan Raue --- packages/sysutils/kmod/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/kmod/meta b/packages/sysutils/kmod/meta index c20b643a29..7e64f66b0b 100644 --- a/packages/sysutils/kmod/meta +++ b/packages/sysutils/kmod/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="kmod" -PKG_VERSION="9" +PKG_VERSION="10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From e42b18e899eab72ebe9c6046c703370794c7b507 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:47:33 +0200 Subject: [PATCH 06/47] libvdpau: update to libvdpau-0.5 Signed-off-by: Stephan Raue --- packages/multimedia/libvdpau/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libvdpau/meta b/packages/multimedia/libvdpau/meta index 6197e5da2f..a9c3707c21 100644 --- a/packages/multimedia/libvdpau/meta +++ b/packages/multimedia/libvdpau/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libvdpau" -PKG_VERSION="0.4.1" +PKG_VERSION="0.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 1c961da0c769309ac56a750643fd3610968b1a38 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:48:05 +0200 Subject: [PATCH 07/47] sqlite: update to sqlite-autoconf-3071400 Signed-off-by: Stephan Raue --- packages/databases/sqlite/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta index 16451186c1..37c82b2aee 100644 --- a/packages/databases/sqlite/meta +++ b/packages/databases/sqlite/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="sqlite" -PKG_VERSION="autoconf-3071300" +PKG_VERSION="autoconf-3071400" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="PublicDomain" From e6370ae7fae8b65760b0b5ac0877132e0df4d2d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:51:25 +0200 Subject: [PATCH 08/47] mpc: update to mpc-1.0.1 Signed-off-by: Stephan Raue --- packages/toolchain/math/mpc/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/math/mpc/meta b/packages/toolchain/math/mpc/meta index a54066f952..c7cc50d830 100644 --- a/packages/toolchain/math/mpc/meta +++ b/packages/toolchain/math/mpc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="mpc" -PKG_VERSION="1.0" +PKG_VERSION="1.0.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" From b5d85fdf17ceedec1971b738c88ae1ee295dcdf9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:51:42 +0200 Subject: [PATCH 09/47] nasm: update to nasm-2.10.05 Signed-off-by: Stephan Raue --- packages/toolchain/lang/nasm/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/lang/nasm/meta b/packages/toolchain/lang/nasm/meta index 835e360507..b87064677b 100644 --- a/packages/toolchain/lang/nasm/meta +++ b/packages/toolchain/lang/nasm/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="nasm" -PKG_VERSION="2.10.04" +PKG_VERSION="2.10.05" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 82be1bdd1620c21c1c445107e15d196422100f06 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:52:13 +0200 Subject: [PATCH 10/47] pkg-config: update to pkg-config-0.27.1 Signed-off-by: Stephan Raue --- packages/toolchain/devel/pkg-config/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/pkg-config/meta b/packages/toolchain/devel/pkg-config/meta index 41816d8ddd..433164a413 100644 --- a/packages/toolchain/devel/pkg-config/meta +++ b/packages/toolchain/devel/pkg-config/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="pkg-config" -PKG_VERSION="0.27" +PKG_VERSION="0.27.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From ad079b8a17e9b3b10db5e4bc32294f8f91d2c88a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:53:16 +0200 Subject: [PATCH 11/47] autoconf-archive: update to autoconf-archive-2012.09.08 Signed-off-by: Stephan Raue --- packages/toolchain/devel/autotools/autoconf-archive/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/autotools/autoconf-archive/meta b/packages/toolchain/devel/autotools/autoconf-archive/meta index 79d3e0529b..b52e73aaca 100644 --- a/packages/toolchain/devel/autotools/autoconf-archive/meta +++ b/packages/toolchain/devel/autotools/autoconf-archive/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="autoconf-archive" -PKG_VERSION="2012.04.07" +PKG_VERSION="2012.09.08" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From c3c91c9f8328f3620ab95420597efba9b19da166 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:54:20 +0200 Subject: [PATCH 12/47] xf86-video-intel: update to xf86-video-intel-2.20.8 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 13b8aa9603..9db5c797ff 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.20.6" +PKG_VERSION="2.20.8" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 742ad7a0287c9d96aba7d3b1d28f63c11c6b1f35 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 21:56:52 +0200 Subject: [PATCH 13/47] mpfr: update upstream patches Signed-off-by: Stephan Raue --- .../mpfr-3.1.1-allpatches_20120830.patch | 405 ++++++++++++++++++ 1 file changed, 405 insertions(+) create mode 100644 packages/toolchain/math/mpfr/patches/mpfr-3.1.1-allpatches_20120830.patch diff --git a/packages/toolchain/math/mpfr/patches/mpfr-3.1.1-allpatches_20120830.patch b/packages/toolchain/math/mpfr/patches/mpfr-3.1.1-allpatches_20120830.patch new file mode 100644 index 0000000000..43dfcbfe32 --- /dev/null +++ b/packages/toolchain/math/mpfr/patches/mpfr-3.1.1-allpatches_20120830.patch @@ -0,0 +1,405 @@ +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 +@@ -0,0 +1 @@ ++get_decimal64 +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 +@@ -1 +1 @@ +-3.1.1 ++3.1.1-p1 +diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c +--- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -32,6 +32,10 @@ + + #ifdef MPFR_WANT_DECIMAL_FLOATS + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + #ifdef DPD_FORMAT + static int T[1000] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, +@@ -142,26 +146,14 @@ + static _Decimal64 + get_decimal64_min (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 0; +- x.s.manh = 0; +- x.s.manl = 1; +- return x.d; ++ return negative ? - 1E-398dd : 1E-398dd; + } + + /* construct the decimal64 largest finite number with given sign */ + static _Decimal64 + get_decimal64_max (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 1919; +- x.s.manh = 1048575; /* 2^20-1 */ +- x.s.manl = ~0; +- return x.d; ++ return negative ? - DEC64_MAX : DEC64_MAX; + } + + /* one-to-one conversion: +@@ -334,7 +326,8 @@ + /* the largest decimal64 number is just below 10^(385) < 2^1279 */ + else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +@@ -354,6 +347,15 @@ + which corresponds to s=[0.]1000...000 and e=-397 */ + if (e < -397) + { ++ if (rnd_mode == MPFR_RNDN && e == -398) ++ { ++ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), ++ src should round to +/- 1E-398 in MPFR_RNDN. */ ++ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); ++ return e == -398 && s[negative] <= '5' ? ++ get_decimal64_zero (negative) : ++ get_decimal64_min (negative); ++ } + if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN + || (rnd_mode == MPFR_RNDD && negative == 0) + || (rnd_mode == MPFR_RNDU && negative != 0)) +@@ -379,7 +381,8 @@ + which corresponds to s=[0.]9999...999 and e=385 */ + else if (e > 385) + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1" ++#define MPFR_VERSION_STRING "3.1.1-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1"; ++ return "3.1.1-p1"; + } +diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c +--- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,6 +25,10 @@ + #include /* for exit */ + #include "mpfr-test.h" + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + /* #define DEBUG */ + + static void +@@ -149,6 +153,15 @@ + mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); + mpfr_set (y, x, MPFR_RNDZ); + d = mpfr_get_decimal64 (x, MPFR_RNDU); ++ ASSERT_ALWAYS (d == DEC64_MAX); ++ mpfr_set_ui (x, 0, MPFR_RNDZ); ++ mpfr_set_decimal64 (x, d, MPFR_RNDZ); ++ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); ++ ++ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); ++ mpfr_set (y, x, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDA); ++ ASSERT_ALWAYS (d == -DEC64_MAX); + mpfr_set_ui (x, 0, MPFR_RNDZ); + mpfr_set_decimal64 (x, d, MPFR_RNDZ); + ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); +@@ -225,6 +238,83 @@ + mpfr_clear (x); + } + ++static void ++check_overflow (void) ++{ ++ mpfr_t x; ++ int err = 0, neg, rnd; ++ ++ mpfr_init2 (x, 96); ++ for (neg = 0; neg < 2; neg++) ++ RND_LOOP (rnd) ++ { ++ _Decimal64 d, e; ++ mpfr_rnd_t r = (mpfr_rnd_t) rnd; ++ int sign = neg ? -1 : 1; ++ ++ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; ++ /* This tests the binary exponent e > 1279 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 1 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the decimal exponent e > 385 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 2 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ ++ mpfr_set_decimal64 (x, e, MPFR_RNDA); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 3 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ } ++ mpfr_clear (x); ++ if (err) ++ exit (1); ++} ++ ++static void ++check_tiny (void) ++{ ++ mpfr_t x; ++ _Decimal64 d; ++ ++ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round ++ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between ++ 0 and 1E-398 is not a representable binary number, so that there ++ are no tests for it. */ ++ mpfr_init2 (x, 128); ++ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_clear (x); ++} ++ + int + main (void) + { +@@ -241,6 +331,8 @@ + check_inf_nan (); + check_random (); + check_native (); ++ check_overflow (); ++ check_tiny (); + + tests_end_mpfr (); + return 0; +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 +@@ -0,0 +1 @@ ++strtofr-ternary-value +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 +@@ -1 +1 @@ +-3.1.1-p1 ++3.1.1-p2 +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1-p1" ++#define MPFR_VERSION_STRING "3.1.1-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c +--- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 ++++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -667,6 +667,20 @@ + /* (z, exp_z) = base^(exp_base-pstr_size) */ + z = result + 2*ysize + 1; + err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); ++ /* Since we want y/z rounded toward zero, we must get an upper ++ bound of z. If err >= 0, the error on z is bounded by 2^err. */ ++ if (err >= 0) ++ { ++ mp_limb_t cy; ++ unsigned long h = err / GMP_NUMB_BITS; ++ unsigned long l = err - h * GMP_NUMB_BITS; ++ ++ if (h >= ysize) /* not enough precision in z */ ++ goto next_loop; ++ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); ++ if (cy != 0) /* the code below requires z on ysize limbs */ ++ goto next_loop; ++ } + exact = exact && (err == -1); + if (err == -2) + goto underflow; /* FIXME: Sure? */ +@@ -730,6 +744,7 @@ + MPFR_RNDN, rnd, MPFR_PREC(x))) + break; + ++ next_loop: + /* update the prec for next loop */ + MPFR_ZIV_NEXT (loop, prec); + } /* loop */ +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1-p1"; ++ return "3.1.1-p2"; + } +diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c +--- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -1105,6 +1105,92 @@ + mpfr_clear (y); + } + ++/* From a bug reported by Joseph S. Myers ++ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ ++static void ++bug20120814 (void) ++{ ++ mpfr_exp_t emin = -30, e; ++ mpfr_t x, y; ++ int r; ++ char s[64], *p; ++ ++ mpfr_init2 (x, 2); ++ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); ++ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); ++ s[0] = s[1]; ++ s[1] = '.'; ++ for (p = s; *p != 0; p++) ; ++ *p = 'e'; ++ sprintf (p + 1, "%d", (int) e - 1); ++ ++ mpfr_init2 (y, 4); ++ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); ++ if (r <= 0 || ! mpfr_equal_p (x, y)) ++ { ++ printf ("Error in bug20120814\n"); ++ printf ("mpfr_strtofr failed on string \"%s\"\n", s); ++ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); ++ printf ("Got inex = %-6d and y = ", r); ++ mpfr_dump (y); ++ exit (1); ++ } ++ ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ ++static void ++bug20120829 (void) ++{ ++ mpfr_t x1, x2, e; ++ int inex1, inex2, i, r; ++ char s[48] = "1e-1"; ++ ++ mpfr_init2 (e, 128); ++ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); ++ ++ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ ++ for (i = 1; i <= sizeof(s) - 5; i++) ++ { ++ s[3+i] = '0'; ++ s[4+i] = 0; ++ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ RND_LOOP(r) ++ { ++ mpfr_rnd_t rnd = (mpfr_rnd_t) r; ++ ++ inex1 = mpfr_exp10 (x1, e, rnd); ++ inex1 = SIGN (inex1); ++ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); ++ inex2 = SIGN (inex2); ++ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: ++ strtofr.c:...: MPFR assertion failed: cy == 0 ++ r8396 is OK. ++ On 64-bit machines, for i = 15, ++ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) ++ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize ++ r8394 and r8396 are OK. ++ */ ++ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) ++ { ++ printf ("Error in bug20120829 for i = %d, rnd = %s\n", ++ i, mpfr_print_rnd_mode (rnd)); ++ printf ("Expected inex = %d, x = ", inex1); ++ mpfr_dump (x1); ++ printf ("Got inex = %d, x = ", inex2); ++ mpfr_dump (x2); ++ exit (1); ++ } ++ } ++ } ++ ++ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -1117,6 +1203,8 @@ + check_retval (); + bug20081028 (); + test20100310 (); ++ bug20120814 (); ++ bug20120829 (); + + tests_end_mpfr (); + return 0; From 6ab31beee1d4dc59f8813ca90b23e3f86fb67db6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 22:52:59 +0200 Subject: [PATCH 14/47] util-linux: update to util-linux-2.22 Signed-off-by: Stephan Raue --- packages/sysutils/util-linux/build | 34 +++++++++++++--------------- packages/sysutils/util-linux/install | 16 +++++++------ packages/sysutils/util-linux/meta | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build index fefe3def0e..5a96a5d676 100755 --- a/packages/sysutils/util-linux/build +++ b/packages/sysutils/util-linux/build @@ -23,8 +23,6 @@ . config/options $1 cd $PKG_BUILD -#scanf_cv_type_modifier=ms \ -#gt_cv_func_gnugettext1_libintl=no \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -40,8 +38,8 @@ cd $PKG_BUILD --enable-libuuid \ --enable-libblkid \ --enable-libmount \ + --disable-deprecated-mount \ --disable-mount \ - --disable-libmount-mount \ --enable-fsck \ --disable-partx \ --enable-uuidd \ @@ -50,6 +48,7 @@ cd $PKG_BUILD --disable-unshare \ --disable-arch \ --disable-ddate \ + --disable-eject \ --disable-agetty \ --disable-cramfs \ --disable-switch-root \ @@ -57,18 +56,26 @@ cd $PKG_BUILD --disable-elvtune \ --disable-kill \ --disable-last \ + --disable-utmpdump \ --disable-line \ --disable-mesg \ --disable-raw \ --disable-rename \ --disable-reset \ - --disable-login-utils \ + --disable-vipw \ + --disable-newgrp \ + --disable-chfn-chsh \ + --enable-chsh-only-listed \ + --disable-login \ + --disable-login-chown-vcs \ + --disable-login-stat-mail \ + --disable-sulogin \ + --disable-su \ --disable-schedutils \ --disable-wall \ --disable-write \ - --enable-chsh-only-listed \ - --disable-login-chown-vcs \ - --disable-login-stat-mail \ + --disable-chkdupexe \ + --disable-socket-activation \ --disable-pg-bell \ --disable-require-password \ --disable-use-tty-group \ @@ -80,19 +87,10 @@ cd $PKG_BUILD --without-udev \ --without-ncurses \ --without-slang \ - --without-utempter + --without-utempter \ + --without-systemdsystemunitdir make $MAKEINSTALL -#make -C fsck fsck -#make -C mount swapon -#make -C misc-utils blkid -#make -C sys-utils fstrim -#make -C libuuid -#make -C libblkid - -# libuuid must be installed before libblkid!!! -# $MAKEINSTALL -C libuuid -# $MAKEINSTALL -C libblkid diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install index 02600174f0..7167fa7607 100755 --- a/packages/sysutils/util-linux/install +++ b/packages/sysutils/util-linux/install @@ -23,20 +23,22 @@ . config/options $1 mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin - cp $PKG_BUILD/sys-utils/fstrim $INSTALL/usr/bin - cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/usr/bin + cp $PKG_BUILD/fstrim $INSTALL/usr/bin + cp $PKG_BUILD/.libs/blkid $INSTALL/usr/bin + cp $PKG_BUILD/.libs/fsck $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/libblkid/src/.libs/libblkid.so* $INSTALL/usr/lib + cp -PR $PKG_BUILD/.libs/libblkid.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libblkid.so*T - cp -PR $PKG_BUILD/libuuid/src/.libs/libuuid.so* $INSTALL/usr/lib + cp -PR $PKG_BUILD/.libs/libmount.so* $INSTALL/usr/lib + rm -rf $INSTALL/usr/lib/libmount.so*T + cp -PR $PKG_BUILD/.libs/libuuid.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libuuid.so*T if [ "$SWAP_SUPPORT" = "yes" ]; then mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin - ln -sf swapon $INSTALL/usr/bin/swapoff + cp $PKG_BUILD/.libs/swapon $INSTALL/usr/bin + cp $PKG_BUILD/.libs/swapoff $INSTALL/usr/bin mkdir -p $INSTALL/etc/init.d cp $PKG_DIR/scripts/32_swapfile $INSTALL/etc/init.d diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta index 8975f10b40..4f22032992 100644 --- a/packages/sysutils/util-linux/meta +++ b/packages/sysutils/util-linux/meta @@ -19,11 +19,11 @@ ################################################################################ PKG_NAME="util-linux" -PKG_VERSION="2.21.2" +PKG_VERSION="2.22" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.21/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.22/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" From fe8aba367eb55a6b113d50dc1d089afabf178c02 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 22:54:59 +0200 Subject: [PATCH 15/47] alsa-lib: update to alsa-lib-1.0.26 Signed-off-by: Stephan Raue --- packages/audio/alsa-lib/meta | 2 +- ...ir.patch => alsa-lib-1.0.26-001-asound.conf_configdir.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/audio/alsa-lib/patches/{alsa-lib-1.0.25-001-asound.conf_configdir.patch => alsa-lib-1.0.26-001-asound.conf_configdir.patch} (100%) diff --git a/packages/audio/alsa-lib/meta b/packages/audio/alsa-lib/meta index 3aa3d4890d..4b71f3839a 100644 --- a/packages/audio/alsa-lib/meta +++ b/packages/audio/alsa-lib/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-lib" -PKG_VERSION="1.0.25" +PKG_VERSION="1.0.26" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch b/packages/audio/alsa-lib/patches/alsa-lib-1.0.26-001-asound.conf_configdir.patch similarity index 100% rename from packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch rename to packages/audio/alsa-lib/patches/alsa-lib-1.0.26-001-asound.conf_configdir.patch From 59bf06b6ac646434be937597d15c8d0e1e2846cd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 22:55:13 +0200 Subject: [PATCH 16/47] alsa-utils: update to alsa-utils-1.0.26 Signed-off-by: Stephan Raue --- packages/audio/alsa-utils/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa-utils/meta b/packages/audio/alsa-utils/meta index a9f783ae65..6e199e33d5 100644 --- a/packages/audio/alsa-utils/meta +++ b/packages/audio/alsa-utils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-utils" -PKG_VERSION="1.0.25" +PKG_VERSION="1.0.26" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 5c8a9beaa6c7a47ca2416dfdd713b06771061f95 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Sep 2012 22:55:27 +0200 Subject: [PATCH 17/47] alsa-plugins: update to alsa-plugins-1.0.26 Signed-off-by: Stephan Raue --- packages/audio/alsa-plugins/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa-plugins/meta b/packages/audio/alsa-plugins/meta index 6773f89f74..abcbcfcf56 100644 --- a/packages/audio/alsa-plugins/meta +++ b/packages/audio/alsa-plugins/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-plugins" -PKG_VERSION="1.0.25" +PKG_VERSION="1.0.26" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 65d6d4ed402136dcb13deec64223d4d159b9ab81 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 20 Sep 2012 01:13:20 +0200 Subject: [PATCH 18/47] readline: add readline for target Signed-off-by: Stephan Raue --- packages/devel/readline/build | 40 +++++++++++++++++++ packages/devel/readline/install | 32 +++++++++++++++ packages/devel/readline/meta | 2 +- .../patches/readline-6.2-shlib_libs.patch | 36 +++++++++++++++++ 4 files changed, 109 insertions(+), 1 deletion(-) create mode 100755 packages/devel/readline/build create mode 100755 packages/devel/readline/install create mode 100644 packages/devel/readline/patches/readline-6.2-shlib_libs.patch diff --git a/packages/devel/readline/build b/packages/devel/readline/build new file mode 100755 index 0000000000..c9151252d2 --- /dev/null +++ b/packages/devel/readline/build @@ -0,0 +1,40 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD +mkdir -p .build-target && cd .build-target +../configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --enable-shared \ + --disable-static \ + --without-curses \ + --without-purify + +make + +$MAKEINSTALL diff --git a/packages/devel/readline/install b/packages/devel/readline/install new file mode 100755 index 0000000000..c9aaf70f03 --- /dev/null +++ b/packages/devel/readline/install @@ -0,0 +1,32 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/.build-target/shlib/libreadline.so.6.2 $INSTALL/usr/lib + ln -sf /usr/lib/libreadline.so.6.2 $INSTALL/usr/lib/libreadline.so.6 + ln -sf /usr/lib/libreadline.so.6 $INSTALL/usr/lib/libreadline.so + + cp -P $PKG_BUILD/.build-target/shlib/libhistory.so.6.2 $INSTALL/usr/lib + ln -sf /usr/lib/libhistory.so.6.2 $INSTALL/usr/lib/libhistory.so.6 + ln -sf /usr/lib/libhistory.so.6 $INSTALL/usr/lib/libhistory.so diff --git a/packages/devel/readline/meta b/packages/devel/readline/meta index ad6789657a..1ff56dfd0e 100644 --- a/packages/devel/readline/meta +++ b/packages/devel/readline/meta @@ -33,4 +33,4 @@ PKG_SHORTDESC="readline: The GNU Readline library provides a set of functions fo PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in." PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" +PKG_AUTORECONF="no" diff --git a/packages/devel/readline/patches/readline-6.2-shlib_libs.patch b/packages/devel/readline/patches/readline-6.2-shlib_libs.patch new file mode 100644 index 0000000000..6bc7cc2330 --- /dev/null +++ b/packages/devel/readline/patches/readline-6.2-shlib_libs.patch @@ -0,0 +1,36 @@ +diff -Naur readline-6.2-old/configure readline-6.2-new/configure +--- a/configure 2010-11-14 14:48:06.000000000 -0800 ++++ b/configure 2012-05-02 19:38:49.000000000 -0700 +@@ -10450,10 +10450,10 @@ + $as_echo_n "checking configuration for building shared libraries... " >&6; } + eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` + +-# case "$SHLIB_LIBS" in +-# *curses*|*termcap*|*termlib*) ;; +-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; +-# esac ++ case "$SHLIB_LIBS" in ++ *curses*|*termcap*|*termlib*) ;; ++ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; ++ esac + + + +diff -Naur readline-6.2-old/configure.in readline-6.2-new/configure.in +--- a/configure.in 2010-11-14 14:41:48.000000000 -0800 ++++ b/configure.in 2012-05-02 19:38:41.000000000 -0700 +@@ -214,10 +214,10 @@ + AC_MSG_CHECKING(configuration for building shared libraries) + eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` + +-# case "$SHLIB_LIBS" in +-# *curses*|*termcap*|*termlib*) ;; +-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; +-# esac ++ case "$SHLIB_LIBS" in ++ *curses*|*termcap*|*termlib*) ;; ++ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; ++ esac + + AC_SUBST(SHOBJ_CC) + AC_SUBST(SHOBJ_CFLAGS) From 680992c828e4338289bdd7aaca8dba25e39e25ee Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 20 Sep 2012 01:13:43 +0200 Subject: [PATCH 19/47] connman: update to connman-1.7 Signed-off-by: Stephan Raue --- packages/network/connman/install | 2 +- packages/network/connman/meta | 6 +++--- ...routes.patch => connman-1.7-do-not-cleanup-routes.patch} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename packages/network/connman/patches/{connman-1.6-do-not-cleanup-routes.patch => connman-1.7-do-not-cleanup-routes.patch} (100%) diff --git a/packages/network/connman/install b/packages/network/connman/install index c55b4b23c1..890310a466 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -36,7 +36,7 @@ mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/client/cm $INSTALL/usr/bin + cp -P $PKG_BUILD/client/connmanctl $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib/connman cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/connman diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 7c8452005d..29cc83374f 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="1.6" +PKG_VERSION="1.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.connman.net" PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib dbus systemd iptables wpa_supplicant ntp Python pygobject dbus-python" -PKG_BUILD_DEPENDS="toolchain glib dbus systemd iptables" +PKG_DEPENDS="glib readline dbus systemd iptables wpa_supplicant ntp Python pygobject dbus-python" +PKG_BUILD_DEPENDS="toolchain glib readline dbus systemd iptables" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="connman: Network manager daemon" diff --git a/packages/network/connman/patches/connman-1.6-do-not-cleanup-routes.patch b/packages/network/connman/patches/connman-1.7-do-not-cleanup-routes.patch similarity index 100% rename from packages/network/connman/patches/connman-1.6-do-not-cleanup-routes.patch rename to packages/network/connman/patches/connman-1.7-do-not-cleanup-routes.patch From 94caadc72a1f27cd6f26f19cb42acd9e7604aeaf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 20 Sep 2012 16:20:51 +0200 Subject: [PATCH 20/47] readline: build with ncurses support Signed-off-by: Stephan Raue --- packages/devel/readline/build | 2 +- packages/devel/readline/meta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/devel/readline/build b/packages/devel/readline/build index c9151252d2..784a6c775d 100755 --- a/packages/devel/readline/build +++ b/packages/devel/readline/build @@ -32,7 +32,7 @@ mkdir -p .build-target && cd .build-target --datadir=/usr/share \ --enable-shared \ --disable-static \ - --without-curses \ + --with-curses \ --without-purify make diff --git a/packages/devel/readline/meta b/packages/devel/readline/meta index 1ff56dfd0e..8bb7b91238 100644 --- a/packages/devel/readline/meta +++ b/packages/devel/readline/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://www.gnu.org/readline" PKG_URL="ftp://ftp.gnu.org/gnu/readline/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="ncurses" +PKG_BUILD_DEPENDS="toolchain ncurses" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="readline: The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in." From 45c9a8aceab9737f1f9c19b4628653d38fe2495e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 20 Sep 2012 16:21:33 +0200 Subject: [PATCH 21/47] projects/RPi: remove alsa support, its still not supported from XBMC Signed-off-by: Stephan Raue --- projects/RPi/linux/linux.arm.conf | 41 ++----------------------------- projects/RPi/options | 2 +- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 2d71334c40..c053a78b18 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.28 Kernel Configuration +# Linux/arm 3.2.29 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1284,13 +1284,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set # CONFIG_VIDEO_HDPVR is not set CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=y -# CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m # CONFIG_VIDEO_USBVISION is not set # CONFIG_USB_ET61X251 is not set @@ -1515,38 +1512,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=y -# CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_PCM_OSS is not set -CONFIG_SND_HRTIMER=y -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -# CONFIG_SND_RAWMIDI_SEQ is not set -# CONFIG_SND_OPL3_LIB_SEQ is not set -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_SBAWE_SEQ is not set -# CONFIG_SND_EMU10K1_SEQ is not set -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_ARM=y -# CONFIG_SND_ARMAACI is not set -CONFIG_SND_BCM2835=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -# CONFIG_SND_USB_UA101 is not set -# CONFIG_SND_USB_CAIAQ is not set -# CONFIG_SND_USB_6FIRE is not set -# CONFIG_SND_SOC is not set -# CONFIG_SOUND_PRIME is not set +# CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y CONFIG_HIDRAW=y @@ -1568,7 +1534,6 @@ CONFIG_HID_AUREAL=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y -# CONFIG_HID_PRODIKEYS is not set CONFIG_HID_CYPRESS=y # CONFIG_HID_DRAGONRISE is not set # CONFIG_HID_EMS_FF is not set @@ -1856,7 +1821,6 @@ CONFIG_R8712U=m # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_POHMELFS is not set -# CONFIG_LINE6_USB is not set # CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_USB_SERIAL_QUATECH_USB2 is not set CONFIG_VT6656=m @@ -1878,7 +1842,6 @@ CONFIG_ZCACHE=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -# CONFIG_EASYCAP is not set CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=y # CONFIG_LIRC_IMON is not set diff --git a/projects/RPi/options b/projects/RPi/options index 9c56246e69..73a0392eac 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -139,7 +139,7 @@ XBMC_VIS_GOOM="no" # build and install ALSA Audio support (yes / no) - ALSA_SUPPORT="yes" + ALSA_SUPPORT="no" # build and install PulseAudio support (yes / no) PULSEAUDIO_SUPPORT="no" From f3770375cd18dcee1cc8f63a0d3ff09e5df5ed10 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Sep 2012 18:07:58 +0200 Subject: [PATCH 22/47] xbmc: change Kernel governator to 'ondemand', this fixes #1258 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/init.d/93_xbmc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index d33fb5ff40..164310c603 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -54,8 +54,8 @@ fi # set cpu's to 'conservative' ( usleep 15000000 - progress "set cpu's to 'conservative'" - cpupower frequency-set -g conservative > /dev/null 2>&1 + progress "set cpu's to 'ondemand'" + cpupower frequency-set -g ondemand > /dev/null 2>&1 )& # prevent restrating XBMC at reboot or shutdown From be5b09fb01c0d374e954befc8c659373211be9aa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Sep 2012 18:08:12 +0200 Subject: [PATCH 23/47] xbmc-frodo: change Kernel governator to 'ondemand', this fixes #1258 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-frodo/init.d/93_xbmc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc-frodo/init.d/93_xbmc b/packages/mediacenter/xbmc-frodo/init.d/93_xbmc index d33fb5ff40..164310c603 100644 --- a/packages/mediacenter/xbmc-frodo/init.d/93_xbmc +++ b/packages/mediacenter/xbmc-frodo/init.d/93_xbmc @@ -54,8 +54,8 @@ fi # set cpu's to 'conservative' ( usleep 15000000 - progress "set cpu's to 'conservative'" - cpupower frequency-set -g conservative > /dev/null 2>&1 + progress "set cpu's to 'ondemand'" + cpupower frequency-set -g ondemand > /dev/null 2>&1 )& # prevent restrating XBMC at reboot or shutdown From 14264306cdd5c4ede081f33ddd440880a8e9fe02 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Sep 2012 18:08:54 +0200 Subject: [PATCH 24/47] xbmc-frodo: update to xbmc-frodo-5184234 Signed-off-by: Stephan Raue --- .../xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...o-5184234-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...rodo-5184234-311-fix_rsxs_build-0.1.patch} | 0 ...-texturepacker-hostflags-and-rework.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-5184234-452-change_lcd_content-0.1.patch} | 0 ...34-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...o-5184234-454-disable_backslash-0.1.patch} | 0 ...184234-457-fix_connection_check-0.1.patch} | 0 ...5184234-463-add_remote_devinput-0.1.patch} | 0 ...-frodo-ba2c709-901-CEC_add_2548-1002.patch | 25 ------------------- 13 files changed, 2 insertions(+), 27 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-311-fix_rsxs_build-0.1.patch => xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-452-change_lcd_content-0.1.patch => xbmc-frodo-5184234-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-454-disable_backslash-0.1.patch => xbmc-frodo-5184234-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-457-fix_connection_check-0.1.patch => xbmc-frodo-5184234-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-ba2c709-463-add_remote_devinput-0.1.patch => xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch} (100%) delete mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-901-CEC_add_2548-1002.patch diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 750ab78f10..246ba0bf96 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="ba2c709" +PKG_VERSION="5184234" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 9a34c11c0a..85258e0dda 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="ba2c709" +PKG_VERSION="5184234" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-901-CEC_add_2548-1002.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-901-CEC_add_2548-1002.patch deleted file mode 100644 index ac124df53f..0000000000 --- a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-901-CEC_add_2548-1002.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 35c9bf5bd0f9d03541280df8d7b9af0bf6ffb1a4 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Wed, 29 Aug 2012 13:43:55 +0200 -Subject: [PATCH] cec: also match 2548:1002 to the cec adapter - ---- - system/peripherals.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index cf0c6c4..76a1df9 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -9,7 +9,7 @@ - - - -- -+ - - - --- -1.7.10 - From 254c098ba69dc837162ec9c6370745a2205e80fb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 02:30:38 +0200 Subject: [PATCH 25/47] linux: update to linux-3.2.30 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- ...0_crosscompile.patch => linux-3.2.30-000_crosscompile.patch} | 0 ..._dev_console.patch => linux-3.2.30-003-no_dev_console.patch} | 0 ...atch => linux-3.2.30-004_lower_undefined_mode_timeout.patch} | 0 ...006_enable_utf8.patch => linux-3.2.30-006_enable_utf8.patch} | 0 ...e_floppy_die.patch => linux-3.2.30-007_die_floppy_die.patch} | 0 ... => linux-3.2.30-009_disable_i8042_check_on_apple_mac.patch} | 0 ...0.1.patch => linux-3.2.30-052-aureal_remote_quirk-0.1.patch} | 0 ...e-0.1.patch => linux-3.2.30-053-spinelplus-remote-0.1.patch} | 0 ...voton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} | 0 ...Formosa-IR606.patch => linux-3.2.30-056-Formosa-IR606.patch} | 0 ...-media-ati_remote-allow-specifying-a-default-keymap-s.patch} | 0 ...-media-ati_remote-add-support-for-Medion-X10-Digitain.patch} | 0 ...-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch} | 0 ...-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch} | 0 ...patch => linux-3.2.30-071-silence_i915_agp-module-0.1.patch} | 0 ...drm_cea_modes.patch => linux-3.2.30-081-drm_cea_modes.patch} | 0 ....patch => linux-3.2.30-201-add_Anysee_T2C_support-0.1.patch} | 0 ...0.1.patch => linux-3.2.30-202-add_HVR930C_support-0.1.patch} | 0 ...ch => linux-3.2.30-203-stb0899_enable_low_symbol_rate.patch} | 0 ... linux-3.2.30-204-add_Formosa_eHome_Infrared_Receiver.patch} | 0 ..._support.patch => linux-3.2.30-210-add_DVBSky_support.patch} | 0 ...port.patch => linux-3.2.30-211-add_TeVii_s471_support.patch} | 0 ....patch => linux-3.2.30-212-mantis_stb0899_faster_lock.patch} | 0 ...s2_usb_r2.patch => linux-3.2.30-213-cinergy_s2_usb_r2.patch} | 0 ...4-hdtv-hvr930c.patch => linux-3.2.30-214-hdtv-hvr930c.patch} | 0 ....0_support.patch => linux-3.2.30-251-acpi-5.0_support.patch} | 0 ...e33263e.patch => linux-3.2.30-601-RPi_support-e33263e.patch} | 0 ..._bluetooth.patch => linux-3.2.30-901_broken_bluetooth.patch} | 0 ...920_add_rtl8168.patch => linux-3.2.30-920_add_rtl8168.patch} | 0 ...ux-3.2.30-990-xc5000_add_support_for_get_if_frequency.patch} | 0 ...-3.2.30-999-fix-iMon-Knob-event-interpretation-issues.patch} | 0 32 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{linux-3.2.29-000_crosscompile.patch => linux-3.2.30-000_crosscompile.patch} (100%) rename packages/linux/patches/{linux-3.2.29-003-no_dev_console.patch => linux-3.2.30-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-3.2.29-004_lower_undefined_mode_timeout.patch => linux-3.2.30-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-3.2.29-006_enable_utf8.patch => linux-3.2.30-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-3.2.29-007_die_floppy_die.patch => linux-3.2.30-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch => linux-3.2.30-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-3.2.29-052-aureal_remote_quirk-0.1.patch => linux-3.2.30-052-aureal_remote_quirk-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.29-053-spinelplus-remote-0.1.patch => linux-3.2.30-053-spinelplus-remote-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch => linux-3.2.30-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} (100%) rename packages/linux/patches/{linux-3.2.29-056-Formosa-IR606.patch => linux-3.2.30-056-Formosa-IR606.patch} (100%) rename packages/linux/patches/{linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch => linux-3.2.30-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch} (100%) rename packages/linux/patches/{linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch => linux-3.2.30-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch} (100%) rename packages/linux/patches/{linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch => linux-3.2.30-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch} (100%) rename packages/linux/patches/{linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch => linux-3.2.30-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch} (100%) rename packages/linux/patches/{linux-3.2.29-071-silence_i915_agp-module-0.1.patch => linux-3.2.30-071-silence_i915_agp-module-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.29-081-drm_cea_modes.patch => linux-3.2.30-081-drm_cea_modes.patch} (100%) rename packages/linux/patches/{linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch => linux-3.2.30-201-add_Anysee_T2C_support-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.29-202-add_HVR930C_support-0.1.patch => linux-3.2.30-202-add_HVR930C_support-0.1.patch} (100%) rename packages/linux/patches/{linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch => linux-3.2.30-203-stb0899_enable_low_symbol_rate.patch} (100%) rename packages/linux/patches/{linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch => linux-3.2.30-204-add_Formosa_eHome_Infrared_Receiver.patch} (100%) rename packages/linux/patches/{linux-3.2.29-210-add_DVBSky_support.patch => linux-3.2.30-210-add_DVBSky_support.patch} (100%) rename packages/linux/patches/{linux-3.2.29-211-add_TeVii_s471_support.patch => linux-3.2.30-211-add_TeVii_s471_support.patch} (100%) rename packages/linux/patches/{linux-3.2.29-212-mantis_stb0899_faster_lock.patch => linux-3.2.30-212-mantis_stb0899_faster_lock.patch} (100%) rename packages/linux/patches/{linux-3.2.29-213-cinergy_s2_usb_r2.patch => linux-3.2.30-213-cinergy_s2_usb_r2.patch} (100%) rename packages/linux/patches/{linux-3.2.29-214-hdtv-hvr930c.patch => linux-3.2.30-214-hdtv-hvr930c.patch} (100%) rename packages/linux/patches/{linux-3.2.29-251-acpi-5.0_support.patch => linux-3.2.30-251-acpi-5.0_support.patch} (100%) rename packages/linux/patches/{linux-3.2.29-601-RPi_support-e33263e.patch => linux-3.2.30-601-RPi_support-e33263e.patch} (100%) rename packages/linux/patches/{linux-3.2.29-901_broken_bluetooth.patch => linux-3.2.30-901_broken_bluetooth.patch} (100%) rename packages/linux/patches/{linux-3.2.29-920_add_rtl8168.patch => linux-3.2.30-920_add_rtl8168.patch} (100%) rename packages/linux/patches/{linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch => linux-3.2.30-990-xc5000_add_support_for_get_if_frequency.patch} (100%) rename packages/linux/patches/{linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch => linux-3.2.30-999-fix-iMon-Knob-event-interpretation-issues.patch} (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 1a8ae5e028..0465c9d809 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.2.29" +PKG_VERSION="3.2.30" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.2.29-000_crosscompile.patch b/packages/linux/patches/linux-3.2.30-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-000_crosscompile.patch rename to packages/linux/patches/linux-3.2.30-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.2.29-003-no_dev_console.patch b/packages/linux/patches/linux-3.2.30-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-003-no_dev_console.patch rename to packages/linux/patches/linux-3.2.30-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.2.29-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.2.30-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.2.30-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.2.29-006_enable_utf8.patch b/packages/linux/patches/linux-3.2.30-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-006_enable_utf8.patch rename to packages/linux/patches/linux-3.2.30-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.2.29-007_die_floppy_die.patch b/packages/linux/patches/linux-3.2.30-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.2.30-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.2.30-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.2.30-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.2.29-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.2.30-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.2.30-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.2.29-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.2.30-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.2.30-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.2.30-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.2.30-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.2.29-056-Formosa-IR606.patch b/packages/linux/patches/linux-3.2.30-056-Formosa-IR606.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-056-Formosa-IR606.patch rename to packages/linux/patches/linux-3.2.30-056-Formosa-IR606.patch diff --git a/packages/linux/patches/linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch b/packages/linux/patches/linux-3.2.30-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch rename to packages/linux/patches/linux-3.2.30-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch diff --git a/packages/linux/patches/linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch b/packages/linux/patches/linux-3.2.30-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch rename to packages/linux/patches/linux-3.2.30-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch diff --git a/packages/linux/patches/linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch b/packages/linux/patches/linux-3.2.30-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch rename to packages/linux/patches/linux-3.2.30-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch diff --git a/packages/linux/patches/linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch b/packages/linux/patches/linux-3.2.30-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch rename to packages/linux/patches/linux-3.2.30-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch diff --git a/packages/linux/patches/linux-3.2.29-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.2.30-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.2.30-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.2.29-081-drm_cea_modes.patch b/packages/linux/patches/linux-3.2.30-081-drm_cea_modes.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-081-drm_cea_modes.patch rename to packages/linux/patches/linux-3.2.30-081-drm_cea_modes.patch diff --git a/packages/linux/patches/linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch b/packages/linux/patches/linux-3.2.30-201-add_Anysee_T2C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-201-add_Anysee_T2C_support-0.1.patch rename to packages/linux/patches/linux-3.2.30-201-add_Anysee_T2C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.29-202-add_HVR930C_support-0.1.patch b/packages/linux/patches/linux-3.2.30-202-add_HVR930C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-202-add_HVR930C_support-0.1.patch rename to packages/linux/patches/linux-3.2.30-202-add_HVR930C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.2.30-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.2.30-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.2.30-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.2.30-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.2.29-210-add_DVBSky_support.patch b/packages/linux/patches/linux-3.2.30-210-add_DVBSky_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-210-add_DVBSky_support.patch rename to packages/linux/patches/linux-3.2.30-210-add_DVBSky_support.patch diff --git a/packages/linux/patches/linux-3.2.29-211-add_TeVii_s471_support.patch b/packages/linux/patches/linux-3.2.30-211-add_TeVii_s471_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-211-add_TeVii_s471_support.patch rename to packages/linux/patches/linux-3.2.30-211-add_TeVii_s471_support.patch diff --git a/packages/linux/patches/linux-3.2.29-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.2.30-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/linux-3.2.30-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/linux-3.2.29-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/linux-3.2.30-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/linux-3.2.30-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/linux-3.2.29-214-hdtv-hvr930c.patch b/packages/linux/patches/linux-3.2.30-214-hdtv-hvr930c.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-214-hdtv-hvr930c.patch rename to packages/linux/patches/linux-3.2.30-214-hdtv-hvr930c.patch diff --git a/packages/linux/patches/linux-3.2.29-251-acpi-5.0_support.patch b/packages/linux/patches/linux-3.2.30-251-acpi-5.0_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-251-acpi-5.0_support.patch rename to packages/linux/patches/linux-3.2.30-251-acpi-5.0_support.patch diff --git a/packages/linux/patches/linux-3.2.29-601-RPi_support-e33263e.patch b/packages/linux/patches/linux-3.2.30-601-RPi_support-e33263e.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-601-RPi_support-e33263e.patch rename to packages/linux/patches/linux-3.2.30-601-RPi_support-e33263e.patch diff --git a/packages/linux/patches/linux-3.2.29-901_broken_bluetooth.patch b/packages/linux/patches/linux-3.2.30-901_broken_bluetooth.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-901_broken_bluetooth.patch rename to packages/linux/patches/linux-3.2.30-901_broken_bluetooth.patch diff --git a/packages/linux/patches/linux-3.2.29-920_add_rtl8168.patch b/packages/linux/patches/linux-3.2.30-920_add_rtl8168.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-920_add_rtl8168.patch rename to packages/linux/patches/linux-3.2.30-920_add_rtl8168.patch diff --git a/packages/linux/patches/linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch b/packages/linux/patches/linux-3.2.30-990-xc5000_add_support_for_get_if_frequency.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-990-xc5000_add_support_for_get_if_frequency.patch rename to packages/linux/patches/linux-3.2.30-990-xc5000_add_support_for_get_if_frequency.patch diff --git a/packages/linux/patches/linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch b/packages/linux/patches/linux-3.2.30-999-fix-iMon-Knob-event-interpretation-issues.patch similarity index 100% rename from packages/linux/patches/linux-3.2.29-999-fix-iMon-Knob-event-interpretation-issues.patch rename to packages/linux/patches/linux-3.2.30-999-fix-iMon-Knob-event-interpretation-issues.patch From f8fedaec427dab1ee009ff7eac3cdf7163a64944 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 02:32:04 +0200 Subject: [PATCH 26/47] linux: update RPi patches Signed-off-by: Stephan Raue --- ...inux-3.2.30-601-RPi_support-8524c78.patch} | 472 ++++++++++-------- 1 file changed, 274 insertions(+), 198 deletions(-) rename packages/linux/patches/{linux-3.2.30-601-RPi_support-e33263e.patch => linux-3.2.30-601-RPi_support-8524c78.patch} (99%) diff --git a/packages/linux/patches/linux-3.2.30-601-RPi_support-e33263e.patch b/packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch similarity index 99% rename from packages/linux/patches/linux-3.2.30-601-RPi_support-e33263e.patch rename to packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch index 818c93deab..f8d7654cc3 100644 --- a/packages/linux/patches/linux-3.2.30-601-RPi_support-e33263e.patch +++ b/packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch @@ -619,10 +619,10 @@ index 0000000..3b8bd74 +CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig new file mode 100644 -index 0000000..35c5042 +index 0000000..b4a3da1 --- /dev/null +++ b/arch/arm/configs/bcmrpi_defconfig -@@ -0,0 +1,913 @@ +@@ -0,0 +1,945 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -673,9 +673,10 @@ index 0000000..35c5042 +CONFIG_KEXEC=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=m -+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_POWERSAVE=y ++CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y ++CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y ++CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_IDLE=y +CONFIG_VFP=y @@ -854,6 +855,7 @@ index 0000000..35c5042 +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m ++CONFIG_L2TP=m +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y @@ -1049,6 +1051,7 @@ index 0000000..35c5042 +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT53XX=y ++CONFIG_RT2800USB_UNKNOWN=y +CONFIG_WL1251=m +CONFIG_WL12XX_MENU=m +CONFIG_ZD1211RW=m @@ -1108,6 +1111,8 @@ index 0000000..35c5042 +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_BQ27000=m +# CONFIG_HWMON is not set ++CONFIG_THERMAL=y ++CONFIG_THERMAL_BCM2835=y +CONFIG_WATCHDOG=y +CONFIG_BCM2708_WDT=m +CONFIG_MEDIA_SUPPORT=m @@ -1394,6 +1399,33 @@ index 0000000..35c5042 +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=m ++CONFIG_RTC_DRV_DS1374=m ++CONFIG_RTC_DRV_DS1672=m ++CONFIG_RTC_DRV_DS3232=m ++CONFIG_RTC_DRV_MAX6900=m ++CONFIG_RTC_DRV_RS5C372=m ++CONFIG_RTC_DRV_ISL1208=m ++CONFIG_RTC_DRV_ISL12022=m ++CONFIG_RTC_DRV_X1205=m ++CONFIG_RTC_DRV_PCF8563=m ++CONFIG_RTC_DRV_PCF8583=m ++CONFIG_RTC_DRV_M41T80=m ++CONFIG_RTC_DRV_BQ32K=m ++CONFIG_RTC_DRV_S35390A=m ++CONFIG_RTC_DRV_FM3130=m ++CONFIG_RTC_DRV_RX8581=m ++CONFIG_RTC_DRV_RX8025=m ++CONFIG_RTC_DRV_EM3027=m ++CONFIG_RTC_DRV_RV3029C2=m ++CONFIG_RTC_DRV_M41T93=m ++CONFIG_RTC_DRV_M41T94=m ++CONFIG_RTC_DRV_DS1305=m ++CONFIG_RTC_DRV_DS1390=m ++CONFIG_RTC_DRV_MAX6902=m ++CONFIG_RTC_DRV_R9701=m ++CONFIG_RTC_DRV_RS5C348=m ++CONFIG_RTC_DRV_DS3234=m ++CONFIG_RTC_DRV_PCF2123=m +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m @@ -2642,10 +2674,10 @@ index 0000000..0aa916e +#endif diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c new file mode 100644 -index 0000000..b3dbbd1 +index 0000000..72dcf31 --- /dev/null +++ b/arch/arm/mach-bcm2708/bcm2708.c -@@ -0,0 +1,825 @@ +@@ -0,0 +1,867 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -3164,6 +3196,48 @@ index 0000000..b3dbbd1 + .resource = 0, + .num_resources = 0, + }, ++ [1] = { ++ .name = "bcm2835_AUD1", ++ .id = 1, /* second audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [2] = { ++ .name = "bcm2835_AUD2", ++ .id = 2, /* third audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [3] = { ++ .name = "bcm2835_AUD3", ++ .id = 3, /* forth audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [4] = { ++ .name = "bcm2835_AUD4", ++ .id = 4, /* fifth audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [5] = { ++ .name = "bcm2835_AUD5", ++ .id = 5, /* sixth audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [6] = { ++ .name = "bcm2835_AUD6", ++ .id = 6, /* seventh audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, ++ [7] = { ++ .name = "bcm2835_AUD7", ++ .id = 7, /* eighth audio device */ ++ .resource = 0, ++ .num_resources = 0, ++ }, +}; + +static struct resource bcm2708_spi_resources[] = { @@ -7271,7 +7345,7 @@ index a48bc02..51ebbb3 100644 # PowerPC platform drivers diff --git a/drivers/cpufreq/bcm2835-cpufreq.c b/drivers/cpufreq/bcm2835-cpufreq.c new file mode 100755 -index 0000000..aa6fc66 +index 0000000..6ff1edb --- /dev/null +++ b/drivers/cpufreq/bcm2835-cpufreq.c @@ -0,0 +1,239 @@ @@ -7473,7 +7547,7 @@ index 0000000..aa6fc66 + policy->cur = bcm2835_cpufreq_get_clock(VCMSG_GET_CLOCK_RATE); + return -EINVAL; + } -+ print_info("Freq %d->%d (min=%d max=%d target=%d request=%d)", cur, policy->cur, policy->min, policy->max, target_freq, target); ++ print_debug("Freq %d->%d (min=%d max=%d target=%d request=%d)", cur, policy->cur, policy->min, policy->max, target_freq, target); + return 0; +} + @@ -7515,14 +7589,15 @@ index 0000000..aa6fc66 +module_exit(bcm2835_cpufreq_module_exit); + diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig -index 83e3e9d..761b528 100644 +index 83e3e9d..a22de2a 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig -@@ -1361,6 +1361,15 @@ config SENSORS_MC13783_ADC +@@ -1361,6 +1361,16 @@ config SENSORS_MC13783_ADC help Support for the A/D converter on MC13783 PMIC. +config SENSORS_BCM2835 ++ depends on THERMAL_BCM2835=n + tristate "Broadcom BCM2835 HWMON Driver" + help + If you say yes here you get support for the hardware @@ -7548,11 +7623,23 @@ index 8251ce8..8f2743b 100644 diff --git a/drivers/hwmon/bcm2835-hwmon.c b/drivers/hwmon/bcm2835-hwmon.c new file mode 100644 -index 0000000..4976387 +index 0000000..5bbed45 --- /dev/null +++ b/drivers/hwmon/bcm2835-hwmon.c -@@ -0,0 +1,211 @@ -+//bcm2835-hwmon.c +@@ -0,0 +1,219 @@ ++/***************************************************************************** ++* Copyright 2011 Broadcom Corporation. All rights reserved. ++* ++* Unless you and Broadcom execute a separate written software license ++* agreement governing use of this software, this software is licensed to you ++* under the terms of the GNU General Public License version 2, available at ++* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). ++* ++* Notwithstanding the above, under no circumstances may you combine this ++* software in any way with any other Broadcom software provided under a ++* license other than the GPL, without Broadcom's express prior written ++* consent. ++*****************************************************************************/ + +#include +#include @@ -7579,12 +7666,12 @@ index 0000000..4976387 + +#define VC_TAG_GET_TEMP 0x00030006 +#define VC_TAG_GET_MAX_TEMP 0x0003000A ++ ++/* --- STRUCTS --- */ +struct bcm2835_hwmon_data { + struct device *hwmon_dev; +}; + -+/* --- STRUCTS --- */ -+ +/* tag part of the message */ +struct vc_msg_tag { + uint32_t tag_id; /* the tag ID for the temperature */ @@ -7618,16 +7705,12 @@ index 0000000..4976387 + +static SENSOR_DEVICE_ATTR(name, S_IRUGO,bcm2835_get_name,NULL,0); +static SENSOR_DEVICE_ATTR(temp1_input,S_IRUGO,bcm2835_get_temp,NULL,TEMP); -+static SENSOR_DEVICE_ATTR(temp,S_IRUGO,bcm2835_get_temp,NULL,TEMP); +static SENSOR_DEVICE_ATTR(temp1_max,S_IRUGO,bcm2835_get_temp,NULL,MAX_TEMP); -+static SENSOR_DEVICE_ATTR(trip_point_0_temp,S_IRUGO,bcm2835_get_temp,NULL,MAX_TEMP); + +static struct attribute* bcm2835_attributes[] = { + &sensor_dev_attr_name.dev_attr.attr, + &sensor_dev_attr_temp1_input.dev_attr.attr, + &sensor_dev_attr_temp1_max.dev_attr.attr, -+ &sensor_dev_attr_temp.dev_attr.attr, -+ &sensor_dev_attr_trip_point_0_temp.dev_attr.attr, + NULL, +}; + @@ -30097,7 +30180,7 @@ index 0000000..2703103 + + diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 6ce32a7..0562295 100644 +index 6ce32a7..b4ffbe3 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -27,6 +27,7 @@ @@ -30134,9 +30217,9 @@ index 6ce32a7..0562295 100644 + if(enable_llm) + { + local_irq_disable(); -+ enable_irq(host->irq); + if(host->second_irq) + enable_irq(host->second_irq); ++ enable_irq(host->irq); + } +#endif + spin_unlock(&host->lock); @@ -30168,9 +30251,9 @@ index 6ce32a7..0562295 100644 + if(enable_llm) + { + local_irq_disable(); -+ enable_irq(host->irq); + if(host->second_irq) + enable_irq(host->second_irq); ++ enable_irq(host->irq); + } +#endif + spin_unlock_irqrestore(&host->lock,flags); @@ -30200,17 +30283,7 @@ index 6ce32a7..0562295 100644 static void sdhci_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set) { -@@ -206,7 +292,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) - return; - } - timeout--; -+ sdhci_spin_enable_schedule(host); - mdelay(1); -+ sdhci_spin_disable_schedule(host); - } - - if (host->ops->platform_reset_exit) -@@ -269,7 +357,7 @@ static void sdhci_led_control(struct led_classdev *led, +@@ -269,7 +355,7 @@ static void sdhci_led_control(struct led_classdev *led, struct sdhci_host *host = container_of(led, struct sdhci_host, led); unsigned long flags; @@ -30219,7 +30292,7 @@ index 6ce32a7..0562295 100644 if (host->runtime_suspended) goto out; -@@ -279,7 +367,7 @@ static void sdhci_led_control(struct led_classdev *led, +@@ -279,7 +365,7 @@ static void sdhci_led_control(struct led_classdev *led, else sdhci_activate_led(host); out: @@ -30228,7 +30301,7 @@ index 6ce32a7..0562295 100644 } #endif -@@ -296,7 +384,7 @@ static void sdhci_read_block_pio(struct sdhci_host *host) +@@ -296,7 +382,7 @@ static void sdhci_read_block_pio(struct sdhci_host *host) u32 uninitialized_var(scratch); u8 *buf; @@ -30237,7 +30310,7 @@ index 6ce32a7..0562295 100644 blksize = host->data->blksz; chunk = 0; -@@ -341,7 +429,7 @@ static void sdhci_write_block_pio(struct sdhci_host *host) +@@ -341,7 +427,7 @@ static void sdhci_write_block_pio(struct sdhci_host *host) u32 scratch; u8 *buf; @@ -30246,7 +30319,7 @@ index 6ce32a7..0562295 100644 blksize = host->data->blksz; chunk = 0; -@@ -380,19 +468,28 @@ static void sdhci_write_block_pio(struct sdhci_host *host) +@@ -380,19 +466,28 @@ static void sdhci_write_block_pio(struct sdhci_host *host) local_irq_restore(flags); } @@ -30278,7 +30351,7 @@ index 6ce32a7..0562295 100644 /* * Some controllers (JMicron JMB38x) mess up the buffer bits -@@ -403,7 +500,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host) +@@ -403,7 +498,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host) (host->data->blocks == 1)) mask = ~0; @@ -30287,7 +30360,7 @@ index 6ce32a7..0562295 100644 if (host->quirks & SDHCI_QUIRK_PIO_NEEDS_DELAY) udelay(100); -@@ -415,9 +512,11 @@ static void sdhci_transfer_pio(struct sdhci_host *host) +@@ -415,9 +510,11 @@ static void sdhci_transfer_pio(struct sdhci_host *host) host->blocks--; if (host->blocks == 0) break; @@ -30300,7 +30373,7 @@ index 6ce32a7..0562295 100644 } static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags) -@@ -690,7 +789,9 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) +@@ -690,7 +787,9 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL; u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR; @@ -30311,7 +30384,7 @@ index 6ce32a7..0562295 100644 sdhci_clear_set_irqs(host, pio_irqs, dma_irqs); else sdhci_clear_set_irqs(host, dma_irqs, pio_irqs); -@@ -722,44 +823,25 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) +@@ -722,44 +821,25 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) host->data_early = 0; host->data->bytes_xfered = 0; @@ -30364,7 +30437,7 @@ index 6ce32a7..0562295 100644 int broken, i; struct scatterlist *sg; -@@ -818,7 +900,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) +@@ -818,7 +898,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) */ WARN_ON(1); host->flags &= ~SDHCI_REQ_USE_DMA; @@ -30374,7 +30447,7 @@ index 6ce32a7..0562295 100644 WARN_ON(sg_cnt != 1); sdhci_writel(host, sg_dma_address(data->sg), SDHCI_DMA_ADDRESS); -@@ -834,11 +917,13 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) +@@ -834,11 +915,13 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) if (host->version >= SDHCI_SPEC_200) { ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); ctrl &= ~SDHCI_CTRL_DMA_MASK; @@ -30393,7 +30466,7 @@ index 6ce32a7..0562295 100644 sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); } -@@ -890,7 +975,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, +@@ -890,7 +973,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ; @@ -30403,7 +30476,7 @@ index 6ce32a7..0562295 100644 mode |= SDHCI_TRNS_DMA; sdhci_writew(host, mode, SDHCI_TRANSFER_MODE); -@@ -906,13 +992,16 @@ static void sdhci_finish_data(struct sdhci_host *host) +@@ -906,13 +990,16 @@ static void sdhci_finish_data(struct sdhci_host *host) host->data = NULL; if (host->flags & SDHCI_REQ_USE_DMA) { @@ -30424,7 +30497,7 @@ index 6ce32a7..0562295 100644 } /* -@@ -965,6 +1054,12 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) +@@ -965,6 +1052,12 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY)) mask |= SDHCI_DATA_INHIBIT; @@ -30437,7 +30510,7 @@ index 6ce32a7..0562295 100644 /* We shouldn't wait for data inihibit for stop commands, even though they might use busy signaling */ if (host->mrq->data && (cmd == host->mrq->data->stop)) -@@ -980,12 +1075,20 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) +@@ -980,12 +1073,20 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) return; } timeout--; @@ -30458,7 +30531,7 @@ index 6ce32a7..0562295 100644 sdhci_prepare_data(host, cmd); -@@ -1150,7 +1253,9 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) +@@ -1150,7 +1251,9 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) return; } timeout--; @@ -30468,7 +30541,7 @@ index 6ce32a7..0562295 100644 } clk |= SDHCI_CLOCK_CARD_EN; -@@ -1218,6 +1323,35 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) +@@ -1218,6 +1321,35 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) mdelay(10); } @@ -30504,7 +30577,7 @@ index 6ce32a7..0562295 100644 /*****************************************************************************\ * * * MMC callbacks * -@@ -1234,7 +1368,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) +@@ -1234,7 +1366,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) sdhci_runtime_pm_get(host); @@ -30513,7 +30586,7 @@ index 6ce32a7..0562295 100644 WARN_ON(host->mrq != NULL); -@@ -1276,9 +1410,9 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) +@@ -1276,9 +1408,9 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) */ if ((host->flags & SDHCI_NEEDS_RETUNING) && !(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) { @@ -30525,7 +30598,7 @@ index 6ce32a7..0562295 100644 /* Restore original mmc_request structure */ host->mrq = mrq; -@@ -1291,15 +1425,16 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) +@@ -1291,15 +1423,16 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) } mmiowb(); @@ -30544,7 +30617,7 @@ index 6ce32a7..0562295 100644 if (host->flags & SDHCI_DEVICE_DEAD) goto out; -@@ -1356,7 +1491,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) +@@ -1356,7 +1489,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) else ctrl &= ~SDHCI_CTRL_HISPD; @@ -30553,7 +30626,7 @@ index 6ce32a7..0562295 100644 u16 clk, ctrl_2; unsigned int clock; -@@ -1364,7 +1499,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) +@@ -1364,7 +1497,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) if ((ios->timing == MMC_TIMING_UHS_SDR50) || (ios->timing == MMC_TIMING_UHS_SDR104) || (ios->timing == MMC_TIMING_UHS_DDR50) || @@ -30563,7 +30636,7 @@ index 6ce32a7..0562295 100644 ctrl |= SDHCI_CTRL_HISPD; ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); -@@ -1444,7 +1580,13 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) +@@ -1444,7 +1578,13 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) out: mmiowb(); @@ -30578,7 +30651,7 @@ index 6ce32a7..0562295 100644 } static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) -@@ -1461,7 +1603,7 @@ static int sdhci_check_ro(struct sdhci_host *host) +@@ -1461,7 +1601,7 @@ static int sdhci_check_ro(struct sdhci_host *host) unsigned long flags; int is_readonly; @@ -30587,7 +30660,7 @@ index 6ce32a7..0562295 100644 if (host->flags & SDHCI_DEVICE_DEAD) is_readonly = 0; -@@ -1471,7 +1613,7 @@ static int sdhci_check_ro(struct sdhci_host *host) +@@ -1471,7 +1611,7 @@ static int sdhci_check_ro(struct sdhci_host *host) is_readonly = !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_WRITE_PROTECT); @@ -30596,7 +30669,7 @@ index 6ce32a7..0562295 100644 /* This quirk needs to be replaced by a callback-function later */ return host->quirks & SDHCI_QUIRK_INVERTED_WRITE_PROTECT ? -@@ -1544,9 +1686,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) +@@ -1544,9 +1684,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) struct sdhci_host *host = mmc_priv(mmc); unsigned long flags; @@ -30608,7 +30681,7 @@ index 6ce32a7..0562295 100644 } static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, -@@ -1849,7 +1991,7 @@ static void sdhci_do_enable_preset_value(struct sdhci_host *host, bool enable) +@@ -1849,7 +1989,7 @@ static void sdhci_do_enable_preset_value(struct sdhci_host *host, bool enable) if (host->version < SDHCI_SPEC_300) return; @@ -30617,7 +30690,7 @@ index 6ce32a7..0562295 100644 ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); -@@ -1867,7 +2009,7 @@ static void sdhci_do_enable_preset_value(struct sdhci_host *host, bool enable) +@@ -1867,7 +2007,7 @@ static void sdhci_do_enable_preset_value(struct sdhci_host *host, bool enable) host->flags &= ~SDHCI_PV_ENABLED; } @@ -30626,7 +30699,7 @@ index 6ce32a7..0562295 100644 } static void sdhci_enable_preset_value(struct mmc_host *mmc, bool enable) -@@ -1888,6 +2030,8 @@ static const struct mmc_host_ops sdhci_ops = { +@@ -1888,6 +2028,8 @@ static const struct mmc_host_ops sdhci_ops = { .start_signal_voltage_switch = sdhci_start_signal_voltage_switch, .execute_tuning = sdhci_execute_tuning, .enable_preset_value = sdhci_enable_preset_value, @@ -30635,7 +30708,7 @@ index 6ce32a7..0562295 100644 }; /*****************************************************************************\ -@@ -1903,7 +2047,7 @@ static void sdhci_tasklet_card(unsigned long param) +@@ -1903,7 +2045,7 @@ static void sdhci_tasklet_card(unsigned long param) host = (struct sdhci_host*)param; @@ -30644,7 +30717,7 @@ index 6ce32a7..0562295 100644 /* Check host->mrq first in case we are runtime suspended */ if (host->mrq && -@@ -1920,7 +2064,7 @@ static void sdhci_tasklet_card(unsigned long param) +@@ -1920,7 +2062,7 @@ static void sdhci_tasklet_card(unsigned long param) tasklet_schedule(&host->finish_tasklet); } @@ -30653,7 +30726,7 @@ index 6ce32a7..0562295 100644 mmc_detect_change(host->mmc, msecs_to_jiffies(200)); } -@@ -1933,14 +2077,14 @@ static void sdhci_tasklet_finish(unsigned long param) +@@ -1933,14 +2075,14 @@ static void sdhci_tasklet_finish(unsigned long param) host = (struct sdhci_host*)param; @@ -30670,7 +30743,7 @@ index 6ce32a7..0562295 100644 return; } -@@ -1983,7 +2127,7 @@ static void sdhci_tasklet_finish(unsigned long param) +@@ -1983,7 +2125,7 @@ static void sdhci_tasklet_finish(unsigned long param) #endif mmiowb(); @@ -30679,7 +30752,7 @@ index 6ce32a7..0562295 100644 mmc_request_done(host->mmc, mrq); sdhci_runtime_pm_put(host); -@@ -1996,11 +2140,11 @@ static void sdhci_timeout_timer(unsigned long data) +@@ -1996,11 +2138,11 @@ static void sdhci_timeout_timer(unsigned long data) host = (struct sdhci_host*)data; @@ -30693,7 +30766,7 @@ index 6ce32a7..0562295 100644 sdhci_dumpregs(host); if (host->data) { -@@ -2017,7 +2161,7 @@ static void sdhci_timeout_timer(unsigned long data) +@@ -2017,7 +2159,7 @@ static void sdhci_timeout_timer(unsigned long data) } mmiowb(); @@ -30702,7 +30775,7 @@ index 6ce32a7..0562295 100644 } static void sdhci_tuning_timer(unsigned long data) -@@ -2027,11 +2171,11 @@ static void sdhci_tuning_timer(unsigned long data) +@@ -2027,11 +2169,11 @@ static void sdhci_tuning_timer(unsigned long data) host = (struct sdhci_host *)data; @@ -30716,7 +30789,7 @@ index 6ce32a7..0562295 100644 } /*****************************************************************************\ -@@ -2045,10 +2189,13 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) +@@ -2045,10 +2187,13 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) BUG_ON(intmask == 0); if (!host->cmd) { @@ -30734,7 +30807,7 @@ index 6ce32a7..0562295 100644 return; } -@@ -2118,6 +2265,19 @@ static void sdhci_show_adma_error(struct sdhci_host *host) +@@ -2118,6 +2263,19 @@ static void sdhci_show_adma_error(struct sdhci_host *host) static void sdhci_show_adma_error(struct sdhci_host *host) { } #endif @@ -30754,7 +30827,7 @@ index 6ce32a7..0562295 100644 static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) { BUG_ON(intmask == 0); -@@ -2144,34 +2304,57 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) +@@ -2144,34 +2302,57 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) return; } } @@ -30827,7 +30900,7 @@ index 6ce32a7..0562295 100644 /* * We currently don't do anything fancy with DMA -@@ -2200,18 +2383,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) +@@ -2200,18 +2381,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); } @@ -30848,7 +30921,7 @@ index 6ce32a7..0562295 100644 } } -@@ -2222,10 +2395,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) +@@ -2222,10 +2393,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) u32 intmask; int cardint = 0; @@ -30861,7 +30934,7 @@ index 6ce32a7..0562295 100644 pr_warning("%s: got irq while runtime suspended\n", mmc_hostname(host->mmc)); return IRQ_HANDLED; -@@ -2266,6 +2439,22 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) +@@ -2266,6 +2437,22 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) tasklet_schedule(&host->card_tasklet); } @@ -30884,7 +30957,7 @@ index 6ce32a7..0562295 100644 if (intmask & SDHCI_INT_CMD_MASK) { sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, SDHCI_INT_STATUS); -@@ -2280,7 +2469,13 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) +@@ -2280,7 +2467,13 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); @@ -30899,7 +30972,7 @@ index 6ce32a7..0562295 100644 if (intmask & SDHCI_INT_BUS_POWER) { pr_err("%s: Card is consuming too much power!\n", -@@ -2307,7 +2502,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) +@@ -2307,7 +2500,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) mmiowb(); out: @@ -30908,7 +30981,7 @@ index 6ce32a7..0562295 100644 /* * We have to delay this as it calls back into the driver. -@@ -2363,7 +2558,8 @@ int sdhci_resume_host(struct sdhci_host *host) +@@ -2363,7 +2556,8 @@ int sdhci_resume_host(struct sdhci_host *host) return ret; } @@ -30918,7 +30991,7 @@ index 6ce32a7..0562295 100644 if (host->ops->enable_dma) host->ops->enable_dma(host); } -@@ -2426,15 +2622,15 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host) +@@ -2426,15 +2620,15 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host) host->flags &= ~SDHCI_NEEDS_RETUNING; } @@ -30938,7 +31011,7 @@ index 6ce32a7..0562295 100644 return ret; } -@@ -2466,7 +2662,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) +@@ -2466,7 +2660,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) (host->tuning_mode == SDHCI_TUNING_MODE_1)) host->flags |= SDHCI_NEEDS_RETUNING; @@ -30947,7 +31020,7 @@ index 6ce32a7..0562295 100644 host->runtime_suspended = false; -@@ -2477,7 +2673,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) +@@ -2477,7 +2671,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) /* Enable Card Detection */ sdhci_enable_card_detection(host); @@ -30956,7 +31029,7 @@ index 6ce32a7..0562295 100644 return ret; } -@@ -2570,14 +2766,16 @@ int sdhci_add_host(struct sdhci_host *host) +@@ -2570,14 +2764,16 @@ int sdhci_add_host(struct sdhci_host *host) host->flags &= ~SDHCI_USE_ADMA; } @@ -30975,7 +31048,7 @@ index 6ce32a7..0562295 100644 } } } -@@ -2688,7 +2886,7 @@ int sdhci_add_host(struct sdhci_host *host) +@@ -2688,7 +2884,7 @@ int sdhci_add_host(struct sdhci_host *host) /* Auto-CMD23 stuff only works in ADMA or PIO. */ if ((host->version >= SDHCI_SPEC_300) && ((host->flags & SDHCI_USE_ADMA) || @@ -30984,7 +31057,7 @@ index 6ce32a7..0562295 100644 host->flags |= SDHCI_AUTO_CMD23; DBG("%s: Auto-CMD23 available\n", mmc_hostname(mmc)); } else { -@@ -2821,6 +3019,12 @@ int sdhci_add_host(struct sdhci_host *host) +@@ -2821,6 +3017,12 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_MAX_CURRENT_200; } @@ -30997,7 +31070,7 @@ index 6ce32a7..0562295 100644 mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) -@@ -2915,7 +3119,7 @@ int sdhci_add_host(struct sdhci_host *host) +@@ -2915,7 +3117,7 @@ int sdhci_add_host(struct sdhci_host *host) host->tuning_timer.function = sdhci_tuning_timer; } @@ -31006,7 +31079,7 @@ index 6ce32a7..0562295 100644 mmc_hostname(mmc), host); if (ret) goto untasklet; -@@ -2953,6 +3157,7 @@ int sdhci_add_host(struct sdhci_host *host) +@@ -2953,6 +3155,7 @@ int sdhci_add_host(struct sdhci_host *host) pr_info("%s: SDHCI controller on %s [%s] using %s\n", mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), @@ -31014,7 +31087,7 @@ index 6ce32a7..0562295 100644 (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -@@ -2979,7 +3184,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) +@@ -2979,7 +3182,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) unsigned long flags; if (dead) { @@ -31023,7 +31096,7 @@ index 6ce32a7..0562295 100644 host->flags |= SDHCI_DEVICE_DEAD; -@@ -2991,7 +3196,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) +@@ -2991,7 +3194,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) tasklet_schedule(&host->finish_tasklet); } @@ -32347,11 +32420,24 @@ index 31108a0..48081d1 100644 +obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c new file mode 100644 -index 0000000..c6420de +index 0000000..72454d4 --- /dev/null +++ b/drivers/thermal/bcm2835-thermal.c -@@ -0,0 +1,195 @@ -+//bcm2835-thermal.c +@@ -0,0 +1,208 @@ ++/***************************************************************************** ++* Copyright 2011 Broadcom Corporation. All rights reserved. ++* ++* Unless you and Broadcom execute a separate written software license ++* agreement governing use of this software, this software is licensed to you ++* under the terms of the GNU General Public License version 2, available at ++* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). ++* ++* Notwithstanding the above, under no circumstances may you combine this ++* software in any way with any other Broadcom software provided under a ++* license other than the GPL, without Broadcom's express prior written ++* consent. ++*****************************************************************************/ ++ +#include +#include +#include @@ -86615,10 +86701,10 @@ index 9b9d8ff..6e9e8e9 100644 obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c new file mode 100644 -index 0000000..5ca8aca +index 0000000..efdee9d --- /dev/null +++ b/drivers/video/bcm2708_fb.c -@@ -0,0 +1,487 @@ +@@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c + * @@ -86657,6 +86743,12 @@ index 0000000..5ca8aca +#include +#include + ++#ifdef BCM2708_FB_DEBUG ++#define print_debug(fmt,...) pr_debug("%s:%s:%d: "fmt, MODULE_NAME, __func__, __LINE__, ##__VA_ARGS__) ++#else ++#define print_debug(fmt,...) ++#endif ++ +/* This is limited to 16 characters when displayed by X startup */ +static const char *bcm2708_name = "BCM2708 FB"; + @@ -86756,17 +86848,15 @@ index 0000000..5ca8aca +{ + /* info input, var output */ + int yres; -+ /* memory size in pixels */ -+ unsigned pixels = info->screen_size * 8 / var->bits_per_pixel; + + /* info input, var output */ -+ pr_info("bcm2708_fb_check_var info(%p) %dx%d (%dx%d), %d, %d\n", info, ++ print_debug("bcm2708_fb_check_var info(%p) %dx%d (%dx%d), %d, %d\n", info, + info->var.xres, info->var.yres, info->var.xres_virtual, + info->var.yres_virtual, (int)info->screen_size, + info->var.bits_per_pixel); -+ pr_info("bcm2708_fb_check_var var(%p) %dx%d (%dx%d), %d, %d\n", var, ++ print_debug("bcm2708_fb_check_var var(%p) %dx%d (%dx%d), %d\n", var, + var->xres, var->yres, var->xres_virtual, var->yres_virtual, -+ var->bits_per_pixel, pixels); ++ var->bits_per_pixel); + + if (!var->bits_per_pixel) + var->bits_per_pixel = 16; @@ -86832,7 +86922,7 @@ index 0000000..5ca8aca + fbinfo->base = 0; /* filled in by VC */ + fbinfo->pitch = 0; /* filled in by VC */ + -+ pr_info("bcm2708_fb_set_par info(%p) %dx%d (%dx%d), %d, %d\n", info, ++ print_debug("bcm2708_fb_set_par info(%p) %dx%d (%dx%d), %d, %d\n", info, + info->var.xres, info->var.yres, info->var.xres_virtual, + info->var.yres_virtual, (int)info->screen_size, + info->var.bits_per_pixel); @@ -86872,7 +86962,7 @@ index 0000000..5ca8aca + BUG(); /* what can we do here */ + } + } -+ pr_info ++ print_debug + ("BCM2708FB: start = %p,%p width=%d, height=%d, bpp=%d, pitch=%d size=%d success=%d\n", + (void *)fb->fb.screen_base, (void *)fb->fb.fix.smem_start, + fbinfo->xres, fbinfo->yres, fbinfo->bpp, @@ -86895,7 +86985,7 @@ index 0000000..5ca8aca +{ + struct bcm2708_fb *fb = to_bcm2708(info); + -+ /*pr_info("BCM2708FB: setcolreg %d:(%02x,%02x,%02x,%02x) %x\n", regno, red, green, blue, transp, fb->fb.fix.visual);*/ ++ /*print_debug("BCM2708FB: setcolreg %d:(%02x,%02x,%02x,%02x) %x\n", regno, red, green, blue, transp, fb->fb.fix.visual);*/ + if (fb->fb.var.bits_per_pixel <= 8) { + if (regno < 256) { + /* blue [0:4], green [5:10], red [11:15] */ @@ -86918,28 +87008,28 @@ index 0000000..5ca8aca + +static int bcm2708_fb_blank(int blank_mode, struct fb_info *info) +{ -+ /*pr_info("bcm2708_fb_blank\n"); */ ++ /*print_debug("bcm2708_fb_blank\n"); */ + return -1; +} + +static void bcm2708_fb_fillrect(struct fb_info *info, + const struct fb_fillrect *rect) +{ -+ /* (is called) pr_info("bcm2708_fb_fillrect\n"); */ ++ /* (is called) print_debug("bcm2708_fb_fillrect\n"); */ + cfb_fillrect(info, rect); +} + +static void bcm2708_fb_copyarea(struct fb_info *info, + const struct fb_copyarea *region) +{ -+ /*pr_info("bcm2708_fb_copyarea\n"); */ ++ /*print_debug("bcm2708_fb_copyarea\n"); */ + cfb_copyarea(info, region); +} + +static void bcm2708_fb_imageblit(struct fb_info *info, + const struct fb_image *image) +{ -+ /* (is called) pr_info("bcm2708_fb_imageblit\n"); */ ++ /* (is called) print_debug("bcm2708_fb_imageblit\n"); */ + cfb_imageblit(info, image); +} + @@ -87014,15 +87104,15 @@ index 0000000..5ca8aca + + fb_set_var(&fb->fb, &fb->fb.var); + -+ pr_info("BCM2708FB: registering framebuffer (%dx%d@%d)\n", fbwidth, ++ print_debug("BCM2708FB: registering framebuffer (%dx%d@%d)\n", fbwidth, + fbheight, fbdepth); + + ret = register_framebuffer(&fb->fb); -+ pr_info("BCM2708FB: register framebuffer (%d)\n", ret); ++ print_debug("BCM2708FB: register framebuffer (%d)\n", ret); + if (ret == 0) + goto out; + -+ pr_info("BCM2708FB: cannot register framebuffer (%d)\n", ret); ++ print_debug("BCM2708FB: cannot register framebuffer (%d)\n", ret); +out: + return ret; +} @@ -90336,7 +90426,7 @@ index 0000000..0c1b80a +} diff --git a/sound/arm/bcm2835-pcm.c b/sound/arm/bcm2835-pcm.c new file mode 100755 -index 0000000..bc146a2 +index 0000000..2f63ac6 --- /dev/null +++ b/sound/arm/bcm2835-pcm.c @@ -0,0 +1,408 @@ @@ -90440,7 +90530,7 @@ index 0000000..bc146a2 + + audio_info(" .. IN (%d)\n", substream->number); + -+ audio_warning("Alsa open (%d)\n", substream->number); ++ audio_info("Alsa open (%d)\n", substream->number); + idx = substream->number; + + if (idx > MAX_SUBSTREAMS) { @@ -90509,7 +90599,7 @@ index 0000000..bc146a2 + bcm2835_alsa_stream_t *alsa_stream = runtime->private_data; + + audio_info(" .. IN\n"); -+ audio_warning("Alsa close\n"); ++ audio_info("Alsa close\n"); + + /* + * Call stop if it's still running. This happens when app @@ -90750,10 +90840,10 @@ index 0000000..bc146a2 +} diff --git a/sound/arm/bcm2835-vchiq.c b/sound/arm/bcm2835-vchiq.c new file mode 100755 -index 0000000..68d838d +index 0000000..3b7ed1e --- /dev/null +++ b/sound/arm/bcm2835-vchiq.c -@@ -0,0 +1,834 @@ +@@ -0,0 +1,825 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. +* @@ -90788,17 +90878,10 @@ index 0000000..68d838d +/* ---- Include Files -------------------------------------------------------- */ + +#include "interface/vchi/vchi.h" -+#include "interface/vcos/vcos.h" -+#include "interface/vcos/vcos_logging.h" +#include "vc_vchi_audioserv_defs.h" + +/* ---- Private Constants and Types ------------------------------------------ */ + -+/* VCOS logging category for this service */ -+#define VCOS_LOG_CATEGORY (&audio_log_category) -+ -+/* Default VCOS logging level */ -+#define LOG_LEVEL VCOS_LOG_WARN +/* Logging macros (for remapping to other logging mechanisms, i.e., printf) */ +#ifdef AUDIO_DEBUG_ENABLE + #define LOG_ERR( fmt, arg... ) pr_err( "%s:%d " fmt, __func__, __LINE__, ##arg) @@ -90806,26 +90889,23 @@ index 0000000..68d838d + #define LOG_INFO( fmt, arg... ) pr_info( "%s:%d " fmt, __func__, __LINE__, ##arg) + #define LOG_DBG( fmt, arg... ) pr_info( "%s:%d " fmt, __func__, __LINE__, ##arg) +#else -+ #define LOG_ERR( fmt, arg... ) vcos_log_error( "%s:%d " fmt, __func__, __LINE__, ##arg) -+ #define LOG_WARN( fmt, arg... ) vcos_log_warn( "%s:%d " fmt, __func__, __LINE__, ##arg) -+ #define LOG_INFO( fmt, arg... ) vcos_log_info( "%s:%d " fmt, __func__, __LINE__, ##arg) -+ #define LOG_DBG( fmt, arg... ) vcos_log_info( "%s:%d " fmt, __func__, __LINE__, ##arg) ++ #define LOG_ERR( fmt, arg... ) ++ #define LOG_WARN( fmt, arg... ) ++ #define LOG_INFO( fmt, arg... ) ++ #define LOG_DBG( fmt, arg... ) +#endif + +typedef struct opaque_AUDIO_INSTANCE_T { + uint32_t num_connections; + VCHI_SERVICE_HANDLE_T vchi_handle[VCHI_MAX_NUM_CONNECTIONS]; -+ VCOS_EVENT_T msg_avail_event; -+ VCOS_MUTEX_T vchi_mutex; ++ struct semaphore msg_avail_event; ++ struct mutex vchi_mutex; + bcm2835_alsa_stream_t *alsa_stream; + int32_t result, got_result; +} AUDIO_INSTANCE_T; + +/* ---- Private Variables ---------------------------------------------------- */ + -+/* VCOS logging category for this service */ -+static VCOS_LOG_CAT_T audio_log_category; -+ +/* ---- Private Function Prototypes ------------------------------------------ */ + +/* ---- Private Functions ---------------------------------------------------- */ @@ -90942,7 +91022,7 @@ index 0000000..68d838d + BUG_ON(instance->got_result); + instance->result = m.u.result.success; + instance->got_result = 1; -+ vcos_event_signal(&instance->msg_avail_event); ++ up(&instance->msg_avail_event); + } else if (m.type == VC_AUDIO_MSG_TYPE_COMPLETE) { + irq_handler_t callback = (irq_handler_t) m.u.complete.callback; + LOG_DBG @@ -90955,7 +91035,7 @@ index 0000000..68d838d + LOG_DBG(" .. unexpected alsa_stream=%p, callback=%p\n", + alsa_stream, callback); + } -+ vcos_event_signal(&instance->msg_avail_event); ++ up(&instance->msg_avail_event); + } else { + LOG_DBG(" .. unexpected m.type=%d\n", m.type); + } @@ -90968,7 +91048,7 @@ index 0000000..68d838d +{ + uint32_t i; + AUDIO_INSTANCE_T *instance; -+ VCOS_STATUS_T status; ++ int status; + + LOG_DBG("%s: start", __func__); + @@ -90979,27 +91059,16 @@ index 0000000..68d838d + return NULL; + } + /* Allocate memory for this instance */ -+ instance = vcos_malloc(sizeof(*instance), "audio_instance"); ++ instance = kmalloc(sizeof(*instance), GFP_KERNEL); ++ + memset(instance, 0, sizeof(*instance)); + + instance->num_connections = num_connections; + /* Create the message available event */ -+ status = -+ vcos_event_create(&instance->msg_avail_event, "audio_msg_avail"); -+ if (status != VCOS_SUCCESS) { -+ LOG_ERR("%s: failed to create event (status=%d)", __func__, -+ status); ++ sema_init(&instance->msg_avail_event,1); + -+ goto err_free_mem; -+ } + /* Create a lock for exclusive, serialized VCHI connection access */ -+ status = vcos_mutex_create(&instance->vchi_mutex, "audio_vchi_mutex"); -+ if (status != VCOS_SUCCESS) { -+ LOG_ERR("%s: failed to create event (status=%d)", __func__, -+ status); -+ -+ goto err_delete_event; -+ } ++ mutex_init(&instance->vchi_mutex); + /* Open the VCHI service connections */ + for (i = 0; i < num_connections; i++) { + SERVICE_CREATION_T params = { @@ -91009,14 +91078,14 @@ index 0000000..68d838d + 0, // tx fifo size (unused) + audio_vchi_callback, // service callback + instance, // service callback parameter -+ VCOS_TRUE, //TODO: remove VCOS_FALSE, // unaligned bulk recieves -+ VCOS_TRUE, //TODO: remove VCOS_FALSE, // unaligned bulk transmits -+ VCOS_FALSE // want crc check on bulk transfers ++ 1, //TODO: remove VCOS_FALSE, // unaligned bulk recieves ++ 1, //TODO: remove VCOS_FALSE, // unaligned bulk transmits ++ 0 // want crc check on bulk transfers + }; + + status = vchi_service_open(vchi_instance, ¶ms, + &instance->vchi_handle[i]); -+ if (status != VCOS_SUCCESS) { ++ if (status) { + LOG_ERR + ("%s: failed to open VCHI service connection (status=%d)", + __func__, status); @@ -91034,13 +91103,7 @@ index 0000000..68d838d + vchi_service_close(instance->vchi_handle[i]); + } + -+ vcos_mutex_delete(&instance->vchi_mutex); -+ -+err_delete_event: -+ vcos_event_delete(&instance->msg_avail_event); -+ -+err_free_mem: -+ vcos_free(instance); ++ kfree(instance); + + return NULL; +} @@ -91058,7 +91121,11 @@ index 0000000..68d838d + } + + LOG_DBG(" .. about to lock (%d)\n", instance->num_connections); -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + + /* Close all VCHI service connections */ + for (i = 0; i < instance->num_connections; i++) { @@ -91074,16 +91141,9 @@ index 0000000..68d838d + } + } + -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + -+ vcos_mutex_delete(&instance->vchi_mutex); -+ -+ vcos_event_delete(&instance->msg_avail_event); -+ -+ vcos_free(instance); -+ -+ /* Unregister the log category so we can add it back next time */ -+ vcos_log_unregister(&audio_log_category); ++ kfree(instance); + + LOG_DBG(" .. OUT\n"); + @@ -91127,10 +91187,6 @@ index 0000000..68d838d + goto err_free_mem; + } + -+ /* Set up the VCOS logging */ -+ vcos_log_set_level(VCOS_LOG_CATEGORY, LOG_LEVEL); -+ vcos_log_register("audio", VCOS_LOG_CATEGORY); -+ + /* Initialize an instance of the audio service */ + instance = vc_vchi_audio_init(vchi_instance, &vchi_connection, 1); + @@ -91168,7 +91224,11 @@ index 0000000..68d838d + } + instance = alsa_stream->instance; + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + m.type = VC_AUDIO_MSG_TYPE_OPEN; @@ -91190,7 +91250,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); +exit: + LOG_DBG(" .. OUT\n"); + return ret; @@ -91208,7 +91268,11 @@ index 0000000..68d838d + LOG_INFO + (" Setting ALSA dest(%d), volume(%d)\n", chip->dest, chip->volume); + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + instance->got_result = 0; @@ -91233,8 +91297,7 @@ index 0000000..68d838d + + /* We are expecting a reply from the videocore */ + while (!instance->got_result) { -+ success = vcos_event_wait(&instance->msg_avail_event); -+ if (success != VCOS_SUCCESS) { ++ if (down_interruptible(&instance->msg_avail_event)) { + LOG_ERR("%s: failed on waiting for event (status=%d)", + __func__, success); + @@ -91254,7 +91317,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + + LOG_DBG(" .. OUT\n"); + return ret; @@ -91308,7 +91371,11 @@ index 0000000..68d838d + return -EINVAL; + } + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + instance->got_result = 0; @@ -91334,8 +91401,7 @@ index 0000000..68d838d + + /* We are expecting a reply from the videocore */ + while (!instance->got_result) { -+ success = vcos_event_wait(&instance->msg_avail_event); -+ if (success != VCOS_SUCCESS) { ++ if (down_interruptible(&instance->msg_avail_event)) { + LOG_ERR("%s: failed on waiting for event (status=%d)", + __func__, success); + @@ -91355,7 +91421,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + + LOG_DBG(" .. OUT\n"); + return ret; @@ -91378,7 +91444,11 @@ index 0000000..68d838d + int ret; + LOG_DBG(" .. IN\n"); + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + m.type = VC_AUDIO_MSG_TYPE_START; @@ -91400,7 +91470,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + LOG_DBG(" .. OUT\n"); + return ret; +} @@ -91413,7 +91483,11 @@ index 0000000..68d838d + int ret; + LOG_DBG(" .. IN\n"); + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + m.type = VC_AUDIO_MSG_TYPE_STOP; @@ -91436,7 +91510,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + LOG_DBG(" .. OUT\n"); + return ret; +} @@ -91451,7 +91525,11 @@ index 0000000..68d838d + + my_workqueue_quit(alsa_stream); + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + m.type = VC_AUDIO_MSG_TYPE_CLOSE; @@ -91468,8 +91546,7 @@ index 0000000..68d838d + goto unlock; + } + while (!instance->got_result) { -+ success = vcos_event_wait(&instance->msg_avail_event); -+ if (success != VCOS_SUCCESS) { ++ if (down_interruptible(&instance->msg_avail_event)) { + LOG_ERR("%s: failed on waiting for event (status=%d)", + __func__, success); + @@ -91489,7 +91566,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + + /* Stop the audio service */ + if (instance) { @@ -91512,7 +91589,11 @@ index 0000000..68d838d + + LOG_INFO(" Writing %d bytes from %p\n", count, src); + -+ vcos_mutex_lock(&instance->vchi_mutex); ++ if(mutex_lock_interruptible(&instance->vchi_mutex)) ++ { ++ LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",instance->num_connections); ++ return -EINTR; ++ } + vchi_service_use(instance->vchi_handle[0]); + + m.type = VC_AUDIO_MSG_TYPE_WRITE; @@ -91557,7 +91638,7 @@ index 0000000..68d838d + +unlock: + vchi_service_release(instance->vchi_handle[0]); -+ vcos_mutex_unlock(&instance->vchi_mutex); ++ mutex_unlock(&instance->vchi_mutex); + LOG_DBG(" .. OUT\n"); + return ret; +} @@ -91590,10 +91671,10 @@ index 0000000..68d838d +} diff --git a/sound/arm/bcm2835.c b/sound/arm/bcm2835.c new file mode 100755 -index 0000000..44bedb5 +index 0000000..9546fe6 --- /dev/null +++ b/sound/arm/bcm2835.c -@@ -0,0 +1,418 @@ +@@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. +* @@ -91683,8 +91764,6 @@ index 0000000..44bedb5 + bcm2835_chip_t *chip; + struct snd_card *card; + int err; -+ printk(KERN_INFO "Probing FOR bcm2835 ALSA device (%d):(%d)\n", -+ dev, enable[dev]); + + if (dev >= MAX_SUBSTREAMS) + return -ENODEV; @@ -91697,7 +91776,6 @@ index 0000000..44bedb5 + if (dev > 0) + goto add_register_map; + -+ printk("Creating card...\n"); + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &g_card); + if (err < 0) + goto out; @@ -91970,8 +92048,6 @@ index 0000000..44bedb5 + printk("Error registering bcm2835_alsa7_driver %d .\n", err); + goto unregister_6; + } -+ printk(KERN_INFO "BCM2835 ALSA driver init %s\n", -+ err ? "FAILED" : "OK"); + + return 0; + From d5084b220dbe966769ef97284124a9561d38f345 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 02:32:55 +0200 Subject: [PATCH 27/47] systemd: update to systemd-191 Signed-off-by: Stephan Raue --- packages/sysutils/systemd/meta | 2 +- .../patches/systemd-189-broken-HAVE_XZ.patch | 33 -------- .../systemd-189-missing_includes.patch | 78 ------------------- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch delete mode 100644 packages/sysutils/systemd/patches/systemd-189-missing_includes.patch diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta index 9dbb17edf9..cf26819121 100644 --- a/packages/sysutils/systemd/meta +++ b/packages/sysutils/systemd/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="189" +PKG_VERSION="191" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch deleted file mode 100644 index 717a2aafc6..0000000000 --- a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch +++ /dev/null @@ -1,33 +0,0 @@ -Without this, build fail if we --disable-xz or does not have xz installed in -system. - -Signed-off-by: Yin Kangkai ---- - src/journal/journal-verify.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 2401293..5d134bd 100644 ---- a/src/journal/journal-verify.c -+++ b/src/journal/journal-verify.c -@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { - h1 = le64toh(o->data.hash); - - if (o->object.flags & OBJECT_COMPRESSED) { -+#ifdef HAVE_XZ - void *b = NULL; - uint64_t alloc = 0, b_size; - -@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { - - h2 = hash64(b, b_size); - free(b); -+#else -+ return -EPROTONOSUPPORT; -+#endif - } else - h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload)); - --- -1.7.3.4 - diff --git a/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch b/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch deleted file mode 100644 index 19ff579cc5..0000000000 --- a/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Allin Cottrell -Date: Thu, 23 Aug 2012 23:46:38 +0000 -Subject: journald: add missing includes - ---- -diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c -index 6cd2397..2596d44 100644 ---- a/src/journal/journald-console.c -+++ b/src/journal/journald-console.c -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #include "journald.h" - #include "journald-console.h" -diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf -index 2f83cbd..32474df 100644 ---- a/src/journal/journald-gperf.gperf -+++ b/src/journal/journald-gperf.gperf -@@ -1,5 +1,6 @@ - %{ - #include -+#include - #include "conf-parser.h" - #include "journald.h" - %} -diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c -index aebca5d..b259480 100644 ---- a/src/journal/journald-kmsg.c -+++ b/src/journal/journald-kmsg.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c -index 7aa99a3..4e44c3a 100644 ---- a/src/journal/journald-native.c -+++ b/src/journal/journald-native.c -@@ -20,6 +20,7 @@ - ***/ - - #include -+#include - #include - - #include "socket-util.h" -diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c -index 3e4022a..113c421 100644 ---- a/src/journal/journald-stream.c -+++ b/src/journal/journald-stream.c -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - - #ifdef HAVE_SELINUX -diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index daed095..9db9198 100644 ---- a/src/journal/journald-syslog.c -+++ b/src/journal/journald-syslog.c -@@ -20,6 +20,7 @@ - ***/ - - #include -+#include - #include - - #include "socket-util.h" --- -cgit v0.9.0.2-2-gbebe From 81af45f83b4db4172853a2e1830698d7effbb6ee Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 17:30:30 +0200 Subject: [PATCH 28/47] systemd: add buildfix patch Signed-off-by: Stephan Raue --- .../patches/systemd-191-buildfix.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/sysutils/systemd/patches/systemd-191-buildfix.patch diff --git a/packages/sysutils/systemd/patches/systemd-191-buildfix.patch b/packages/sysutils/systemd/patches/systemd-191-buildfix.patch new file mode 100644 index 0000000000..3034e20ca9 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-191-buildfix.patch @@ -0,0 +1,20 @@ +From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 21 Sep 2012 22:16:13 +0000 +Subject: journal: bring mmap cache prototype in sync + +--- +diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h +index de34634..0c42fb8 100644 +--- a/src/journal/mmap-cache.h ++++ b/src/journal/mmap-cache.h +@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); + MMapCache* mmap_cache_ref(MMapCache *m); + MMapCache* mmap_cache_unref(MMapCache *m); + +-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); ++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); + void mmap_cache_close_fd(MMapCache *m, int fd); + void mmap_cache_close_context(MMapCache *m, unsigned context); +-- +cgit v0.9.0.2-2-gbebe From 981a9858b3121b32b71a354e6088e7c2fce637fc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 17:31:58 +0200 Subject: [PATCH 29/47] bcm2835-driver: update to bcm2835-driver-2245c75 Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 4dccdd02dc..4b70c8e4f1 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="f20e9d7" +PKG_VERSION="2245c75" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 6bf0a10c2693b6bcb83e5ca05c7de13e788580e6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 17:32:27 +0200 Subject: [PATCH 30/47] bcm2835-bootloader: update to bcm2835-bootloader-2245c75 Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index 26fb98d3b7..b3bb8e9000 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="f20e9d7" +PKG_VERSION="2245c75" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From e6e7063e6f0bcba07e1531ce46a95b0a4efcc3cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 20:06:25 +0200 Subject: [PATCH 31/47] ffmpeg: cleanup buildscript Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/build | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/multimedia/ffmpeg/build b/packages/multimedia/ffmpeg/build index 96a368d7d2..27022bd66e 100755 --- a/packages/multimedia/ffmpeg/build +++ b/packages/multimedia/ffmpeg/build @@ -61,17 +61,17 @@ fi case "$TARGET_ARCH" in arm) - FFMPEG_CPU="--enable-armv5te --disable-armv6t2 --enable-armv6" + FFMPEG_CPU="" FFMPEG_TABLES="--enable-hardcoded-tables" FFMPEG_PIC="--enable-pic" ;; i?86) - FFMPEG_CPU="--disable-armv5te --disable-armv6t2 --disable-armv6" + FFMPEG_CPU="" FFMPEG_TABLES="--disable-hardcoded-tables" FFMPEG_PIC="--disable-pic" ;; x86_64) - FFMPEG_CPU="--disable-armv5te --disable-armv6t2 --disable-armv6" + FFMPEG_CPU="" FFMPEG_TABLES="--disable-hardcoded-tables" FFMPEG_PIC="--enable-pic" ;; @@ -79,19 +79,19 @@ esac case "$TARGET_FPU" in neon*) - FFMPEG_FPU="--enable-neon --disable-armvfp" + FFMPEG_FPU="--enable-neon" ;; vfp*) - FFMPEG_FPU="--enable-armvfp --disable-neon" + FFMPEG_FPU="" ;; *) - FFMPEG_FPU="--disable-neon --disable-armvfp" + FFMPEG_FPU="" ;; esac export pkg_config="$ROOT/$TOOLCHAIN/bin/pkg-config" -# libav fails building with LTO support +# ffmpeg fails building with LTO support strip_lto #LDFLAGS="$(echo "$LDFLAGS" | sed "s/-Wl,-Bsymbolic-functions//g")" @@ -218,8 +218,5 @@ cd $PKG_BUILD/ --disable-sram \ --disable-symver \ -#sed -i -e "s#define HAVE_SYMVER 1#define HAVE_SYMVER 0#" config.h && -#sed -i -e "s#define HAVE_SYMVER_GNU_ASM 1#define HAVE_SYMVER_GNU_ASM 0#" config.h - make V=1 $MAKEINSTALL From 3189a75b577de6c527dfd6e58647a3690beb40b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 20:06:52 +0200 Subject: [PATCH 32/47] ffmpeg: update to ffmpeg-0.10.5 Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/meta | 2 +- ...-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch} | 0 ...-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch} | 0 ...-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch} | 0 ...-0004-asf-hacks.patch => ffmpeg-0.10.5-0004-asf-hacks.patch} | 0 ...-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch} | 0 ...-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch} | 0 ....10.5-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch} | 0 ...008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch} | 0 ...-fixed-compile-with-VDPAU-header-versions-without-MPE.patch} | 0 ...-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch} | 0 ...0.10.5-0011-Get-stream-durations-using-read_timestamp.patch} | 0 ...stdint.h.patch => ffmpeg-0.10.5-0012-include-stdint.h.patch} | 0 ...mpeg-0.10.5-0013-aacenc-add-recognized-profiles-array.patch} | 0 ...-changed-allow-8-second-skew-between-streams-in-mov-b.patch} | 0 ...-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch} | 0 ...fmpeg-0.10.5-0016-Speed-up-mpegts-av_find_stream_info.patch} | 0 ...-allow-customizing-shared-library-soname-name-with-ma.patch} | 0 ...-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch} | 0 ...mpeg-0.10.5-0019-dxva-mpeg2-speed-up-slice-allocation.patch} | 0 ...-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch} | 0 ...0.10.5-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch} | 0 ...-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch} | 0 ...-Changed-format-string-td-not-supported-by-our-MingW-.patch} | 0 ...0.10.5-0024-add-public-version-of-ff_read_frame_flush.patch} | 0 ...0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch} | 0 ...-0.10.5-0026-Handle-return-value-of-BeginFrame-better.patch} | 0 ...tch => ffmpeg-0.10.5-0028-added-support-for-OTF-fonts.patch} | 0 ...0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch} | 0 ...-0.10.5-0029-stop-forcing-gas-preprocessor-for-darwin.patch} | 0 ...rate-position-independent-code-to-access-data-symbols.patch} | 0 ....5-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch} | 0 ...upport.patch => ffmpeg-0.10.5-901.01-add_xvba_support.patch} | 0 ...1.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch} | 0 ...tch => ffmpeg-0.10.5-901.03-xvba_xvba_vc-1_new_ffmpeg.patch} | 0 ...ba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch} | 0 ... ffmpeg-0.10.5-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch} | 0 ...-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch} | 0 38 files changed, 1 insertion(+), 1 deletion(-) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch => ffmpeg-0.10.5-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch => ffmpeg-0.10.5-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch => ffmpeg-0.10.5-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0004-asf-hacks.patch => ffmpeg-0.10.5-0004-asf-hacks.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch => ffmpeg-0.10.5-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch => ffmpeg-0.10.5-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch => ffmpeg-0.10.5-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch => ffmpeg-0.10.5-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch => ffmpeg-0.10.5-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch => ffmpeg-0.10.5-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0011-Get-stream-durations-using-read_timestamp.patch => ffmpeg-0.10.5-0011-Get-stream-durations-using-read_timestamp.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0012-include-stdint.h.patch => ffmpeg-0.10.5-0012-include-stdint.h.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0013-aacenc-add-recognized-profiles-array.patch => ffmpeg-0.10.5-0013-aacenc-add-recognized-profiles-array.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch => ffmpeg-0.10.5-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch => ffmpeg-0.10.5-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0016-Speed-up-mpegts-av_find_stream_info.patch => ffmpeg-0.10.5-0016-Speed-up-mpegts-av_find_stream_info.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0017-allow-customizing-shared-library-soname-name-with-ma.patch => ffmpeg-0.10.5-0017-allow-customizing-shared-library-soname-name-with-ma.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch => ffmpeg-0.10.5-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0019-dxva-mpeg2-speed-up-slice-allocation.patch => ffmpeg-0.10.5-0019-dxva-mpeg2-speed-up-slice-allocation.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch => ffmpeg-0.10.5-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch => ffmpeg-0.10.5-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch => ffmpeg-0.10.5-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch => ffmpeg-0.10.5-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0024-add-public-version-of-ff_read_frame_flush.patch => ffmpeg-0.10.5-0024-add-public-version-of-ff_read_frame_flush.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch => ffmpeg-0.10.5-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0026-Handle-return-value-of-BeginFrame-better.patch => ffmpeg-0.10.5-0026-Handle-return-value-of-BeginFrame-better.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0028-added-support-for-OTF-fonts.patch => ffmpeg-0.10.5-0028-added-support-for-OTF-fonts.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch => ffmpeg-0.10.5-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0029-stop-forcing-gas-preprocessor-for-darwin.patch => ffmpeg-0.10.5-0029-stop-forcing-gas-preprocessor-for-darwin.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch => ffmpeg-0.10.5-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch => ffmpeg-0.10.5-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-901.01-add_xvba_support.patch => ffmpeg-0.10.5-901.01-add_xvba_support.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch => ffmpeg-0.10.5-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-901.03-xvba_xvba_vc-1_new_ffmpeg.patch => ffmpeg-0.10.5-901.03-xvba_xvba_vc-1_new_ffmpeg.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch => ffmpeg-0.10.5-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch => ffmpeg-0.10.5-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-0.10.4-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch => ffmpeg-0.10.5-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch} (100%) diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta index 54368e6df2..1a03c63cfd 100644 --- a/packages/multimedia/ffmpeg/meta +++ b/packages/multimedia/ffmpeg/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ffmpeg" -PKG_VERSION="0.10.4" +PKG_VERSION="0.10.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0004-asf-hacks.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0004-asf-hacks.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0004-asf-hacks.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0004-asf-hacks.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0011-Get-stream-durations-using-read_timestamp.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0011-Get-stream-durations-using-read_timestamp.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0011-Get-stream-durations-using-read_timestamp.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0011-Get-stream-durations-using-read_timestamp.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0012-include-stdint.h.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0012-include-stdint.h.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0012-include-stdint.h.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0012-include-stdint.h.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0013-aacenc-add-recognized-profiles-array.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0013-aacenc-add-recognized-profiles-array.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0013-aacenc-add-recognized-profiles-array.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0013-aacenc-add-recognized-profiles-array.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0016-Speed-up-mpegts-av_find_stream_info.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0016-Speed-up-mpegts-av_find_stream_info.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0016-Speed-up-mpegts-av_find_stream_info.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0016-Speed-up-mpegts-av_find_stream_info.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0017-allow-customizing-shared-library-soname-name-with-ma.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0017-allow-customizing-shared-library-soname-name-with-ma.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0017-allow-customizing-shared-library-soname-name-with-ma.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0017-allow-customizing-shared-library-soname-name-with-ma.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0019-dxva-mpeg2-speed-up-slice-allocation.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0019-dxva-mpeg2-speed-up-slice-allocation.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0019-dxva-mpeg2-speed-up-slice-allocation.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0019-dxva-mpeg2-speed-up-slice-allocation.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0024-add-public-version-of-ff_read_frame_flush.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0024-add-public-version-of-ff_read_frame_flush.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0024-add-public-version-of-ff_read_frame_flush.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0024-add-public-version-of-ff_read_frame_flush.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0026-Handle-return-value-of-BeginFrame-better.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0026-Handle-return-value-of-BeginFrame-better.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0026-Handle-return-value-of-BeginFrame-better.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0026-Handle-return-value-of-BeginFrame-better.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-added-support-for-OTF-fonts.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0028-added-support-for-OTF-fonts.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-added-support-for-OTF-fonts.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0028-added-support-for-OTF-fonts.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0029-stop-forcing-gas-preprocessor-for-darwin.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0029-stop-forcing-gas-preprocessor-for-darwin.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0029-stop-forcing-gas-preprocessor-for-darwin.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0029-stop-forcing-gas-preprocessor-for-darwin.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0030-ARM-generate-position-independent-code-to-access-data-symbols.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-0031-ARM-vp56-allow-inline-asm-to-build-with-clang.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.01-add_xvba_support.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.01-add_xvba_support.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.01-add_xvba_support.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.01-add_xvba_support.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.03-xvba_xvba_vc-1_new_ffmpeg.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.03-xvba_xvba_vc-1_new_ffmpeg.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.03-xvba_xvba_vc-1_new_ffmpeg.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.03-xvba_xvba_vc-1_new_ffmpeg.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.04-xvba_correct_h.264_level_in_case_it_was_encoded_wrongly.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.5-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch From e8ecfb4c84a1b1dcb93bcccbdbee760d5d2604b7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 20:07:33 +0200 Subject: [PATCH 33/47] xbmc-frodo: update to xbmc-frodo-e2c8d74 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ....1.patch => xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch} | 0 ...-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch} | 0 ...74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...atch => xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch} | 0 ...> xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...patch => xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch} | 0 ...ch => xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch} | 0 ...tch => xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch} | 0 12 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch => xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-452-change_lcd_content-0.1.patch => xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-454-disable_backslash-0.1.patch => xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-457-fix_connection_check-0.1.patch => xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch => xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 246ba0bf96..2d67884c4f 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="5184234" +PKG_VERSION="e2c8d74" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 85258e0dda..9a0eef5c9f 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="5184234" +PKG_VERSION="e2c8d74" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5184234-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch From 86a94d71a2a4f717c27cff89afbf5e98a68dd4c6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 21:23:10 +0200 Subject: [PATCH 34/47] bcm2835-bootloader: update to bcm2835-bootloader-2997db1 Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index b3bb8e9000..3812d54d5f 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="2245c75" +PKG_VERSION="2997db1" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From e6c8127a31f47b12e2f97c00485458ed226fc5e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Sep 2012 21:23:34 +0200 Subject: [PATCH 35/47] bcm2835-driver: update to bcm2835-driver-2997db1 Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 4b70c8e4f1..984317e282 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="2245c75" +PKG_VERSION="2997db1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 8c6c9c788bfa1eae677f319db52d9a5c0fc20c7e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 00:45:57 +0200 Subject: [PATCH 36/47] samba: fix typo Signed-off-by: Stephan Raue --- packages/network/samba/scripts/52_samba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 16fa8a72f6..4870ce39c8 100644 --- a/packages/network/samba/scripts/52_samba +++ b/packages/network/samba/scripts/52_samba @@ -28,7 +28,7 @@ if [ "$SAMBA_START" = "true" ]; then - # sleep 2 sec to be ensure network is started + # sleep 10 sec to be ensure network is started usleep 10000000 progress "Starting Samba server" From 7994ad88fcb3d5faba15076c9b0f28452051c316 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 00:46:20 +0200 Subject: [PATCH 37/47] avahi: add start delay Signed-off-by: Stephan Raue --- packages/network/avahi/init.d/53_avahi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi index 4f34faf3b8..ef12e72fa0 100644 --- a/packages/network/avahi/init.d/53_avahi +++ b/packages/network/avahi/init.d/53_avahi @@ -23,6 +23,9 @@ # runlevels: openelec, textmode ( + # sleep 10 sec to be ensure network is started + usleep 10000000 + progress "Starting Avahi Daemon" mkdir -p /var/run/avahi-daemon From bec6dcaf5b15f100adc5999ae1f2648c8d930fdf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 03:32:56 +0200 Subject: [PATCH 38/47] xbmc-frodo: add DR by default (PR1426) Signed-off-by: Stephan Raue --- .../xbmc-frodo-e2c8d74-901-PR1426.patch | 38 +++++++++++++++++++ projects/RPi/xbmc/advancedsettings.xml | 6 --- 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch new file mode 100644 index 0000000000..bd103a4c90 --- /dev/null +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch @@ -0,0 +1,38 @@ +From 735e49e62dc07cbe94cb75e9069a01b1b985f70f Mon Sep 17 00:00:00 2001 +From: Cory Fields +Date: Fri, 14 Sep 2012 15:35:32 -0400 +Subject: [PATCH] d-r: enable dirty-regions by default + +This enables the all-or-nothing mode, which means that we repaint the entire +screen if there's a single dirty region. + +Also, nofliptimeout=0 is set to ensure that we never flip without rendering. + +With these combined, this should be universally safe (and within spec) for all +gfx cards/drivers. + +The main possible side-effect is the slow-motion effect brought about on slower +cpus that can't keep up at times and produce wild timestamps. With our improved +decoding and caching, this is now quite rare. +--- + xbmc/settings/AdvancedSettings.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index 47aaf7e..6f75227 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -306,8 +306,8 @@ void CAdvancedSettings::Initialize() + + m_canWindowed = true; + m_guiVisualizeDirtyRegions = false; +- m_guiAlgorithmDirtyRegions = 0; +- m_guiDirtyRegionNoFlipTimeout = -1; ++ m_guiAlgorithmDirtyRegions = 3; ++ m_guiDirtyRegionNoFlipTimeout = 0; + m_logEnableAirtunes = false; + m_airTunesPort = 36666; + m_airPlayPort = 36667; +-- +1.7.10 + diff --git a/projects/RPi/xbmc/advancedsettings.xml b/projects/RPi/xbmc/advancedsettings.xml index 1e1412aa4e..abc74fa1ab 100644 --- a/projects/RPi/xbmc/advancedsettings.xml +++ b/projects/RPi/xbmc/advancedsettings.xml @@ -12,12 +12,6 @@ 2 true - - 3 - 0 - off - - 5282880 From ca96339b3e057a5dcb900e5797db0005a9db67ed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 03:34:26 +0200 Subject: [PATCH 39/47] xbmc-frodo: enable ISO playing in RPi by default (PR1435) Signed-off-by: Stephan Raue --- .../xbmc-frodo-e2c8d74-901-PR1435.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch new file mode 100644 index 0000000000..190c9533fe --- /dev/null +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch @@ -0,0 +1,28 @@ +From 7c5b281bf4403de8a02a3793188a4d735efafe9a Mon Sep 17 00:00:00 2001 +From: epideme +Date: Sun, 16 Sep 2012 19:57:52 +0300 +Subject: [PATCH] [rbp] Allow OMXPlayer to try playing DVD/BD-iso + +Now that scaling is fixed and overlays behave better, and license for MPG2 codec is available, allow iso playback with a warning in the debug log. +--- + xbmc/cores/omxplayer/OMXPlayer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp +index a3736df..1fc32b4 100644 +--- a/xbmc/cores/omxplayer/OMXPlayer.cpp ++++ b/xbmc/cores/omxplayer/OMXPlayer.cpp +@@ -590,8 +590,8 @@ bool COMXPlayer::OpenInputStream() + if (m_pInputStream && ( m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) + || m_pInputStream->IsStreamType(DVDSTREAM_TYPE_BLURAY) ) ) + { +- CLog::Log(LOGINFO, "COMXPlayer::OpenInputStream - DVD/BD not supported"); +- return false; ++ CLog::Log(LOGINFO, "COMXPlayer::OpenInputStream - DVD/BD not supported - Will try..."); ++ // return false; + } + + // find any available external subtitles for non dvd files +-- +1.7.10 + From fe26cac196ea1a488dcc7410088980a1ee560052 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 03:35:37 +0200 Subject: [PATCH 40/47] xbmc-frodo: add patch to add the ability to run a split gui/display resolution for embedded platforms. (PR1467) Signed-off-by: Stephan Raue --- .../xbmc-frodo-e2c8d74-901-PR1467.patch | 477 ++++++++++++++++++ 1 file changed, 477 insertions(+) create mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch new file mode 100644 index 0000000000..406ec3af31 --- /dev/null +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch @@ -0,0 +1,477 @@ +From 7d692ff576d0a713891908b5630ce2b8d0128f2e Mon Sep 17 00:00:00 2001 +From: davilla +Date: Sat, 22 Sep 2012 20:10:33 -0400 +Subject: [PATCH] add the ability to run a split gui/display resolution for + embedded platforms + +--- + xbmc/Application.cpp | 2 +- + xbmc/GUIInfoManager.cpp | 12 +++---- + xbmc/guilib/GraphicContext.cpp | 2 ++ + xbmc/guilib/Resolution.h | 5 +++ + xbmc/settings/GUISettings.cpp | 6 ++-- + xbmc/settings/GUIWindowSettingsCategory.cpp | 10 +++--- + .../GUIWindowSettingsScreenCalibration.cpp | 8 ++--- + xbmc/video/windows/GUIWindowFullScreen.cpp | 8 ++--- + xbmc/windowing/WinSystem.cpp | 14 ++++++--- + xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ + xbmc/windowing/X11/WinSystemX11GLES.cpp | 2 ++ + xbmc/windowing/egl/WinEGLPlatformGeneric.cpp | 11 +++---- + xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp | 10 +++--- + xbmc/windowing/egl/WinSystemGLES.cpp | 33 +++++++++++++------- + xbmc/windowing/egl/WinSystemGLES.h | 2 ++ + xbmc/windowing/windows/WinSystemWin32.cpp | 2 ++ + 16 files changed, 80 insertions(+), 49 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index 961e8f9..cd9fc9f 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -890,7 +890,7 @@ bool CApplication::CreateGUI() + return false; + + int iResolution = g_graphicsContext.GetVideoResolution(); +- CLog::Log(LOGINFO, "GUI format %ix%i %s", ++ CLog::Log(LOGINFO, "GUI format %ix%i, Display %s", + g_settings.m_ResInfo[iResolution].iWidth, + g_settings.m_ResInfo[iResolution].iHeight, + g_settings.m_ResInfo[iResolution].strMode.c_str()); +diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp +index fb6292d..c4ecd0a 100644 +--- a/xbmc/GUIInfoManager.cpp ++++ b/xbmc/GUIInfoManager.cpp +@@ -1493,14 +1493,14 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa + case SYSTEM_SCREEN_RESOLUTION: + if(g_Windowing.IsFullScreen()) + strLabel.Format("%ix%i@%.2fHz - %s (%02.2f fps)", +- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth, +- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight, ++ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth, ++ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight, + g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].fRefreshRate, + g_localizeStrings.Get(244), GetFPS()); + else + strLabel.Format("%ix%i - %s (%02.2f fps)", +- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth, +- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight, ++ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth, ++ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight, + g_localizeStrings.Get(242), GetFPS()); + return strLabel; + break; +@@ -1620,10 +1620,10 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa + strLabel = g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].strMode; + break; + case SYSTEM_SCREEN_WIDTH: +- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iWidth); ++ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenWidth); + break; + case SYSTEM_SCREEN_HEIGHT: +- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iHeight); ++ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenHeight); + break; + case SYSTEM_CURRENT_WINDOW: + return g_localizeStrings.Get(g_windowManager.GetFocusedWindow()); +diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp +index 31bfdbf..94f248b 100644 +--- a/xbmc/guilib/GraphicContext.cpp ++++ b/xbmc/guilib/GraphicContext.cpp +@@ -580,6 +580,8 @@ void CGraphicContext::ResetScreenParameters(RESOLUTION res) + default: + break; + } ++ g_settings.m_ResInfo[res].iScreenWidth = g_settings.m_ResInfo[res].iWidth; ++ g_settings.m_ResInfo[res].iScreenHeight = g_settings.m_ResInfo[res].iHeight; + ResetOverscan(res, g_settings.m_ResInfo[res].Overscan); + } + +diff --git a/xbmc/guilib/Resolution.h b/xbmc/guilib/Resolution.h +index ede938d..20864e2 100644 +--- a/xbmc/guilib/Resolution.h ++++ b/xbmc/guilib/Resolution.h +@@ -88,6 +88,8 @@ struct RESOLUTION_INFO + int iScreen; + int iWidth; + int iHeight; ++ int iScreenWidth; ++ int iScreenHeight; + int iSubtitles; + uint32_t dwFlags; + float fPixelRatio; +@@ -100,6 +102,8 @@ struct RESOLUTION_INFO + { + iWidth = width; + iHeight = height; ++ iScreenWidth = width; ++ iScreenHeight = height; + fPixelRatio = aspect ? ((float)width)/height / aspect : 1.0f; + strMode = mode; + bFullScreen = true; +@@ -114,6 +118,7 @@ struct RESOLUTION_INFO + { + Overscan = res.Overscan; bFullScreen = res.bFullScreen; + iScreen = res.iScreen; iWidth = res.iWidth; iHeight = res.iHeight; ++ iScreenWidth = res.iScreenWidth; iScreenHeight = res.iScreenHeight; + iSubtitles = res.iSubtitles; dwFlags = res.dwFlags; + fPixelRatio = res.fPixelRatio; fRefreshRate = res.fRefreshRate; + strMode = res.strMode; strOutput = res.strOutput; strId = res.strId; +diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp +index da2a78b..ec24ad5 100644 +--- a/xbmc/settings/GUISettings.cpp ++++ b/xbmc/settings/GUISettings.cpp +@@ -1526,8 +1526,8 @@ RESOLUTION CGUISettings::GetResFromString(const CStdString &res) + const RESOLUTION_INFO &info = g_settings.m_ResInfo[i]; + if (info.iScreen != screen) + continue; +- float score = 10 * (square_error((float)info.iWidth, (float)width) + +- square_error((float)info.iHeight, (float)height) + ++ float score = 10 * (square_error((float)info.iScreenWidth, (float)width) + ++ square_error((float)info.iScreenHeight, (float)height) + + square_error(info.fRefreshRate, refresh) + + square_error((float)((info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? 100:200), interlaced)); + if (score < bestScore) +@@ -1552,7 +1552,7 @@ void CGUISettings::SetResolution(RESOLUTION res) + { + const RESOLUTION_INFO &info = g_settings.m_ResInfo[res]; + mode.Format("%1i%05i%05i%09.5f%s", info.iScreen, +- info.iWidth, info.iHeight, info.fRefreshRate, ++ info.iScreenWidth, info.iScreenHeight, info.fRefreshRate, + (info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? "i":"p"); + } + else +diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp +index b436b98..ce517bb 100644 +--- a/xbmc/settings/GUIWindowSettingsCategory.cpp ++++ b/xbmc/settings/GUIWindowSettingsCategory.cpp +@@ -2392,8 +2392,8 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa + RESOLUTION_INFO res1 = g_settings.m_ResInfo[res]; + RESOLUTION_INFO res2 = g_settings.m_ResInfo[resolutions[idx].ResInfo_Index]; + if ( res1.iScreen == res2.iScreen +- && res1.iWidth == res2.iWidth +- && res1.iHeight == res2.iHeight ++ && res1.iScreenWidth == res2.iScreenWidth ++ && res1.iScreenHeight == res2.iScreenHeight + && (res1.dwFlags & D3DPRESENTFLAG_INTERLACED) == (res2.dwFlags & D3DPRESENTFLAG_INTERLACED)) + spinres = (RESOLUTION) resolutions[idx].ResInfo_Index; + } +@@ -2430,13 +2430,13 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa + + void CGUIWindowSettingsCategory::FillInRefreshRates(CStdString strSetting, RESOLUTION res, bool UserChange) + { +- // The only meaningful parts of res here are iScreen, iWidth, iHeight ++ // The only meaningful parts of res here are iScreen, iScreenWidth, iScreenHeight + + vector refreshrates; + if (res > RES_WINDOW) + refreshrates = g_Windowing.RefreshRates(g_settings.m_ResInfo[res].iScreen, +- g_settings.m_ResInfo[res].iWidth, +- g_settings.m_ResInfo[res].iHeight, ++ g_settings.m_ResInfo[res].iScreenWidth, ++ g_settings.m_ResInfo[res].iScreenHeight, + g_settings.m_ResInfo[res].dwFlags); + + // The control setting doesn't exist when not in standalone mode, don't manipulate it +diff --git a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp +index b2430bc..3e6ba83 100644 +--- a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp ++++ b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp +@@ -352,12 +352,12 @@ void CGUIWindowSettingsScreenCalibration::UpdateFromControl(int iControl) + // set the label control correctly + CStdString strText; + if (g_Windowing.IsFullScreen()) +- strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth, +- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate, ++ strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth, ++ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate, + g_localizeStrings.Get(244).c_str(), strStatus.c_str()); + else +- strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth, +- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight, ++ strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth, ++ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight, + g_localizeStrings.Get(242).c_str(), strStatus.c_str()); + + SET_CONTROL_LABEL(CONTROL_LABEL_ROW1, strText); +diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp +index 22a5c35..1bba604 100644 +--- a/xbmc/video/windows/GUIWindowFullScreen.cpp ++++ b/xbmc/video/windows/GUIWindowFullScreen.cpp +@@ -1008,13 +1008,13 @@ void CGUIWindowFullScreen::FrameMove() + CStdString strStatus; + if (g_Windowing.IsFullScreen()) + strStatus.Format("%s %ix%i@%.2fHz - %s", +- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth, +- g_settings.m_ResInfo[iResolution].iHeight, g_settings.m_ResInfo[iResolution].fRefreshRate, ++ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth, ++ g_settings.m_ResInfo[iResolution].iScreenHeight, g_settings.m_ResInfo[iResolution].fRefreshRate, + g_localizeStrings.Get(244)); + else + strStatus.Format("%s %ix%i - %s", +- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth, +- g_settings.m_ResInfo[iResolution].iHeight, g_localizeStrings.Get(242)); ++ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth, ++ g_settings.m_ResInfo[iResolution].iScreenHeight, g_localizeStrings.Get(242)); + + CGUIMessage msg(GUI_MSG_LABEL_SET, GetID(), LABEL_ROW3); + msg.SetLabel(strStatus); +diff --git a/xbmc/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp +index 9882161..6a17586 100644 +--- a/xbmc/windowing/WinSystem.cpp ++++ b/xbmc/windowing/WinSystem.cpp +@@ -63,6 +63,8 @@ void CWinSystemBase::UpdateDesktopResolution(RESOLUTION_INFO& newRes, int screen + newRes.fPixelRatio = 1.0f; + newRes.iWidth = width; + newRes.iHeight = height; ++ newRes.iScreenWidth = width; ++ newRes.iScreenHeight = height; + newRes.strMode.Format("%dx%d", width, height); + if (refreshRate > 1) + newRes.strMode.Format("%s @ %.2f%s - Full Screen", newRes.strMode, refreshRate, dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); +@@ -79,6 +81,8 @@ void CWinSystemBase::UpdateResolutions() + window.iWidth = 720; + if (window.iHeight == 0) + window.iHeight = 480; ++ window.iScreenWidth = window.iWidth; ++ window.iScreenHeight = window.iHeight; + if (window.iSubtitles == 0) + window.iSubtitles = (int)(0.965 * window.iHeight); + window.fPixelRatio = 1.0f; +@@ -90,6 +94,8 @@ void CWinSystemBase::SetWindowResolution(int width, int height) + RESOLUTION_INFO& window = g_settings.m_ResInfo[RES_WINDOW]; + window.iWidth = width; + window.iHeight = height; ++ window.iScreenWidth = width; ++ window.iScreenHeight = height; + window.iSubtitles = (int)(0.965 * window.iHeight); + g_graphicsContext.ResetOverscan(window); + } +@@ -105,8 +111,8 @@ int CWinSystemBase::DesktopResolution(int screen) + + static void AddResolution(vector &resolutions, unsigned int addindex) + { +- int width = g_settings.m_ResInfo[addindex].iWidth; +- int height = g_settings.m_ResInfo[addindex].iHeight; ++ int width = g_settings.m_ResInfo[addindex].iScreenWidth; ++ int height = g_settings.m_ResInfo[addindex].iScreenHeight; + int interlaced = g_settings.m_ResInfo[addindex].dwFlags & D3DPRESENTFLAG_INTERLACED; + + for (unsigned int idx = 0; idx < resolutions.size(); idx++) +@@ -163,8 +169,8 @@ static bool rrSortPredicate(REFRESHRATE i, REFRESHRATE j) + + for (unsigned int idx = RES_DESKTOP; idx < g_settings.m_ResInfo.size(); idx++) + if ( g_settings.m_ResInfo[idx].iScreen == screen +- && g_settings.m_ResInfo[idx].iWidth == width +- && g_settings.m_ResInfo[idx].iHeight == height ++ && g_settings.m_ResInfo[idx].iScreenWidth == width ++ && g_settings.m_ResInfo[idx].iScreenHeight == height + && (g_settings.m_ResInfo[idx].dwFlags & D3DPRESENTFLAG_INTERLACED) == (dwFlags & D3DPRESENTFLAG_INTERLACED)) + AddRefreshRate(refreshrates, idx); + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 889c445..a839709 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -269,6 +269,8 @@ void CWinSystemX11::UpdateResolutions() + RESOLUTION_INFO res; + res.iWidth = mode.w; + res.iHeight = mode.h; ++ res.iScreenWidth = mode.w; ++ res.iScreenHeight = mode.h; + if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0) + res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h)); + else +diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp +index 2b67e37..50185f9 100644 +--- a/xbmc/windowing/X11/WinSystemX11GLES.cpp ++++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp +@@ -292,6 +292,8 @@ void CWinSystemX11GLES::UpdateResolutions() + RESOLUTION_INFO res; + res.iWidth = mode.w; + res.iHeight = mode.h; ++ res.iScreenWidth = mode.w; ++ res.iScreenHeight = mode.h; + if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0) + res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h)); + else +diff --git a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp +index 9febe15..b6dec7e 100644 +--- a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp ++++ b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp +@@ -43,8 +43,8 @@ + m_desktopRes.iScreen = 0; + m_desktopRes.iWidth = 1280; + m_desktopRes.iHeight = 720; +- //m_desktopRes.iScreenWidth = 1280; +- //m_desktopRes.iScreenHeight = 720; ++ m_desktopRes.iScreenWidth = 1280; ++ m_desktopRes.iScreenHeight = 720; + m_desktopRes.fRefreshRate = 60.0f; + m_desktopRes.bFullScreen = true; + m_desktopRes.iSubtitles = (int)(0.965 * 720); +@@ -101,12 +101,9 @@ bool CWinEGLPlatformGeneric::ProbeDisplayResolutions(std::vector 1) + { +@@ -687,8 +689,8 @@ void CWinEGLPlatformRaspberryPI::GetSupportedModes(HDMI_RES_GROUP_T group, std:: + res.fPixelRatio = 1.0f; + res.iWidth = width; + res.iHeight = tv->height; +- //res.iScreenWidth = width; +- //res.iScreenHeight = tv->height; ++ res.iScreenWidth = width; ++ res.iScreenHeight = tv->height; + res.strMode.Format("%dx%d", width, tv->height); + if((float)tv->frame_rate > 1) + { +diff --git a/xbmc/windowing/egl/WinSystemGLES.cpp b/xbmc/windowing/egl/WinSystemGLES.cpp +index d4f1f04..eb78f74 100644 +--- a/xbmc/windowing/egl/WinSystemGLES.cpp ++++ b/xbmc/windowing/egl/WinSystemGLES.cpp +@@ -78,7 +78,11 @@ bool CWinSystemGLES::DestroyWindowSystem() + + bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) + { +- if (m_bWindowCreated && m_nWidth == res.iWidth && m_nHeight == res.iHeight && m_fRefreshRate == res.fRefreshRate && m_bFullScreen == fullScreen) ++ if (m_bWindowCreated && ++ m_nWidth == res.iWidth && m_nHeight == res.iHeight && ++ m_nScreenWidth == res.iScreenWidth && m_nScreenHeight == res.iScreenHeight && ++ m_bFullScreen == fullScreen && ++ m_fRefreshRate == res.fRefreshRate) + { + CLog::Log(LOGDEBUG, "CWinSystemGLES::CreateNewWindow: No need to create a new window"); + return true; +@@ -86,8 +90,10 @@ bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RE + + m_nWidth = res.iWidth; + m_nHeight = res.iHeight; +- m_bFullScreen = fullScreen; +- m_fRefreshRate = res.fRefreshRate; ++ m_nScreenWidth = res.iScreenWidth; ++ m_nScreenHeight = res.iScreenHeight; ++ m_bFullScreen = fullScreen; ++ m_fRefreshRate = res.fRefreshRate; + + // Destroy any existing window + if (m_bWindowCreated) +@@ -138,7 +144,6 @@ void CWinSystemGLES::UpdateResolutions() + { + CWinSystemBase::UpdateResolutions(); + +- //std::vector resolutions; + std::vector resolutions; + + m_eglplatform->ProbeDisplayResolutions(resolutions); +@@ -148,9 +153,6 @@ void CWinSystemGLES::UpdateResolutions() + RESOLUTION ResDesktop = RES_INVALID; + RESOLUTION res_index = RES_DESKTOP; + +- // Clear old resolutions +- //g_settings.m_ResInfo.clear(); +- + for (size_t i = 0; i < resolutions.size(); i++) + { + int gui_width = resolutions[i].iWidth; +@@ -173,17 +175,23 @@ void CWinSystemGLES::UpdateResolutions() + g_graphicsContext.ResetOverscan(resolutions[i]); + g_settings.m_ResInfo[res_index] = resolutions[i]; + +- CLog::Log(LOGNOTICE, "Found resolution for display %d with %d x %d @ %f Hz\n", ++ CLog::Log(LOGNOTICE, "Found resolution %d x %d for display %d with %d x %d%s @ %f Hz\n", + resolutions[i].iScreen, + resolutions[i].iWidth, + resolutions[i].iHeight, ++ resolutions[i].iScreenWidth, ++ resolutions[i].iScreenHeight, ++ resolutions[i].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "", + resolutions[i].fRefreshRate); + + if(m_eglplatform->FixedDesktop()) + { + if(resDesktop.iWidth == resolutions[i].iWidth && + resDesktop.iHeight == resolutions[i].iHeight && +- resDesktop.fRefreshRate == resolutions[i].fRefreshRate) ++ resDesktop.iScreenWidth == resolutions[i].iScreenWidth && ++ resDesktop.iScreenHeight == resolutions[i].iScreenHeight && ++ resDesktop.fRefreshRate == resolutions[i].fRefreshRate && ++ resDesktop.dwFlags == resolutions[i].dwFlags) + { + ResDesktop = res_index; + } +@@ -195,8 +203,11 @@ void CWinSystemGLES::UpdateResolutions() + // swap desktop index for desktop res if available + if (ResDesktop != RES_INVALID) + { +- CLog::Log(LOGNOTICE, "Found (%dx%d@%f) at %d, setting to RES_DESKTOP at %d", +- resDesktop.iWidth, resDesktop.iHeight, resDesktop.fRefreshRate, (int)ResDesktop, (int)RES_DESKTOP); ++ CLog::Log(LOGNOTICE, "Found (%dx%d%s@%f) at %d, setting to RES_DESKTOP at %d", ++ resDesktop.iWidth, resDesktop.iHeight, ++ resDesktop.dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "", ++ resDesktop.fRefreshRate, ++ (int)ResDesktop, (int)RES_DESKTOP); + + RESOLUTION_INFO desktop = g_settings.m_ResInfo[RES_DESKTOP]; + g_settings.m_ResInfo[RES_DESKTOP] = g_settings.m_ResInfo[ResDesktop]; +diff --git a/xbmc/windowing/egl/WinSystemGLES.h b/xbmc/windowing/egl/WinSystemGLES.h +index d94d24d..72c1eb7 100644 +--- a/xbmc/windowing/egl/WinSystemGLES.h ++++ b/xbmc/windowing/egl/WinSystemGLES.h +@@ -63,6 +63,8 @@ class CWinSystemGLES : public CWinSystemBase, public CRenderSystemGLES + void *m_display; + EGLNativeWindowType m_window; + CWinEGLPlatform *m_eglplatform; ++ int m_nScreenWidth; ++ int m_nScreenHeight; + }; + + XBMC_GLOBAL_REF(CWinSystemGLES,g_Windowing); +diff --git a/xbmc/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp +index 6a0e335..182b9a2 100644 +--- a/xbmc/windowing/windows/WinSystemWin32.cpp ++++ b/xbmc/windowing/windows/WinSystemWin32.cpp +@@ -541,6 +541,8 @@ void CWinSystemWin32::AddResolution(const RESOLUTION_INFO &res) + if (g_settings.m_ResInfo[i].iScreen == res.iScreen && + g_settings.m_ResInfo[i].iWidth == res.iWidth && + g_settings.m_ResInfo[i].iHeight == res.iHeight && ++ g_settings.m_ResInfo[i].iScreenWidth == res.iScreenWidth && ++ g_settings.m_ResInfo[i].iScreenHeight== res.iScreenHeight && + g_settings.m_ResInfo[i].fRefreshRate == res.fRefreshRate && + g_settings.m_ResInfo[i].dwFlags == res.dwFlags) + return; // already have this resolution +-- +1.7.10 + From 8478f8bc0ae2364a38695b4d82104f9363689da1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 03:36:55 +0200 Subject: [PATCH 41/47] rtmpdump: update to rtmpdump-e0056c5 Signed-off-by: Stephan Raue --- packages/multimedia/rtmpdump/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/rtmpdump/meta b/packages/multimedia/rtmpdump/meta index f9975675e1..3ac76c51c8 100644 --- a/packages/multimedia/rtmpdump/meta +++ b/packages/multimedia/rtmpdump/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="rtmpdump" -PKG_VERSION="7340f6d" +PKG_VERSION="e0056c5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 65569f2e45d64c1be0b26dc118f63b821ee338b4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 03:37:37 +0200 Subject: [PATCH 42/47] rtmpdump: add 60 second fix (XBMC upstream) Signed-off-by: Stephan Raue --- .../rtmpdump-e0056c5-60-second-fix.patch | 1913 +++++++++++++++++ 1 file changed, 1913 insertions(+) create mode 100644 packages/multimedia/rtmpdump/patches/rtmpdump-e0056c5-60-second-fix.patch diff --git a/packages/multimedia/rtmpdump/patches/rtmpdump-e0056c5-60-second-fix.patch b/packages/multimedia/rtmpdump/patches/rtmpdump-e0056c5-60-second-fix.patch new file mode 100644 index 0000000000..2914fc1b8e --- /dev/null +++ b/packages/multimedia/rtmpdump/patches/rtmpdump-e0056c5-60-second-fix.patch @@ -0,0 +1,1913 @@ +diff --git a/librtmp/amf.c b/librtmp/amf.c +index ce84f81..a25bc04 100644 +--- a/librtmp/amf.c ++++ b/librtmp/amf.c +@@ -610,6 +610,9 @@ AMFProp_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize, + return -1; + } + ++ if (*pBuffer == AMF_NULL) ++ bDecodeName = 0; ++ + if (bDecodeName && nSize < 4) + { /* at least name (length + at least 1 byte) and 1 byte of data */ + RTMP_Log(RTMP_LOGDEBUG, +@@ -801,8 +804,8 @@ AMFProp_Dump(AMFObjectProperty *prop) + } + else + { +- name.av_val = "no-name."; +- name.av_len = sizeof("no-name.") - 1; ++ name.av_val = "no-name"; ++ name.av_len = sizeof("no-name") - 1; + } + if (name.av_len > 18) + name.av_len = 18; +diff --git a/librtmp/dh.h b/librtmp/dh.h +index 9959532..e29587b 100644 +--- a/librtmp/dh.h ++++ b/librtmp/dh.h +@@ -61,7 +61,7 @@ static int MDH_generate_key(MDH *dh) + MP_set(&dh->ctx.P, dh->p); + MP_set(&dh->ctx.G, dh->g); + dh->ctx.len = 128; +- dhm_make_public(&dh->ctx, 1024, out, 1, havege_rand, &RTMP_TLS_ctx->hs); ++ dhm_make_public(&dh->ctx, 1024, out, 1, havege_random, &RTMP_TLS_ctx->hs); + MP_new(dh->pub_key); + MP_new(dh->priv_key); + MP_set(dh->pub_key, &dh->ctx.GX); +diff --git a/librtmp/handshake.h b/librtmp/handshake.h +index 0438486..102ba82 100644 +--- a/librtmp/handshake.h ++++ b/librtmp/handshake.h +@@ -965,8 +965,18 @@ HandShake(RTMP * r, int FP9HandShake) + __FUNCTION__); + RTMP_LogHex(RTMP_LOGDEBUG, reply, RTMP_SIG_SIZE); + #endif +- if (!WriteN(r, (char *)reply, RTMP_SIG_SIZE)) +- return FALSE; ++ if (r->Link.CombineConnectPacket) ++ { ++ char *HandshakeResponse = malloc(RTMP_SIG_SIZE); ++ memcpy(HandshakeResponse, (char *) reply, RTMP_SIG_SIZE); ++ r->Link.HandshakeResponse.av_val = HandshakeResponse; ++ r->Link.HandshakeResponse.av_len = RTMP_SIG_SIZE; ++ } ++ else ++ { ++ if (!WriteN(r, (char *) reply, RTMP_SIG_SIZE)) ++ return FALSE; ++ } + + /* 2nd part of handshake */ + if (ReadN(r, (char *)serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) +diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c +index 9f4e2c0..eeed34c 100644 +--- a/librtmp/hashswf.c ++++ b/librtmp/hashswf.c +@@ -70,7 +70,7 @@ extern TLS_CTX RTMP_TLS_ctx; + + #endif /* CRYPTO */ + +-#define AGENT "Mozilla/5.0" ++#define AGENT "Mozilla/5.0 (Windows NT 5.1; rv:8.0) Gecko/20100101 Firefox/8.0" + + HTTPResult + HTTP_get(struct HTTP_ctx *http, const char *url, HTTP_read_callback *cb) +@@ -528,7 +528,7 @@ RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash, + + if (strncmp(buf, "url: ", 5)) + continue; +- if (strncmp(buf + 5, url, hlen)) ++ if (strncmp(buf + 5, url, strlen(buf + 5) - 1)) + continue; + r1 = strrchr(buf, '/'); + i = strlen(r1); +diff --git a/librtmp/log.c b/librtmp/log.c +index 0012985..856e3e4 100644 +--- a/librtmp/log.c ++++ b/librtmp/log.c +@@ -52,8 +52,8 @@ static void rtmp_log_default(int level, const char *format, va_list vl) + vsnprintf(str, MAX_PRINT_LEN-1, format, vl); + + /* Filter out 'no-name' */ +- if ( RTMP_debuglevel + #include + #include ++#include + + #include "rtmp_sys.h" + #include "log.h" +@@ -45,6 +46,7 @@ TLS_CTX RTMP_TLS_ctx; + + #define RTMP_SIG_SIZE 1536 + #define RTMP_LARGE_HEADER_SIZE 12 ++#define HEX2BIN(a) (((a)&0x40)?((a)&0xf)+9:((a)&0xf)) + + static const int packetSize[] = { 12, 8, 4, 1 }; + +@@ -97,6 +99,9 @@ static int SendFCSubscribe(RTMP *r, AVal *subscribepath); + static int SendPlay(RTMP *r); + static int SendBytesReceived(RTMP *r); + static int SendUsherToken(RTMP *r, AVal *usherToken); ++static int SendInvoke(RTMP *r, AVal *Command, int queue); ++static int SendGetStreamLength(RTMP *r); ++static int strsplit(char *src, int srclen, char delim, char ***params); + + #if 0 /* unused */ + static int SendBGHasStream(RTMP *r, double dId, AVal *playpath); +@@ -259,6 +264,8 @@ RTMP_Init(RTMP *r) + r->m_fVideoCodecs = 252.0; + r->Link.timeout = 30; + r->Link.swfAge = 30; ++ r->Link.CombineConnectPacket = TRUE; ++ r->Link.ConnectPacket = FALSE; + } + + void +@@ -337,6 +344,7 @@ RTMP_SetupStream(RTMP *r, + AVal *flashVer, + AVal *subscribepath, + AVal *usherToken, ++ AVal *WeebToken, + int dStart, + int dStop, int bLiveStream, long int timeout) + { +@@ -359,6 +367,8 @@ RTMP_SetupStream(RTMP *r, + RTMP_Log(RTMP_LOGDEBUG, "subscribepath : %s", subscribepath->av_val); + if (usherToken && usherToken->av_val) + RTMP_Log(RTMP_LOGDEBUG, "NetStream.Authenticate.UsherToken : %s", usherToken->av_val); ++ if (WeebToken && WeebToken->av_val) ++ RTMP_Log(RTMP_LOGDEBUG, "WeebToken: %s", WeebToken->av_val); + if (flashVer && flashVer->av_val) + RTMP_Log(RTMP_LOGDEBUG, "flashVer : %s", flashVer->av_val); + if (dStart > 0) +@@ -426,6 +436,8 @@ RTMP_SetupStream(RTMP *r, + r->Link.subscribepath = *subscribepath; + if (usherToken && usherToken->av_len) + r->Link.usherToken = *usherToken; ++ if (WeebToken && WeebToken->av_len) ++ r->Link.WeebToken = *WeebToken; + r->Link.seekTime = dStart; + r->Link.stopTime = dStop; + if (bLiveStream) +@@ -483,14 +495,22 @@ static struct urlopt { + "Stream is live, no seeking possible" }, + { AVC("subscribe"), OFF(Link.subscribepath), OPT_STR, 0, + "Stream to subscribe to" }, +- { AVC("jtv"), OFF(Link.usherToken), OPT_STR, 0, +- "Justin.tv authentication token" }, +- { AVC("token"), OFF(Link.token), OPT_STR, 0, ++ { AVC("jtv"), OFF(Link.usherToken), OPT_STR, 0, ++ "Justin.tv authentication token"}, ++ { AVC("weeb"), OFF(Link.WeebToken), OPT_STR, 0, ++ "Weeb.tv authentication token"}, ++ { AVC("token"), OFF(Link.token), OPT_STR, 0, + "Key for SecureToken response" }, + { AVC("swfVfy"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_SWFV, + "Perform SWF Verification" }, + { AVC("swfAge"), OFF(Link.swfAge), OPT_INT, 0, + "Number of days to use cached SWF hash" }, ++#ifdef CRYPTO ++ { AVC("swfsize"), OFF(Link.swfSize), OPT_INT, 0, ++ "Size of the decompressed SWF file"}, ++ { AVC("swfhash"), OFF(Link.swfHash), OPT_STR, 0, ++ "SHA256 hash of the decompressed SWF file"}, ++#endif + { AVC("start"), OFF(Link.seekTime), OPT_INT, 0, + "Stream start position in milliseconds" }, + { AVC("stop"), OFF(Link.stopTime), OPT_INT, 0, +@@ -751,9 +771,16 @@ int RTMP_SetupURL(RTMP *r, char *url) + } + + #ifdef CRYPTO +- if ((r->Link.lFlags & RTMP_LF_SWFV) && r->Link.swfUrl.av_len) +- RTMP_HashSWF(r->Link.swfUrl.av_val, &r->Link.SWFSize, +- (unsigned char *)r->Link.SWFHash, r->Link.swfAge); ++ RTMP_Log(RTMP_LOGDEBUG, "Khalsa: %d %d %s\n", r->Link.swfSize, r->Link.swfHash.av_len, r->Link.swfHash.av_val); ++ if (r->Link.swfSize && r->Link.swfHash.av_len) ++ { ++ int i, j = 0; ++ for (i = 0; i < r->Link.swfHash.av_len; i += 2) ++ r->Link.SWFHash[j++] = (HEX2BIN(r->Link.swfHash.av_val[i]) << 4) | HEX2BIN(r->Link.swfHash.av_val[i + 1]); ++ r->Link.SWFSize = (uint32_t) r->Link.swfSize; ++ } ++ else if ((r->Link.lFlags & RTMP_LF_SWFV) && r->Link.swfUrl.av_len) ++ RTMP_HashSWF(r->Link.swfUrl.av_val, &r->Link.SWFSize, (unsigned char *) r->Link.SWFHash, r->Link.swfAge); + #endif + + if (r->Link.port == 0) +@@ -854,6 +881,8 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service) + } + + setsockopt(r->m_sb.sb_socket, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(on)); ++ if (r->Link.protocol & RTMP_FEATURE_HTTP) ++ setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, sizeof (on)); + + return TRUE; + } +@@ -1308,8 +1337,24 @@ ReadN(RTMP *r, char *buffer, int n) + return 0; + } + } +- if (r->m_resplen && !r->m_sb.sb_size) +- RTMPSockBuf_Fill(&r->m_sb); ++ ++ // Try to fill the whole buffer. previous buffer needs to be consumed ++ // completely before receiving new data. ++ if (r->m_resplen && (r->m_sb.sb_size <= 0)) ++ { ++ do ++ { ++ nBytes = RTMPSockBuf_Fill(&r->m_sb); ++ if (nBytes == -1) ++ { ++ if (!r->m_sb.sb_timedout) ++ RTMP_Close(r); ++ return 0; ++ } ++ } ++ while (r->m_resplen && (r->m_sb.sb_size < r->m_resplen) && (nBytes > 0)); ++ } ++ + avail = r->m_sb.sb_size; + if (avail > r->m_resplen) + avail = r->m_resplen; +@@ -1336,10 +1381,9 @@ ReadN(RTMP *r, char *buffer, int n) + r->m_sb.sb_size -= nRead; + nBytes = nRead; + r->m_nBytesIn += nRead; +- if (r->m_bSendCounter +- && r->m_nBytesIn > ( r->m_nBytesInSent + r->m_nClientBW / 10)) +- if (!SendBytesReceived(r)) +- return FALSE; ++ if (r->m_bSendCounter && r->m_nBytesIn > (r->m_nBytesInSent + r->m_nClientBW / 10)) ++ if (!SendBytesReceived(r)) ++ return FALSE; + } + /*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */ + #ifdef _DEBUG +@@ -1390,6 +1434,16 @@ WriteN(RTMP *r, const char *buffer, int n) + } + #endif + ++ if (r->Link.ConnectPacket) ++ { ++ char *ConnectPacket = malloc(r->Link.HandshakeResponse.av_len + n); ++ memcpy(ConnectPacket, r->Link.HandshakeResponse.av_val, r->Link.HandshakeResponse.av_len); ++ memcpy(ConnectPacket + r->Link.HandshakeResponse.av_len, ptr, n); ++ ptr = ConnectPacket; ++ n += r->Link.HandshakeResponse.av_len; ++ r->Link.ConnectPacket = FALSE; ++ } ++ + while (n > 0) + { + int nBytes; +@@ -1455,6 +1509,9 @@ SendConnectPacket(RTMP *r, RTMPPacket *cp) + char pbuf[4096], *pend = pbuf + sizeof(pbuf); + char *enc; + ++ if (r->Link.CombineConnectPacket) ++ r->Link.ConnectPacket = TRUE; ++ + if (cp) + return RTMP_SendPacket(r, cp, TRUE); + +@@ -1667,7 +1724,7 @@ SendUsherToken(RTMP *r, AVal *usherToken) + packet.m_hasAbsTimestamp = 0; + packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; + +- RTMP_Log(RTMP_LOGDEBUG, "UsherToken: %s", usherToken->av_val); ++ RTMP_Log(RTMP_LOGDEBUG, "UsherToken: %.*s", usherToken->av_len, usherToken->av_val); + enc = packet.m_body; + enc = AMF_EncodeString(enc, pend, &av_NetStream_Authenticate_UsherToken); + enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); +@@ -2096,10 +2153,8 @@ SendPlay(RTMP *r) + enc = AMF_EncodeNumber(enc, pend, -1000.0); + else + { +- if (r->Link.seekTime > 0.0) +- enc = AMF_EncodeNumber(enc, pend, r->Link.seekTime); /* resume from here */ +- else +- enc = AMF_EncodeNumber(enc, pend, 0.0); /*-2000.0);*/ /* recorded as default, -2000.0 is not reliable since that freezes the player if the stream is not found */ ++ if (r->Link.seekTime > 0.0 || r->Link.stopTime) ++ enc = AMF_EncodeNumber(enc, pend, r->Link.seekTime); /* resume from here */ + } + if (!enc) + return FALSE; +@@ -2215,7 +2270,7 @@ RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime) + int nSize; + char *buf; + +- RTMP_Log(RTMP_LOGDEBUG, "sending ctrl. type: 0x%04x", (unsigned short)nType); ++ RTMP_Log(RTMP_LOGDEBUG, "sending ctrl, type: 0x%04x", (unsigned short)nType); + + packet.m_nChannel = 0x02; /* control channel (ping) */ + packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; +@@ -2247,8 +2302,8 @@ RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime) + } + else if (nType == 0x1A) + { +- *buf = nObject & 0xff; +- } ++ *buf = nObject & 0xff; ++ } + else + { + if (nSize > 2) +@@ -2305,6 +2360,7 @@ AV_clear(RTMP_METHOD *vals, int num) + free(vals); + } + ++SAVC(onBWCheck); + SAVC(onBWDone); + SAVC(onFCSubscribe); + SAVC(onFCUnsubscribe); +@@ -2314,24 +2370,26 @@ SAVC(_error); + SAVC(close); + SAVC(code); + SAVC(level); ++SAVC(description); + SAVC(onStatus); + SAVC(playlist_ready); + static const AVal av_NetStream_Failed = AVC("NetStream.Failed"); + static const AVal av_NetStream_Play_Failed = AVC("NetStream.Play.Failed"); +-static const AVal av_NetStream_Play_StreamNotFound = +-AVC("NetStream.Play.StreamNotFound"); +-static const AVal av_NetConnection_Connect_InvalidApp = +-AVC("NetConnection.Connect.InvalidApp"); ++static const AVal av_NetStream_Play_StreamNotFound = AVC("NetStream.Play.StreamNotFound"); ++static const AVal av_NetConnection_Connect_InvalidApp = AVC("NetConnection.Connect.InvalidApp"); + static const AVal av_NetStream_Play_Start = AVC("NetStream.Play.Start"); + static const AVal av_NetStream_Play_Complete = AVC("NetStream.Play.Complete"); + static const AVal av_NetStream_Play_Stop = AVC("NetStream.Play.Stop"); + static const AVal av_NetStream_Seek_Notify = AVC("NetStream.Seek.Notify"); + static const AVal av_NetStream_Pause_Notify = AVC("NetStream.Pause.Notify"); +-static const AVal av_NetStream_Play_PublishNotify = +-AVC("NetStream.Play.PublishNotify"); +-static const AVal av_NetStream_Play_UnpublishNotify = +-AVC("NetStream.Play.UnpublishNotify"); ++static const AVal av_NetStream_Play_PublishNotify = AVC("NetStream.Play.PublishNotify"); ++static const AVal av_NetStream_Play_UnpublishNotify = AVC("NetStream.Play.UnpublishNotify"); + static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start"); ++static const AVal av_NetConnection_confStream = AVC("NetConnection.confStream"); ++static const AVal av_verifyClient = AVC("verifyClient"); ++static const AVal av_sendStatus = AVC("sendStatus"); ++static const AVal av_getStreamLength = AVC("getStreamLength"); ++static const AVal av_ReceiveCheckPublicStatus = AVC("ReceiveCheckPublicStatus"); + + /* Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' */ + static int +@@ -2341,6 +2399,11 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + AVal method; + double txn; + int ret = 0, nRes; ++ char pbuf[256], *pend = pbuf + sizeof (pbuf), *enc, **params = NULL; ++ char *host = r->Link.hostname.av_len ? r->Link.hostname.av_val : ""; ++ char *pageUrl = r->Link.pageUrl.av_len ? r->Link.pageUrl.av_val : ""; ++ int param_count; ++ AVal av_Command, av_Response; + if (body[0] != 0x02) /* make sure it is a string method name we start with */ + { + RTMP_Log(RTMP_LOGWARNING, "%s, Sanity failed. no string method in invoke packet", +@@ -2402,23 +2465,137 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + RTMP_SendServerBW(r); + RTMP_SendCtrl(r, 3, 0, 300); + } +- RTMP_SendCreateStream(r); +- +- if (!(r->Link.protocol & RTMP_FEATURE_WRITE)) +- { +- /* Authenticate on Justin.tv legacy servers before sending FCSubscribe */ +- if (r->Link.usherToken.av_len) +- SendUsherToken(r, &r->Link.usherToken); +- /* Send the FCSubscribe if live stream or if subscribepath is set */ +- if (r->Link.subscribepath.av_len) +- SendFCSubscribe(r, &r->Link.subscribepath); +- else if (r->Link.lFlags & RTMP_LF_LIVE) +- SendFCSubscribe(r, &r->Link.playpath); +- } +- } ++ if (strstr(host, "tv-stream.to") || strstr(pageUrl, "tv-stream.to")) ++ { ++ static char auth[] = {'h', 0xC2, 0xA7, '4', 'j', 'h', 'H', '4', '3', 'd'}; ++ AVal av_auth; ++ SAVC(requestAccess); ++ av_auth.av_val = auth; ++ av_auth.av_len = sizeof (auth); ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_requestAccess); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeString(enc, pend, &av_auth); ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ SendInvoke(r, &av_Command, FALSE); ++ ++ SAVC(getConnectionCount); ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_getConnectionCount); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ SendInvoke(r, &av_Command, FALSE); ++ ++ SendGetStreamLength(r); ++ } ++ else if (strstr(host, "jampo.com.ua") || strstr(pageUrl, "jampo.com.ua")) ++ { ++ SendGetStreamLength(r); ++ } ++ else if (strstr(host, "streamscene.cc") || strstr(pageUrl, "streamscene.cc") ++ || strstr(host, "tsboard.tv") || strstr(pageUrl, "teamstream.in")) ++ { ++ SAVC(r); ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_r); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ SendInvoke(r, &av_Command, FALSE); ++ ++ SendGetStreamLength(r); ++ } ++ else if (strstr(host, "chaturbate.com") || strstr(pageUrl, "chaturbate.com")) ++ { ++ AVal av_ModelName; ++ SAVC(CheckPublicStatus); ++ ++ if (strlen(pageUrl) > 7) ++ { ++ strsplit(pageUrl + 7, FALSE, '/', ¶ms); ++ av_ModelName.av_val = params[1]; ++ av_ModelName.av_len = strlen(params[1]); ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_CheckPublicStatus); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeString(enc, pend, &av_ModelName); ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ ++ SendInvoke(r, &av_Command, FALSE); ++ } ++ else ++ { ++ RTMP_Log(RTMP_LOGERROR, "you must specify the pageUrl"); ++ RTMP_Close(r); ++ } ++ } ++ /* Weeb.tv specific authentication */ ++ else if (r->Link.WeebToken.av_len) ++ { ++ AVal av_Token, av_Username, av_Password; ++ SAVC(determineAccess); ++ ++ param_count = strsplit(r->Link.WeebToken.av_val, FALSE, ';', ¶ms); ++ if (param_count >= 1) ++ { ++ av_Token.av_val = params[0]; ++ av_Token.av_len = strlen(params[0]); ++ } ++ if (param_count >= 2) ++ { ++ av_Username.av_val = params[1]; ++ av_Username.av_len = strlen(params[1]); ++ } ++ if (param_count >= 3) ++ { ++ av_Password.av_val = params[2]; ++ av_Password.av_len = strlen(params[2]); ++ } ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_determineAccess); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeString(enc, pend, &av_Token); ++ enc = AMF_EncodeString(enc, pend, &av_Username); ++ enc = AMF_EncodeString(enc, pend, &av_Password); ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ ++ RTMP_Log(RTMP_LOGDEBUG, "WeebToken: %s", r->Link.WeebToken.av_val); ++ SendInvoke(r, &av_Command, FALSE); ++ } ++ else ++ RTMP_SendCreateStream(r); ++ } ++ else if (AVMATCH(&methodInvoked, &av_getStreamLength)) ++ { ++ RTMP_SendCreateStream(r); ++ } + else if (AVMATCH(&methodInvoked, &av_createStream)) +- { +- r->m_stream_id = (int)AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 3)); ++ { ++ r->m_stream_id = (int) AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 3)); ++ ++ if (!(r->Link.protocol & RTMP_FEATURE_WRITE)) ++ { ++ /* Authenticate on Justin.tv legacy servers before sending FCSubscribe */ ++ if (r->Link.usherToken.av_len) ++ SendUsherToken(r, &r->Link.usherToken); ++ /* Send the FCSubscribe if live stream or if subscribepath is set */ ++ if (r->Link.subscribepath.av_len) ++ SendFCSubscribe(r, &r->Link.subscribepath); ++ else if ((r->Link.lFlags & RTMP_LF_LIVE) && (!r->Link.WeebToken.av_len)) ++ SendFCSubscribe(r, &r->Link.playpath); ++ } + + if (r->Link.protocol & RTMP_FEATURE_WRITE) + { +@@ -2441,7 +2618,7 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + } + else if (AVMATCH(&method, &av_onBWDone)) + { +- if (!r->m_nBWCheckCounter) ++ if (!r->m_nBWCheckCounter) + SendCheckBW(r); + } + else if (AVMATCH(&method, &av_onFCSubscribe)) +@@ -2457,7 +2634,7 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + { + SendPong(r, txn); + } +- else if (AVMATCH(&method, &av__onbwcheck)) ++ else if (AVMATCH(&method, &av__onbwcheck) || AVMATCH(&method, &av_onBWCheck)) + { + SendCheckBWResult(r, txn); + } +@@ -2473,20 +2650,63 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + } + else if (AVMATCH(&method, &av__error)) + { +- RTMP_Log(RTMP_LOGERROR, "rtmp server sent error"); ++ double code = 0; ++ unsigned int parsedPort; ++ AMFObject obj2; ++ AMFObjectProperty p; ++ AVal redirect; ++ SAVC(ex); ++ SAVC(redirect); ++ ++ AMFProp_GetObject(AMF_GetProp(&obj, NULL, 3), &obj2); ++ if (RTMP_FindFirstMatchingProperty(&obj2, &av_ex, &p)) ++ { ++ AMFProp_GetObject(&p, &obj2); ++ if (RTMP_FindFirstMatchingProperty(&obj2, &av_code, &p)) ++ code = AMFProp_GetNumber(&p); ++ if (code == 302 && RTMP_FindFirstMatchingProperty(&obj2, &av_redirect, &p)) ++ { ++ AMFProp_GetString(&p, &redirect); ++ r->Link.redirected = TRUE; ++ ++ char *url = malloc(redirect.av_len + sizeof ("/playpath")); ++ strncpy(url, redirect.av_val, redirect.av_len); ++ url[redirect.av_len] = '\0'; ++ r->Link.tcUrl.av_val = url; ++ r->Link.tcUrl.av_len = redirect.av_len; ++ strcat(url, "/playpath"); ++ RTMP_ParseURL(url, &r->Link.protocol, &r->Link.hostname, &parsedPort, &r->Link.playpath0, &r->Link.app); ++ r->Link.port = parsedPort; ++ } ++ } ++ if (r->Link.redirected) ++ RTMP_Log(RTMP_LOGINFO, "rtmp server sent redirect"); ++ else ++ RTMP_Log(RTMP_LOGERROR, "rtmp server sent error"); + } + else if (AVMATCH(&method, &av_close)) + { +- RTMP_Log(RTMP_LOGERROR, "rtmp server requested close"); +- RTMP_Close(r); ++ if (r->Link.redirected) ++ { ++ RTMP_Log(RTMP_LOGINFO, "trying to connect with redirected url"); ++ RTMP_Close(r); ++ r->Link.redirected = FALSE; ++ RTMP_Connect(r, NULL); ++ } ++ else ++ { ++ RTMP_Log(RTMP_LOGERROR, "rtmp server requested close"); ++ RTMP_Close(r); ++ } + } + else if (AVMATCH(&method, &av_onStatus)) + { + AMFObject obj2; +- AVal code, level; ++ AVal code, level, description; + AMFProp_GetObject(AMF_GetProp(&obj, NULL, 3), &obj2); + AMFProp_GetString(AMF_GetProp(&obj2, &av_code, -1), &code); + AMFProp_GetString(AMF_GetProp(&obj2, &av_level, -1), &level); ++ AMFProp_GetString(AMF_GetProp(&obj2, &av_description, -1), &description); + + RTMP_Log(RTMP_LOGDEBUG, "%s, onStatus: %s", __FUNCTION__, code.av_val); + if (AVMATCH(&code, &av_NetStream_Failed) +@@ -2550,6 +2770,45 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + r->m_pausing = 3; + } + } ++ ++ else if (AVMATCH(&code, &av_NetConnection_confStream)) ++ { ++#ifdef CRYPTO ++ static const char hexdig[] = "0123456789abcdef"; ++ SAVC(cf_stream); ++ int i; ++ char hash_hex[33] = {0}; ++ unsigned char hash[16]; ++ AVal auth; ++ param_count = strsplit(description.av_val, description.av_len, ':', ¶ms); ++ if (param_count >= 3) ++ { ++ char *buf = malloc(strlen(params[0]) + r->Link.playpath.av_len + 1); ++ strcpy(buf, params[0]); ++ strncat(buf, r->Link.playpath.av_val, r->Link.playpath.av_len); ++ md5_hash((unsigned char *) buf, strlen(buf), hash); ++ for (i = 0; i < 16; i++) ++ { ++ hash_hex[i * 2] = hexdig[0x0f & (hash[i] >> 4)]; ++ hash_hex[i * 2 + 1] = hexdig[0x0f & (hash[i])]; ++ } ++ auth.av_val = &hash_hex[atoi(params[1]) - 1]; ++ auth.av_len = atoi(params[2]); ++ RTMP_Log(RTMP_LOGDEBUG, "Khalsa: %.*s", auth.av_len, auth.av_val); ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_cf_stream); ++ enc = AMF_EncodeNumber(enc, pend, txn); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeString(enc, pend, &auth); ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ ++ SendInvoke(r, &av_Command, FALSE); ++ free(buf); ++ } ++#endif ++ } + } + else if (AVMATCH(&method, &av_playlist_ready)) + { +@@ -2563,6 +2822,74 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) + } + } + } ++ else if (AVMATCH(&method, &av_verifyClient)) ++ { ++ double VerificationNumber = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 3)); ++ RTMP_Log(RTMP_LOGDEBUG, "VerificationNumber: %.2f", VerificationNumber); ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av__result); ++ enc = AMF_EncodeNumber(enc, pend, txn); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeNumber(enc, pend, exp(atan(sqrt(VerificationNumber))) + 1); ++ av_Response.av_val = pbuf; ++ av_Response.av_len = enc - pbuf; ++ ++ AMF_Decode(&obj, av_Response.av_val, av_Response.av_len, FALSE); ++ AMF_Dump(&obj); ++ SendInvoke(r, &av_Response, FALSE); ++ } ++ else if (AVMATCH(&method, &av_sendStatus)) ++ { ++ if (r->Link.WeebToken.av_len) ++ { ++ AVal av_Authorized = AVC("User.hasAccess"); ++ AVal av_TransferLimit = AVC("User.noPremium.limited"); ++ AVal av_UserLimit = AVC("User.noPremium.tooManyUsers"); ++ AVal av_TimeLeft = AVC("timeLeft"); ++ AVal av_Status, av_ReconnectionTime; ++ ++ AMFObject Status; ++ AMFProp_GetObject(AMF_GetProp(&obj, NULL, 3), &Status); ++ AMFProp_GetString(AMF_GetProp(&Status, &av_code, -1), &av_Status); ++ RTMP_Log(RTMP_LOGINFO, "%.*s", av_Status.av_len, av_Status.av_val); ++ if (AVMATCH(&av_Status, &av_Authorized)) ++ { ++ RTMP_Log(RTMP_LOGINFO, "Weeb.tv authentication successful"); ++ RTMP_SendCreateStream(r); ++ } ++ else if (AVMATCH(&av_Status, &av_UserLimit)) ++ { ++ RTMP_Log(RTMP_LOGINFO, "No free slots available"); ++ RTMP_Close(r); ++ } ++ else if (AVMATCH(&av_Status, &av_TransferLimit)) ++ { ++ AMFProp_GetString(AMF_GetProp(&Status, &av_TimeLeft, -1), &av_ReconnectionTime); ++ RTMP_Log(RTMP_LOGINFO, "Viewing limit exceeded. try again in %.*s minutes.", av_ReconnectionTime.av_len, av_ReconnectionTime.av_val); ++ RTMP_Close(r); ++ } ++ } ++ } ++ else if (AVMATCH(&method, &av_ReceiveCheckPublicStatus)) ++ { ++ AVal Status; ++ AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &Status); ++ strsplit(Status.av_val, Status.av_len, ',', ¶ms); ++ if (strcmp(params[0], "0") == 0) ++ { ++ RTMP_Log(RTMP_LOGINFO, "Model status is %s", params[1]); ++ RTMP_Close(r); ++ } ++ else ++ { ++ AVal Playpath; ++ Playpath.av_val = params[1]; ++ Playpath.av_len = strlen(params[1]); ++ RTMP_ParsePlaypath(&Playpath, &r->Link.playpath); ++ RTMP_SendCreateStream(r); ++ } ++ } + else + { + +@@ -2748,7 +3075,7 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet) + unsigned int tmp; + if (packet->m_body && packet->m_nBodySize >= 2) + nType = AMF_DecodeInt16(packet->m_body); +- RTMP_Log(RTMP_LOGDEBUG, "%s, received ctrl. type: %d, len: %d", __FUNCTION__, nType, ++ RTMP_Log(RTMP_LOGDEBUG, "%s, received ctrl, type: %d, len: %d", __FUNCTION__, nType, + packet->m_nBodySize); + /*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */ + +@@ -2856,15 +3183,15 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet) + RTMP_Log(RTMP_LOGDEBUG, "%s, SWFVerification ping received: ", __FUNCTION__); + if (packet->m_nBodySize > 2 && packet->m_body[2] > 0x01) + { +- RTMP_Log(RTMP_LOGERROR, +- "%s: SWFVerification Type %d request not supported! Patches welcome...", +- __FUNCTION__, packet->m_body[2]); ++ RTMP_Log(RTMP_LOGERROR, ++ "%s: SWFVerification Type %d request not supported, attempting to use SWFVerification Type 1! Patches welcome...", ++ __FUNCTION__, packet->m_body[2]); + } + #ifdef CRYPTO + /*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */ + + /* respond with HMAC SHA256 of decompressed SWF, key is the 30byte player key, also the last 30 bytes of the server handshake are applied */ +- else if (r->Link.SWFSize) ++ if (r->Link.SWFSize) + { + RTMP_SendCtrl(r, 0x1B, 0, 0); + } +@@ -3142,8 +3469,18 @@ HandShake(RTMP *r, int FP9HandShake) + serversig[4], serversig[5], serversig[6], serversig[7]); + + /* 2nd part of handshake */ +- if (!WriteN(r, serversig, RTMP_SIG_SIZE)) +- return FALSE; ++ if (r->Link.CombineConnectPacket) ++ { ++ char *HandshakeResponse = malloc(RTMP_SIG_SIZE); ++ memcpy(HandshakeResponse, (char *) serversig, RTMP_SIG_SIZE); ++ r->Link.HandshakeResponse.av_val = HandshakeResponse; ++ r->Link.HandshakeResponse.av_len = RTMP_SIG_SIZE; ++ } ++ else ++ { ++ if (!WriteN(r, (char *) serversig, RTMP_SIG_SIZE)) ++ return FALSE; ++ } + + if (ReadN(r, serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) + return FALSE; +@@ -3709,12 +4046,11 @@ HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len) + char hbuf[512]; + int hlen = snprintf(hbuf, sizeof(hbuf), "POST /%s%s/%d HTTP/1.1\r\n" + "Host: %.*s:%d\r\n" +- "Accept: */*\r\n" +- "User-Agent: Shockwave Flash\n" +- "Connection: Keep-Alive\n" ++ "User-Agent: Shockwave Flash\r\n" ++ "Connection: Keep-Alive\r\n" + "Cache-Control: no-cache\r\n" +- "Content-type: application/x-fcs\r\n" +- "Content-length: %d\r\n\r\n", RTMPT_cmds[cmd], ++ "Content-Type: application/x-fcs\r\n" ++ "Content-Length: %d\r\n\r\n", RTMPT_cmds[cmd], + r->m_clientID.av_val ? r->m_clientID.av_val : "", + r->m_msgCounter, r->Link.hostname.av_len, r->Link.hostname.av_val, + r->Link.port, len); +@@ -3749,6 +4085,14 @@ HTTP_read(RTMP *r, int fill) + if (!ptr) + return -1; + ptr += 4; ++ int resplen = r->m_sb.sb_size - (ptr - r->m_sb.sb_start); ++ if (hlen < 4096) ++ while (resplen < hlen) ++ { ++ if (RTMPSockBuf_Fill(&r->m_sb) == -1) ++ return -1; ++ resplen = r->m_sb.sb_size - (ptr - r->m_sb.sb_start); ++ } + r->m_sb.sb_size -= ptr - r->m_sb.sb_start; + r->m_sb.sb_start = ptr; + r->m_unackd--; +@@ -4301,13 +4645,21 @@ fail: + r->m_read.status = nRead; + goto fail; + } +- /* buffer overflow, fix buffer and give up */ +- if (r->m_read.buf < mybuf || r->m_read.buf > end) { +- mybuf = realloc(mybuf, cnt + nRead); +- memcpy(mybuf+cnt, r->m_read.buf, nRead); +- r->m_read.buf = mybuf+cnt+nRead; +- break; +- } ++ /* buffer overflow, fix buffer and give up */ ++ if (r->m_read.buf < mybuf || r->m_read.buf > end) ++ { ++ if (!cnt) ++ { ++ mybuf = realloc(mybuf, sizeof (flvHeader) + cnt + nRead); ++ memcpy(mybuf, flvHeader, sizeof (flvHeader)); ++ cnt += sizeof (flvHeader); ++ } ++ else ++ mybuf = realloc(mybuf, cnt + nRead); ++ memcpy(mybuf + cnt, r->m_read.buf, nRead); ++ r->m_read.buf = mybuf + cnt + nRead; ++ break; ++ } + cnt += nRead; + r->m_read.buf += nRead; + r->m_read.buflen -= nRead; +@@ -4458,3 +4810,90 @@ RTMP_Write(RTMP *r, const char *buf, int size) + } + return size+s2; + } ++ ++static int ++SendInvoke(RTMP *r, AVal *Command, int queue) ++{ ++ RTMPPacket packet; ++ char pbuf[512], *enc; ++ ++ packet.m_nChannel = 0x03; /* control channel (invoke) */ ++ packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; ++ packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; ++ packet.m_nTimeStamp = 0; ++ packet.m_nInfoField2 = 0; ++ packet.m_hasAbsTimestamp = 0; ++ packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; ++ ++ enc = packet.m_body; ++ if (Command->av_len) ++ { ++ memcpy(enc, Command->av_val, Command->av_len); ++ enc += Command->av_len; ++ } ++ else ++ return FALSE; ++ packet.m_nBodySize = enc - packet.m_body; ++ ++ return RTMP_SendPacket(r, &packet, queue); ++} ++ ++static int ++strsplit(char *src, int srclen, char delim, char ***params) ++{ ++ char *sptr, *srcbeg, *srcend, *dstr; ++ int count = 1, i = 0, len = 0; ++ ++ if (src == NULL) ++ return 0; ++ if (!srclen) ++ srclen = strlen(src); ++ srcbeg = src; ++ srcend = srcbeg + srclen; ++ sptr = srcbeg; ++ ++ /* count the delimiters */ ++ while (sptr < srcend) ++ { ++ if (*sptr++ == delim) ++ count++; ++ } ++ sptr = srcbeg; ++ *params = calloc(count, sizeof (size_t)); ++ char **param = *params; ++ ++ for (i = 0; i < (count - 1); i++) ++ { ++ dstr = strchr(sptr, delim); ++ len = dstr - sptr; ++ param[i] = calloc(len + 1, sizeof (char)); ++ strncpy(param[i], sptr, len); ++ sptr += len + 1; ++ } ++ ++ /* copy the last string */ ++ if (sptr <= srcend) ++ { ++ len = srclen - (sptr - srcbeg); ++ param[i] = calloc(len + 1, sizeof (char)); ++ strncpy(param[i], sptr, len); ++ } ++ return count; ++} ++ ++static int ++SendGetStreamLength(RTMP *r) ++{ ++ char pbuf[256], *pend = pbuf + sizeof (pbuf), *enc; ++ AVal av_Command; ++ ++ enc = pbuf; ++ enc = AMF_EncodeString(enc, pend, &av_getStreamLength); ++ enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeString(enc, pend, &r->Link.playpath); ++ av_Command.av_val = pbuf; ++ av_Command.av_len = enc - pbuf; ++ ++ return SendInvoke(r, &av_Command, TRUE); ++} +diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h +index 6b2ae5b..411b488 100644 +--- a/librtmp/rtmp.h ++++ b/librtmp/rtmp.h +@@ -150,12 +150,14 @@ extern "C" + AVal playpath; /* passed in explicitly */ + AVal tcUrl; + AVal swfUrl; ++ AVal swfHash; + AVal pageUrl; + AVal app; + AVal auth; + AVal flashVer; + AVal subscribepath; + AVal usherToken; ++ AVal WeebToken; + AVal token; + AMFObject extras; + int edepth; +@@ -172,9 +174,15 @@ extern "C" + int lFlags; + + int swfAge; ++ int swfSize; + + int protocol; ++ int ConnectPacket; ++ int CombineConnectPacket; ++ int redirected; + int timeout; /* connection timeout in seconds */ ++ AVal Extras; ++ AVal HandshakeResponse; + + unsigned short socksport; + unsigned short port; +@@ -299,6 +307,7 @@ extern "C" + AVal *flashVer, + AVal *subscribepath, + AVal *usherToken, ++ AVal *WeebToken, + int dStart, + int dStop, int bLiveStream, long int timeout); + +diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h +index c3fd4a6..1bfb562 100644 +--- a/librtmp/rtmp_sys.h ++++ b/librtmp/rtmp_sys.h +@@ -64,6 +64,7 @@ + #include + #include + #include ++#include + typedef struct tls_ctx { + havege_state hs; + ssl_session ssn; +@@ -71,7 +72,7 @@ typedef struct tls_ctx { + #define TLS_CTX tls_ctx * + #define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\ + ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\ +- ssl_set_rng(s, havege_rand, &ctx->hs);\ ++ ssl_set_rng(s, havege_random, &ctx->hs);\ + ssl_set_ciphersuites(s, ssl_default_ciphersuites);\ + ssl_set_session(s, 1, 600, &ctx->ssn) + #define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd) +@@ -80,6 +81,7 @@ typedef struct tls_ctx { + #define TLS_write(s,b,l) ssl_write(s,(unsigned char *)b,l) + #define TLS_shutdown(s) ssl_close_notify(s) + #define TLS_close(s) ssl_free(s); free(s) ++#define md5_hash(i, ilen, o) md5(i, ilen, o) + + #elif defined(USE_GNUTLS) + #include +@@ -95,6 +97,8 @@ typedef struct tls_ctx { + #define TLS_write(s,b,l) gnutls_record_send(s,b,l) + #define TLS_shutdown(s) gnutls_bye(s, GNUTLS_SHUT_RDWR) + #define TLS_close(s) gnutls_deinit(s) ++#define md5_hash(i, ilen, o) gnutls_digest_algorithm_t algorithm = GNUTLS_DIG_MD5;\ ++ gnutls_hash_fast(algorithm, i, ilen, o); + + #else /* USE_OPENSSL */ + #define TLS_CTX SSL_CTX * +@@ -105,6 +109,7 @@ typedef struct tls_ctx { + #define TLS_write(s,b,l) SSL_write(s,b,l) + #define TLS_shutdown(s) SSL_shutdown(s) + #define TLS_close(s) SSL_free(s) ++#define md5_hash(i, ilen, o) MD5(i, ilen, o) + + #endif + #endif +diff --git a/rtmpdump.c b/rtmpdump.c +index e52f7d4..7bb0890 100644 +--- a/rtmpdump.c ++++ b/rtmpdump.c +@@ -701,6 +701,8 @@ void usage(char *prog) + RTMP_LogPrintf + ("--jtv|-j JSON Authentication token for Justin.tv legacy servers\n"); + RTMP_LogPrintf ++ ("--weeb|-J string Authentication token for weeb.tv servers\n"); ++ RTMP_LogPrintf + ("--hashes|-# Display progress with hashes, not with the byte counter\n"); + RTMP_LogPrintf + ("--buffer|-b Buffer time in milliseconds (default: %u)\n", +@@ -747,7 +749,8 @@ main(int argc, char **argv) + AVal hostname = { 0, 0 }; + AVal playpath = { 0, 0 }; + AVal subscribepath = { 0, 0 }; +- AVal usherToken = { 0, 0 }; //Justin.tv auth token ++ AVal usherToken = { 0, 0 }; // Justin.tv auth token ++ AVal WeebToken = { 0, 0 }; // Weeb.tv auth token + int port = -1; + int protocol = RTMP_PROTOCOL_UNDEFINED; + int retries = 0; +@@ -852,12 +855,13 @@ main(int argc, char **argv) + {"quiet", 0, NULL, 'q'}, + {"verbose", 0, NULL, 'V'}, + {"jtv", 1, NULL, 'j'}, ++ {"weeb", 1, NULL, 'J'}, + {0, 0, 0, 0} + }; + + while ((opt = + getopt_long(argc, argv, +- "hVveqzRr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#j:", ++ "hVveqzr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#j:J:", + longopts, NULL)) != -1) + { + switch (opt) +@@ -1070,6 +1074,9 @@ main(int argc, char **argv) + case 'j': + STR2AVAL(usherToken, optarg); + break; ++ case 'J': ++ STR2AVAL(WeebToken, optarg); ++ break; + default: + RTMP_LogPrintf("unknown option: %c\n", opt); + usage(argv[0]); +@@ -1161,14 +1168,14 @@ main(int argc, char **argv) + + if (tcUrl.av_len == 0) + { +- tcUrl.av_len = strlen(RTMPProtocolStringsLower[protocol]) + +- hostname.av_len + app.av_len + sizeof("://:65535/"); ++ tcUrl.av_len = strlen(RTMPProtocolStringsLower[protocol]) + ++ hostname.av_len + app.av_len + sizeof ("://:65535/"); + tcUrl.av_val = (char *) malloc(tcUrl.av_len); +- if (!tcUrl.av_val) +- return RD_FAILED; ++ if (!tcUrl.av_val) ++ return RD_FAILED; + tcUrl.av_len = snprintf(tcUrl.av_val, tcUrl.av_len, "%s://%.*s:%d/%.*s", +- RTMPProtocolStringsLower[protocol], hostname.av_len, +- hostname.av_val, port, app.av_len, app.av_val); ++ RTMPProtocolStringsLower[protocol], hostname.av_len, ++ hostname.av_val, port, app.av_len, app.av_val); + } + + int first = 1; +@@ -1187,7 +1194,7 @@ main(int argc, char **argv) + + RTMP_SetupStream(&rtmp, protocol, &hostname, port, &sockshost, &playpath, + &tcUrl, &swfUrl, &pageUrl, &app, &auth, &swfHash, swfSize, +- &flashVer, &subscribepath, &usherToken, dSeek, dStopOffset, bLiveStream, timeout); ++ &flashVer, &subscribepath, &usherToken, &WeebToken, dSeek, dStopOffset, bLiveStream, timeout); + + /* Try to keep the stream moving if it pauses on us */ + if (!bLiveStream && !bRealtimeStream && !(protocol & RTMP_FEATURE_HTTP)) +diff --git a/rtmpgw.c b/rtmpgw.c +index 0cf56bb..cd4396d 100644 +--- a/rtmpgw.c ++++ b/rtmpgw.c +@@ -95,7 +95,8 @@ typedef struct + AVal flashVer; + AVal token; + AVal subscribepath; +- AVal usherToken; //Justin.tv auth token ++ AVal usherToken; // Justin.tv auth token ++ AVal WeebToken; // Weeb.tv auth token + AVal sockshost; + AMFObject extras; + int edepth; +@@ -553,7 +554,7 @@ void processTCPrequest(STREAMING_SERVER * server, // server socket and state (ou + RTMP_Init(&rtmp); + RTMP_SetBufferMS(&rtmp, req.bufferTime); + RTMP_SetupStream(&rtmp, req.protocol, &req.hostname, req.rtmpport, &req.sockshost, +- &req.playpath, &req.tcUrl, &req.swfUrl, &req.pageUrl, &req.app, &req.auth, &req.swfHash, req.swfSize, &req.flashVer, &req.subscribepath, &req.usherToken, dSeek, req.dStopOffset, ++ &req.playpath, &req.tcUrl, &req.swfUrl, &req.pageUrl, &req.app, &req.auth, &req.swfHash, req.swfSize, &req.flashVer, &req.subscribepath, &req.usherToken, &req.WeebToken, dSeek, req.dStopOffset, + req.bLiveStream, req.timeout); + /* backward compatibility, we always sent this as true before */ + if (req.auth.av_len) +@@ -957,6 +958,9 @@ ParseOption(char opt, char *arg, RTMP_REQUEST * req) + case 'j': + STR2AVAL(req->usherToken, arg); + break; ++ case 'J': ++ STR2AVAL(req->WeebToken, arg); ++ break; + default: + RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg); + return FALSE; +@@ -1028,6 +1032,7 @@ main(int argc, char **argv) + {"quiet", 0, NULL, 'q'}, + {"verbose", 0, NULL, 'V'}, + {"jtv", 1, NULL, 'j'}, ++ {"weeb", 1, NULL, 'J'}, + {0, 0, 0, 0} + }; + +@@ -1040,7 +1045,7 @@ main(int argc, char **argv) + + while ((opt = + getopt_long(argc, argv, +- "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:S:j:", longopts, ++ "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:S:j:J:", longopts, + NULL)) != -1) + { + switch (opt) +@@ -1103,6 +1108,8 @@ main(int argc, char **argv) + RTMP_LogPrintf + ("--jtv|-j JSON Authentication token for Justin.tv legacy servers\n"); + RTMP_LogPrintf ++ ("--weeb|-J string Authentication token for weeb.tv servers\n"); ++ RTMP_LogPrintf + ("--buffer|-b Buffer time in milliseconds (default: %u)\n\n", + defaultRTMPRequest.bufferTime); + +diff --git a/rtmpsrv.c b/rtmpsrv.c +index 9aa62f3..9ec8f23 100644 +--- a/rtmpsrv.c ++++ b/rtmpsrv.c +@@ -96,9 +96,20 @@ STREAMING_SERVER *rtmpServer = 0; // server structure pointer + STREAMING_SERVER *startStreaming(const char *address, int port); + void stopStreaming(STREAMING_SERVER * server); + void AVreplace(AVal *src, const AVal *orig, const AVal *repl); ++char *strreplace(char *srcstr, int srclen, char *orig, char *repl); ++int file_exists(const char *fname); ++int SendCheckBWResponse(RTMP *r, int oldMethodType, int onBWDoneInit); ++AVal AVcopy(AVal src); ++AVal StripParams(AVal *src); + + static const AVal av_dquote = AVC("\""); + static const AVal av_escdquote = AVC("\\\""); ++#ifdef WIN32 ++static const AVal av_caret = AVC("^"); ++static const AVal av_esccaret = AVC("^^"); ++static const AVal av_pipe = AVC("|"); ++static const AVal av_escpipe = AVC("^|"); ++#endif + + typedef struct + { +@@ -167,6 +178,10 @@ SAVC(level); + SAVC(code); + SAVC(description); + SAVC(secureToken); ++SAVC(_checkbw); ++SAVC(_onbwdone); ++SAVC(checkBandwidth); ++SAVC(onBWDone); + + static int + SendConnectResult(RTMP *r, double txn) +@@ -190,7 +205,7 @@ SendConnectResult(RTMP *r, double txn) + enc = AMF_EncodeNumber(enc, pend, txn); + *enc++ = AMF_OBJECT; + +- STR2AVAL(av, "FMS/3,5,1,525"); ++ STR2AVAL(av, "FMS/3,5,7,7009"); + enc = AMF_EncodeNamedString(enc, pend, &av_fmsVer, &av); + enc = AMF_EncodeNamedNumber(enc, pend, &av_capabilities, 31.0); + enc = AMF_EncodeNamedNumber(enc, pend, &av_mode, 1.0); +@@ -212,7 +227,7 @@ SendConnectResult(RTMP *r, double txn) + enc = AMF_EncodeNamedString(enc, pend, &av_secureToken, &av); + #endif + STR2AVAL(p.p_name, "version"); +- STR2AVAL(p.p_vu.p_aval, "3,5,1,525"); ++ STR2AVAL(p.p_vu.p_aval, "3,5,7,7009"); + p.p_type = AMF_STRING; + obj.o_num = 1; + obj.o_props = &p; +@@ -268,7 +283,7 @@ static int + SendPlayStart(RTMP *r) + { + RTMPPacket packet; +- char pbuf[512], *pend = pbuf+sizeof(pbuf); ++ char pbuf[1024], *pend = pbuf + sizeof (pbuf); + + packet.m_nChannel = 0x03; // control channel (invoke) + packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ +@@ -300,7 +315,7 @@ static int + SendPlayStop(RTMP *r) + { + RTMPPacket packet; +- char pbuf[512], *pend = pbuf+sizeof(pbuf); ++ char pbuf[1024], *pend = pbuf + sizeof (pbuf); + + packet.m_nChannel = 0x03; // control channel (invoke) + packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ +@@ -328,6 +343,49 @@ SendPlayStop(RTMP *r) + return RTMP_SendPacket(r, &packet, FALSE); + } + ++int ++SendCheckBWResponse(RTMP *r, int oldMethodType, int onBWDoneInit) ++{ ++ RTMPPacket packet; ++ char pbuf[256], *pend = pbuf + sizeof (pbuf); ++ char *enc; ++ ++ packet.m_nChannel = 0x03; /* control channel (invoke) */ ++ packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; ++ packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; ++ packet.m_nTimeStamp = 0; ++ packet.m_nInfoField2 = 0; ++ packet.m_hasAbsTimestamp = 0; ++ packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; ++ ++ enc = packet.m_body; ++ if (oldMethodType) ++ { ++ enc = AMF_EncodeString(enc, pend, &av__onbwdone); ++ enc = AMF_EncodeNumber(enc, pend, 0); ++ *enc++ = AMF_NULL; ++ enc = AMF_EncodeNumber(enc, pend, 10240); ++ enc = AMF_EncodeNumber(enc, pend, 10240); ++ } ++ else ++ { ++ enc = AMF_EncodeString(enc, pend, &av_onBWDone); ++ enc = AMF_EncodeNumber(enc, pend, 0); ++ *enc++ = AMF_NULL; ++ if (!onBWDoneInit) ++ { ++ enc = AMF_EncodeNumber(enc, pend, 10240); ++ enc = AMF_EncodeNumber(enc, pend, 10240); ++ enc = AMF_EncodeNumber(enc, pend, 0); ++ enc = AMF_EncodeNumber(enc, pend, 0); ++ } ++ } ++ ++ packet.m_nBodySize = enc - packet.m_body; ++ ++ return RTMP_SendPacket(r, &packet, FALSE); ++} ++ + static void + spawn_dumper(int argc, AVal *av, char *cmd) + { +@@ -568,6 +626,7 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + server->arglen += countAMF(&r->Link.extras, &server->argc); + } + SendConnectResult(r, txn); ++ SendCheckBWResponse(r, FALSE, TRUE); + } + else if (AVMATCH(&method, &av_createStream)) + { +@@ -582,10 +641,22 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + AVal usherToken; + AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &usherToken); + AVreplace(&usherToken, &av_dquote, &av_escdquote); ++#ifdef WIN32 ++ AVreplace(&usherToken, &av_caret, &av_esccaret); ++ AVreplace(&usherToken, &av_pipe, &av_escpipe); ++#endif + server->arglen += 6 + usherToken.av_len; + server->argc += 2; + r->Link.usherToken = usherToken; + } ++ else if (AVMATCH(&method, &av__checkbw)) ++ { ++ SendCheckBWResponse(r, TRUE, FALSE); ++ } ++ else if (AVMATCH(&method, &av_checkBandwidth)) ++ { ++ SendCheckBWResponse(r, FALSE, FALSE); ++ } + else if (AVMATCH(&method, &av_play)) + { + char *file, *p, *q, *cmd, *ptr; +@@ -599,6 +670,17 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + if (obj.o_num > 5) + r->Link.length = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 5)); + */ ++ double StartFlag = 0; ++ AMFObjectProperty *Start = AMF_GetProp(&obj, NULL, 4); ++ if (!(Start->p_type == AMF_INVALID)) ++ StartFlag = AMFProp_GetNumber(Start); ++ r->Link.app = AVcopy(r->Link.app); ++ if (StartFlag == -1000 || strstr(r->Link.app.av_val, "live")) ++ { ++ StartFlag = -1000; ++ server->arglen += 7; ++ server->argc += 1; ++ } + if (r->Link.tcUrl.av_len) + { + len = server->arglen + r->Link.playpath.av_len + 4 + +@@ -616,6 +698,7 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + argv[argc].av_val = ptr + 1; + argv[argc++].av_len = 2; + argv[argc].av_val = ptr + 5; ++ r->Link.tcUrl = StripParams(&r->Link.tcUrl); + ptr += sprintf(ptr," -r \"%s\"", r->Link.tcUrl.av_val); + argv[argc++].av_len = r->Link.tcUrl.av_len; + +@@ -640,6 +723,7 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + argv[argc].av_val = ptr + 1; + argv[argc++].av_len = 2; + argv[argc].av_val = ptr + 5; ++ r->Link.swfUrl = StripParams(&r->Link.swfUrl); + ptr += sprintf(ptr, " -W \"%s\"", r->Link.swfUrl.av_val); + argv[argc++].av_len = r->Link.swfUrl.av_len; + } +@@ -662,10 +746,17 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + r->Link.usherToken.av_val = NULL; + r->Link.usherToken.av_len = 0; + } +- if (r->Link.extras.o_num) { +- ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc); +- AMF_Reset(&r->Link.extras); +- } ++ if (StartFlag == -1000) ++ { ++ argv[argc].av_val = ptr + 1; ++ argv[argc++].av_len = 6; ++ ptr += sprintf(ptr, " --live"); ++ } ++ if (r->Link.extras.o_num) ++ { ++ ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc); ++ AMF_Reset(&r->Link.extras); ++ } + argv[argc].av_val = ptr + 1; + argv[argc++].av_len = 2; + argv[argc].av_val = ptr + 5; +@@ -673,7 +764,13 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + r->Link.playpath.av_len, r->Link.playpath.av_val); + argv[argc++].av_len = r->Link.playpath.av_len; + +- av = r->Link.playpath; ++ if (r->Link.playpath.av_len) ++ av = r->Link.playpath; ++ else ++ { ++ av.av_val = "file"; ++ av.av_len = 4; ++ } + /* strip trailing URL parameters */ + q = memchr(av.av_val, '?', av.av_len); + if (q) +@@ -725,7 +822,30 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + argv[argc++].av_len = 2; + argv[argc].av_val = file; + argv[argc].av_len = av.av_len; +- ptr += sprintf(ptr, " -o %s", file); ++#ifdef VLC ++ char *vlc; ++ int didAlloc = FALSE; ++ ++ if (getenv("VLC")) ++ vlc = getenv("VLC"); ++ else if (getenv("ProgramFiles")) ++ { ++ vlc = malloc(512 * sizeof (char)); ++ didAlloc = TRUE; ++ char *ProgramFiles = getenv("ProgramFiles"); ++ sprintf(vlc, "%s%s", ProgramFiles, " (x86)\\VideoLAN\\VLC\\vlc.exe"); ++ if (!file_exists(vlc)) ++ sprintf(vlc, "%s%s", ProgramFiles, "\\VideoLAN\\VLC\\vlc.exe"); ++ } ++ else ++ vlc = "C:\\Program Files\\VideoLAN\\VLC\\vlc.exe"; ++ ++ ptr += sprintf(ptr, " | %s -", vlc); ++ if (didAlloc) ++ free(vlc); ++#else ++ ptr += sprintf(ptr, " -o %s", file); ++#endif + now = RTMP_GetTime(); + if (now - server->filetime < DUPTIME && AVMATCH(&argv[argc], &server->filename)) + { +@@ -739,7 +859,23 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int + server->filetime = now; + free(server->filename.av_val); + server->filename = argv[argc++]; +- spawn_dumper(argc, argv, cmd); ++#ifdef VLC ++ FILE *vlc_cmdfile = fopen("VLC.bat", "w"); ++ char *vlc_batchcmd = strreplace(cmd, 0, "%", "%%"); ++ fprintf(vlc_cmdfile, "%s\n", vlc_batchcmd); ++ fclose(vlc_cmdfile); ++ free(vlc_batchcmd); ++ spawn_dumper(argc, argv, "VLC.bat"); ++#else ++ spawn_dumper(argc, argv, cmd); ++#endif ++ ++#ifdef WIN32 ++ // Dump command to batch file ++ FILE *cmdfile = fopen("Command.bat", "a"); ++ fprintf(cmdfile, "%s\n", cmd); ++ fclose(cmdfile); ++#endif + } + + free(cmd); +@@ -1178,3 +1314,115 @@ AVreplace(AVal *src, const AVal *orig, const AVal *repl) + src->av_val = dest; + src->av_len = dptr - dest; + } ++ ++char * ++strreplace(char *srcstr, int srclen, char *orig, char *repl) ++{ ++ char *ptr = NULL, *sptr = srcstr; ++ int origlen = strlen(orig); ++ int repllen = strlen(repl); ++ if (!srclen) ++ srclen = strlen(srcstr); ++ char *srcend = srcstr + srclen; ++ int dstbuffer = srclen / origlen * repllen; ++ if (dstbuffer < srclen) ++ dstbuffer = srclen; ++ char *dststr = calloc(dstbuffer + 1, sizeof (char)); ++ char *dptr = dststr; ++ ++ if ((ptr = strstr(srcstr, orig))) ++ { ++ while (ptr < srcend && (ptr = strstr(sptr, orig))) ++ { ++ int len = ptr - sptr; ++ memcpy(dptr, sptr, len); ++ sptr += len + origlen; ++ dptr += len; ++ memcpy(dptr, repl, repllen); ++ dptr += repllen; ++ } ++ memcpy(dptr, sptr, srcend - sptr); ++ return dststr; ++ } ++ ++ memcpy(dststr, srcstr, srclen); ++ return dststr; ++} ++ ++AVal ++StripParams(AVal *src) ++{ ++ AVal str; ++ if (src->av_val) ++ { ++ str.av_val = calloc(src->av_len + 1, sizeof (char)); ++ strncpy(str.av_val, src->av_val, src->av_len); ++ str.av_len = src->av_len; ++ char *start = str.av_val; ++ char *end = start + str.av_len; ++ char *ptr = start; ++ ++ while (ptr < end) ++ { ++ if (*ptr == '?') ++ { ++ str.av_len = ptr - start; ++ break; ++ } ++ ptr++; ++ } ++ memset(start + str.av_len, 0, 1); ++ ++ char *dynamic = strstr(start, "[[DYNAMIC]]"); ++ if (dynamic) ++ { ++ dynamic -= 1; ++ memset(dynamic, 0, 1); ++ str.av_len = dynamic - start; ++ end = start + str.av_len; ++ } ++ ++ char *import = strstr(start, "[[IMPORT]]"); ++ if (import) ++ { ++ str.av_val = import + 11; ++ strcpy(start, "http://"); ++ str.av_val = strcat(start, str.av_val); ++ str.av_len = strlen(str.av_val); ++ } ++ return str; ++ } ++ str = *src; ++ return str; ++} ++ ++int ++file_exists(const char *fname) ++{ ++ FILE *file; ++ if ((file = fopen(fname, "r"))) ++ { ++ fclose(file); ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++AVal ++AVcopy(AVal src) ++{ ++ AVal dst; ++ if (src.av_len) ++ { ++ dst.av_val = malloc(src.av_len + 1); ++ memcpy(dst.av_val, src.av_val, src.av_len); ++ dst.av_val[src.av_len] = '\0'; ++ dst.av_len = src.av_len; ++ } ++ else ++ { ++ dst.av_val = NULL; ++ dst.av_len = 0; ++ } ++ return dst; ++} +diff --git a/rtmpsuck.c b/rtmpsuck.c +index e886179..e80c686 100644 +--- a/rtmpsuck.c ++++ b/rtmpsuck.c +@@ -143,15 +143,18 @@ SAVC(onStatus); + SAVC(close); + static const AVal av_NetStream_Failed = AVC("NetStream.Failed"); + static const AVal av_NetStream_Play_Failed = AVC("NetStream.Play.Failed"); +-static const AVal av_NetStream_Play_StreamNotFound = +-AVC("NetStream.Play.StreamNotFound"); +-static const AVal av_NetConnection_Connect_InvalidApp = +-AVC("NetConnection.Connect.InvalidApp"); ++static const AVal av_NetStream_Play_StreamNotFound = AVC("NetStream.Play.StreamNotFound"); ++static const AVal av_NetConnection_Connect_InvalidApp = AVC("NetConnection.Connect.InvalidApp"); + static const AVal av_NetStream_Play_Start = AVC("NetStream.Play.Start"); + static const AVal av_NetStream_Play_Complete = AVC("NetStream.Play.Complete"); + static const AVal av_NetStream_Play_Stop = AVC("NetStream.Play.Stop"); ++static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken"); + + static const char *cst[] = { "client", "server" }; ++char *dumpAMF(AMFObject *obj, char *ptr); ++char *strreplace(char *srcstr, int srclen, char *orig, char *repl); ++AVal AVcopy(AVal src); ++AVal StripParams(AVal *src); + + // Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' + int +@@ -198,26 +201,28 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + if (cobj.o_props[i].p_type == AMF_STRING) + { + pval = cobj.o_props[i].p_vu.p_aval; +- RTMP_LogPrintf("%.*s: %.*s\n", pname.av_len, pname.av_val, pval.av_len, pval.av_val); ++ RTMP_LogPrintf("%10.*s : %.*s\n", pname.av_len, pname.av_val, pval.av_len, pval.av_val); + } + if (AVMATCH(&pname, &av_app)) + { +- server->rc.Link.app = pval; ++ server->rc.Link.app = AVcopy(pval); + pval.av_val = NULL; + } + else if (AVMATCH(&pname, &av_flashVer)) + { +- server->rc.Link.flashVer = pval; ++ server->rc.Link.flashVer = AVcopy(pval); + pval.av_val = NULL; + } + else if (AVMATCH(&pname, &av_swfUrl)) + { + #ifdef CRYPTO + if (pval.av_val) +- RTMP_HashSWF(pval.av_val, &server->rc.Link.SWFSize, +- (unsigned char *)server->rc.Link.SWFHash, 30); ++ { ++ AVal swfUrl = StripParams(&pval); ++ RTMP_HashSWF(swfUrl.av_val, &server->rc.Link.SWFSize, (unsigned char *) server->rc.Link.SWFHash, 30); ++ } + #endif +- server->rc.Link.swfUrl = pval; ++ server->rc.Link.swfUrl = AVcopy(pval); + pval.av_val = NULL; + } + else if (AVMATCH(&pname, &av_tcUrl)) +@@ -225,7 +230,7 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + char *r1 = NULL, *r2; + int len; + +- server->rc.Link.tcUrl = pval; ++ server->rc.Link.tcUrl = AVcopy(pval); + if ((pval.av_val[0] | 0x40) == 'r' && + (pval.av_val[1] | 0x40) == 't' && + (pval.av_val[2] | 0x40) == 'm' && +@@ -267,7 +272,7 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + } + else if (AVMATCH(&pname, &av_pageUrl)) + { +- server->rc.Link.pageUrl = pval; ++ server->rc.Link.pageUrl = AVcopy(pval); + pval.av_val = NULL; + } + else if (AVMATCH(&pname, &av_audioCodecs)) +@@ -287,14 +292,21 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + if (pval.av_val) + free(pval.av_val); + } ++ + if (obj.o_num > 3) + { +- if (AMFProp_GetBoolean(&obj.o_props[3])) +- server->rc.Link.lFlags |= RTMP_LF_AUTH; +- if (obj.o_num > 4) +- { +- AMFProp_GetString(&obj.o_props[4], &server->rc.Link.auth); +- } ++ int i = obj.o_num - 3; ++ server->rc.Link.extras.o_num = i; ++ server->rc.Link.extras.o_props = malloc(i * sizeof (AMFObjectProperty)); ++ memcpy(server->rc.Link.extras.o_props, obj.o_props + 3, i * sizeof (AMFObjectProperty)); ++ obj.o_num = 3; ++ } ++ ++ if (server->rc.Link.extras.o_num) ++ { ++ server->rc.Link.Extras.av_val = calloc(1024, sizeof (char)); ++ dumpAMF(&server->rc.Link.extras, server->rc.Link.Extras.av_val); ++ server->rc.Link.Extras.av_len = strlen(server->rc.Link.Extras.av_val); + } + + if (!RTMP_Connect(&server->rc, pack)) +@@ -303,6 +315,16 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + return 1; + } + server->rc.m_bSendCounter = FALSE; ++ ++ if (server->rc.Link.extras.o_props) ++ { ++ AMF_Reset(&server->rc.Link.extras); ++ } ++ } ++ else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken)) ++ { ++ AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &server->rc.Link.usherToken); ++ RTMP_LogPrintf("%10s : %.*s\n", "usherToken", server->rc.Link.usherToken.av_len, server->rc.Link.usherToken.av_val); + } + else if (AVMATCH(&method, &av_play)) + { +@@ -323,6 +345,14 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + if (!av.av_val) + goto out; + ++ double StartFlag = 0; ++ AMFObjectProperty *Start = AMF_GetProp(&obj, NULL, 4); ++ if (!(Start->p_type == AMF_INVALID)) ++ StartFlag = AMFProp_GetNumber(Start); ++ if (StartFlag == -1000 || strstr(server->rc.Link.app.av_val, "live")) ++ StartFlag = -1000; ++ RTMP_LogPrintf("%10s : %s\n", "live", (StartFlag == -1000) ? "yes" : "no"); ++ + /* check for duplicates */ + for (fl = server->f_head; fl; fl=fl->f_next) + { +@@ -372,9 +402,51 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b + for (p=file; *p; p++) + if (*p == ':') + *p = '_'; +- RTMP_LogPrintf("Playpath: %.*s\nSaving as: %s\n", +- server->rc.Link.playpath.av_len, server->rc.Link.playpath.av_val, +- file); ++ RTMP_LogPrintf("%10s : %.*s\n%10s : %s\n", "Playpath", server->rc.Link.playpath.av_len, ++ server->rc.Link.playpath.av_val, "Saving as", file); ++ ++#ifdef WIN32 ++ // Dump command to batch file ++ char *cmd = NULL, *ptr = NULL; ++ AVal swfUrl, tcUrl; ++ ++ cmd = calloc(2048, sizeof (char)); ++ ptr = cmd; ++ tcUrl = StripParams(&server->rc.Link.tcUrl); ++ swfUrl = StripParams(&server->rc.Link.swfUrl); ++ ptr += sprintf(ptr, "rtmpdump -r \"%.*s\" -a \"%.*s\" -f \"%.*s\" -W \"%.*s\" -p \"%.*s\"", ++ tcUrl.av_len, tcUrl.av_val, ++ server->rc.Link.app.av_len, server->rc.Link.app.av_val, ++ server->rc.Link.flashVer.av_len, server->rc.Link.flashVer.av_val, ++ swfUrl.av_len, swfUrl.av_val, ++ server->rc.Link.pageUrl.av_len, server->rc.Link.pageUrl.av_val); ++ ++ if (server->rc.Link.usherToken.av_val) ++ { ++ char *usherToken = strreplace(server->rc.Link.usherToken.av_val, server->rc.Link.usherToken.av_len, "\"", "\\\""); ++ usherToken = strreplace(usherToken, 0, "^", "^^"); ++ usherToken = strreplace(usherToken, 0, "|", "^|"); ++ ptr += sprintf(ptr, " --jtv \"%s\"", usherToken); ++ free(usherToken); ++ } ++ ++ if (server->rc.Link.Extras.av_len) ++ { ++ ptr += sprintf(ptr, "%.*s", server->rc.Link.Extras.av_len, server->rc.Link.Extras.av_val); ++ } ++ ++ if (StartFlag == -1000) ++ ptr += sprintf(ptr, "%s", " --live"); ++ ptr += sprintf(ptr, " -y \"%.*s\"", server->rc.Link.playpath.av_len, server->rc.Link.playpath.av_val); ++ ptr += sprintf(ptr, " -o \"%s.flv\"\n", file); ++ ++ FILE *cmdfile = fopen("Command.bat", "a"); ++ fprintf(cmdfile, "%s", cmd); ++ fclose(cmdfile); ++ ++ free(cmd); ++#endif ++ + out = fopen(file, "wb"); + free(file); + if (!out) +@@ -1196,3 +1268,146 @@ main(int argc, char **argv) + #endif + return nStatus; + } ++ ++char * ++dumpAMF(AMFObject *obj, char *ptr) ++{ ++ int i; ++ const char opt[] = "NBSO Z"; ++ ++ for (i = 0; i < obj->o_num; i++) ++ { ++ AMFObjectProperty *p = &obj->o_props[i]; ++ if (p->p_type > 5) ++ continue; ++ ptr += sprintf(ptr, " -C "); ++ if (p->p_name.av_val) ++ *ptr++ = 'N'; ++ *ptr++ = opt[p->p_type]; ++ *ptr++ = ':'; ++ if (p->p_name.av_val) ++ ptr += sprintf(ptr, "%.*s:", p->p_name.av_len, p->p_name.av_val); ++ switch (p->p_type) ++ { ++ case AMF_BOOLEAN: ++ *ptr++ = p->p_vu.p_number != 0 ? '1' : '0'; ++ break; ++ case AMF_STRING: ++ memcpy(ptr, p->p_vu.p_aval.av_val, p->p_vu.p_aval.av_len); ++ ptr += p->p_vu.p_aval.av_len; ++ break; ++ case AMF_NUMBER: ++ ptr += sprintf(ptr, "%f", p->p_vu.p_number); ++ break; ++ case AMF_OBJECT: ++ *ptr++ = '1'; ++ ptr = dumpAMF(&p->p_vu.p_object, ptr); ++ ptr += sprintf(ptr, " -C O:0"); ++ break; ++ case AMF_NULL: ++ default: ++ break; ++ } ++ } ++ return ptr; ++} ++ ++char * ++strreplace(char *srcstr, int srclen, char *orig, char *repl) ++{ ++ char *ptr = NULL, *sptr = srcstr; ++ int origlen = strlen(orig); ++ int repllen = strlen(repl); ++ if (!srclen) ++ srclen = strlen(srcstr); ++ char *srcend = srcstr + srclen; ++ int dstbuffer = srclen / origlen * repllen; ++ if (dstbuffer < srclen) ++ dstbuffer = srclen; ++ char *dststr = calloc(dstbuffer + 1, sizeof (char)); ++ char *dptr = dststr; ++ ++ if ((ptr = strstr(srcstr, orig))) ++ { ++ while (ptr < srcend && (ptr = strstr(sptr, orig))) ++ { ++ int len = ptr - sptr; ++ memcpy(dptr, sptr, len); ++ sptr += len + origlen; ++ dptr += len; ++ memcpy(dptr, repl, repllen); ++ dptr += repllen; ++ } ++ memcpy(dptr, sptr, srcend - sptr); ++ return dststr; ++ } ++ ++ memcpy(dststr, srcstr, srclen); ++ return dststr; ++} ++ ++AVal ++StripParams(AVal *src) ++{ ++ AVal str; ++ if (src->av_val) ++ { ++ str.av_val = calloc(src->av_len + 1, sizeof (char)); ++ strncpy(str.av_val, src->av_val, src->av_len); ++ str.av_len = src->av_len; ++ char *start = str.av_val; ++ char *end = start + str.av_len; ++ char *ptr = start; ++ ++ while (ptr < end) ++ { ++ if (*ptr == '?') ++ { ++ str.av_len = ptr - start; ++ break; ++ } ++ ptr++; ++ } ++ memset(start + str.av_len, 0, 1); ++ ++ char *dynamic = strstr(start, "[[DYNAMIC]]"); ++ if (dynamic) ++ { ++ dynamic -= 1; ++ memset(dynamic, 0, 1); ++ str.av_len = dynamic - start; ++ end = start + str.av_len; ++ } ++ ++ char *import = strstr(start, "[[IMPORT]]"); ++ if (import) ++ { ++ str.av_val = import + 11; ++ strcpy(start, "http://"); ++ str.av_val = strcat(start, str.av_val); ++ str.av_len = strlen(str.av_val); ++ } ++ return str; ++ } ++ str = *src; ++ return str; ++} ++ ++AVal ++AVcopy(AVal src) ++{ ++ AVal dst; ++ if (src.av_len) ++ { ++ dst.av_val = malloc(src.av_len + 1); ++ memcpy(dst.av_val, src.av_val, src.av_len); ++ dst.av_val[src.av_len] = '\0'; ++ dst.av_len = src.av_len; ++ } ++ else ++ { ++ dst.av_val = NULL; ++ dst.av_len = 0; ++ } ++ return dst; ++} From 629525b9318e052bda60f1e63f47bf7dc7792da7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 18:29:41 +0200 Subject: [PATCH 43/47] rtmpdump: build with GnuTLS support, fix usage of *FLAGS Signed-off-by: Stephan Raue --- packages/multimedia/rtmpdump/build | 12 ++++++++---- packages/multimedia/rtmpdump/meta | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/multimedia/rtmpdump/build b/packages/multimedia/rtmpdump/build index ca31be07eb..6042d21ffe 100755 --- a/packages/multimedia/rtmpdump/build +++ b/packages/multimedia/rtmpdump/build @@ -31,8 +31,10 @@ make prefix=/usr \ CC="$CC" \ LD="$LD" \ AR="$AR" \ - CRYPTO="OPENSSL" \ - XCFLAGS="$CFLAGS $LDFLAGS" + CRYPTO="GNUTLS" \ + OPT="" \ + XCFLAGS="$CFLAGS" \ + XLDFLAGS="$LDFLAGS -lm" $MAKEINSTALL prefix=/usr \ incdir=/usr/include/librtmp \ @@ -41,5 +43,7 @@ $MAKEINSTALL prefix=/usr \ CC="$CC" \ LD="$LD" \ AR="$AR" \ - CRYPTO="OPENSSL" \ - XCFLAGS="$CFLAGS $LDFLAGS" + CRYPTO="GNUTLS" \ + OPT="" \ + XCFLAGS="$CFLAGS" \ + XLDFLAGS="$LDFLAGS -lm" diff --git a/packages/multimedia/rtmpdump/meta b/packages/multimedia/rtmpdump/meta index 3ac76c51c8..b26f7cd7d7 100644 --- a/packages/multimedia/rtmpdump/meta +++ b/packages/multimedia/rtmpdump/meta @@ -26,8 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://rtmpdump.mplayerhq.hu/" #PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib openssl" -PKG_BUILD_DEPENDS="toolchain zlib openssl" +PKG_DEPENDS="zlib gnutls" +PKG_BUILD_DEPENDS="toolchain zlib gnutls" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="rtmpdump: a toolkit for RTMP streams." From 7de4f83cbbdfe018fa686ede81ebb566a6b5a480 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 18:30:30 +0200 Subject: [PATCH 44/47] gnutls: update to gnutls-3.0.22 Signed-off-by: Stephan Raue --- packages/security/gnutls/meta | 2 +- ...nutls-3.0.20-automake.patch => gnutls-3.0.22-automake.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/security/gnutls/patches/{gnutls-3.0.20-automake.patch => gnutls-3.0.22-automake.patch} (100%) diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta index 0a3c45a94d..d38007c122 100644 --- a/packages/security/gnutls/meta +++ b/packages/security/gnutls/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gnutls" -PKG_VERSION="3.0.20" +PKG_VERSION="3.0.22" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/security/gnutls/patches/gnutls-3.0.20-automake.patch b/packages/security/gnutls/patches/gnutls-3.0.22-automake.patch similarity index 100% rename from packages/security/gnutls/patches/gnutls-3.0.20-automake.patch rename to packages/security/gnutls/patches/gnutls-3.0.22-automake.patch From 34de3a05e332e797ef41a5b6a69f022fae3f92bd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Sep 2012 18:31:35 +0200 Subject: [PATCH 45/47] curl: build with GnuTLS support, add upstream patches Signed-off-by: Stephan Raue --- packages/web/curl/build | 6 +- packages/web/curl/meta | 4 +- ...l-7.27.0-04_workaround_as_needed_bug.patch | 38 +++++ ...failure-by-including-nettle-specific.patch | 30 ++++ ...de-order-to-build-with-gnutls-nettle.patch | 148 ++++++++++++++++++ 5 files changed, 221 insertions(+), 5 deletions(-) create mode 100644 packages/web/curl/patches/curl-7.27.0-04_workaround_as_needed_bug.patch create mode 100644 packages/web/curl/patches/curl-7.27.0-gtls-fix-build-failure-by-including-nettle-specific.patch create mode 100644 packages/web/curl/patches/curl-7.27.0-metalink-change-code-order-to-build-with-gnutls-nettle.patch diff --git a/packages/web/curl/build b/packages/web/curl/build index fb02e7adf9..dd561619bc 100755 --- a/packages/web/curl/build +++ b/packages/web/curl/build @@ -23,7 +23,7 @@ . config/options $1 # link against librt because of undefined reference to 'clock_gettime' - LDFLAGS="$LDFLAGS -lrt -lrtmp" + LDFLAGS="$LDFLAGS -lrt -lm -lrtmp" cd $PKG_BUILD ac_cv_lib_rtmp_RTMP_Init=yes \ @@ -69,12 +69,12 @@ ac_cv_header_librtmp_rtmp_h=yes \ --without-krb4 \ --without-spnego \ --without-gssapi \ - --with-ssl \ --with-zlib \ --without-egd-socket \ --enable-thread \ --with-random=/dev/urandom \ - --without-gnutls \ + --with-gnutls="$SYSROOT_PREFIX/usr" \ + --without-ssl \ --without-polarssl \ --without-nss \ --with-ca-bundle="$SSL_CERTIFICATES/cacert.pem" \ diff --git a/packages/web/curl/meta b/packages/web/curl/meta index c3a2a7aa03..4a9197162d 100644 --- a/packages/web/curl/meta +++ b/packages/web/curl/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://curl.haxx.se" PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib openssl rtmpdump" -PKG_BUILD_DEPENDS="toolchain zlib openssl rtmpdump" +PKG_DEPENDS="zlib gnutls rtmpdump" +PKG_BUILD_DEPENDS="toolchain zlib gnutls rtmpdump" PKG_PRIORITY="optional" PKG_SECTION="web" PKG_SHORTDESC="curl: Client and library for (HTTP, HTTPS, FTP, ...) transfers" diff --git a/packages/web/curl/patches/curl-7.27.0-04_workaround_as_needed_bug.patch b/packages/web/curl/patches/curl-7.27.0-04_workaround_as_needed_bug.patch new file mode 100644 index 0000000000..46a397668f --- /dev/null +++ b/packages/web/curl/patches/curl-7.27.0-04_workaround_as_needed_bug.patch @@ -0,0 +1,38 @@ +Description: Work around libtool --as-needed reordering bug +Origin: vendor +Bug-Debian: http://bugs.debian.org/347650 +Forwarded: not-needed +Author: Alessandro Ghedini +Reviewed-by: Alessandro Ghedini +Last-Update: 2013-03-22 + +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5800,6 +5800,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed|-Wl,--no-as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -6163,6 +6168,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed|-Wl,--no-as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test "$linkmode,$pass" = "prog,link"; then diff --git a/packages/web/curl/patches/curl-7.27.0-gtls-fix-build-failure-by-including-nettle-specific.patch b/packages/web/curl/patches/curl-7.27.0-gtls-fix-build-failure-by-including-nettle-specific.patch new file mode 100644 index 0000000000..b0a81657fd --- /dev/null +++ b/packages/web/curl/patches/curl-7.27.0-gtls-fix-build-failure-by-including-nettle-specific.patch @@ -0,0 +1,30 @@ +From 986c7949c0638bebb99bd08d63216433254c2185 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 6 Aug 2012 15:04:25 +0200 +Subject: [PATCH] gtls: fix build failure by including nettle-specific headers + +Bug: http://curl.haxx.se/bug/view.cgi?id=3554668 +Reported by: Anthony G. Basile +--- + lib/gtls.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/gtls.c b/lib/gtls.c +index d981ef1..c750a6f 100644 +--- a/lib/gtls.c ++++ b/lib/gtls.c +@@ -34,7 +34,10 @@ + + #include + #include +-#ifndef USE_GNUTLS_NETTLE ++#ifdef USE_GNUTLS_NETTLE ++#include ++#include ++#else + #include + #endif + +-- +1.7.10.4 + diff --git a/packages/web/curl/patches/curl-7.27.0-metalink-change-code-order-to-build-with-gnutls-nettle.patch b/packages/web/curl/patches/curl-7.27.0-metalink-change-code-order-to-build-with-gnutls-nettle.patch new file mode 100644 index 0000000000..7cbd98b1a7 --- /dev/null +++ b/packages/web/curl/patches/curl-7.27.0-metalink-change-code-order-to-build-with-gnutls-nettle.patch @@ -0,0 +1,148 @@ +From 9f304291bd72aae66944cd7523707e1b88c6ad7b Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 6 Aug 2012 19:20:35 +0200 +Subject: [PATCH] metalink: change code order to build with gnutls-nettle + +Bug: http://curl.haxx.se/bug/view.cgi?id=3554668 +Reported by: Anthony G. Basile +--- + src/tool_metalink.c | 116 +++++++++++++++++++++++++-------------------------- + 1 file changed, 58 insertions(+), 58 deletions(-) + +diff --git a/src/tool_metalink.c b/src/tool_metalink.c +index 5491815..3a24a15 100644 +--- a/src/tool_metalink.c ++++ b/src/tool_metalink.c +@@ -82,64 +82,6 @@ + return PARAM_NO_MEM; \ + } WHILE_FALSE + +-const digest_params MD5_DIGEST_PARAMS[] = { +- { +- (Curl_digest_init_func) MD5_Init, +- (Curl_digest_update_func) MD5_Update, +- (Curl_digest_final_func) MD5_Final, +- sizeof(MD5_CTX), +- 16 +- } +-}; +- +-const digest_params SHA1_DIGEST_PARAMS[] = { +- { +- (Curl_digest_init_func) SHA1_Init, +- (Curl_digest_update_func) SHA1_Update, +- (Curl_digest_final_func) SHA1_Final, +- sizeof(SHA_CTX), +- 20 +- } +-}; +- +-const digest_params SHA256_DIGEST_PARAMS[] = { +- { +- (Curl_digest_init_func) SHA256_Init, +- (Curl_digest_update_func) SHA256_Update, +- (Curl_digest_final_func) SHA256_Final, +- sizeof(SHA256_CTX), +- 32 +- } +-}; +- +-static const metalink_digest_def SHA256_DIGEST_DEF[] = { +- {"sha-256", SHA256_DIGEST_PARAMS} +-}; +- +-static const metalink_digest_def SHA1_DIGEST_DEF[] = { +- {"sha-1", SHA1_DIGEST_PARAMS} +-}; +- +-static const metalink_digest_def MD5_DIGEST_DEF[] = { +- {"md5", MD5_DIGEST_PARAMS} +-}; +- +-/* +- * The alias of supported hash functions in the order by preference +- * (basically stronger hash comes first). We included "sha-256" and +- * "sha256". The former is the name defined in the IANA registry named +- * "Hash Function Textual Names". The latter is widely (and +- * historically) used in Metalink version 3. +- */ +-static const metalink_digest_alias digest_aliases[] = { +- {"sha-256", SHA256_DIGEST_DEF}, +- {"sha256", SHA256_DIGEST_DEF}, +- {"sha-1", SHA1_DIGEST_DEF}, +- {"sha1", SHA1_DIGEST_DEF}, +- {"md5", MD5_DIGEST_DEF}, +- {NULL, NULL} +-}; +- + #ifdef USE_GNUTLS_NETTLE + + static void MD5_Init(MD5_CTX *ctx) +@@ -251,6 +193,64 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx) + + #endif /* CRYPTO LIBS */ + ++const digest_params MD5_DIGEST_PARAMS[] = { ++ { ++ (Curl_digest_init_func) MD5_Init, ++ (Curl_digest_update_func) MD5_Update, ++ (Curl_digest_final_func) MD5_Final, ++ sizeof(MD5_CTX), ++ 16 ++ } ++}; ++ ++const digest_params SHA1_DIGEST_PARAMS[] = { ++ { ++ (Curl_digest_init_func) SHA1_Init, ++ (Curl_digest_update_func) SHA1_Update, ++ (Curl_digest_final_func) SHA1_Final, ++ sizeof(SHA_CTX), ++ 20 ++ } ++}; ++ ++const digest_params SHA256_DIGEST_PARAMS[] = { ++ { ++ (Curl_digest_init_func) SHA256_Init, ++ (Curl_digest_update_func) SHA256_Update, ++ (Curl_digest_final_func) SHA256_Final, ++ sizeof(SHA256_CTX), ++ 32 ++ } ++}; ++ ++static const metalink_digest_def SHA256_DIGEST_DEF[] = { ++ {"sha-256", SHA256_DIGEST_PARAMS} ++}; ++ ++static const metalink_digest_def SHA1_DIGEST_DEF[] = { ++ {"sha-1", SHA1_DIGEST_PARAMS} ++}; ++ ++static const metalink_digest_def MD5_DIGEST_DEF[] = { ++ {"md5", MD5_DIGEST_PARAMS} ++}; ++ ++/* ++ * The alias of supported hash functions in the order by preference ++ * (basically stronger hash comes first). We included "sha-256" and ++ * "sha256". The former is the name defined in the IANA registry named ++ * "Hash Function Textual Names". The latter is widely (and ++ * historically) used in Metalink version 3. ++ */ ++static const metalink_digest_alias digest_aliases[] = { ++ {"sha-256", SHA256_DIGEST_DEF}, ++ {"sha256", SHA256_DIGEST_DEF}, ++ {"sha-1", SHA1_DIGEST_DEF}, ++ {"sha1", SHA1_DIGEST_DEF}, ++ {"md5", MD5_DIGEST_DEF}, ++ {NULL, NULL} ++}; ++ + digest_context *Curl_digest_init(const digest_params *dparams) + { + digest_context *ctxt; +-- +1.7.10.4 + From 25192040ab283ce895f67fdce1f218e8e344780f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 01:59:16 +0200 Subject: [PATCH 46/47] xorg-server: build with libgcrypt support Signed-off-by: Stephan Raue --- packages/x11/xserver/xorg-server/build | 2 +- packages/x11/xserver/xorg-server/meta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 3065a91938..152c9da6d6 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -121,7 +121,7 @@ cd $PKG_BUILD --with-int10=x86emu \ --disable-ipv6 \ --with-gnu-ld \ - --with-sha1=libcrypto \ + --with-sha1=libgcrypt \ --with-os-vendor="OpenELEC.tv" \ --with-module-dir=$XORG_PATH_MODULES \ --with-xkb-path=$XORG_PATH_XKB \ diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index da38761fad..d29efb713e 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd" -PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm libgcrypt freetype pixman systemd" +PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm libgcrypt freetype pixman fontsproto systemd" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver" PKG_SHORTDESC="xorg-server: The Xorg X server" From 0a7d5acd32bbf1dee58b721468a0ea6875c6282b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 18:32:18 +0200 Subject: [PATCH 47/47] xbmc-frodo: update to xbmc-frodo-a642b33 Signed-off-by: Stephan Raue --- .../xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...o-a642b33-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...rodo-a642b33-311-fix_rsxs_build-0.1.patch} | 0 ...-texturepacker-hostflags-and-rework.patch} | 28 +++++++++---------- ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-a642b33-452-change_lcd_content-0.1.patch} | 0 ...33-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...o-a642b33-454-disable_backslash-0.1.patch} | 0 ...642b33-457-fix_connection_check-0.1.patch} | 0 ...a642b33-463-add_remote_devinput-0.1.patch} | 0 ...ch => xbmc-frodo-a642b33-901-PR1426.patch} | 0 ...ch => xbmc-frodo-a642b33-901-PR1435.patch} | 0 ...ch => xbmc-frodo-a642b33-901-PR1467.patch} | 0 15 files changed, 16 insertions(+), 16 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch => xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch} (85%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch => xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch => xbmc-frodo-a642b33-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch => xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch => xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-901-PR1426.patch => xbmc-frodo-a642b33-901-PR1426.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-901-PR1435.patch => xbmc-frodo-a642b33-901-PR1435.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-e2c8d74-901-PR1467.patch => xbmc-frodo-a642b33-901-PR1467.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 2d67884c4f..6facd0394d 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="e2c8d74" +PKG_VERSION="a642b33" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 9a0eef5c9f..65bdda4631 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="e2c8d74" +PKG_VERSION="a642b33" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch similarity index 85% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch index db7d6f6c61..4d54002c02 100644 --- a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in ---- xbmc-frodo-5ea1d22/configure.in 2012-09-05 13:27:56.000000000 +0200 -+++ xbmc-frodo-5ea1d22.patch/configure.in 2012-09-05 17:55:46.727316107 +0200 -@@ -437,6 +437,12 @@ +diff -Naur xbmc-frodo-a642b33/configure.in xbmc-frodo-a642b33.patch/configure.in +--- xbmc-frodo-a642b33/configure.in 2012-09-25 15:44:35.000000000 +0200 ++++ xbmc-frodo-a642b33.patch/configure.in 2012-09-25 16:17:31.666076439 +0200 +@@ -445,6 +445,12 @@ [use_texturepacker=$enableval], [use_texturepacker=auto]) @@ -14,7 +14,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in AC_ARG_WITH([lirc-device], [AS_HELP_STRING([--with-lirc-device=file], [specify the default LIRC device (default is /dev/lircd)])], -@@ -570,8 +576,7 @@ +@@ -584,8 +590,7 @@ use_cpu=cortex-a8 check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`] if test "x$check_sdl_arch" = "xi386"; then @@ -24,7 +24,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in else use_texturepacker=no fi -@@ -587,8 +592,6 @@ +@@ -601,8 +606,6 @@ *86*-apple-darwin*) use_joystick=no use_vtbdecoder=no @@ -33,7 +33,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in ARCH="x86-osx" AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") ;; -@@ -1938,13 +1941,13 @@ +@@ -1987,13 +1990,13 @@ USE_TEXTUREPACKER_NATIVE=0 if test "x$use_texturepacker" != "xno"; then @@ -52,9 +52,9 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in fi else final_message="$final_message\n TexturePacker:No" -diff -Naur xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in ---- xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in 2012-09-05 13:28:31.000000000 +0200 -+++ xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in 2012-09-05 17:56:05.017178267 +0200 +diff -Naur xbmc-frodo-a642b33/lib/libsquish/Makefile.in xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in +--- xbmc-frodo-a642b33/lib/libsquish/Makefile.in 2012-09-25 15:45:45.000000000 +0200 ++++ xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in 2012-09-25 16:17:31.666076439 +0200 @@ -11,26 +11,25 @@ singlecolourfit.cpp \ squish.cpp @@ -93,9 +93,9 @@ diff -Naur xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in xbmc-frodo-5ea1d22.patch endif include ../../Makefile.include -diff -Naur xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in ---- xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in 2012-09-05 13:28:16.000000000 +0200 -+++ xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in 2012-09-05 17:55:49.927291649 +0200 +diff -Naur xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in +--- xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in 2012-09-25 15:44:57.000000000 +0200 ++++ xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in 2012-09-25 16:19:08.889015705 +0200 @@ -1,56 +1,54 @@ -DEFINES += -D_LINUX -DUSE_LZO_PACKING +DEFINES += -D_LINUX -DUSE_LZO_PACKING @@ -179,7 +179,7 @@ diff -Naur xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in xbmc-frodo-5ea1d22 ifeq (@USE_TEXTUREPACKER_NATIVE@,1) # TexturePacker run native on build system, build it with native tools - $(TARGET): $(SRCS) + $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h - g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET) + make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so + $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET) diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1426.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1426.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1435.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1435.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1435.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1467.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-e2c8d74-901-PR1467.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1467.patch