Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

This commit is contained in:
Stephan Raue 2011-07-15 20:58:29 +02:00
commit b857ca758e
3 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index bac0c9e..e7dba5a 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -388,7 +388,7 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable)
_X_HIDDEN void
driReleaseDrawables(struct glx_context *gc)
{
- struct glx_display *const priv = __glXInitialize(gc->psc->dpy);
+ const struct glx_display *priv = gc->psc->display;
__GLXDRIdrawable *pdraw;
if (priv == NULL)

View File

@ -24,6 +24,8 @@
setup_toolchain host
LDFLAGS="$LDFLAGS -fwhole-program"
cd $BUILD/$1*/squashfs-tools
make mksquashfs \
XZ_SUPPORT=1 \

View File

@ -0,0 +1,12 @@
diff -Naur squashfs4.2-old/squashfs-tools/compressor.c squashfs4.2-new/squashfs-tools/compressor.c
--- squashfs4.2-old/squashfs-tools/compressor.c 2011-02-11 07:49:24.000000000 -0800
+++ squashfs4.2-new/squashfs-tools/compressor.c 2011-03-04 10:27:47.000000000 -0800
@@ -27,7 +27,7 @@
#ifndef GZIP_SUPPORT
static struct compressor gzip_comp_ops = {
- NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
};
#else
extern struct compressor gzip_comp_ops;