mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
106 lines
3.2 KiB
Diff
106 lines
3.2 KiB
Diff
Michel Dänzer <daenzer AT debian.org>
|
|
|
|
* The boolean value returned via the last parameter to XShmQueryVersion()
|
|
isn't honoured everywhere.
|
|
* The init functions that take parameters allow the caller to enable shared
|
|
pixmaps when they aren't supported (or disabled by configuration files).
|
|
|
|
|
|
These result in incorrect rendering when the MIT-SHM extension doesn't support
|
|
shared pixmaps, e.g. using EXA with current versions of Xorg.
|
|
|
|
http://bugs.gentoo.org/show_bug.cgi?id=197489
|
|
|
|
diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c
|
|
--- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100
|
|
+++ imlib-1.9.15/gdk_imlib/misc.c 2007-10-28 14:00:04.000000000 +0100
|
|
@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams
|
|
visual = gdk_rgb_get_visual();
|
|
id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */
|
|
id->x.depth = visual->depth; /* the depth of the screen in bpp */
|
|
+
|
|
+ id->x.shm = 0;
|
|
+ id->x.shmp = 0;
|
|
+ id->max_shm = 0;
|
|
#ifdef HAVE_SHM
|
|
if (XShmQueryExtension(id->x.disp))
|
|
{
|
|
@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams
|
|
id->x.last_xim = NULL;
|
|
id->x.last_sxim = NULL;
|
|
id->max_shm = 0x7fffffff;
|
|
- if (XShmPixmapFormat(id->x.disp) == ZPixmap)
|
|
+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
|
|
+ (pm == True))
|
|
id->x.shmp = 1;
|
|
}
|
|
}
|
|
}
|
|
- else
|
|
#endif
|
|
- {
|
|
- id->x.shm = 0;
|
|
- id->x.shmp = 0;
|
|
- }
|
|
+
|
|
id->cache.on_image = 0;
|
|
id->cache.size_image = 0;
|
|
id->cache.num_image = 0;
|
|
@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams
|
|
}
|
|
if (p->flags & PARAMS_SHAREDPIXMAPS)
|
|
{
|
|
- if (id->x.shm)
|
|
- id->x.shmp = p->sharedpixmaps;
|
|
+ if (!p->sharedpixmaps)
|
|
+ id->x.shmp = 0;
|
|
}
|
|
if (p->flags & PARAMS_PALETTEOVERRIDE)
|
|
override = p->paletteoverride;
|
|
diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c
|
|
--- imlib-1.9.15.orig/Imlib/misc.c 2004-09-21 02:22:59.000000000 +0200
|
|
+++ imlib-1.9.15/Imlib/misc.c 2007-10-28 14:00:23.000000000 +0100
|
|
@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I
|
|
id->x.root = DefaultRootWindow(disp); /* the root window id */
|
|
id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */
|
|
id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */
|
|
+
|
|
+ id->x.shm = 0;
|
|
+ id->x.shmp = 0;
|
|
+ id->max_shm = 0;
|
|
#ifdef HAVE_SHM
|
|
if (XShmQueryExtension(id->x.disp))
|
|
{
|
|
@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I
|
|
id->x.last_xim = NULL;
|
|
id->x.last_sxim = NULL;
|
|
id->max_shm = 0x7fffffff;
|
|
- if (XShmPixmapFormat(id->x.disp) == ZPixmap)
|
|
+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
|
|
+ (pm == True)))
|
|
id->x.shmp = 1;
|
|
}
|
|
}
|
|
}
|
|
- else
|
|
#endif
|
|
- {
|
|
- id->x.shm = 0;
|
|
- id->x.shmp = 0;
|
|
- }
|
|
+
|
|
id->cache.on_image = 0;
|
|
id->cache.size_image = 0;
|
|
id->cache.num_image = 0;
|
|
@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I
|
|
}
|
|
if (p->flags & PARAMS_SHAREDPIXMAPS)
|
|
{
|
|
- if (id->x.shm)
|
|
- id->x.shmp = p->sharedpixmaps;
|
|
+ if (!p->sharedpixmaps)
|
|
+ id->x.shmp = 0;
|
|
}
|
|
if (p->flags & PARAMS_PALETTEOVERRIDE)
|
|
override = p->paletteoverride;
|