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-settings
This commit is contained in:
commit
25d52865d4
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.5.13"
|
||||
PKG_VERSION="1.5.14"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -Naur libpng-1.5.13-old/configure.ac libpng-1.5.13-new/configure.ac
|
||||
--- libpng-1.5.13-old/configure.ac 2012-09-27 04:21:22.000000000 -0700
|
||||
+++ libpng-1.5.13-new/configure.ac 2012-12-30 09:53:28.000000000 -0800
|
||||
@@ -31,7 +31,7 @@
|
||||
dnl End of version number stuff
|
||||
|
||||
AC_CONFIG_SRCDIR([pngget.c])
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
# Checks for programs.
|
||||
AC_LANG([C])
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="3.7.7"
|
||||
PKG_VERSION="3.7.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
93
packages/linux/patches/3.7.8/linux-990.06-hda-fix-broken-audio-over-optical-on-alc662.patch
vendored
Normal file
93
packages/linux/patches/3.7.8/linux-990.06-hda-fix-broken-audio-over-optical-on-alc662.patch
vendored
Normal file
@ -0,0 +1,93 @@
|
||||
From 09c206b7ee18b50d81916697150bd510f198716d Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Fri, 15 Feb 2013 20:19:48 +0200
|
||||
Subject: [PATCH] hda: fix broken audio over optical on alc662+
|
||||
|
||||
original commit:
|
||||
|
||||
> commit 2626d16bbdedcd64c6af3c519aecd5a6f2356e58
|
||||
> Author: Takashi Iwai <tiwai@suse.de>
|
||||
> Date: Fri Dec 14 10:22:35 2012 +0100
|
||||
>
|
||||
> ALSA: hda - Always turn on pins for HDMI/DP
|
||||
>
|
||||
> commit 6169b673618bf0b2518ce413b54925782a603f06 upstream.
|
||||
>
|
||||
> We've seen the broken HDMI *video* output on some machines with GM965,
|
||||
> and the debugging session pointed that the culprit is the disabled
|
||||
> audio output pins. Toggling these pins dynamically on demand caused
|
||||
> flickering of HDMI TV.
|
||||
>
|
||||
> This patch changes the behavior to keep the pin ON constantly.
|
||||
>
|
||||
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51421
|
||||
>
|
||||
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
|
||||
for now we revert the above commit, until we have a propper fix
|
||||
---
|
||||
sound/pci/hda/patch_hdmi.c | 18 ++++++++++++++----
|
||||
1 files changed, 14 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index 791ef80..2587119 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -431,11 +431,9 @@ static void hdmi_init_pin(struct hda_codec *codec, hda_nid_t pin_nid)
|
||||
if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP)
|
||||
snd_hda_codec_write(codec, pin_nid, 0,
|
||||
AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
|
||||
- /* Enable pin out: some machines with GM965 gets broken output when
|
||||
- * the pin is disabled or changed while using with HDMI
|
||||
- */
|
||||
+ /* Disable pin out until stream is active*/
|
||||
snd_hda_codec_write(codec, pin_nid, 0,
|
||||
- AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
|
||||
+ AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
|
||||
}
|
||||
|
||||
static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t cvt_nid)
|
||||
@@ -1343,6 +1341,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
||||
struct hdmi_spec *spec = codec->spec;
|
||||
int pin_idx = hinfo_to_pin_index(spec, hinfo);
|
||||
hda_nid_t pin_nid = spec->pins[pin_idx].pin_nid;
|
||||
+ int pinctl;
|
||||
bool non_pcm;
|
||||
|
||||
non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
|
||||
@@ -1351,6 +1350,11 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
||||
|
||||
hdmi_setup_audio_infoframe(codec, pin_idx, non_pcm, substream);
|
||||
|
||||
+ pinctl = snd_hda_codec_read(codec, pin_nid, 0,
|
||||
+ AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
|
||||
+ snd_hda_codec_write(codec, pin_nid, 0,
|
||||
+ AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl | PIN_OUT);
|
||||
+
|
||||
return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);
|
||||
}
|
||||
|
||||
@@ -1370,6 +1374,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
|
||||
int cvt_idx, pin_idx;
|
||||
struct hdmi_spec_per_cvt *per_cvt;
|
||||
struct hdmi_spec_per_pin *per_pin;
|
||||
+ int pinctl;
|
||||
|
||||
if (hinfo->nid) {
|
||||
cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
|
||||
@@ -1386,6 +1391,11 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
|
||||
return -EINVAL;
|
||||
per_pin = &spec->pins[pin_idx];
|
||||
|
||||
+ pinctl = snd_hda_codec_read(codec, per_pin->pin_nid, 0,
|
||||
+ AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
|
||||
+ snd_hda_codec_write(codec, per_pin->pin_nid, 0,
|
||||
+ AC_VERB_SET_PIN_WIDGET_CONTROL,
|
||||
+ pinctl & ~PIN_OUT);
|
||||
snd_hda_spdif_ctls_unassign(codec, pin_idx);
|
||||
per_pin->chmap_set = false;
|
||||
memset(per_pin->chmap, 0, sizeof(per_pin->chmap));
|
||||
--
|
||||
1.7.2.5
|
||||
|
@ -16,4 +16,7 @@
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
</network>
|
||||
</advancedsettings>
|
||||
|
@ -0,0 +1,23 @@
|
||||
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
|
||||
index 5b36c8d..2967347 100755
|
||||
--- a/src/gen7_mfd.c
|
||||
+++ b/src/gen7_mfd.c
|
||||
@@ -194,7 +194,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
|
||||
if (gen7_avc_surface->dmv_top == NULL) {
|
||||
gen7_avc_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr,
|
||||
"direct mv w/r buffer",
|
||||
- width_in_mbs * height_in_mbs * 64,
|
||||
+ width_in_mbs * (height_in_mbs + 1) * 64,
|
||||
0x1000);
|
||||
assert(gen7_avc_surface->dmv_top);
|
||||
}
|
||||
@@ -203,7 +203,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
|
||||
gen7_avc_surface->dmv_bottom == NULL) {
|
||||
gen7_avc_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr,
|
||||
"direct mv w/r buffer",
|
||||
- width_in_mbs * height_in_mbs * 64,
|
||||
+ width_in_mbs * (height_in_mbs + 1) * 64,
|
||||
0x1000);
|
||||
assert(gen7_avc_surface->dmv_bottom);
|
||||
}
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c
|
||||
index 049be09..72ec9a4 100644
|
||||
--- a/va/glx/va_glx_impl.c
|
||||
+++ b/va/glx/va_glx_impl.c
|
||||
@@ -937,6 +937,7 @@ associate_surface(
|
||||
return status;
|
||||
|
||||
x11_trap_errors();
|
||||
+ status = ctx->vtable->vaSyncSurface(ctx, surface);
|
||||
status = ctx->vtable->vaPutSurface(
|
||||
ctx,
|
||||
surface,
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libvdpau"
|
||||
PKG_VERSION="0.5"
|
||||
PKG_VERSION="0.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -Naur libvdpau-0.5-old/configure.ac libvdpau-0.5-new/configure.ac
|
||||
--- libvdpau-0.5-old/configure.ac 2012-09-04 10:26:33.000000000 -0700
|
||||
+++ libvdpau-0.5-new/configure.ac 2012-12-29 05:04:20.000000000 -0800
|
||||
@@ -4,7 +4,7 @@
|
||||
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
# Disable static libraries by default. Use --enable-static if you really want
|
||||
# them.
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pkg-config"
|
||||
PKG_VERSION="0.27.1"
|
||||
PKG_VERSION="0.28"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libmicrohttpd"
|
||||
PKG_VERSION="0.9.24"
|
||||
PKG_VERSION="0.9.25"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xrandr"
|
||||
PKG_VERSION="1.3.5"
|
||||
PKG_VERSION="1.4.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xkeyboard-config"
|
||||
PKG_VERSION="2.7"
|
||||
PKG_VERSION="2.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-intel"
|
||||
PKG_VERSION="2.20.19"
|
||||
PKG_VERSION="2.21.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -17,4 +17,7 @@
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
</network>
|
||||
</advancedsettings>
|
||||
|
@ -28,4 +28,8 @@
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
</network>
|
||||
|
||||
</advancedsettings>
|
||||
|
Loading…
x
Reference in New Issue
Block a user