Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Fri Jul 18 22:03:57 CEST 2008.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2008-07-10 17:11:14.000000000 +0200
+++ xorg-x11-libs/xorg-x11-libs.changes 2008-07-18 17:12:29.718644000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 18 17:12:08 CEST 2008 - sndirsch@suse.de
+
+- pixman 0.11.8
+- obsoletes pixman-bfo16310.diff
+
+-------------------------------------------------------------------
Old:
----
pixman-0.11.6.tar.bz2
pixman-bfo16310.diff
New:
----
pixman-0.11.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.Y23047/_old 2008-07-18 22:02:09.000000000 +0200
+++ /var/tmp/diff_new_pack.Y23047/_new 2008-07-18 22:02:09.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 70
+Release: 72
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -57,14 +57,13 @@
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.2.tar.bz2
-Source32: pixman-0.11.6.tar.bz2
+Source32: pixman-0.11.8.tar.bz2
Source33: libpciaccess-0.10.3.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
Patch5: libxkbui.diff
Patch10: libXxf86misc-xcb.diff
-Patch11: pixman-bfo16310.diff
%description
This package contains the remaining X.Org libraries.
@@ -149,9 +148,6 @@
pushd libXxf86misc-*
%patch10 -p0
popd
-pushd pixman-*
-%patch11 -p1
-popd
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -224,6 +220,9 @@
%{_mandir}/man3/*
%changelog
+* Fri Jul 18 2008 sndirsch@suse.de
+- pixman 0.11.8
+- obsoletes pixman-bfo16310.diff
* Thu Jul 10 2008 sndirsch@suse.de
- pixman 0.11.6
* development release
++++++ pixman-0.11.6.tar.bz2 -> pixman-0.11.8.tar.bz2 ++++++
++++ 1705 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/configure.ac new/pixman-0.11.8/configure.ac
--- old/pixman-0.11.6/configure.ac 2008-06-25 13:54:33.000000000 +0200
+++ new/pixman-0.11.8/configure.ac 2008-07-17 19:38:50.000000000 +0200
@@ -24,22 +24,18 @@
# Pixman versioning scheme
#
-# - The git version must at all times have an odd MICRO version
-# number.
+# - The version in git has an odd MICRO version number
#
-# - If you add API, increment the MICRO version to the next largest
-# odd number.
+# - Released versions both development and stable have an even MICRO
+# version number
#
-# - If you release a version that contains new API, then increment
-# MINOR and set MICRO to 0.
+# - Released development versions have an odd MINOR number
#
-# - If you release a new version that does not contain new API, then
-# increment MICRO to the next even number.
+# - Released stable versions have an event MINOR number
#
-# - After doing a release, increment MICRO again to make the version
-# number in git odd.
+# - Versions that break ABI must have a new MAJOR number
#
-# - If you break the ABI, then
+# - If you break the ABI, then at least this must be done:
#
# - increment MAJOR
#
@@ -54,10 +50,11 @@
# This ensures that binary incompatible versions can be installed
# in parallel. See http://www106.pair.com/rhp/parallel.html for
# more information
+#
m4_define([pixman_major], 0)
m4_define([pixman_minor], 11)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 8)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -153,9 +150,9 @@
AC_ARG_ENABLE(mmx,
[AC_HELP_STRING([--disable-mmx],
[disable MMX fast paths])],
- [disable_mmx=yes], [disable_mmx=no])
+ [enable_mmx=$enableval], [enable_mmx=auto])
-if test $disable_mmx = yes ; then
+if test $enable_mmx = no ; then
have_mmx_intrinsics=disabled
fi
@@ -166,6 +163,9 @@
fi
AC_MSG_RESULT($have_mmx_intrinsics)
+if test $enable_mmx = yes && test $have_mmx_intrinsics = no ; then
+ AC_MSG_ERROR([MMX intrinsics not detected])
+fi
AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
@@ -239,9 +239,9 @@
AC_ARG_ENABLE(sse2,
[AC_HELP_STRING([--disable-sse2],
[disable SSE2 fast paths])],
- [disable_sse2=yes], [disable_sse2=no])
+ [enable_sse2=$enableval], [enable_sse2=auto])
-if test $disable_sse2 = yes ; then
+if test $enable_sse2 = no ; then
have_sse2_intrinsics=disabled
fi
@@ -250,6 +250,9 @@
fi
AC_MSG_RESULT($have_sse2_intrinsics)
+if test $enable_sse2 = yes && test $have_sse_intrinsics = no ; then
+ AC_MSG_ERROR([SSE2 intrinsics not detected])
+fi
AM_CONDITIONAL(USE_SSE2, test $have_sse2_intrinsics = yes)
@@ -283,9 +286,9 @@
AC_ARG_ENABLE(vmx,
[AC_HELP_STRING([--disable-vmx],
[disable VMX fast paths])],
- [disable_vmx=yes], [disable_vmx=no])
+ [enable_vmx=$enableval], [enable_vmx=auto])
-if test $disable_vmx = yes ; then
+if test $enable_vmx = no ; then
have_vmx_intrinsics=disabled
fi
@@ -296,23 +299,28 @@
fi
AC_MSG_RESULT($have_vmx_intrinsics)
+if test $enable_vmx = yes && test $have_vmx_intrinsics = no ; then
+ AC_MSG_ERROR([VMX intrinsics not detected])
+fi
AC_SUBST(VMX_CFLAGS)
AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
AC_ARG_ENABLE(gtk,
- [AC_HELP_STRING([--disable-gtk],
- [disable tests using GTK+])],
- [disable_gtk=yes], [disable_gtk=no])
+ [AC_HELP_STRING([--enable-gtk],
+ [enable tests using GTK+ [default=auto]])],
+ [enable_gtk=$enableval], [enable_gtk=auto])
-if test $disable_gtk = no ; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
-else
- HAVE_GTK=no
+PKG_PROG_PKG_CONFIG
+if test $enable_gtk = auto ; then
+ PKG_CHECK_EXISTS([gtk+-2.0], [enable_gtk=yes], [enable_gtk=no])
+fi
+if test $enable_gtk = yes ; then
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0])
fi
-AM_CONDITIONAL(HAVE_GTK, [test "x$HAVE_GTK" = xyes])
+AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes])
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -320,6 +328,7 @@
AC_SUBST(DEP_LIBS)
AC_OUTPUT([pixman-1.pc
+ pixman-1-uninstalled.pc
Makefile
pixman/Makefile
pixman/pixman-version.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/Makefile.am new/pixman-0.11.8/Makefile.am
--- old/pixman-0.11.6/Makefile.am 2008-06-13 21:51:00.000000000 +0200
+++ new/pixman-0.11.8/Makefile.am 2008-06-25 15:21:32.000000000 +0200
@@ -10,6 +10,7 @@
test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
+GPGKEY=6FF7C1A8
USERNAME=$$USER
RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
RELEASE_CAIRO_HOST = $(USERNAME)@cairographics.org
@@ -66,22 +67,24 @@
@if [[ "$(PREV)" == "" ]]; then \
echo "" && \
echo "You must set the PREV variable on the make command line to" && \
- echo "the git tag of the last release." && \
+ echo "the last version." && \
echo "" && \
echo "For example:" && \
- echo " make PREV=pixman-0.7.3" && \
+ echo " make PREV=0.7.3" && \
echo "" && \
false; \
fi
release-check: ensure-prev release-verify-newer release-remove-old distcheck
+release-tag:
+ git-tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
+
release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(gpg_file)
mkdir -p releases
scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
- git-tag -s -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-prev
@echo "Please follow the instructions in RELEASING to push stuff out and"
@@ -122,6 +125,6 @@
@echo "============================== CUT HERE =============================="
@echo ""
-release-publish: release-upload release-publish-message
+release-publish: release-upload release-tag release-publish-message
-.PHONY: release-upload release-publish release-publish-message
+.PHONY: release-upload release-publish release-publish-message release-tag
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/pixman/combine.h.inc new/pixman-0.11.8/pixman/combine.h.inc
--- old/pixman-0.11.6/pixman/combine.h.inc 2008-06-13 21:51:00.000000000 +0200
+++ new/pixman-0.11.8/pixman/combine.h.inc 2008-07-17 19:32:03.000000000 +0200
@@ -57,19 +57,31 @@
x_c = (x_c * a) / 255 + y
*/
#define FbByteMulAdd(x, a, y) do { \
+ /* multiply and divide: trunc((i + 128)*257/65536) */ \
comp4_t t = ((x & RB_MASK) * a) + RB_ONE_HALF; \
t = (t + ((t >> COMPONENT_SIZE) & RB_MASK)) >> COMPONENT_SIZE; \
t &= RB_MASK; \
+ \
+ /* add */ \
t += y & RB_MASK; \
+ \
+ /* saturate */ \
t |= RB_MASK_PLUS_ONE - ((t >> COMPONENT_SIZE) & RB_MASK); \
t &= RB_MASK; \
\
+ /* multiply and divide */ \
x = (((x >> COMPONENT_SIZE) & RB_MASK) * a) + RB_ONE_HALF; \
x = (x + ((x >> COMPONENT_SIZE) & RB_MASK)) >> COMPONENT_SIZE; \
x &= RB_MASK; \
+ \
+ /* add */ \
x += (y >> COMPONENT_SIZE) & RB_MASK; \
+ \
+ /* saturate */ \
x |= RB_MASK_PLUS_ONE - ((x >> COMPONENT_SIZE) & RB_MASK); \
x &= RB_MASK; \
+ \
+ /* recombine */ \
x <<= COMPONENT_SIZE; \
x += t; \
} while (0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/pixman/Makefile.am new/pixman-0.11.8/pixman/Makefile.am
--- old/pixman-0.11.6/pixman/Makefile.am 2008-06-13 21:51:00.000000000 +0200
+++ new/pixman-0.11.8/pixman/Makefile.am 2008-07-17 03:45:56.000000000 +0200
@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libpixman-1.la
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
libpixman_1_la_SOURCES = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/pixman/pixman-access.c new/pixman-0.11.8/pixman/pixman-access.c
--- old/pixman-0.11.6/pixman/pixman-access.c 2008-06-13 21:51:00.000000000 +0200
+++ new/pixman-0.11.8/pixman/pixman-access.c 2008-06-27 12:22:03.000000000 +0200
@@ -1258,6 +1258,24 @@
(b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0);
}
+/*
+ * XXX: The transformed fetch path only works at 32-bpp so far. When all paths
+ * have wide versions, this can be removed.
+ *
+ * WARNING: This function loses precision!
+ */
+static FASTCALL uint32_t
+fbFetchPixel32_generic_lossy (bits_image_t *pict, int offset, int line)
+{
+ fetchPixelProc64 fetchPixel64 = ACCESS(pixman_fetchPixelProcForPicture64) (pict);
+ const uint64_t argb16Pixel = fetchPixel64(pict, offset, line);
+ uint32_t argb8Pixel;
+
+ pixman_contract(&argb8Pixel, &argb16Pixel, 1);
+
+ return argb8Pixel;
+}
+
fetchPixelProc32 ACCESS(pixman_fetchPixelProcForPicture32) (bits_image_t * pict)
{
switch(pict->format) {
@@ -1266,8 +1284,8 @@
case PIXMAN_a8b8g8r8: return fbFetchPixel_a8b8g8r8;
case PIXMAN_x8b8g8r8: return fbFetchPixel_x8b8g8r8;
/* These two require wide compositing */
- case PIXMAN_a2b10g10r10: return NULL;
- case PIXMAN_x2b10g10r10: return NULL;
+ case PIXMAN_a2b10g10r10: return fbFetchPixel32_generic_lossy;
+ case PIXMAN_x2b10g10r10: return fbFetchPixel32_generic_lossy;
/* 24bpp formats */
case PIXMAN_r8g8b8: return fbFetchPixel_r8g8b8;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/pixman/pixman-combine32.h new/pixman-0.11.8/pixman/pixman-combine32.h
--- old/pixman-0.11.6/pixman/pixman-combine32.h 2008-06-23 15:23:31.000000000 +0200
+++ new/pixman-0.11.8/pixman/pixman-combine32.h 2008-07-17 19:33:51.000000000 +0200
@@ -61,19 +61,31 @@
x_c = (x_c * a) / 255 + y
*/
#define FbByteMulAdd(x, a, y) do { \
+ /* multiply and divide: trunc((i + 128)*257/65536) */ \
uint32_t t = ((x & RB_MASK) * a) + RB_ONE_HALF; \
t = (t + ((t >> COMPONENT_SIZE) & RB_MASK)) >> COMPONENT_SIZE; \
t &= RB_MASK; \
+ \
+ /* add */ \
t += y & RB_MASK; \
+ \
+ /* saturate */ \
t |= RB_MASK_PLUS_ONE - ((t >> COMPONENT_SIZE) & RB_MASK); \
t &= RB_MASK; \
\
+ /* multiply and divide */ \
x = (((x >> COMPONENT_SIZE) & RB_MASK) * a) + RB_ONE_HALF; \
x = (x + ((x >> COMPONENT_SIZE) & RB_MASK)) >> COMPONENT_SIZE; \
x &= RB_MASK; \
+ \
+ /* add */ \
x += (y >> COMPONENT_SIZE) & RB_MASK; \
+ \
+ /* saturate */ \
x |= RB_MASK_PLUS_ONE - ((x >> COMPONENT_SIZE) & RB_MASK); \
x &= RB_MASK; \
+ \
+ /* recombine */ \
x <<= COMPONENT_SIZE; \
x += t; \
} while (0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pixman-0.11.6/pixman/pixman.h new/pixman-0.11.8/pixman/pixman.h
--- old/pixman-0.11.6/pixman/pixman.h 2008-06-25 13:53:38.000000000 +0200
+++ new/pixman-0.11.8/pixman/pixman.h 2008-07-16 21:08:45.000000000 +0200
@@ -74,10 +74,7 @@
/*
* Standard integers
*/
-#if defined (__SVR4) && defined (__sun)
-# include