[Frugalware-darcs] frugalware-current: libxcb-1.0-3-i686

voroskoi voroskoi at frugalware.org
Sat Jun 9 11:09:15 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070609085246-dd049-63e854db90a5fd83c885454b86f9ea5416246619.gz;

[libxcb-1.0-3-i686
voroskoi <voroskoi at frugalware.org>**20070609085246
 added a patch to workaround #2144
 ok krix@
] {
hunk ./source/x11/libxcb/FrugalBuild 6
-pkgrel=2
+pkgrel=3
hunk ./source/x11/libxcb/FrugalBuild 14
-source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2)
-sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e')
+source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2 \
+	libxcb-1.0-sloppy_lock.patch)
+sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e'\
+          '4248f7becce913e5cc15f5f45b9f1cc47e6657e5')
addfile ./source/x11/libxcb/libxcb-1.0-sloppy_lock.patch
hunk ./source/x11/libxcb/libxcb-1.0-sloppy_lock.patch 1
+--- 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);
}


More information about the Frugalware-darcs mailing list