diff --git a/config/options b/config/options index 67c3e47fc9..04cb2be9ee 100644 --- a/config/options +++ b/config/options @@ -1,3 +1,6 @@ +# set default language for buildsystem + export LC_ALL=C + # determines PROJECT, if not forced by user # default is Generic if [ -z "$PROJECT" ]; then diff --git a/packages/graphics/libjpeg-turbo/meta b/packages/graphics/libjpeg-turbo/meta index 54ed3f5d34..8c98fe07be 100644 --- a/packages/graphics/libjpeg-turbo/meta +++ b/packages/graphics/libjpeg-turbo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libjpeg-turbo" -PKG_VERSION="1.2.0" +PKG_VERSION="1.2.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/meta b/packages/linux/meta index f458ec884d..fc2c863b9d 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -21,7 +21,7 @@ PKG_NAME="linux" PKG_VERSION="3.5" if [ "$LINUX" = "3.2" ]; then - PKG_VERSION="3.2.23" + PKG_VERSION="3.2.24" fi PKG_REV="1" PKG_ARCH="any" diff --git a/packages/linux/patches/linux-3.2.23-000_crosscompile.patch b/packages/linux/patches/linux-3.2.24-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-000_crosscompile.patch rename to packages/linux/patches/linux-3.2.24-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.2.23-003-no_dev_console.patch b/packages/linux/patches/linux-3.2.24-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-003-no_dev_console.patch rename to packages/linux/patches/linux-3.2.24-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.2.23-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.2.24-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.2.24-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.2.23-006_enable_utf8.patch b/packages/linux/patches/linux-3.2.24-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-006_enable_utf8.patch rename to packages/linux/patches/linux-3.2.24-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.2.23-007_die_floppy_die.patch b/packages/linux/patches/linux-3.2.24-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.2.24-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.2.23-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.2.24-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.2.24-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.2.23-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.2.24-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.2.24-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.2.23-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.2.24-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.2.24-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.2.23-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.2.24-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.2.24-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.2.23-056-Formosa-IR606.patch b/packages/linux/patches/linux-3.2.24-056-Formosa-IR606.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-056-Formosa-IR606.patch rename to packages/linux/patches/linux-3.2.24-056-Formosa-IR606.patch diff --git a/packages/linux/patches/linux-3.2.23-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch b/packages/linux/patches/linux-3.2.24-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch rename to packages/linux/patches/linux-3.2.24-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch diff --git a/packages/linux/patches/linux-3.2.23-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch b/packages/linux/patches/linux-3.2.24-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch rename to packages/linux/patches/linux-3.2.24-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch diff --git a/packages/linux/patches/linux-3.2.23-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch b/packages/linux/patches/linux-3.2.24-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch rename to packages/linux/patches/linux-3.2.24-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch diff --git a/packages/linux/patches/linux-3.2.23-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch b/packages/linux/patches/linux-3.2.24-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch rename to packages/linux/patches/linux-3.2.24-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch diff --git a/packages/linux/patches/linux-3.2.23-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.2.24-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.2.24-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.2.23-081-drm_cea_modes.patch b/packages/linux/patches/linux-3.2.24-081-drm_cea_modes.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-081-drm_cea_modes.patch rename to packages/linux/patches/linux-3.2.24-081-drm_cea_modes.patch diff --git a/packages/linux/patches/linux-3.2.23-201-add_Anysee_T2C_support-0.1.patch b/packages/linux/patches/linux-3.2.24-201-add_Anysee_T2C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-201-add_Anysee_T2C_support-0.1.patch rename to packages/linux/patches/linux-3.2.24-201-add_Anysee_T2C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.23-202-add_HVR930C_support-0.1.patch b/packages/linux/patches/linux-3.2.24-202-add_HVR930C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-202-add_HVR930C_support-0.1.patch rename to packages/linux/patches/linux-3.2.24-202-add_HVR930C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.23-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.2.24-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.2.24-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.2.23-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.2.24-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.2.24-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.2.23-210-add_DVBSky_support.patch b/packages/linux/patches/linux-3.2.24-210-add_DVBSky_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-210-add_DVBSky_support.patch rename to packages/linux/patches/linux-3.2.24-210-add_DVBSky_support.patch diff --git a/packages/linux/patches/linux-3.2.23-211-add_TeVii_s471_support.patch b/packages/linux/patches/linux-3.2.24-211-add_TeVii_s471_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-211-add_TeVii_s471_support.patch rename to packages/linux/patches/linux-3.2.24-211-add_TeVii_s471_support.patch diff --git a/packages/linux/patches/linux-3.2.23-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.2.24-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/linux-3.2.24-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/linux-3.2.23-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/linux-3.2.24-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/linux-3.2.24-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/linux-3.2.23-251-acpi-5.0_support.patch b/packages/linux/patches/linux-3.2.24-251-acpi-5.0_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-251-acpi-5.0_support.patch rename to packages/linux/patches/linux-3.2.24-251-acpi-5.0_support.patch diff --git a/packages/linux/patches/linux-3.2.23-601-RPi_support-f23da7f.patch b/packages/linux/patches/linux-3.2.24-601-RPi_support-f23da7f.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-601-RPi_support-f23da7f.patch rename to packages/linux/patches/linux-3.2.24-601-RPi_support-f23da7f.patch diff --git a/packages/linux/patches/linux-3.2.23-901_broken_bluetooth.patch b/packages/linux/patches/linux-3.2.24-901_broken_bluetooth.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-901_broken_bluetooth.patch rename to packages/linux/patches/linux-3.2.24-901_broken_bluetooth.patch diff --git a/packages/linux/patches/linux-3.2.23-920_add_rtl8168.patch b/packages/linux/patches/linux-3.2.24-920_add_rtl8168.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-920_add_rtl8168.patch rename to packages/linux/patches/linux-3.2.24-920_add_rtl8168.patch diff --git a/packages/linux/patches/linux-3.2.23-990-xc5000_add_support_for_get_if_frequency.patch b/packages/linux/patches/linux-3.2.24-990-xc5000_add_support_for_get_if_frequency.patch similarity index 100% rename from packages/linux/patches/linux-3.2.23-990-xc5000_add_support_for_get_if_frequency.patch rename to packages/linux/patches/linux-3.2.24-990-xc5000_add_support_for_get_if_frequency.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch new file mode 100644 index 0000000000..9f209e8e04 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch @@ -0,0 +1,99 @@ +From 268d6a01b6a7dea0d53b042c246c95e87f4fc3d8 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Thu, 26 Jul 2012 15:43:24 +0200 +Subject: [PATCH] move deleting gl textures to TextureManager, fixes asic hang + on AMD + +--- + xbmc/Application.cpp | 4 ++-- + xbmc/guilib/GUIFontTTFGL.cpp | 3 ++- + xbmc/guilib/TextureManager.cpp | 13 +++++++++++++ + xbmc/guilib/TextureManager.h | 2 ++ + 4 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index 71d8a4e..b66459a 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -2231,8 +2231,6 @@ void CApplication::Render() + + g_Windowing.EndRender(); + +- g_TextureManager.FreeUnusedTextures(); +- + // reset our info cache - we do this at the end of Render so that it is + // fresh for the next process(), or after a windowclose animation (where process() + // isn't called) +@@ -2270,6 +2268,8 @@ void CApplication::Render() + } + CTimeUtils::UpdateFrameTime(flip); + ++ g_TextureManager.FreeUnusedTextures(); ++ + g_renderManager.UpdateResolution(); + g_renderManager.ManageCaptures(); + } +diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp +index 87e07ca..6c93eb8 100644 +--- a/xbmc/guilib/GUIFontTTFGL.cpp ++++ b/xbmc/guilib/GUIFontTTFGL.cpp +@@ -24,6 +24,7 @@ + #include "GUIFontTTFGL.h" + #include "GUIFontManager.h" + #include "Texture.h" ++#include "TextureManager.h" + #include "GraphicContext.h" + #include "gui3d.h" + #include "utils/log.h" +@@ -234,7 +235,7 @@ void CGUIFontTTFGL::DeleteHardwareTexture() + if (m_bTextureLoaded) + { + if (glIsTexture(m_nTexture)) +- glDeleteTextures(1, (GLuint*) &m_nTexture); ++ g_TextureManager.ReleaseHwTexture(m_nTexture); + m_bTextureLoaded = false; + } + } +diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp +index 9ef7889..ccd0d03 100644 +--- a/xbmc/guilib/TextureManager.cpp ++++ b/xbmc/guilib/TextureManager.cpp +@@ -457,6 +457,19 @@ void CGUITextureManager::FreeUnusedTextures() + for (ivecTextures i = m_unusedTextures.begin(); i != m_unusedTextures.end(); ++i) + delete *i; + m_unusedTextures.clear(); ++ ++#if defined(HAS_GL) || defined(HAS_GLES) ++ for (unsigned int i = 0; i < m_unusedHwTextures.size(); ++i) ++ { ++ glDeleteTextures(1, (GLuint*) &m_unusedHwTextures[i]); ++ } ++#endif ++ m_unusedHwTextures.clear(); ++} ++ ++void CGUITextureManager::ReleaseHwTexture(unsigned int texture) ++{ ++ m_unusedHwTextures.push_back(texture); + } + + void CGUITextureManager::Cleanup() +diff --git a/xbmc/guilib/TextureManager.h b/xbmc/guilib/TextureManager.h +index dd47f48..001f470 100644 +--- a/xbmc/guilib/TextureManager.h ++++ b/xbmc/guilib/TextureManager.h +@@ -124,9 +124,11 @@ class CGUITextureManager + void RemoveTexturePath(const CStdString &texturePath); ///< Remove a path from the paths to check when loading media + + void FreeUnusedTextures(); ///< Free textures (called from app thread only) ++ void ReleaseHwTexture(unsigned int texture); + protected: + std::vector m_vecTextures; + std::vector m_unusedTextures; ++ std::vector m_unusedHwTextures; + typedef std::vector::iterator ivecTextures; + // we have 2 texture bundles (one for the base textures, one for the theme) + CTextureBundle m_TexBundle[2]; +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch new file mode 100644 index 0000000000..9f209e8e04 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.002-268d6a0-fix_ASIC_hang.patch @@ -0,0 +1,99 @@ +From 268d6a01b6a7dea0d53b042c246c95e87f4fc3d8 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Thu, 26 Jul 2012 15:43:24 +0200 +Subject: [PATCH] move deleting gl textures to TextureManager, fixes asic hang + on AMD + +--- + xbmc/Application.cpp | 4 ++-- + xbmc/guilib/GUIFontTTFGL.cpp | 3 ++- + xbmc/guilib/TextureManager.cpp | 13 +++++++++++++ + xbmc/guilib/TextureManager.h | 2 ++ + 4 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index 71d8a4e..b66459a 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -2231,8 +2231,6 @@ void CApplication::Render() + + g_Windowing.EndRender(); + +- g_TextureManager.FreeUnusedTextures(); +- + // reset our info cache - we do this at the end of Render so that it is + // fresh for the next process(), or after a windowclose animation (where process() + // isn't called) +@@ -2270,6 +2268,8 @@ void CApplication::Render() + } + CTimeUtils::UpdateFrameTime(flip); + ++ g_TextureManager.FreeUnusedTextures(); ++ + g_renderManager.UpdateResolution(); + g_renderManager.ManageCaptures(); + } +diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp +index 87e07ca..6c93eb8 100644 +--- a/xbmc/guilib/GUIFontTTFGL.cpp ++++ b/xbmc/guilib/GUIFontTTFGL.cpp +@@ -24,6 +24,7 @@ + #include "GUIFontTTFGL.h" + #include "GUIFontManager.h" + #include "Texture.h" ++#include "TextureManager.h" + #include "GraphicContext.h" + #include "gui3d.h" + #include "utils/log.h" +@@ -234,7 +235,7 @@ void CGUIFontTTFGL::DeleteHardwareTexture() + if (m_bTextureLoaded) + { + if (glIsTexture(m_nTexture)) +- glDeleteTextures(1, (GLuint*) &m_nTexture); ++ g_TextureManager.ReleaseHwTexture(m_nTexture); + m_bTextureLoaded = false; + } + } +diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp +index 9ef7889..ccd0d03 100644 +--- a/xbmc/guilib/TextureManager.cpp ++++ b/xbmc/guilib/TextureManager.cpp +@@ -457,6 +457,19 @@ void CGUITextureManager::FreeUnusedTextures() + for (ivecTextures i = m_unusedTextures.begin(); i != m_unusedTextures.end(); ++i) + delete *i; + m_unusedTextures.clear(); ++ ++#if defined(HAS_GL) || defined(HAS_GLES) ++ for (unsigned int i = 0; i < m_unusedHwTextures.size(); ++i) ++ { ++ glDeleteTextures(1, (GLuint*) &m_unusedHwTextures[i]); ++ } ++#endif ++ m_unusedHwTextures.clear(); ++} ++ ++void CGUITextureManager::ReleaseHwTexture(unsigned int texture) ++{ ++ m_unusedHwTextures.push_back(texture); + } + + void CGUITextureManager::Cleanup() +diff --git a/xbmc/guilib/TextureManager.h b/xbmc/guilib/TextureManager.h +index dd47f48..001f470 100644 +--- a/xbmc/guilib/TextureManager.h ++++ b/xbmc/guilib/TextureManager.h +@@ -124,9 +124,11 @@ class CGUITextureManager + void RemoveTexturePath(const CStdString &texturePath); ///< Remove a path from the paths to check when loading media + + void FreeUnusedTextures(); ///< Free textures (called from app thread only) ++ void ReleaseHwTexture(unsigned int texture); + protected: + std::vector m_vecTextures; + std::vector m_unusedTextures; ++ std::vector m_unusedHwTextures; + typedef std::vector::iterator ivecTextures; + // we have 2 texture bundles (one for the base textures, one for the theme) + CTextureBundle m_TexBundle[2]; +-- +1.7.10 + diff --git a/packages/toolchain/devel/jam/build b/packages/toolchain/devel/jam/build deleted file mode 100755 index 0b30a96fde..0000000000 --- a/packages/toolchain/devel/jam/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 - -setup_toolchain host - -cd $PKG_BUILD - -make CC=$HOST_CC AR="$HOST_AR rcu" - -mkdir -p $ROOT/$TOOLCHAIN/bin - if [ "$DEBUG" = "yes" ]; then - cp bin.linux*/g/jam $ROOT/$TOOLCHAIN/bin - else - cp bin.linux*/jam $ROOT/$TOOLCHAIN/bin - fi diff --git a/packages/toolchain/devel/jam/meta b/packages/toolchain/devel/jam/meta deleted file mode 100644 index 41cdc5e1b3..0000000000 --- a/packages/toolchain/devel/jam/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="jam" -PKG_VERSION="2.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.perforce.com/jam/jam.html" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache" -PKG_PRIORITY="optional" -PKG_SECTION="toolchain/devel" -PKG_SHORTDESC="jam: A make-like program" -PKG_LONGDESC="Jam is a portable build tool with its own interpreted language, allowing to implement rather complex logic in a readable way and without resorting to external programs." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/toolchain/meta b/packages/toolchain/meta index b2488019a3..9a85dbce6b 100644 --- a/packages/toolchain/meta +++ b/packages/toolchain/meta @@ -26,7 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison flex cmake jam scons yasm nasm" +#PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison flex cmake jam scons yasm nasm" +PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison flex cmake scons yasm nasm" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain" diff --git a/packages/x11/driver/xf86-input-evdev/meta b/packages/x11/driver/xf86-input-evdev/meta index c5245d741b..6587efc61e 100644 --- a/packages/x11/driver/xf86-input-evdev/meta +++ b/packages/x11/driver/xf86-input-evdev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-input-evdev" -PKG_VERSION="2.7.0" +PKG_VERSION="2.7.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 5bb31291be..45e8678664 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.1" +PKG_VERSION="2.20.2" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" diff --git a/packages/x11/lib/libXrandr/meta b/packages/x11/lib/libXrandr/meta index 91e36f2c4f..ac33dd8e07 100644 --- a/packages/x11/lib/libXrandr/meta +++ b/packages/x11/lib/libXrandr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libXrandr" -PKG_VERSION="1.3.2" +PKG_VERSION="1.4.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/projects/ATV/options b/projects/ATV/options index 4c349f9fe5..4d5546e7ec 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -329,6 +329,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Fusion/options b/projects/Fusion/options index 9dca10aa08..ec3a508ac0 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Generic/options b/projects/Generic/options index fe729ccbf6..f9be9b43d6 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 285c940412..b4531c1103 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/ION/options b/projects/ION/options index 965252e249..7adfe1de8e 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Intel/options b/projects/Intel/options index 2fe0c1c114..ff82a49de9 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/RPi/options b/projects/RPi/options index 6f04447da4..6b064309c5 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -330,6 +330,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Ultra/options b/projects/Ultra/options index 0946542ed4..866af98d89 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -328,6 +328,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/projects/Virtual/options b/projects/Virtual/options index 862d5c0d40..259391534a 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -324,6 +324,7 @@ COREBOOT="no" # Distribution Specific source location + DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" # Addon Server Url diff --git a/scripts/get b/scripts/get index d901d9114e..1a7f839584 100755 --- a/scripts/get +++ b/scripts/get @@ -35,10 +35,9 @@ if [ -n "$PKG_URL" ]; then URLS="$URLS `echo $PKG_URL | sed s%GEEXBOX_SRCS%$GEEXBOX_SRCS%`" for i in $URLS; do - OPENELEC_MIRROR="http://sources.openelec.tv/mirror" SOURCE_NAME="`basename $i`" PACKAGE="$SOURCES/$1/$SOURCE_NAME" - PACKAGE_MIRROR="$OPENELEC_MIRROR/$PKG_NAME/$SOURCE_NAME" + PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$SOURCE_NAME" [ "$VERBOSE" != "yes" ] && WGET_OPT=-q WGET_CMD="wget --passive-ftp --no-check-certificate -c $WGET_OPT -P $SOURCES/$1"