mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
708a34555a
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-addon-xvdr"
|
PKG_NAME="xbmc-addon-xvdr"
|
||||||
PKG_VERSION="8fc8607"
|
PKG_VERSION="0b3b2d4"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-pvr-addons"
|
PKG_NAME="xbmc-pvr-addons"
|
||||||
PKG_VERSION="5f97406"
|
PKG_VERSION="96774c4"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-theme-Confluence"
|
PKG_NAME="xbmc-theme-Confluence"
|
||||||
PKG_VERSION="966a6cc"
|
PKG_VERSION="6fc42b2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="966a6cc"
|
PKG_VERSION="6fc42b2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -1,25 +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
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
for i in `ls xbmc-*.patch`; do
|
|
||||||
mv $i `echo $i | sed "s,$1,$2,g"`
|
|
||||||
done
|
|
@ -2556,7 +2556,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86_64 3.7.3 Kernel Configuration
|
# Linux/x86_64 3.7.4 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
@ -2501,7 +2501,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
@ -2514,7 +2514,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
@ -2442,7 +2442,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
@ -2565,7 +2565,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
@ -2494,7 +2494,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
|||||||
# CONFIG_SND_HDSP is not set
|
# CONFIG_SND_HDSP is not set
|
||||||
# CONFIG_SND_HDSPM is not set
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
CONFIG_SND_ICE1724=m
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
# CONFIG_SND_KORG1212 is not set
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user