Author: arekm Date: Sat May 8 19:53:16 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.8.0.902
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server-builtin-SHA1.patch (1.1 -> 1.2) ,
xorg-xserver-server.spec (1.233 -> 1.234) , xorg-xserver-server-git.patch (1.1
-> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch
diff -u packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.1
packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.2
--- packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.1
Thu Apr 29 12:32:03 2010
+++ packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch Sat May
8 21:53:10 2010
@@ -61,7 +61,7 @@
else
DIX_LIB='$(top_builddir)/dix/libdix.la'
OS_LIB='$(top_builddir)/os/libos.la'
-@@ -1325,93 +1325,6 @@ MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+@@ -1349,99 +1349,6 @@
MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
@@ -105,23 +105,29 @@
- [Use libmd SHA1 functions])
- SHA1_LIBS=-lmd
-fi
--AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
--if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
-- with_sha1=libgcrypt
--fi
--if test "x$with_sha1" = xlibgcrypt; then
-- AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
-- [Use libgcrypt SHA1 functions])
-- SHA1_LIBS=-lgcrypt
--fi
-AC_CHECK_LIB([sha1], [sha1_begin], [HAVE_LIBSHA1=yes])
-if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
- with_sha1=libsha1
-fi
+-if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then
+- AC_MSG_ERROR([libsha1 requested but not found])
+-fi
-if test "x$with_sha1" = xlibsha1; then
- AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],
- [Use libsha1 for SHA1])
- SHA1_LIBS=-lsha1
+-fi
+-AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+-if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
+- with_sha1=libgcrypt
+-fi
+-if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then
+- AC_MSG_ERROR([libgcrypt requested but not found])
+-fi
+-if test "x$with_sha1" = xlibgcrypt; then
+- AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
+- [Use libgcrypt SHA1 functions])
+- SHA1_LIBS=-lgcrypt
-fi
-# We don't need all of the OpenSSL libraries, just libcrypto
-AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.233
packages/xorg-xserver-server/xorg-xserver-server.spec:1.234
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.233 Thu Apr 29
12:33:50 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Sat May 8
21:53:10 2010
@@ -7,7 +7,7 @@
%bcond_with hal # HAL support
%bcond_without udev # UDEV support
%bcond_without dmx # DMX support
-%bcond_with record # RECORD extension
+%bcond_without record # RECORD extension
#
# ABI versions, see hw/xfree86/common/xf86Module.h
%define xorg_xserver_server_ansic_abi 0.4
@@ -20,20 +20,19 @@
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.8.0.901
+Version: 1.8.0.902
Release: %{rel}%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0:
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 5326bc5e84f2e3455321ab2baed26362
+# Source0-md5: 1d77850a2258f9ee797bc00d12cc4b3e
Source1: 10-quirks.conf
Source2: xserver.pamd
Patch0: %{name}-xwrapper.patch
Patch1: %{name}-pic-libxf86config.patch
Patch2: %{name}-fb-size.patch
Patch3: %{name}-less-acpi-brokenness.patch
-Patch4: %{name}-git.patch
-Patch5: %{name}-builtin-SHA1.patch
+Patch4: %{name}-builtin-SHA1.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel >= 7.8.1
# for glx headers
@@ -334,7 +333,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
# xserver uses pixman-1 API/ABI so put that explictly here
sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h
./render/picture.h
@@ -552,6 +550,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.234 2010/05/08 19:53:10 arekm
+- up to 1.8.0.902
+
Revision 1.233 2010/04/29 10:33:50 baggins
- rel 6
- use builtin SHA1, don't pull openssl dep
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.233&r2=1.234&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
