Hello community,
here is the log from the commit of package xorg-x11-libxcb for openSUSE:Factory
checked in at Tue May 19 00:29:43 CEST 2009.
--------
--- xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-04-21 20:37:09.000000000 +0200
+++ xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-05-16 09:51:08.000000000 +0200
@@ -1,0 +2,16 @@
+Sat May 16 09:49:06 CEST 2009 - sndirsch@suse.de
+
+- commit-beccb0b.diff
+ * kludgily hand-merged xid fixes (bnc #423740, bfo #20254)
+
+-------------------------------------------------------------------
+Thu Apr 30 21:53:45 CEST 2009 - eich@suse.de
+
+- pack .la files in devel package
+
+-------------------------------------------------------------------
+Thu Apr 30 18:21:11 CEST 2009 - sndirsch@suse.de
+
+- reenabled build of static libs on openSUSE <= 11.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
commit-beccb0b.diff
libxcb-xlib.la
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libxcb.spec ++++++
--- /var/tmp/diff_new_pack.iM8124/_old 2009-05-19 00:27:57.000000000 +0200
+++ /var/tmp/diff_new_pack.iM8124/_new 2009-05-19 00:27:57.000000000 +0200
@@ -28,13 +28,15 @@
#%endif
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 7
+Release: 8
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
Summary: X.Org xcb library
Source: libxcb-%{dirsuffix}.tar.bz2
+Source1: libxcb-xlib.la
Patch1: bug-262309_xcb-xauthlocalhostname.diff
+Patch2: commit-beccb0b.diff
%description
This package contains the X.Org xcb library.
@@ -69,10 +71,15 @@
%prep
%setup -q -n libxcb-%{dirsuffix}
%patch1 -p1
+%patch2 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --disable-static --with-pic --docdir=%{_docdir}/%{name}
+%configure \
+%if %suse_version > 1110
+--disable-static \
+%endif
+--with-pic --docdir=%{_docdir}/%{name}
make %{?jobs:-j %jobs}
%install
@@ -82,7 +89,14 @@
gcc -Wall -ansi -pedantic -c xcb-xlib.c -fPIC
ld -shared -soname libxcb-xlib.so.0 \
-o $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.so.0 xcb-xlib.o
+%if %suse_version <= 1110
+ar cru $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.a xcb-xlib.o
+ranlib $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.a
+sed 's/LIB/%{_lib}/g' $RPM_SOURCE_DIR/libxcb-xlib.la \
+ > $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.la
+%else
%{__rm} -f %{buildroot}%{_libdir}/*.la
+%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -99,10 +113,21 @@
%defattr(-,root,root)
%doc %{_docdir}/%{name}
/usr/include/xcb/
+%if %suse_version <= 1110
+%{_libdir}/*.a
+%{_libdir}/*.la
+%endif
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat May 16 2009 sndirsch@suse.de
+- commit-beccb0b.diff
+ * kludgily hand-merged xid fixes (bnc #423740, bfo #20254)
+* Thu Apr 30 2009 eich@suse.de
+- pack .la files in devel package
+* Thu Apr 30 2009 sndirsch@suse.de
+- reenabled build of static libs on openSUSE <= 11.1
* Tue Apr 21 2009 crrodriguez@suse.de
- remove static libraries and "la" files
* Mon Mar 02 2009 sndirsch@suse.de
++++++ commit-beccb0b.diff ++++++
commit beccb0be15f5699c942a0af33307d9e4bf797e2a
Author: Bart Massey
Date: Tue Mar 24 16:24:04 2009 -0700
kludgily hand-merged xid fixes
Signed-off-by: Bart Massey
Signed-off-by: Julien Danjou
diff --git a/src/xcb_xid.c b/src/xcb_xid.c
index 7ff0c5f..3df5dbe 100644
--- a/src/xcb_xid.c
+++ b/src/xcb_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
+/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
/* XID allocators. */
+#include
#include
#include "xcb.h"
#include "xcbext.h"
@@ -39,21 +40,40 @@ uint32_t xcb_generate_id(xcb_connection_t *c)
if(c->has_error)
return -1;
pthread_mutex_lock(&c->xid.lock);
- if(c->xid.last == c->xid.max)
+ if(c->xid.last >= c->xid.max - c->xid.inc + 1)
{
xcb_xc_misc_get_xid_range_reply_t *range;
- range = xcb_xc_misc_get_xid_range_reply(c, xcb_xc_misc_get_xid_range(c), 0);
- if(!range)
- {
- pthread_mutex_unlock(&c->xid.lock);
- return -1;
+ assert(c->xid.last == c->xid.max);
+ if (c->xid.last == 0) {
+ /* finish setting up initial range */
+ c->xid.max = c->setup->resource_id_mask;
+ } else {
+ /* check for extension */
+ const xcb_query_extension_reply_t *xc_misc_reply =
+ xcb_get_extension_data(c, &xcb_xc_misc_id);
+ if (!xc_misc_reply) {
+ pthread_mutex_unlock(&c->xid.lock);
+ return -1;
+ }
+ /* get new range */
+ range = xcb_xc_misc_get_xid_range_reply(c,
+ xcb_xc_misc_get_xid_range(c), 0);
+ /* XXX The latter disjunct is what the server returns
+ when it is out of XIDs. Sweet. */
+ if(!range || (range->start_id == 0 && range->count == 1))
+ {
+ pthread_mutex_unlock(&c->xid.lock);
+ return -1;
+ }
+ assert(range->count > 0 && range->start_id > 0);
+ c->xid.last = range->start_id;
+ c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
+ free(range);
}
- c->xid.last = range->start_id;
- c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
- free(range);
+ } else {
+ c->xid.last += c->xid.inc;
}
ret = c->xid.last | c->xid.base;
- c->xid.last += c->xid.inc;
pthread_mutex_unlock(&c->xid.lock);
return ret;
}
@@ -65,8 +85,8 @@ int _xcb_xid_init(xcb_connection_t *c)
if(pthread_mutex_init(&c->xid.lock, 0))
return 0;
c->xid.last = 0;
+ c->xid.max = 0;
c->xid.base = c->setup->resource_id_base;
- c->xid.max = c->setup->resource_id_mask;
c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);
return 1;
}
++++++ libxcb-xlib.la ++++++
# libxcb-xlib.la - a libtool library file
# Generated by ltmain.sh - GNU libtool 1.5.22 Debian 1.5.22-4 (1.1220.2.365 2005/12/18 22:14:06)
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname='libxcb-xlib.so.0'
# Names of this library.
library_names='libxcb-xlib.so.0'
# The name of the static archive.
old_library='libxcb-xlib.a'
# Libraries that this one depends upon.
dependency_libs=' /usr/LIB/libxcb.la -lXau'
# Version information for libxcb-xlib.
current=0
age=0
revision=0
# Is this an already installed library?
installed=yes
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/usr/LIB'
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org