mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
b14d6da9cb
@ -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"
|
||||
|
@ -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="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