Hello community, here is the log from the commit of package xorg-x11-libxcb checked in at Mon Mar 5 00:23:22 CET 2007. -------- --- xorg-x11-libxcb/xorg-x11-libxcb.changes 2006-12-03 15:40:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libxcb/xorg-x11-libxcb.changes 2007-03-04 13:43:24.094252000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 4 13:41:15 CET 2007 - sndirsch@suse.de + +- sloppy-lock.diff: + * workaround for "xcb_xlib.c:50: xcb_xlib_unlock: Assertion + `c->xlib.lock' failed"; set LIBXCB_ALLOW_SLOPPY_LOCK to enable + it (Bug #251087) + +------------------------------------------------------------------- New: ---- sloppy-lock.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libxcb.spec ++++++ --- /var/tmp/diff_new_pack.i29604/_old 2007-03-05 00:22:44.000000000 +0100 +++ /var/tmp/diff_new_pack.i29604/_new 2007-03-05 00:22:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libxcb (Version 7.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,12 +15,13 @@ BuildRequires: libxslt pkgconfig xorg-x11-libXau-devel xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 1 +Release: 11 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries Summary: X.Org xcb library Source: libxcb-%{dirsuffix}.tar.bz2 +Patch: sloppy-lock.diff %description This package contains the X.Org xcb library. @@ -53,6 +54,7 @@ %prep %setup -n libxcb-%{dirsuffix} +%patch %build ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -80,6 +82,11 @@ /usr/%{_lib}/*.so /usr/%{_lib}/pkgconfig/*.pc -%changelog -n xorg-x11-libxcb +%changelog +* Sun Mar 04 2007 - sndirsch@suse.de +- sloppy-lock.diff: + * workaround for "xcb_xlib.c:50: xcb_xlib_unlock: Assertion + `c->xlib.lock' failed"; set LIBXCB_ALLOW_SLOPPY_LOCK to enable + it (Bug #251087) * Sun Dec 03 2006 - sndirsch@suse.de - created package ++++++ sloppy-lock.diff ++++++ --- src/xcb_conn.c.orig 2007-03-03 17:05:12.000000000 +0100 +++ src/xcb_conn.c 2007-03-03 17:18:25.000000000 +0100 @@ -62,6 +62,11 @@ static int _xcb_xlib_init(_xcb_xlib *xlib) { xlib->lock = 0; + xlib->sloppy_lock = 0; + + if (getenv("LIBXCB_ALLOW_SLOPPY_LOCK")) + xlib->sloppy_lock = 1; + pthread_cond_init(&xlib->cond, 0); return 1; } --- src/xcbint.h.orig 2007-03-03 17:05:00.000000000 +0100 +++ src/xcbint.h 2007-03-03 17:10:33.000000000 +0100 @@ -130,6 +130,7 @@ typedef struct _xcb_xlib { int lock; + int sloppy_lock; pthread_t thread; pthread_cond_t cond; } _xcb_xlib; --- src/xcb_xlib.c.orig 2007-03-03 17:07:06.000000000 +0100 +++ src/xcb_xlib.c 2007-03-03 17:10:14.000000000 +0100 @@ -40,7 +40,8 @@ void xcb_xlib_lock(xcb_connection_t *c) { _xcb_lock_io(c); - assert(!c->xlib.lock); + if (!c->xlib.sloppy_lock) + assert(!c->xlib.lock); c->xlib.lock = 1; c->xlib.thread = pthread_self(); _xcb_unlock_io(c); @@ -49,7 +50,8 @@ void xcb_xlib_unlock(xcb_connection_t *c) { _xcb_lock_io(c); - assert(c->xlib.lock); + if (!c->xlib.sloppy_lock) + assert(c->xlib.lock); assert(pthread_equal(c->xlib.thread, pthread_self())); c->xlib.lock = 0; pthread_cond_broadcast(&c->xlib.cond); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org