mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge remote-tracking branch 'upstream/master' into openelec-3.2
This commit is contained in:
commit
aa5bb2685b
@ -31,6 +31,11 @@ PKG_PRIORITY="optional"
|
||||
PKG_SECTION="lang"
|
||||
PKG_SHORTDESC="python: The Python programming language"
|
||||
PKG_LONGDESC="Python is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS bluez"
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bluez"
|
||||
fi
|
||||
|
@ -0,0 +1,70 @@
|
||||
From d0929f7068e8025a3d9ccf5dd7bea8dc0d887a49 Mon Sep 17 00:00:00 2001
|
||||
From: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Date: Sun, 1 Sep 2013 13:01:09 +0300
|
||||
Subject: [PATCH] ALSA: hda - hdmi: Fallback to ALSA allocation when selecting
|
||||
CA
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
hdmi_channel_allocation() tries to find a HDMI channel allocation that
|
||||
matches the number channels in the playback stream and contains only
|
||||
speakers that the HDMI sink has reported as available via EDID. If no
|
||||
such allocation is found, 0 (stereo audio) is used.
|
||||
|
||||
Using CA 0 causes the audio causes the sink to discard everything except
|
||||
the first two channels (front left and front right).
|
||||
|
||||
However, the sink may be capable of receiving more channels than it has
|
||||
speakers (and then perform downmix or discard the extra channels), in
|
||||
which case it is preferable to use a CA that contains extra channels
|
||||
than to use CA 0 which discards all the non-stereo channels.
|
||||
|
||||
Additionally, it seems that HBR passthrough output does not work on
|
||||
Intel HDMI codecs when CA is set to 0 (possibly the codec zeroes
|
||||
channels not present in CA). This happens with all receivers that report
|
||||
a 5.1 speaker mask since a HBR stream is carried on 8 channels to the
|
||||
codec.
|
||||
|
||||
Add a fallback in the CA selection so that the CA channel count at least
|
||||
matches the stream channel count, even if the streams contains channels
|
||||
not present in the sink speaker descriptor.
|
||||
|
||||
Thanks to GrimGriefer at OpenELEC forums for discovering that changing
|
||||
the sink speaker mask allowed HBR output.
|
||||
|
||||
Reported-by: GrimGriefer
|
||||
Reported-by: Ashecrow
|
||||
Reported-by: Frank Zafka <kafkaesque1978@gmail.com>
|
||||
Reported-by: Peter Frühberger <fritsch@xbmc.org>
|
||||
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
---
|
||||
sound/pci/hda/patch_hdmi.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index 030ca86..354fc55 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -551,6 +551,17 @@ static int hdmi_channel_allocation(struct hdmi_eld *eld, int channels)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (!ca) {
|
||||
+ /* if there was no match, select the regular ALSA channel
|
||||
+ * allocation with the matching number of channels */
|
||||
+ for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
|
||||
+ if (channels == channel_allocations[i].channels) {
|
||||
+ ca = channel_allocations[i].ca_index;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
snd_print_channel_allocation(eld->info.spk_alloc, buf, sizeof(buf));
|
||||
snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",
|
||||
ca, channels, buf);
|
||||
--
|
||||
1.8.1.5
|
||||
|
@ -21,7 +21,7 @@
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="12.2-18397e1"
|
||||
if [ "$XBMC" = "master" ]; then
|
||||
PKG_VERSION="13.alpha-0efa87e"
|
||||
PKG_VERSION="13.alpha-2435cf3"
|
||||
elif [ "$XBMC" = "xbmc-aml" ]; then
|
||||
PKG_VERSION="aml-frodo-d9119f2"
|
||||
fi
|
||||
|
@ -21,7 +21,7 @@
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="12.2-18397e1"
|
||||
if [ "$XBMC" = "master" ]; then
|
||||
PKG_VERSION="13.alpha-0efa87e"
|
||||
PKG_VERSION="13.alpha-2435cf3"
|
||||
elif [ "$XBMC" = "xbmc-aml" ]; then
|
||||
PKG_VERSION="aml-frodo-d9119f2"
|
||||
fi
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -42,15 +42,15 @@ else
|
||||
fi
|
||||
|
||||
if [ "$DEVTOOLS" = "yes" ]; then
|
||||
BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test --enable-tools"
|
||||
BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test"
|
||||
else
|
||||
BLUEZ_CONFIG="$BLUEZ_CONFIG --disable-monitor --disable-test --disable-tools"
|
||||
BLUEZ_CONFIG="$BLUEZ_CONFIG --disable-monitor --disable-test"
|
||||
fi
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
|
||||
--disable-silent-rules \
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-library \
|
||||
--enable-usb \
|
||||
--enable-udev \
|
||||
@ -58,6 +58,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
|
||||
--disable-obex \
|
||||
--enable-client \
|
||||
--disable-systemd \
|
||||
--enable-tools \
|
||||
--enable-datafiles \
|
||||
--disable-experimental \
|
||||
--with-gnu-ld \
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="iptables"
|
||||
PKG_VERSION="1.4.19.1"
|
||||
PKG_VERSION="1.4.20"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff -Naur iptables-1.4.20/iptables/Makefile.am iptables-1.4.20.patch/iptables/Makefile.am
|
||||
--- iptables-1.4.20/iptables/Makefile.am 2013-08-06 17:48:43.000000000 +0200
|
||||
+++ iptables-1.4.20.patch/iptables/Makefile.am 2013-09-01 05:30:03.118428151 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
v6_sbin_links = ip6tables ip6tables-restore ip6tables-save
|
||||
endif
|
||||
|
||||
-iptables-extensions.8: ${srcdir}/iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
|
||||
+iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
|
||||
${AM_VERBOSE_GEN} sed \
|
||||
-e '/@MATCH@/ r ../extensions/matches.man' \
|
||||
-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="samba"
|
||||
PKG_VERSION="3.6.16"
|
||||
PKG_VERSION="3.6.18"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -29,7 +29,7 @@ PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
|
||||
PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
#PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp-host mpfr cloog ppl"
|
||||
PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp-host mpfr cloog ppl:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/devel"
|
||||
PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
|
||||
|
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://gcc.gnu.org/"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl"
|
||||
PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/lang"
|
||||
PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
|
||||
|
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://gcc.gnu.org/"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl eglibc"
|
||||
PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl:host eglibc"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/lang"
|
||||
PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
|
||||
|
@ -1,41 +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 $BUILD/$1*
|
||||
|
||||
mkdir -p objdir && cd objdir
|
||||
|
||||
../configure --host=$HOST_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--target=$TARGET_NAME \
|
||||
--prefix=$ROOT/$TOOLCHAIN \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-interfaces="c,cxx" \
|
||||
--with-gmp="$ROOT/$TOOLCHAIN" \
|
||||
|
||||
make -j1
|
||||
make install
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ppl"
|
||||
PKG_VERSION="1.1pre9"
|
||||
PKG_VERSION="1.1pre10"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@ -32,6 +32,9 @@ PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/math"
|
||||
PKG_SHORTDESC="ppl: Parma Polyhedra Library"
|
||||
PKG_LONGDESC="The Parma Polyhedra Library (PPL) provides numerical abstractions especially targeted at applications in the field of analysis and verification of complex systems."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-interfaces=c,cxx --with-gmp=$ROOT/$TOOLCHAIN"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.10.7 Kernel Configuration
|
||||
# Linux/arm 3.10.10 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -139,9 +139,10 @@ CONFIG_PERF_USE_VMALLOC=y
|
||||
#
|
||||
# CONFIG_PERF_EVENTS is not set
|
||||
# CONFIG_VM_EVENT_COUNTERS is not set
|
||||
CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
CONFIG_SLAB=y
|
||||
# CONFIG_SLUB is not set
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
@ -347,7 +348,8 @@ CONFIG_HAVE_MEMBLOCK=y
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||
# CONFIG_COMPACTION is not set
|
||||
CONFIG_COMPACTION=y
|
||||
CONFIG_MIGRATION=y
|
||||
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
# CONFIG_KSM is not set
|
||||
@ -2519,7 +2521,8 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_TIMER_STATS is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_DEBUG_SLAB is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
||||
# CONFIG_DEBUG_KMEMLEAK is not set
|
||||
# CONFIG_DEBUG_PREEMPT is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user