From 93b88a2c6d0e193fc47c14e8b5db28a92411b47d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Feb 2013 01:39:11 +0100 Subject: [PATCH 1/5] xbmc: add toto patch :-) Signed-off-by: Stephan Raue --- ...ti-screen_fix_compilation_on_windows.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/todo/xbmc-811.11-multi-screen_fix_compilation_on_windows.patch diff --git a/packages/mediacenter/xbmc/patches/todo/xbmc-811.11-multi-screen_fix_compilation_on_windows.patch b/packages/mediacenter/xbmc/patches/todo/xbmc-811.11-multi-screen_fix_compilation_on_windows.patch new file mode 100644 index 0000000000..265c9ae628 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/todo/xbmc-811.11-multi-screen_fix_compilation_on_windows.patch @@ -0,0 +1,75 @@ +From bf4d77aeb9ff7c198914031ec0d8268dae0c5973 Mon Sep 17 00:00:00 2001 +From: unknown +Date: Fri, 18 Jan 2013 15:16:38 +0100 +Subject: [PATCH] multi-screen: fix compilation on windows + +--- + xbmc/settings/GUIWindowSettingsCategory.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp +index bb29daa..c468a73 100644 +--- a/xbmc/settings/GUIWindowSettingsCategory.cpp ++++ b/xbmc/settings/GUIWindowSettingsCategory.cpp +@@ -525,12 +525,14 @@ void CGUIWindowSettingsCategory::CreateSettings() + FillInRefreshRates(strSetting, g_guiSettings.GetResolution(), false); + continue; + } ++#if defined(HAS_GLX) + else if (strSetting.Equals("videoscreen.monitor")) + { + AddSetting(pSetting, group->GetWidth(), iControlID); + FillInMonitors(strSetting); + continue; + } ++#endif + else if (strSetting.Equals("lookandfeel.skintheme")) + { + AddSetting(pSetting, group->GetWidth(), iControlID); +@@ -1463,6 +1465,7 @@ void CGUIWindowSettingsCategory::OnSettingChanged(BaseSettingControlPtr pSetting + // Cascade + FillInResolutions("videoscreen.resolution", mode, RES_DESKTOP, true); + } ++#if defined(HAS_GLX) + else if (strSetting.Equals("videoscreen.monitor")) + { + CSettingString *pSettingString = (CSettingString *)pSettingControl->GetSetting(); +@@ -1477,6 +1480,7 @@ void CGUIWindowSettingsCategory::OnSettingChanged(BaseSettingControlPtr pSetting + FillInResolutions("videoscreen.resolution", mode, RES_DESKTOP, true); + } + } ++#endif + else if (strSetting.Equals("videoscreen.resolution")) + { + RESOLUTION nextRes = (RESOLUTION) g_guiSettings.GetInt("videoscreen.resolution"); +@@ -2431,6 +2435,7 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES + + void CGUIWindowSettingsCategory::FillInMonitors(CStdString strSetting) + { ++#if defined(HAS_GLX) + // we expect "videoscreen.monitor" but it might be hidden on some platforms, + // so check that we actually have a visable control. + BaseSettingControlPtr control = GetSetting(strSetting); +@@ -2456,6 +2461,7 @@ void CGUIWindowSettingsCategory::FillInMonitors(CStdString strSetting) + pControl->SetValue(currentMonitor); + g_guiSettings.SetString("videoscreen.monitor", g_settings.m_ResInfo[RES_DESKTOP].strOutput); + } ++#endif + } + + +@@ -2587,7 +2593,10 @@ void CGUIWindowSettingsCategory::OnRefreshRateChanged(RESOLUTION nextRes) + RESOLUTION lastRes = g_graphicsContext.GetVideoResolution(); + bool cancelled = false; + +- bool outputChanged = !g_Windowing.IsCurrentOutput(g_guiSettings.GetString("videoscreen.monitor")); ++ bool outputChanged = true; ++#if defined(HAS_GLX) ++ outputChanged = !g_Windowing.IsCurrentOutput(g_guiSettings.GetString("videoscreen.monitor")); ++#endif + + g_guiSettings.SetResolution(nextRes); + g_graphicsContext.SetVideoResolution(nextRes, outputChanged); +-- +1.7.10 + From d8f296ec61d1b089360f013c8ce6653183ab5bf1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Feb 2013 01:39:30 +0100 Subject: [PATCH 2/5] xbmc: add PR2146 patch Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.09-PR2146.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.09-PR2146.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.09-PR2146.patch b/packages/mediacenter/xbmc/patches/xbmc-990.09-PR2146.patch new file mode 100644 index 0000000000..01e6350733 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.09-PR2146.patch @@ -0,0 +1,34 @@ +From d1196435876904453d49b93ce5cefa6903489162 Mon Sep 17 00:00:00 2001 +From: Martijn Kaijser +Date: Wed, 30 Jan 2013 19:30:47 +0100 +Subject: [PATCH] [visualizations] fix crash in goom fixes #12584 + +--- + xbmc/visualizations/Goom/goom2k4-0/src/mmx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/visualizations/Goom/goom2k4-0/src/mmx.c b/xbmc/visualizations/Goom/goom2k4-0/src/mmx.c +index fdf0649..8effa52 100644 +--- a/xbmc/visualizations/Goom/goom2k4-0/src/mmx.c ++++ b/xbmc/visualizations/Goom/goom2k4-0/src/mmx.c +@@ -91,7 +91,7 @@ void zoom_filter_mmx (int prevX, int prevY, + "punpckhbw %%mm7, %%mm5 \n\t" /* 00-c4-00-c4-00-c4-00-c4 */ + + /* ajouter la longueur de ligne a esi */ +- "addl 8(%%ebp),%1 \n\t" ++ "addl %4,%1 \n\t" + + /* recuperation des 2 derniers pixels */ + "movq (%3,%1,4), %%mm1 \n\t" +@@ -115,7 +115,7 @@ void zoom_filter_mmx (int prevX, int prevY, + + "movd %%mm0,%0 \n\t" + :"=g"(expix2[loop]) +- :"r"(pos),"r"(coeffs),"r"(expix1) ++ :"r"(pos),"r"(coeffs),"r"(expix1),"r"(prevX) + + ); + +-- +1.7.10 + From ab57f8a53b2a027e98fef314c9229b597a442e37 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Feb 2013 01:39:58 +0100 Subject: [PATCH 3/5] xbmc: update PR2218 patch Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.07-PR2218.patch | 133 ++++++++++++++++-- 1 file changed, 119 insertions(+), 14 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch b/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch index c8472d53fa..a8a2a65953 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch @@ -1,4 +1,4 @@ -From aee2b8942c507d0b0c52e1a87d72687d864eaeae Mon Sep 17 00:00:00 2001 +From 9abc7d0311a3adc6e83d289d54c3e2d0fffc0d28 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 10 Feb 2013 21:49:31 +0100 Subject: [PATCH 1/3] AE: Linux AE - some fixes of yesterday merge (Enumerate @@ -38,7 +38,7 @@ index 96a9a72..20af5a1 100644 1.7.10 -From 8b382daadfe7e9cd1b6498571dcba8aca7b05c55 Mon Sep 17 00:00:00 2001 +From 3dfe32ce310b7543f58572f59c3c9223c38bae20 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 11 Feb 2013 00:08:05 +0100 Subject: [PATCH 2/3] AE: in doubt restore old suspend behaviour @@ -129,20 +129,20 @@ index 20af5a1..0f6c6ed 100644 1.7.10 -From c42665ba9f1958452567ed1af8e85d07adae6b7b Mon Sep 17 00:00:00 2001 +From 9dfebbdd375a2447f9f0d326a40696885e637520 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 11 Feb 2013 03:08:42 +0100 -Subject: [PATCH 3/3] AE: Stop async closing when going to suspend - we close - in any case but cannot guarantee that the closeEvent - gets set +Subject: [PATCH 3/3] AE: Choose indirection when possible. Care for lazy + evaluation --- - xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 23 ++-------------------- - xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h | 2 -- - 2 files changed, 2 insertions(+), 23 deletions(-) + xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 46 ++++++---------------- + xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h | 2 - + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 7 ++-- + 3 files changed, 16 insertions(+), 39 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -index 0f6c6ed..017782c 100644 +index 0f6c6ed..dc01abe 100644 --- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp @@ -59,7 +59,6 @@ @@ -162,7 +162,34 @@ index 0f6c6ed..017782c 100644 } /* this must NEVER be called from outside the main thread or Initialization */ void CSoftAE::InternalOpenSink() -@@ -873,16 +870,8 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream) +@@ -732,7 +729,7 @@ void CSoftAE::PauseStream(CSoftAEStream *stream) + stream->m_paused = true; + streamLock.Leave(); + +- OpenSink(); ++ m_reOpen = true; + } + + void CSoftAE::ResumeStream(CSoftAEStream *stream) +@@ -743,7 +740,7 @@ void CSoftAE::ResumeStream(CSoftAEStream *stream) + streamLock.Leave(); + + m_streamsPlaying = true; +- OpenSink(); ++ m_reOpen = true; + } + + void CSoftAE::Stop() +@@ -780,7 +777,7 @@ IAEStream *CSoftAE::MakeStream(enum AEDataFormat dataFormat, unsigned int sample + CSoftAEStream *stream = new CSoftAEStream(dataFormat, sampleRate, encodedSampleRate, channelLayout, options); + m_newStreams.push_back(stream); + streamLock.Leave(); +- ++ // this is really needed here + OpenSink(); + return stream; + } +@@ -873,17 +870,9 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream) RemoveStream(m_playingStreams, (CSoftAEStream*)stream); RemoveStream(m_streams , (CSoftAEStream*)stream); lock.Leave(); @@ -176,12 +203,26 @@ index 0f6c6ed..017782c 100644 - m_wake.Set(); - } - else if (m_masterStream == stream) +- OpenSink(); + // Reopen is old behaviour. Not opening when masterstream stops means clipping on S/PDIF. + if(!m_isSuspended && (m_masterStream == stream)) - OpenSink(); ++ m_reOpen = true; delete (CSoftAEStream*)stream; -@@ -1029,8 +1018,6 @@ bool CSoftAE::Suspend() + return NULL; +@@ -1012,10 +1001,7 @@ bool CSoftAE::Suspend() + { + itt->m_deviceInfoList.pop_back(); + } +- m_sink->Drain(); +- m_sink->Deinitialize(); +- delete m_sink; +- m_sink = NULL; ++ InternalCloseSink(); + } + else + { +@@ -1029,8 +1015,6 @@ bool CSoftAE::Suspend() // signal anybody, that we are gone now (beware of deadlocks) // we don't unset the fields here, to care for reinit after resume @@ -190,7 +231,20 @@ index 0f6c6ed..017782c 100644 if(m_reOpen) m_reOpenEvent.Set(); #endif -@@ -1101,12 +1088,6 @@ void CSoftAE::Run() +@@ -1075,10 +1059,10 @@ void CSoftAE::Run() + // ProcessSuspending() cannot guarantee that we get our sink back softresumed + // that is a big problem as another thread could start adding packets + // this must be checked here, before writing anything on the sinks +- if(m_sinkIsSuspended) ++ if(m_sinkIsSuspended && m_sink) + { + CLog::Log(LOGDEBUG, "CSoftAE::Run - Someone has forgotten to resume us (device resumed)"); +- m_sink->SoftResume(); ++ m_reOpen = !m_sink->SoftResume() || m_reOpen; + m_sinkIsSuspended = false; + } + if ((this->*m_outputStageFn)(hasAudio) > 0) +@@ -1101,12 +1085,6 @@ void CSoftAE::Run() restart = true; } @@ -203,6 +257,33 @@ index 0f6c6ed..017782c 100644 /* Handle idle or forced suspend */ ProcessSuspend(); +@@ -1115,7 +1093,8 @@ void CSoftAE::Run() + { + if(m_sinkIsSuspended && m_sink) + { +- m_reOpen = m_reOpen || m_sink->SoftResume(); ++ // hint for fritsch: remember lazy evaluation ++ m_reOpen = !m_sink->SoftResume() || m_reOpen; + m_sinkIsSuspended = false; + CLog::Log(LOGDEBUG, "CSoftAE::Run - Sink was forgotten"); + } +@@ -1505,7 +1484,6 @@ inline void CSoftAE::RemoveStream(StreamList &streams, CSoftAEStream *stream) + + inline void CSoftAE::ProcessSuspend() + { +- m_sinkIsSuspended = false; + unsigned int curSystemClock = 0; + #if defined(TARGET_WINDOWS) || defined(TARGET_LINUX) + if (!m_softSuspend && m_playingStreams.empty() && m_playing_sounds.empty() && +@@ -1563,7 +1541,7 @@ inline void CSoftAE::ProcessSuspend() + */ + if (!m_isSuspended && (!m_playingStreams.empty() || !m_playing_sounds.empty())) + { +- m_reOpen = m_reOpen || !m_sink->SoftResume(); // sink returns false if it requires reinit ++ m_reOpen = !m_sink->SoftResume() || m_reOpen; // sink returns false if it requires reinit (worthless with current implementation) + m_sinkIsSuspended = false; //sink processing data + m_softSuspend = false; //break suspend loop (under some conditions) + CLog::Log(LOGDEBUG, "Resumed the Sink"); diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h index 559e055..26d5e9c 100644 --- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h @@ -222,6 +303,30 @@ index 559e055..26d5e9c 100644 CEvent m_saveSuspend; CCriticalSection m_runningLock; /* released when the thread exits */ +diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +index b06d358..985c201 100644 +--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +@@ -1145,15 +1145,16 @@ bool CAESinkALSA::SoftSuspend() + bool CAESinkALSA::SoftResume() + { + // reinit all the clibber ++ bool ret = true; // all fine + if(!m_pcm) + { + if (!snd_config) + snd_config_update(); + +- Initialize(m_initFormat, m_initDevice); ++ ret = Initialize(m_initFormat, m_initDevice); + } +- //we want that AE loves us again +- return false; // force reinit ++ //we want that AE loves us again - reinit when initialize failed ++ return ret; // force reinit if false + } + + void CAESinkALSA::sndLibErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...) -- 1.7.10 From 0e192a0947f74292e1027d31e954f6a405b0cf6c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Feb 2013 05:26:59 +0100 Subject: [PATCH 4/5] linux: update to linux-3.7.7 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 ...linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch | 0 ...2-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch | 0 .../linux-206.03-media-rc-Set-rdev-before-irq-setup.patch | 0 ...6.04-media-rc-Call-rc_register_device-before-irq-setup.patch | 0 packages/linux/patches/{3.7.6 => 3.7.7}/linux-210-dvbsky.patch | 0 .../{3.7.6 => 3.7.7}/linux-212-mantis_stb0899_faster_lock.patch | 0 .../patches/{3.7.6 => 3.7.7}/linux-213-cinergy_s2_usb_r2.patch | 0 .../linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch | 0 .../linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch | 0 .../linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch | 0 .../patches/{3.7.6 => 3.7.7}/linux-221-ngene-octopus.patch | 0 .../{3.7.6 => 3.7.7}/linux-222-stb0899_signal_quality.patch | 0 .../patches/{3.7.6 => 3.7.7}/linux-700-jmicron_1_0_8_5.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 ....01-hda_Add_workaround_for_conflicting_IEC958_controls.patch | 0 ...990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch | 0 .../linux-990.03-media-ds3000_firmware-01.patch | 0 .../linux-990.03-media-ds3000_firmware-02.patch | 0 ...hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch | 0 21 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-213-cinergy_s2_usb_r2.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-700-jmicron_1_0_8_5.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-990.03-media-ds3000_firmware-01.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-990.03-media-ds3000_firmware-02.patch (100%) rename packages/linux/patches/{3.7.6 => 3.7.7}/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 6d8f141bf1..40160579f4 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.7.6" +PKG_VERSION="3.7.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/3.7.6/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.7.7/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.7.7/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.7.6/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch b/packages/linux/patches/3.7.7/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch rename to packages/linux/patches/3.7.7/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch diff --git a/packages/linux/patches/3.7.6/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch b/packages/linux/patches/3.7.7/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch rename to packages/linux/patches/3.7.7/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch diff --git a/packages/linux/patches/3.7.6/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch b/packages/linux/patches/3.7.7/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch rename to packages/linux/patches/3.7.7/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.6/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch b/packages/linux/patches/3.7.7/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch rename to packages/linux/patches/3.7.7/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.6/linux-210-dvbsky.patch b/packages/linux/patches/3.7.7/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-210-dvbsky.patch rename to packages/linux/patches/3.7.7/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.7.6/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.7.7/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.7.7/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.7.6/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.7.7/linux-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/3.7.7/linux-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/3.7.6/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch b/packages/linux/patches/3.7.7/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch rename to packages/linux/patches/3.7.7/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch diff --git a/packages/linux/patches/3.7.6/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch b/packages/linux/patches/3.7.7/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch rename to packages/linux/patches/3.7.7/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch diff --git a/packages/linux/patches/3.7.6/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch b/packages/linux/patches/3.7.7/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch rename to packages/linux/patches/3.7.7/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch diff --git a/packages/linux/patches/3.7.6/linux-221-ngene-octopus.patch b/packages/linux/patches/3.7.7/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.7.7/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.7.6/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.7.7/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.7.7/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.7.6/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.7.7/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.7.7/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.7.6/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.7.7/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.7.7/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.7.6/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch b/packages/linux/patches/3.7.7/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch rename to packages/linux/patches/3.7.7/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch diff --git a/packages/linux/patches/3.7.6/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch b/packages/linux/patches/3.7.7/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch rename to packages/linux/patches/3.7.7/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch diff --git a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch b/packages/linux/patches/3.7.7/linux-990.03-media-ds3000_firmware-01.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch rename to packages/linux/patches/3.7.7/linux-990.03-media-ds3000_firmware-01.patch diff --git a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch b/packages/linux/patches/3.7.7/linux-990.03-media-ds3000_firmware-02.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch rename to packages/linux/patches/3.7.7/linux-990.03-media-ds3000_firmware-02.patch diff --git a/packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch b/packages/linux/patches/3.7.7/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch similarity index 100% rename from packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch rename to packages/linux/patches/3.7.7/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch From 52031840e5d9fbfba86d75e1315d5555d23434e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Feb 2013 05:27:56 +0100 Subject: [PATCH 5/5] openssl: update to openssl-1.0.1e Signed-off-by: Stephan Raue --- packages/security/openssl/meta | 2 +- .../{openssl-1.0.1c-cflags.patch => openssl-cflags.patch} | 0 .../{openssl-1.0.1c-nodocs.patch => openssl-nodocs.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/security/openssl/patches/{openssl-1.0.1c-cflags.patch => openssl-cflags.patch} (100%) rename packages/security/openssl/patches/{openssl-1.0.1c-nodocs.patch => openssl-nodocs.patch} (100%) diff --git a/packages/security/openssl/meta b/packages/security/openssl/meta index 4d32223a3a..ea2305b30c 100644 --- a/packages/security/openssl/meta +++ b/packages/security/openssl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openssl" -PKG_VERSION="1.0.1c" +PKG_VERSION="1.0.1e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/security/openssl/patches/openssl-1.0.1c-cflags.patch b/packages/security/openssl/patches/openssl-cflags.patch similarity index 100% rename from packages/security/openssl/patches/openssl-1.0.1c-cflags.patch rename to packages/security/openssl/patches/openssl-cflags.patch diff --git a/packages/security/openssl/patches/openssl-1.0.1c-nodocs.patch b/packages/security/openssl/patches/openssl-nodocs.patch similarity index 100% rename from packages/security/openssl/patches/openssl-1.0.1c-nodocs.patch rename to packages/security/openssl/patches/openssl-nodocs.patch